Skip to content

Commit 360a0b9

Browse files
committed
Merge branch 'master' into otp-ui-refactor
2 parents 8555ae9 + 58e4630 commit 360a0b9

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

Diff for: package.json

+1-7
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
},
2828
"homepage": "https://github.com/opentripplanner/otp-react-redux#readme",
2929
"dependencies": {
30-
"@conveyal/lonlat": "^1.1.0",
31-
"@mapbox/polyline": "^0.2.0",
3230
"@opentripplanner/base-map": "^0.0.21",
3331
"@opentripplanner/core-utils": "^0.0.21",
3432
"@opentripplanner/endpoints-overlay": "^0.0.21",
@@ -49,7 +47,6 @@
4947
"@opentripplanner/trip-form": "^0.0.21",
5048
"@opentripplanner/trip-viewer-overlay": "^0.0.21",
5149
"@opentripplanner/vehicle-rental-overlay": "^0.0.21",
52-
"@turf/along": "^6.0.1",
5350
"bootstrap": "^3.3.7",
5451
"bowser": "^1.9.3",
5552
"clone": "^2.1.0",
@@ -58,13 +55,11 @@
5855
"currency-formatter": "^1.4.2",
5956
"d3-selection": "^1.3.0",
6057
"d3-zoom": "^1.7.1",
61-
"deep-equal": "^1.0.1",
6258
"font-awesome": "^4.7.0",
6359
"haversine": "^1.1.0",
6460
"history": "^4.7.2",
6561
"immutability-helper": "^2.1.1",
6662
"isomorphic-fetch": "^2.2.1",
67-
"leaflet.polylinemeasure": "github:ppete2/Leaflet.PolylineMeasure",
6863
"lodash.debounce": "^4.0.8",
6964
"lodash.isequal": "^4.5.0",
7065
"lodash.memoize": "^4.1.2",
@@ -75,7 +70,6 @@
7570
"prop-types": "^15.6.0",
7671
"qs": "^6.3.0",
7772
"react": "^16.9.0",
78-
"react-addons-shallow-compare": "^15.4.2",
7973
"react-bootstrap": "^0.32.1",
8074
"react-dates": "^6.0.2",
8175
"react-dom": "^16.9.0",
@@ -88,7 +82,7 @@
8882
"redux-actions": "^1.2.1",
8983
"redux-logger": "^2.7.4",
9084
"redux-thunk": "^2.3.0",
91-
"transitive-js": "^0.13.0",
85+
"transitive-js": "^0.13.2",
9286
"velocity-react": "^1.3.3"
9387
},
9488
"devDependencies": {

Diff for: yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -15481,10 +15481,10 @@ tr46@^1.0.1:
1548115481
dependencies:
1548215482
punycode "^2.1.0"
1548315483

15484-
transitive-js@^0.13.0:
15485-
version "0.13.0"
15486-
resolved "https://registry.yarnpkg.com/transitive-js/-/transitive-js-0.13.0.tgz#443e734c011171d25f5591bc013b12fb61a6e88d"
15487-
integrity sha512-Ydhsc6y6CW35wH34+Fapb6KKT4gkZXe50WwKydUImlpN02pxlOa4jzXzuNgM5ayLAVWka3S5VMwJE0hZNVSZgg==
15484+
transitive-js@^0.13.2:
15485+
version "0.13.2"
15486+
resolved "https://registry.yarnpkg.com/transitive-js/-/transitive-js-0.13.2.tgz#ca8adde4ccf5c1fb02623df287ac3c91499c566a"
15487+
integrity sha512-2r6uoA7pCOyMeecTOWgT+MJMa+gVmLlBR2+s1YKYxBYmusS5Lx24ICqc3RVA2+yE36k9fe+ReMBOcBCoK2mY6w==
1548815488
dependencies:
1548915489
augment "4.3.0"
1549015490
component-each "0.2.6"

0 commit comments

Comments
 (0)