Skip to content

Commit

Permalink
Merge 3afbfc7 into 58082eb
Browse files Browse the repository at this point in the history
  • Loading branch information
Xintong Xia authored Jun 3, 2020
2 parents 58082eb + 3afbfc7 commit 108f647
Show file tree
Hide file tree
Showing 38 changed files with 145 additions and 176 deletions.
2 changes: 1 addition & 1 deletion examples/basis/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"dependencies": {
"@loaders.gl/basis": "^2.1.3",
"@loaders.gl/core": "^2.1.3"
"@loaders.gl/core": "^2.2.0-alpha.1"
},
"devDependencies": {
"babel-plugin-inline-import": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/benchmarks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@probe.gl/react-bench": "^3.3.0-alpha.8"
},
"devDependencies": {
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/core": "^2.2.0-alpha.1",
"@babel/cli": "^7.0.0",
"@babel/core": "^7.4.0",
"@babel/preset-react": "^7.0.0",
Expand Down
6 changes: 3 additions & 3 deletions examples/cesium/3d-tiles/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"start-local": "webpack-dev-server --env.local --env.esnext --progress --hot --open"
},
"dependencies": {
"@loaders.gl/3d-tiles": "^2.1.3",
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/draco": "^2.1.3",
"@loaders.gl/3d-tiles": "^2.2.0-alpha.1",
"@loaders.gl/core": "^2.2.0-alpha.1",
"@loaders.gl/draco": "^2.2.0-alpha.1",
"@math.gl/culling": "^3.1.3",
"math.gl": "^3.1.3"
},
Expand Down
18 changes: 9 additions & 9 deletions examples/deck.gl/3d-tiles/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"generate": "node ./generate-index/index.js"
},
"dependencies": {
"@deck.gl/core": "^8.1.4",
"@deck.gl/geo-layers": "^8.1.4",
"@deck.gl/layers": "^8.1.4",
"@deck.gl/mesh-layers": "^8.1.4",
"@deck.gl/react": "^8.1.4",
"@loaders.gl/3d-tiles": "^2.1.3",
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/draco": "^2.1.3",
"@loaders.gl/gltf": "^2.1.3",
"@deck.gl/core": "^8.1.8",
"@deck.gl/geo-layers": "^8.1.8",
"@deck.gl/layers": "^8.1.8",
"@deck.gl/mesh-layers": "^8.1.8",
"@deck.gl/react": "^8.1.8",
"@loaders.gl/3d-tiles": "^2.2.0-alpha.1",
"@loaders.gl/core": "^2.2.0-alpha.1",
"@loaders.gl/draco": "^2.2.0-alpha.1",
"@loaders.gl/gltf": "^2.2.0-alpha.1",
"@luma.gl/core": "^8.1.2",
"@probe.gl/stats-widget": "^3.2.0",
"marked": "^0.7.0",
Expand Down
12 changes: 6 additions & 6 deletions examples/deck.gl/gltf/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"start-local": "webpack-dev-server --env.local --env.esnext --progress --hot --open"
},
"dependencies": {
"@deck.gl/core": "^8.1.4",
"@deck.gl/mesh-layers": "^8.1.4",
"@deck.gl/react": "^8.1.4",
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/gltf": "^2.1.3",
"@loaders.gl/draco": "^2.1.3",
"@deck.gl/core": "^8.1.8",
"@deck.gl/mesh-layers": "^8.1.8",
"@deck.gl/react": "^8.1.8",
"@loaders.gl/core": "^2.2.0-alpha.1",
"@loaders.gl/gltf": "^2.2.0-alpha.1",
"@loaders.gl/draco": "^2.2.0-alpha.1",
"@luma.gl/constants": "^8.1.2",
"react": "^16.8.0",
"react-dom": "^16.8.0",
Expand Down
16 changes: 8 additions & 8 deletions examples/deck.gl/i3s/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"generate": "node ./generate-index/index.js"
},
"dependencies": {
"@deck.gl/core": "^8.1.4",
"@deck.gl/geo-layers": "^8.1.4",
"@deck.gl/layers": "^8.1.4",
"@deck.gl/mesh-layers": "^8.1.4",
"@deck.gl/react": "^8.1.4",
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/draco": "^2.1.3",
"@loaders.gl/gltf": "^2.1.3",
"@deck.gl/core": "^8.1.8",
"@deck.gl/geo-layers": "^8.1.8",
"@deck.gl/layers": "^8.1.8",
"@deck.gl/mesh-layers": "^8.1.8",
"@deck.gl/react": "^8.1.8",
"@loaders.gl/core": "^2.2.0-alpha.1",
"@loaders.gl/draco": "^2.2.0-alpha.1",
"@loaders.gl/gltf": "^2.2.0-alpha.1",
"@loaders.gl/i3s": "^2.1.0-alpha.1",
"@luma.gl/constants": "^8.1.2",
"@luma.gl/core": "^8.1.2",
Expand Down
16 changes: 8 additions & 8 deletions examples/deck.gl/pointcloud/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@deck.gl/react": "^8.1.4",
"@deck.gl/core": "^8.1.4",
"@deck.gl/layers": "^8.1.4",
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/draco": "^2.1.3",
"@loaders.gl/las": "^2.1.3",
"@loaders.gl/obj": "^2.1.3",
"@loaders.gl/pcd": "^2.1.3",
"@deck.gl/react": "^8.1.8",
"@deck.gl/core": "^8.1.8",
"@deck.gl/layers": "^8.1.8",
"@loaders.gl/core": "^2.2.0-alpha.1",
"@loaders.gl/draco": "^2.2.0-alpha.1",
"@loaders.gl/las": "^2.2.0-alpha.1",
"@loaders.gl/obj": "^2.2.0-alpha.1",
"@loaders.gl/pcd": "^2.2.0-alpha.1",
"@loaders.gl/ply": "^2.1.1",
"prop-types": "^15.7.2",
"react": "^16.3.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/get-started/get-started-rollup/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"serve": "serve public"
},
"dependencies": {
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/obj": "^2.1.3"
"@loaders.gl/core": "^2.2.0-alpha.1",
"@loaders.gl/obj": "^2.2.0-alpha.1"
},
"devDependencies": {
"rollup": "^1.16.2",
Expand Down
4 changes: 2 additions & 2 deletions examples/get-started/get-started-webpack/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"start": "webpack-dev-server --progress --hot --open -d"
},
"dependencies": {
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/obj": "^2.1.3"
"@loaders.gl/core": "^2.2.0-alpha.1",
"@loaders.gl/obj": "^2.2.0-alpha.1"
},
"devDependencies": {
"html-webpack-plugin": "^3.2.0",
Expand Down
6 changes: 3 additions & 3 deletions examples/luma.gl/gltf/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"open-vr": "adb reverse tcp:8080 tcp:8080 && adb shell am start -a android.intent.action.VIEW -d http://localhost:8080/"
},
"dependencies": {
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/draco": "^2.1.3",
"@loaders.gl/gltf": "^2.1.3",
"@loaders.gl/core": "^2.2.0-alpha.1",
"@loaders.gl/draco": "^2.2.0-alpha.1",
"@loaders.gl/gltf": "^2.2.0-alpha.1",
"@luma.gl/constants": "^8.1.2",
"@luma.gl/core": "^8.1.2",
"@luma.gl/experimental": "^8.1.2",
Expand Down
6 changes: 3 additions & 3 deletions examples/three.js/3d-tiles/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/3d-tiles": "^2.1.3",
"@loaders.gl/draco": "^2.1.3",
"@loaders.gl/core": "^2.2.0-alpha.1",
"@loaders.gl/3d-tiles": "^2.2.0-alpha.1",
"@loaders.gl/draco": "^2.2.0-alpha.1",
"@math.gl/culling": "^3.1.3",
"mapbox-gl": "^1.1.1",
"three": "^0.106.2"
Expand Down
10 changes: 5 additions & 5 deletions modules/3d-tiles/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
"build-bundle": "webpack --display=minimal --config ../../scripts/bundle.config.js"
},
"dependencies": {
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/gltf": "^2.1.3",
"@loaders.gl/loader-utils": "^2.1.3",
"@loaders.gl/math": "^2.1.3",
"@loaders.gl/tiles": "^2.1.3",
"@loaders.gl/core": "^2.2.0-alpha.1",
"@loaders.gl/gltf": "^2.2.0-alpha.1",
"@loaders.gl/loader-utils": "^2.2.0-alpha.1",
"@loaders.gl/math": "^2.2.0-alpha.1",
"@loaders.gl/tiles": "^2.2.0-alpha.1",
"@math.gl/core": "^3.1.3",
"@math.gl/geospatial": "^3.1.3",
"@probe.gl/stats": "^3.2.1"
Expand Down
6 changes: 3 additions & 3 deletions modules/arrow/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
"build-worker": "webpack --entry ./src/arrow-loader.worker.js --output ./dist/arrow-loader.worker.js --config ../../scripts/worker-webpack-config.js"
},
"dependencies": {
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/loader-utils": "^2.1.3",
"@loaders.gl/tables": "^2.1.3",
"@loaders.gl/core": "^2.2.0-alpha.1",
"@loaders.gl/loader-utils": "^2.2.0-alpha.1",
"@loaders.gl/tables": "^2.2.0-alpha.1",
"apache-arrow": "^0.17.0"
}
}
4 changes: 2 additions & 2 deletions modules/basis/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"build-worker": "webpack --entry ./src/workers/basis-loader.worker.js --output ./dist/basis-loader.worker.js --config ../../scripts/worker-webpack-config.js"
},
"dependencies": {
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/loader-utils": "^2.1.3"
"@loaders.gl/core": "^2.2.0-alpha.1",
"@loaders.gl/loader-utils": "^2.2.0-alpha.1"
}
}
2 changes: 1 addition & 1 deletion modules/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@
},
"dependencies": {
"@babel/runtime": "^7.3.1",
"@loaders.gl/loader-utils": "^2.1.3"
"@loaders.gl/loader-utils": "^2.2.0-alpha.1"
}
}
4 changes: 2 additions & 2 deletions modules/csv/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"build-bundle": "webpack --display=minimal --config ../../scripts/bundle.config.js"
},
"dependencies": {
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/tables": "^2.1.3"
"@loaders.gl/core": "^2.2.0-alpha.1",
"@loaders.gl/tables": "^2.2.0-alpha.1"
},
"devDependencies": {
"d3-dsv": "^1.2.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/draco/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"dependencies": {
"@babel/runtime": "^7.3.1",
"@loaders.gl/loader-utils": "^2.1.3",
"@loaders.gl/loader-utils": "^2.2.0-alpha.1",
"draco3d": "^1.3.4"
}
}
2 changes: 1 addition & 1 deletion modules/gis/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"README.md"
],
"dependencies": {
"@loaders.gl/loader-utils": "^2.1.3",
"@loaders.gl/loader-utils": "^2.2.0-alpha.1",
"@mapbox/vector-tile": "^1.3.1",
"pbf": "^3.2.1"
}
Expand Down
6 changes: 3 additions & 3 deletions modules/gltf/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"build-bin": "BABEL_ENV=es5 babel scripts --config-file ../../babel.config.js --out-dir dist/scripts"
},
"dependencies": {
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/images": "^2.1.3",
"@loaders.gl/loader-utils": "^2.1.3"
"@loaders.gl/core": "^2.2.0-alpha.1",
"@loaders.gl/images": "^2.2.0-alpha.1",
"@loaders.gl/loader-utils": "^2.2.0-alpha.1"
}
}
8 changes: 4 additions & 4 deletions modules/i3s/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"build-bundle": "webpack --display=minimal --config ../../scripts/bundle.config.js"
},
"dependencies": {
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/images": "^2.1.3",
"@loaders.gl/loader-utils": "^2.1.3",
"@loaders.gl/tiles": "^2.1.3",
"@loaders.gl/core": "^2.2.0-alpha.1",
"@loaders.gl/images": "^2.2.0-alpha.1",
"@loaders.gl/loader-utils": "^2.2.0-alpha.1",
"@loaders.gl/tiles": "^2.2.0-alpha.1",
"@luma.gl/constants": "^8.1.2",
"@math.gl/core": "^3.1.3",
"@math.gl/geospatial": "^3.1.3",
Expand Down
2 changes: 1 addition & 1 deletion modules/images/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
"build-worker": "webpack --entry ./src/image-loader.worker.js --output ./dist/image-loader.worker.js --config ../../scripts/worker-webpack-config.js"
},
"dependencies": {
"@loaders.gl/loader-utils": "^2.1.3"
"@loaders.gl/loader-utils": "^2.2.0-alpha.1"
}
}
4 changes: 2 additions & 2 deletions modules/json/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"build-worker": "webpack --entry ./src/geojson-loader.worker.js --output ./dist/geojson-loader.worker.js --config ../../scripts/worker-webpack-config.js"
},
"dependencies": {
"@loaders.gl/loader-utils": "^2.1.3",
"@loaders.gl/tables": "^2.1.3"
"@loaders.gl/loader-utils": "^2.2.0-alpha.1",
"@loaders.gl/tables": "^2.2.0-alpha.1"
}
}
4 changes: 2 additions & 2 deletions modules/kml/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"build-bundle": "webpack --display=minimal --config ../../scripts/bundle.config.js"
},
"dependencies": {
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/tables": "^2.1.3"
"@loaders.gl/core": "^2.2.0-alpha.1",
"@loaders.gl/tables": "^2.2.0-alpha.1"
}
}
2 changes: 1 addition & 1 deletion modules/las/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@
},
"dependencies": {
"@babel/runtime": "^7.3.1",
"@loaders.gl/loader-utils": "^2.1.3"
"@loaders.gl/loader-utils": "^2.2.0-alpha.1"
}
}
4 changes: 2 additions & 2 deletions modules/math/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"pre-build": "echo \"Nothing to build in @loaders.gl/math\""
},
"dependencies": {
"@loaders.gl/images": "^2.1.3",
"@loaders.gl/loader-utils": "^2.1.3",
"@loaders.gl/images": "^2.2.0-alpha.1",
"@loaders.gl/loader-utils": "^2.2.0-alpha.1",
"math.gl": "^3.1.3"
}
}
2 changes: 1 addition & 1 deletion modules/mvt/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"build-bundle": "webpack --display=minimal --config ../../scripts/bundle.config.js"
},
"dependencies": {
"@loaders.gl/loader-utils": "^2.1.3",
"@loaders.gl/loader-utils": "^2.2.0-alpha.1",
"@mapbox/vector-tile": "^1.3.1",
"pbf": "^3.2.1"
}
Expand Down
2 changes: 1 addition & 1 deletion modules/obj/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
},
"dependencies": {
"@babel/runtime": "^7.3.1",
"@loaders.gl/loader-utils": "^2.1.3"
"@loaders.gl/loader-utils": "^2.2.0-alpha.1"
}
}
2 changes: 1 addition & 1 deletion modules/pcd/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
"build-worker": "webpack --entry ./src/pcd-loader.worker.js --output ./dist/pcd-loader.worker.js --config ../../scripts/worker-webpack-config.js"
},
"dependencies": {
"@loaders.gl/loader-utils": "^2.1.3"
"@loaders.gl/loader-utils": "^2.2.0-alpha.1"
}
}
4 changes: 2 additions & 2 deletions modules/ply/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"dependencies": {
"@babel/runtime": "^7.3.1",
"@loaders.gl/core": "^2.1.3",
"@loaders.gl/loader-utils": "^2.1.3"
"@loaders.gl/core": "^2.2.0-alpha.1",
"@loaders.gl/loader-utils": "^2.2.0-alpha.1"
}
}
2 changes: 1 addition & 1 deletion modules/potree/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"build-bundle": "webpack --display=minimal --config ../../scripts/bundle.config.js"
},
"dependencies": {
"@loaders.gl/math": "^2.1.3",
"@loaders.gl/math": "^2.2.0-alpha.1",
"math.gl": "^3.1.3"
}
}
2 changes: 1 addition & 1 deletion modules/tables/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
"build-bundle": "webpack --display=minimal --config ../../scripts/bundle.config.js"
},
"dependencies": {
"@loaders.gl/core": "^2.1.3"
"@loaders.gl/core": "^2.2.0-alpha.1"
}
}
2 changes: 1 addition & 1 deletion modules/terrain/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"dependencies": {
"@babel/runtime": "^7.3.1",
"@loaders.gl/loader-utils": "^2.1.3",
"@loaders.gl/loader-utils": "^2.2.0-alpha.1",
"@mapbox/martini": "^0.2.0"
}
}
Loading

0 comments on commit 108f647

Please sign in to comment.