From a008ac18647a73039de14df05d6f90d78b581209 Mon Sep 17 00:00:00 2001 From: Chris Gervang Date: Thu, 6 Feb 2025 17:43:31 -0800 Subject: [PATCH 1/2] renable core node tests, upgrade to loaders 3.4 --- modules/core/package.json | 6 +-- modules/react/package.json | 4 +- test/node.ts | 1 + yarn.lock | 85 +++++++++----------------------------- 4 files changed, 26 insertions(+), 70 deletions(-) diff --git a/modules/core/package.json b/modules/core/package.json index 00c1d578..6e0aaff1 100644 --- a/modules/core/package.json +++ b/modules/core/package.json @@ -35,9 +35,9 @@ "build-bundle": "ocular-bundle ./bundle.ts" }, "dependencies": { - "@loaders.gl/core": "^3.0.0", - "@loaders.gl/video": "^3.0.12", - "@loaders.gl/zip": "^3.0.12", + "@loaders.gl/core": "^3.4.13", + "@loaders.gl/video": "^3.4.13", + "@loaders.gl/zip": "^3.4.13", "@math.gl/core": "^3.6.0", "@math.gl/web-mercator": "^3.6.2", "@probe.gl/log": "^4.1.0", diff --git a/modules/react/package.json b/modules/react/package.json index 3396dbff..7c29a5ce 100644 --- a/modules/react/package.json +++ b/modules/react/package.json @@ -35,7 +35,7 @@ "sideEffects": false, "dependencies": { "@kepler.gl/constants": "3.1.0", - "@loaders.gl/zip": "^3.0.12", + "@loaders.gl/zip": "^3.4.13", "@turf/helpers": "^5.1.5", "@turf/transform-translate": "^5.1.5", "classnames": "^2.3.1", @@ -59,7 +59,7 @@ "@deck.gl/mapbox": ">=8.3", "@deck.gl/react": ">=8.3", "@hubble.gl/core": "^1.4.0", - "@loaders.gl/core": "^3.0.0", + "@loaders.gl/core": "^3.4.13", "react": ">=18.2", "react-dom": ">=18.2" }, diff --git a/test/node.ts b/test/node.ts index d3272534..4d95f0f8 100644 --- a/test/node.ts +++ b/test/node.ts @@ -23,3 +23,4 @@ _global.requestAnimationFrame = cb => setTimeout(cb, 0); _global.cancelAnimationFrame = t => clearTimeout(t); // import './imports-spec'; +import '../modules/core/test/index'; diff --git a/yarn.lock b/yarn.lock index 8a6f07bf..3cb76be1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1986,9 +1986,9 @@ __metadata: resolution: "@hubble.gl/core@workspace:modules/core" dependencies: "@deck.gl/core": "npm:^8.9" - "@loaders.gl/core": "npm:^3.0.0" - "@loaders.gl/video": "npm:^3.0.12" - "@loaders.gl/zip": "npm:^3.0.12" + "@loaders.gl/core": "npm:^3.4.13" + "@loaders.gl/video": "npm:^3.4.13" + "@loaders.gl/zip": "npm:^3.4.13" "@luma.gl/core": "npm:^8.5.0" "@luma.gl/engine": "npm:^8.5.0" "@math.gl/core": "npm:^3.6.0" @@ -2013,7 +2013,7 @@ __metadata: "@deck.gl/mapbox": "npm:^8.9" "@deck.gl/react": "npm:^8.9" "@kepler.gl/constants": "npm:3.1.0" - "@loaders.gl/zip": "npm:^3.0.12" + "@loaders.gl/zip": "npm:^3.4.13" "@turf/helpers": "npm:^5.1.5" "@turf/transform-translate": "npm:^5.1.5" "@types/lodash.get": "npm:^4.4.9" @@ -2043,7 +2043,7 @@ __metadata: "@deck.gl/mapbox": ">=8.3" "@deck.gl/react": ">=8.3" "@hubble.gl/core": ^1.4.0 - "@loaders.gl/core": ^3.0.0 + "@loaders.gl/core": ^3.4.13 react: ">=18.2" react-dom: ">=18.2" languageName: unknown @@ -2316,19 +2316,6 @@ __metadata: languageName: node linkType: hard -"@loaders.gl/core@npm:^3.0.0": - version: 3.2.6 - resolution: "@loaders.gl/core@npm:3.2.6" - dependencies: - "@babel/runtime": "npm:^7.3.1" - "@loaders.gl/loader-utils": "npm:3.2.6" - "@loaders.gl/worker-utils": "npm:3.2.6" - "@probe.gl/log": "npm:^3.5.0" - probe.gl: "npm:^3.4.0" - checksum: 10c0/a4dcaa517a4778bf3726010d49ea08517f74f746002b14461c0d2e2a2b9635cff74f5b1318eafbbe9cbab927199afdca6935c58d114076ff0efcc30c6a695ea7 - languageName: node - linkType: hard - "@loaders.gl/core@npm:^3.4.13": version: 3.4.15 resolution: "@loaders.gl/core@npm:3.4.15" @@ -2374,17 +2361,6 @@ __metadata: languageName: node linkType: hard -"@loaders.gl/loader-utils@npm:3.2.6": - version: 3.2.6 - resolution: "@loaders.gl/loader-utils@npm:3.2.6" - dependencies: - "@babel/runtime": "npm:^7.3.1" - "@loaders.gl/worker-utils": "npm:3.2.6" - "@probe.gl/stats": "npm:^3.5.0" - checksum: 10c0/b6438aeab76cedcd00212bc5a88571e6b07f27627bc96835622787294881eefe584a38413bc59618e1df9b2363e129e8db19a086d74314870ebb8a56fa7a04fa - languageName: node - linkType: hard - "@loaders.gl/loader-utils@npm:3.4.15": version: 3.4.15 resolution: "@loaders.gl/loader-utils@npm:3.4.15" @@ -2459,15 +2435,6 @@ __metadata: languageName: node linkType: hard -"@loaders.gl/worker-utils@npm:3.2.6": - version: 3.2.6 - resolution: "@loaders.gl/worker-utils@npm:3.2.6" - dependencies: - "@babel/runtime": "npm:^7.3.1" - checksum: 10c0/2e9471e935127ad5c718d4f84202461bb7357c37c983caa998021c590db7d7d19d4eb3e8c49f604870b8b20660a04fe5f6815155dac94062fda31e701db0b82b - languageName: node - linkType: hard - "@loaders.gl/worker-utils@npm:3.4.15": version: 3.4.15 resolution: "@loaders.gl/worker-utils@npm:3.4.15" @@ -2486,12 +2453,12 @@ __metadata: languageName: node linkType: hard -"@loaders.gl/zip@npm:^3.0.12": - version: 3.2.6 - resolution: "@loaders.gl/zip@npm:3.2.6" +"@loaders.gl/zip@npm:^3.4.13": + version: 3.4.15 + resolution: "@loaders.gl/zip@npm:3.4.15" dependencies: jszip: "npm:^3.1.5" - checksum: 10c0/7c25d7199a8d9043fee14112d21d4c8a189410582a09fba842bc4f9ea5539050829b9177084ac1daa46c2f80e3f1ea8cb46f38b9686ca004a75fde988fdfc714 + checksum: 10c0/90010ceb67fe1a55f1126fa9f3438207a66bab9e98d7989d6e3650eafd900f34521222335400ba1d0bf9b67410137d735e6acefda80e1b8de7a7c2da015f5291 languageName: node linkType: hard @@ -3187,16 +3154,6 @@ __metadata: languageName: node linkType: hard -"@probe.gl/log@npm:3.5.0, @probe.gl/log@npm:^3.5.0": - version: 3.5.0 - resolution: "@probe.gl/log@npm:3.5.0" - dependencies: - "@babel/runtime": "npm:^7.0.0" - "@probe.gl/env": "npm:3.5.0" - checksum: 10c0/992deb26aa2ca756590c70172cce40d8a729ab770f693a2b42b6fb17bb92b6fdbe10ef2ef519fb726deabdbb3ca36095e530f7ca7bf4f8b1481a90dccd576e3b - languageName: node - linkType: hard - "@probe.gl/log@npm:4.0.9": version: 4.0.9 resolution: "@probe.gl/log@npm:4.0.9" @@ -3215,7 +3172,17 @@ __metadata: languageName: node linkType: hard -"@probe.gl/stats@npm:3.5.0, @probe.gl/stats@npm:^3.4.0, @probe.gl/stats@npm:^3.5.0": +"@probe.gl/log@npm:^3.5.0": + version: 3.5.0 + resolution: "@probe.gl/log@npm:3.5.0" + dependencies: + "@babel/runtime": "npm:^7.0.0" + "@probe.gl/env": "npm:3.5.0" + checksum: 10c0/992deb26aa2ca756590c70172cce40d8a729ab770f693a2b42b6fb17bb92b6fdbe10ef2ef519fb726deabdbb3ca36095e530f7ca7bf4f8b1481a90dccd576e3b + languageName: node + linkType: hard + +"@probe.gl/stats@npm:^3.4.0, @probe.gl/stats@npm:^3.5.0": version: 3.5.0 resolution: "@probe.gl/stats@npm:3.5.0" dependencies: @@ -11298,18 +11265,6 @@ __metadata: languageName: node linkType: hard -"probe.gl@npm:^3.4.0": - version: 3.5.0 - resolution: "probe.gl@npm:3.5.0" - dependencies: - "@babel/runtime": "npm:^7.0.0" - "@probe.gl/env": "npm:3.5.0" - "@probe.gl/log": "npm:3.5.0" - "@probe.gl/stats": "npm:3.5.0" - checksum: 10c0/50835b39f1b115cc60b3a81a2fa027cd338ba394b61299e26dcaaecb5a2744014ce81eb821fc9e83f55254b67a4d0017caa886c1e503671980707c69dfdbe262 - languageName: node - linkType: hard - "proc-log@npm:^3.0.0": version: 3.0.0 resolution: "proc-log@npm:3.0.0" From f6858d1cea0cf13b93d3ba025c93521aa9f15854 Mon Sep 17 00:00:00 2001 From: Chris Gervang Date: Thu, 6 Feb 2025 17:49:38 -0800 Subject: [PATCH 2/2] chore(core) remove @loaders.gl/video resolution --- modules/core/package.json | 3 --- package.json | 1 - yarn.lock | 34 +++++++--------------------------- 3 files changed, 7 insertions(+), 31 deletions(-) diff --git a/modules/core/package.json b/modules/core/package.json index 6e0aaff1..8c8a2de4 100644 --- a/modules/core/package.json +++ b/modules/core/package.json @@ -45,9 +45,6 @@ "popmotion": "9.3.1", "webm-writer": "^1.0.0" }, - "resolutions": { - "@loaders.gl/video": "3.0.12" - }, "peerDependencies": { "@deck.gl/core": ">=8.3", "@luma.gl/core": ">=8.3", diff --git a/package.json b/package.json index 17e80010..dc3cf619 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,6 @@ "@luma.gl/experimental: must include in devDeps for local dev examples" ], "resolutions": { - "@loaders.gl/video": "3.0.12", "@luma.gl/experimental": "8.5.21" }, "volta": { diff --git a/yarn.lock b/yarn.lock index 3cb76be1..d1afa5f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2350,17 +2350,6 @@ __metadata: languageName: node linkType: hard -"@loaders.gl/loader-utils@npm:3.0.12": - version: 3.0.12 - resolution: "@loaders.gl/loader-utils@npm:3.0.12" - dependencies: - "@babel/runtime": "npm:^7.3.1" - "@loaders.gl/worker-utils": "npm:3.0.12" - "@probe.gl/stats": "npm:^3.4.0" - checksum: 10c0/dc471596385735b7d9d9333a7c081b9b555c38a2870672768ce0396ec13f62290b303af70b47e35c66ae9a799eccda8c29b34ef2e263b5e366a6559a2aafe1b0 - languageName: node - linkType: hard - "@loaders.gl/loader-utils@npm:3.4.15": version: 3.4.15 resolution: "@loaders.gl/loader-utils@npm:3.4.15" @@ -2415,23 +2404,14 @@ __metadata: languageName: node linkType: hard -"@loaders.gl/video@npm:3.0.12": - version: 3.0.12 - resolution: "@loaders.gl/video@npm:3.0.12" +"@loaders.gl/video@npm:^3.4.13": + version: 3.4.15 + resolution: "@loaders.gl/video@npm:3.4.15" dependencies: - "@loaders.gl/loader-utils": "npm:3.0.12" - "@loaders.gl/worker-utils": "npm:3.0.12" + "@loaders.gl/loader-utils": "npm:3.4.15" + "@loaders.gl/worker-utils": "npm:3.4.15" gifshot: "npm:^0.4.5" - checksum: 10c0/b9f59b752d8ec72f1a89a818047cd927066004b9945857dda2393930f10f1e5acfe001e9f48518287dab42ba2055a1b5d5be6c64cbd7a40b72b29c118b12ed61 - languageName: node - linkType: hard - -"@loaders.gl/worker-utils@npm:3.0.12": - version: 3.0.12 - resolution: "@loaders.gl/worker-utils@npm:3.0.12" - dependencies: - "@babel/runtime": "npm:^7.3.1" - checksum: 10c0/386cb4e0d5307088f202a51c31d2e0619968cbf14f0efe1d27f66a6df61d9c23a709e9fb7081761667f735423811adad7c0c9564d03730ebe3ff28707e0a4eac + checksum: 10c0/d734a472945ec93babf69b385589a1ce20364ed46591f40431f0d83625d8cafb22ed483d2479290ff0294b2cccfcb425afae2e300e95af3cf73ba5796fbbd250 languageName: node linkType: hard @@ -3182,7 +3162,7 @@ __metadata: languageName: node linkType: hard -"@probe.gl/stats@npm:^3.4.0, @probe.gl/stats@npm:^3.5.0": +"@probe.gl/stats@npm:^3.5.0": version: 3.5.0 resolution: "@probe.gl/stats@npm:3.5.0" dependencies: