From 54791952992fe7e4e5ab740132a1c63f2ed9da19 Mon Sep 17 00:00:00 2001 From: Ib Green Date: Fri, 13 Oct 2023 15:38:19 -0400 Subject: [PATCH 1/5] chore: Upgrade to math.gl@4.0.0. Remove gl-matrix --- examples/website/mesh/package.json | 2 +- modules/aggregation-layers/package.json | 2 +- modules/carto/package.json | 2 +- modules/core/package.json | 6 +- .../shaderlib/project/project-functions.ts | 3 +- .../shaderlib/project/viewport-uniforms.ts | 3 +- modules/core/src/viewports/globe-viewport.ts | 3 +- .../src/viewports/orthographic-viewport.ts | 3 +- modules/core/src/viewports/viewport.ts | 3 +- .../src/viewports/web-mercator-viewport.ts | 4 +- modules/extensions/package.json | 6 +- .../src/path-style/path-style-extension.ts | 4 +- modules/geo-layers/package.json | 6 +- modules/google-maps/package.json | 2 +- modules/layers/package.json | 6 +- modules/mapbox/package.json | 3 +- modules/test-utils/package.json | 2 +- package.json | 19 ++- test/apps/frustum-cull/frustum-utils.js | 3 +- test/apps/mask-first-person/package.json | 2 +- test/apps/multi-viewport/package.json | 2 +- .../core/effects/lighting/sunlight.spec.ts | 5 +- yarn.lock | 131 +++++++++++++++++- 23 files changed, 171 insertions(+), 51 deletions(-) diff --git a/examples/website/mesh/package.json b/examples/website/mesh/package.json index 8c950d14a79..3f5d250fda4 100644 --- a/examples/website/mesh/package.json +++ b/examples/website/mesh/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@loaders.gl/obj": "^3.4.13", - "@math.gl/core": "4.0.0-alpha.4", + "@math.gl/core": "^4.0.0", "deck.gl": "^8.8.0", "react": "^18.0.0", "react-dom": "^18.0.0" diff --git a/modules/aggregation-layers/package.json b/modules/aggregation-layers/package.json index dcfc4422913..bd1cf48cf71 100644 --- a/modules/aggregation-layers/package.json +++ b/modules/aggregation-layers/package.json @@ -34,7 +34,7 @@ "@luma.gl/constants": "9.0.0-alpha.37", "@luma.gl/core": "9.0.0-alpha.37", "@luma.gl/shadertools": "9.0.0-alpha.37", - "@math.gl/web-mercator": "4.0.0-alpha.4", + "@math.gl/web-mercator": "^4.0.0", "d3-hexbin": "^0.2.1" }, "peerDependencies": { diff --git a/modules/carto/package.json b/modules/carto/package.json index 39a3f57970e..07006440332 100644 --- a/modules/carto/package.json +++ b/modules/carto/package.json @@ -41,7 +41,7 @@ "@loaders.gl/tiles": "^3.4.13", "@luma.gl/core": "9.0.0-alpha.37", "@luma.gl/constants": "^8.5.20", - "@math.gl/web-mercator": "4.0.0-alpha.4", + "@math.gl/web-mercator": "^4.0.0", "cartocolor": "^4.0.2", "d3-array": "^3.2.0", "d3-color": "^3.1.0", diff --git a/modules/core/package.json b/modules/core/package.json index 13e1268fb66..19d513a99b2 100644 --- a/modules/core/package.json +++ b/modules/core/package.json @@ -43,9 +43,9 @@ "@luma.gl/engine": "9.0.0-alpha.37", "@luma.gl/shadertools": "9.0.0-alpha.37", "@luma.gl/webgl": "9.0.0-alpha.37", - "@math.gl/core": "4.0.0-alpha.4", - "@math.gl/sun": "4.0.0-alpha.4", - "@math.gl/web-mercator": "4.0.0-alpha.4", + "@math.gl/core": "^4.0.0", + "@math.gl/sun": "^4.0.0", + "@math.gl/web-mercator": "^4.0.0", "@probe.gl/env": "^4.0.4", "@probe.gl/log": "^4.0.4", "@probe.gl/stats": "^4.0.4", diff --git a/modules/core/src/shaderlib/project/project-functions.ts b/modules/core/src/shaderlib/project/project-functions.ts index 141202c9427..8d770ae4146 100644 --- a/modules/core/src/shaderlib/project/project-functions.ts +++ b/modules/core/src/shaderlib/project/project-functions.ts @@ -6,8 +6,7 @@ import {COORDINATE_SYSTEM} from '../../lib/constants'; import {getOffsetOrigin} from './viewport-uniforms'; import WebMercatorViewport from '../../viewports/web-mercator-viewport'; -import * as vec4 from 'gl-matrix/vec4'; -import * as vec3 from 'gl-matrix/vec3'; +import {vec3, vec4} from '@math.gl/core'; import {addMetersToLngLat} from '@math.gl/web-mercator'; import type {CoordinateSystem} from '../../lib/constants'; diff --git a/modules/core/src/shaderlib/project/viewport-uniforms.ts b/modules/core/src/shaderlib/project/viewport-uniforms.ts index 7e149aa2d96..bf4c3f212ff 100644 --- a/modules/core/src/shaderlib/project/viewport-uniforms.ts +++ b/modules/core/src/shaderlib/project/viewport-uniforms.ts @@ -19,8 +19,7 @@ // THE SOFTWARE. /* eslint-disable complexity, camelcase */ -import * as mat4 from 'gl-matrix/mat4'; -import * as vec4 from 'gl-matrix/vec4'; +import {mat4, vec4} from '@math.gl/core'; import {COORDINATE_SYSTEM, PROJECTION_MODE} from '../../lib/constants'; diff --git a/modules/core/src/viewports/globe-viewport.ts b/modules/core/src/viewports/globe-viewport.ts index 836527c1623..85764a365d9 100644 --- a/modules/core/src/viewports/globe-viewport.ts +++ b/modules/core/src/viewports/globe-viewport.ts @@ -2,8 +2,7 @@ import {Matrix4} from '@math.gl/core'; import Viewport from './viewport'; import {PROJECTION_MODE} from '../lib/constants'; -import * as vec3 from 'gl-matrix/vec3'; -import * as vec4 from 'gl-matrix/vec4'; +import {vec3, vec4} from '@math.gl/core'; const DEGREES_TO_RADIANS = Math.PI / 180; const RADIANS_TO_DEGREES = 180 / Math.PI; diff --git a/modules/core/src/viewports/orthographic-viewport.ts b/modules/core/src/viewports/orthographic-viewport.ts index db82d235f75..32331bad49b 100644 --- a/modules/core/src/viewports/orthographic-viewport.ts +++ b/modules/core/src/viewports/orthographic-viewport.ts @@ -1,8 +1,7 @@ import Viewport from '../viewports/viewport'; -import {Matrix4, clamp} from '@math.gl/core'; +import {Matrix4, clamp, vec2} from '@math.gl/core'; import {pixelsToWorld} from '@math.gl/web-mercator'; -import * as vec2 from 'gl-matrix/vec2'; import type {Padding} from './viewport'; diff --git a/modules/core/src/viewports/viewport.ts b/modules/core/src/viewports/viewport.ts index 19f09706a82..7a9b4e30311 100644 --- a/modules/core/src/viewports/viewport.ts +++ b/modules/core/src/viewports/viewport.ts @@ -21,8 +21,7 @@ import log from '../utils/log'; import {createMat4, getCameraPosition, getFrustumPlanes, FrustumPlane} from '../utils/math-utils'; -import {Matrix4, Vector3, equals, clamp} from '@math.gl/core'; -import * as mat4 from 'gl-matrix/mat4'; +import {Matrix4, Vector3, equals, clamp, mat4} from '@math.gl/core'; import { getDistanceScales, diff --git a/modules/core/src/viewports/web-mercator-viewport.ts b/modules/core/src/viewports/web-mercator-viewport.ts index 25d99504992..697c7745b11 100644 --- a/modules/core/src/viewports/web-mercator-viewport.ts +++ b/modules/core/src/viewports/web-mercator-viewport.ts @@ -35,9 +35,7 @@ import { } from '@math.gl/web-mercator'; import {Padding} from './viewport'; -// TODO - import from math.gl -import * as vec2 from 'gl-matrix/vec2'; -import {Matrix4, clamp} from '@math.gl/core'; +import {Matrix4, clamp, vec2} from '@math.gl/core'; export type WebMercatorViewportOptions = { /** Name of the viewport */ diff --git a/modules/extensions/package.json b/modules/extensions/package.json index e22815031fa..2712e81a3c2 100644 --- a/modules/extensions/package.json +++ b/modules/extensions/package.json @@ -40,10 +40,8 @@ "@luma.gl/engine": "9.0.0-alpha.37", "@luma.gl/shadertools": "9.0.0-alpha.37", "@luma.gl/webgl": "9.0.0-alpha.37", - "@math.gl/core": "4.0.0-alpha.4", - "@math.gl/constants": "4.0.0-alpha.4", - "@math.gl/web-mercator": "4.0.0-alpha.4", - "gl-matrix": "^3.0.0" + "@math.gl/core": "^4.0.0", + "@math.gl/web-mercator": "^4.0.0". }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/extensions/src/path-style/path-style-extension.ts b/modules/extensions/src/path-style/path-style-extension.ts index aadb1148389..11e54b34c5e 100644 --- a/modules/extensions/src/path-style/path-style-extension.ts +++ b/modules/extensions/src/path-style/path-style-extension.ts @@ -19,8 +19,8 @@ // THE SOFTWARE. import {LayerExtension, _mergeShaders as mergeShaders} from '@deck.gl/core'; +import {vec3} from '@math.gl/core'; import {dashShaders, offsetShaders} from './shaders.glsl'; -import {dist} from 'gl-matrix/vec3'; import type {Layer, LayerContext, Accessor, UpdateParameters} from '@deck.gl/core'; import type {Model} from '@luma.gl/engine'; @@ -172,7 +172,7 @@ export default class PathStyleExtension extends LayerExtension 0) { - result[i] = result[i - 1] + dist(prevP, p); + result[i] = result[i - 1] + vec3.dist(prevP, p); } prevP = p; diff --git a/modules/geo-layers/package.json b/modules/geo-layers/package.json index c4707e3f08b..d89f19aa0dc 100644 --- a/modules/geo-layers/package.json +++ b/modules/geo-layers/package.json @@ -40,9 +40,9 @@ "@loaders.gl/tiles": "^3.4.13", "@loaders.gl/wms": "^3.4.13", "@luma.gl/core": "9.0.0-alpha.37", - "@math.gl/core": "4.0.0-alpha.4", - "@math.gl/culling": "4.0.0-alpha.4", - "@math.gl/web-mercator": "4.0.0-alpha.4", + "@math.gl/core": "^4.0.0", + "@math.gl/culling": "^4.0.0", + "@math.gl/web-mercator": "^4.0.0", "@types/geojson": "^7946.0.8", "h3-js": "^4.1.0", "long": "^3.2.0" diff --git a/modules/google-maps/package.json b/modules/google-maps/package.json index 58a4ee80973..979a8e21366 100644 --- a/modules/google-maps/package.json +++ b/modules/google-maps/package.json @@ -41,7 +41,7 @@ "@luma.gl/engine": "9.0.0-alpha.37", "@luma.gl/webgl": "9.0.0-alpha.37", "@luma.gl/constants": "9.0.0-alpha.37", - "@math.gl/core": "4.0.0-alpha.4" + "@math.gl/core": "^4.0.0" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/modules/layers/package.json b/modules/layers/package.json index 975a636c883..046e1bbe5f6 100644 --- a/modules/layers/package.json +++ b/modules/layers/package.json @@ -37,9 +37,9 @@ "@luma.gl/shadertools": "9.0.0-alpha.37", "@luma.gl/constants": "9.0.0-alpha.37", "@mapbox/tiny-sdf": "^2.0.5", - "@math.gl/core": "4.0.0-alpha.4", - "@math.gl/polygon": "4.0.0-alpha.4", - "@math.gl/web-mercator": "4.0.0-alpha.4", + "@math.gl/core": "^4.0.0", + "@math.gl/polygon": "^4.0.0", + "@math.gl/web-mercator": "^4.0.0", "earcut": "^2.2.4" }, "peerDependencies": { diff --git a/modules/mapbox/package.json b/modules/mapbox/package.json index ed82e091008..63ae3ce6af2 100644 --- a/modules/mapbox/package.json +++ b/modules/mapbox/package.json @@ -31,8 +31,7 @@ }, "dependencies": { "@luma.gl/core": "9.0.0-alpha.37", - "@math.gl/web-mercator": "4.0.0-alpha.4", - "@types/mapbox-gl": "^2.6.3" + "@math.gl/web-mercator": "^4.0.0" }, "peerDependencies": { "@deck.gl/core": "^8.0.0" diff --git a/modules/test-utils/package.json b/modules/test-utils/package.json index c948cdace08..88e77c4cdf1 100644 --- a/modules/test-utils/package.json +++ b/modules/test-utils/package.json @@ -30,7 +30,7 @@ "@deck.gl/core": "^8.0.0", "@luma.gl/test-utils": "9.0.0-alpha.37", "@luma.gl/webgl": "9.0.0-alpha.37", - "@probe.gl/test-utils": "^4.0.4" + "@probe.gl/test-utils": "^4.0.0" }, "scripts": {}, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" diff --git a/package.json b/package.json index 5dc5ccc6ed5..4bbf17df354 100644 --- a/package.json +++ b/package.json @@ -18,14 +18,22 @@ ], "resolution_comments": { "escaper": "v2 has an invalid main field in package.json, breaks esbuild during browser test", - "vite": "process polyfill missing" + "vite": "process polyfill missing", + "math.gl": "loaders.gl pulls in v3 packages" }, "resolutions": { "@probe.gl/log": "4.0.4", "@probe.gl/stats": "4.0.4", "@probe.gl/env": "4.0.4", "escaper": "3.0.6", - "vite": "^4.3.9" + "escaper": "3.0.6", + "vite": "^4.3.9", + "math.gl": "^4.0.0", + "@math.gl/core": "^4.0.0", + "@math.gl/web-mercator": "^4.0.0", + "@math.gl/culling": "^4.0.0", + "@math.gl/geospatial": "^4.0.0", + "@math.gl/proj4": "^4.0.0" }, "scripts": { "bootstrap": "PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true yarn && ocular-bootstrap", @@ -60,11 +68,18 @@ "@babel/register": "^7.13.0", "@loaders.gl/csv": "^3.4.13", "@loaders.gl/polyfills": "^3.4.13", +<<<<<<< HEAD "@luma.gl/test-utils": "9.0.0-alpha.37", "@luma.gl/webgpu": "9.0.0-alpha.37", "@math.gl/proj4": "4.0.0-alpha.4", "@probe.gl/bench": "^4.0.4", "@probe.gl/test-utils": "^4.0.4", +======= + "@luma.gl/test-utils": "^8.5.20", + "@math.gl/proj4": "^4.0.0", + "@probe.gl/bench": "^4.0.0", + "@probe.gl/test-utils": "^4.0.0", +>>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) "@types/react": "^18.0.0", "abortcontroller-polyfill": "^1.5.0", "babel-loader": "^8.0.0", diff --git a/test/apps/frustum-cull/frustum-utils.js b/test/apps/frustum-cull/frustum-utils.js index 9c1f3e9cc65..2a9a0a1da62 100644 --- a/test/apps/frustum-cull/frustum-utils.js +++ b/test/apps/frustum-cull/frustum-utils.js @@ -1,5 +1,4 @@ -import {Vector3} from '@math.gl/core'; -import * as mat3 from 'gl-matrix/mat3'; +import {Vector3, mat3} from '@math.gl/core'; const NEAR = [255, 0, 128]; const FAR = [128, 0, 255]; diff --git a/test/apps/mask-first-person/package.json b/test/apps/mask-first-person/package.json index 9f96e7a0a75..773748afab3 100644 --- a/test/apps/mask-first-person/package.json +++ b/test/apps/mask-first-person/package.json @@ -5,7 +5,7 @@ }, "dependencies": { "deck.gl": "^8.4.0", - "@math.gl/core": "4.0.0-alpha.4", + "@math.gl/core": "^4.0.0", "@turf/circle": "6.5.0" }, "devDependencies": { diff --git a/test/apps/multi-viewport/package.json b/test/apps/multi-viewport/package.json index 009572fd5b9..e3d430b960d 100644 --- a/test/apps/multi-viewport/package.json +++ b/test/apps/multi-viewport/package.json @@ -5,7 +5,7 @@ }, "dependencies": { "deck.gl": "^8.4.0", - "@math.gl/core": "4.0.0-alpha.4", + "@math.gl/core": "^4.0.0", "maplibre-gl": "^2.4.0", "react": "^18.0.0", "react-dom": "^18.0.0", diff --git a/test/modules/core/effects/lighting/sunlight.spec.ts b/test/modules/core/effects/lighting/sunlight.spec.ts index e389dca4cd8..a1e4d4603a8 100644 --- a/test/modules/core/effects/lighting/sunlight.spec.ts +++ b/test/modules/core/effects/lighting/sunlight.spec.ts @@ -2,8 +2,7 @@ import test from 'tape-promise/tape'; import {WebMercatorViewport, _GlobeViewport as GlobeViewport, PolygonLayer} from 'deck.gl'; import {_SunLight as SunLight} from '@deck.gl/core'; - -import {angle} from 'gl-matrix/vec3'; +import {vec3} from '@math.gl/core'; test('Sunlight#Constructor', t => { const sunLight = new SunLight({ @@ -110,7 +109,7 @@ test('Sunlight#getProjectedLight', t => { layer.context.viewport = testCase.viewport; const projectedLight = sunLight.getProjectedLight({layer}); t.comment(projectedLight.direction.join(',')); - t.ok(angle(projectedLight.direction, testCase.expected) < 0.05, testCase.title); + t.ok(vec3.angle(projectedLight.direction, testCase.expected) < 0.05, testCase.title); } t.end(); diff --git a/yarn.lock b/yarn.lock index b1c5c42498b..b0da37dd50d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3044,15 +3044,22 @@ resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe" integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q== +<<<<<<< HEAD "@math.gl/core@3.6.2", "@math.gl/core@^3.5.1": version "3.6.2" resolved "https://registry.yarnpkg.com/@math.gl/core/-/core-3.6.2.tgz#2f05c0f9655b1979fd8a74147d463d7795eb29a3" integrity sha512-1GxQNy1EI1FvJNw3VRKoV97ZAOfDaGMRyfasA0RSl7IT98deLUOga6K5LOy4VYpD2YFgF85RBabpO6xJKyJHQg== +======= +"@math.gl/core@3.6.3", "@math.gl/core@4.0.0", "@math.gl/core@^3.5.0", "@math.gl/core@^3.5.1", "@math.gl/core@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@math.gl/core/-/core-4.0.0.tgz#db64af16743ee4def7c1e294b3d1247621d2dabc" + integrity sha512-qGbP4R8G0dsh5OUO+eWKX5NJwZitkV8CdVEolRFSoPteE0lrWxsg01FwAjegKv4jCm975VJ4HxDcb4L6KAiGGw== +>>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) dependencies: "@babel/runtime" "^7.12.0" - "@math.gl/types" "3.6.2" - gl-matrix "^3.4.0" + "@math.gl/types" "4.0.0" +<<<<<<< HEAD "@math.gl/core@4.0.0-alpha.4": version "4.0.0-alpha.4" resolved "https://registry.yarnpkg.com/@math.gl/core/-/core-4.0.0-alpha.4.tgz#6d8b4ecb084be6800800fe8748fc173dc5e64f72" @@ -3116,14 +3123,61 @@ version "4.0.0-alpha.4" resolved "https://registry.yarnpkg.com/@math.gl/sun/-/sun-4.0.0-alpha.4.tgz#a33680040cdffa621debf01d0e0f6a1fdae8ea5b" integrity sha512-uBS2u+cBCYS9uTYuZsthui1AppzzUZepAJhMm71f1yeFYdv37I2HARou2/e65JoLKMRNOpA6bNyN79WzYZwW+w== +======= +"@math.gl/culling@^3.5.1", "@math.gl/culling@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@math.gl/culling/-/culling-4.0.0.tgz#5bb96ec38645944088176911a6f4aab43b265cb9" + integrity sha512-8+btkQZtirG64kGbWs/UBoLnXPLw83D1g0sKgZQG32bQLm2dnArMynfqkPs/Mkj5Cm3MvwkTSdz6vN4a3FF6UA== dependencies: "@babel/runtime" "^7.12.0" + "@math.gl/core" "4.0.0" -"@math.gl/types@3.6.2": - version "3.6.2" - resolved "https://registry.yarnpkg.com/@math.gl/types/-/types-3.6.2.tgz#2c17c5d88b3ae968df1f9af0f959de08389536e6" - integrity sha512-Vl9rod2vJDk0LofWrAWlBS3kAQO9a/V2w6MtXBOOpjF7USa4qECE9kjhKTORUET/OH2gHbzrgBDAzhATgnsAvg== +"@math.gl/geospatial@^3.5.1", "@math.gl/geospatial@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@math.gl/geospatial/-/geospatial-4.0.0.tgz#fdaf8546dc6e2459134a0b2e2bc20a0cc6baac9d" + integrity sha512-bfUqDbu9ZftmiMERMkM1b1N01RVrFUT0d6VuiMRER0d8R5GrWuRccZxROPoS52lyo692nJa0Z4Or97WJxLUYYw== + dependencies: + "@babel/runtime" "^7.12.0" + "@math.gl/core" "4.0.0" + +"@math.gl/polygon@^3.5.1": + version "3.6.3" + resolved "https://registry.yarnpkg.com/@math.gl/polygon/-/polygon-3.6.3.tgz#0c19c0b059cedde1cd760cc3796e9180f75bcbde" + integrity sha512-FivQ1ZnYcAss1wVifOkHP/ZnlfQy1IL/769uzNtiHxwUbW0kZG3yyOZ9I7fwyzR5Hvqt3ErJKHjSYZr0uVlz5g== + dependencies: + "@math.gl/core" "3.6.3" + +"@math.gl/polygon@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@math.gl/polygon/-/polygon-4.0.0.tgz#17d2b1c7569d5a7fd1cde67e885d77e5742c23ec" + integrity sha512-BsseetloYtSZkphH5Fqn02uCL9UWsD26DNLfGhvd2farhU9BaJnn0JGuZnRWT/rf+glZZcDJkyqHq5pDnSX/BQ== + dependencies: + "@math.gl/core" "4.0.0" + +"@math.gl/proj4@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@math.gl/proj4/-/proj4-4.0.0.tgz#5073be8eedfb61decca9cb20d07116bee37748f4" + integrity sha512-gMVTlhzb1Mbq1F32jDph2nJivkipcGNU+Nx+jovFT9shplXwXeEdZxObjngYCtQiZEM3HqFFTbTnA1YhhZsG7A== + dependencies: + "@babel/runtime" "^7.12.0" + "@math.gl/core" "4.0.0" + "@types/proj4" "^2.5.0" + proj4 "2.6.2" + +"@math.gl/sun@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@math.gl/sun/-/sun-4.0.0.tgz#20cf7960093e26d29685d76ee8b7364e38f9460e" + integrity sha512-CEjq/IC/RWjrqgmG/496yJDmwgiASKBnFPjEsGcbVpwFh0kM8wLUGykf9z3nHQ0nY54RwgbrR1nyzQuAqDLShw== +>>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) + dependencies: + "@babel/runtime" "^7.12.0" +"@math.gl/types@4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@math.gl/types/-/types-4.0.0.tgz#20c649dcef8459d9dd1f83a708d7410fe06a3309" + integrity sha512-ZqU7o0LFaWQK/0wYobCwQKrKhRHaihps8oE74CLnWAdTTjXkM2vA8dU7vdx238QfXkNkz4Mv+KYklHpXMQJ8Hw== + +<<<<<<< HEAD "@math.gl/types@4.0.0-alpha.4": version "4.0.0-alpha.4" resolved "https://registry.yarnpkg.com/@math.gl/types/-/types-4.0.0-alpha.4.tgz#eb2875f2e20dd03ddcd3033153bec413dc430935" @@ -3141,9 +3195,14 @@ version "3.6.2" resolved "https://registry.yarnpkg.com/@math.gl/web-mercator/-/web-mercator-3.6.2.tgz#1fd8fc2f1dfa794e5fe03eed328d53f69e7bf932" integrity sha512-jud2n6YEPp0+PHseG/gtJXskYAMQEM3bOyyPdwwEeu9OekjeWvkC9q3OGDF7Ve7KUA2kPbNzpD/r8VBhuixk8w== +======= +"@math.gl/web-mercator@^3.1.3", "@math.gl/web-mercator@^3.5.1", "@math.gl/web-mercator@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@math.gl/web-mercator/-/web-mercator-4.0.0.tgz#2df70ec478b464337991b9fcdc3acaacf41311cc" + integrity sha512-dtzjaJPckyAEsCT0eHayPoZ8RrHg7XkQq9fZAHAn8CPiyLX0J0ZdvpH1x4a3qe7Ct7CPo6ChnqSk0DwItA4aNQ== +>>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) dependencies: "@babel/runtime" "^7.12.0" - gl-matrix "^3.4.0" "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" @@ -3279,7 +3338,11 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.3.tgz#8b68da1ebd7fc603999cf6ebee34a4899a14b88e" integrity sha512-xDu17cEfh7Kid/d95kB6tZsLOmSWKCZKtprnhVepjsSaCij+lM3mItSJDuuHDMbCWTh8Ejmebwb+KONcCJ0eXQ== +<<<<<<< HEAD "@probe.gl/bench@^4.0.4": +======= +"@probe.gl/bench@^4.0.0": +>>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) version "4.0.4" resolved "https://registry.yarnpkg.com/@probe.gl/bench/-/bench-4.0.4.tgz#833353fac77a74dc4b7b32b12da9ca6319995063" integrity sha512-7cf8VLdt4/8lhsUnt6+0bxGaYCK2udeuQ2uwUtyR4nCWcOPbVhknt6XcSI8l6NRrr4oGEJ3vF9nj5561dIl3Gg== @@ -3287,14 +3350,36 @@ "@babel/runtime" "^7.0.0" "@probe.gl/log" "4.0.4" +<<<<<<< HEAD "@probe.gl/env@4.0.4", "@probe.gl/env@^4.0.2", "@probe.gl/env@^4.0.4": +======= +"@probe.gl/env@3.5.0", "@probe.gl/env@^3.5.0": + version "3.5.0" + resolved "https://registry.yarnpkg.com/@probe.gl/env/-/env-3.5.0.tgz#c6d8fbf414fda3eba7b3813cc274e76245216fe0" + integrity sha512-YdlpZZshhyYxvWDBmZ5RIW2pTR14Pw4p9czMlt/v7F6HbFzWfAdmH7q6xVwFRYxUpQLwhWensWyv4aFysiWl4g== + dependencies: + "@babel/runtime" "^7.0.0" + +"@probe.gl/env@4.0.3": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@probe.gl/env/-/env-4.0.3.tgz#c437b139953ceda9c1a13bad2be9c14d3ff3ba03" + integrity sha512-Iz2/xPHMa5adDBw/m7nyQ0bKgLXZqMauPfV2ePU9ZOfkt6NnWMzQAjBeeXufujE6vndJUAALgpweO/YjYkKo+Q== + dependencies: + "@babel/runtime" "^7.0.0" + +"@probe.gl/env@4.0.4", "@probe.gl/env@^4.0.0": +>>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) version "4.0.4" resolved "https://registry.yarnpkg.com/@probe.gl/env/-/env-4.0.4.tgz#ea4e7d16f143faaf1e863316c6ccfe68db8b66a4" integrity sha512-sYNGqesDfWD6dFP5oNZtTeFA4Z6ak5T4a8BNPdNhoqy7PK9w70JHrb6mv+RKWqKXq33KiwCDWL7fYxx2HuEH2w== dependencies: "@babel/runtime" "^7.0.0" +<<<<<<< HEAD "@probe.gl/log@4.0.4", "@probe.gl/log@^4.0.1", "@probe.gl/log@^4.0.2", "@probe.gl/log@^4.0.4": +======= +"@probe.gl/log@4.0.4", "@probe.gl/log@^4.0.0": +>>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) version "4.0.4" resolved "https://registry.yarnpkg.com/@probe.gl/log/-/log-4.0.4.tgz#e42d1d0e22981c4010521c350cad2305bce02976" integrity sha512-WpmXl6njlBMwrm8HBh/b4kSp/xnY1VVmeT4PWUKF+RkVbFuKQbsU11dA1IxoMd7gSY+5DGIwxGfAv1H5OMzA4A== @@ -3309,7 +3394,25 @@ dependencies: "@babel/runtime" "^7.0.0" +<<<<<<< HEAD "@probe.gl/test-utils@^4.0.3", "@probe.gl/test-utils@^4.0.4": +======= +"@probe.gl/stats@^4.0.0": + version "4.0.4" + resolved "https://registry.yarnpkg.com/@probe.gl/stats/-/stats-4.0.4.tgz#b33a47bf192951d0789dfd2044b295c3709386bd" + integrity sha512-SDuSY/D4yDL6LQDa69l/GCcnZLRiGYdyvYkxWb0CgnzTPdPrcdrzGkzkvpC3zsA4fEFw2smlDje370QGHwlisg== + dependencies: + "@babel/runtime" "^7.0.0" + +"@probe.gl/stats@^4.0.1": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@probe.gl/stats/-/stats-4.0.3.tgz#a17ea752eb3d7540d0a5c92d8c9cea268a48930a" + integrity sha512-8BNKDmgwNqvcBNEcsIavtEWQp1WvBfryLodAv1YX8/Swg60Ky3ElDNNpSDuIVMnFDvI/De0zXiuXXydtn86/vA== + dependencies: + "@babel/runtime" "^7.0.0" + +"@probe.gl/test-utils@^4.0.0", "@probe.gl/test-utils@^4.0.3": +>>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) version "4.0.4" resolved "https://registry.yarnpkg.com/@probe.gl/test-utils/-/test-utils-4.0.4.tgz#86533d0a6ea3db03d3d41356830e4de8b0d84c8d" integrity sha512-VxcFQ0yxgvbdL/4HQnrSFhaSRoUYGm6UB7xlah+DNUhBOJNF+30Cba7ekZYkq6u1ggcS+bRIf7Susgb4UXuI3g== @@ -7091,7 +7194,11 @@ gl-matrix@^3.0.0: resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.3.0.tgz#232eef60b1c8b30a28cbbe75b2caf6c48fd6358b" integrity sha512-COb7LDz+SXaHtl/h4LeaFcNdJdAQSDeVqjiIihSXNrkWObZLhDI4hIkZC11Aeqp7bcE72clzB0BnDXr2SmslRA== +<<<<<<< HEAD gl-matrix@^3.2.1, gl-matrix@^3.4.0, gl-matrix@^3.4.3: +======= +gl-matrix@^3.2.1: +>>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) version "3.4.3" resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.4.3.tgz#fc1191e8320009fd4d20e9339595c6041ddc22c9" integrity sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA== @@ -8803,6 +8910,16 @@ mapbox-gl@^1.13.2: tinyqueue "^2.0.3" vt-pbf "^3.1.1" +<<<<<<< HEAD +======= +math.gl@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/math.gl/-/math.gl-4.0.0.tgz#3ad72415de664df1f7e93e3d6af3a738f89a93fc" + integrity sha512-YTRDrbw3QZt+MeUB34M8j8UnhnhjztdKu72hwYuqYGPPjPmfNDgo+4gmHcW1cywgL7u6f9ePieAp1F5jKOuOBg== + dependencies: + "@math.gl/core" "4.0.0" + +>>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) mdast-util-from-markdown@^0.8.5: version "0.8.5" resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz#d1ef2ca42bc377ecb0463a987910dae89bd9a28c" From 1084a03e234747240d735d0c531b8e76a53422d7 Mon Sep 17 00:00:00 2001 From: Ib Green Date: Sat, 14 Oct 2023 09:48:40 -0400 Subject: [PATCH 2/5] Bump 9,0 to math.gl@4.0.0 --- modules/extensions/package.json | 2 +- package.json | 10 +- yarn.lock | 158 ++------------------------------ 3 files changed, 8 insertions(+), 162 deletions(-) diff --git a/modules/extensions/package.json b/modules/extensions/package.json index 2712e81a3c2..ae390fbd768 100644 --- a/modules/extensions/package.json +++ b/modules/extensions/package.json @@ -41,7 +41,7 @@ "@luma.gl/shadertools": "9.0.0-alpha.37", "@luma.gl/webgl": "9.0.0-alpha.37", "@math.gl/core": "^4.0.0", - "@math.gl/web-mercator": "^4.0.0". + "@math.gl/web-mercator": "^4.0.0" }, "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4" } diff --git a/package.json b/package.json index 4bbf17df354..07fdb5fcbbe 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ "@probe.gl/stats": "4.0.4", "@probe.gl/env": "4.0.4", "escaper": "3.0.6", - "escaper": "3.0.6", "vite": "^4.3.9", "math.gl": "^4.0.0", "@math.gl/core": "^4.0.0", @@ -68,18 +67,11 @@ "@babel/register": "^7.13.0", "@loaders.gl/csv": "^3.4.13", "@loaders.gl/polyfills": "^3.4.13", -<<<<<<< HEAD "@luma.gl/test-utils": "9.0.0-alpha.37", "@luma.gl/webgpu": "9.0.0-alpha.37", - "@math.gl/proj4": "4.0.0-alpha.4", + "@math.gl/proj4": "^4.0.0", "@probe.gl/bench": "^4.0.4", "@probe.gl/test-utils": "^4.0.4", -======= - "@luma.gl/test-utils": "^8.5.20", - "@math.gl/proj4": "^4.0.0", - "@probe.gl/bench": "^4.0.0", - "@probe.gl/test-utils": "^4.0.0", ->>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) "@types/react": "^18.0.0", "abortcontroller-polyfill": "^1.5.0", "babel-loader": "^8.0.0", diff --git a/yarn.lock b/yarn.lock index b0da37dd50d..cb745dfe896 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3044,86 +3044,14 @@ resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe" integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q== -<<<<<<< HEAD -"@math.gl/core@3.6.2", "@math.gl/core@^3.5.1": - version "3.6.2" - resolved "https://registry.yarnpkg.com/@math.gl/core/-/core-3.6.2.tgz#2f05c0f9655b1979fd8a74147d463d7795eb29a3" - integrity sha512-1GxQNy1EI1FvJNw3VRKoV97ZAOfDaGMRyfasA0RSl7IT98deLUOga6K5LOy4VYpD2YFgF85RBabpO6xJKyJHQg== -======= -"@math.gl/core@3.6.3", "@math.gl/core@4.0.0", "@math.gl/core@^3.5.0", "@math.gl/core@^3.5.1", "@math.gl/core@^4.0.0": +"@math.gl/core@3.6.2", "@math.gl/core@4.0.0", "@math.gl/core@4.0.0-alpha.4", "@math.gl/core@^3.5.1", "@math.gl/core@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@math.gl/core/-/core-4.0.0.tgz#db64af16743ee4def7c1e294b3d1247621d2dabc" integrity sha512-qGbP4R8G0dsh5OUO+eWKX5NJwZitkV8CdVEolRFSoPteE0lrWxsg01FwAjegKv4jCm975VJ4HxDcb4L6KAiGGw== ->>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) dependencies: "@babel/runtime" "^7.12.0" "@math.gl/types" "4.0.0" -<<<<<<< HEAD -"@math.gl/core@4.0.0-alpha.4": - version "4.0.0-alpha.4" - resolved "https://registry.yarnpkg.com/@math.gl/core/-/core-4.0.0-alpha.4.tgz#6d8b4ecb084be6800800fe8748fc173dc5e64f72" - integrity sha512-lP8Sb1t2b4nmNTAwk6U0BG1Sl1/oj2PTUQTrFLUq0itEk5ppcc6Z6VqYovgxoOng44e5cLx7rfdaDT9l3EjTqQ== - dependencies: - "@babel/runtime" "^7.12.0" - "@math.gl/types" "4.0.0-alpha.4" - -"@math.gl/culling@4.0.0-alpha.4": - version "4.0.0-alpha.4" - resolved "https://registry.yarnpkg.com/@math.gl/culling/-/culling-4.0.0-alpha.4.tgz#3ec98adffd3bfcd63f7f10e6941e529bca24749c" - integrity sha512-BzQnG9SDQy84safvKNBg942ocfUwrEXPDJPkCOAf1EAdDAE8f3PdVx3QCymilxBj7c2d+NylAL2hGrMzIGhZ1w== - dependencies: - "@babel/runtime" "^7.12.0" - "@math.gl/core" "4.0.0-alpha.4" - gl-matrix "^3.4.3" - -"@math.gl/culling@^3.5.1": - version "3.6.2" - resolved "https://registry.yarnpkg.com/@math.gl/culling/-/culling-3.6.2.tgz#f35e1b18cd8b3c1e48f29ff41a8c54202fb7c691" - integrity sha512-KYO4Wi8XY4dNh7GrPke0A6Z6hQS4CAxnUVkFIIilLH0z4PggdMC/NrHezMlTwVxJS0Zvuy/Pr5uP5Nm9HY5y0g== - dependencies: - "@babel/runtime" "^7.12.0" - "@math.gl/core" "3.6.2" - gl-matrix "^3.4.0" - -"@math.gl/geospatial@^3.5.1": - version "3.6.2" - resolved "https://registry.yarnpkg.com/@math.gl/geospatial/-/geospatial-3.6.2.tgz#db0fb64cdf49bdf8db344bbae3d585f4045b84ff" - integrity sha512-FAg0JT7n3V4p/FuN1b6jiou+jaMxtj2GAvj8qArv0XK0L+CBd7SOl9J/LWr+GCMvX8wAvOXdB3AzrdV2UwUsuQ== - dependencies: - "@babel/runtime" "^7.12.0" - "@math.gl/core" "3.6.2" - gl-matrix "^3.4.0" - -"@math.gl/polygon@4.0.0-alpha.4": - version "4.0.0-alpha.4" - resolved "https://registry.yarnpkg.com/@math.gl/polygon/-/polygon-4.0.0-alpha.4.tgz#f12b227df950858caa5eab746f75d2cde59375da" - integrity sha512-fDQMPGp+bVcJGMRBy+zd8kQQBnaVwjDv25UgXKDXsFvPPNRC7uyr6xXcoGsujPXAdnU5sfpG66VATfOzHYkd1A== - dependencies: - "@math.gl/core" "4.0.0-alpha.4" - -"@math.gl/polygon@^3.5.1": - version "3.6.2" - resolved "https://registry.yarnpkg.com/@math.gl/polygon/-/polygon-3.6.2.tgz#6999d20b227ea89877ed61655a3ea7c898fe4bd6" - integrity sha512-Kq9jQrO4Iv1oGb5/goS6JFzezYmynW7PrmKXLiI7vvS6jGw/ATZzl7Wn+8Svlta9NpuKKPI7DcBYSYSvfmnIoA== - dependencies: - "@math.gl/core" "3.6.2" - -"@math.gl/proj4@4.0.0-alpha.4": - version "4.0.0-alpha.4" - resolved "https://registry.yarnpkg.com/@math.gl/proj4/-/proj4-4.0.0-alpha.4.tgz#3d37fd575bc90571974b8221da9bd59805884bfd" - integrity sha512-H41jm9/V2j73aQ3RZqHJuFO0FW/Jmkny+dtCh0gfhAIrrEitzva70hkx8u7/1xTqjYpj6uA9Z86W/BTGOvH1nw== - dependencies: - "@babel/runtime" "^7.12.0" - "@math.gl/core" "4.0.0-alpha.4" - "@types/proj4" "^2.5.0" - proj4 "2.6.2" - -"@math.gl/sun@4.0.0-alpha.4": - version "4.0.0-alpha.4" - resolved "https://registry.yarnpkg.com/@math.gl/sun/-/sun-4.0.0-alpha.4.tgz#a33680040cdffa621debf01d0e0f6a1fdae8ea5b" - integrity sha512-uBS2u+cBCYS9uTYuZsthui1AppzzUZepAJhMm71f1yeFYdv37I2HARou2/e65JoLKMRNOpA6bNyN79WzYZwW+w== -======= "@math.gl/culling@^3.5.1", "@math.gl/culling@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@math.gl/culling/-/culling-4.0.0.tgz#5bb96ec38645944088176911a6f4aab43b265cb9" @@ -3141,11 +3069,11 @@ "@math.gl/core" "4.0.0" "@math.gl/polygon@^3.5.1": - version "3.6.3" - resolved "https://registry.yarnpkg.com/@math.gl/polygon/-/polygon-3.6.3.tgz#0c19c0b059cedde1cd760cc3796e9180f75bcbde" - integrity sha512-FivQ1ZnYcAss1wVifOkHP/ZnlfQy1IL/769uzNtiHxwUbW0kZG3yyOZ9I7fwyzR5Hvqt3ErJKHjSYZr0uVlz5g== + version "3.6.2" + resolved "https://registry.yarnpkg.com/@math.gl/polygon/-/polygon-3.6.2.tgz#6999d20b227ea89877ed61655a3ea7c898fe4bd6" + integrity sha512-Kq9jQrO4Iv1oGb5/goS6JFzezYmynW7PrmKXLiI7vvS6jGw/ATZzl7Wn+8Svlta9NpuKKPI7DcBYSYSvfmnIoA== dependencies: - "@math.gl/core" "3.6.3" + "@math.gl/core" "3.6.2" "@math.gl/polygon@^4.0.0": version "4.0.0" @@ -3168,7 +3096,6 @@ version "4.0.0" resolved "https://registry.yarnpkg.com/@math.gl/sun/-/sun-4.0.0.tgz#20cf7960093e26d29685d76ee8b7364e38f9460e" integrity sha512-CEjq/IC/RWjrqgmG/496yJDmwgiASKBnFPjEsGcbVpwFh0kM8wLUGykf9z3nHQ0nY54RwgbrR1nyzQuAqDLShw== ->>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) dependencies: "@babel/runtime" "^7.12.0" @@ -3177,30 +3104,15 @@ resolved "https://registry.yarnpkg.com/@math.gl/types/-/types-4.0.0.tgz#20c649dcef8459d9dd1f83a708d7410fe06a3309" integrity sha512-ZqU7o0LFaWQK/0wYobCwQKrKhRHaihps8oE74CLnWAdTTjXkM2vA8dU7vdx238QfXkNkz4Mv+KYklHpXMQJ8Hw== -<<<<<<< HEAD "@math.gl/types@4.0.0-alpha.4": version "4.0.0-alpha.4" resolved "https://registry.yarnpkg.com/@math.gl/types/-/types-4.0.0-alpha.4.tgz#eb2875f2e20dd03ddcd3033153bec413dc430935" integrity sha512-+sA2EJKFbB57xDgkiTSTelnnrvmTG0ZxoYZOEEgwr6y4AKfzzBsuESTVjUfv0o5LnuDv8ctJ1vHXm4Khg9bjsg== -"@math.gl/web-mercator@4.0.0-alpha.4": - version "4.0.0-alpha.4" - resolved "https://registry.yarnpkg.com/@math.gl/web-mercator/-/web-mercator-4.0.0-alpha.4.tgz#58de9b7eba014e292ecde96b5f3ba8e6ab883a0c" - integrity sha512-vl3ybYsZCFzWsNGlc+bxJKrwymP/kOyesCWSpGZ4P/9vUJ7cXPB8nlScolBK4G3ecXeNBdw43EiA9b8jEqmXZg== - dependencies: - "@babel/runtime" "^7.12.0" - gl-matrix "^3.4.3" - -"@math.gl/web-mercator@^3.1.3", "@math.gl/web-mercator@^3.5.1": - version "3.6.2" - resolved "https://registry.yarnpkg.com/@math.gl/web-mercator/-/web-mercator-3.6.2.tgz#1fd8fc2f1dfa794e5fe03eed328d53f69e7bf932" - integrity sha512-jud2n6YEPp0+PHseG/gtJXskYAMQEM3bOyyPdwwEeu9OekjeWvkC9q3OGDF7Ve7KUA2kPbNzpD/r8VBhuixk8w== -======= "@math.gl/web-mercator@^3.1.3", "@math.gl/web-mercator@^3.5.1", "@math.gl/web-mercator@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@math.gl/web-mercator/-/web-mercator-4.0.0.tgz#2df70ec478b464337991b9fcdc3acaacf41311cc" integrity sha512-dtzjaJPckyAEsCT0eHayPoZ8RrHg7XkQq9fZAHAn8CPiyLX0J0ZdvpH1x4a3qe7Ct7CPo6ChnqSk0DwItA4aNQ== ->>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) dependencies: "@babel/runtime" "^7.12.0" @@ -3338,11 +3250,7 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.3.tgz#8b68da1ebd7fc603999cf6ebee34a4899a14b88e" integrity sha512-xDu17cEfh7Kid/d95kB6tZsLOmSWKCZKtprnhVepjsSaCij+lM3mItSJDuuHDMbCWTh8Ejmebwb+KONcCJ0eXQ== -<<<<<<< HEAD "@probe.gl/bench@^4.0.4": -======= -"@probe.gl/bench@^4.0.0": ->>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) version "4.0.4" resolved "https://registry.yarnpkg.com/@probe.gl/bench/-/bench-4.0.4.tgz#833353fac77a74dc4b7b32b12da9ca6319995063" integrity sha512-7cf8VLdt4/8lhsUnt6+0bxGaYCK2udeuQ2uwUtyR4nCWcOPbVhknt6XcSI8l6NRrr4oGEJ3vF9nj5561dIl3Gg== @@ -3350,36 +3258,14 @@ "@babel/runtime" "^7.0.0" "@probe.gl/log" "4.0.4" -<<<<<<< HEAD "@probe.gl/env@4.0.4", "@probe.gl/env@^4.0.2", "@probe.gl/env@^4.0.4": -======= -"@probe.gl/env@3.5.0", "@probe.gl/env@^3.5.0": - version "3.5.0" - resolved "https://registry.yarnpkg.com/@probe.gl/env/-/env-3.5.0.tgz#c6d8fbf414fda3eba7b3813cc274e76245216fe0" - integrity sha512-YdlpZZshhyYxvWDBmZ5RIW2pTR14Pw4p9czMlt/v7F6HbFzWfAdmH7q6xVwFRYxUpQLwhWensWyv4aFysiWl4g== - dependencies: - "@babel/runtime" "^7.0.0" - -"@probe.gl/env@4.0.3": - version "4.0.3" - resolved "https://registry.yarnpkg.com/@probe.gl/env/-/env-4.0.3.tgz#c437b139953ceda9c1a13bad2be9c14d3ff3ba03" - integrity sha512-Iz2/xPHMa5adDBw/m7nyQ0bKgLXZqMauPfV2ePU9ZOfkt6NnWMzQAjBeeXufujE6vndJUAALgpweO/YjYkKo+Q== - dependencies: - "@babel/runtime" "^7.0.0" - -"@probe.gl/env@4.0.4", "@probe.gl/env@^4.0.0": ->>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) version "4.0.4" resolved "https://registry.yarnpkg.com/@probe.gl/env/-/env-4.0.4.tgz#ea4e7d16f143faaf1e863316c6ccfe68db8b66a4" integrity sha512-sYNGqesDfWD6dFP5oNZtTeFA4Z6ak5T4a8BNPdNhoqy7PK9w70JHrb6mv+RKWqKXq33KiwCDWL7fYxx2HuEH2w== dependencies: "@babel/runtime" "^7.0.0" -<<<<<<< HEAD "@probe.gl/log@4.0.4", "@probe.gl/log@^4.0.1", "@probe.gl/log@^4.0.2", "@probe.gl/log@^4.0.4": -======= -"@probe.gl/log@4.0.4", "@probe.gl/log@^4.0.0": ->>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) version "4.0.4" resolved "https://registry.yarnpkg.com/@probe.gl/log/-/log-4.0.4.tgz#e42d1d0e22981c4010521c350cad2305bce02976" integrity sha512-WpmXl6njlBMwrm8HBh/b4kSp/xnY1VVmeT4PWUKF+RkVbFuKQbsU11dA1IxoMd7gSY+5DGIwxGfAv1H5OMzA4A== @@ -3394,25 +3280,7 @@ dependencies: "@babel/runtime" "^7.0.0" -<<<<<<< HEAD "@probe.gl/test-utils@^4.0.3", "@probe.gl/test-utils@^4.0.4": -======= -"@probe.gl/stats@^4.0.0": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@probe.gl/stats/-/stats-4.0.4.tgz#b33a47bf192951d0789dfd2044b295c3709386bd" - integrity sha512-SDuSY/D4yDL6LQDa69l/GCcnZLRiGYdyvYkxWb0CgnzTPdPrcdrzGkzkvpC3zsA4fEFw2smlDje370QGHwlisg== - dependencies: - "@babel/runtime" "^7.0.0" - -"@probe.gl/stats@^4.0.1": - version "4.0.3" - resolved "https://registry.yarnpkg.com/@probe.gl/stats/-/stats-4.0.3.tgz#a17ea752eb3d7540d0a5c92d8c9cea268a48930a" - integrity sha512-8BNKDmgwNqvcBNEcsIavtEWQp1WvBfryLodAv1YX8/Swg60Ky3ElDNNpSDuIVMnFDvI/De0zXiuXXydtn86/vA== - dependencies: - "@babel/runtime" "^7.0.0" - -"@probe.gl/test-utils@^4.0.0", "@probe.gl/test-utils@^4.0.3": ->>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) version "4.0.4" resolved "https://registry.yarnpkg.com/@probe.gl/test-utils/-/test-utils-4.0.4.tgz#86533d0a6ea3db03d3d41356830e4de8b0d84c8d" integrity sha512-VxcFQ0yxgvbdL/4HQnrSFhaSRoUYGm6UB7xlah+DNUhBOJNF+30Cba7ekZYkq6u1ggcS+bRIf7Susgb4UXuI3g== @@ -3560,7 +3428,7 @@ resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g== -"@types/geojson@*", "@types/geojson@^7946.0.7", "@types/geojson@^7946.0.8": +"@types/geojson@^7946.0.7", "@types/geojson@^7946.0.8": version "7946.0.8" resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca" integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA== @@ -3616,13 +3484,6 @@ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.155.tgz#e2b4514f46a261fd11542e47519c20ebce7bc23a" integrity sha512-vEcX7S7aPhsBCivxMwAANQburHBtfN9RdyXFk84IJmu2Z4Hkg1tOFgaslRiEqqvoLtbCBi6ika1EMspE+NZ9Lg== -"@types/mapbox-gl@^2.6.3": - version "2.6.3" - resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-2.6.3.tgz#09e4992bb540fe5e024eebc5fbc315317cb13ffe" - integrity sha512-oF5eQmczkoPQfxfRSwpF9GcrWi3YleptJ67uiCQKps+7aKxwIbww0EHHqIrxvOg49l07+AZBtJU2FPKZm1jKAg== - dependencies: - "@types/geojson" "*" - "@types/mdast@^3.0.0": version "3.0.10" resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af" @@ -7194,11 +7055,7 @@ gl-matrix@^3.0.0: resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.3.0.tgz#232eef60b1c8b30a28cbbe75b2caf6c48fd6358b" integrity sha512-COb7LDz+SXaHtl/h4LeaFcNdJdAQSDeVqjiIihSXNrkWObZLhDI4hIkZC11Aeqp7bcE72clzB0BnDXr2SmslRA== -<<<<<<< HEAD -gl-matrix@^3.2.1, gl-matrix@^3.4.0, gl-matrix@^3.4.3: -======= gl-matrix@^3.2.1: ->>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) version "3.4.3" resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.4.3.tgz#fc1191e8320009fd4d20e9339595c6041ddc22c9" integrity sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA== @@ -8910,8 +8767,6 @@ mapbox-gl@^1.13.2: tinyqueue "^2.0.3" vt-pbf "^3.1.1" -<<<<<<< HEAD -======= math.gl@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/math.gl/-/math.gl-4.0.0.tgz#3ad72415de664df1f7e93e3d6af3a738f89a93fc" @@ -8919,7 +8774,6 @@ math.gl@^4.0.0: dependencies: "@math.gl/core" "4.0.0" ->>>>>>> 719ece647 (chore: Upgrade to math.gl@4.0.0. Remove gl-matrix) mdast-util-from-markdown@^0.8.5: version "0.8.5" resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz#d1ef2ca42bc377ecb0463a987910dae89bd9a28c" From 182b01189c50b183adeac511ec7d71000677e310 Mon Sep 17 00:00:00 2001 From: Ib Green Date: Sat, 14 Oct 2023 09:55:19 -0400 Subject: [PATCH 3/5] lint --- modules/mapbox/src/mapbox-layer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mapbox/src/mapbox-layer.ts b/modules/mapbox/src/mapbox-layer.ts index 0d98a6cf4ed..1154930493d 100644 --- a/modules/mapbox/src/mapbox-layer.ts +++ b/modules/mapbox/src/mapbox-layer.ts @@ -54,6 +54,6 @@ export default class MapboxLayer implements CustomLayerInt } render() { - drawLayer(this.deck!, this.map!, this); + drawLayer(this.deck!, this.map, this); } } From 94e50b30f3acb1d43a56bf03eb47b7dec5b3c1fa Mon Sep 17 00:00:00 2001 From: Ib Green Date: Sat, 14 Oct 2023 09:55:27 -0400 Subject: [PATCH 4/5] lint --- modules/mapbox/src/deck-utils.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/mapbox/src/deck-utils.ts b/modules/mapbox/src/deck-utils.ts index d6ab8324754..377e4e6997c 100644 --- a/modules/mapbox/src/deck-utils.ts +++ b/modules/mapbox/src/deck-utils.ts @@ -277,9 +277,7 @@ function getViewport(deck: Deck, map: Map, useMapboxProjection = true): WebMerca 0.02 : // use deck.gl's own default 0.1, - // @ts-expect-error Mapbox specific - extract near plane position nearZ: map.transform._nearZ / map.transform.height, - // @ts-expect-error Mapbox specific - extract far plane position farZ: map.transform._farZ / map.transform.height }); } From e126214f08cf7acfcd7bd0e90f8a2fa10eefd580 Mon Sep 17 00:00:00 2001 From: Ib Green Date: Mon, 23 Oct 2023 16:29:51 -0400 Subject: [PATCH 5/5] wip --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 17dee679c77..f55f6d15271 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,7 @@ ], "resolution_comments": { "escaper": "v2 has an invalid main field in package.json, breaks esbuild during browser test", - "vite": "process polyfill missing", - "math.gl": "loaders.gl pulls in v3 packages" + "vite": "process polyfill missing" }, "resolutions": { "@probe.gl/log": "4.0.4",