Skip to content

Commit

Permalink
Merge pull request #784 from ibi-group/fix-dependency-issues
Browse files Browse the repository at this point in the history 
fix build issues by using alpha version
  • Loading branch information
@daniel-heppner-ibigroup
daniel-heppner-ibigroup authored Oct 1, 2024
2 parents 43cee77 + ecb86ae commit 04e09ef
Show file tree
Hide file tree
Showing 22 changed files with 98 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .storybook/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports = {

stories: [
"../packages/**/*.story.mdx",
"../packages/**/*.story.@(js|jsx|ts|tsx)"
"../packages/*/src/**/*.story.@(js|jsx|ts|tsx)"
],
staticDirs: ['../public'],

Expand Down
2 changes: 1 addition & 1 deletion packages/base-map/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"mapbox-gl": "npm:empty-npm-package@1.0.0",
"maplibre-gl": "^2.1.9",
"react-map-gl": "^7.0.15",
"@opentripplanner/building-blocks": "^1.2.2"
"@opentripplanner/building-blocks": "^2.0.0"
},
"peerDependencies": {
"react": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/building-blocks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"private": false,
"devDependencies": {
"@opentripplanner/types": "^6.5.2",
"@opentripplanner/core-utils": "^11.4.4"
"@opentripplanner/core-utils": "^12.0.0"
},
"peerDependencies": {
"react": "^18.2.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/endpoints-overlay/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
"url": "https://github.com/opentripplanner/otp-ui/issues"
},
"dependencies": {
"@opentripplanner/base-map": "^3.2.2",
"@opentripplanner/base-map": "^4.0.0",
"@opentripplanner/location-icon": "^1.4.1",
"@opentripplanner/core-utils": "^11.4.4",
"@opentripplanner/core-utils": "^12.0.0",
"flat": "^5.0.2",
"@styled-icons/fa-solid": "^10.34.0",
"@opentripplanner/building-blocks": "^1.2.2"
"@opentripplanner/building-blocks": "^2.0.0"
},
"devDependencies": {
"@opentripplanner/types": "^6.5.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/icons/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"license": "MIT",
"private": false,
"dependencies": {
"@opentripplanner/core-utils": "^11.4.4",
"@opentripplanner/core-utils": "^12.0.0",
"prop-types": "^15.7.2"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/itinerary-body/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"license": "MIT",
"private": false,
"dependencies": {
"@opentripplanner/core-utils": "^11.4.4",
"@opentripplanner/core-utils": "^12.0.0",
"@opentripplanner/humanize-distance": "^1.2.0",
"@opentripplanner/icons": "^2.0.12",
"@opentripplanner/icons": "^3.0.0",
"@opentripplanner/location-icon": "^1.4.1",
"@styled-icons/fa-solid": "^10.34.0",
"@styled-icons/foundation": "^10.34.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/location-field/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"private": false,
"dependencies": {
"@conveyal/geocoder-arcgis-geojson": "^0.0.3",
"@opentripplanner/core-utils": "^11.4.4",
"@opentripplanner/core-utils": "^12.0.0",
"@opentripplanner/geocoder": "^3.0.2",
"@opentripplanner/humanize-distance": "^1.2.0",
"@opentripplanner/location-icon": "^1.4.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/map-popup/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"license": "MIT",
"private": false,
"dependencies": {
"@opentripplanner/base-map": "^3.2.2",
"@opentripplanner/building-blocks": "^1.2.2",
"@opentripplanner/core-utils": "^11.4.4",
"@opentripplanner/from-to-location-picker": "^2.1.14",
"@opentripplanner/base-map": "^4.0.0",
"@opentripplanner/building-blocks": "^2.0.0",
"@opentripplanner/core-utils": "^12.0.0",
"@opentripplanner/from-to-location-picker": "^3.0.0",
"flat": "^5.0.2"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/otp2-tile-overlay/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"react-map-gl": "^7.0.15"
},
"dependencies": {
"@opentripplanner/map-popup": "^4.0.0"
"@opentripplanner/map-popup": "^v3.2.0-alpha.1"
},
"devDependencies": {
"@opentripplanner/base-map": "^3.2.2",
"@opentripplanner/base-map": "^4.0.0",
"@opentripplanner/types": "^6.5.2"
}
}
4 changes: 2 additions & 2 deletions packages/park-and-ride-overlay/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"url": "https://github.com/opentripplanner/otp-ui/issues"
},
"dependencies": {
"@opentripplanner/base-map": "^3.2.2",
"@opentripplanner/from-to-location-picker": "^2.1.14"
"@opentripplanner/base-map": "^4.0.0",
"@opentripplanner/from-to-location-picker": "^3.0.0"
},
"peerDependencies": {
"react": "^18.2.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/printable-itinerary/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"license": "MIT",
"private": false,
"dependencies": {
"@opentripplanner/core-utils": "^11.4.4",
"@opentripplanner/itinerary-body": "^5.3.6"
"@opentripplanner/core-utils": "^12.0.0",
"@opentripplanner/itinerary-body": "^6.0.0"
},
"devDependencies": {
"@opentripplanner/icons": "^2.0.12"
"@opentripplanner/icons": "^3.0.0"
},
"peerDependencies": {
"react": "^18.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/route-viewer-overlay/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
},
"dependencies": {
"@mapbox/polyline": "^1.1.0",
"@opentripplanner/base-map": "^3.2.2",
"@opentripplanner/core-utils": "^11.4.4",
"@opentripplanner/base-map": "^4.0.0",
"@opentripplanner/core-utils": "^12.0.0",
"point-in-polygon": "^1.1.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/stop-viewer-overlay/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"url": "https://github.com/opentripplanner/otp-ui/issues"
},
"dependencies": {
"@opentripplanner/base-map": "^3.2.2",
"@opentripplanner/core-utils": "^11.4.4"
"@opentripplanner/base-map": "^4.0.0",
"@opentripplanner/core-utils": "^12.0.0"
},
"devDependencies": {
"@opentripplanner/types": "^6.5.2"
Expand Down
6 changes: 3 additions & 3 deletions packages/stops-overlay/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"url": "https://github.com/opentripplanner/otp-ui/issues"
},
"dependencies": {
"@opentripplanner/base-map": "^3.2.2",
"@opentripplanner/from-to-location-picker": "^2.1.14",
"@opentripplanner/map-popup": "^4.0.0",
"@opentripplanner/base-map": "^4.0.0",
"@opentripplanner/from-to-location-picker": "^3.0.0",
"@opentripplanner/map-popup": "^5.0.0",
"flat": "^5.0.2"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/transit-vehicle-overlay/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"module": "esm/index.js",
"private": false,
"dependencies": {
"@opentripplanner/base-map": "^3.2.2",
"@opentripplanner/core-utils": "^11.4.4",
"@opentripplanner/icons": "^2.0.12",
"@opentripplanner/base-map": "^4.0.0",
"@opentripplanner/core-utils": "^12.0.0",
"@opentripplanner/icons": "^3.0.0",
"flat": "^5.0.2"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/transitive-overlay/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
},
"dependencies": {
"@mapbox/polyline": "^1.1.1",
"@opentripplanner/base-map": "^3.2.2",
"@opentripplanner/core-utils": "^11.4.4",
"@opentripplanner/itinerary-body": "^5.3.6",
"@opentripplanner/base-map": "^4.0.0",
"@opentripplanner/core-utils": "^12.0.0",
"@opentripplanner/itinerary-body": "^6.0.0",
"@turf/bbox": "^6.5.0",
"@turf/bearing": "^6.5.0",
"@turf/destination": "^6.5.0",
Expand All @@ -32,7 +32,7 @@
"lodash.isequal": "^4.5.0"
},
"devDependencies": {
"@opentripplanner/endpoints-overlay": "^2.1.3",
"@opentripplanner/endpoints-overlay": "^3.0.0",
"@opentripplanner/types": "^6.5.2"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/trip-details/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"license": "MIT",
"private": false,
"dependencies": {
"@opentripplanner/core-utils": "^11.4.4",
"@opentripplanner/core-utils": "^12.0.0",
"@styled-icons/fa-solid": "^10.34.0",
"flat": "^5.0.2",
"react-animate-height": "^3.0.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/trip-form/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"types": "lib/index.d.ts",
"private": false,
"dependencies": {
"@opentripplanner/core-utils": "^11.4.4",
"@opentripplanner/building-blocks": "^1.0.3",
"@opentripplanner/core-utils": "^12.0.0",
"@opentripplanner/building-blocks": "^2.0.0",
"@floating-ui/react": "^0.19.2",
"@styled-icons/bootstrap": "^10.34.0",
"@styled-icons/boxicons-regular": "^10.38.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/trip-viewer-overlay/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
},
"dependencies": {
"@mapbox/polyline": "^1.1.0",
"@opentripplanner/base-map": "^3.2.2",
"@opentripplanner/core-utils": "^11.4.4"
"@opentripplanner/base-map": "^4.0.0",
"@opentripplanner/core-utils": "^12.0.0"
},
"peerDependencies": {
"react": "^18.2.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/vehicle-rental-overlay/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"url": "git+https://github.com/opentripplanner/otp-ui.git"
},
"dependencies": {
"@opentripplanner/base-map": "^3.2.2",
"@opentripplanner/core-utils": "^11.4.4",
"@opentripplanner/from-to-location-picker": "^2.1.14",
"@opentripplanner/map-popup": "^4.0.0",
"@opentripplanner/base-map": "^4.0.0",
"@opentripplanner/core-utils": "^12.0.0",
"@opentripplanner/from-to-location-picker": "^3.0.0",
"@opentripplanner/map-popup": "^5.0.0",
"@styled-icons/fa-solid": "^10.34.0",
"flat": "^5.0.2",
"lodash.memoize": "^4.1.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/zoom-based-markers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"url": "https://github.com/opentripplanner/otp-ui/issues"
},
"dependencies": {
"@opentripplanner/core-utils": "^11.4.4",
"@opentripplanner/base-map": "^3.2.2"
"@opentripplanner/core-utils": "^12.0.0",
"@opentripplanner/base-map": "^4.0.0"
},
"devDependencies": {
"@opentripplanner/types": "^6.5.2"
Expand Down
52 changes: 52 additions & 0 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4608,6 +4608,58 @@
resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-2.1.0.tgz#0acf32f470af2ceaf47f095cdecd40d68666efda"
integrity sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==

"@opentripplanner/base-map@^3.2.2":
version "3.2.2"
resolved "https://registry.yarnpkg.com/@opentripplanner/base-map/-/base-map-3.2.2.tgz#6dc15f3af0bfe483ffea220dcd2220272fa31040"
integrity sha512-Neg+rvAr9lWx+8V8/4ZlPE+l91wxM0fbbsM5vp45L1zCRE4WszD7XtmLocnNMyuYzo3xEijoKF+ICiENsOM9bg==
dependencies:
"@opentripplanner/building-blocks" "^1.2.2"
mapbox-gl "npm:empty-npm-package@1.0.0"
maplibre-gl "^2.1.9"
react-map-gl "^7.0.15"

"@opentripplanner/building-blocks@^1.2.2":
version "1.2.3"
resolved "https://registry.yarnpkg.com/@opentripplanner/building-blocks/-/building-blocks-1.2.3.tgz#404e8f9038867d66d55f51adf8855b1326c51ed5"
integrity sha512-I0AxiZrTZu+e7+av4u0tHW2ijqpxH0AkLHrhf75BHf1Ep2FOGxaul/v+8UT18mNYiM5eHNstOX3XiXaDjtCUaw==

"@opentripplanner/core-utils@^11.4.4":
version "11.5.0"
resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-11.5.0.tgz#b0aaa7724bb44fadc71c7027fe9eacac09e4e042"
integrity sha512-kRn50DSnET6t8Zdwx5hoGz6ZwOegvq70Ovxs6shgJJRKuEj5tEhkPyuqY+LndTG8NWuZj9Ql9Vb4Va7kZbHAvA==
dependencies:
"@conveyal/lonlat" "^1.4.1"
"@mapbox/polyline" "^1.1.0"
"@opentripplanner/geocoder" "^3.0.2"
"@styled-icons/foundation" "^10.34.0"
"@turf/along" "^6.0.1"
chroma-js "^2.4.2"
date-fns "^2.28.0"
date-fns-tz "^1.2.2"
graphql "^16.6.0"
lodash.clonedeep "^4.5.0"
lodash.isequal "^4.5.0"
qs "^6.9.1"

"@opentripplanner/from-to-location-picker@^2.1.14":
version "2.1.14"
resolved "https://registry.yarnpkg.com/@opentripplanner/from-to-location-picker/-/from-to-location-picker-2.1.14.tgz#7386fe93cd486a67a119a81fb46a5a442f9aa7ec"
integrity sha512-V0slZKBxGj6J4QxrIc3hpcHmZzAW6F1qZGBFJG/0Lpx3MiT5BVnaYyapedJOJW7zdzcIt16FBg774RjvwBu3fQ==
dependencies:
"@opentripplanner/location-icon" "^1.4.1"
flat "^5.0.2"

"@opentripplanner/map-popup@^v3.2.0-alpha.1":
version "3.2.0-alpha.1"
resolved "https://registry.yarnpkg.com/@opentripplanner/map-popup/-/map-popup-3.2.0-alpha.1.tgz#dcad38c103500f7c5ad3c632398204849ed5885e"
integrity sha512-Z0RsyC7wkYU/aOLYQFsJI5tBhzooEE/sQZROX2WODkDWAv4Qfj95ppS8pvNkpoZ0N4fioFcj5aM2VGXVMSy0EA==
dependencies:
"@opentripplanner/base-map" "^3.2.2"
"@opentripplanner/building-blocks" "^1.2.2"
"@opentripplanner/core-utils" "^11.4.4"
"@opentripplanner/from-to-location-picker" "^2.1.14"
flat "^5.0.2"

"@peculiar/asn1-schema@^2.1.6", "@peculiar/asn1-schema@^2.3.0":
version "2.3.3"
resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.3.3.tgz#21418e1f3819e0b353ceff0c2dad8ccb61acd777"
Expand Down

0 comments on commit 04e09ef

Please sign in to comment.