From 3440ed2a9ce041b1445c45b52f4550fd1b8acf03 Mon Sep 17 00:00:00 2001 From: Viktor Belomestnov Date: Fri, 20 Oct 2023 12:22:37 +0200 Subject: [PATCH 1/6] fix: loaders.gl beta.4 compatibility --- src/redux/slices/attribute-stats-map-slice.ts | 5 ++--- webpack.dev.config.js | 8 ++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/redux/slices/attribute-stats-map-slice.ts b/src/redux/slices/attribute-stats-map-slice.ts index 7f6b1c9e..21f8e0c0 100644 --- a/src/redux/slices/attribute-stats-map-slice.ts +++ b/src/redux/slices/attribute-stats-map-slice.ts @@ -2,8 +2,6 @@ import { StatsInfo } from "@loaders.gl/i3s"; import { createSlice, createAsyncThunk } from "@reduxjs/toolkit"; import { RootState } from "../store"; -import { load } from "@loaders.gl/core"; -import { JSONLoader } from "@loaders.gl/loader-utils"; // Define a type for the slice state interface statisitcsMapState { @@ -36,7 +34,8 @@ export const getAttributeStatsInfo = createAsyncThunk< string >("getAttributeStatsInfo", async (statAttributeUrl) => { let stats: StatsInfo | null = null; - const data = await load(statAttributeUrl, JSONLoader); + const dataResponse = await fetch(statAttributeUrl); + const data = JSON.parse(await dataResponse.text()); stats = (data?.stats as StatsInfo) || null; return { stats, statAttributeUrl }; }); diff --git a/webpack.dev.config.js b/webpack.dev.config.js index f0dbaa64..71b3ef0a 100644 --- a/webpack.dev.config.js +++ b/webpack.dev.config.js @@ -29,6 +29,14 @@ const LOADERS_LINK_ALIASES = { __dirname, "../loaders.gl/modules/textures/src" ), + "@loaders.gl/compression": path.resolve( + __dirname, + "../loaders.gl/modules/compression/src" + ), + "@loaders.gl/worker-threads": path.resolve( + __dirname, + "../loaders.gl/modules/worker-threads/src" + ), }; const LUMA_LINK_ALIASES = { From 2ce6a7cbbc91ed72656335e90a395acb173215c7 Mon Sep 17 00:00:00 2001 From: Viktor Belomestnov Date: Fri, 20 Oct 2023 12:26:46 +0200 Subject: [PATCH 2/6] Clean up package.json --- package.json | 1 - yarn.lock | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 9b5b4db7..66c3d56a 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "@loaders.gl/3d-tiles": "^4.0.0-beta.2", "@loaders.gl/core": "^4.0.0-beta.2", "@loaders.gl/i3s": "^4.0.0-beta.2", - "@loaders.gl/loader-utils": "^4.0.0-beta.2", "@loaders.gl/tiles": "^4.0.0-beta.2", "@luma.gl/core": "^8.5.14", "@math.gl/proj4": "^3.6.3", diff --git a/yarn.lock b/yarn.lock index 835a3442..0c45aed6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2323,7 +2323,7 @@ "@loaders.gl/worker-utils" "3.2.12" "@probe.gl/stats" "^3.5.0" -"@loaders.gl/loader-utils@4.0.0-beta.2", "@loaders.gl/loader-utils@^4.0.0-beta.2": +"@loaders.gl/loader-utils@4.0.0-beta.2": version "4.0.0-beta.2" resolved "https://registry.yarnpkg.com/@loaders.gl/loader-utils/-/loader-utils-4.0.0-beta.2.tgz#a6fd75ea2fd74e9686e8a71cce219ce9345cbfb6" integrity sha512-+6l7xVlJglj1mnNnbwl9Z7+HzRh5xT1TRZUCWUoJvqyTHPrn7ImoRfnyCXPpBiZvmeWoV23m6V4EI3fk8pSCJg== From 47bd232980782dac993bffcc8d33fd675665fe49 Mon Sep 17 00:00:00 2001 From: Viktor Belomestnov Date: Fri, 20 Oct 2023 12:50:47 +0200 Subject: [PATCH 3/6] fix tests --- .../attributes-stats/attribute-stats.spec.tsx | 21 ++++++++-------- .../slices/attribute-stats-map-slice.spec.ts | 24 +++++++++++++++---- src/redux/slices/attribute-stats-map-slice.ts | 3 ++- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/src/components/attributes-panel/attributes-stats/attribute-stats.spec.tsx b/src/components/attributes-panel/attributes-stats/attribute-stats.spec.tsx index 1d8507eb..cb7e74d1 100644 --- a/src/components/attributes-panel/attributes-stats/attribute-stats.spec.tsx +++ b/src/components/attributes-panel/attributes-stats/attribute-stats.spec.tsx @@ -3,7 +3,7 @@ import userEvent from "@testing-library/user-event"; import { renderWithThemeProviders } from "../../../utils/testing-utils/render-with-theme"; import { AttributeStats } from "./attribute-stats"; -import { load } from "@loaders.gl/core"; +import { fetchFile } from "@loaders.gl/core"; import { capitalize } from "../../../utils/format/capitalize"; import { setupStore } from "../../../redux/store"; import { setColorsByAttrubute } from "../../../redux/slices/colors-by-attribute-slice"; @@ -14,7 +14,7 @@ jest.mock("../histogram", () => ({ HistogramChart: jest.fn().mockImplementation(() =>
HistogramChart
), })); -const loadMock = load as unknown as jest.Mocked; +const fetchMock = fetchFile as unknown as jest.Mocked; const stats = { totalValuesCount: 1, @@ -46,10 +46,6 @@ function sleep(ms) { return new Promise((resolve) => setTimeout(resolve, ms)); } -jest.mock("@loaders.gl/loader-utils", () => ({ - JSONLoader: jest.fn(), -})); - jest.mock("../../toogle-switch/toggle-switch", () => ({ ToggleSwitch: jest .fn() @@ -64,7 +60,7 @@ jest.mock("../../loading-spinner/loading-spinner", () => ({ describe("Attribute Stats Error test", () => { it("Should no render Attribute Stats if loading statistics error", async () => { - loadMock.mockImplementationOnce( + fetchMock.mockImplementationOnce( () => new Promise((resolve, reject) => setTimeout(() => { @@ -109,11 +105,16 @@ describe("Attribute Stats Error test", () => { describe("AttributeStats", () => { beforeEach(() => { - loadMock.mockImplementationOnce( + fetchMock.mockImplementationOnce( () => new Promise((resolve) => setTimeout(() => { - resolve({ stats }); + resolve({ + text: async () => + JSON.stringify({ + stats, + }), + }); }, 50) ) ); @@ -189,7 +190,7 @@ describe("AttributeStats", () => { ); }); - expect(loadMock).toHaveBeenCalledTimes(1); + expect(fetchMock).toHaveBeenCalledTimes(1); }); it("Should render colorize block", async () => { diff --git a/src/redux/slices/attribute-stats-map-slice.spec.ts b/src/redux/slices/attribute-stats-map-slice.spec.ts index f2f83d02..7d0b5ab1 100644 --- a/src/redux/slices/attribute-stats-map-slice.spec.ts +++ b/src/redux/slices/attribute-stats-map-slice.spec.ts @@ -1,4 +1,4 @@ -import { load } from "@loaders.gl/core"; +import { fetchFile } from "@loaders.gl/core"; import { setupStore } from "../store"; import { getAttributeStatsInfo, @@ -16,7 +16,7 @@ describe("slice: attribute-stats-map", () => { }); it("Should handle `getAttributeStatsInfo.rejected` action", async () => { - (load as unknown as jest.Mock).mockRejectedValue("Error"); + (fetchFile as unknown as jest.Mock).mockRejectedValue("Error"); const store = setupStore(); const state = store.getState(); @@ -28,8 +28,15 @@ describe("slice: attribute-stats-map", () => { }); it("Should handle `getAttributeStatsInfo.fulfilled` action for non-empty stats", async () => { - (load as unknown as jest.Mock).mockReturnValue( - Promise.resolve({ stats }) + (fetchFile as unknown as jest.Mock).mockReturnValue( + new Promise((resolve) => { + resolve({ + text: async () => + JSON.stringify({ + stats, + }), + }); + }) ); const store = setupStore(); @@ -42,7 +49,14 @@ describe("slice: attribute-stats-map", () => { }); it("Should handle `getAttributeStatsInfo.fulfilled` action for empty stats", async () => { - (load as unknown as jest.Mock).mockReturnValue(Promise.resolve({})); + (fetchFile as unknown as jest.Mock).mockReturnValue( + new Promise((resolve) => { + resolve({ + text: async () => + JSON.stringify({}), + }); + }) + ); const store = setupStore(); const state = store.getState(); diff --git a/src/redux/slices/attribute-stats-map-slice.ts b/src/redux/slices/attribute-stats-map-slice.ts index 21f8e0c0..09d6bb43 100644 --- a/src/redux/slices/attribute-stats-map-slice.ts +++ b/src/redux/slices/attribute-stats-map-slice.ts @@ -1,5 +1,6 @@ import { StatsInfo } from "@loaders.gl/i3s"; +import { fetchFile } from "@loaders.gl/core"; import { createSlice, createAsyncThunk } from "@reduxjs/toolkit"; import { RootState } from "../store"; @@ -34,7 +35,7 @@ export const getAttributeStatsInfo = createAsyncThunk< string >("getAttributeStatsInfo", async (statAttributeUrl) => { let stats: StatsInfo | null = null; - const dataResponse = await fetch(statAttributeUrl); + const dataResponse = await fetchFile(statAttributeUrl); const data = JSON.parse(await dataResponse.text()); stats = (data?.stats as StatsInfo) || null; return { stats, statAttributeUrl }; From cfea8f028cb99006f9c2ec0d5b4d6a197719e116 Mon Sep 17 00:00:00 2001 From: Viktor Belomestnov Date: Fri, 20 Oct 2023 13:02:24 +0200 Subject: [PATCH 4/6] fix: Compression reexport error --- webpack.dev.config.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/webpack.dev.config.js b/webpack.dev.config.js index 71b3ef0a..71f0a6d7 100644 --- a/webpack.dev.config.js +++ b/webpack.dev.config.js @@ -107,6 +107,11 @@ module.exports = (env) => { historyApiFallback: true, }, module: { + parser: { + javascript: { + exportsPresence: 'warn', + }, + }, rules: [ { test: [/\.(js)$/], From 302cb1c5851dbfadfa3f5ba7c9b237c68f13a4a3 Mon Sep 17 00:00:00 2001 From: Viktor Belomestnov Date: Fri, 20 Oct 2023 14:34:26 +0200 Subject: [PATCH 5/6] bump loaders --- package.json | 10 +- webpack.dev.config.js | 2 +- webpack.prod.config.js | 5 + yarn.lock | 275 ++++++++++++++++++++++++----------------- 4 files changed, 170 insertions(+), 122 deletions(-) diff --git a/package.json b/package.json index 66c3d56a..b194cc1d 100644 --- a/package.json +++ b/package.json @@ -24,10 +24,10 @@ "@fortawesome/free-solid-svg-icons": "^5.15.4", "@fortawesome/react-fontawesome": "^0.1.17", "@hyperjump/json-schema": "^0.23.2", - "@loaders.gl/3d-tiles": "^4.0.0-beta.2", - "@loaders.gl/core": "^4.0.0-beta.2", - "@loaders.gl/i3s": "^4.0.0-beta.2", - "@loaders.gl/tiles": "^4.0.0-beta.2", + "@loaders.gl/3d-tiles": "^4.0.0-beta.5", + "@loaders.gl/core": "^4.0.0-beta.5", + "@loaders.gl/i3s": "^4.0.0-beta.5", + "@loaders.gl/tiles": "^4.0.0-beta.5", "@luma.gl/core": "^8.5.14", "@math.gl/proj4": "^3.6.3", "@probe.gl/stats": "^4.0.4", @@ -86,6 +86,6 @@ "webpack-dev-server": "^4.7.4" }, "resolutions": { - "@loaders.gl/tiles": "^4.0.0-beta.2" + "@loaders.gl/tiles": "^4.0.0-beta.5" } } diff --git a/webpack.dev.config.js b/webpack.dev.config.js index 71f0a6d7..5bcb04b0 100644 --- a/webpack.dev.config.js +++ b/webpack.dev.config.js @@ -109,7 +109,7 @@ module.exports = (env) => { module: { parser: { javascript: { - exportsPresence: 'warn', + exportsPresence: "warn", }, }, rules: [ diff --git a/webpack.prod.config.js b/webpack.prod.config.js index e1c13620..0e6368fa 100644 --- a/webpack.prod.config.js +++ b/webpack.prod.config.js @@ -8,6 +8,11 @@ module.exports = { path: path.resolve(__dirname, "build"), }, module: { + parser: { + javascript: { + exportsPresence: "warn", + }, + }, rules: [ { test: [/\.(js)$/], diff --git a/yarn.lock b/yarn.lock index 0c45aed6..4b142900 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2172,30 +2172,30 @@ "@math.gl/core" "^3.5.1" "@math.gl/geospatial" "^3.5.1" -"@loaders.gl/3d-tiles@^4.0.0-beta.2": - version "4.0.0-beta.2" - resolved "https://registry.yarnpkg.com/@loaders.gl/3d-tiles/-/3d-tiles-4.0.0-beta.2.tgz#a43d5d9723aa4a68539843d5a72d0520c914efdc" - integrity sha512-C5J1JScbh4cSz4bthPW3m9xustjIqHQc8TAYeWy1F1agovoTl41rrWY1d0y0OjINpZ/9cM5QMEuCzXreICWs2A== - dependencies: - "@loaders.gl/draco" "4.0.0-beta.2" - "@loaders.gl/gltf" "4.0.0-beta.2" - "@loaders.gl/loader-utils" "4.0.0-beta.2" - "@loaders.gl/math" "4.0.0-beta.2" - "@loaders.gl/tiles" "4.0.0-beta.2" - "@loaders.gl/zip" "4.0.0-beta.2" - "@math.gl/core" "^3.5.1" - "@math.gl/geospatial" "^3.5.1" +"@loaders.gl/3d-tiles@^4.0.0-beta.5": + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/3d-tiles/-/3d-tiles-4.0.0-beta.5.tgz#36a89ccb0e6439ff41e7640967bbb52405125f55" + integrity sha512-ad6srU2rF3lespRK03PmDglxz+dIZEwRzloZLpNPN6nHNhM8lmsgCPEKRAt3WtPD2w/z9KUkE0OTJVhO1yiZqw== + dependencies: + "@loaders.gl/draco" "4.0.0-beta.5" + "@loaders.gl/gltf" "4.0.0-beta.5" + "@loaders.gl/loader-utils" "4.0.0-beta.5" + "@loaders.gl/math" "4.0.0-beta.5" + "@loaders.gl/tiles" "4.0.0-beta.5" + "@loaders.gl/zip" "4.0.0-beta.5" + "@math.gl/core" "^4.0.0" + "@math.gl/geospatial" "^4.0.0" "@probe.gl/log" "^4.0.4" long "^5.2.1" -"@loaders.gl/compression@4.0.0-beta.2": - version "4.0.0-beta.2" - resolved "https://registry.yarnpkg.com/@loaders.gl/compression/-/compression-4.0.0-beta.2.tgz#3cd38722a87bd77ad8e5c46909faefc1a9798624" - integrity sha512-1j78CLD4Kbqg2n7Tfamk0Y+T91XkjL68KXryJceueLcZ6FbMXtM57yriTxlSaJbzhMSUPegwfJ+4UNCAmxaFkg== +"@loaders.gl/compression@4.0.0-beta.5": + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/compression/-/compression-4.0.0-beta.5.tgz#d1a4cd777e4f68ee22f14babff5e16d4ca145065" + integrity sha512-stFvMc0YdUS8EOKqnyb+UBIzLRUC+LmCGtMRbQ6m/jAQtCz49hLhvo/ii+lqsNPGw44xmFMlzN0idR/gxPSaZw== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/loader-utils" "4.0.0-beta.2" - "@loaders.gl/worker-utils" "4.0.0-beta.2" + "@loaders.gl/loader-utils" "4.0.0-beta.5" + "@loaders.gl/worker-utils" "4.0.0-beta.5" "@types/brotli" "^1.3.0" "@types/pako" "^1.0.1" fflate "0.7.4" @@ -2218,16 +2218,26 @@ "@probe.gl/log" "^3.5.0" probe.gl "^3.4.0" -"@loaders.gl/core@^4.0.0-beta.2": - version "4.0.0-beta.2" - resolved "https://registry.yarnpkg.com/@loaders.gl/core/-/core-4.0.0-beta.2.tgz#e38b20b0883e449a5e71682b4e753b5980f03340" - integrity sha512-v7c2R986Fp0b3++qgnAIInhQ8rHkJJ768CLeYg3xpjgWOe86a+xSRJSSyUbLcQFoozykS759HymcE1Z5fPifxg== +"@loaders.gl/core@^4.0.0-beta.5": + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/core/-/core-4.0.0-beta.5.tgz#4c8ab164dc29d71d85012e82b2f3539a1353064a" + integrity sha512-GnAc8bSQKxyFmIXFn+tAQmw4MVDBF43dr9KgFm13n0iSt7fY6rwDqM2fvEHymSbWzXyalJn1dqaWlhjBJQ5ukQ== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/loader-utils" "4.0.0-beta.2" - "@loaders.gl/worker-utils" "4.0.0-beta.2" + "@loaders.gl/loader-utils" "4.0.0-beta.5" + "@loaders.gl/worker-utils" "4.0.0-beta.5" "@probe.gl/log" "^4.0.2" +"@loaders.gl/crypto@4.0.0-beta.5": + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/crypto/-/crypto-4.0.0-beta.5.tgz#4ebfe85e3f7ca1ffb15b9c28121229ad2afe500b" + integrity sha512-HDZuJsf5TOaDU1RVFdw9Uq4ey1jz9X+HqZmXBUFRNt7U+3fpunvQpLFpZRJms85tv6GJL9FEDkhteHXULlU1/Q== + dependencies: + "@babel/runtime" "^7.3.1" + "@loaders.gl/loader-utils" "4.0.0-beta.5" + "@loaders.gl/worker-utils" "4.0.0-beta.5" + "@types/crypto-js" "^4.0.2" + "@loaders.gl/draco@3.2.12": version "3.2.12" resolved "https://registry.yarnpkg.com/@loaders.gl/draco/-/draco-3.2.12.tgz#e561431a2c6b4971abcf39e7704aa1f36a1f5f30" @@ -2239,15 +2249,15 @@ "@loaders.gl/worker-utils" "3.2.12" draco3d "1.4.1" -"@loaders.gl/draco@4.0.0-beta.2": - version "4.0.0-beta.2" - resolved "https://registry.yarnpkg.com/@loaders.gl/draco/-/draco-4.0.0-beta.2.tgz#995ba98be5f1c37c1640cc481f009c38e1a23e8d" - integrity sha512-reaqwFQ3y+SG7MVKqq47a/K+EYpXZqoCDP7LLQmxsyRnIIsyZ3Yp1zQSArfzMuvbdkp/dT6IXCAkgBqVcpKU6A== +"@loaders.gl/draco@4.0.0-beta.5": + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/draco/-/draco-4.0.0-beta.5.tgz#13daaa03fb78787c12087b6bcca0b194a2dbe936" + integrity sha512-7o+j/tPXCIB04ZZFlDnrB51GSHPlwakwXyc5o3FPEJe/XLN5W96TYxoESJRWpvakudR8Ao+G00KDhsH2dayJlQ== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/loader-utils" "4.0.0-beta.2" - "@loaders.gl/schema" "4.0.0-beta.2" - "@loaders.gl/worker-utils" "4.0.0-beta.2" + "@loaders.gl/loader-utils" "4.0.0-beta.5" + "@loaders.gl/schema" "4.0.0-beta.5" + "@loaders.gl/worker-utils" "4.0.0-beta.5" draco3d "1.5.5" "@loaders.gl/gis@3.2.12", "@loaders.gl/gis@^3.2.0": @@ -2271,34 +2281,34 @@ "@loaders.gl/loader-utils" "3.2.12" "@loaders.gl/textures" "3.2.12" -"@loaders.gl/gltf@4.0.0-beta.2": - version "4.0.0-beta.2" - resolved "https://registry.yarnpkg.com/@loaders.gl/gltf/-/gltf-4.0.0-beta.2.tgz#5ab9b13caf6aa85e7cf5cb96b5c8899735d50c5d" - integrity sha512-Qtdp6WshErBeXE94k/srYvWa1mPfMkkn6yDHkUMw/0M0JWywcJTmsOKpKTEfMCbTf9dJe3YlTDSnc4ArfDmf+g== - dependencies: - "@loaders.gl/draco" "4.0.0-beta.2" - "@loaders.gl/images" "4.0.0-beta.2" - "@loaders.gl/loader-utils" "4.0.0-beta.2" - "@loaders.gl/textures" "4.0.0-beta.2" - "@math.gl/core" "^3.5.1" - -"@loaders.gl/i3s@^4.0.0-beta.2": - version "4.0.0-beta.2" - resolved "https://registry.yarnpkg.com/@loaders.gl/i3s/-/i3s-4.0.0-beta.2.tgz#104facf8f725ebb03c63a2c1b18672ec5f08d4ff" - integrity sha512-AimGSPzTHNRbtCF9baXP+3rYx22tMdYV4r640GhuEEPjJzPrqwHXnN/gDI3YcjsHLqPNzjW5AiFmkevKNvBmYw== - dependencies: - "@loaders.gl/compression" "4.0.0-beta.2" - "@loaders.gl/draco" "4.0.0-beta.2" - "@loaders.gl/images" "4.0.0-beta.2" - "@loaders.gl/loader-utils" "4.0.0-beta.2" - "@loaders.gl/schema" "4.0.0-beta.2" - "@loaders.gl/textures" "4.0.0-beta.2" - "@loaders.gl/tiles" "4.0.0-beta.2" +"@loaders.gl/gltf@4.0.0-beta.5": + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/gltf/-/gltf-4.0.0-beta.5.tgz#33a8374c4adf03d0a8260b1f0424a576ba2a6b94" + integrity sha512-rzlv09raWU0bxWiQTAm+Z9Dvj7IuhumRYVQ9CwZvSYW8l48ySNpCG5hxSEapa9UaOqc/QJFGtJRbVur9Z1bqqQ== + dependencies: + "@loaders.gl/draco" "4.0.0-beta.5" + "@loaders.gl/images" "4.0.0-beta.5" + "@loaders.gl/loader-utils" "4.0.0-beta.5" + "@loaders.gl/textures" "4.0.0-beta.5" + "@math.gl/core" "^4.0.0" + +"@loaders.gl/i3s@^4.0.0-beta.5": + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/i3s/-/i3s-4.0.0-beta.5.tgz#9504841e31d5da75f4db64687fd10569ad46f5d6" + integrity sha512-5/GM2QXyQ9mqzyrGTsw/YUTFUF4kfLoaPqqPORLdAFf0Ew5pqSqrO54jOgrSEalc8yA09HLKFLUVjMtfWHlsIg== + dependencies: + "@loaders.gl/compression" "4.0.0-beta.5" + "@loaders.gl/crypto" "4.0.0-beta.5" + "@loaders.gl/draco" "4.0.0-beta.5" + "@loaders.gl/images" "4.0.0-beta.5" + "@loaders.gl/loader-utils" "4.0.0-beta.5" + "@loaders.gl/schema" "4.0.0-beta.5" + "@loaders.gl/textures" "4.0.0-beta.5" + "@loaders.gl/tiles" "4.0.0-beta.5" "@luma.gl/constants" "^8.5.4" - "@math.gl/core" "^3.5.1" - "@math.gl/culling" "^3.5.1" - "@math.gl/geospatial" "^3.5.1" - md5 "^2.3.0" + "@math.gl/core" "^4.0.0" + "@math.gl/culling" "^4.0.0" + "@math.gl/geospatial" "^4.0.0" "@loaders.gl/images@3.2.12", "@loaders.gl/images@^3.2.0": version "3.2.12" @@ -2307,12 +2317,12 @@ dependencies: "@loaders.gl/loader-utils" "3.2.12" -"@loaders.gl/images@4.0.0-beta.2": - version "4.0.0-beta.2" - resolved "https://registry.yarnpkg.com/@loaders.gl/images/-/images-4.0.0-beta.2.tgz#c9fb48e8b77aa53d7ed1a3ba424e0e20b9065528" - integrity sha512-gLyY0YkRs8+MvHl7UN3NJ0VCLwC/+aIuKnAOMY5p4lCGlKCcYmuwXS6SVFBIGHWObd2uZkmNiqLO9E0kdsipwA== +"@loaders.gl/images@4.0.0-beta.5": + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/images/-/images-4.0.0-beta.5.tgz#ec3942184f85e3a3e2b5b5981223672ad6c4179e" + integrity sha512-qGwyZqQw3FG/UUP30jzWY6X/xrT7f6qi/RL5y9p5KDL7ybSUZ3mklhc+rNvZV543zOChSLECTmiB7lmsyhxeBw== dependencies: - "@loaders.gl/loader-utils" "4.0.0-beta.2" + "@loaders.gl/loader-utils" "4.0.0-beta.5" "@loaders.gl/loader-utils@3.2.12", "@loaders.gl/loader-utils@^3.2.0": version "3.2.12" @@ -2323,13 +2333,13 @@ "@loaders.gl/worker-utils" "3.2.12" "@probe.gl/stats" "^3.5.0" -"@loaders.gl/loader-utils@4.0.0-beta.2": - version "4.0.0-beta.2" - resolved "https://registry.yarnpkg.com/@loaders.gl/loader-utils/-/loader-utils-4.0.0-beta.2.tgz#a6fd75ea2fd74e9686e8a71cce219ce9345cbfb6" - integrity sha512-+6l7xVlJglj1mnNnbwl9Z7+HzRh5xT1TRZUCWUoJvqyTHPrn7ImoRfnyCXPpBiZvmeWoV23m6V4EI3fk8pSCJg== +"@loaders.gl/loader-utils@4.0.0-beta.5": + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/loader-utils/-/loader-utils-4.0.0-beta.5.tgz#bca3e926708fab0e4c9502fa63c8f947aae41a71" + integrity sha512-hdwithS1mZlxll1aTi36GCJml2RSiS81SAvHqDSE998SfGoh9n0UuoX1kaZtPIvPzTvtsZyJYNe6tGauNJ/o4Q== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/worker-utils" "4.0.0-beta.2" + "@loaders.gl/worker-utils" "4.0.0-beta.5" "@probe.gl/stats" "^4.0.2" "@loaders.gl/math@3.2.12": @@ -2341,14 +2351,14 @@ "@loaders.gl/loader-utils" "3.2.12" "@math.gl/core" "^3.5.1" -"@loaders.gl/math@4.0.0-beta.2": - version "4.0.0-beta.2" - resolved "https://registry.yarnpkg.com/@loaders.gl/math/-/math-4.0.0-beta.2.tgz#c89d9159774ddc455446e1b34167601137140959" - integrity sha512-vnmNs7mlkrvPjVpMJAWTz7LT0s+28gtVjNO7Mfc3IgYHWIjUjXcs38CNBkWTRLaxkwqzcPxLIcQPxeftyNVhmQ== +"@loaders.gl/math@4.0.0-beta.5": + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/math/-/math-4.0.0-beta.5.tgz#cd367ff9aea7a2eb0b2a64285bb112986173fda3" + integrity sha512-sCPvAPPuScHv+7nrqe2bpJ7dK7as1uEVttbsrSmOczq5xgIm7qL2VJgHv5H4NIlIJdmsnPdR9uQZPL7Il7jsZw== dependencies: - "@loaders.gl/images" "4.0.0-beta.2" - "@loaders.gl/loader-utils" "4.0.0-beta.2" - "@math.gl/core" "^3.5.1" + "@loaders.gl/images" "4.0.0-beta.5" + "@loaders.gl/loader-utils" "4.0.0-beta.5" + "@math.gl/core" "^4.0.0" "@loaders.gl/mvt@^3.2.0": version "3.2.12" @@ -2369,10 +2379,10 @@ "@types/geojson" "^7946.0.7" apache-arrow "^4.0.0" -"@loaders.gl/schema@4.0.0-beta.2": - version "4.0.0-beta.2" - resolved "https://registry.yarnpkg.com/@loaders.gl/schema/-/schema-4.0.0-beta.2.tgz#57d4ce57a7e1e0754832553fdce9559a4046279a" - integrity sha512-0tjs+MPu61S+v/Ztz/e0bj1El40oYpugQzaMqEAC9JlYRXL2uT4yP5n/sqk54+4gb3imUZABcXze/Si7e9NPiA== +"@loaders.gl/schema@4.0.0-beta.5": + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/schema/-/schema-4.0.0-beta.5.tgz#fa7c05e7f2b9422350a2bc8b831a3b1061f1a980" + integrity sha512-+LKdxGScthvAt/imQFASDuCfmymlbmBSRPn8J1p2apjy6z3n7P8Wj6tamKqy4BWYikqfcVyr3yyXJmKf0OH5XQ== dependencies: "@types/geojson" "^7946.0.7" @@ -2398,29 +2408,29 @@ ktx-parse "^0.0.4" texture-compressor "^1.0.2" -"@loaders.gl/textures@4.0.0-beta.2": - version "4.0.0-beta.2" - resolved "https://registry.yarnpkg.com/@loaders.gl/textures/-/textures-4.0.0-beta.2.tgz#1bb60261b99ac419788ce159cff92172e5e16b61" - integrity sha512-IvN/GmCwy/1VbBQJORl/sxbCmssDLEFYGj1SXCJXDqVAjJGvDunfZCXPV9uUIL+6zgo/oOqUOxFSF0n27yPAmg== +"@loaders.gl/textures@4.0.0-beta.5": + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/textures/-/textures-4.0.0-beta.5.tgz#82063a32e232ecda7f66cfa58b4093d956ca2f34" + integrity sha512-UrlmPnykRdcygLIeZ+ZHp3J53ItvuvFOewCXfZl43rvKulCE552AiuyIh1zPtRRdY6ukkPhrEJHYJ66qJqN2pA== dependencies: - "@loaders.gl/images" "4.0.0-beta.2" - "@loaders.gl/loader-utils" "4.0.0-beta.2" - "@loaders.gl/schema" "4.0.0-beta.2" - "@loaders.gl/worker-utils" "4.0.0-beta.2" + "@loaders.gl/images" "4.0.0-beta.5" + "@loaders.gl/loader-utils" "4.0.0-beta.5" + "@loaders.gl/schema" "4.0.0-beta.5" + "@loaders.gl/worker-utils" "4.0.0-beta.5" ktx-parse "^0.0.4" texture-compressor "^1.0.2" -"@loaders.gl/tiles@3.2.12", "@loaders.gl/tiles@4.0.0-beta.2", "@loaders.gl/tiles@^3.2.0", "@loaders.gl/tiles@^4.0.0-beta.2": - version "4.0.0-beta.2" - resolved "https://registry.yarnpkg.com/@loaders.gl/tiles/-/tiles-4.0.0-beta.2.tgz#fbad0b87b75dd7bdb26ae586cfbd194ea0675c91" - integrity sha512-EdwwYDqfzSA/aKpDxRv2hbHduMSTWauRmKC4j2E9oDGkl1lsIxgytR0ifjmqxHoZ4T3m91i/fcymI0CbS8k+aA== - dependencies: - "@loaders.gl/loader-utils" "4.0.0-beta.2" - "@loaders.gl/math" "4.0.0-beta.2" - "@math.gl/core" "^3.5.1" - "@math.gl/culling" "^3.5.1" - "@math.gl/geospatial" "^3.5.1" - "@math.gl/web-mercator" "^3.5.1" +"@loaders.gl/tiles@3.2.12", "@loaders.gl/tiles@4.0.0-beta.5", "@loaders.gl/tiles@^3.2.0", "@loaders.gl/tiles@^4.0.0-beta.5": + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/tiles/-/tiles-4.0.0-beta.5.tgz#adddde574aa368e22c341946e9784e9b08e99ccd" + integrity sha512-HU2T0US5AsZXGHu9VIMHiyISnu7xAgUNDorpXHnfEUkrviSbu3+0k9I0Une2XHqE/kzFHmXOCRimMA0FMQv4Lw== + dependencies: + "@loaders.gl/loader-utils" "4.0.0-beta.5" + "@loaders.gl/math" "4.0.0-beta.5" + "@math.gl/core" "^4.0.0" + "@math.gl/culling" "^4.0.0" + "@math.gl/geospatial" "^4.0.0" + "@math.gl/web-mercator" "^4.0.0" "@probe.gl/stats" "^4.0.2" "@loaders.gl/worker-utils@3.2.12": @@ -2430,20 +2440,21 @@ dependencies: "@babel/runtime" "^7.3.1" -"@loaders.gl/worker-utils@4.0.0-beta.2": - version "4.0.0-beta.2" - resolved "https://registry.yarnpkg.com/@loaders.gl/worker-utils/-/worker-utils-4.0.0-beta.2.tgz#28d5ef9148d5825f2419eba39e23cf8419a111f5" - integrity sha512-n+vulpuHlgRtzxEn6jX7AyJRrkhxmryr5UxWCLoh4i7+W+K8cXqclOkqCyeiHCEyyJtnPe092ZBPRdbuPnEIww== +"@loaders.gl/worker-utils@4.0.0-beta.5": + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/worker-utils/-/worker-utils-4.0.0-beta.5.tgz#0245179197e024eab35ca29f0bbf461b93efb7e8" + integrity sha512-Xd6VU8+tKdJD4KP9CyjVf1AuJnY+uKJlygbH20MEenNE3dTsQMG8E8uSVdnIgPfn491WYjCNWzGUbh2MVPgLEw== dependencies: "@babel/runtime" "^7.3.1" -"@loaders.gl/zip@4.0.0-beta.2": - version "4.0.0-beta.2" - resolved "https://registry.yarnpkg.com/@loaders.gl/zip/-/zip-4.0.0-beta.2.tgz#0c641d49e1068e13d2f37bc90529cc791ed123dd" - integrity sha512-sBL23SDGlnVsdorUCiIOg2bHQlpgrx4JP/mg7h5Ew2IOaOJs+TBMRX+1gnet0q46i1P1GaGeT84LESeLvrT8XQ== +"@loaders.gl/zip@4.0.0-beta.5": + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/@loaders.gl/zip/-/zip-4.0.0-beta.5.tgz#af58c9241a438456320761daf98b76bff700ff02" + integrity sha512-TNgSxDrfeh0EApLt7yLujpCbk2rP6NgA6je5OxRQezWtIoFDs0QOO53BE8P5cZiT/38MRc6/7qaMK856Rtz8eg== dependencies: - "@loaders.gl/compression" "4.0.0-beta.2" - "@loaders.gl/loader-utils" "4.0.0-beta.2" + "@loaders.gl/compression" "4.0.0-beta.5" + "@loaders.gl/crypto" "4.0.0-beta.5" + "@loaders.gl/loader-utils" "4.0.0-beta.5" jszip "^3.1.5" md5 "^2.3.0" @@ -2599,14 +2610,13 @@ "@math.gl/types" "3.6.3" gl-matrix "^3.4.0" -"@math.gl/culling@^3.5.1": - version "3.5.7" - resolved "https://registry.yarnpkg.com/@math.gl/culling/-/culling-3.5.7.tgz#bb5c75df96facbb5f3b64176220911a493cd5d0e" - integrity sha512-wQlcnT05/u2ByHX8xjjo2pQUE8O2zghpBL19S1Rzzn3Zloj1eL5okIXecTnQCGghpt5lSP1I4W91x7PhV7YU7Q== +"@math.gl/core@4.0.0", "@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== dependencies: "@babel/runtime" "^7.12.0" - "@math.gl/core" "3.5.7" - gl-matrix "~3.3.0" + "@math.gl/types" "4.0.0" "@math.gl/culling@^3.6.0": version "3.6.1" @@ -2617,6 +2627,14 @@ "@math.gl/core" "3.6.1" gl-matrix "^3.4.0" +"@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/geospatial@^3.5.1": version "3.5.7" resolved "https://registry.yarnpkg.com/@math.gl/geospatial/-/geospatial-3.5.7.tgz#bf7feabd519eb7cb5bdfab22802bce70647d4be5" @@ -2626,6 +2644,14 @@ "@math.gl/core" "3.5.7" gl-matrix "~3.3.0" +"@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.5.7" resolved "https://registry.yarnpkg.com/@math.gl/polygon/-/polygon-3.5.7.tgz#6ddab215552919a2f784e8ea746fe582475c1e33" @@ -2667,7 +2693,12 @@ resolved "https://registry.yarnpkg.com/@math.gl/types/-/types-3.6.3.tgz#9fa9866feabcbb76de107d78ff3a89c0243ac374" integrity sha512-3uWLVXHY3jQxsXCr/UCNPSc2BG0hNUljhmOBt9l+lNFDp7zHgm0cK2Tw4kj2XfkJy4TgwZTBGwRDQgWEbLbdTA== -"@math.gl/web-mercator@^3.5.1", "@math.gl/web-mercator@^3.5.5": +"@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== + +"@math.gl/web-mercator@^3.5.5": version "3.5.7" resolved "https://registry.yarnpkg.com/@math.gl/web-mercator/-/web-mercator-3.5.7.tgz#180a1057ea622bd857c6931f67268c2e98f174c6" integrity sha512-i0w6AcV2b5+yeUQOA/KdnnzTYMUZvEKzHbbxI+ZyCuFs3p9S/IUt/EWVw4KGGOjVbf3UrGFlWSM70Th+0KyrsA== @@ -2683,6 +2714,13 @@ "@babel/runtime" "^7.12.0" gl-matrix "^3.4.0" +"@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== + dependencies: + "@babel/runtime" "^7.12.0" + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -3045,6 +3083,11 @@ dependencies: "@types/node" "*" +"@types/crypto-js@^4.0.2": + version "4.1.3" + resolved "https://registry.yarnpkg.com/@types/crypto-js/-/crypto-js-4.1.3.tgz#7f2fa22857ae2b5d3221edcba9644f67f8ea984c" + integrity sha512-YP1sYYayLe7Eg5oXyLLvOLfxBfZ5Fgpz6sVWkpB18wDMywCLPWmqzRz+9gyuOoLF0fzDTTFwlyNbx7koONUwqA== + "@types/d3-path@^1": version "1.0.9" resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-1.0.9.tgz#73526b150d14cd96e701597cbf346cfd1fd4a58c" From d2f50c67f288983c1c341914d90ba002118b4287 Mon Sep 17 00:00:00 2001 From: Viktor Belomestnov Date: Tue, 24 Oct 2023 15:55:43 +0200 Subject: [PATCH 6/6] bump to beta.7 --- package.json | 14 +- src/utils/debug/build-minimap-data.spec.ts | 4 +- src/utils/debug/normals-utils.spec.ts | 2 +- yarn.lock | 207 ++++++++++----------- 4 files changed, 115 insertions(+), 112 deletions(-) diff --git a/package.json b/package.json index b194cc1d..6ecb6476 100644 --- a/package.json +++ b/package.json @@ -24,10 +24,10 @@ "@fortawesome/free-solid-svg-icons": "^5.15.4", "@fortawesome/react-fontawesome": "^0.1.17", "@hyperjump/json-schema": "^0.23.2", - "@loaders.gl/3d-tiles": "^4.0.0-beta.5", - "@loaders.gl/core": "^4.0.0-beta.5", - "@loaders.gl/i3s": "^4.0.0-beta.5", - "@loaders.gl/tiles": "^4.0.0-beta.5", + "@loaders.gl/3d-tiles": "^4.0.0-beta.7", + "@loaders.gl/core": "^4.0.0-beta.7", + "@loaders.gl/i3s": "^4.0.0-beta.7", + "@loaders.gl/tiles": "^4.0.0-beta.7", "@luma.gl/core": "^8.5.14", "@math.gl/proj4": "^3.6.3", "@probe.gl/stats": "^4.0.4", @@ -86,6 +86,10 @@ "webpack-dev-server": "^4.7.4" }, "resolutions": { - "@loaders.gl/tiles": "^4.0.0-beta.5" + "@loaders.gl/tiles": "^4.0.0-beta.7" + }, + "volta": { + "node": "18.18.2", + "yarn": "1.22.19" } } diff --git a/src/utils/debug/build-minimap-data.spec.ts b/src/utils/debug/build-minimap-data.spec.ts index 2ede08b5..70e459ab 100644 --- a/src/utils/debug/build-minimap-data.spec.ts +++ b/src/utils/debug/build-minimap-data.spec.ts @@ -43,7 +43,7 @@ describe("Build Minimap Data", () => { const expectedResult = [ { coordinates: new Vector3([ - 63.43494882292201, 53.48500010847735, -6364361.246505878, + 63.43494882292201, 53.48500010847735, -6364361.246505877, ]), radius: 10, }, @@ -70,7 +70,7 @@ describe("Build Minimap Data", () => { const expectedResult = [ { coordinates: new Vector3([ - 63.43494882292201, 53.48500010847735, -6364361.246505878, + 63.43494882292201, 53.48500010847735, -6364361.246505877, ]), radius: 10, }, diff --git a/src/utils/debug/normals-utils.spec.ts b/src/utils/debug/normals-utils.spec.ts index 47434e1e..5cccf6df 100644 --- a/src/utils/debug/normals-utils.spec.ts +++ b/src/utils/debug/normals-utils.spec.ts @@ -13,7 +13,7 @@ jest.mock("@math.gl/geospatial", () => ({ }, })); -describe.skip("generateBinaryNormalsDebugData", () => { +describe("generateBinaryNormalsDebugData", () => { test("Should return empty object if no tile content", () => { const tile = getTile3d(); tile.unloadContent(); diff --git a/yarn.lock b/yarn.lock index 4b142900..e7340b96 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2172,30 +2172,30 @@ "@math.gl/core" "^3.5.1" "@math.gl/geospatial" "^3.5.1" -"@loaders.gl/3d-tiles@^4.0.0-beta.5": - version "4.0.0-beta.5" - resolved "https://registry.yarnpkg.com/@loaders.gl/3d-tiles/-/3d-tiles-4.0.0-beta.5.tgz#36a89ccb0e6439ff41e7640967bbb52405125f55" - integrity sha512-ad6srU2rF3lespRK03PmDglxz+dIZEwRzloZLpNPN6nHNhM8lmsgCPEKRAt3WtPD2w/z9KUkE0OTJVhO1yiZqw== - dependencies: - "@loaders.gl/draco" "4.0.0-beta.5" - "@loaders.gl/gltf" "4.0.0-beta.5" - "@loaders.gl/loader-utils" "4.0.0-beta.5" - "@loaders.gl/math" "4.0.0-beta.5" - "@loaders.gl/tiles" "4.0.0-beta.5" - "@loaders.gl/zip" "4.0.0-beta.5" +"@loaders.gl/3d-tiles@^4.0.0-beta.7": + version "4.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@loaders.gl/3d-tiles/-/3d-tiles-4.0.0-beta.7.tgz#b0ca6ed6d1e6b66f60434db65b4a849ebd4f074a" + integrity sha512-lTmFYYjM7SlzLzMWoVg1szeGF2Ofg6ZaK825odMr2sIrzhpc91YB9JR5W/DOfCKGW4ROQ0mvk4tV+yCp5GMhhQ== + dependencies: + "@loaders.gl/draco" "4.0.0-beta.7" + "@loaders.gl/gltf" "4.0.0-beta.7" + "@loaders.gl/loader-utils" "4.0.0-beta.7" + "@loaders.gl/math" "4.0.0-beta.7" + "@loaders.gl/tiles" "4.0.0-beta.7" + "@loaders.gl/zip" "4.0.0-beta.7" "@math.gl/core" "^4.0.0" "@math.gl/geospatial" "^4.0.0" "@probe.gl/log" "^4.0.4" long "^5.2.1" -"@loaders.gl/compression@4.0.0-beta.5": - version "4.0.0-beta.5" - resolved "https://registry.yarnpkg.com/@loaders.gl/compression/-/compression-4.0.0-beta.5.tgz#d1a4cd777e4f68ee22f14babff5e16d4ca145065" - integrity sha512-stFvMc0YdUS8EOKqnyb+UBIzLRUC+LmCGtMRbQ6m/jAQtCz49hLhvo/ii+lqsNPGw44xmFMlzN0idR/gxPSaZw== +"@loaders.gl/compression@4.0.0-beta.7": + version "4.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@loaders.gl/compression/-/compression-4.0.0-beta.7.tgz#bb7344053e189d1c171eac13614972830d77267e" + integrity sha512-ewmHG84TfTPDnfqKFjWIrY6GgUO6eFEP81L1VGJRKIW1LYl/Xrdk4cCCozlGS+Sut3VNb0djtGL2+oei+LBuKw== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/loader-utils" "4.0.0-beta.5" - "@loaders.gl/worker-utils" "4.0.0-beta.5" + "@loaders.gl/loader-utils" "4.0.0-beta.7" + "@loaders.gl/worker-utils" "4.0.0-beta.7" "@types/brotli" "^1.3.0" "@types/pako" "^1.0.1" fflate "0.7.4" @@ -2218,24 +2218,24 @@ "@probe.gl/log" "^3.5.0" probe.gl "^3.4.0" -"@loaders.gl/core@^4.0.0-beta.5": - version "4.0.0-beta.5" - resolved "https://registry.yarnpkg.com/@loaders.gl/core/-/core-4.0.0-beta.5.tgz#4c8ab164dc29d71d85012e82b2f3539a1353064a" - integrity sha512-GnAc8bSQKxyFmIXFn+tAQmw4MVDBF43dr9KgFm13n0iSt7fY6rwDqM2fvEHymSbWzXyalJn1dqaWlhjBJQ5ukQ== +"@loaders.gl/core@^4.0.0-beta.7": + version "4.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@loaders.gl/core/-/core-4.0.0-beta.7.tgz#292b06bdd1f8a48f49bf743d45601b54cbf7d91e" + integrity sha512-DEf5q03ubQei6SU0Kv1kRwyZgFKbGoCY8oxNZcV0rhhhb65+7sF0TcwPuqB6/ix9MJKLzcM727SFSV4lleI+fQ== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/loader-utils" "4.0.0-beta.5" - "@loaders.gl/worker-utils" "4.0.0-beta.5" + "@loaders.gl/loader-utils" "4.0.0-beta.7" + "@loaders.gl/worker-utils" "4.0.0-beta.7" "@probe.gl/log" "^4.0.2" -"@loaders.gl/crypto@4.0.0-beta.5": - version "4.0.0-beta.5" - resolved "https://registry.yarnpkg.com/@loaders.gl/crypto/-/crypto-4.0.0-beta.5.tgz#4ebfe85e3f7ca1ffb15b9c28121229ad2afe500b" - integrity sha512-HDZuJsf5TOaDU1RVFdw9Uq4ey1jz9X+HqZmXBUFRNt7U+3fpunvQpLFpZRJms85tv6GJL9FEDkhteHXULlU1/Q== +"@loaders.gl/crypto@4.0.0-beta.7": + version "4.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@loaders.gl/crypto/-/crypto-4.0.0-beta.7.tgz#b8ecc7990c2910e6e234aa0e8a74634ce056dcbe" + integrity sha512-jcwyUHSz9xfa8mpE4CYfg5x8ztraUmZbiChbYT4Z5V60nnptQm3mOOTdAMJ1d4ZEKeHY/x4WIM6qv8plS8DJOw== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/loader-utils" "4.0.0-beta.5" - "@loaders.gl/worker-utils" "4.0.0-beta.5" + "@loaders.gl/loader-utils" "4.0.0-beta.7" + "@loaders.gl/worker-utils" "4.0.0-beta.7" "@types/crypto-js" "^4.0.2" "@loaders.gl/draco@3.2.12": @@ -2249,15 +2249,15 @@ "@loaders.gl/worker-utils" "3.2.12" draco3d "1.4.1" -"@loaders.gl/draco@4.0.0-beta.5": - version "4.0.0-beta.5" - resolved "https://registry.yarnpkg.com/@loaders.gl/draco/-/draco-4.0.0-beta.5.tgz#13daaa03fb78787c12087b6bcca0b194a2dbe936" - integrity sha512-7o+j/tPXCIB04ZZFlDnrB51GSHPlwakwXyc5o3FPEJe/XLN5W96TYxoESJRWpvakudR8Ao+G00KDhsH2dayJlQ== +"@loaders.gl/draco@4.0.0-beta.7": + version "4.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@loaders.gl/draco/-/draco-4.0.0-beta.7.tgz#a9d6e10befccdd6f98359e13d42abdb5095396cf" + integrity sha512-YrenVRU12EfLAqIqAqZYYYq3dg3NGTQ9160caR/cLfOxqa09v5CtSlq1CvJwAjy+bIcRJjNR734aIlKC1SdkCw== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/loader-utils" "4.0.0-beta.5" - "@loaders.gl/schema" "4.0.0-beta.5" - "@loaders.gl/worker-utils" "4.0.0-beta.5" + "@loaders.gl/loader-utils" "4.0.0-beta.7" + "@loaders.gl/schema" "4.0.0-beta.7" + "@loaders.gl/worker-utils" "4.0.0-beta.7" draco3d "1.5.5" "@loaders.gl/gis@3.2.12", "@loaders.gl/gis@^3.2.0": @@ -2281,31 +2281,30 @@ "@loaders.gl/loader-utils" "3.2.12" "@loaders.gl/textures" "3.2.12" -"@loaders.gl/gltf@4.0.0-beta.5": - version "4.0.0-beta.5" - resolved "https://registry.yarnpkg.com/@loaders.gl/gltf/-/gltf-4.0.0-beta.5.tgz#33a8374c4adf03d0a8260b1f0424a576ba2a6b94" - integrity sha512-rzlv09raWU0bxWiQTAm+Z9Dvj7IuhumRYVQ9CwZvSYW8l48ySNpCG5hxSEapa9UaOqc/QJFGtJRbVur9Z1bqqQ== +"@loaders.gl/gltf@4.0.0-beta.7": + version "4.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@loaders.gl/gltf/-/gltf-4.0.0-beta.7.tgz#9a5b64356f6a4b3150b78ab859744023e3096495" + integrity sha512-kwKr64g8QfDmMBa6mL+OZCBmhFDiy0W4X0dgWu49699S2wFnpp1j4akFt8AegeE2xhcRX2dILy0tX1P4qF35kA== dependencies: - "@loaders.gl/draco" "4.0.0-beta.5" - "@loaders.gl/images" "4.0.0-beta.5" - "@loaders.gl/loader-utils" "4.0.0-beta.5" - "@loaders.gl/textures" "4.0.0-beta.5" + "@loaders.gl/draco" "4.0.0-beta.7" + "@loaders.gl/images" "4.0.0-beta.7" + "@loaders.gl/loader-utils" "4.0.0-beta.7" + "@loaders.gl/textures" "4.0.0-beta.7" "@math.gl/core" "^4.0.0" -"@loaders.gl/i3s@^4.0.0-beta.5": - version "4.0.0-beta.5" - resolved "https://registry.yarnpkg.com/@loaders.gl/i3s/-/i3s-4.0.0-beta.5.tgz#9504841e31d5da75f4db64687fd10569ad46f5d6" - integrity sha512-5/GM2QXyQ9mqzyrGTsw/YUTFUF4kfLoaPqqPORLdAFf0Ew5pqSqrO54jOgrSEalc8yA09HLKFLUVjMtfWHlsIg== - dependencies: - "@loaders.gl/compression" "4.0.0-beta.5" - "@loaders.gl/crypto" "4.0.0-beta.5" - "@loaders.gl/draco" "4.0.0-beta.5" - "@loaders.gl/images" "4.0.0-beta.5" - "@loaders.gl/loader-utils" "4.0.0-beta.5" - "@loaders.gl/schema" "4.0.0-beta.5" - "@loaders.gl/textures" "4.0.0-beta.5" - "@loaders.gl/tiles" "4.0.0-beta.5" - "@luma.gl/constants" "^8.5.4" +"@loaders.gl/i3s@^4.0.0-beta.7": + version "4.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@loaders.gl/i3s/-/i3s-4.0.0-beta.7.tgz#5d48d5e621109d031448880d5fbce43df64ad879" + integrity sha512-fyyNVJiJr3SzMt/5NGtIMs4489XtsaD43LWSoWbXjbadsWeCORg6yp4R89JGfkmZ8cVhxjSfrunakx0LVn7vaQ== + dependencies: + "@loaders.gl/compression" "4.0.0-beta.7" + "@loaders.gl/crypto" "4.0.0-beta.7" + "@loaders.gl/draco" "4.0.0-beta.7" + "@loaders.gl/images" "4.0.0-beta.7" + "@loaders.gl/loader-utils" "4.0.0-beta.7" + "@loaders.gl/schema" "4.0.0-beta.7" + "@loaders.gl/textures" "4.0.0-beta.7" + "@loaders.gl/tiles" "4.0.0-beta.7" "@math.gl/core" "^4.0.0" "@math.gl/culling" "^4.0.0" "@math.gl/geospatial" "^4.0.0" @@ -2317,12 +2316,12 @@ dependencies: "@loaders.gl/loader-utils" "3.2.12" -"@loaders.gl/images@4.0.0-beta.5": - version "4.0.0-beta.5" - resolved "https://registry.yarnpkg.com/@loaders.gl/images/-/images-4.0.0-beta.5.tgz#ec3942184f85e3a3e2b5b5981223672ad6c4179e" - integrity sha512-qGwyZqQw3FG/UUP30jzWY6X/xrT7f6qi/RL5y9p5KDL7ybSUZ3mklhc+rNvZV543zOChSLECTmiB7lmsyhxeBw== +"@loaders.gl/images@4.0.0-beta.7": + version "4.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@loaders.gl/images/-/images-4.0.0-beta.7.tgz#865c1854f6a914b378c9f72aa3a8fc4648a7c6f9" + integrity sha512-V5YdrhZb0ywJOK2WhTy1nNcIcPE3ZjzsWaDCfuliKokstqgB3FldLSBSQ5D+KmGPaRthV++nqHxRxtV/PA7wag== dependencies: - "@loaders.gl/loader-utils" "4.0.0-beta.5" + "@loaders.gl/loader-utils" "4.0.0-beta.7" "@loaders.gl/loader-utils@3.2.12", "@loaders.gl/loader-utils@^3.2.0": version "3.2.12" @@ -2333,13 +2332,13 @@ "@loaders.gl/worker-utils" "3.2.12" "@probe.gl/stats" "^3.5.0" -"@loaders.gl/loader-utils@4.0.0-beta.5": - version "4.0.0-beta.5" - resolved "https://registry.yarnpkg.com/@loaders.gl/loader-utils/-/loader-utils-4.0.0-beta.5.tgz#bca3e926708fab0e4c9502fa63c8f947aae41a71" - integrity sha512-hdwithS1mZlxll1aTi36GCJml2RSiS81SAvHqDSE998SfGoh9n0UuoX1kaZtPIvPzTvtsZyJYNe6tGauNJ/o4Q== +"@loaders.gl/loader-utils@4.0.0-beta.7": + version "4.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@loaders.gl/loader-utils/-/loader-utils-4.0.0-beta.7.tgz#4bd191c18a374ab82b8477ebec1b3baceb06ab8b" + integrity sha512-DNer1W+tUO3I2fgrpsy+7CEidoO4HN/h8R6IESERzpDa2zHiue/+sX6TXEbbUDPO8pa9upOxdXwR4TEXHPlsrw== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/worker-utils" "4.0.0-beta.5" + "@loaders.gl/worker-utils" "4.0.0-beta.7" "@probe.gl/stats" "^4.0.2" "@loaders.gl/math@3.2.12": @@ -2351,13 +2350,13 @@ "@loaders.gl/loader-utils" "3.2.12" "@math.gl/core" "^3.5.1" -"@loaders.gl/math@4.0.0-beta.5": - version "4.0.0-beta.5" - resolved "https://registry.yarnpkg.com/@loaders.gl/math/-/math-4.0.0-beta.5.tgz#cd367ff9aea7a2eb0b2a64285bb112986173fda3" - integrity sha512-sCPvAPPuScHv+7nrqe2bpJ7dK7as1uEVttbsrSmOczq5xgIm7qL2VJgHv5H4NIlIJdmsnPdR9uQZPL7Il7jsZw== +"@loaders.gl/math@4.0.0-beta.7": + version "4.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@loaders.gl/math/-/math-4.0.0-beta.7.tgz#00653c8d41741e9e682cbc7e2e11798acfd2c9ad" + integrity sha512-02Up8I9hLXy/ICj/SLjVnw3xnoFBqkTCrKLxZ7VjIRBBZtdDXtQi0wBhl0FXBfaCkRkmCwUYOL2bazKsynVBeQ== dependencies: - "@loaders.gl/images" "4.0.0-beta.5" - "@loaders.gl/loader-utils" "4.0.0-beta.5" + "@loaders.gl/images" "4.0.0-beta.7" + "@loaders.gl/loader-utils" "4.0.0-beta.7" "@math.gl/core" "^4.0.0" "@loaders.gl/mvt@^3.2.0": @@ -2379,10 +2378,10 @@ "@types/geojson" "^7946.0.7" apache-arrow "^4.0.0" -"@loaders.gl/schema@4.0.0-beta.5": - version "4.0.0-beta.5" - resolved "https://registry.yarnpkg.com/@loaders.gl/schema/-/schema-4.0.0-beta.5.tgz#fa7c05e7f2b9422350a2bc8b831a3b1061f1a980" - integrity sha512-+LKdxGScthvAt/imQFASDuCfmymlbmBSRPn8J1p2apjy6z3n7P8Wj6tamKqy4BWYikqfcVyr3yyXJmKf0OH5XQ== +"@loaders.gl/schema@4.0.0-beta.7": + version "4.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@loaders.gl/schema/-/schema-4.0.0-beta.7.tgz#85df6bd44aa3283545499dbdf78d8faf02f2d642" + integrity sha512-NTESRVLkXgkBZigATT6BeYut+siPtJoJ03mZ7sf8E7V7YzepcTf9Xdzqmq+pkTmSZKBVYiYFRe6VH0FF2N2lDQ== dependencies: "@types/geojson" "^7946.0.7" @@ -2408,25 +2407,25 @@ ktx-parse "^0.0.4" texture-compressor "^1.0.2" -"@loaders.gl/textures@4.0.0-beta.5": - version "4.0.0-beta.5" - resolved "https://registry.yarnpkg.com/@loaders.gl/textures/-/textures-4.0.0-beta.5.tgz#82063a32e232ecda7f66cfa58b4093d956ca2f34" - integrity sha512-UrlmPnykRdcygLIeZ+ZHp3J53ItvuvFOewCXfZl43rvKulCE552AiuyIh1zPtRRdY6ukkPhrEJHYJ66qJqN2pA== +"@loaders.gl/textures@4.0.0-beta.7": + version "4.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@loaders.gl/textures/-/textures-4.0.0-beta.7.tgz#b2d1e2300a3d64537cdf71a68c5dac8f47bb9565" + integrity sha512-ZkYylbDmmnIpwQomoKMiIJ12H07/nMIi8e9uBfIP+GhvuQgyOO5vOiyEcTI+3Q6dVOgSteSPPdoSq1I+Cub/6Q== dependencies: - "@loaders.gl/images" "4.0.0-beta.5" - "@loaders.gl/loader-utils" "4.0.0-beta.5" - "@loaders.gl/schema" "4.0.0-beta.5" - "@loaders.gl/worker-utils" "4.0.0-beta.5" + "@loaders.gl/images" "4.0.0-beta.7" + "@loaders.gl/loader-utils" "4.0.0-beta.7" + "@loaders.gl/schema" "4.0.0-beta.7" + "@loaders.gl/worker-utils" "4.0.0-beta.7" ktx-parse "^0.0.4" texture-compressor "^1.0.2" -"@loaders.gl/tiles@3.2.12", "@loaders.gl/tiles@4.0.0-beta.5", "@loaders.gl/tiles@^3.2.0", "@loaders.gl/tiles@^4.0.0-beta.5": - version "4.0.0-beta.5" - resolved "https://registry.yarnpkg.com/@loaders.gl/tiles/-/tiles-4.0.0-beta.5.tgz#adddde574aa368e22c341946e9784e9b08e99ccd" - integrity sha512-HU2T0US5AsZXGHu9VIMHiyISnu7xAgUNDorpXHnfEUkrviSbu3+0k9I0Une2XHqE/kzFHmXOCRimMA0FMQv4Lw== +"@loaders.gl/tiles@3.2.12", "@loaders.gl/tiles@4.0.0-beta.7", "@loaders.gl/tiles@^3.2.0", "@loaders.gl/tiles@^4.0.0-beta.7": + version "4.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@loaders.gl/tiles/-/tiles-4.0.0-beta.7.tgz#bddd974c506386d56b78a5a2d0d6b37a3a5e6339" + integrity sha512-KpdLvGeZeTh0yZPo0hgYHR1WPwPMtNn+GZ6Wz5090pQLs9eVAer8OivxaySlfqMT3iyLjYIN8wg0wDx6pwKN1Q== dependencies: - "@loaders.gl/loader-utils" "4.0.0-beta.5" - "@loaders.gl/math" "4.0.0-beta.5" + "@loaders.gl/loader-utils" "4.0.0-beta.7" + "@loaders.gl/math" "4.0.0-beta.7" "@math.gl/core" "^4.0.0" "@math.gl/culling" "^4.0.0" "@math.gl/geospatial" "^4.0.0" @@ -2440,25 +2439,25 @@ dependencies: "@babel/runtime" "^7.3.1" -"@loaders.gl/worker-utils@4.0.0-beta.5": - version "4.0.0-beta.5" - resolved "https://registry.yarnpkg.com/@loaders.gl/worker-utils/-/worker-utils-4.0.0-beta.5.tgz#0245179197e024eab35ca29f0bbf461b93efb7e8" - integrity sha512-Xd6VU8+tKdJD4KP9CyjVf1AuJnY+uKJlygbH20MEenNE3dTsQMG8E8uSVdnIgPfn491WYjCNWzGUbh2MVPgLEw== +"@loaders.gl/worker-utils@4.0.0-beta.7": + version "4.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@loaders.gl/worker-utils/-/worker-utils-4.0.0-beta.7.tgz#b7a9bdfd45cbb50db6e2e847b2ba34244431afed" + integrity sha512-5vZ7WHDkS/jMMdHeCg1n/a0aHVaHdu7lpkbkcOqncQHkA/jX6m9pE+Xm4tUt7W1LV3NlFDHMirt1mDX5csVvNw== dependencies: "@babel/runtime" "^7.3.1" -"@loaders.gl/zip@4.0.0-beta.5": - version "4.0.0-beta.5" - resolved "https://registry.yarnpkg.com/@loaders.gl/zip/-/zip-4.0.0-beta.5.tgz#af58c9241a438456320761daf98b76bff700ff02" - integrity sha512-TNgSxDrfeh0EApLt7yLujpCbk2rP6NgA6je5OxRQezWtIoFDs0QOO53BE8P5cZiT/38MRc6/7qaMK856Rtz8eg== +"@loaders.gl/zip@4.0.0-beta.7": + version "4.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@loaders.gl/zip/-/zip-4.0.0-beta.7.tgz#92abbc75760ff2594be25be8e4b1c7268e91ed6e" + integrity sha512-T8L0QShP+hlqUZae6ztMrW+d0c2e5VpBKA8ygmxN86JaiqeCJ09OIZyX+YxKG/QgdQI/7zB7aralareAKBMzrA== dependencies: - "@loaders.gl/compression" "4.0.0-beta.5" - "@loaders.gl/crypto" "4.0.0-beta.5" - "@loaders.gl/loader-utils" "4.0.0-beta.5" + "@loaders.gl/compression" "4.0.0-beta.7" + "@loaders.gl/crypto" "4.0.0-beta.7" + "@loaders.gl/loader-utils" "4.0.0-beta.7" jszip "^3.1.5" md5 "^2.3.0" -"@luma.gl/constants@8.5.18", "@luma.gl/constants@^8.5.14", "@luma.gl/constants@^8.5.4": +"@luma.gl/constants@8.5.18", "@luma.gl/constants@^8.5.14": version "8.5.18" resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-8.5.18.tgz#f18886dfb1407225cd18cb792e490219f91eb3d2" integrity sha512-lQLGAlroQaeJkAUwrb1fRiHlMBP9/ukyjnZ1QlYgXYyeC7/9XhLx4rqBlOzQ2sxcTHHwi73nHD0P2XmVuAccBg==