Skip to content

Commit 9fda1ce

Browse files
igorDykhtaigorDykhta
committed
chore: upgrade to deckgl 9.2.11
Signed-off-by: Ihor Dykhta <dikhta.igor@gmail.com>
1 parent e375612 commit 9fda1ce

File tree

78 files changed

+1875
-1568
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+1875
-1568
lines changed

‎bindings/kepler.gl-jupyter/js/package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@
7777
"@kepler.gl/reducers": "^3.0.0",
7878
"@kepler.gl/schemas": "^3.0.0",
7979
"@kepler.gl/styles": "^3.0.0",
80-
"@loaders.gl/arrow": "^4.1.0",
81-
"@loaders.gl/core": "^4.1.0",
82-
"@loaders.gl/csv": "^4.1.0",
83-
"@loaders.gl/json": "^4.1.0",
80+
"@loaders.gl/arrow": "^4.3.4",
81+
"@loaders.gl/core": "^4.3.4",
82+
"@loaders.gl/csv": "^4.3.4",
83+
"@loaders.gl/json": "^4.3.4",
8484
"global": "^4.3.0",
8585
"node-polyfill-webpack-plugin": "^1.1.2",
8686
"querystring": "0.2.1",
@@ -95,11 +95,11 @@
9595
"styled-components": "6.1.8"
9696
},
9797
"resolutions": {
98-
"@deck.gl/core": "^8.9.27",
99-
"@deck.gl/react": "^8.9.27",
100-
"@deck.gl/aggregation-layers": "^8.9.27",
101-
"@deck.gl/geo-layers": "^8.9.27",
102-
"@deck.gl/layers": "^8.9.27"
98+
"@deck.gl/core": "^9.2.11",
99+
"@deck.gl/react": "^9.2.11",
100+
"@deck.gl/aggregation-layers": "^9.2.11",
101+
"@deck.gl/geo-layers": "^9.2.11",
102+
"@deck.gl/layers": "^9.2.11"
103103
},
104104
"jupyterlab": {
105105
"extension": "babel/labplugin",

‎examples/demo-app/esbuild.config.mjs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,6 @@ function addAliases(externals, args) {
171171
resolveAlias[`@deck.gl/${mdl}`] = useLocalDeck
172172
? `${NODE_MODULES_DIR}/@deck.gl/${mdl}/src`
173173
: `${EXTERNAL_DECK_SRC}/modules/${mdl}/src`;
174-
// types are stored in different directory
175-
resolveAlias[`@deck.gl/${mdl}/typed`] = useLocalDeck
176-
? `${NODE_MODULES_DIR}/@deck.gl/${mdl}/typed`
177-
: `${EXTERNAL_DECK_SRC}/modules/${mdl}/src/types`;
178174
});
179175

