Skip to content

Commit 4779f89

Browse files
ilan-goldmanzt
ilan-gold
and
manzt
authored
Upgrade deck.gl to 8.8 (#615)
* Upgrade `deck.gl` to 8.8 * Fix tests. * Lint. * Add base. * chore: run pnpm meta-updater for monorepo * Remove opts. * upgrade probe.gl * Try again! * chore: relock dependencies Co-authored-by: Trevor Manz <[email protected]>
1 parent 064dd83 commit 4779f89

19 files changed

+1226
-950
lines changed

‎.meta-updater/main.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import * as fs from 'node:fs';
22
import * as path from 'node:path';
33

4-
const DECK_VERSION = '8.6.7';
5-
const LUMAGL_VERSION = '8.5.13';
4+
const DECK_VERSION = '~8.8.6';
5+
const LUMAGL_VERSION = '~8.5.16';
66
const MATHGL_VERSION = '^3.5.7';
77
const REACT_VERSION = '^16.8.0 || ^17.0.0';
88

‎.npmrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
auto-install-peers = true
2-
strict-peer-dependencies = false

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
### Added
66

77
### Changed
8+
- Upgrade deck.gl to 8.8
89
- Replace `postversion` script with `version` script for CI release.
910
- Remove `package-lock.json` from root (since we use pnpm)
1011

‎package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@
2222
"version": "pnpm meta-updater && ./version.sh && git add ."
2323
},
2424
"dependencies": {
25-
"@deck.gl/core": "8.6.7",
26-
"@deck.gl/geo-layers": "8.6.7",
27-
"@deck.gl/layers": "8.6.7",
28-
"@deck.gl/react": "8.6.7",
29-
"@luma.gl/constants": "8.5.13",
30-
"@luma.gl/core": "8.5.13",
31-
"@luma.gl/engine": "8.5.13",
32-
"@luma.gl/webgl": "8.5.13"
25+
"@deck.gl/core": "~8.8.6",
26+
"@deck.gl/geo-layers": "~8.8.6",
27+
"@deck.gl/layers": "~8.8.6",
28+
"@deck.gl/react": "~8.8.6",
29+
"@luma.gl/constants": "~8.5.16",
30+
"@luma.gl/core": "~8.5.16",
31+
"@luma.gl/shadertools": "~8.5.16",
32+
"@luma.gl/webgl": "~8.5.16"
3333
},
3434
"devDependencies": {
35-
"@deck.gl/extensions": "8.6.7",
36-
"@deck.gl/mesh-layers": "8.6.7",
37-
"@deck.gl/test-utils": "8.6.7",
35+
"@deck.gl/extensions": "~8.8.6",
36+
"@deck.gl/mesh-layers": "~8.8.6",
37+
"@deck.gl/test-utils": "~8.8.6",
3838
"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
3939
"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
40-
"@luma.gl/test-utils": "8.5.13",
40+
"@luma.gl/test-utils": "~8.5.16",
4141
"@pnpm/types": "^8.4.0",
4242
"@probe.gl/test-utils": "^3.5.0",
4343
"@typescript-eslint/eslint-plugin": "^5.25.0",

‎packages/constants/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"build": "unbuild"
2424
},
2525
"dependencies": {
26-
"@luma.gl/constants": "8.5.13"
26+
"@luma.gl/constants": "~8.5.16"
2727
},
2828
"unbuild": {
2929
"entries": [

‎packages/extensions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"prepare": "node prepare.mjs"
2424
},
2525
"peerDependencies": {
26-
"@deck.gl/core": "8.6.7"
26+
"@deck.gl/core": "~8.8.6"
2727
},
2828
"dependencies": {
2929
"@vivjs/constants": "workspace:*"

‎packages/extensions/src/additive-colormap-3d-extensions/additive-blend-extension.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const _AFTER_RENDER = '';
3232
const AdditiveBlendExtension = class extends BaseExtension {
3333
constructor(args) {
3434
super(args);
35-
this.opts.rendering = { _BEFORE_RENDER, _RENDER, _AFTER_RENDER };
35+
this.rendering = { _BEFORE_RENDER, _RENDER, _AFTER_RENDER };
3636
}
3737
};
3838

‎packages/extensions/src/additive-colormap-3d-extensions/base-extension.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ const defaultProps = {
4040
* @property {string=} colormap String indicating a colormap (default: 'viridis'). The full list of options is here: https://github.com/glslify/glsl-colormap#glsl-colormap
4141
* */
4242
const BaseExtension = class extends LayerExtension {
43+
constructor(...args) {
44+
super(args);
45+
// After deck.gl 8.8, it does not seem like this is always initialized.
46+
this.opts = this.opts || {};
47+
}
48+
4349
getShaders() {
4450
const name = this?.props?.colormap || defaultProps.colormap.value;
4551
const apply_cmap = cmaps[name];

‎packages/extensions/src/additive-colormap-3d-extensions/maximum-intensity-projection-extension.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const _AFTER_RENDER = `\
3030
const MaximumIntensityProjectionExtension = class extends BaseExtension {
3131
constructor(args) {
3232
super(args);
33-
this.opts.rendering = { _BEFORE_RENDER, _RENDER, _AFTER_RENDER };
33+
this.rendering = { _BEFORE_RENDER, _RENDER, _AFTER_RENDER };
3434
}
3535
};
3636

‎packages/extensions/src/additive-colormap-3d-extensions/minimum-intensity-projection-extension.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const _AFTER_RENDER = `\
3030
const MinimumIntensityProjectionExtension = class extends BaseExtension {
3131
constructor(args) {
3232
super(args);
33-
this.opts.rendering = { _BEFORE_RENDER, _RENDER, _AFTER_RENDER };
33+
this.rendering = { _BEFORE_RENDER, _RENDER, _AFTER_RENDER };
3434
}
3535
};
3636

‎packages/extensions/src/color-palette-3d-extensions/additive-blend-extension.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const _AFTER_RENDER = ``;
3232
const AdditiveBlendExtension = class extends BaseExtension {
3333
constructor(args) {
3434
super(args);
35-
this.opts.rendering = { _BEFORE_RENDER, _RENDER, _AFTER_RENDER };
35+
this.rendering = { _BEFORE_RENDER, _RENDER, _AFTER_RENDER };
3636
}
3737
};
3838

‎packages/extensions/src/color-palette-3d-extensions/base-extension.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ const defaultProps = {
1212
* @property {Array<Array<number>>=} colors Array of colors to map channels to (RGB).
1313
* */
1414
const BaseExtension = class extends LayerExtension {
15+
constructor(...args) {
16+
super(args);
17+
// After deck.gl 8.8, it does not seem like this is always initialized.
18+
this.opts = this.opts || {};
19+
}
20+
1521
draw() {
1622
const { colors, channelsVisible } = this.props;
1723
const paddedColors = padColors({

‎packages/extensions/src/color-palette-3d-extensions/maximum-intensity-projection-extension.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const _AFTER_RENDER = `\
2828
const MaximumIntensityProjectionExtension = class extends BaseExtension {
2929
constructor(args) {
3030
super(args);
31-
this.opts.rendering = { _BEFORE_RENDER, _RENDER, _AFTER_RENDER };
31+
this.rendering = { _BEFORE_RENDER, _RENDER, _AFTER_RENDER };
3232
}
3333
};
3434

‎packages/extensions/src/color-palette-3d-extensions/minimum-intensity-projection-extension.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const _AFTER_RENDER = `\
2828
const MinimumIntensityProjectionExtension = class extends BaseExtension {
2929
constructor(args) {
3030
super(args);
31-
this.opts.rendering = { _BEFORE_RENDER, _RENDER, _AFTER_RENDER };
31+
this.rendering = { _BEFORE_RENDER, _RENDER, _AFTER_RENDER };
3232
}
3333
};
3434

‎packages/layers/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
"test": "node ../../scripts/bundle-test.mjs tests/index.spec.js | tape-run | tap-spec"
2424
},
2525
"peerDependencies": {
26-
"@deck.gl/core": "8.6.7",
27-
"@deck.gl/geo-layers": "8.6.7",
28-
"@deck.gl/layers": "8.6.7",
29-
"@luma.gl/constants": "8.5.13",
30-
"@luma.gl/core": "8.5.13",
31-
"@luma.gl/engine": "8.5.13",
32-
"@luma.gl/webgl": "8.5.13"
26+
"@deck.gl/core": "~8.8.6",
27+
"@deck.gl/geo-layers": "~8.8.6",
28+
"@deck.gl/layers": "~8.8.6",
29+
"@luma.gl/constants": "~8.5.16",
30+
"@luma.gl/core": "~8.5.16",
31+
"@luma.gl/engine": "~8.5.16",
32+
"@luma.gl/webgl": "~8.5.16"
3333
},
3434
"dependencies": {
3535
"@math.gl/core": "^3.5.7",

‎packages/layers/src/xr-3d-layer/xr-3d-layer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ function getRenderingAttrs() {
9898
function getRenderingFromExtensions(extensions) {
9999
let rendering = {};
100100
extensions.forEach(extension => {
101-
rendering = extension.opts.rendering;
101+
rendering = extension.rendering;
102102
});
103103
if (!rendering._RENDER) {
104104
throw new Error(

‎packages/viewers/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"build": "unbuild"
2424
},
2525
"peerDependencies": {
26-
"@deck.gl/react": "8.6.7",
26+
"@deck.gl/react": "~8.8.6",
2727
"react": "^16.8.0 || ^17.0.0"
2828
},
2929
"dependencies": {

‎packages/views/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"test": "esno tests/index.spec.js | tap-spec"
2424
},
2525
"peerDependencies": {
26-
"@deck.gl/core": "8.6.7",
27-
"@deck.gl/layers": "8.6.7"
26+
"@deck.gl/core": "~8.8.6",
27+
"@deck.gl/layers": "~8.8.6"
2828
},
2929
"dependencies": {
3030
"@math.gl/core": "^3.5.7",

0 commit comments

Comments
 (0)