chore: Upgrade to loaders.gl@4.0 (#2394)

Signed-off-by: Ib Green <ib@foursquare.com>
keplergl · Oct 24, 2023 · b54c173 · b54c173
1 parent e47ccc0
commit b54c173
Show file tree

Hide file tree

Showing 8 changed files with 195 additions and 119 deletions.
diff --git a/babel-register.js b/babel-register.js
@@ -21,6 +21,7 @@
 const forceTranspile = [
   // ESM libraries that require transpilation
   /@deck.gl\/layers/,
+  /@loaders.gl\/polyfills/,
   // For some reason babel crashes even before trying to transpile this library
   // Instead we force transpile @deck.gl/layers which includes it, and alias to a transpiled version in babel.config.js
   /@mapbox\/tiny-sdf/

diff --git a/package.json b/package.json
@@ -112,8 +112,8 @@
     "@hubble.gl/core": "1.2.0-alpha.6",
     "@hubble.gl/react": "1.2.0-alpha.6",
     "@kepler.gl/components": "3.0.0-alpha.1",
-    "@loaders.gl/polyfills": "^3.4.14",
-    "@loaders.gl/shapefile": "^3.4.14",
+    "@loaders.gl/polyfills": "4.0.0-beta.7",
+    "@loaders.gl/shapefile": "4.0.0-beta.7",
     "@types/mapbox__geo-viewport": "^0.4.1",
     "@typescript-eslint/parser": "^5.27.0",
     "d3-hexbin": "^0.2.2",
@@ -142,7 +142,7 @@
     "@babel/traverse": "^7.12.1",
     "@cfaester/enzyme-adapter-react-18": "^0.7.0",
     "@deck.gl/test-utils": "^8.9.12",
-    "@loaders.gl/polyfills": "^3.4.14",
+    "@loaders.gl/polyfills": "4.0.0-beta.7",
     "@luma.gl/test-utils": "^8.5.19",
     "@nebula.gl/layers": "1.0.2-alpha.1",
     "@probe.gl/env": "^3.5.0",
@@ -216,12 +216,12 @@
     "webpack-stats-plugin": "^0.2.1"
   },
   "resolutions": {
-    "@loaders.gl/core": "^3.4.14",
-    "@loaders.gl/csv": "^3.4.14",
-    "@loaders.gl/gltf": "^3.4.14",
-    "@loaders.gl/json": "^3.4.14",
-    "@loaders.gl/loader-utils": "^3.4.14",
-    "@loaders.gl/polyfills": "^3.4.14",
+    "@loaders.gl/core": "4.0.0-beta.7",
+    "@loaders.gl/csv": "4.0.0-beta.7",
+    "@loaders.gl/gltf": "4.0.0-beta.7",
+    "@loaders.gl/json": "4.0.0-beta.7",
+    "@loaders.gl/loader-utils": "4.0.0-beta.7",
+    "@loaders.gl/polyfills": "4.0.0-beta.7",
     "@luma.gl/constants": "8.5.19",
     "@luma.gl/core": "8.5.19",
     "@luma.gl/experimental": "8.5.19",

diff --git a/src/layers/package.json b/src/layers/package.json
@@ -42,10 +42,10 @@
     "@kepler.gl/table": "3.0.0-alpha.1",
     "@kepler.gl/types": "3.0.0-alpha.1",
     "@kepler.gl/utils": "3.0.0-alpha.1",
-    "@loaders.gl/core": "^3.4.14",
-    "@loaders.gl/gis": "^3.4.14",
-    "@loaders.gl/gltf": "^3.4.14",
-    "@loaders.gl/wkt": "^3.4.14",
+    "@loaders.gl/core": "4.0.0-beta.7",
+    "@loaders.gl/gis": "4.0.0-beta.7",
+    "@loaders.gl/gltf": "4.0.0-beta.7",
+    "@loaders.gl/wkt": "4.0.0-beta.7",
     "@luma.gl/constants": "^8.5.19",
     "@mapbox/geojson-normalize": "0.0.1",
     "@nebula.gl/layers": "1.0.2-alpha.1",

diff --git a/src/layers/src/geojson-layer/geojson-utils.ts b/src/layers/src/geojson-layer/geojson-utils.ts
@@ -145,6 +145,7 @@ export function parseGeometryFromString(geoString: string): Feature | null {
     try {
       const buffer = Buffer.from(geoString, 'hex');
       const binaryGeo = parseSync(buffer, WKBLoader);
+      // @ts-expect-error
       parsedGeo = binaryToGeometry(binaryGeo);
     } catch (e) {
       return null;

diff --git a/src/processors/package.json b/src/processors/package.json
@@ -35,10 +35,10 @@
     "@kepler.gl/schemas": "3.0.0-alpha.1",
     "@kepler.gl/types": "3.0.0-alpha.1",
     "@kepler.gl/utils": "3.0.0-alpha.1",
-    "@loaders.gl/core": "^3.4.14",
-    "@loaders.gl/csv": "^3.4.14",
-    "@loaders.gl/json": "^3.4.14",
-    "@loaders.gl/loader-utils": "^3.4.14",
+    "@loaders.gl/core": "4.0.0-beta.7",
+    "@loaders.gl/csv": "4.0.0-beta.7",
+    "@loaders.gl/json": "4.0.0-beta.7",
+    "@loaders.gl/loader-utils": "4.0.0-beta.7",
     "@mapbox/geojson-normalize": "0.0.1",
     "@nebula.gl/edit-modes": "1.0.2-alpha.1",
     "@turf/helpers": "^6.1.4",

diff --git a/src/reducers/package.json b/src/reducers/package.json
@@ -43,7 +43,7 @@
     "@kepler.gl/tasks": "3.0.0-alpha.1",
     "@kepler.gl/types": "3.0.0-alpha.1",
     "@kepler.gl/utils": "3.0.0-alpha.1",
-    "@loaders.gl/loader-utils": "^3.4.14",
+    "@loaders.gl/loader-utils": "4.0.0-beta.7",
     "@types/lodash.clonedeep": "^4.5.7",
     "@types/lodash.flattendeep": "^4.4.7",
     "@types/lodash.get": "^4.4.6",

diff --git a/src/schemas/package.json b/src/schemas/package.json
@@ -35,7 +35,7 @@
     "@kepler.gl/table": "3.0.0-alpha.1",
     "@kepler.gl/types": "3.0.0-alpha.1",
     "@kepler.gl/utils": "3.0.0-alpha.1",
-    "@loaders.gl/loader-utils": "^3.4.14",
+    "@loaders.gl/loader-utils": "4.0.0-beta.7",
     "@types/keymirror": "^0.1.1",
     "@types/lodash.clonedeep": "^4.5.7",
     "@types/lodash.pick": "^4.4.6",