180176
['luma.gl', 'probe.gl', 'loaders.gl'].forEach(name => {

‎examples/demo-app/package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
"@kepler.gl/schemas": "^3.2.0",
2727
"@kepler.gl/styles": "^3.2.0",
2828
"@kepler.gl/utils": "^3.2.0",
29-
"@loaders.gl/arrow": "^4.3.2",
30-
"@loaders.gl/core": "^4.3.2",
31-
"@loaders.gl/csv": "^4.3.2",
32-
"@loaders.gl/json": "^4.3.2",
33-
"@loaders.gl/parquet": "^4.3.2",
29+
"@loaders.gl/arrow": "^4.3.4",
30+
"@loaders.gl/core": "^4.3.4",
31+
"@loaders.gl/csv": "^4.3.4",
32+
"@loaders.gl/json": "^4.3.4",
33+
"@loaders.gl/parquet": "^4.3.4",
3434
"@openassistant/core": "^0.5.17",
3535
"@openassistant/ui": "^0.5.17",
3636
"@types/classnames": "^2.3.1",
@@ -60,10 +60,10 @@
6060
"usehooks-ts": "^3.1.0"
6161
},
6262
"resolutions": {
63-
"@luma.gl/core": "8.5.21",
64-
"@luma.gl/webgl": "8.5.21",
65-
"@deck.gl/core": "8.9.27",
66-
"@deck.gl/extensions": "8.9.27",
63+
"@luma.gl/core": "9.2.6",
64+
"@luma.gl/webgl": "9.2.6",
65+
"@deck.gl/core": "9.2.11",
66+
"@deck.gl/extensions": "9.2.11",
6767
"react-vis": "1.11.7"
6868
},
6969
"engines": {

‎examples/get-started-vite/package.json‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,30 @@
99
},
1010
"dependencies": {
1111
"@babel/runtime": "^7.12.1",
12-
"@deck.gl/aggregation-layers": "^8.9.27",
13-
"@deck.gl/core": "^8.9.27",
14-
"@deck.gl/extensions": "^8.9.27",
15-
"@deck.gl/geo-layers": "^8.9.27",
16-
"@deck.gl/layers": "^8.9.27",
17-
"@deck.gl/mesh-layers": "^8.9.27",
12+
"@deck.gl/aggregation-layers": "^9.2.11",
13+
"@deck.gl/core": "^9.2.11",
14+
"@deck.gl/extensions": "^9.2.11",
15+
"@deck.gl/geo-layers": "^9.2.11",
16+
"@deck.gl/layers": "^9.2.11",
17+
"@deck.gl/mesh-layers": "^9.2.11",
1818
"@dnd-kit/core": "^6.1.0",
1919
"@dnd-kit/modifiers": "^7.0.0",
2020
"@dnd-kit/sortable": "^8.0.0",
2121
"@kepler.gl/components": "3.1.7",
2222
"@kepler.gl/reducers": "3.1.7",
23-
"@loaders.gl/arrow": "4.3.2",
24-
"@loaders.gl/core": "4.3.2",
25-
"@loaders.gl/gltf": "4.3.2",
26-
"@loaders.gl/images": "4.3.2",
27-
"@loaders.gl/mvt": "4.3.2",
28-
"@loaders.gl/parquet": "4.3.2",
29-
"@loaders.gl/pmtiles": "4.3.2",
30-
"@luma.gl/core": "8.5.21",
31-
"@luma.gl/engine": "8.5.21",
32-
"@luma.gl/gltools": "8.5.21",
33-
"@luma.gl/shadertools": "8.5.21",
34-
"@luma.gl/webgl": "8.5.21",
23+
"@loaders.gl/arrow": "4.3.4",
24+
"@loaders.gl/core": "4.3.4",
25+
"@loaders.gl/gltf": "4.3.4",
26+
"@loaders.gl/images": "4.3.4",
27+
"@loaders.gl/mvt": "4.3.4",
28+
"@loaders.gl/parquet": "4.3.4",
29+
"@loaders.gl/pmtiles": "4.3.4",
30+
"@luma.gl/core": "9.2.6",
31+
"@luma.gl/engine": "9.2.6",
32+
"@luma.gl/shadertools": "9.2.6",
33+
"@luma.gl/webgl": "9.2.6",
3534
"@math.gl/core": "^4.0.0",
36-
"@math.gl/web-mercator": "^3.6.2",
35+
"@math.gl/web-mercator": "^4.1.0",
3736
"apache-arrow": "17.0.0",
3837
"gl-matrix": "^3.4.3",
3938
"lodash": "4.17.21",

‎examples/replace-component/esbuild.config.mjs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ function addAliases(externals, args) {
111111
resolveAlias[`@deck.gl/${mdl}`] = useLocalDeck
112112
? `${NODE_MODULES_DIR}/@deck.gl/${mdl}/src`
113113
: `${EXTERNAL_DECK_SRC}/modules/${mdl}/src`;
114-
// types are stored in different directory
115-
resolveAlias[`@deck.gl/${mdl}/typed`] = useLocalDeck
116-
? `${NODE_MODULES_DIR}/@deck.gl/${mdl}/typed`
117-
: `${EXTERNAL_DECK_SRC}/modules/${mdl}/src/types`;
118114
});
119115

120116
['luma.gl', 'probe.gl', 'loaders.gl'].forEach(name => {

‎jest.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const config = {
2222
// Some libraries (even if transitive) are transitioning to ESM and need additional transpilation. Relevant issues:
2323
// - tiny-sdf: https://github.com/visgl/deck.gl/issues/7735
2424
transformIgnorePatterns: [
25-
'/node_modules\\/(?!(.*@mapbox\\/tiny-sdf\\.*|@loaders\\.gl))',
25+
'/node_modules\\/(?!(.*@mapbox\\/tiny-sdf\\.*|@loaders\\.gl|@deck\\.gl|@deck\\.gl-community|@luma\\.gl|preact))',
2626
'\\.pnp\\.[^\\/]+$'
2727
]
2828
};

‎package.json‎

Lines changed: 37 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,14 @@
101101
"umd"
102102
],
103103
"dependencies": {
104-
"@deck.gl/mapbox": "^8.9.27",
104+
"@deck.gl/mapbox": "^9.2.11",
105105
"@hubble.gl/core": "1.4.0",
106106
"@hubble.gl/react": "1.4.0",
107107
"@kepler.gl/components": "3.2.6",
108-
"@loaders.gl/polyfills": "^4.3.2",
108+
"@loaders.gl/polyfills": "^4.3.4",
109109
"@types/mapbox__geo-viewport": "^0.4.1",
110110
"html-webpack-plugin": "^4.3.0",
111+
"math.gl": "^4.1.0",
111112
"monaco-editor": "^0.52.0",
112113
"typedoc": "^0.19.2"
113114
},
@@ -133,10 +134,11 @@
133134
"@babel/runtime": "^7.12.1",
134135
"@babel/traverse": "^7.12.1",
135136
"@cfaester/enzyme-adapter-react-18": "^0.7.0",
136-
"@deck.gl/test-utils": "^8.9.27",
137-
"@loaders.gl/polyfills": "^4.3.2",
138-
"@luma.gl/test-utils": "^8.5.20",
139-
"@nebula.gl/layers": "1.0.2-alpha.1",
137+
"@deck.gl-community/editable-layers": "9.2.8",
138+
"@deck.gl-community/layers": "9.2.8",
139+
"@deck.gl/test-utils": "^9.2.11",
140+
"@loaders.gl/polyfills": "^4.3.4",
141+
"@luma.gl/test-utils": "^9.2.6",
140142
"@open-wc/webpack-import-meta-loader": "0.4.7",
141143
"@probe.gl/env": "^3.5.0",
142144
"@probe.gl/test-utils": "^3.5.0",
@@ -210,7 +212,7 @@
210212
"tape": "^4.9.2",
211213
"tape-catch": "^1.0.6",
212214
"typedoc-plugin-markdown": "^3.0.11",
213-
"typescript": "4.7.2",
215+
"typescript": "5.6.3",
214216
"url-loader": "^4.1.1",
215217
"usehooks-ts": "^3.1.0",
216218
"watchify": "^3.6.1",
@@ -223,25 +225,34 @@
223225
"webpack-stats-plugin": "^0.2.1"
224226
},
225227
"resolutions": {
226-
"@loaders.gl/core": "4.3.2",
227-
"@loaders.gl/csv": "4.3.2",
228-
"@loaders.gl/draco": "4.3.2",
229-
"@loaders.gl/gltf": "4.3.2",
230-
"@loaders.gl/json": "4.3.2",
231-
"@loaders.gl/loader-utils": "4.3.2",
232-
"@loaders.gl/polyfills": "4.3.2",
233-
"@loaders.gl/arrow": "4.3.2",
234-
"@loaders.gl/parquet": "4.3.2",
235-
"@loaders.gl/gis": "4.3.2",
236-
"@loaders.gl/schema": "4.3.2",
237-
"@loaders.gl/wkt": "4.3.2",
238-
"@loaders.gl/wms": "4.3.2",
239-
"@luma.gl/constants": "8.5.21",
240-
"@luma.gl/core": "8.5.21",
241-
"@luma.gl/experimental": "8.5.21",
242-
"@luma.gl/shadertools": "8.5.21",
243-
"@luma.gl/test-utils": "8.5.21",
244-
"@luma.gl/webgl": "8.5.21",
228+
"@deck.gl/aggregation-layers": "9.2.11",
229+
"@deck.gl/core": "9.2.11",
230+
"@deck.gl/extensions": "9.2.11",
231+
"@deck.gl/geo-layers": "9.2.11",
232+
"@deck.gl/layers": "9.2.11",
233+
"@deck.gl/mesh-layers": "9.2.11",
234+
"@deck.gl/mapbox": "9.2.11",
235+
"@deck.gl/react": "9.2.11",
236+
"@deck.gl/widgets": "9.2.11",
237+
"@loaders.gl/core": "4.3.4",
238+
"@loaders.gl/csv": "4.3.4",
239+
"@loaders.gl/draco": "4.3.4",
240+
"@loaders.gl/gltf": "4.3.4",
241+
"@loaders.gl/json": "4.3.4",
242+
"@loaders.gl/loader-utils": "4.3.4",
243+
"@loaders.gl/polyfills": "4.3.4",
244+
"@loaders.gl/arrow": "4.3.4",
245+
"@loaders.gl/parquet": "4.3.4",
246+
"@loaders.gl/gis": "4.3.4",
247+
"@loaders.gl/schema": "4.3.4",
248+
"@loaders.gl/wkt": "4.3.4",
249+
"@loaders.gl/wms": "4.3.4",
250+
"@luma.gl/constants": "9.2.6",
251+
"@luma.gl/core": "9.2.6",
252+
"@luma.gl/engine": "9.2.6",
253+
"@luma.gl/shadertools": "9.2.6",
254+
"@luma.gl/test-utils": "9.2.6",
255+
"@luma.gl/webgl": "9.2.6",
245256
"@types/lodash": "4.17.5",
246257
"browserslist": "^4.17.0",
247258
"caniuse-lite": "^1.0.30001636",

‎src/actions/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"umd"
3131
],
3232
"dependencies": {
33-
"@deck.gl/core": "^8.9.27",
33+
"@deck.gl/core": "^9.2.11",
3434
"@kepler.gl/cloud-providers": "3.2.6",
3535
"@kepler.gl/constants": "3.2.6",
3636
"@kepler.gl/layers": "3.2.6",

‎src/actions/src/vis-state-actions.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Copyright contributors to the kepler.gl project
33

44
// vis-state-reducer
5-
import {PickInfo} from '@deck.gl/core/lib/deck';
5+
import {PickingInfo} from '@deck.gl/core';
66
import {default as ActionTypes} from './action-types';
77
import {FileCacheItem} from '@kepler.gl/processors';
88
import {Layer, LayerBaseConfig} from '@kepler.gl/layers';
@@ -1112,7 +1112,7 @@ export function toggleFilterFeature(
11121112
}
11131113

11141114
export type OnLayerHoverUpdaterAction = {
1115-
info: PickInfo<any> | null;
1115+
info: PickingInfo<any> | null;
11161116
mapIndex?: number;
11171117
};
11181118
/**
@@ -1124,7 +1124,7 @@ export type OnLayerHoverUpdaterAction = {
11241124
* @public
11251125
*/
11261126
export function onLayerHover(
1127-
info: PickInfo<any> | null,
1127+
info: PickingInfo<any> | null,
11281128
mapIndex?: number
11291129
): Merge<OnLayerHoverUpdaterAction, {type: typeof ActionTypes.LAYER_HOVER}> {
11301130
return {
@@ -1135,7 +1135,7 @@ export function onLayerHover(
11351135
}
11361136

11371137
export type OnLayerClickUpdaterAction = {
1138-
info: PickInfo<any> | null;
1138+
info: PickingInfo<any> | null;
11391139
};
11401140
/**
11411141
* Trigger layer click event with clicked object
@@ -1145,7 +1145,7 @@ export type OnLayerClickUpdaterAction = {
11451145
* @public
11461146
*/
11471147
export function onLayerClick(
1148-
info: PickInfo<any> | null
1148+
info: PickingInfo<any> | null
11491149
): Merge<OnLayerClickUpdaterAction, {type: typeof ActionTypes.LAYER_CLICK}> {
11501150
return {
11511151
type: ActionTypes.LAYER_CLICK,

‎src/components/package.json‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@
3030
"umd"
3131
],
3232
"dependencies": {
33-
"@deck.gl/core": "^8.9.27",
34-
"@deck.gl/react": "^8.9.27",
33+
"@deck.gl-community/editable-layers": "9.2.8",
34+
"@deck.gl/core": "^9.2.11",
35+
"@deck.gl/react": "^9.2.11",
36+
"@deck.gl/widgets": "^9.2.11",
3537
"@dnd-kit/core": "^6.1.0",
3638
"@dnd-kit/modifiers": "^7.0.0",
3739
"@dnd-kit/sortable": "^8.0.0",
@@ -52,11 +54,10 @@
5254
"@kepler.gl/table": "3.2.6",
5355
"@kepler.gl/types": "3.2.6",
5456
"@kepler.gl/utils": "3.2.6",
55-
"@loaders.gl/mvt": "^4.3.2",
56-
"@loaders.gl/pmtiles": "^4.3.2",
57-
"@loaders.gl/wms": "4.3.2",
57+
"@loaders.gl/mvt": "^4.3.4",
58+
"@loaders.gl/pmtiles": "^4.3.4",
59+
"@loaders.gl/wms": "4.3.4",
5860
"@mapbox/mapbox-sdk": "^0.15.3",
59-
"@nebula.gl/edit-modes": "1.0.2-alpha.1",
6061
"@tippyjs/react": "^4.2.0",
6162
"@types/classnames": "^2.3.1",
6263
"@types/d3-array": "^2.8.0",
@@ -91,7 +92,7 @@
9192
"mapbox-gl": "1.13.1",
9293
"maplibre-gl": "^3.6.2",
9394
"markdown-to-jsx": "^7.7.6",
94-
"mjolnir.js": "^2.7.0",
95+
"mjolnir.js": "^3.0.0",
9596
"moment": "^2.10.6",
9697
"moment-timezone": "^0.5.35",
9798
"prop-types": "^15.6.0",

0 commit comments

Comments
 (0)