chore: Bump to luma.gl@9-alpha.13. Remove imports of /core and /const…

…ants. (#7539)
visgl · Jan 5, 2023 · f7362c9 · f7362c9
1 parent 861ed96
commit f7362c9
Show file tree

Hide file tree

Showing 109 changed files with 213 additions and 246 deletions.
diff --git a/examples/experimental/bezier/index.html b/examples/experimental/bezier/index.html
@@ -11,5 +11,5 @@
 <body>
 <div id="app"></div>
 </body>
-<script type="module" src="src/app.jsx"></script>
+<script type="module" src="src/app.tsx"></script>
 </html>
diff --git a/examples/experimental/bezier/src/app.jsx → examples/experimental/bezier/src/app.tsx b/examples/experimental/bezier/src/app.jsx → examples/experimental/bezier/src/app.tsx
diff --git a/examples/experimental/bezier/src/bezier-curve-layer/bezier-curve-layer.js b/examples/experimental/bezier/src/bezier-curve-layer/bezier-curve-layer.js
@@ -19,8 +19,7 @@
 // THE SOFTWARE.
 
 import {Layer, fp64LowPart, picking} from '@deck.gl/core';
-import GL from '@luma.gl/constants';
-import {Model, Geometry} from '@luma.gl/core';
+import {GL, Model, Geometry} from '@luma.gl/webgl-legacy';
 
 import vs from './bezier-curve-layer-vertex.glsl';
 import fs from './bezier-curve-layer-fragment.glsl';

diff --git a/...rimental/bezier/src/bezier-graph-layer.js → ...rimental/bezier/src/bezier-graph-layer.ts b/...rimental/bezier/src/bezier-graph-layer.js → ...rimental/bezier/src/bezier-graph-layer.ts
diff --git a/examples/experimental/h3-grid/index.html b/examples/experimental/h3-grid/index.html
@@ -11,5 +11,5 @@
 <body>
 <div id="app"></div>
 </body>
-<script type="module" src="src/app.jsx"></script>
+<script type="module" src="src/app.tsx"></script>
 </html>
diff --git a/examples/experimental/h3-grid/src/app.jsx → examples/experimental/h3-grid/src/app.tsx b/examples/experimental/h3-grid/src/app.jsx → examples/experimental/h3-grid/src/app.tsx
diff --git a/...experimental/h3-grid/src/h3-grid-layer.js → ...experimental/h3-grid/src/h3-grid-layer.ts b/...experimental/h3-grid/src/h3-grid-layer.js → ...experimental/h3-grid/src/h3-grid-layer.ts
diff --git a/...ples/experimental/h3-grid/src/h3-utils.js → ...ples/experimental/h3-grid/src/h3-utils.ts b/...ples/experimental/h3-grid/src/h3-utils.js → ...ples/experimental/h3-grid/src/h3-utils.ts
diff --git a/...es/experimental/interleaved-buffer/app.js → ...es/experimental/interleaved-buffer/app.ts b/...es/experimental/interleaved-buffer/app.js → ...es/experimental/interleaved-buffer/app.ts
diff --git a/...s/experimental/interleaved-buffer/data.js → ...s/experimental/interleaved-buffer/data.ts b/...s/experimental/interleaved-buffer/data.js → ...s/experimental/interleaved-buffer/data.ts
diff --git a/examples/experimental/interleaved-buffer/index.html b/examples/experimental/interleaved-buffer/index.html
@@ -11,5 +11,5 @@
 <body>
 <div id="app"></div>
 </body>
-<script type="module" src="./app.js"></script>
+<script type="module" src="./app.ts"></script>
 </html>
diff --git a/examples/layer-browser/package.json b/examples/layer-browser/package.json
@@ -9,8 +9,8 @@
   "dependencies": {
     "@loaders.gl/ply": "^3.2.10",
     "@loaders.gl/gltf": "^3.2.10",
-    "@luma.gl/experimental": "9.0.0-alpha.12",
-    "@luma.gl/debug": "9.0.0-alpha.12",
+    "@luma.gl/experimental": "9.0.0-alpha.13",
+    "@luma.gl/debug": "9.0.0-alpha.13",
     "colorbrewer": "^1.0.0",
     "d3-request": "^1.0.6",
     "d3-scale": "^3.1.0",

diff --git a/examples/playground/package.json b/examples/playground/package.json
@@ -14,7 +14,7 @@
     "@loaders.gl/csv": "^3.2.10",
     "@loaders.gl/draco": "^3.2.10",
     "@loaders.gl/gltf": "^3.2.10",
-    "@luma.gl/constants": "9.0.0-alpha.12",
+    "@luma.gl/webgl-legacy": "9.0.0-alpha.13",
     "brace": "^0.11.1",
     "deck.gl": "^8.8.0",
     "react": "~16.9.0",

diff --git a/examples/website/360-video/app.tsx b/examples/website/360-video/app.tsx
@@ -4,7 +4,7 @@ import {render} from 'react-dom';
 import DeckGL from '@deck.gl/react';
 import {FirstPersonView, COORDINATE_SYSTEM} from '@deck.gl/core';
 import {SimpleMeshLayer} from '@deck.gl/mesh-layers';
-import {SphereGeometry} from '@luma.gl/core';
+import {SphereGeometry} from '@luma.gl/engine';
 
 // Video created by the NASA Jet Propulsion Laboratory, Public domain, via Wikimedia Commons
 const VIDEO_URL =

diff --git a/modules/aggregation-layers/package.json b/modules/aggregation-layers/package.json
@@ -30,16 +30,15 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
   },
   "dependencies": {
-    "@luma.gl/constants": "9.0.0-alpha.12",
-    "@luma.gl/shadertools": "9.0.0-alpha.12",
+    "@luma.gl/constants": "9.0.0-alpha.13",
+    "@luma.gl/shadertools": "9.0.0-alpha.13",
     "@math.gl/web-mercator": "^4.0.0-alpha.1",
     "d3-hexbin": "^0.2.1"
   },
   "peerDependencies": {
     "@deck.gl/core": "^8.0.0",
     "@deck.gl/layers": "^8.0.0",
     "@luma.gl/api": "^9.0.0-alpha",
-    "@luma.gl/core": "^9.0.0-alpha",
     "@luma.gl/engine": "^9.0.0-alpha",
     "@luma.gl/webgl-legacy": "^9.0.0-alpha"
   },

diff --git a/modules/aggregation-layers/src/contour-layer/contour-layer.ts b/modules/aggregation-layers/src/contour-layer/contour-layer.ts
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import GL from '@luma.gl/constants';
+import {GL} from '@luma.gl/webgl-legacy';
 import {LineLayer, SolidPolygonLayer} from '@deck.gl/layers';
 import {generateContours} from './contour-utils';
 import {

diff --git a/modules/aggregation-layers/src/cpu-grid-layer/cpu-grid-layer.ts b/modules/aggregation-layers/src/cpu-grid-layer/cpu-grid-layer.ts
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import GL from '@luma.gl/constants';
+import {GL} from '@luma.gl/webgl-legacy';
 import {GridCellLayer} from '@deck.gl/layers';
 import {Accessor, AccessorFunction, Color, Position, Material, DefaultProps} from '@deck.gl/core';
 

diff --git a/modules/aggregation-layers/src/gpu-grid-layer/gpu-grid-cell-layer.ts b/modules/aggregation-layers/src/gpu-grid-layer/gpu-grid-cell-layer.ts
@@ -27,10 +27,9 @@ import {
   LayerProps,
   DefaultProps
 } from '@deck.gl/core';
-import GL from '@luma.gl/constants';
 import {CubeGeometry} from '@luma.gl/engine';
 import {fp64arithmetic} from '@luma.gl/shadertools';
-import {Model, Buffer} from '@luma.gl/webgl-legacy';
+import {GL, Model, Buffer} from '@luma.gl/webgl-legacy';
 import {defaultColorRange, colorRangeToFlatArray} from '../utils/color-utils';
 import type {_GPUGridLayerProps} from './gpu-grid-layer';
 import vs from './gpu-grid-cell-layer-vertex.glsl';

diff --git a/modules/aggregation-layers/src/gpu-grid-layer/gpu-grid-layer.ts b/modules/aggregation-layers/src/gpu-grid-layer/gpu-grid-layer.ts
@@ -18,8 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import {Buffer} from '@luma.gl/webgl-legacy';
-import GL from '@luma.gl/constants';
+import {GL, Buffer} from '@luma.gl/webgl-legacy';
 import {
   Accessor,
   AccessorFunction,

diff --git a/modules/aggregation-layers/src/grid-aggregation-layer.ts b/modules/aggregation-layers/src/grid-aggregation-layer.ts
@@ -18,11 +18,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import {GL, Buffer} from '@luma.gl/webgl-legacy';
+import {LayerContext, log, UpdateParameters} from '@deck.gl/core';
 import AggregationLayer, {AggregationLayerProps} from './aggregation-layer';
 import GPUGridAggregator from './utils/gpu-grid-aggregation/gpu-grid-aggregator';
-import {Buffer} from '@luma.gl/webgl-legacy';
-import {LayerContext, log, UpdateParameters} from '@deck.gl/core';
-import GL from '@luma.gl/constants';
 import BinSorter from './utils/bin-sorter';
 import {pointToDensityGridDataCPU} from './cpu-grid-layer/grid-aggregator';
 

diff --git a/modules/aggregation-layers/src/heatmap-layer/heatmap-layer-utils.ts b/modules/aggregation-layers/src/heatmap-layer/heatmap-layer-utils.ts
@@ -1,5 +1,5 @@
 import {Device} from '@luma.gl/api';
-import GL from '@luma.gl/constants';
+import {GL} from '@luma.gl/webgl-legacy';
 
 export function getBounds(points: number[][]): number[] {
   // Now build bounding box in world space (aligned to world coordiante system)

diff --git a/modules/aggregation-layers/src/heatmap-layer/heatmap-layer.ts b/modules/aggregation-layers/src/heatmap-layer/heatmap-layer.ts
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 /* global setTimeout clearTimeout */
-import GL from '@luma.gl/constants';
+import {GL} from '@luma.gl/webgl-legacy';
 import {
   getBounds,
   boundsContain,

diff --git a/modules/aggregation-layers/src/heatmap-layer/triangle-layer.ts b/modules/aggregation-layers/src/heatmap-layer/triangle-layer.ts
@@ -19,8 +19,7 @@
 // THE SOFTWARE.
 
 import type {Device} from '@luma.gl/api';
-import GL from '@luma.gl/constants';
-import {Model, Texture2D} from '@luma.gl/webgl-legacy';
+import {GL, Model, Texture2D} from '@luma.gl/webgl-legacy';
 import {Geometry} from '@luma.gl/engine';
 import {Layer, LayerContext, project32} from '@deck.gl/core';
 import vs from './triangle-layer-vertex.glsl';

diff --git a/modules/aggregation-layers/src/hexagon-layer/hexagon-layer.ts b/modules/aggregation-layers/src/hexagon-layer/hexagon-layer.ts
@@ -29,14 +29,14 @@ import {
   DefaultProps
 } from '@deck.gl/core';
 import {ColumnLayer} from '@deck.gl/layers';
+import {GL} from '@luma.gl/webgl-legacy';
 
 import {defaultColorRange} from '../utils/color-utils';
 
 import {pointToHexbin} from './hexagon-aggregator';
 import CPUAggregator from '../utils/cpu-aggregator';
 import AggregationLayer, {AggregationLayerProps} from '../aggregation-layer';
 
-import GL from '@luma.gl/constants';
 import {AggregateAccessor} from '../types';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-function

diff --git a/modules/aggregation-layers/src/screen-grid-layer/screen-grid-cell-layer.ts b/modules/aggregation-layers/src/screen-grid-layer/screen-grid-cell-layer.ts
@@ -19,9 +19,8 @@
 // THE SOFTWARE.
 
 import {Device} from '@luma.gl/api';
-import GL from '@luma.gl/constants';
 import {Geometry} from '@luma.gl/engine';
-import {Model, FEATURES, hasFeatures, Texture2D} from '@luma.gl/webgl-legacy';
+import {GL, Model, FEATURES, hasFeatures, Texture2D} from '@luma.gl/webgl-legacy';
 import {Layer, LayerProps, log, picking, UpdateParameters, DefaultProps} from '@deck.gl/core';
 import {defaultColorRange, colorRangeToFlatArray} from '../utils/color-utils';
 import vs from './screen-grid-layer-vertex.glsl';

diff --git a/modules/aggregation-layers/src/screen-grid-layer/screen-grid-layer.ts b/modules/aggregation-layers/src/screen-grid-layer/screen-grid-layer.ts
@@ -31,8 +31,8 @@ import {
   UpdateParameters,
   DefaultProps
 } from '@deck.gl/core';
-import GL from '@luma.gl/constants';
 import type {Texture2D} from '@luma.gl/webgl-legacy';
+import {GL} from '@luma.gl/webgl-legacy';
 import GPUGridAggregator from '../utils/gpu-grid-aggregation/gpu-grid-aggregator';
 import {AGGREGATION_OPERATION, getValueFunc} from '../utils/aggregation-operation-utils';
 import ScreenGridCellLayer from './screen-grid-cell-layer';

diff --git a/modules/aggregation-layers/src/utils/gpu-grid-aggregation/gpu-grid-aggregator-constants.ts b/modules/aggregation-layers/src/utils/gpu-grid-aggregation/gpu-grid-aggregator-constants.ts
@@ -1,4 +1,4 @@
-import GL from '@luma.gl/constants';
+import {GL} from '@luma.gl/webgl-legacy';
 import {AGGREGATION_OPERATION} from '../aggregation-operation-utils';
 
 export const DEFAULT_RUN_PARAMS = {

diff --git a/modules/aggregation-layers/src/utils/gpu-grid-aggregation/gpu-grid-aggregator.ts b/modules/aggregation-layers/src/utils/gpu-grid-aggregation/gpu-grid-aggregator.ts
@@ -19,8 +19,8 @@
 // THE SOFTWARE.
 
 import type {Device} from '@luma.gl/api';
-import GL from '@luma.gl/constants';
 import {
+  GL,
   Model,
   Transform,
   FEATURES,

diff --git a/modules/aggregation-layers/src/utils/resource-utils.ts b/modules/aggregation-layers/src/utils/resource-utils.ts
@@ -1,6 +1,5 @@
 import {Device} from '@luma.gl/api';
-import GL from '@luma.gl/constants';
-import {Framebuffer, Texture2D} from '@luma.gl/webgl-legacy';
+import {GL, Framebuffer, Texture2D} from '@luma.gl/webgl-legacy';
 
 const DEFAULT_PARAMETERS = {
   [GL.TEXTURE_MAG_FILTER]: GL.NEAREST,

diff --git a/modules/arcgis/package.json b/modules/arcgis/package.json
@@ -32,7 +32,6 @@
   "peerDependencies": {
     "@arcgis/core": "^4.0.0",
     "@deck.gl/core": "^8.0.0",
-    "@luma.gl/core": "^9.0.0-alpha",
     "@luma.gl/webgl-legacy": "^9.0.0-alpha"
   },
   "dependencies": {

diff --git a/modules/arcgis/src/commons.ts b/modules/arcgis/src/commons.ts
@@ -1,15 +1,15 @@
 /* eslint-disable no-invalid-this */
 
 import type {Device} from '@luma.gl/api';
-import GL from '@luma.gl/constants';
-import {Deck} from '@deck.gl/core';
 import {
+  GL,
   Model,
   Buffer,
   Framebuffer,
   instrumentGLContext,
   withParameters
 } from '@luma.gl/webgl-legacy';
+import {Deck} from '@deck.gl/core';
 
 export function initializeResources(device: Device) {
   // @ts-expect-error

diff --git a/modules/carto/package.json b/modules/carto/package.json
@@ -36,7 +36,7 @@
     "@loaders.gl/loader-utils": "^3.2.10",
     "@loaders.gl/mvt": "^3.2.10",
     "@loaders.gl/tiles": "^3.2.10",
-    "@luma.gl/constants": "9.0.0-alpha.12",
+    "@luma.gl/webgl-legacy": "9.0.0-alpha.13",
     "@math.gl/web-mercator": "4.0.0-alpha.1",
     "cartocolor": "^4.0.2",
     "d3-array": "^3.2.0",

diff --git a/modules/carto/src/api/parseMap.ts b/modules/carto/src/api/parseMap.ts
@@ -1,4 +1,5 @@
-import GL from '@luma.gl/constants';
+import {GL} from '@luma.gl/webgl-legacy';
+import {_flatten as flatten, log} from '@deck.gl/core';
 import {
   AGGREGATION,
   getLayer,
@@ -13,7 +14,6 @@ import {
   negateAccessor,
   getMaxMarkerSize
 } from './layer-map';
-import {_flatten as flatten, log} from '@deck.gl/core';
 import {assert} from '../utils';
 import {MapDataset, MapTextSubLayerConfig, VisualChannels} from './types';
 

diff --git a/modules/core/bundle/lumagl.js b/modules/core/bundle/lumagl.js
@@ -1,10 +1,26 @@
 // Cherry-pick luma core exports that are relevant to deck
 export {
   // Core classes
+  Timeline,
+
+  // Geometries
+  Geometry,
+  ConeGeometry,
+  CubeGeometry,
+  CylinderGeometry,
+  IcoSphereGeometry,
+  PlaneGeometry,
+  SphereGeometry,
+  TruncatedConeGeometry
+} from '@luma.gl/engine';
+
+export {
   Model,
   Transform,
-  ProgramManager,
-  Timeline,
+  ProgramManager
+} from '@luma.gl/webgl-legacy';
+
+export { 
   // Context utilities
   instrumentGLContext,
   isWebGL2,
@@ -29,14 +45,5 @@ export {
   TextureCube,
   // WebGL2 classes
   Texture3D,
-  TransformFeedback,
-  // Geometries
-  Geometry,
-  ConeGeometry,
-  CubeGeometry,
-  CylinderGeometry,
-  IcoSphereGeometry,
-  PlaneGeometry,
-  SphereGeometry,
-  TruncatedConeGeometry
-} from '@luma.gl/core';
+  TransformFeedback
+} from '@luma.gl/webgl-legacy';
diff --git a/modules/core/package.json b/modules/core/package.json
@@ -37,14 +37,12 @@
   "dependencies": {
     "@loaders.gl/core": "^3.2.10",
     "@loaders.gl/images": "^3.2.10",
-    "@luma.gl/api": "9.0.0-alpha.12",
-    "@luma.gl/constants": "9.0.0-alpha.12",
-    "@luma.gl/core": "9.0.0-alpha.12",
-    "@luma.gl/gltools": "9.0.0-alpha.12",
-    "@luma.gl/shadertools": "9.0.0-alpha.12",
-    "@luma.gl/webgl": "9.0.0-alpha.12",
-    "@luma.gl/engine": "9.0.0-alpha.12",
-    "@luma.gl/webgl-legacy": "9.0.0-alpha.12",
+    "@luma.gl/api": "9.0.0-alpha.13",
+    "@luma.gl/gltools": "9.0.0-alpha.13",
+    "@luma.gl/shadertools": "9.0.0-alpha.13",
+    "@luma.gl/webgl": "9.0.0-alpha.13",
+    "@luma.gl/engine": "9.0.0-alpha.13",
+    "@luma.gl/webgl-legacy": "9.0.0-alpha.13",
     "@math.gl/core": "4.0.0-alpha.1",
     "@math.gl/sun": "4.0.0-alpha.1",
     "@math.gl/web-mercator": "4.0.0-alpha.1",

diff --git a/modules/core/src/lib/attribute/data-column.ts b/modules/core/src/lib/attribute/data-column.ts
@@ -1,8 +1,8 @@
 /* eslint-disable complexity */
 import type {Device} from '@luma.gl/api';
-import GL from '@luma.gl/constants';
-import {hasFeature, FEATURES, Buffer} from '@luma.gl/webgl-legacy';
 import type {Buffer as LumaBuffer} from '@luma.gl/webgl-legacy';
+import {GL, hasFeature, FEATURES, Buffer} from '@luma.gl/webgl-legacy';
+
 import ShaderAttribute, {IShaderAttribute} from './shader-attribute';
 import {glArrayFromType} from './gl-utils';
 import typedArrayManager from '../../utils/typed-array-manager';

diff --git a/modules/core/src/lib/attribute/gl-utils.ts b/modules/core/src/lib/attribute/gl-utils.ts
@@ -1,4 +1,4 @@
-import GL from '@luma.gl/constants';
+import {GL} from '@luma.gl/webgl-legacy';
 import type {TypedArrayConstructor} from '../../types/types';
 
 /* eslint-disable complexity */

diff --git a/modules/core/src/lib/deck-picker.ts b/modules/core/src/lib/deck-picker.ts
@@ -19,8 +19,7 @@
 // THE SOFTWARE.
 
 import type {Device} from '@luma.gl/api';
-import {Framebuffer, Texture2D, readPixelsToArray} from '@luma.gl/webgl-legacy';
-import GL from '@luma.gl/constants';
+import {GL, Framebuffer, Texture2D, readPixelsToArray} from '@luma.gl/webgl-legacy';
 import PickLayersPass, {PickingColorDecoder} from '../passes/pick-layers-pass';
 import {getClosestObject, getUniqueObjects, PickedPixel} from './picking/query-object';
 import {

diff --git a/modules/core/src/lib/deck.ts b/modules/core/src/lib/deck.ts
@@ -33,10 +33,8 @@ import {VERSION} from './init';
 import {getBrowser} from '@probe.gl/env';
 import {luma, Device, DeviceProps} from '@luma.gl/api';
 import {WebGLDevice} from '@luma.gl/webgl';
-import GL from '@luma.gl/constants';
 import {Timeline} from '@luma.gl/engine';
-import {lumaStats} from '@luma.gl/core';
-import {AnimationLoop, instrumentGLContext, setParameters} from '@luma.gl/webgl-legacy';
+import {GL, AnimationLoop, instrumentGLContext, setParameters} from '@luma.gl/webgl-legacy';
 
 import {Stats} from '@probe.gl/stats';
 import {EventManager} from 'mjolnir.js';
@@ -1167,7 +1165,7 @@ export default class Deck {
     metrics.gpuTimePerFrame = stats.get('GPU Time').getAverageTime();
     metrics.cpuTimePerFrame = stats.get('CPU Time').getAverageTime();
 
-    const memoryStats = lumaStats.get('Memory Usage');
+    const memoryStats = luma.stats.get('Memory Usage');
     metrics.bufferMemory = memoryStats.get('Buffer Memory').count;
     metrics.textureMemory = memoryStats.get('Texture Memory').count;
     metrics.renderbufferMemory = memoryStats.get('Renderbuffer Memory').count;