Merge fc6d8bf into a9fe9c6

.eslintrc.js

@@ -20,7 +20,7 @@ module.exports = {
     // This means lint will not find the imported files and generate false warnings
     {
       // scripts use devDependencies
-      files: ['**/test/**/*.js', 'scripts/**/*.js'],
+      files: ['**/test/**/*.js', '**/scripts/**/*.js', '*.config.js', '*.config.local.js'],
       rules: {
         'import/no-unresolved': 0,
         'import/no-extraneous-dependencies': 0

examples/babel.config.local.js

@@ -1,3 +1,4 @@
+/* eslint-disable */
 const getBabelConfig = require('ocular-dev-tools/config/babel.config');
 
 module.exports = api => {

examples/basis/package.json

@@ -6,8 +6,8 @@
     "start-local": "webpack-dev-server --env.local --progress --hot --open"
   },
   "dependencies": {
-    "@loaders.gl/basis": "^2.1.0-alpha.1",
-    "@loaders.gl/core": "^2.1.0-alpha.1"
+    "@loaders.gl/basis": "^2.1.0-beta.2",
+    "@loaders.gl/core": "^2.1.0-beta.2"
   },
   "devDependencies": {
     "babel-plugin-inline-import": "^3.0.0",

examples/cesium/3d-tiles/package.json

@@ -6,9 +6,9 @@
     "start-local": "webpack-dev-server --env.local --env.esnext --progress --hot --open"
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "^2.1.0-alpha.1",
-    "@loaders.gl/core": "^2.1.0-alpha.1",
-    "@loaders.gl/draco": "^2.1.0-alpha.1",
+    "@loaders.gl/3d-tiles": "^2.1.0-beta.2",
+    "@loaders.gl/core": "^2.1.0-beta.2",
+    "@loaders.gl/draco": "^2.1.0-beta.2",
     "@math.gl/culling": "^3.1.2",
     "math.gl": "^3.1.2"
   },

examples/deck.gl/3d-tiles/app.js

@@ -2,13 +2,11 @@
 import React, {PureComponent} from 'react';
 import {render} from 'react-dom';
 import {StaticMap} from 'react-map-gl';
+
+import {lumaStats} from '@luma.gl/core';
 import DeckGL from '@deck.gl/react';
 import {MapController, FlyToInterpolator} from '@deck.gl/core';
-// import {Tile3DLayer} from '@deck.gl/geo-layers';
-// TODO bring back to deck.gl
-// remove after deck.gl release a new version of tile-3d-layer
-import Tile3DLayer from './tile-3d-layer';
-import {lumaStats} from '@luma.gl/core';
+import {Tile3DLayer} from '@deck.gl/geo-layers';
 import {StatsWidget} from '@probe.gl/stats-widget';
 
 // To manage dependencies and bundle size, the app must decide which supporting loaders to bring in

examples/deck.gl/3d-tiles/components/control-panel.js

@@ -133,7 +133,10 @@ export default class ControlPanel extends PureComponent {
       return null;
     }
 
-    const {description, credits: {attributions}} = this.props.tileset || {};
+    const {
+      description,
+      credits: {attributions}
+    } = this.props.tileset || {};
     if (!attributions || attributions.length === 0 || !description) {
       return null;
     }

examples/deck.gl/3d-tiles/package.json

@@ -14,9 +14,11 @@
     "@deck.gl/layers": "^8.1.0-beta.3",
     "@deck.gl/mesh-layers": "^8.1.0-beta.3",
     "@deck.gl/react": "^8.1.0-beta.3",
-    "@loaders.gl/core": "^2.1.0-alpha.1",
-    "@loaders.gl/draco": "^2.1.0-alpha.1",
-    "@loaders.gl/gltf": "^2.1.0-alpha.1",
+    "@loaders.gl/3d-tiles": "^2.1.0-beta.2",
+    "@loaders.gl/core": "^2.1.0-beta.2",
+    "@loaders.gl/draco": "^2.1.0-beta.2",
+    "@loaders.gl/gltf": "^2.1.0-beta.2",
+    "@luma.gl/core": "^8.1.0-beta.4",
     "@probe.gl/stats-widget": "^3.2.0",
     "marked": "^0.7.0",
     "probe.gl": "^3.2.0",

examples/deck.gl/gltf/package.json

@@ -8,9 +8,10 @@
     "@deck.gl/core": "^8.1.0-beta.3",
     "@deck.gl/mesh-layers": "^8.1.0-beta.3",
     "@deck.gl/react": "^8.1.0-beta.3",
-    "@loaders.gl/core": "^2.1.0-alpha.1",
-    "@loaders.gl/gltf": "^2.1.0-alpha.1",
-    "@loaders.gl/draco": "^2.1.0-alpha.1",
+    "@loaders.gl/core": "^2.1.0-beta.2",
+    "@loaders.gl/gltf": "^2.1.0-beta.2",
+    "@loaders.gl/draco": "^2.1.0-beta.2",
+    "@luma.gl/constants": "^8.1.0-beta.4",
     "react": "^16.8.0",
     "react-dom": "^16.8.0",
     "react-map-gl": "^5.0.0"