Merge 51ea759 into f2bc050

.eslintrc.cjs

@@ -17,7 +17,6 @@ module.exports = getESLintConfig({
 
     rules: {
       'no-unused-expressions': 'warn',
-      'import/no-unresolved': 1,
       'no-console': 1,
       'no-continue': ['warn'],
       'callback-return': 0,
@@ -52,8 +51,8 @@ module.exports = getESLintConfig({
 
           'consistent-return': 0, // We use typescript noImplicitReturn
           'default-case': 0, // We rely on typescript
-          'import/no-unresolved': 0,
-          'import/no-extraneous-dependencies': 0,
+          'import/no-unresolved': 'error',
+          'import/no-extraneous-dependencies': 'error',
           'no-unused-expressions': 'warn',
           '@typescript-eslint/no-empty-function': 0,
           '@typescript-eslint/no-misused-promises': 0,
@@ -71,9 +70,6 @@ module.exports = getESLintConfig({
             'warn',
             {vars: 'all', args: 'none', ignoreRestSiblings: false}
           ],
-          // We still have some issues with import resolution
-          'import/named': 0,
-          // 'import/no-extraneous-dependencies': ['warn'],
           // Warn instead of error
           // 'max-params': ['warn'],
           // 'no-undef': ['warn'],
@@ -99,7 +95,7 @@ module.exports = getESLintConfig({
       // This means lint will not find the imported files and generate false warnings
       {
         // scripts use devDependencies
-        files: ['**/test/**/*.js', '**/scripts/**/*.js', '*.config.js', '*.config.local.js'],
+        files: ['**/test/**/*.ts', '**/test/**/*.js', '**/scripts/**/*.js', '*.config.ts', '*.config.js', '*.config.local.js'],
         rules: {
           'import/no-unresolved': 0,
           'import/no-extraneous-dependencies': 0

CHANGELOG.md

@@ -16,7 +16,7 @@
 - feat(shadertools): ShaderAssembler support single compute/unified shader (#1980)
 - chore(webgpu): Improve ComputePipeline implementation, add tests (#1979)
 
-### v9.0.0-beta.6
+### v9.0.0-beta.7
 
 - feat: Add QuerySet resource (#1975)
 - chore(engine): Restore tests for Model class (#1973)

examples/portable/rotating-cube/package.json

@@ -11,7 +11,8 @@
     "@luma.gl/core": "9.0.0-beta.7",
     "@luma.gl/engine": "9.0.0-beta.7",
     "@luma.gl/shadertools": "9.0.0-beta.7",
-    "@luma.gl/webgpu": "9.0.0-beta.7"
+    "@luma.gl/webgpu": "9.0.0-beta.7",
+    "@math.gl/core": "^4.0.0"
   },
   "devDependencies": {
     "typescript": "^5.3.0",

examples/script/webgl/transform-feedback/package.json

@@ -8,8 +8,9 @@
     "serve": "vite preview"
   },
   "dependencies": {
-    "@luma.gl/engine": "9.0.0-alpha.54",
-    "@luma.gl/webgl": "9.0.0-alpha.54"
+    "@luma.gl/core": "9.0.0-beta.7",
+    "@luma.gl/engine": "9.0.0-beta.7",
+    "@luma.gl/webgl": "9.0.0-beta.7"
   },
   "devDependencies": {
     "typescript": "^5.1.6",

examples/tutorials/hello-gltf/package.json

@@ -8,12 +8,15 @@
     "serve": "vite preview"
   },
   "dependencies": {
+    "@loaders.gl/core": "^4.0.4",
     "@loaders.gl/gltf": "^4.0.4",
     "@luma.gl/core": "9.0.0-beta.7",
     "@luma.gl/engine": "9.0.0-beta.7",
+    "@luma.gl/gltf": "9.0.0-beta.7",
     "@luma.gl/shadertools": "9.0.0-beta.7",
     "@luma.gl/webgl": "9.0.0-beta.7",
-    "@luma.gl/webgpu": "9.0.0-beta.7"
+    "@luma.gl/webgpu": "9.0.0-beta.7",
+    "@math.gl/core": "^4.0.0"
   },
   "devDependencies": {
     "typescript": "^5.3.0",

examples/webgpu/computeboids/app.ts

@@ -3,8 +3,8 @@
 // @ts-nocheck
 /* eslint-disable no-console */
 
-import updateSprites from './update-sprites.wgsl?raw';
-import sprites from './sprites.wgsl?raw';
+import updateSprites from './update-sprites.wgsl?raw'; // eslint-disable-line
+import sprites from './sprites.wgsl?raw'; // eslint-disable-line
 import {Buffer} from '@luma.gl/core';
 // import { RenderPipelineParameters} from '@luma.gl/core';
 import {Model, WebGPUDevice} from '@luma.gl/webgpu';

modules/core/package.json

@@ -40,6 +40,10 @@
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "dependencies": {
+    "@math.gl/types": "^4.0.0",
+    "@probe.gl/env": "^4.0.2",
+    "@probe.gl/log": "^4.0.2",
+    "@probe.gl/stats": "^4.0.2",
     "@types/offscreencanvas": "^2019.6.4"
   },
   "gitHead": "c636c34b8f1581eed163e94543a8eb1f4382ba8e"

modules/engine/package.json

@@ -40,10 +40,10 @@
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {
-    "@luma.gl/core": "^9.0.0-beta.4",
-    "@luma.gl/shadertools": "^9.0.0-beta.4"
+    "@luma.gl/core": "^9.0.0-beta"
   },
   "dependencies": {
+    "@luma.gl/shadertools": "9.0.0-beta.7",
     "@math.gl/core": "^4.0.0",
     "@probe.gl/log": "^4.0.2",
     "@probe.gl/stats": "^4.0.2"

modules/engine/src/debug/copy-texture-to-image.ts

@@ -3,7 +3,6 @@
 // Copyright (c) vis.gl contributors
 
 import {Texture, Framebuffer} from '@luma.gl/core';
-import {GL} from '@luma.gl/constants';
 import {flipRows, scalePixels} from './pixel-data-utils';
 
 /**
@@ -44,10 +43,7 @@ export function copyTextureToDataUrl(
   source: Texture | Framebuffer,
   options: CopyTextureToImageOptions = {}
 ): string {
-  const {
-    sourceAttachment = GL.COLOR_ATTACHMENT0, // TODO - support gl.readBuffer
-    targetMaxHeight = Number.MAX_SAFE_INTEGER
-  } = options;
+  const {sourceAttachment, targetMaxHeight = Number.MAX_SAFE_INTEGER} = options;
 
   let data = source.device.readPixelsToArrayWebGL(source, {sourceAttachment});
 

modules/engine/src/index.ts

@@ -35,7 +35,7 @@ export type {ModelNodeProps} from './scenegraph/model-node';
 export {ModelNode} from './scenegraph/model-node';
 
 // Geometries
-export type {GeometryProps} from './geometry/geometry';
+export type {GeometryProps, GeometryAttribute} from './geometry/geometry';
 export {Geometry} from './geometry/geometry';
 export type {GPUGeometryProps} from './geometry/gpu-geometry';
 export {GPUGeometry} from './geometry/gpu-geometry';

modules/gltf/package.json

@@ -40,18 +40,13 @@
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {
-    "@luma.gl/core": "^9.0.0-beta.4",
-    "@luma.gl/engine": "^9.0.0-beta.4",
-    "@luma.gl/shadertools": "^9.0.0-beta.4",
-    "@luma.gl/webgl": "^9.0.0-beta.4"
+    "@luma.gl/core": "^9.0.0-beta",
+    "@luma.gl/engine": "^9.0.0-beta"
   },
   "dependencies": {
-    "@math.gl/core": "4.0.0"
-  },
-  "devDependencies": {
-    "@loaders.gl/gltf": "^4.0.4",
-    "@loaders.gl/math": "^4.0.4",
-    "@luma.gl/test-utils": "9.0.0-beta.7"
+    "@loaders.gl/textures": "^4.1.0",
+    "@luma.gl/shadertools": "9.0.0-beta.7",
+    "@math.gl/core": "^4.0.0"
   },
   "gitHead": "c636c34b8f1581eed163e94543a8eb1f4382ba8e"
 }

modules/gltf/src/gltf/gltf-instantiator.ts

@@ -1,7 +1,5 @@
 import {Device, Buffer, PrimitiveTopology} from '@luma.gl/core';
-import {Geometry, GroupNode, ModelNode, ModelProps} from '@luma.gl/engine';
-import {GeometryAttribute} from '@luma.gl/engine/geometry/geometry';
-import {WebGLDevice} from '@luma.gl/webgl';
+import {Geometry, GeometryAttribute, GroupNode, ModelNode, ModelProps} from '@luma.gl/engine';
 import {Matrix4} from '@math.gl/core';
 
 import {GLTFAnimator} from './gltf-animator';
@@ -29,13 +27,12 @@ const DEFAULT_OPTIONS: GLTFInstantiatorOptions = {
  * Walks the parsed and resolved glTF structure and builds a luma.gl scenegraph
  */
 export class GLTFInstantiator {
-  // TODO - replace with Device
-  device: WebGLDevice;
+  device: Device;
   options: GLTFInstantiatorOptions;
   gltf: any;
 
   constructor(device: Device, options: GLTFInstantiatorOptions = {}) {
-    this.device = device as WebGLDevice;
+    this.device = device;
     this.options = {...DEFAULT_OPTIONS, ...options};
   }
 

modules/shadertools/package.json

@@ -46,7 +46,7 @@
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {
-    "@luma.gl/core": "^9.0.0-beta.4"
+    "@luma.gl/core": "^9.0.0-beta"
   },
   "dependencies": {
     "@math.gl/core": "^4.0.0",

modules/shadertools/src/modules-webgl1/lighting/dirlight/dirlight.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {ShaderModule} from '@luma.gl/shadertools/lib/shader-module/shader-module';
+import {ShaderModule} from '../../../lib/shader-module/shader-module';
 import {glsl} from '../../../lib/glsl-utils/highlight';
 import type {NumberArray} from '../../../types';
 import {project} from '../../project/project';

modules/test-utils/package.json

@@ -36,20 +36,15 @@
     "pre-build": "echo test utils has no bundle"
   },
   "peerDependencies": {
-    "@luma.gl/core": "^9.0.0-beta.4",
-    "@luma.gl/engine": "^9.0.0-beta.4",
-    "@luma.gl/shadertools": "^9.0.0-beta.4",
-    "@luma.gl/webgl": "^9.0.0-beta.4",
-    "@luma.gl/webgpu": "^9.0.0-beta.4"
-  },
-  "devDependencies": {
-    "@luma.gl/core": "9.0.0-beta.7",
-    "@luma.gl/engine": "9.0.0-beta.7",
-    "@luma.gl/webgl": "9.0.0-beta.7",
-    "@luma.gl/webgpu": "9.0.0-beta.7"
+    "@luma.gl/core": "^9.0.0-beta",
+    "@luma.gl/engine": "^9.0.0-beta",
+    "@luma.gl/shadertools": "^9.0.0-beta",
+    "@luma.gl/webgl": "^9.0.0-beta",
+    "@luma.gl/webgpu": "^9.0.0-beta"
   },
   "dependencies": {
-    "@probe.gl/env": "^4.0.2"
+    "@probe.gl/env": "^4.0.2",
+    "@probe.gl/stats": "^4.0.2"
   },
   "gitHead": "c636c34b8f1581eed163e94543a8eb1f4382ba8e"
 }

modules/webgl/package.json

@@ -40,11 +40,10 @@
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {
-    "@luma.gl/constants": "^9.0.0-beta.4"
+    "@luma.gl/core": "^9.0.0-beta"
   },
   "dependencies": {
     "@luma.gl/constants": "9.0.0-beta.7",
-    "@luma.gl/core": "9.0.0-beta.7",
     "@probe.gl/env": "^4.0.2"
   },
   "gitHead": "c636c34b8f1581eed163e94543a8eb1f4382ba8e"

modules/webgpu/package.json

@@ -37,7 +37,7 @@
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {
-    "@luma.gl/core": "^9.0.0-beta.4"
+    "@luma.gl/core": "^9.0.0-beta"
   },
   "dependencies": {
     "@probe.gl/env": "^4.0.2",

package.json

@@ -41,9 +41,9 @@
     "metrics": "./scripts/metrics.sh && ocular-metrics"
   },
   "devDependencies": {
-    "@loaders.gl/core": "4.0.0-beta.7",
-    "@loaders.gl/gltf": "4.0.0-beta.7",
-    "@loaders.gl/polyfills": "4.0.0-beta.7",
+    "@loaders.gl/core": "^4.1.0",
+    "@loaders.gl/gltf": "^4.1.0",
+    "@loaders.gl/polyfills": "^4.1.0",
     "@probe.gl/bench": "^4.0.2",
     "@probe.gl/stats": "^4.0.2",
     "@probe.gl/stats-widget": "^4.0.2",