Skip to content

Commit

Permalink
Merge branch 'master' into chr/trip-layer-trail-fade
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrisgervang
chrisgervang authored Jul 5, 2021
2 parents f1b91eb + abeead4 commit af92b0b
Show file tree
Hide file tree
Showing 21 changed files with 401 additions and 303 deletions.
8 changes: 4 additions & 4 deletions examples/layer-browser/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"start-local-production": "webpack-dev-server --env.local --env.production --progress --hot --open"
},
"dependencies": {
"@loaders.gl/ply": "^3.0.0-beta.6",
"@loaders.gl/gltf": "^3.0.0-beta.6",
"@luma.gl/experimental": "^8.3.1",
"@luma.gl/debug": "^8.3.1",
"@loaders.gl/ply": "^3.0.0-beta.8",
"@loaders.gl/gltf": "^3.0.0-beta.8",
"@luma.gl/experimental": "^8.5.0-beta.1",
"@luma.gl/debug": "^8.5.0-beta.1",
"colorbrewer": "^1.0.0",
"d3-request": "^1.0.6",
"d3-scale": "^3.1.0",
Expand Down
12 changes: 6 additions & 6 deletions examples/playground/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
"build": "rm -rf dist && mkdir dist && cp index.html dist/ && webpack --env.local --env.production=true"
},
"dependencies": {
"@loaders.gl/3d-tiles": "^3.0.0-beta.6",
"@loaders.gl/core": "^3.0.0-beta.6",
"@loaders.gl/csv": "^3.0.0-beta.6",
"@loaders.gl/draco": "^3.0.0-beta.6",
"@loaders.gl/gltf": "^3.0.0-beta.6",
"@luma.gl/constants": "^8.3.1",
"@loaders.gl/3d-tiles": "^3.0.0-beta.8",
"@loaders.gl/core": "^3.0.0-beta.8",
"@loaders.gl/csv": "^3.0.0-beta.8",
"@loaders.gl/draco": "^3.0.0-beta.8",
"@loaders.gl/gltf": "^3.0.0-beta.8",
"@luma.gl/constants": "^8.5.0-beta.1",
"brace": "^0.11.1",
"deck.gl": "^8.3.0",
"react": "~16.9.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/3d-tiles/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"dependencies": {
"deck.gl": "^8.4.0",
"@loaders.gl/3d-tiles": "^3.0.0-beta.6",
"@loaders.gl/3d-tiles": "^3.0.0-beta.8",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-map-gl": "^5.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/website/globe/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"start": "webpack-dev-server --progress --hot --open"
},
"dependencies": {
"@loaders.gl/csv": "^3.0.0-beta.6",
"@loaders.gl/csv": "^3.0.0-beta.8",
"@material-ui/core": "^4.10.2",
"@material-ui/icons": "^4.9.1",
"deck.gl": "^8.4.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/i3s/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@loaders.gl/i3s": "^3.0.0-beta.6",
"@loaders.gl/i3s": "^3.0.0-beta.8",
"deck.gl": "^8.4.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/website/mesh/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@loaders.gl/obj": "^3.0.0-beta.6",
"@loaders.gl/obj": "^3.0.0-beta.8",
"deck.gl": "^8.4.0",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"math.gl": "^3.0.0"
"math.gl": "^3.5.0-beta.1"
},
"devDependencies": {
"@babel/core": "^7.4.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/point-cloud/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@loaders.gl/las": "^3.0.0-beta.6",
"@loaders.gl/las": "^3.0.0-beta.8",
"deck.gl": "^8.4.0",
"react": "^16.3.0",
"react-dom": "^16.3.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/website/radio/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"start": "webpack-dev-server --progress --hot --open"
},
"dependencies": {
"@loaders.gl/csv": "^3.0.0-beta.6",
"@loaders.gl/csv": "^3.0.0-beta.8",
"@material-ui/core": "^4.11.3",
"@material-ui/lab": "^4.0.0-alpha.57",
"d3-scale": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/website/safegraph/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@loaders.gl/csv": "^3.0.0-beta.6",
"@loaders.gl/csv": "^3.0.0-beta.8",
"d3-scale": "^2.0.0",
"deck.gl": "^8.4.0",
"mapbox-gl": "^1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/website/scenegraph/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"deck.gl": "^8.4.0",
"@loaders.gl/gltf": "^3.0.0-beta.6",
"@loaders.gl/gltf": "^3.0.0-beta.8",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react-map-gl": "^5.0.0"
Expand Down
4 changes: 2 additions & 2 deletions modules/aggregation-layers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@luma.gl/shadertools": "^8.5.0-alpha.1",
"@math.gl/web-mercator": "^3.4.2",
"@luma.gl/shadertools": "^8.5.0-beta.1",
"@math.gl/web-mercator": "^3.5.0-beta.1",
"d3-hexbin": "^0.2.1"
},
"peerDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions modules/carto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@loaders.gl/loader-utils": "^3.0.0-beta.6",
"@loaders.gl/mvt": "^3.0.0-beta.6",
"@loaders.gl/tiles": "^3.0.0-beta.6",
"@math.gl/web-mercator": "^3.4.2",
"@loaders.gl/loader-utils": "^3.0.0-beta.8",
"@loaders.gl/mvt": "^3.0.0-beta.8",
"@loaders.gl/tiles": "^3.0.0-beta.8",
"@math.gl/web-mercator": "^3.5.0-beta.1",
"cartocolor": "^4.0.2",
"d3-scale": "^3.2.3"
},
Expand Down
12 changes: 6 additions & 6 deletions modules/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
"prepublishOnly": "npm run build-debugger && npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@loaders.gl/core": "^3.0.0-beta.6",
"@loaders.gl/images": "^3.0.0-beta.6",
"@luma.gl/core": "^8.5.0-alpha.1",
"@math.gl/web-mercator": "^3.4.2",
"@loaders.gl/core": "^3.0.0-beta.8",
"@loaders.gl/images": "^3.0.0-beta.8",
"@luma.gl/core": "^8.5.0-beta.1",
"@math.gl/web-mercator": "^3.5.0-beta.1",
"gl-matrix": "^3.0.0",
"math.gl": "^3.4.2",
"math.gl": "^3.5.0-beta.1",
"mjolnir.js": "^2.5.0",
"probe.gl": "^3.3.1"
"probe.gl": "^3.4.0-beta.1"
}
}
2 changes: 1 addition & 1 deletion modules/extensions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@luma.gl/shadertools": "^8.5.0-alpha.1"
"@luma.gl/shadertools": "^8.5.0-beta.1"
},
"peerDependencies": {
"@deck.gl/core": "^8.0.0",
Expand Down
20 changes: 10 additions & 10 deletions modules/geo-layers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@loaders.gl/3d-tiles": "^3.0.0-beta.6",
"@loaders.gl/gis": "^3.0.0-beta.6",
"@loaders.gl/loader-utils": "^3.0.0-beta.6",
"@loaders.gl/mvt": "^3.0.0-beta.6",
"@loaders.gl/terrain": "^3.0.0-beta.6",
"@loaders.gl/tiles": "^3.0.0-beta.6",
"@luma.gl/experimental": "^8.5.0-alpha.1",
"@math.gl/culling": "^3.4.2",
"@math.gl/web-mercator": "^3.4.2",
"@loaders.gl/3d-tiles": "^3.0.0-beta.8",
"@loaders.gl/gis": "^3.0.0-beta.8",
"@loaders.gl/loader-utils": "^3.0.0-beta.8",
"@loaders.gl/mvt": "^3.0.0-beta.8",
"@loaders.gl/terrain": "^3.0.0-beta.8",
"@loaders.gl/tiles": "^3.0.0-beta.8",
"@luma.gl/experimental": "^8.5.0-beta.1",
"@math.gl/culling": "^3.5.0-beta.1",
"@math.gl/web-mercator": "^3.5.0-beta.1",
"h3-js": "^3.6.0",
"long": "^3.2.0",
"math.gl": "^3.4.2"
"math.gl": "^3.5.0-beta.1"
},
"peerDependencies": {
"@deck.gl/core": "^8.0.0",
Expand Down
8 changes: 4 additions & 4 deletions modules/jupyter-widget/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
"@deck.gl/layers": "8.5.0-alpha.11",
"@deck.gl/mesh-layers": "8.5.0-alpha.11",
"@jupyter-widgets/base": "^1.1.10 || ^2 || ^3",
"@loaders.gl/3d-tiles": "^3.0.0-beta.6",
"@loaders.gl/core": "^3.0.0-beta.6",
"@loaders.gl/csv": "^3.0.0-beta.6",
"@luma.gl/constants": "^8.5.0-alpha.1",
"@loaders.gl/3d-tiles": "^3.0.0-beta.8",
"@loaders.gl/core": "^3.0.0-beta.8",
"@loaders.gl/csv": "^3.0.0-beta.8",
"@luma.gl/constants": "^8.5.0-beta.1",
"mapbox-gl": "^1.2.1"
},
"jupyterlab": {
Expand Down
4 changes: 2 additions & 2 deletions modules/layers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
},
"dependencies": {
"@loaders.gl/images": "^3.0.0-beta.6",
"@loaders.gl/images": "^3.0.0-beta.8",
"@mapbox/tiny-sdf": "^1.1.0",
"@math.gl/polygon": "^3.4.2",
"@math.gl/polygon": "^3.5.0-beta.1",
"earcut": "^2.0.6"
},
"peerDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions modules/mesh-layers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"@deck.gl/core": "^8.0.0"
},
"dependencies": {
"@loaders.gl/gltf": "^3.0.0-beta.6",
"@luma.gl/experimental": "^8.5.0-alpha.1",
"@luma.gl/shadertools": "^8.5.0-alpha.1"
"@loaders.gl/gltf": "^3.0.0-beta.8",
"@luma.gl/experimental": "^8.5.0-beta.1",
"@luma.gl/shadertools": "^8.5.0-beta.1"
}
}
2 changes: 1 addition & 1 deletion modules/test-utils/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@deck.gl/core": "^8.0.0",
"@luma.gl/test-utils": "^8.0.0",
"@luma.gl/webgl": "^8.0.0",
"@probe.gl/test-utils": "^3.2.1"
"@probe.gl/test-utils": "^3.4.0-beta.1"
},
"scripts": {}
}
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
},
"devDependencies": {
"@babel/register": "^7.13.0",
"@loaders.gl/csv": "^3.0.0-beta.6",
"@loaders.gl/polyfills": "^3.0.0-beta.6",
"@luma.gl/test-utils": "^8.5.0-alpha.1",
"@probe.gl/bench": "^3.3.1",
"@probe.gl/test-utils": "^3.3.1",
"@loaders.gl/csv": "^3.0.0-beta.8",
"@loaders.gl/polyfills": "^3.0.0-beta.8",
"@luma.gl/test-utils": "^8.5.0-beta.1",
"@probe.gl/bench": "^3.4.0-beta.1",
"@probe.gl/test-utils": "^3.4.0-beta.1",
"abortcontroller-polyfill": "^1.5.0",
"babel-loader": "^8.0.0",
"babel-plugin-inline-webgl-constants": "^1.0.3",
Expand Down
Loading

0 comments on commit af92b0b

Please sign in to comment.