Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump to loaders@4.2 #8771

Merged
merged 4 commits into from
Apr 10, 2024
Merged

Bump to loaders@4.2 #8771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
befc312
test only: Bump to loaders@4.2-beta
ibgreen Apr 8, 2024
1e6069b
prod
ibgreen Apr 9, 2024
15783fd
fix duplicate copies
Pessimistress Apr 10, 2024
79ac4b6
Merge branch 'master' into loaders.gl@4.2
Pessimistress Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/layer-browser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"start-local": "vite --config ../vite.config.local.mjs"
},
"dependencies": {
"@loaders.gl/ply": "^4.1.4",
"@loaders.gl/gltf": "^4.1.4",
"@loaders.gl/ply": "^4.2.0",
"@loaders.gl/gltf": "^4.2.0",
"colorbrewer": "^1.0.0",
"d3-request": "^1.0.6",
"d3-scale": "^3.1.0",
Expand Down
10 changes: 5 additions & 5 deletions examples/playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/3d-tiles": "^4.1.4",
"@loaders.gl/core": "^4.1.4",
"@loaders.gl/csv": "^4.1.4",
"@loaders.gl/draco": "^4.1.4",
"@loaders.gl/gltf": "^4.1.4",
"@loaders.gl/3d-tiles": "^4.2.0",
"@loaders.gl/core": "^4.2.0",
"@loaders.gl/csv": "^4.2.0",
"@loaders.gl/draco": "^4.2.0",
"@loaders.gl/gltf": "^4.2.0",
"@luma.gl/constants": "^9.0.4",
"brace": "^0.11.1",
"deck.gl": "^9.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/3d-heatmap/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/csv": "^4.1.4",
"@loaders.gl/csv": "^4.2.0",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"deck.gl": "^9.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/3d-tiles/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dependencies": {
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"@loaders.gl/3d-tiles": "^4.1.4",
"@loaders.gl/3d-tiles": "^4.2.0",
"deck.gl": "^9.0.0",
"maplibre-gl": "^3.0.0",
"react": "^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/data-filter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dependencies": {
"@material-ui/core": "^4.10.2",
"@material-ui/icons": "^4.9.1",
"@loaders.gl/csv": "^4.1.4",
"@loaders.gl/csv": "^4.2.0",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"deck.gl": "^9.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/globe/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/csv": "^4.1.4",
"@loaders.gl/csv": "^4.2.0",
"@material-ui/core": "^4.10.2",
"@material-ui/icons": "^4.9.1",
"@types/react": "^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/highway/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/csv": "^4.1.4",
"@loaders.gl/csv": "^4.2.0",
"@types/d3-scale": "^4.0.0",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/i3s/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/i3s": "^4.1.4",
"@loaders.gl/i3s": "^4.2.0",
"deck.gl": "^9.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/website/mapbox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/csv": "^4.1.4",
"@loaders.gl/csv": "^4.2.0",
"d3-scale": "^4.0.0",
"deck.gl": "^9.0.0",
"mapbox-gl": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/mask-extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/csv": "^4.1.4",
"@loaders.gl/csv": "^4.2.0",
"@material-ui/core": "^4.10.2",
"@material-ui/icons": "^4.9.1",
"@types/react": "^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/mesh/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/obj": "^4.1.4",
"@loaders.gl/obj": "^4.2.0",
"@math.gl/core": "^4.0.0",
"deck.gl": "^9.0.0",
"react": "^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/point-cloud/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/las": "^4.1.4",
"@loaders.gl/las": "^4.2.0",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"deck.gl": "^9.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/radio/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/csv": "^4.1.4",
"@loaders.gl/csv": "^4.2.0",
"@material-ui/core": "^4.11.3",
"@material-ui/lab": "^4.0.0-alpha.57",
"@types/d3-scale": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/text/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@loaders.gl/csv": "^4.1.4",
"@loaders.gl/csv": "^4.2.0",
"@types/d3-scale": "^4.0.0",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
Expand Down
12 changes: 6 additions & 6 deletions modules/carto/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@loaders.gl/gis": "^4.1.4",
"@loaders.gl/loader-utils": "^4.1.4",
"@loaders.gl/mvt": "^4.1.4",
"@loaders.gl/schema": "^4.1.4",
"@loaders.gl/tiles": "^4.1.4",
"@loaders.gl/gis": "^4.2.0",
"@loaders.gl/loader-utils": "^4.2.0",
"@loaders.gl/mvt": "^4.2.0",
"@loaders.gl/schema": "^4.2.0",
"@loaders.gl/tiles": "^4.2.0",
"@luma.gl/constants": "^9.0.9",
"@math.gl/web-mercator": "^4.0.0",
"@types/d3-array": "^3.0.2",
Expand All @@ -69,7 +69,7 @@
"@deck.gl/extensions": "^9.0.0-beta",
"@deck.gl/geo-layers": "^9.0.0-beta",
"@deck.gl/layers": "^9.0.0-beta",
"@loaders.gl/core": "^4.1.0",
"@loaders.gl/core": "^4.2.0",
"@luma.gl/core": "^9.0.0"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
Expand Down
4 changes: 2 additions & 2 deletions modules/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"prepublishOnly": "npm run build-debugger && npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@loaders.gl/core": "^4.1.4",
"@loaders.gl/images": "^4.1.4",
"@loaders.gl/core": "^4.2.0",
"@loaders.gl/images": "^4.2.0",
"@luma.gl/constants": "^9.0.9",
"@luma.gl/core": "^9.0.9",
"@luma.gl/engine": "^9.0.9",
Expand Down
2 changes: 2 additions & 0 deletions modules/core/src/utils/json-loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ function isJSON(text: string): boolean {

// A light weight version instead of @loaders.gl/json (stream processing etc.)
export default {
dataType: null as any,
batchType: null as never,
id: 'JSON',
name: 'JSON',
module: '',
Expand Down
18 changes: 9 additions & 9 deletions modules/geo-layers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@loaders.gl/3d-tiles": "^4.1.4",
"@loaders.gl/gis": "^4.1.4",
"@loaders.gl/loader-utils": "^4.1.4",
"@loaders.gl/mvt": "^4.1.4",
"@loaders.gl/schema": "^4.1.4",
"@loaders.gl/terrain": "^4.1.4",
"@loaders.gl/tiles": "^4.1.4",
"@loaders.gl/wms": "^4.1.4",
"@loaders.gl/3d-tiles": "^4.2.0",
"@loaders.gl/gis": "^4.2.0",
"@loaders.gl/loader-utils": "^4.2.0",
"@loaders.gl/mvt": "^4.2.0",
"@loaders.gl/schema": "^4.2.0",
"@loaders.gl/terrain": "^4.2.0",
"@loaders.gl/tiles": "^4.2.0",
"@loaders.gl/wms": "^4.2.0",
"@luma.gl/gltf": "^9.0.9",
"@luma.gl/shadertools": "^9.0.9",
"@math.gl/core": "^4.0.0",
Expand All @@ -60,7 +60,7 @@
"@deck.gl/extensions": "^9.0.0-beta",
"@deck.gl/layers": "^9.0.0-beta",
"@deck.gl/mesh-layers": "^9.0.0-beta",
"@loaders.gl/core": "^4.1.0",
"@loaders.gl/core": "^4.2.0",
"@luma.gl/core": "^9.0.0",
"@luma.gl/engine": "^9.0.0"
},
Expand Down
6 changes: 3 additions & 3 deletions modules/jupyter-widget/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
"@deck.gl/layers": "9.0.0-beta.10",
"@deck.gl/mesh-layers": "9.0.0-beta.10",
"@jupyter-widgets/base": "^1.1.10 || ^2 || ^3 || ^4",
"@loaders.gl/3d-tiles": "^4.1.4",
"@loaders.gl/core": "^4.1.4",
"@loaders.gl/csv": "^4.1.4",
"@loaders.gl/3d-tiles": "^4.2.0",
"@loaders.gl/core": "^4.2.0",
"@loaders.gl/csv": "^4.2.0",
"@luma.gl/core": "^9.0.9",
"d3-dsv": "^1.0.8",
"mapbox-gl": "^1.13.2"
Expand Down
6 changes: 3 additions & 3 deletions modules/layers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@loaders.gl/images": "^4.1.4",
"@loaders.gl/schema": "^4.1.4",
"@loaders.gl/images": "^4.2.0",
"@loaders.gl/schema": "^4.2.0",
"@mapbox/tiny-sdf": "^2.0.5",
"@math.gl/core": "^4.0.0",
"@math.gl/polygon": "^4.0.0",
Expand All @@ -47,7 +47,7 @@
},
"peerDependencies": {
"@deck.gl/core": "^9.0.0-beta",
"@loaders.gl/core": "^4.1.0",
"@loaders.gl/core": "^4.2.0",
"@luma.gl/core": "^9.0.0",
"@luma.gl/engine": "^9.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion modules/mesh-layers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@loaders.gl/gltf": "^4.1.4",
"@loaders.gl/gltf": "^4.2.0",
"@luma.gl/gltf": "^9.0.9",
"@luma.gl/shadertools": "^9.0.9"
},
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
"jsdom": false
},
"devDependencies": {
"@loaders.gl/csv": "^4.1.4",
"@loaders.gl/polyfills": "^4.1.4",
"@loaders.gl/csv": "^4.2.0",
"@loaders.gl/polyfills": "^4.2.0",
"@luma.gl/webgpu": "^9.0.9",
"@math.gl/proj4": "^4.0.0",
"@probe.gl/bench": "^4.0.9",
Expand Down
2 changes: 1 addition & 1 deletion test/apps/arcgis-i3s/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dependencies": {
"@deck.gl/core": "^8.1.0",
"@deck.gl/layers": "^8.1.0",
"@loaders.gl/i3s": "^4.1.4"
"@loaders.gl/i3s": "^4.2.0"
},
"devDependencies": {
"vite": "^4.0.0"
Expand Down
8 changes: 4 additions & 4 deletions website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
},
"dependencies": {
"@googlemaps/js-api-loader": "^1.16.0",
"@loaders.gl/i3s": "^4.1.4",
"@loaders.gl/las": "^4.1.4",
"@loaders.gl/obj": "^4.1.4",
"@loaders.gl/ply": "^4.1.4",
"@loaders.gl/i3s": "^4.2.0",
"@loaders.gl/las": "^4.2.0",
"@loaders.gl/obj": "^4.2.0",
"@loaders.gl/ply": "^4.2.0",
"@material-ui/core": "^4.10.2",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.57",
Expand Down
Loading
Loading