From 865edf736b0d4e4b4918d618c92616bd1a005856 Mon Sep 17 00:00:00 2001 From: Christopher Tannum Date: Wed, 21 Jun 2023 16:07:43 +0200 Subject: [PATCH 1/9] chore: restructure folder layout --- .../Image360HistoricalDetails.tsx | 9 ++++----- .../Panel/Image360HistoricalPanel.tsx | 0 .../{ => Image360HistoricalDetails}/Panel/index.ts | 0 .../Toolbar/Image360HistoricalSummary.tsx | 0 .../{ => Image360HistoricalDetails}/Toolbar/index.ts | 0 .../{ => Image360HistoricalDetails}/utils/FormatDate.ts | 0 .../{ => Image360HistoricalDetails}/utils/Thumbnail.tsx | 0 react-components/src/components/View/index.ts | 1 - react-components/src/components/index.ts | 2 +- .../src/stories/Image360HistoricalDetails.stories.ts | 2 +- 10 files changed, 6 insertions(+), 8 deletions(-) rename react-components/src/components/{View => Image360HistoricalDetails}/Image360HistoricalDetails.tsx (90%) rename react-components/src/components/{ => Image360HistoricalDetails}/Panel/Image360HistoricalPanel.tsx (100%) rename react-components/src/components/{ => Image360HistoricalDetails}/Panel/index.ts (100%) rename react-components/src/components/{ => Image360HistoricalDetails}/Toolbar/Image360HistoricalSummary.tsx (100%) rename react-components/src/components/{ => Image360HistoricalDetails}/Toolbar/index.ts (100%) rename react-components/src/components/{ => Image360HistoricalDetails}/utils/FormatDate.ts (100%) rename react-components/src/components/{ => Image360HistoricalDetails}/utils/Thumbnail.tsx (100%) delete mode 100644 react-components/src/components/View/index.ts diff --git a/react-components/src/components/View/Image360HistoricalDetails.tsx b/react-components/src/components/Image360HistoricalDetails/Image360HistoricalDetails.tsx similarity index 90% rename from react-components/src/components/View/Image360HistoricalDetails.tsx rename to react-components/src/components/Image360HistoricalDetails/Image360HistoricalDetails.tsx index e77a1007f6f..3c7f76bc718 100644 --- a/react-components/src/components/View/Image360HistoricalDetails.tsx +++ b/react-components/src/components/Image360HistoricalDetails/Image360HistoricalDetails.tsx @@ -4,12 +4,11 @@ import { Cognite3DViewer, Image360 } from '@cognite/reveal'; import React, { useEffect, useRef, useState } from 'react'; -import { Image360HistoricalPanel } from '../Panel/Image360HistoricalPanel'; -import { Image360HistoricalSummary } from '../Toolbar/Image360HistoricalSummary'; -import { formatDate } from '../utils/FormatDate'; +import { Image360HistoricalPanel } from './Panel/Image360HistoricalPanel'; +import { Image360HistoricalSummary } from './Toolbar/Image360HistoricalSummary'; +import { formatDate } from './utils/FormatDate'; import styled from 'styled-components'; -// Using named import to avoid react component creation error when default import is used. -import { uniqueId } from 'lodash'; +import uniqueId from 'lodash/uniqueId'; export interface Image360HistoricalDetailsProps { viewer: Cognite3DViewer; diff --git a/react-components/src/components/Panel/Image360HistoricalPanel.tsx b/react-components/src/components/Image360HistoricalDetails/Panel/Image360HistoricalPanel.tsx similarity index 100% rename from react-components/src/components/Panel/Image360HistoricalPanel.tsx rename to react-components/src/components/Image360HistoricalDetails/Panel/Image360HistoricalPanel.tsx diff --git a/react-components/src/components/Panel/index.ts b/react-components/src/components/Image360HistoricalDetails/Panel/index.ts similarity index 100% rename from react-components/src/components/Panel/index.ts rename to react-components/src/components/Image360HistoricalDetails/Panel/index.ts diff --git a/react-components/src/components/Toolbar/Image360HistoricalSummary.tsx b/react-components/src/components/Image360HistoricalDetails/Toolbar/Image360HistoricalSummary.tsx similarity index 100% rename from react-components/src/components/Toolbar/Image360HistoricalSummary.tsx rename to react-components/src/components/Image360HistoricalDetails/Toolbar/Image360HistoricalSummary.tsx diff --git a/react-components/src/components/Toolbar/index.ts b/react-components/src/components/Image360HistoricalDetails/Toolbar/index.ts similarity index 100% rename from react-components/src/components/Toolbar/index.ts rename to react-components/src/components/Image360HistoricalDetails/Toolbar/index.ts diff --git a/react-components/src/components/utils/FormatDate.ts b/react-components/src/components/Image360HistoricalDetails/utils/FormatDate.ts similarity index 100% rename from react-components/src/components/utils/FormatDate.ts rename to react-components/src/components/Image360HistoricalDetails/utils/FormatDate.ts diff --git a/react-components/src/components/utils/Thumbnail.tsx b/react-components/src/components/Image360HistoricalDetails/utils/Thumbnail.tsx similarity index 100% rename from react-components/src/components/utils/Thumbnail.tsx rename to react-components/src/components/Image360HistoricalDetails/utils/Thumbnail.tsx diff --git a/react-components/src/components/View/index.ts b/react-components/src/components/View/index.ts deleted file mode 100644 index 1a4006d0b75..00000000000 --- a/react-components/src/components/View/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { Image360HistoricalDetails } from "./Image360HistoricalDetails"; diff --git a/react-components/src/components/index.ts b/react-components/src/components/index.ts index d1b2e4714bc..96650111dff 100644 --- a/react-components/src/components/index.ts +++ b/react-components/src/components/index.ts @@ -1,2 +1,2 @@ import '@cognite/cogs.js/dist/cogs.css'; -export { Image360HistoricalDetails } from './View'; +export { Image360HistoricalDetails } from './Image360HistoricalDetails/Image360HistoricalDetails'; diff --git a/react-components/src/stories/Image360HistoricalDetails.stories.ts b/react-components/src/stories/Image360HistoricalDetails.stories.ts index 001607c803d..cc3f007692b 100644 --- a/react-components/src/stories/Image360HistoricalDetails.stories.ts +++ b/react-components/src/stories/Image360HistoricalDetails.stories.ts @@ -1,5 +1,5 @@ import type { Meta, StoryObj } from '@storybook/react'; -import { Image360HistoricalDetails } from '../components/View'; +import { Image360HistoricalDetails } from '..'; import { It, Mock } from 'moq.ts'; import { Cognite3DViewer, Image360, Image360Revision } from '@cognite/reveal'; From c559f9c21eb881b0f88d4069ef77f69790f8ff83 Mon Sep 17 00:00:00 2001 From: Christopher Tannum Date: Thu, 22 Jun 2023 09:56:28 +0200 Subject: [PATCH 2/9] asd --- react-components/package.json | 8 +- react-components/src/components/index.ts | 1 + react-components/tsconfig.json | 5 +- react-components/yarn.lock | 171 +++++++++++++++++++---- 4 files changed, 151 insertions(+), 34 deletions(-) diff --git a/react-components/package.json b/react-components/package.json index 39b99fde39e..003b6505961 100644 --- a/react-components/package.json +++ b/react-components/package.json @@ -25,8 +25,9 @@ "@babel/preset-env": "7.22.5", "@babel/preset-react": "7.22.5", "@babel/preset-typescript": "7.22.5", - "@cognite/cogs.js": "^9.13.2", - "@cognite/reveal": "^4.3.1", + "@cognite/cogs.js": "^9.17.0", + "@cognite/reveal": "^4.3.3", + "@cognite/sdk": "^8.2.0", "@storybook/addon-essentials": "7.0.21", "@storybook/addon-interactions": "7.0.21", "@storybook/addon-links": "7.0.21", @@ -35,7 +36,7 @@ "@storybook/react-webpack5": "7.0.21", "@storybook/testing-library": "0.1.0", "@types/lodash": "^4.14.190", - "@types/react": "18.2.12", + "@types/react": "18.2.7", "@types/styled-components": "5.1.26", "@types/three": "0.152.0", "moq.ts": "^10.0.6", @@ -44,6 +45,7 @@ "react-dom": "18.2.0", "storybook": "7.0.21", "styled-components": "5.3.11", + "three": "0.152.2", "ts-loader": "9.4.3", "typescript": "5.1.3", "webpack": "5.87.0", diff --git a/react-components/src/components/index.ts b/react-components/src/components/index.ts index 96650111dff..37696305002 100644 --- a/react-components/src/components/index.ts +++ b/react-components/src/components/index.ts @@ -1,2 +1,3 @@ import '@cognite/cogs.js/dist/cogs.css'; +export { default as RevealContainer } from './RevealContainer/RevealContainer'; export { Image360HistoricalDetails } from './Image360HistoricalDetails/Image360HistoricalDetails'; diff --git a/react-components/tsconfig.json b/react-components/tsconfig.json index 94cbe3a1ab1..f0d31066786 100644 --- a/react-components/tsconfig.json +++ b/react-components/tsconfig.json @@ -1,10 +1,9 @@ { "compilerOptions": { "target": "ES6", - "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "strict": true, - "skipLibCheck": true, + "skipLibCheck": false, "jsx": "react-jsx", "module": "ESNext", "declaration": true, @@ -21,4 +20,4 @@ "exclude": [ "**/*.stories.ts" ] -} +} \ No newline at end of file diff --git a/react-components/yarn.lock b/react-components/yarn.lock index e73ed671212..744bdeb0d0d 100644 --- a/react-components/yarn.lock +++ b/react-components/yarn.lock @@ -2691,9 +2691,9 @@ __metadata: languageName: node linkType: hard -"@cognite/cogs.js@npm:^9.13.2": - version: 9.13.4 - resolution: "@cognite/cogs.js@npm:9.13.4" +"@cognite/cogs.js@npm:^9.17.0": + version: 9.17.0 + resolution: "@cognite/cogs.js@npm:9.17.0" dependencies: "@emotion/react": 11.10.6 "@emotion/styled": 11.10.6 @@ -2730,7 +2730,7 @@ __metadata: peerDependencies: react: ^18.0.0 react-dom: ^18.0.0 - checksum: c66bf4a2b600acefb0dbb46dfd7a2a01de47bc80d04b1239cb20482e07dd2ad8a55c008eaf4c4084bf372571b39434badc08bbe30d6a0ea2d41d989abb76fdb4 + checksum: f2098b89053ce90e8413953170d2504f2d616da5afe942c536c391880e41d7c0d41291e490e6cfec15f0a96f4a43a91689fb67b85fc8aaaf72482f8e4db03af9 languageName: node linkType: hard @@ -2741,8 +2741,9 @@ __metadata: "@babel/preset-env": 7.22.5 "@babel/preset-react": 7.22.5 "@babel/preset-typescript": 7.22.5 - "@cognite/cogs.js": ^9.13.2 - "@cognite/reveal": ^4.3.1 + "@cognite/cogs.js": ^9.17.0 + "@cognite/reveal": ^4.3.3 + "@cognite/sdk": ^8.2.0 "@storybook/addon-essentials": 7.0.21 "@storybook/addon-interactions": 7.0.21 "@storybook/addon-links": 7.0.21 @@ -2751,7 +2752,7 @@ __metadata: "@storybook/react-webpack5": 7.0.21 "@storybook/testing-library": 0.1.0 "@types/lodash": ^4.14.190 - "@types/react": 18.2.12 + "@types/react": 18.2.7 "@types/styled-components": 5.1.26 "@types/three": 0.152.0 lodash: ^4.17.21 @@ -2762,6 +2763,7 @@ __metadata: storybook: 7.0.21 style-loader: ^3.3.3 styled-components: 5.3.11 + three: 0.152.2 ts-loader: 9.4.3 typescript: 5.1.3 webpack: 5.87.0 @@ -2775,9 +2777,9 @@ __metadata: languageName: unknown linkType: soft -"@cognite/reveal@npm:^4.3.1": - version: 4.3.1 - resolution: "@cognite/reveal@npm:4.3.1" +"@cognite/reveal@npm:^4.3.3": + version: 4.3.3 + resolution: "@cognite/reveal@npm:4.3.3" dependencies: "@tweenjs/tween.js": 19.0.0 assert: 2.0.0 @@ -2792,12 +2794,37 @@ __metadata: random-seed: 0.3.0 rxjs: 7.8.1 skmeans: 0.11.3 - sparse-octree: 7.1.6 - three-stdlib: 2.23.4 + sparse-octree: 7.1.8 + three-stdlib: 2.23.10 peerDependencies: "@cognite/sdk": ^7.16.0 || ^8.0.0 three: 0.152.2 - checksum: a93a1ddfdd80d9501950f1da35ae1117102f5e9e6ce1fa580f956323cfdd12e65ae72670a475ecb4ae01eb530b32ac2bbb5e05a421350b6adb39a372e6460b08 + checksum: 5bc2b4f5cbf2c21f0b87594e25f7dd455635b694ed1ee06d071fd8694aae7fec90be8309095a37c5096224a1c709034245490ccfeb4cdf0ef49c2c39faa45d5a + languageName: node + linkType: hard + +"@cognite/sdk-core@npm:^4.9.0": + version: 4.9.0 + resolution: "@cognite/sdk-core@npm:4.9.0" + dependencies: + cross-fetch: ^3.0.4 + is-buffer: ^2.0.5 + lodash: ^4.17.11 + query-string: ^5.1.1 + url: ^0.11.0 + checksum: 257c627de952d8b6a1396c71f58c269d254d05648076072ab709708ba98495253062cb1299b113dc0fd9a40a228dddd9984e90b1ef2d2abb6aa926285cbe36ce + languageName: node + linkType: hard + +"@cognite/sdk@npm:^8.2.0": + version: 8.2.0 + resolution: "@cognite/sdk@npm:8.2.0" + dependencies: + "@cognite/sdk-core": ^4.9.0 + "@types/geojson": ^7946.0.8 + geojson: ^0.5.0 + lodash: ^4.17.11 + checksum: f65f00f6941522b2828f637fd8ae0f5b09fdf8e849fe0ad74857baf789b4479471f04cda265fceca6cd1ddd301ee2d2554a33e212513db4df5121549a475f787 languageName: node linkType: hard @@ -5218,6 +5245,13 @@ __metadata: languageName: node linkType: hard +"@types/geojson@npm:^7946.0.8": + version: 7946.0.10 + resolution: "@types/geojson@npm:7946.0.10" + checksum: 12c407c2dc93ecb26c08af533ee732f1506a9b29456616ba7ba1d525df96206c28ddf44a528f6a5415d7d22893e9d967420940a9c095ee5e539c1eba5fefc1f4 + languageName: node + linkType: hard + "@types/glob@npm:^8.0.0": version: 8.1.0 resolution: "@types/glob@npm:8.1.0" @@ -5454,14 +5488,14 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:18.2.12": - version: 18.2.12 - resolution: "@types/react@npm:18.2.12" +"@types/react@npm:18.2.7": + version: 18.2.7 + resolution: "@types/react@npm:18.2.7" dependencies: "@types/prop-types": "*" "@types/scheduler": "*" csstype: ^3.0.2 - checksum: ad85a7eadaf1b35cfeee9f715b39311420ff46d46e0650377d918b3f888c2e47416037da4a765e1dccd3d1916abd54c105a3bee803c971ba56c955a7768ce976 + checksum: caa5da4cf929766738ec789301dc6fb6624bd48dd317d851c4c9b84b1f47cd8ebe17fe01398cadaa0bc938cd4d502d67f4b9de9ff771dc132096bdc86228efba languageName: node linkType: hard @@ -7196,6 +7230,15 @@ __metadata: languageName: node linkType: hard +"cross-fetch@npm:^3.0.4": + version: 3.1.6 + resolution: "cross-fetch@npm:3.1.6" + dependencies: + node-fetch: ^2.6.11 + checksum: 704b3519ab7de488328cc49a52cf1aa14132ec748382be5b9557b22398c33ffa7f8c2530e8a97ed8cb55da52b0a9740a9791d361271c4591910501682d981d9c + languageName: node + linkType: hard + "cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.3": version: 7.0.3 resolution: "cross-spawn@npm:7.0.3" @@ -7356,6 +7399,13 @@ __metadata: languageName: node linkType: hard +"decode-uri-component@npm:^0.2.0": + version: 0.2.2 + resolution: "decode-uri-component@npm:0.2.2" + checksum: 95476a7d28f267292ce745eac3524a9079058bbb35767b76e3ee87d42e34cd0275d2eb19d9d08c3e167f97556e8a2872747f5e65cbebcac8b0c98d83e285f139 + languageName: node + linkType: hard + "dedent@npm:^0.7.0": version: 0.7.0 resolution: "dedent@npm:0.7.0" @@ -8666,6 +8716,13 @@ __metadata: languageName: node linkType: hard +"geojson@npm:^0.5.0": + version: 0.5.0 + resolution: "geojson@npm:0.5.0" + checksum: 44fbf916dc66d17f1561fb56fd2741f21e26da5dd7daf842a794119c841c7f6d611ccc21d9797c9c62a78c41a0f841c0648042989a5a5a05045835c6ada8612f + languageName: node + linkType: hard + "get-caller-file@npm:^2.0.5": version: 2.0.5 resolution: "get-caller-file@npm:2.0.5" @@ -9477,6 +9534,13 @@ __metadata: languageName: node linkType: hard +"is-buffer@npm:^2.0.5": + version: 2.0.5 + resolution: "is-buffer@npm:2.0.5" + checksum: 764c9ad8b523a9f5a32af29bdf772b08eb48c04d2ad0a7240916ac2688c983bf5f8504bf25b35e66240edeb9d9085461f9b5dae1f3d2861c6b06a65fe983de42 + languageName: node + linkType: hard + "is-callable@npm:^1.1.3": version: 1.2.7 resolution: "is-callable@npm:1.2.7" @@ -10149,7 +10213,7 @@ __metadata: languageName: node linkType: hard -"lodash@npm:4.17.21, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21": +"lodash@npm:4.17.21, lodash@npm:^4.17.11, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7 @@ -10698,7 +10762,7 @@ __metadata: languageName: node linkType: hard -"node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.7": +"node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.11, node-fetch@npm:^2.6.7": version: 2.6.11 resolution: "node-fetch@npm:2.6.11" dependencies: @@ -10818,7 +10882,7 @@ __metadata: languageName: node linkType: hard -"object-assign@npm:4.x, object-assign@npm:^4.1.1": +"object-assign@npm:4.x, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1": version: 4.1.1 resolution: "object-assign@npm:4.1.1" checksum: fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f @@ -11485,6 +11549,13 @@ __metadata: languageName: node linkType: hard +"punycode@npm:^1.4.1": + version: 1.4.1 + resolution: "punycode@npm:1.4.1" + checksum: fa6e698cb53db45e4628559e557ddaf554103d2a96a1d62892c8f4032cd3bc8871796cae9eabc1bc700e2b6677611521ce5bb1d9a27700086039965d0cf34518 + languageName: node + linkType: hard + "punycode@npm:^2.1.0": version: 2.3.0 resolution: "punycode@npm:2.3.0" @@ -11528,6 +11599,26 @@ __metadata: languageName: node linkType: hard +"qs@npm:^6.11.0": + version: 6.11.2 + resolution: "qs@npm:6.11.2" + dependencies: + side-channel: ^1.0.4 + checksum: e812f3c590b2262548647d62f1637b6989cc56656dc960b893fe2098d96e1bd633f36576f4cd7564dfbff9db42e17775884db96d846bebe4f37420d073ecdc0b + languageName: node + linkType: hard + +"query-string@npm:^5.1.1": + version: 5.1.1 + resolution: "query-string@npm:5.1.1" + dependencies: + decode-uri-component: ^0.2.0 + object-assign: ^4.1.0 + strict-uri-encode: ^1.0.0 + checksum: 4ac760d9778d413ef5f94f030ed14b1a07a1708dd13fd3bc54f8b9ef7b425942c7577f30de0bf5a7d227ee65a9a0350dfa3a43d1d266880882fb7ce4c434a4dd + languageName: node + linkType: hard + "queue-microtask@npm:^1.2.2": version: 1.2.3 resolution: "queue-microtask@npm:1.2.3" @@ -12804,12 +12895,12 @@ __metadata: languageName: node linkType: hard -"sparse-octree@npm:7.1.6": - version: 7.1.6 - resolution: "sparse-octree@npm:7.1.6" +"sparse-octree@npm:7.1.8": + version: 7.1.8 + resolution: "sparse-octree@npm:7.1.8" peerDependencies: three: 0.x.x - checksum: 310fa0472815a15a2b6f04baf108720a9a953fc6f3e54318a18bd31f613a333a922ca3240306f678e075612a3adab06f63dd4cca73edc974fde73eaac2689798 + checksum: 07074c703cd9cee9e3c1becc0b125356ffcea72713d47c4229b1ba3cd56ffbf68223c4a75586a0c6923a56e322b6383dd37b37e58c83471d2632e111a60c0a71 languageName: node linkType: hard @@ -12928,6 +13019,13 @@ __metadata: languageName: node linkType: hard +"strict-uri-encode@npm:^1.0.0": + version: 1.1.0 + resolution: "strict-uri-encode@npm:1.1.0" + checksum: 9466d371f7b36768d43f7803f26137657559e4c8b0161fb9e320efb8edba3ae22f8e99d4b0d91da023b05a13f62ec5412c3f4f764b5788fac11d1fea93720bb3 + languageName: node + linkType: hard + "string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3": version: 4.2.3 resolution: "string-width@npm:4.2.3" @@ -13241,9 +13339,9 @@ __metadata: languageName: node linkType: hard -"three-stdlib@npm:2.23.4": - version: 2.23.4 - resolution: "three-stdlib@npm:2.23.4" +"three-stdlib@npm:2.23.10": + version: 2.23.10 + resolution: "three-stdlib@npm:2.23.10" dependencies: "@types/draco3d": ^1.4.0 "@types/offscreencanvas": ^2019.6.4 @@ -13258,7 +13356,14 @@ __metadata: zstddec: ^0.0.2 peerDependencies: three: ">=0.128.0" - checksum: da676dca345841c11c9129d3d8cdf15e7d84dc958fd80833e48b9f3faf1ce166989dc17bf3aad3d70856785efdde890f4194f78b740c9f2a043a8ca1b295a407 + checksum: ff217acd9e90ef9d785a6c7261c9a24f85c6d0affafc90bb29292ea16a885f655c4e340a214c305d4f90e70237a85382ce747064b09034b191afcf721b0b1526 + languageName: node + linkType: hard + +"three@npm:0.152.2": + version: 0.152.2 + resolution: "three@npm:0.152.2" + checksum: 6d2d990dbff60b99c7e58b7f1446bb4bd235c7db5dd848a671385e01ae5c72bec865265be7f5a82907ecc96186acc13177d7de1252bc9592f5c9ebaffd1da1e7 languageName: node linkType: hard @@ -13610,6 +13715,16 @@ __metadata: languageName: node linkType: hard +"url@npm:^0.11.0": + version: 0.11.1 + resolution: "url@npm:0.11.1" + dependencies: + punycode: ^1.4.1 + qs: ^6.11.0 + checksum: a7de4b37bbcbe60ef199acda4ce437ef843c0ef3a4b34ec3e3d97e0446a5f50dc7bfeafbe33ad118cf4e5aa04805e1328f0d0126e254f2b77bb8498fa395c596 + languageName: node + linkType: hard + "use-resize-observer@npm:^9.1.0": version: 9.1.0 resolution: "use-resize-observer@npm:9.1.0" From a2aec9f78c8eaee9645ad11f0d05ac8f33ec44e6 Mon Sep 17 00:00:00 2001 From: Christopher Tannum Date: Thu, 22 Jun 2023 09:56:32 +0200 Subject: [PATCH 3/9] asd --- .../RevealContainer/RevealContainer.tsx | 17 +++++++++++++++++ .../src/stories/RevealContainer.stories.ts | 18 ++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 react-components/src/components/RevealContainer/RevealContainer.tsx create mode 100644 react-components/src/stories/RevealContainer.stories.ts diff --git a/react-components/src/components/RevealContainer/RevealContainer.tsx b/react-components/src/components/RevealContainer/RevealContainer.tsx new file mode 100644 index 00000000000..e3ce54bd0ab --- /dev/null +++ b/react-components/src/components/RevealContainer/RevealContainer.tsx @@ -0,0 +1,17 @@ +import { CogniteClient } from "@cognite/sdk"; +import { useEffect, useRef } from "react"; +import { Cognite3DViewer } from '@cognite/reveal'; + + +export default function RevealContainer() { + const revealDomElementRef = useRef(null); + useEffect(() => { + const sdk = new CogniteClient({ appId: 'reveal.example', project: 'test', getToken: () => Promise.resolve('') }); + const asdf = new Cognite3DViewer({ sdk, domElement: revealDomElementRef.current! }); + }, []) + return ( +
+

RevealContainer

+
+ ); +} \ No newline at end of file diff --git a/react-components/src/stories/RevealContainer.stories.ts b/react-components/src/stories/RevealContainer.stories.ts new file mode 100644 index 00000000000..95f2906128f --- /dev/null +++ b/react-components/src/stories/RevealContainer.stories.ts @@ -0,0 +1,18 @@ +import type { Meta, StoryObj } from '@storybook/react'; +import { It, Mock } from 'moq.ts'; +import { Cognite3DViewer, Image360, Image360Revision } from '@cognite/reveal'; +import { RevealContainer } from '..'; + +const meta = { + title: 'Example/RevealContainer', + component: RevealContainer, + tags: ['autodocs'], +} satisfies Meta; + +export default meta; +type Story = StoryObj; + +export const Main: Story = { + args: { + } +}; From ca83d9b89f94616009da4296e301a5182e71f322 Mon Sep 17 00:00:00 2001 From: Christopher Tannum Date: Thu, 22 Jun 2023 18:15:13 +0200 Subject: [PATCH 4/9] feat: add RevealContainer --- .../CogniteCadModelContainer.tsx | 34 ++++++++++++++++ .../RevealContainer/RevealContainer.tsx | 40 ++++++++++++++++--- .../RevealContainer/RevealContext.ts | 12 ++++++ react-components/src/components/index.ts | 1 + .../src/stories/RevealContainer.stories.ts | 18 --------- .../src/stories/RevealContainer.stories.tsx | 29 ++++++++++++++ 6 files changed, 110 insertions(+), 24 deletions(-) create mode 100644 react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx create mode 100644 react-components/src/components/RevealContainer/RevealContext.ts delete mode 100644 react-components/src/stories/RevealContainer.stories.ts create mode 100644 react-components/src/stories/RevealContainer.stories.tsx diff --git a/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx b/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx new file mode 100644 index 00000000000..d27a536cda5 --- /dev/null +++ b/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx @@ -0,0 +1,34 @@ +import { useEffect, useRef, useState } from "react"; +import { Cognite3DViewer, CogniteCadModel } from '@cognite/reveal'; +import { useReveal } from "../RevealContainer/RevealContext"; +import { Matrix4 } from "three"; + +type Cognite3dModelProps = { + modelId: number; + revisionId: number; + transform?: THREE.Matrix4; +} + +export default function CogniteCadModelContainer({ modelId, revisionId, transform }: Cognite3dModelProps) { + const modelRef = useRef(); + const viewer = useReveal(); + + useEffect(() => { + addModel(modelId, revisionId, transform) + .catch(console.error); + return () => { + if (modelRef.current === undefined || (viewer as any).isDisposed) return; + viewer.removeModel(modelRef.current); + } + }, []) + return <>; + + async function addModel(modelId: number, revisionId: number, transform?: Matrix4) { + const cadModel = await viewer.addCadModel({ modelId, revisionId }); + if (transform !== undefined) { + cadModel.setModelTransformation(transform); + } + viewer.fitCameraToModel(cadModel); + modelRef.current = cadModel; + } +} \ No newline at end of file diff --git a/react-components/src/components/RevealContainer/RevealContainer.tsx b/react-components/src/components/RevealContainer/RevealContainer.tsx index e3ce54bd0ab..7d71cd9e546 100644 --- a/react-components/src/components/RevealContainer/RevealContainer.tsx +++ b/react-components/src/components/RevealContainer/RevealContainer.tsx @@ -1,17 +1,45 @@ import { CogniteClient } from "@cognite/sdk"; -import { useEffect, useRef } from "react"; +import { useEffect, useRef, ReactNode, useState, useMemo } from "react"; import { Cognite3DViewer } from '@cognite/reveal'; +import { RevealContext } from "./RevealContext"; +import { Color } from "three"; +type RevealContainerProps = { + color?: Color; + sdk: CogniteClient; + children?: ReactNode; +} -export default function RevealContainer() { +export default function RevealContainer({ children, sdk, color }: RevealContainerProps) { + const [viewer, setViewer] = useState(); const revealDomElementRef = useRef(null); + useEffect(() => { - const sdk = new CogniteClient({ appId: 'reveal.example', project: 'test', getToken: () => Promise.resolve('') }); - const asdf = new Cognite3DViewer({ sdk, domElement: revealDomElementRef.current! }); - }, []) + const viewer = new Cognite3DViewer({ sdk, domElement: revealDomElementRef.current! }); + viewer.setBackgroundColor({ color, alpha: 1 }) + setViewer(viewer); + return () => { + viewer.dispose(); + console.log('a'); + setViewer(undefined); + console.log('b'); + } + }, []); + + const mountChildren = (viewer: Cognite3DViewer | undefined) => { + if (viewer === undefined) return <>; + return ( + <> + + {children} + + + ) + } + return (
-

RevealContainer

+ {mountChildren(viewer)}
); } \ No newline at end of file diff --git a/react-components/src/components/RevealContainer/RevealContext.ts b/react-components/src/components/RevealContainer/RevealContext.ts new file mode 100644 index 00000000000..bd81c714aad --- /dev/null +++ b/react-components/src/components/RevealContainer/RevealContext.ts @@ -0,0 +1,12 @@ +import { Cognite3DViewer } from '@cognite/reveal'; +import {createContext, useContext} from 'react'; + +export const RevealContext = createContext(null); + +export const useReveal = () => { + const reveal = useContext(RevealContext); + if (!reveal) { + throw new Error('useReveal must be used within a RevealProvider'); + } + return reveal; +} \ No newline at end of file diff --git a/react-components/src/components/index.ts b/react-components/src/components/index.ts index 37696305002..05db4253a3b 100644 --- a/react-components/src/components/index.ts +++ b/react-components/src/components/index.ts @@ -1,3 +1,4 @@ import '@cognite/cogs.js/dist/cogs.css'; export { default as RevealContainer } from './RevealContainer/RevealContainer'; +export { default as CogniteCadModelContainer } from './CogniteCadModelContainer/CogniteCadModelContainer'; export { Image360HistoricalDetails } from './Image360HistoricalDetails/Image360HistoricalDetails'; diff --git a/react-components/src/stories/RevealContainer.stories.ts b/react-components/src/stories/RevealContainer.stories.ts deleted file mode 100644 index 95f2906128f..00000000000 --- a/react-components/src/stories/RevealContainer.stories.ts +++ /dev/null @@ -1,18 +0,0 @@ -import type { Meta, StoryObj } from '@storybook/react'; -import { It, Mock } from 'moq.ts'; -import { Cognite3DViewer, Image360, Image360Revision } from '@cognite/reveal'; -import { RevealContainer } from '..'; - -const meta = { - title: 'Example/RevealContainer', - component: RevealContainer, - tags: ['autodocs'], -} satisfies Meta; - -export default meta; -type Story = StoryObj; - -export const Main: Story = { - args: { - } -}; diff --git a/react-components/src/stories/RevealContainer.stories.tsx b/react-components/src/stories/RevealContainer.stories.tsx new file mode 100644 index 00000000000..209e830bdae --- /dev/null +++ b/react-components/src/stories/RevealContainer.stories.tsx @@ -0,0 +1,29 @@ +import type { Meta, StoryObj } from '@storybook/react'; + +import { CogniteCadModelContainer, RevealContainer } from '..'; +import { CogniteClient } from '@cognite/sdk'; +import { Color, Matrix4 } from 'three'; + + +const meta = { + title: 'Example/RevealContainer', + component: RevealContainer, + tags: ['autodocs'], +} satisfies Meta; + +export default meta; +type Story = StoryObj; + +const token = new URLSearchParams(window.location.search).get('token')!; + +export const Main: Story = { + args: { + sdk: new CogniteClient({ appId: 'reveal.example', baseUrl: 'https://greenfield.cognitedata.com', project: '3d-test', getToken: () => Promise.resolve(token) }), + color: new Color(0x4a4a4a) + }, + render: (args) => + + + + +}; From a4b3e5d8e33f2b15f28f291f081c37497ed6331b Mon Sep 17 00:00:00 2001 From: Christopher Tannum Date: Fri, 23 Jun 2023 14:33:13 +0200 Subject: [PATCH 5/9] fix: update transformation when updating prop --- .../CogniteCadModelContainer/CogniteCadModelContainer.tsx | 7 ++++++- .../src/components/RevealContainer/RevealContainer.tsx | 2 -- react-components/src/stories/RevealContainer.stories.tsx | 5 +++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx b/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx index d27a536cda5..63793aa7682 100644 --- a/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx +++ b/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx @@ -20,7 +20,12 @@ export default function CogniteCadModelContainer({ modelId, revisionId, transfor if (modelRef.current === undefined || (viewer as any).isDisposed) return; viewer.removeModel(modelRef.current); } - }, []) + }, []); + + if (modelRef.current !== undefined && transform !== undefined) { + modelRef.current.setModelTransformation(transform); + } + return <>; async function addModel(modelId: number, revisionId: number, transform?: Matrix4) { diff --git a/react-components/src/components/RevealContainer/RevealContainer.tsx b/react-components/src/components/RevealContainer/RevealContainer.tsx index 7d71cd9e546..8346e841f60 100644 --- a/react-components/src/components/RevealContainer/RevealContainer.tsx +++ b/react-components/src/components/RevealContainer/RevealContainer.tsx @@ -20,9 +20,7 @@ export default function RevealContainer({ children, sdk, color }: RevealContaine setViewer(viewer); return () => { viewer.dispose(); - console.log('a'); setViewer(undefined); - console.log('b'); } }, []); diff --git a/react-components/src/stories/RevealContainer.stories.tsx b/react-components/src/stories/RevealContainer.stories.tsx index 209e830bdae..73d1d5f2e5d 100644 --- a/react-components/src/stories/RevealContainer.stories.tsx +++ b/react-components/src/stories/RevealContainer.stories.tsx @@ -9,6 +9,11 @@ const meta = { title: 'Example/RevealContainer', component: RevealContainer, tags: ['autodocs'], + argTypes: { + sdk: { + control: false + } + } } satisfies Meta; export default meta; From 8c2cba7abfe32d0c54313335c1e0fb0a661e4f3f Mon Sep 17 00:00:00 2001 From: Christopher Tannum Date: Fri, 23 Jun 2023 16:53:02 +0200 Subject: [PATCH 6/9] fix: conflicts --- react-components/package.json | 2 +- react-components/yarn.lock | 21 +-------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/react-components/package.json b/react-components/package.json index 080b2de9c70..8436827f05d 100644 --- a/react-components/package.json +++ b/react-components/package.json @@ -60,4 +60,4 @@ "lodash": "^4.17.21", "style-loader": "^3.3.3" } -} \ No newline at end of file +} diff --git a/react-components/yarn.lock b/react-components/yarn.lock index e33b769c16f..6ed845692eb 100644 --- a/react-components/yarn.lock +++ b/react-components/yarn.lock @@ -2741,26 +2741,15 @@ __metadata: "@babel/preset-env": 7.22.5 "@babel/preset-react": 7.22.5 "@babel/preset-typescript": 7.22.5 -<<<<<<< HEAD "@cognite/cogs.js": ^9.17.0 "@cognite/reveal": ^4.3.3 "@cognite/sdk": ^8.2.0 - "@storybook/addon-essentials": 7.0.21 - "@storybook/addon-interactions": 7.0.21 - "@storybook/addon-links": 7.0.21 - "@storybook/blocks": 7.0.21 - "@storybook/react": 7.0.21 - "@storybook/react-webpack5": 7.0.21 -======= - "@cognite/cogs.js": ^9.13.2 - "@cognite/reveal": ^4.3.1 "@storybook/addon-essentials": 7.0.22 "@storybook/addon-interactions": 7.0.22 "@storybook/addon-links": 7.0.22 "@storybook/blocks": 7.0.22 "@storybook/react": 7.0.22 "@storybook/react-webpack5": 7.0.22 ->>>>>>> 1f2e5f068f5c719a4267d1dd3bd5c10079709dcb "@storybook/testing-library": 0.1.0 "@types/lodash": ^4.14.190 "@types/react": 18.2.7 @@ -10744,11 +10733,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.11, node-fetch@npm:^2.6.7": -======= -"node-fetch@npm:^2.0.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.7": ->>>>>>> 1f2e5f068f5c719a4267d1dd3bd5c10079709dcb +"node-fetch@npm:^2.0.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.11, node-fetch@npm:^2.6.7": version: 2.6.11 resolution: "node-fetch@npm:2.6.11" dependencies: @@ -13005,7 +12990,6 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD "strict-uri-encode@npm:^1.0.0": version: 1.1.0 resolution: "strict-uri-encode@npm:1.1.0" @@ -13013,10 +12997,7 @@ __metadata: languageName: node linkType: hard -"string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3": -======= "string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": ->>>>>>> 1f2e5f068f5c719a4267d1dd3bd5c10079709dcb version: 4.2.3 resolution: "string-width@npm:4.2.3" dependencies: From a20c4016ba68e657533663ee2a22baa71ceaf7f7 Mon Sep 17 00:00:00 2001 From: Christopher Tannum Date: Fri, 23 Jun 2023 17:37:20 +0200 Subject: [PATCH 7/9] fix: update storybook setup --- react-components/package.json | 2 +- .../CogniteCadModelContainer.tsx | 12 +- .../CogniteCadModelContainer.stories.tsx | 31 + .../src/stories/RevealContainer.stories.tsx | 34 - react-components/yarn.lock | 668 +----------------- 5 files changed, 61 insertions(+), 686 deletions(-) create mode 100644 react-components/src/stories/CogniteCadModelContainer.stories.tsx delete mode 100644 react-components/src/stories/RevealContainer.stories.tsx diff --git a/react-components/package.json b/react-components/package.json index 8436827f05d..a72bf5f8864 100644 --- a/react-components/package.json +++ b/react-components/package.json @@ -26,7 +26,7 @@ "@babel/preset-react": "7.22.5", "@babel/preset-typescript": "7.22.5", "@cognite/cogs.js": "^9.17.0", - "@cognite/reveal": "^4.3.3", + "@cognite/reveal": "link:../viewer", "@cognite/sdk": "^8.2.0", "@storybook/addon-essentials": "7.0.22", "@storybook/addon-interactions": "7.0.22", diff --git a/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx b/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx index 63793aa7682..4f15990d37b 100644 --- a/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx +++ b/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx @@ -1,17 +1,17 @@ import { useEffect, useRef, useState } from "react"; -import { Cognite3DViewer, CogniteCadModel } from '@cognite/reveal'; +import { AddModelOptions, Cognite3DViewer, CogniteCadModel } from '@cognite/reveal'; import { useReveal } from "../RevealContainer/RevealContext"; import { Matrix4 } from "three"; type Cognite3dModelProps = { - modelId: number; - revisionId: number; + addModelOptions: AddModelOptions; transform?: THREE.Matrix4; } -export default function CogniteCadModelContainer({ modelId, revisionId, transform }: Cognite3dModelProps) { +export default function CogniteCadModelContainer({ addModelOptions, transform }: Cognite3dModelProps) { const modelRef = useRef(); const viewer = useReveal(); + const { modelId, revisionId } = addModelOptions; useEffect(() => { addModel(modelId, revisionId, transform) @@ -19,13 +19,13 @@ export default function CogniteCadModelContainer({ modelId, revisionId, transfor return () => { if (modelRef.current === undefined || (viewer as any).isDisposed) return; viewer.removeModel(modelRef.current); + modelRef.current = undefined; } - }, []); + }, [addModelOptions]); if (modelRef.current !== undefined && transform !== undefined) { modelRef.current.setModelTransformation(transform); } - return <>; async function addModel(modelId: number, revisionId: number, transform?: Matrix4) { diff --git a/react-components/src/stories/CogniteCadModelContainer.stories.tsx b/react-components/src/stories/CogniteCadModelContainer.stories.tsx new file mode 100644 index 00000000000..fee69f7cbe3 --- /dev/null +++ b/react-components/src/stories/CogniteCadModelContainer.stories.tsx @@ -0,0 +1,31 @@ +import type { Meta, StoryObj } from '@storybook/react'; +import { CogniteCadModelContainer, RevealContainer } from '..'; +import { CogniteClient } from '@cognite/sdk'; +import { Color, Matrix4 } from 'three'; + +const meta = { + title: 'Example/CogniteCadModelContainer', + component: CogniteCadModelContainer, + tags: ['autodocs'] +} satisfies Meta; + +export default meta; +type Story = StoryObj; + +const token = new URLSearchParams(window.location.search).get('token')!; +const sdk = new CogniteClient({ appId: 'reveal.example', baseUrl: 'https://greenfield.cognitedata.com', project: '3d-test', getToken: () => Promise.resolve(token) }); + +export const Main: Story = { + args: { + addModelOptions: { + modelId: 1791160622840317, + revisionId: 498427137020189 + }, + transform: new Matrix4().makeTranslation(0, 10, 0) + }, + render: ({ addModelOptions, transform }) => + + + + +}; diff --git a/react-components/src/stories/RevealContainer.stories.tsx b/react-components/src/stories/RevealContainer.stories.tsx deleted file mode 100644 index 73d1d5f2e5d..00000000000 --- a/react-components/src/stories/RevealContainer.stories.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import type { Meta, StoryObj } from '@storybook/react'; - -import { CogniteCadModelContainer, RevealContainer } from '..'; -import { CogniteClient } from '@cognite/sdk'; -import { Color, Matrix4 } from 'three'; - - -const meta = { - title: 'Example/RevealContainer', - component: RevealContainer, - tags: ['autodocs'], - argTypes: { - sdk: { - control: false - } - } -} satisfies Meta; - -export default meta; -type Story = StoryObj; - -const token = new URLSearchParams(window.location.search).get('token')!; - -export const Main: Story = { - args: { - sdk: new CogniteClient({ appId: 'reveal.example', baseUrl: 'https://greenfield.cognitedata.com', project: '3d-test', getToken: () => Promise.resolve(token) }), - color: new Color(0x4a4a4a) - }, - render: (args) => - - - - -}; diff --git a/react-components/yarn.lock b/react-components/yarn.lock index 6ed845692eb..8aafca9d0e8 100644 --- a/react-components/yarn.lock +++ b/react-components/yarn.lock @@ -2645,52 +2645,6 @@ __metadata: languageName: node linkType: hard -"@chevrotain/cst-dts-gen@npm:10.5.0": - version: 10.5.0 - resolution: "@chevrotain/cst-dts-gen@npm:10.5.0" - dependencies: - "@chevrotain/gast": 10.5.0 - "@chevrotain/types": 10.5.0 - lodash: 4.17.21 - checksum: 3ff851d5cbccc509269bb77078dafd7acfcd2e128e7d362718cde728f3fa95f4dd58eb1eea67ecf11453fba70bded97df55c5ba31ed93fb2dec4324663bd2eee - languageName: node - linkType: hard - -"@chevrotain/gast@npm:10.5.0": - version: 10.5.0 - resolution: "@chevrotain/gast@npm:10.5.0" - dependencies: - "@chevrotain/types": 10.5.0 - lodash: 4.17.21 - checksum: 35183e7067bc936db9ecfea7624ee3178634618cf1518ea3470b4ed208fb19454dc3ed990a0de2dab80794251398a857ad17d26cc552eac497a2aa974f76b86d - languageName: node - linkType: hard - -"@chevrotain/types@npm:10.5.0": - version: 10.5.0 - resolution: "@chevrotain/types@npm:10.5.0" - checksum: 72f7b48de1888ab14831108da4b0ab3ef244e1101a4094240382e4983a9e71aae6f8a87e09b819854d1028cee08f97b7d2a81fce935742c55d2bc497b7cad350 - languageName: node - linkType: hard - -"@chevrotain/utils@npm:10.5.0": - version: 10.5.0 - resolution: "@chevrotain/utils@npm:10.5.0" - checksum: f3ae9e0fea2e928a1a4930311d3ef04f45c29fa58ba4d5d2ca43c33355ac47f95ce99a98d6496706e2e7f773ef684a9a7e7cbd7b77c00af9158f08c82d88212b - languageName: node - linkType: hard - -"@choojs/findup@npm:^0.2.0": - version: 0.2.1 - resolution: "@choojs/findup@npm:0.2.1" - dependencies: - commander: ^2.15.1 - bin: - findup: bin/findup.js - checksum: 9496321caa276f2a560ebae0e7607ba009012e8eff16db68fb405561ec482606edecf1c5ce1956805d77721c2db34c4bd9e2e95a2be2eec1c5ae8bb289ed5fd2 - languageName: node - linkType: hard - "@cognite/cogs.js@npm:^9.17.0": version: 9.17.0 resolution: "@cognite/cogs.js@npm:9.17.0" @@ -2742,7 +2696,7 @@ __metadata: "@babel/preset-react": 7.22.5 "@babel/preset-typescript": 7.22.5 "@cognite/cogs.js": ^9.17.0 - "@cognite/reveal": ^4.3.3 + "@cognite/reveal": "link:../viewer" "@cognite/sdk": ^8.2.0 "@storybook/addon-essentials": 7.0.22 "@storybook/addon-interactions": 7.0.22 @@ -2777,31 +2731,11 @@ __metadata: languageName: unknown linkType: soft -"@cognite/reveal@npm:^4.3.3": - version: 4.3.3 - resolution: "@cognite/reveal@npm:4.3.3" - dependencies: - "@tweenjs/tween.js": 19.0.0 - assert: 2.0.0 - async-mutex: 0.4.0 - glslify: 7.1.1 - glslify-import: 3.1.0 - html2canvas: ^1.4.1 - lodash: 4.17.21 - loglevel: 1.8.1 - mixpanel-browser: 2.47.0 - path-browserify: 1.0.1 - random-seed: 0.3.0 - rxjs: 7.8.1 - skmeans: 0.11.3 - sparse-octree: 7.1.8 - three-stdlib: 2.23.10 - peerDependencies: - "@cognite/sdk": ^7.16.0 || ^8.0.0 - three: 0.152.2 - checksum: 5bc2b4f5cbf2c21f0b87594e25f7dd455635b694ed1ee06d071fd8694aae7fec90be8309095a37c5096224a1c709034245490ccfeb4cdf0ef49c2c39faa45d5a +"@cognite/reveal@link:../viewer::locator=%40cognite%2Freveal-react-components%40workspace%3A.": + version: 0.0.0-use.local + resolution: "@cognite/reveal@link:../viewer::locator=%40cognite%2Freveal-react-components%40workspace%3A." languageName: node - linkType: hard + linkType: soft "@cognite/sdk-core@npm:^4.9.0": version: 4.9.0 @@ -5064,13 +4998,6 @@ __metadata: languageName: node linkType: hard -"@tweenjs/tween.js@npm:19.0.0": - version: 19.0.0 - resolution: "@tweenjs/tween.js@npm:19.0.0" - checksum: 8bb50058e6d20e74c7cd0d2d5675ce7aeb1505e4d92b667e35157b787ed885208eba3c85cae86c7dfed3016897ead2e667b251228f15130bb6fa61030a734b69 - languageName: node - linkType: hard - "@tweenjs/tween.js@npm:~18.6.4": version: 18.6.4 resolution: "@tweenjs/tween.js@npm:18.6.4" @@ -5159,13 +5086,6 @@ __metadata: languageName: node linkType: hard -"@types/draco3d@npm:^1.4.0": - version: 1.4.2 - resolution: "@types/draco3d@npm:1.4.2" - checksum: d8e60db5e7e51081b32700d8f0defa537b41249eac6fe39e4af4e3e002f131acfd2a5e993bcfde9b597b30413726fbe6189a7b3bd970a3d7e9da93ef2e098283 - languageName: node - linkType: hard - "@types/ejs@npm:^3.1.1": version: 3.1.2 resolution: "@types/ejs@npm:3.1.2" @@ -5417,13 +5337,6 @@ __metadata: languageName: node linkType: hard -"@types/offscreencanvas@npm:^2019.6.4": - version: 2019.7.0 - resolution: "@types/offscreencanvas@npm:2019.7.0" - checksum: 018cfcd19e0c59c44d14ba61caaca7246f77fbb512839c7881654b7f2b6591dbdd5857362eccbf49f29cdc93724e71a4b37c8b6cf203388f9c04e913a53ea390 - languageName: node - linkType: hard - "@types/parse-json@npm:^4.0.0": version: 4.0.0 resolution: "@types/parse-json@npm:4.0.0" @@ -5592,7 +5505,7 @@ __metadata: languageName: node linkType: hard -"@types/webxr@npm:*, @types/webxr@npm:^0.5.2": +"@types/webxr@npm:*": version: 0.5.2 resolution: "@types/webxr@npm:0.5.2" checksum: e3387c3d64c140557796a4bcececd82d912a88f73ff8e34bf51c04d44078390fbe4756b256b2844b1ae4664a883d46f96bb40913d21f12e9ab484d9d8dbc68c3 @@ -5884,7 +5797,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^7.1.1, acorn@npm:^7.4.1": +"acorn@npm:^7.4.1": version: 7.4.1 resolution: "acorn@npm:7.4.1" bin: @@ -6140,7 +6053,7 @@ __metadata: languageName: node linkType: hard -"assert@npm:2.0.0, assert@npm:^2.0.0": +"assert@npm:^2.0.0": version: 2.0.0 resolution: "assert@npm:2.0.0" dependencies: @@ -6186,15 +6099,6 @@ __metadata: languageName: node linkType: hard -"async-mutex@npm:0.4.0": - version: 0.4.0 - resolution: "async-mutex@npm:0.4.0" - dependencies: - tslib: ^2.4.0 - checksum: 813a71728b35a4fbfd64dba719f04726d9133c67b577fcd951b7028c4a675a13ee34e69beb82d621f87bf81f5d4f135c4c44be0448550c7db728547244ef71fc - languageName: node - linkType: hard - "async@npm:^3.2.3": version: 3.2.4 resolution: "async@npm:3.2.4" @@ -6437,13 +6341,6 @@ __metadata: languageName: node linkType: hard -"base64-arraybuffer@npm:^1.0.2": - version: 1.0.2 - resolution: "base64-arraybuffer@npm:1.0.2" - checksum: 15e6400d2d028bf18be4ed97702b11418f8f8779fb8c743251c863b726638d52f69571d4cc1843224da7838abef0949c670bde46936663c45ad078e89fee5c62 - languageName: node - linkType: hard - "base64-js@npm:^1.3.1": version: 1.5.1 resolution: "base64-js@npm:1.5.1" @@ -6481,16 +6378,6 @@ __metadata: languageName: node linkType: hard -"bl@npm:^2.2.1": - version: 2.2.1 - resolution: "bl@npm:2.2.1" - dependencies: - readable-stream: ^2.3.5 - safe-buffer: ^5.1.1 - checksum: 4f5d9b258919646a8d02f1731379e53b6f6309e34596ae02afbc3aeb183910bd2d0b70681f889b7c620ca48f65dc1cd0992ee1266c90d6d7c3be60688d141233 - languageName: node - linkType: hard - "bl@npm:^4.0.3, bl@npm:^4.1.0": version: 4.1.0 resolution: "bl@npm:4.1.0" @@ -6767,20 +6654,6 @@ __metadata: languageName: node linkType: hard -"chevrotain@npm:^10.1.2": - version: 10.5.0 - resolution: "chevrotain@npm:10.5.0" - dependencies: - "@chevrotain/cst-dts-gen": 10.5.0 - "@chevrotain/gast": 10.5.0 - "@chevrotain/types": 10.5.0 - "@chevrotain/utils": 10.5.0 - lodash: 4.17.21 - regexp-to-ast: 0.5.0 - checksum: b641f149f60979a29eff2434d745e9565a7c89422b601d554bcf8f047f7d8ff776b9a54b1b36085a622e3f1ed7eb4b8721b5a5348d90ae2567ce7594b10f25aa - languageName: node - linkType: hard - "chokidar@npm:^3.5.3": version: 3.5.3 resolution: "chokidar@npm:3.5.3" @@ -7000,7 +6873,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:^2.15.1, commander@npm:^2.19.0, commander@npm:^2.20.0": +"commander@npm:^2.19.0, commander@npm:^2.20.0": version: 2.20.3 resolution: "commander@npm:2.20.3" checksum: ab8c07884e42c3a8dbc5dd9592c606176c7eb5c1ca5ff274bcf907039b2c41de3626f684ea75ccf4d361ba004bbaff1f577d5384c155f3871e456bdf27becf9e @@ -7082,7 +6955,7 @@ __metadata: languageName: node linkType: hard -"concat-stream@npm:^1.5.2, concat-stream@npm:^1.6.2": +"concat-stream@npm:^1.6.2": version: 1.6.2 resolution: "concat-stream@npm:1.6.2" dependencies: @@ -7245,15 +7118,6 @@ __metadata: languageName: node linkType: hard -"css-line-break@npm:^2.1.0": - version: 2.1.0 - resolution: "css-line-break@npm:2.1.0" - dependencies: - utrie: ^1.0.2 - checksum: 37b1fe632b03be7a287cd394cef8b5285666343443125c510df9cfb6a4734a2c71e154ec8f7bbff72d7c339e1e5872989b1c52d86162aed27d6cc114725bb4d0 - languageName: node - linkType: hard - "css-loader@npm:^6.7.1": version: 6.7.3 resolution: "css-loader@npm:6.7.3" @@ -7686,14 +7550,7 @@ __metadata: languageName: node linkType: hard -"draco3d@npm:^1.4.1": - version: 1.5.6 - resolution: "draco3d@npm:1.5.6" - checksum: ae1080c02c5bb95b3e4ce6bbd2b8c61a30e44ccc421648acdf5d261c3eb980210d7da2a562b2009bcf782d5193cbafc722e153ba8aafbaf30a072946007d2183 - languageName: node - linkType: hard - -"duplexify@npm:^3.4.5, duplexify@npm:^3.5.0, duplexify@npm:^3.6.0": +"duplexify@npm:^3.5.0, duplexify@npm:^3.6.0": version: 3.7.1 resolution: "duplexify@npm:3.7.1" dependencies: @@ -8002,25 +7859,6 @@ __metadata: languageName: node linkType: hard -"escodegen@npm:^1.11.1": - version: 1.14.3 - resolution: "escodegen@npm:1.14.3" - dependencies: - esprima: ^4.0.1 - estraverse: ^4.2.0 - esutils: ^2.0.2 - optionator: ^0.8.1 - source-map: ~0.6.1 - dependenciesMeta: - source-map: - optional: true - bin: - escodegen: bin/escodegen.js - esgenerate: bin/esgenerate.js - checksum: 381cdc4767ecdb221206bbbab021b467bbc2a6f5c9a99c9e6353040080bdd3dfe73d7604ad89a47aca6ea7d58bc635f6bd3fbc8da9a1998e9ddfa8372362ccd0 - languageName: node - linkType: hard - "escodegen@npm:^2.0.0": version: 2.0.0 resolution: "escodegen@npm:2.0.0" @@ -8069,7 +7907,7 @@ __metadata: languageName: node linkType: hard -"estraverse@npm:^4.1.1, estraverse@npm:^4.2.0": +"estraverse@npm:^4.1.1": version: 4.3.0 resolution: "estraverse@npm:4.3.0" checksum: a6299491f9940bb246124a8d44b7b7a413a8336f5436f9837aaa9330209bd9ee8af7e91a654a3545aee9c54b3308e78ee360cef1d777d37cfef77d2fa33b5827 @@ -8192,16 +8030,6 @@ __metadata: languageName: node linkType: hard -"falafel@npm:^2.1.0": - version: 2.2.5 - resolution: "falafel@npm:2.2.5" - dependencies: - acorn: ^7.1.1 - isarray: ^2.0.1 - checksum: bfd46e92bca87670fd2ef31c6123088431271f98f3b2a300a58e9c3e5f4f9944f0058f7daaaaa8cefd68d461a334bd528c952bcec17061522b68b61f7925b382 - languageName: node - linkType: hard - "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3": version: 3.1.3 resolution: "fast-deep-equal@npm:3.1.3" @@ -8284,7 +8112,7 @@ __metadata: languageName: node linkType: hard -"fflate@npm:^0.6.9, fflate@npm:~0.6.9": +"fflate@npm:~0.6.9": version: 0.6.10 resolution: "fflate@npm:0.6.10" checksum: 96384bc4090987fe565c0de8204e3830f538144ec950576fea50aee1b42adbe9fc3ed5e7905dfa7979faaa20979def330dbebce548f3dcafc3e118cc9838526d @@ -8545,16 +8373,6 @@ __metadata: languageName: node linkType: hard -"from2@npm:^2.3.0": - version: 2.3.0 - resolution: "from2@npm:2.3.0" - dependencies: - inherits: ^2.0.1 - readable-stream: ^2.0.0 - checksum: 6080eba0793dce32f475141fb3d54cc15f84ee52e420ee22ac3ab0ad639dc95a1875bc6eb9c0e1140e94972a36a89dc5542491b85f1ab8df0c126241e0f1a61b - languageName: node - linkType: hard - "fs-constants@npm:^1.0.0": version: 1.0.0 resolution: "fs-constants@npm:1.0.0" @@ -8839,176 +8657,6 @@ __metadata: languageName: node linkType: hard -"glsl-inject-defines@npm:^1.0.1": - version: 1.0.3 - resolution: "glsl-inject-defines@npm:1.0.3" - dependencies: - glsl-token-inject-block: ^1.0.0 - glsl-token-string: ^1.0.1 - glsl-tokenizer: ^2.0.2 - checksum: 91d707cc4cdc924ec1ea13bcc332357c41754542e3c3d8d95f2331569c339a9cfab37c343e253fea10e56d5a70f930b9027b62431c5c786e34e7d8f785456836 - languageName: node - linkType: hard - -"glsl-resolve@npm:0.0.1": - version: 0.0.1 - resolution: "glsl-resolve@npm:0.0.1" - dependencies: - resolve: ^0.6.1 - xtend: ^2.1.2 - checksum: 8bc83f4c56c06d771761c32042fff8fed60f4bcc320d5fc3ec86cf115eb3c0bb5bacf3ca5f80cb88133399734d02c65788845bca9eb90244e08c41e98ddb0275 - languageName: node - linkType: hard - -"glsl-token-assignments@npm:^2.0.0": - version: 2.0.2 - resolution: "glsl-token-assignments@npm:2.0.2" - checksum: efd6051cfd0e5dc4749cc05530e79c42b2396685345695d1232ab3904011e65f117110a2ef7e92a06bc687abf6182f4e90b6b51cc4ab20147aafcc57f724ecb5 - languageName: node - linkType: hard - -"glsl-token-defines@npm:^1.0.0": - version: 1.0.0 - resolution: "glsl-token-defines@npm:1.0.0" - dependencies: - glsl-tokenizer: ^2.0.0 - checksum: 79c3738e4c858c1eb400a7d288a372cf275b6aacee4eed2a89f1c4269a9849d3210bbc770123af408bf0a9d8bf909e558154a27f4c976cee287ea9a4bf9b0047 - languageName: node - linkType: hard - -"glsl-token-depth@npm:^1.1.0, glsl-token-depth@npm:^1.1.1": - version: 1.1.2 - resolution: "glsl-token-depth@npm:1.1.2" - checksum: 97fff701eef20c2ef4552885f060dbf05b307f59b9f1637ddd73c3d5e7d3cc5b4851123706be9f2590042566132f5175ae86a82576bdcfa1edd4625c58d6843c - languageName: node - linkType: hard - -"glsl-token-descope@npm:^1.0.2": - version: 1.0.2 - resolution: "glsl-token-descope@npm:1.0.2" - dependencies: - glsl-token-assignments: ^2.0.0 - glsl-token-depth: ^1.1.0 - glsl-token-properties: ^1.0.0 - glsl-token-scope: ^1.1.0 - checksum: a0d578d5e71178cd5679504a94a60e0811980f46fe6b3cb018bb165530faa75ffcb61b62a1984052223cf2455e36c08f9aa72cf3fdce419aac5d8844ec84cf5a - languageName: node - linkType: hard - -"glsl-token-inject-block@npm:^1.0.0": - version: 1.1.0 - resolution: "glsl-token-inject-block@npm:1.1.0" - checksum: a08aca0f0684ee00eb9beb44993ab59d6d6330947d282204fe114c09a34fe9b9719f035eda0ed317a5409e5d4118674955c225034bb28c5d8334bcc3f905d7dc - languageName: node - linkType: hard - -"glsl-token-properties@npm:^1.0.0": - version: 1.0.1 - resolution: "glsl-token-properties@npm:1.0.1" - checksum: 9b4d1caf02d52f6407479bcd3e780133d6952ba6ae0d85ccd4f3de9ead061a173da0820b0238a0e721ae75370b645152d468bc24eb6f1fd37b5000c500d97cd4 - languageName: node - linkType: hard - -"glsl-token-scope@npm:^1.1.0, glsl-token-scope@npm:^1.1.1": - version: 1.1.2 - resolution: "glsl-token-scope@npm:1.1.2" - checksum: d62812c81a399d7bdd001ce4414293e508dbd78d480b1984190c8d3243c14817c34109893a71503a50ef09de28e4b0c0124be1979292aba5df3f0207eace1b70 - languageName: node - linkType: hard - -"glsl-token-string@npm:^1.0.1": - version: 1.0.1 - resolution: "glsl-token-string@npm:1.0.1" - checksum: 3260c1486b620277396ecb92b13434764eddcd59330ffb7a25d0e5fc2750fbd4330899e2acb5ab36408ea7451f3e103418ca0430b4c6a225a7e5f318b5028fda - languageName: node - linkType: hard - -"glsl-token-whitespace-trim@npm:^1.0.0": - version: 1.0.0 - resolution: "glsl-token-whitespace-trim@npm:1.0.0" - checksum: ffb0d09118a18fa807a249414762e93835d303f476feae8bbb80320ec850a5aa24fa2760245b374312310ebb0ef099da9a9190ff5b587be45566d2aee1503777 - languageName: node - linkType: hard - -"glsl-tokenizer@npm:^2.0.0, glsl-tokenizer@npm:^2.0.2": - version: 2.1.5 - resolution: "glsl-tokenizer@npm:2.1.5" - dependencies: - through2: ^0.6.3 - checksum: daf70e91c66a3143fe0b22be18a0f8cc965d7b81f73a58b14d55d08593bdcc3f996996549bda78b4cc822d7fe8c216aaeaab71f2695d802fb79fc9e89fb507d3 - languageName: node - linkType: hard - -"glslify-bundle@npm:^5.0.0": - version: 5.1.1 - resolution: "glslify-bundle@npm:5.1.1" - dependencies: - glsl-inject-defines: ^1.0.1 - glsl-token-defines: ^1.0.0 - glsl-token-depth: ^1.1.1 - glsl-token-descope: ^1.0.2 - glsl-token-scope: ^1.1.1 - glsl-token-string: ^1.0.1 - glsl-token-whitespace-trim: ^1.0.0 - glsl-tokenizer: ^2.0.2 - murmurhash-js: ^1.0.0 - shallow-copy: 0.0.1 - checksum: e3a5e438dd0ffbdaa72adad23b4eae80258f3f903b3fde3d7022d2f662df1bbb76ce479c2c030ed4aebeb899965e7e3bb7db83748963e0643bbbded3bacdebff - languageName: node - linkType: hard - -"glslify-deps@npm:^1.2.5": - version: 1.3.2 - resolution: "glslify-deps@npm:1.3.2" - dependencies: - "@choojs/findup": ^0.2.0 - events: ^3.2.0 - glsl-resolve: 0.0.1 - glsl-tokenizer: ^2.0.0 - graceful-fs: ^4.1.2 - inherits: ^2.0.1 - map-limit: 0.0.1 - resolve: ^1.0.0 - checksum: 3eb50a26171f66d02582cfa90a9ac7c964ff970d44cd48025af2015fe465be1632cfc7fcec05f5aa4210571ec936c4a26de0e100d9c4d0c2ab655362290a616c - languageName: node - linkType: hard - -"glslify-import@npm:3.1.0": - version: 3.1.0 - resolution: "glslify-import@npm:3.1.0" - dependencies: - glsl-resolve: 0.0.1 - glsl-token-string: ^1.0.1 - glsl-tokenizer: ^2.0.2 - checksum: 4301b8f940af61ce6e1e61ecd9cd79f86b53f44772587af7e987dd1805553905129cb6ba7155b3b3f07aa7923553b04e236ea158648adf6bde2843ab4d48faaa - languageName: node - linkType: hard - -"glslify@npm:7.1.1": - version: 7.1.1 - resolution: "glslify@npm:7.1.1" - dependencies: - bl: ^2.2.1 - concat-stream: ^1.5.2 - duplexify: ^3.4.5 - falafel: ^2.1.0 - from2: ^2.3.0 - glsl-resolve: 0.0.1 - glsl-token-whitespace-trim: ^1.0.0 - glslify-bundle: ^5.0.0 - glslify-deps: ^1.2.5 - minimist: ^1.2.5 - resolve: ^1.1.5 - stack-trace: 0.0.9 - static-eval: ^2.0.5 - through2: ^2.0.1 - xtend: ^4.0.0 - bin: - glslify: bin.js - checksum: 2bb59c0480041ca73dcb6e0c6f56d3f063e546c87901f82582a914864ebf836145289316bddb507874bf9405113a3efb3efbeacc0e888337d7d268ef1823ca7b - languageName: node - linkType: hard - "gopd@npm:^1.0.1": version: 1.0.1 resolution: "gopd@npm:1.0.1" @@ -9206,16 +8854,6 @@ __metadata: languageName: node linkType: hard -"html2canvas@npm:^1.4.1": - version: 1.4.1 - resolution: "html2canvas@npm:1.4.1" - dependencies: - css-line-break: ^2.1.0 - text-segmentation: ^1.0.3 - checksum: c134324af57f3262eecf982e436a4843fded3c6cf61954440ffd682527e4dd350e0c2fafd217c0b6f9a455fe345d0c67b4505689796ab160d4ca7c91c3766739 - languageName: node - linkType: hard - "htmlparser2@npm:^6.1.0": version: 6.1.0 resolution: "htmlparser2@npm:6.1.0" @@ -9389,7 +9027,7 @@ __metadata: languageName: node linkType: hard -"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.1, inherits@npm:~2.0.3": +"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.3": version: 2.0.4 resolution: "inherits@npm:2.0.4" checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1 @@ -9766,14 +9404,7 @@ __metadata: languageName: node linkType: hard -"isarray@npm:0.0.1": - version: 0.0.1 - resolution: "isarray@npm:0.0.1" - checksum: 49191f1425681df4a18c2f0f93db3adb85573bcdd6a4482539d98eac9e705d8961317b01175627e860516a2fc45f8f9302db26e5a380a97a520e272e2a40a8d4 - languageName: node - linkType: hard - -"isarray@npm:^2.0.1, isarray@npm:^2.0.5": +"isarray@npm:^2.0.5": version: 2.0.5 resolution: "isarray@npm:2.0.5" checksum: bd5bbe4104438c4196ba58a54650116007fa0262eccef13a4c55b2e09a5b36b59f1e75b9fcc49883dd9d4953892e6fc007eef9e9155648ceea036e184b0f930a @@ -10032,13 +9663,6 @@ __metadata: languageName: node linkType: hard -"json-stringify-safe@npm:^5.0.1": - version: 5.0.1 - resolution: "json-stringify-safe@npm:5.0.1" - checksum: 48ec0adad5280b8a96bb93f4563aa1667fd7a36334f79149abd42446d0989f2ddc58274b479f4819f1f00617957e6344c886c55d05a4e15ebb4ab931e4a6a8ee - languageName: node - linkType: hard - "json5@npm:^2.1.2, json5@npm:^2.2.2": version: 2.2.3 resolution: "json5@npm:2.2.3" @@ -10075,13 +9699,6 @@ __metadata: languageName: node linkType: hard -"ktx-parse@npm:^0.4.5": - version: 0.4.5 - resolution: "ktx-parse@npm:0.4.5" - checksum: f82d8b5dfd0ede05d5e4a2d90ad5114c83d8f708431e3fce2c3e6e0a0e1fe1b1649cb6f3de35b429ef636ce9a92a3897295198e94b46bba24bc3268c6ae9cc42 - languageName: node - linkType: hard - "lazy-universal-dotenv@npm:^4.0.0": version: 4.0.0 resolution: "lazy-universal-dotenv@npm:4.0.0" @@ -10184,7 +9801,7 @@ __metadata: languageName: node linkType: hard -"lodash@npm:4.17.21, lodash@npm:^4.17.11, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21": +"lodash@npm:^4.17.11, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7 @@ -10201,13 +9818,6 @@ __metadata: languageName: node linkType: hard -"loglevel@npm:1.8.1": - version: 1.8.1 - resolution: "loglevel@npm:1.8.1" - checksum: a1a62db40291aaeaef2f612334c49e531bff71cc1d01a2acab689ab80d59e092f852ab164a5aedc1a752fdc46b7b162cb097d8a9eb2cf0b299511106c29af61d - languageName: node - linkType: hard - "loose-envify@npm:^1.1.0, loose-envify@npm:^1.4.0": version: 1.4.0 resolution: "loose-envify@npm:1.4.0" @@ -10314,15 +9924,6 @@ __metadata: languageName: node linkType: hard -"map-limit@npm:0.0.1": - version: 0.0.1 - resolution: "map-limit@npm:0.0.1" - dependencies: - once: ~1.3.0 - checksum: e7ad9a66037d4168f2e3dbd20654cb0503126911e0e43c8fe95ae1a3ea54b72e84f94f8577a13598708a29a096cc6ecf136622ea6a5d393c227f84f6f1445b83 - languageName: node - linkType: hard - "map-or-similar@npm:^1.5.0": version: 1.5.0 resolution: "map-or-similar@npm:1.5.0" @@ -10585,13 +10186,6 @@ __metadata: languageName: node linkType: hard -"mixpanel-browser@npm:2.47.0": - version: 2.47.0 - resolution: "mixpanel-browser@npm:2.47.0" - checksum: f44e0e0ac70b3772ed1be7c826d3cb0ffbf2dda35e6b927a3f7167795283745ae16573ae6ba303238bf776e3a5ed72c98c3c3f97e2a3c72bcbada15b956e9e9d - languageName: node - linkType: hard - "mkdirp-classic@npm:^0.5.2": version: 0.5.3 resolution: "mkdirp-classic@npm:0.5.3" @@ -10619,13 +10213,6 @@ __metadata: languageName: node linkType: hard -"mmd-parser@npm:^1.0.4": - version: 1.0.4 - resolution: "mmd-parser@npm:1.0.4" - checksum: 892cc317598440c43919250ec95aec26349db977e64bbe37d0fa8d6a8076e190105e5e687221225dd9afa8937d9d2d06ddab77586c2bc4781cb6855a2938d95b - languageName: node - linkType: hard - "moq.ts@npm:^10.0.6": version: 10.0.8 resolution: "moq.ts@npm:10.0.8" @@ -10670,13 +10257,6 @@ __metadata: languageName: node linkType: hard -"murmurhash-js@npm:^1.0.0": - version: 1.0.0 - resolution: "murmurhash-js@npm:1.0.0" - checksum: 083cea92a11bc9eb25be1446fc92eded3f49731bc1ad34fa8023afd68c234d1dd59458d70eb20e667b1383bedeeb8dfb1a16c89913b6ffe3584fd22fb598739d - languageName: node - linkType: hard - "nanoid@npm:^3.3.1, nanoid@npm:^3.3.6": version: 3.3.6 resolution: "nanoid@npm:3.3.6" @@ -10928,15 +10508,6 @@ __metadata: languageName: node linkType: hard -"once@npm:~1.3.0": - version: 1.3.3 - resolution: "once@npm:1.3.3" - dependencies: - wrappy: 1 - checksum: 8e832de08b1d73b470e01690c211cb4fcefccab1fd1bd19e706d572d74d3e9b7e38a8bfcdabdd364f9f868757d9e8e5812a59817dc473eaf698ff3bfae2219f2 - languageName: node - linkType: hard - "onetime@npm:^5.1.0, onetime@npm:^5.1.2": version: 5.1.2 resolution: "onetime@npm:5.1.2" @@ -10967,18 +10538,6 @@ __metadata: languageName: node linkType: hard -"opentype.js@npm:^1.3.3": - version: 1.3.4 - resolution: "opentype.js@npm:1.3.4" - dependencies: - string.prototype.codepointat: ^0.2.1 - tiny-inflate: ^1.0.3 - bin: - ot: bin/ot - checksum: 365af0f9a8bd87b772c794502a9e53a6d286faf2bafda51f3016acab21bd6202a0d6a1260d7b71f1d6ad8076ccedfe84f76bd6aabb14704ce42ac9a9f96bae21 - languageName: node - linkType: hard - "optionator@npm:^0.8.1": version: 0.8.3 resolution: "optionator@npm:0.8.3" @@ -11126,7 +10685,7 @@ __metadata: languageName: node linkType: hard -"path-browserify@npm:1.0.1, path-browserify@npm:^1.0.1": +"path-browserify@npm:^1.0.1": version: 1.0.1 resolution: "path-browserify@npm:1.0.1" checksum: c6d7fa376423fe35b95b2d67990060c3ee304fc815ff0a2dc1c6c3cfaff2bd0d572ee67e18f19d0ea3bbe32e8add2a05021132ac40509416459fffee35200699 @@ -11362,13 +10921,6 @@ __metadata: languageName: node linkType: hard -"potpack@npm:^1.0.1": - version: 1.0.2 - resolution: "potpack@npm:1.0.2" - checksum: 9dfdbbce012ce80842249abcdd89e20222eb8ae96beba8d578b7e41e78feefc7e33b5c72d46fb8dd3a1e382cb4da9c34574764d88aa8849ab36f542fd2088b42 - languageName: node - linkType: hard - "prelude-ls@npm:~1.1.2": version: 1.1.2 resolution: "prelude-ls@npm:1.1.2" @@ -11613,15 +11165,6 @@ __metadata: languageName: node linkType: hard -"random-seed@npm:0.3.0": - version: 0.3.0 - resolution: "random-seed@npm:0.3.0" - dependencies: - json-stringify-safe: ^5.0.1 - checksum: 0a82692fc8d830bc26259dad78a911969343c247afb4be5d578c30fd9fbe76c7ce3f6900422310fc90fe05d6baa12e84a1b9ff93b0b7fda757ecfa40645a1f72 - languageName: node - linkType: hard - "randombytes@npm:^2.1.0": version: 2.1.0 resolution: "randombytes@npm:2.1.0" @@ -12117,19 +11660,7 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:>=1.0.33-1 <1.1.0-0": - version: 1.0.34 - resolution: "readable-stream@npm:1.0.34" - dependencies: - core-util-is: ~1.0.0 - inherits: ~2.0.1 - isarray: 0.0.1 - string_decoder: ~0.10.x - checksum: 85042c537e4f067daa1448a7e257a201070bfec3dd2706abdbd8ebc7f3418eb4d3ed4b8e5af63e2544d69f88ab09c28d5da3c0b77dc76185fddd189a59863b60 - languageName: node - linkType: hard - -"readable-stream@npm:^2.0.0, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.5, readable-stream@npm:~2.3.6": +"readable-stream@npm:^2.0.0, readable-stream@npm:^2.2.2, readable-stream@npm:~2.3.6": version: 2.3.8 resolution: "readable-stream@npm:2.3.8" dependencies: @@ -12246,13 +11777,6 @@ __metadata: languageName: node linkType: hard -"regexp-to-ast@npm:0.5.0": - version: 0.5.0 - resolution: "regexp-to-ast@npm:0.5.0" - checksum: 72e32f2a1217bb22398ac30867ddd43e16943b6b569dd4eb472de47494c7a39e34f47ee3e92ad4cbf92308f98997da366fe094a0e58eb6b93eab0ee956fff86d - languageName: node - linkType: hard - "regexp.prototype.flags@npm:^1.5.0": version: 1.5.0 resolution: "regexp.prototype.flags@npm:1.5.0" @@ -12384,14 +11908,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^0.6.1": - version: 0.6.3 - resolution: "resolve@npm:0.6.3" - checksum: c3b5d34ba79635ffe380eb0e428e0b49259734ad2c86945c6b3238155b0753d8bcf858c6b99966b3fdb536062f6e204675e4542269f065e34210bb3a6f602f9d - languageName: node - linkType: hard - -"resolve@npm:^1.0.0, resolve@npm:^1.1.5, resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0": +"resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0": version: 1.22.3 resolution: "resolve@npm:1.22.3" dependencies: @@ -12404,14 +11921,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@^0.6.1#~builtin": - version: 0.6.3 - resolution: "resolve@patch:resolve@npm%3A0.6.3#~builtin::version=0.6.3&hash=3bafbf" - checksum: fbdc248b89f655da8ff1509c000027702455d36e99943307d6e939bbef8b6f2bf67f82aa82ceb968f121febea128dd9b3e544fc6497c105204b1633bee1efad9 - languageName: node - linkType: hard - -"resolve@patch:resolve@^1.0.0#~builtin, resolve@patch:resolve@^1.1.5#~builtin, resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.12.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin": +"resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.12.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin": version: 1.22.3 resolution: "resolve@patch:resolve@npm%3A1.22.3#~builtin::version=1.22.3&hash=c3c19d" dependencies: @@ -12490,15 +12000,6 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:7.8.1": - version: 7.8.1 - resolution: "rxjs@npm:7.8.1" - dependencies: - tslib: ^2.1.0 - checksum: de4b53db1063e618ec2eca0f7965d9137cabe98cf6be9272efe6c86b47c17b987383df8574861bcced18ebd590764125a901d5506082be84a8b8e364bf05f119 - languageName: node - linkType: hard - "safe-buffer@npm:5.1.1": version: 5.1.1 resolution: "safe-buffer@npm:5.1.1" @@ -12513,7 +12014,7 @@ __metadata: languageName: node linkType: hard -"safe-buffer@npm:5.2.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:~5.2.0": +"safe-buffer@npm:5.2.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491 @@ -12686,13 +12187,6 @@ __metadata: languageName: node linkType: hard -"shallow-copy@npm:0.0.1": - version: 0.0.1 - resolution: "shallow-copy@npm:0.0.1" - checksum: 2d249a5a57a160b439d84fbf9ed7c0a107a3d656d1bda0b73edf9476c6e6ea9d2afa79829bf33fce6677fae35b15c14e5c28f9902dc4d07a302637a225d00634 - languageName: node - linkType: hard - "shallow-equal@npm:^1.2.1": version: 1.2.1 resolution: "shallow-equal@npm:1.2.1" @@ -12779,13 +12273,6 @@ __metadata: languageName: node linkType: hard -"skmeans@npm:0.11.3": - version: 0.11.3 - resolution: "skmeans@npm:0.11.3" - checksum: fd79f94074353b89462cc3993ce15d9c9ee3b6736b90ae99b45812d00ba5a992dd2f8451e381d8718d8bc47e279e0fd51193458beb5a07409d3696471377826c - languageName: node - linkType: hard - "slash@npm:^3.0.0": version: 3.0.0 resolution: "slash@npm:3.0.0" @@ -12866,15 +12353,6 @@ __metadata: languageName: node linkType: hard -"sparse-octree@npm:7.1.8": - version: 7.1.8 - resolution: "sparse-octree@npm:7.1.8" - peerDependencies: - three: 0.x.x - checksum: 07074c703cd9cee9e3c1becc0b125356ffcea72713d47c4229b1ba3cd56ffbf68223c4a75586a0c6923a56e322b6383dd37b37e58c83471d2632e111a60c0a71 - languageName: node - linkType: hard - "spdx-correct@npm:^3.0.0": version: 3.2.0 resolution: "spdx-correct@npm:3.2.0" @@ -12925,13 +12403,6 @@ __metadata: languageName: node linkType: hard -"stack-trace@npm:0.0.9": - version: 0.0.9 - resolution: "stack-trace@npm:0.0.9" - checksum: 5b1ff9708eaeae2518f70ea10027aa608892faedfd95d3c92b0e3b14cf49b013da22421a32b5bbe29ae711436e53fdf966793cf58a4bd0ad20a71859d27a894f - languageName: node - linkType: hard - "stackframe@npm:^1.3.4": version: 1.3.4 resolution: "stackframe@npm:1.3.4" @@ -12939,15 +12410,6 @@ __metadata: languageName: node linkType: hard -"static-eval@npm:^2.0.5": - version: 2.1.0 - resolution: "static-eval@npm:2.1.0" - dependencies: - escodegen: ^1.11.1 - checksum: 21297ee9af37cd23ef92b3a4b1fd535073539b870d2bb83a4b92f6b668183f7fb552d3c791bbdcd460c62583a2c33d46e5d56e86a7f5851b65b29e19e5d28b41 - languageName: node - linkType: hard - "statuses@npm:2.0.1": version: 2.0.1 resolution: "statuses@npm:2.0.1" @@ -13008,13 +12470,6 @@ __metadata: languageName: node linkType: hard -"string.prototype.codepointat@npm:^0.2.1": - version: 0.2.1 - resolution: "string.prototype.codepointat@npm:0.2.1" - checksum: bafa15844d7ea5bed24a01fa8954327c0c49226cefe68ab70573f1338f6a4680587db962724924f2cceb91abe408e11bd38c80095f25ee080f136a6c9d300f00 - languageName: node - linkType: hard - "string_decoder@npm:^1.1.1": version: 1.3.0 resolution: "string_decoder@npm:1.3.0" @@ -13024,13 +12479,6 @@ __metadata: languageName: node linkType: hard -"string_decoder@npm:~0.10.x": - version: 0.10.31 - resolution: "string_decoder@npm:0.10.31" - checksum: fe00f8e303647e5db919948ccb5ce0da7dea209ab54702894dd0c664edd98e5d4df4b80d6fabf7b9e92b237359d21136c95bf068b2f7760b772ca974ba970202 - languageName: node - linkType: hard - "string_decoder@npm:~1.1.1": version: 1.1.1 resolution: "string_decoder@npm:1.1.1" @@ -13301,36 +12749,6 @@ __metadata: languageName: node linkType: hard -"text-segmentation@npm:^1.0.3": - version: 1.0.3 - resolution: "text-segmentation@npm:1.0.3" - dependencies: - utrie: ^1.0.2 - checksum: 2e24632d59567c55ab49ac324815e2f7a8043e63e26b109636322ac3e30692cee8679a448fd5d0f0598a345f407afd0e34ba612e22524cf576d382d84058c013 - languageName: node - linkType: hard - -"three-stdlib@npm:2.23.10": - version: 2.23.10 - resolution: "three-stdlib@npm:2.23.10" - dependencies: - "@types/draco3d": ^1.4.0 - "@types/offscreencanvas": ^2019.6.4 - "@types/webxr": ^0.5.2 - chevrotain: ^10.1.2 - draco3d: ^1.4.1 - fflate: ^0.6.9 - ktx-parse: ^0.4.5 - mmd-parser: ^1.0.4 - opentype.js: ^1.3.3 - potpack: ^1.0.1 - zstddec: ^0.0.2 - peerDependencies: - three: ">=0.128.0" - checksum: ff217acd9e90ef9d785a6c7261c9a24f85c6d0affafc90bb29292ea16a885f655c4e340a214c305d4f90e70237a85382ce747064b09034b191afcf721b0b1526 - languageName: node - linkType: hard - "three@npm:0.152.2": version: 0.152.2 resolution: "three@npm:0.152.2" @@ -13338,17 +12756,7 @@ __metadata: languageName: node linkType: hard -"through2@npm:^0.6.3": - version: 0.6.5 - resolution: "through2@npm:0.6.5" - dependencies: - readable-stream: ">=1.0.33-1 <1.1.0-0" - xtend: ">=4.0.0 <4.1.0-0" - checksum: dfea228e3134a33219a588448847250897a9994a687807dab52f850fac8b4eb1dc18e3b2c1d3d60dd0d78eb492d2032fdf814ac6576ba5b8d5ba0dade29a3544 - languageName: node - linkType: hard - -"through2@npm:^2.0.1, through2@npm:^2.0.3": +"through2@npm:^2.0.3": version: 2.0.5 resolution: "through2@npm:2.0.5" dependencies: @@ -13358,13 +12766,6 @@ __metadata: languageName: node linkType: hard -"tiny-inflate@npm:^1.0.3": - version: 1.0.3 - resolution: "tiny-inflate@npm:1.0.3" - checksum: 4086a1f8938dafa4a20c63b099aeb47bf8fef5aca991bf4ea4b35dd2684fa52363b2c19b3e76660311e7613cb7c4f063bc48751b9bdf9555e498d997c30bc2d6 - languageName: node - linkType: hard - "tippy.js@npm:6.3.7, tippy.js@npm:^6.3.1": version: 6.3.7 resolution: "tippy.js@npm:6.3.7" @@ -13735,15 +13136,6 @@ __metadata: languageName: node linkType: hard -"utrie@npm:^1.0.2": - version: 1.0.2 - resolution: "utrie@npm:1.0.2" - dependencies: - base64-arraybuffer: ^1.0.2 - checksum: c96fbb7d4d8855a154327da0b18e39b7511cc70a7e4bcc3658e24f424bb884312d72b5ba777500b8858e34d365dc6b1a921dc5ca2f0d341182519c6b78e280a5 - languageName: node - linkType: hard - "uuid@npm:^9.0.0": version: 9.0.0 resolution: "uuid@npm:9.0.0" @@ -14132,20 +13524,13 @@ __metadata: languageName: node linkType: hard -"xtend@npm:>=4.0.0 <4.1.0-0, xtend@npm:^4.0.0, xtend@npm:~4.0.1": +"xtend@npm:~4.0.1": version: 4.0.2 resolution: "xtend@npm:4.0.2" checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a languageName: node linkType: hard -"xtend@npm:^2.1.2": - version: 2.2.0 - resolution: "xtend@npm:2.2.0" - checksum: 9fcd1ddabefdb3c68a698b08177525ad14a6df3423b13bad9a53900d19374e476a43c219b0756d39675776b2326a35fe477c547cfb8a05ae9fea4ba2235bebe2 - languageName: node - linkType: hard - "y18n@npm:^5.0.5": version: 5.0.8 resolution: "y18n@npm:5.0.8" @@ -14212,10 +13597,3 @@ __metadata: checksum: f77b3d8d00310def622123df93d4ee654fc6a0096182af8bd60679ddcdfb3474c56c6c7190817c84a2785648cdee9d721c0154eb45698c62176c322fb46fc700 languageName: node linkType: hard - -"zstddec@npm:^0.0.2": - version: 0.0.2 - resolution: "zstddec@npm:0.0.2" - checksum: 107334442a34590173cda03614006337712658fd043fa79f72bd486de527e2a16da474d7b20d4a171f086b334c2ad8a72afb634776d79bc2c36aee065babe31b - languageName: node - linkType: hard From 2100d011d3b2a3aeed68c0839d7ace1e5415f5f2 Mon Sep 17 00:00:00 2001 From: Christopher Tannum Date: Mon, 26 Jun 2023 09:51:26 +0200 Subject: [PATCH 8/9] fix: update reveal version --- react-components/package.json | 2 +- .../CogniteCadModelContainer.tsx | 6 +- react-components/yarn.lock | 511 +++++++++++++++++- 3 files changed, 494 insertions(+), 25 deletions(-) diff --git a/react-components/package.json b/react-components/package.json index a72bf5f8864..b6b56b4afb7 100644 --- a/react-components/package.json +++ b/react-components/package.json @@ -26,7 +26,7 @@ "@babel/preset-react": "7.22.5", "@babel/preset-typescript": "7.22.5", "@cognite/cogs.js": "^9.17.0", - "@cognite/reveal": "link:../viewer", + "@cognite/reveal": "4.3.4", "@cognite/sdk": "^8.2.0", "@storybook/addon-essentials": "7.0.22", "@storybook/addon-interactions": "7.0.22", diff --git a/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx b/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx index 4f15990d37b..63ed49c6734 100644 --- a/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx +++ b/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx @@ -1,5 +1,5 @@ -import { useEffect, useRef, useState } from "react"; -import { AddModelOptions, Cognite3DViewer, CogniteCadModel } from '@cognite/reveal'; +import { useEffect, useRef } from "react"; +import { AddModelOptions, CogniteCadModel } from '@cognite/reveal'; import { useReveal } from "../RevealContainer/RevealContext"; import { Matrix4 } from "three"; @@ -17,7 +17,7 @@ export default function CogniteCadModelContainer({ addModelOptions, transform }: addModel(modelId, revisionId, transform) .catch(console.error); return () => { - if (modelRef.current === undefined || (viewer as any).isDisposed) return; + if (modelRef.current === undefined || !viewer.models.includes(modelRef.current)) return; viewer.removeModel(modelRef.current); modelRef.current = undefined; } diff --git a/react-components/yarn.lock b/react-components/yarn.lock index 8aafca9d0e8..4bf5c853d04 100644 --- a/react-components/yarn.lock +++ b/react-components/yarn.lock @@ -2645,6 +2645,17 @@ __metadata: languageName: node linkType: hard +"@choojs/findup@npm:^0.2.0": + version: 0.2.1 + resolution: "@choojs/findup@npm:0.2.1" + dependencies: + commander: ^2.15.1 + bin: + findup: bin/findup.js + checksum: 9496321caa276f2a560ebae0e7607ba009012e8eff16db68fb405561ec482606edecf1c5ce1956805d77721c2db34c4bd9e2e95a2be2eec1c5ae8bb289ed5fd2 + languageName: node + linkType: hard + "@cognite/cogs.js@npm:^9.17.0": version: 9.17.0 resolution: "@cognite/cogs.js@npm:9.17.0" @@ -2696,7 +2707,7 @@ __metadata: "@babel/preset-react": 7.22.5 "@babel/preset-typescript": 7.22.5 "@cognite/cogs.js": ^9.17.0 - "@cognite/reveal": "link:../viewer" + "@cognite/reveal": 4.3.4 "@cognite/sdk": ^8.2.0 "@storybook/addon-essentials": 7.0.22 "@storybook/addon-interactions": 7.0.22 @@ -2731,11 +2742,30 @@ __metadata: languageName: unknown linkType: soft -"@cognite/reveal@link:../viewer::locator=%40cognite%2Freveal-react-components%40workspace%3A.": - version: 0.0.0-use.local - resolution: "@cognite/reveal@link:../viewer::locator=%40cognite%2Freveal-react-components%40workspace%3A." +"@cognite/reveal@npm:4.3.4": + version: 4.3.4 + resolution: "@cognite/reveal@npm:4.3.4" + dependencies: + "@tweenjs/tween.js": 19.0.0 + assert: 2.0.0 + async-mutex: 0.4.0 + glslify: 7.1.1 + glslify-import: 3.1.0 + html2canvas: ^1.4.1 + lodash: 4.17.21 + loglevel: 1.8.1 + mixpanel-browser: 2.47.0 + path-browserify: 1.0.1 + random-seed: 0.3.0 + rxjs: 7.8.1 + skmeans: 0.11.3 + sparse-octree: 7.1.8 + peerDependencies: + "@cognite/sdk": ^7.16.0 || ^8.0.0 + three: 0.152.2 + checksum: 7675de40b153a4f4fd0aaeedfd1a2ca50a5ec1ca733109d49981a47d07d1f43b1d2dab3102f53279350db37f535e09b2865c7dcc63e6a49ce98ebe4a4efdc699 languageName: node - linkType: soft + linkType: hard "@cognite/sdk-core@npm:^4.9.0": version: 4.9.0 @@ -4998,6 +5028,13 @@ __metadata: languageName: node linkType: hard +"@tweenjs/tween.js@npm:19.0.0": + version: 19.0.0 + resolution: "@tweenjs/tween.js@npm:19.0.0" + checksum: 8bb50058e6d20e74c7cd0d2d5675ce7aeb1505e4d92b667e35157b787ed885208eba3c85cae86c7dfed3016897ead2e667b251228f15130bb6fa61030a734b69 + languageName: node + linkType: hard + "@tweenjs/tween.js@npm:~18.6.4": version: 18.6.4 resolution: "@tweenjs/tween.js@npm:18.6.4" @@ -5797,7 +5834,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^7.4.1": +"acorn@npm:^7.1.1, acorn@npm:^7.4.1": version: 7.4.1 resolution: "acorn@npm:7.4.1" bin: @@ -6053,7 +6090,7 @@ __metadata: languageName: node linkType: hard -"assert@npm:^2.0.0": +"assert@npm:2.0.0, assert@npm:^2.0.0": version: 2.0.0 resolution: "assert@npm:2.0.0" dependencies: @@ -6099,6 +6136,15 @@ __metadata: languageName: node linkType: hard +"async-mutex@npm:0.4.0": + version: 0.4.0 + resolution: "async-mutex@npm:0.4.0" + dependencies: + tslib: ^2.4.0 + checksum: 813a71728b35a4fbfd64dba719f04726d9133c67b577fcd951b7028c4a675a13ee34e69beb82d621f87bf81f5d4f135c4c44be0448550c7db728547244ef71fc + languageName: node + linkType: hard + "async@npm:^3.2.3": version: 3.2.4 resolution: "async@npm:3.2.4" @@ -6341,6 +6387,13 @@ __metadata: languageName: node linkType: hard +"base64-arraybuffer@npm:^1.0.2": + version: 1.0.2 + resolution: "base64-arraybuffer@npm:1.0.2" + checksum: 15e6400d2d028bf18be4ed97702b11418f8f8779fb8c743251c863b726638d52f69571d4cc1843224da7838abef0949c670bde46936663c45ad078e89fee5c62 + languageName: node + linkType: hard + "base64-js@npm:^1.3.1": version: 1.5.1 resolution: "base64-js@npm:1.5.1" @@ -6378,6 +6431,16 @@ __metadata: languageName: node linkType: hard +"bl@npm:^2.2.1": + version: 2.2.1 + resolution: "bl@npm:2.2.1" + dependencies: + readable-stream: ^2.3.5 + safe-buffer: ^5.1.1 + checksum: 4f5d9b258919646a8d02f1731379e53b6f6309e34596ae02afbc3aeb183910bd2d0b70681f889b7c620ca48f65dc1cd0992ee1266c90d6d7c3be60688d141233 + languageName: node + linkType: hard + "bl@npm:^4.0.3, bl@npm:^4.1.0": version: 4.1.0 resolution: "bl@npm:4.1.0" @@ -6873,7 +6936,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:^2.19.0, commander@npm:^2.20.0": +"commander@npm:^2.15.1, commander@npm:^2.19.0, commander@npm:^2.20.0": version: 2.20.3 resolution: "commander@npm:2.20.3" checksum: ab8c07884e42c3a8dbc5dd9592c606176c7eb5c1ca5ff274bcf907039b2c41de3626f684ea75ccf4d361ba004bbaff1f577d5384c155f3871e456bdf27becf9e @@ -6955,7 +7018,7 @@ __metadata: languageName: node linkType: hard -"concat-stream@npm:^1.6.2": +"concat-stream@npm:^1.5.2, concat-stream@npm:^1.6.2": version: 1.6.2 resolution: "concat-stream@npm:1.6.2" dependencies: @@ -7118,6 +7181,15 @@ __metadata: languageName: node linkType: hard +"css-line-break@npm:^2.1.0": + version: 2.1.0 + resolution: "css-line-break@npm:2.1.0" + dependencies: + utrie: ^1.0.2 + checksum: 37b1fe632b03be7a287cd394cef8b5285666343443125c510df9cfb6a4734a2c71e154ec8f7bbff72d7c339e1e5872989b1c52d86162aed27d6cc114725bb4d0 + languageName: node + linkType: hard + "css-loader@npm:^6.7.1": version: 6.7.3 resolution: "css-loader@npm:6.7.3" @@ -7550,7 +7622,7 @@ __metadata: languageName: node linkType: hard -"duplexify@npm:^3.5.0, duplexify@npm:^3.6.0": +"duplexify@npm:^3.4.5, duplexify@npm:^3.5.0, duplexify@npm:^3.6.0": version: 3.7.1 resolution: "duplexify@npm:3.7.1" dependencies: @@ -7859,6 +7931,25 @@ __metadata: languageName: node linkType: hard +"escodegen@npm:^1.11.1": + version: 1.14.3 + resolution: "escodegen@npm:1.14.3" + dependencies: + esprima: ^4.0.1 + estraverse: ^4.2.0 + esutils: ^2.0.2 + optionator: ^0.8.1 + source-map: ~0.6.1 + dependenciesMeta: + source-map: + optional: true + bin: + escodegen: bin/escodegen.js + esgenerate: bin/esgenerate.js + checksum: 381cdc4767ecdb221206bbbab021b467bbc2a6f5c9a99c9e6353040080bdd3dfe73d7604ad89a47aca6ea7d58bc635f6bd3fbc8da9a1998e9ddfa8372362ccd0 + languageName: node + linkType: hard + "escodegen@npm:^2.0.0": version: 2.0.0 resolution: "escodegen@npm:2.0.0" @@ -7907,7 +7998,7 @@ __metadata: languageName: node linkType: hard -"estraverse@npm:^4.1.1": +"estraverse@npm:^4.1.1, estraverse@npm:^4.2.0": version: 4.3.0 resolution: "estraverse@npm:4.3.0" checksum: a6299491f9940bb246124a8d44b7b7a413a8336f5436f9837aaa9330209bd9ee8af7e91a654a3545aee9c54b3308e78ee360cef1d777d37cfef77d2fa33b5827 @@ -8030,6 +8121,16 @@ __metadata: languageName: node linkType: hard +"falafel@npm:^2.1.0": + version: 2.2.5 + resolution: "falafel@npm:2.2.5" + dependencies: + acorn: ^7.1.1 + isarray: ^2.0.1 + checksum: bfd46e92bca87670fd2ef31c6123088431271f98f3b2a300a58e9c3e5f4f9944f0058f7daaaaa8cefd68d461a334bd528c952bcec17061522b68b61f7925b382 + languageName: node + linkType: hard + "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3": version: 3.1.3 resolution: "fast-deep-equal@npm:3.1.3" @@ -8373,6 +8474,16 @@ __metadata: languageName: node linkType: hard +"from2@npm:^2.3.0": + version: 2.3.0 + resolution: "from2@npm:2.3.0" + dependencies: + inherits: ^2.0.1 + readable-stream: ^2.0.0 + checksum: 6080eba0793dce32f475141fb3d54cc15f84ee52e420ee22ac3ab0ad639dc95a1875bc6eb9c0e1140e94972a36a89dc5542491b85f1ab8df0c126241e0f1a61b + languageName: node + linkType: hard + "fs-constants@npm:^1.0.0": version: 1.0.0 resolution: "fs-constants@npm:1.0.0" @@ -8657,6 +8768,176 @@ __metadata: languageName: node linkType: hard +"glsl-inject-defines@npm:^1.0.1": + version: 1.0.3 + resolution: "glsl-inject-defines@npm:1.0.3" + dependencies: + glsl-token-inject-block: ^1.0.0 + glsl-token-string: ^1.0.1 + glsl-tokenizer: ^2.0.2 + checksum: 91d707cc4cdc924ec1ea13bcc332357c41754542e3c3d8d95f2331569c339a9cfab37c343e253fea10e56d5a70f930b9027b62431c5c786e34e7d8f785456836 + languageName: node + linkType: hard + +"glsl-resolve@npm:0.0.1": + version: 0.0.1 + resolution: "glsl-resolve@npm:0.0.1" + dependencies: + resolve: ^0.6.1 + xtend: ^2.1.2 + checksum: 8bc83f4c56c06d771761c32042fff8fed60f4bcc320d5fc3ec86cf115eb3c0bb5bacf3ca5f80cb88133399734d02c65788845bca9eb90244e08c41e98ddb0275 + languageName: node + linkType: hard + +"glsl-token-assignments@npm:^2.0.0": + version: 2.0.2 + resolution: "glsl-token-assignments@npm:2.0.2" + checksum: efd6051cfd0e5dc4749cc05530e79c42b2396685345695d1232ab3904011e65f117110a2ef7e92a06bc687abf6182f4e90b6b51cc4ab20147aafcc57f724ecb5 + languageName: node + linkType: hard + +"glsl-token-defines@npm:^1.0.0": + version: 1.0.0 + resolution: "glsl-token-defines@npm:1.0.0" + dependencies: + glsl-tokenizer: ^2.0.0 + checksum: 79c3738e4c858c1eb400a7d288a372cf275b6aacee4eed2a89f1c4269a9849d3210bbc770123af408bf0a9d8bf909e558154a27f4c976cee287ea9a4bf9b0047 + languageName: node + linkType: hard + +"glsl-token-depth@npm:^1.1.0, glsl-token-depth@npm:^1.1.1": + version: 1.1.2 + resolution: "glsl-token-depth@npm:1.1.2" + checksum: 97fff701eef20c2ef4552885f060dbf05b307f59b9f1637ddd73c3d5e7d3cc5b4851123706be9f2590042566132f5175ae86a82576bdcfa1edd4625c58d6843c + languageName: node + linkType: hard + +"glsl-token-descope@npm:^1.0.2": + version: 1.0.2 + resolution: "glsl-token-descope@npm:1.0.2" + dependencies: + glsl-token-assignments: ^2.0.0 + glsl-token-depth: ^1.1.0 + glsl-token-properties: ^1.0.0 + glsl-token-scope: ^1.1.0 + checksum: a0d578d5e71178cd5679504a94a60e0811980f46fe6b3cb018bb165530faa75ffcb61b62a1984052223cf2455e36c08f9aa72cf3fdce419aac5d8844ec84cf5a + languageName: node + linkType: hard + +"glsl-token-inject-block@npm:^1.0.0": + version: 1.1.0 + resolution: "glsl-token-inject-block@npm:1.1.0" + checksum: a08aca0f0684ee00eb9beb44993ab59d6d6330947d282204fe114c09a34fe9b9719f035eda0ed317a5409e5d4118674955c225034bb28c5d8334bcc3f905d7dc + languageName: node + linkType: hard + +"glsl-token-properties@npm:^1.0.0": + version: 1.0.1 + resolution: "glsl-token-properties@npm:1.0.1" + checksum: 9b4d1caf02d52f6407479bcd3e780133d6952ba6ae0d85ccd4f3de9ead061a173da0820b0238a0e721ae75370b645152d468bc24eb6f1fd37b5000c500d97cd4 + languageName: node + linkType: hard + +"glsl-token-scope@npm:^1.1.0, glsl-token-scope@npm:^1.1.1": + version: 1.1.2 + resolution: "glsl-token-scope@npm:1.1.2" + checksum: d62812c81a399d7bdd001ce4414293e508dbd78d480b1984190c8d3243c14817c34109893a71503a50ef09de28e4b0c0124be1979292aba5df3f0207eace1b70 + languageName: node + linkType: hard + +"glsl-token-string@npm:^1.0.1": + version: 1.0.1 + resolution: "glsl-token-string@npm:1.0.1" + checksum: 3260c1486b620277396ecb92b13434764eddcd59330ffb7a25d0e5fc2750fbd4330899e2acb5ab36408ea7451f3e103418ca0430b4c6a225a7e5f318b5028fda + languageName: node + linkType: hard + +"glsl-token-whitespace-trim@npm:^1.0.0": + version: 1.0.0 + resolution: "glsl-token-whitespace-trim@npm:1.0.0" + checksum: ffb0d09118a18fa807a249414762e93835d303f476feae8bbb80320ec850a5aa24fa2760245b374312310ebb0ef099da9a9190ff5b587be45566d2aee1503777 + languageName: node + linkType: hard + +"glsl-tokenizer@npm:^2.0.0, glsl-tokenizer@npm:^2.0.2": + version: 2.1.5 + resolution: "glsl-tokenizer@npm:2.1.5" + dependencies: + through2: ^0.6.3 + checksum: daf70e91c66a3143fe0b22be18a0f8cc965d7b81f73a58b14d55d08593bdcc3f996996549bda78b4cc822d7fe8c216aaeaab71f2695d802fb79fc9e89fb507d3 + languageName: node + linkType: hard + +"glslify-bundle@npm:^5.0.0": + version: 5.1.1 + resolution: "glslify-bundle@npm:5.1.1" + dependencies: + glsl-inject-defines: ^1.0.1 + glsl-token-defines: ^1.0.0 + glsl-token-depth: ^1.1.1 + glsl-token-descope: ^1.0.2 + glsl-token-scope: ^1.1.1 + glsl-token-string: ^1.0.1 + glsl-token-whitespace-trim: ^1.0.0 + glsl-tokenizer: ^2.0.2 + murmurhash-js: ^1.0.0 + shallow-copy: 0.0.1 + checksum: e3a5e438dd0ffbdaa72adad23b4eae80258f3f903b3fde3d7022d2f662df1bbb76ce479c2c030ed4aebeb899965e7e3bb7db83748963e0643bbbded3bacdebff + languageName: node + linkType: hard + +"glslify-deps@npm:^1.2.5": + version: 1.3.2 + resolution: "glslify-deps@npm:1.3.2" + dependencies: + "@choojs/findup": ^0.2.0 + events: ^3.2.0 + glsl-resolve: 0.0.1 + glsl-tokenizer: ^2.0.0 + graceful-fs: ^4.1.2 + inherits: ^2.0.1 + map-limit: 0.0.1 + resolve: ^1.0.0 + checksum: 3eb50a26171f66d02582cfa90a9ac7c964ff970d44cd48025af2015fe465be1632cfc7fcec05f5aa4210571ec936c4a26de0e100d9c4d0c2ab655362290a616c + languageName: node + linkType: hard + +"glslify-import@npm:3.1.0": + version: 3.1.0 + resolution: "glslify-import@npm:3.1.0" + dependencies: + glsl-resolve: 0.0.1 + glsl-token-string: ^1.0.1 + glsl-tokenizer: ^2.0.2 + checksum: 4301b8f940af61ce6e1e61ecd9cd79f86b53f44772587af7e987dd1805553905129cb6ba7155b3b3f07aa7923553b04e236ea158648adf6bde2843ab4d48faaa + languageName: node + linkType: hard + +"glslify@npm:7.1.1": + version: 7.1.1 + resolution: "glslify@npm:7.1.1" + dependencies: + bl: ^2.2.1 + concat-stream: ^1.5.2 + duplexify: ^3.4.5 + falafel: ^2.1.0 + from2: ^2.3.0 + glsl-resolve: 0.0.1 + glsl-token-whitespace-trim: ^1.0.0 + glslify-bundle: ^5.0.0 + glslify-deps: ^1.2.5 + minimist: ^1.2.5 + resolve: ^1.1.5 + stack-trace: 0.0.9 + static-eval: ^2.0.5 + through2: ^2.0.1 + xtend: ^4.0.0 + bin: + glslify: bin.js + checksum: 2bb59c0480041ca73dcb6e0c6f56d3f063e546c87901f82582a914864ebf836145289316bddb507874bf9405113a3efb3efbeacc0e888337d7d268ef1823ca7b + languageName: node + linkType: hard + "gopd@npm:^1.0.1": version: 1.0.1 resolution: "gopd@npm:1.0.1" @@ -8854,6 +9135,16 @@ __metadata: languageName: node linkType: hard +"html2canvas@npm:^1.4.1": + version: 1.4.1 + resolution: "html2canvas@npm:1.4.1" + dependencies: + css-line-break: ^2.1.0 + text-segmentation: ^1.0.3 + checksum: c134324af57f3262eecf982e436a4843fded3c6cf61954440ffd682527e4dd350e0c2fafd217c0b6f9a455fe345d0c67b4505689796ab160d4ca7c91c3766739 + languageName: node + linkType: hard + "htmlparser2@npm:^6.1.0": version: 6.1.0 resolution: "htmlparser2@npm:6.1.0" @@ -9027,7 +9318,7 @@ __metadata: languageName: node linkType: hard -"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.3": +"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.1, inherits@npm:~2.0.3": version: 2.0.4 resolution: "inherits@npm:2.0.4" checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1 @@ -9404,7 +9695,14 @@ __metadata: languageName: node linkType: hard -"isarray@npm:^2.0.5": +"isarray@npm:0.0.1": + version: 0.0.1 + resolution: "isarray@npm:0.0.1" + checksum: 49191f1425681df4a18c2f0f93db3adb85573bcdd6a4482539d98eac9e705d8961317b01175627e860516a2fc45f8f9302db26e5a380a97a520e272e2a40a8d4 + languageName: node + linkType: hard + +"isarray@npm:^2.0.1, isarray@npm:^2.0.5": version: 2.0.5 resolution: "isarray@npm:2.0.5" checksum: bd5bbe4104438c4196ba58a54650116007fa0262eccef13a4c55b2e09a5b36b59f1e75b9fcc49883dd9d4953892e6fc007eef9e9155648ceea036e184b0f930a @@ -9663,6 +9961,13 @@ __metadata: languageName: node linkType: hard +"json-stringify-safe@npm:^5.0.1": + version: 5.0.1 + resolution: "json-stringify-safe@npm:5.0.1" + checksum: 48ec0adad5280b8a96bb93f4563aa1667fd7a36334f79149abd42446d0989f2ddc58274b479f4819f1f00617957e6344c886c55d05a4e15ebb4ab931e4a6a8ee + languageName: node + linkType: hard + "json5@npm:^2.1.2, json5@npm:^2.2.2": version: 2.2.3 resolution: "json5@npm:2.2.3" @@ -9801,7 +10106,7 @@ __metadata: languageName: node linkType: hard -"lodash@npm:^4.17.11, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21": +"lodash@npm:4.17.21, lodash@npm:^4.17.11, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7 @@ -9818,6 +10123,13 @@ __metadata: languageName: node linkType: hard +"loglevel@npm:1.8.1": + version: 1.8.1 + resolution: "loglevel@npm:1.8.1" + checksum: a1a62db40291aaeaef2f612334c49e531bff71cc1d01a2acab689ab80d59e092f852ab164a5aedc1a752fdc46b7b162cb097d8a9eb2cf0b299511106c29af61d + languageName: node + linkType: hard + "loose-envify@npm:^1.1.0, loose-envify@npm:^1.4.0": version: 1.4.0 resolution: "loose-envify@npm:1.4.0" @@ -9924,6 +10236,15 @@ __metadata: languageName: node linkType: hard +"map-limit@npm:0.0.1": + version: 0.0.1 + resolution: "map-limit@npm:0.0.1" + dependencies: + once: ~1.3.0 + checksum: e7ad9a66037d4168f2e3dbd20654cb0503126911e0e43c8fe95ae1a3ea54b72e84f94f8577a13598708a29a096cc6ecf136622ea6a5d393c227f84f6f1445b83 + languageName: node + linkType: hard + "map-or-similar@npm:^1.5.0": version: 1.5.0 resolution: "map-or-similar@npm:1.5.0" @@ -10186,6 +10507,13 @@ __metadata: languageName: node linkType: hard +"mixpanel-browser@npm:2.47.0": + version: 2.47.0 + resolution: "mixpanel-browser@npm:2.47.0" + checksum: f44e0e0ac70b3772ed1be7c826d3cb0ffbf2dda35e6b927a3f7167795283745ae16573ae6ba303238bf776e3a5ed72c98c3c3f97e2a3c72bcbada15b956e9e9d + languageName: node + linkType: hard + "mkdirp-classic@npm:^0.5.2": version: 0.5.3 resolution: "mkdirp-classic@npm:0.5.3" @@ -10257,6 +10585,13 @@ __metadata: languageName: node linkType: hard +"murmurhash-js@npm:^1.0.0": + version: 1.0.0 + resolution: "murmurhash-js@npm:1.0.0" + checksum: 083cea92a11bc9eb25be1446fc92eded3f49731bc1ad34fa8023afd68c234d1dd59458d70eb20e667b1383bedeeb8dfb1a16c89913b6ffe3584fd22fb598739d + languageName: node + linkType: hard + "nanoid@npm:^3.3.1, nanoid@npm:^3.3.6": version: 3.3.6 resolution: "nanoid@npm:3.3.6" @@ -10508,6 +10843,15 @@ __metadata: languageName: node linkType: hard +"once@npm:~1.3.0": + version: 1.3.3 + resolution: "once@npm:1.3.3" + dependencies: + wrappy: 1 + checksum: 8e832de08b1d73b470e01690c211cb4fcefccab1fd1bd19e706d572d74d3e9b7e38a8bfcdabdd364f9f868757d9e8e5812a59817dc473eaf698ff3bfae2219f2 + languageName: node + linkType: hard + "onetime@npm:^5.1.0, onetime@npm:^5.1.2": version: 5.1.2 resolution: "onetime@npm:5.1.2" @@ -10685,7 +11029,7 @@ __metadata: languageName: node linkType: hard -"path-browserify@npm:^1.0.1": +"path-browserify@npm:1.0.1, path-browserify@npm:^1.0.1": version: 1.0.1 resolution: "path-browserify@npm:1.0.1" checksum: c6d7fa376423fe35b95b2d67990060c3ee304fc815ff0a2dc1c6c3cfaff2bd0d572ee67e18f19d0ea3bbe32e8add2a05021132ac40509416459fffee35200699 @@ -11165,6 +11509,15 @@ __metadata: languageName: node linkType: hard +"random-seed@npm:0.3.0": + version: 0.3.0 + resolution: "random-seed@npm:0.3.0" + dependencies: + json-stringify-safe: ^5.0.1 + checksum: 0a82692fc8d830bc26259dad78a911969343c247afb4be5d578c30fd9fbe76c7ce3f6900422310fc90fe05d6baa12e84a1b9ff93b0b7fda757ecfa40645a1f72 + languageName: node + linkType: hard + "randombytes@npm:^2.1.0": version: 2.1.0 resolution: "randombytes@npm:2.1.0" @@ -11660,7 +12013,19 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:^2.0.0, readable-stream@npm:^2.2.2, readable-stream@npm:~2.3.6": +"readable-stream@npm:>=1.0.33-1 <1.1.0-0": + version: 1.0.34 + resolution: "readable-stream@npm:1.0.34" + dependencies: + core-util-is: ~1.0.0 + inherits: ~2.0.1 + isarray: 0.0.1 + string_decoder: ~0.10.x + checksum: 85042c537e4f067daa1448a7e257a201070bfec3dd2706abdbd8ebc7f3418eb4d3ed4b8e5af63e2544d69f88ab09c28d5da3c0b77dc76185fddd189a59863b60 + languageName: node + linkType: hard + +"readable-stream@npm:^2.0.0, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.5, readable-stream@npm:~2.3.6": version: 2.3.8 resolution: "readable-stream@npm:2.3.8" dependencies: @@ -11908,7 +12273,14 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0": +"resolve@npm:^0.6.1": + version: 0.6.3 + resolution: "resolve@npm:0.6.3" + checksum: c3b5d34ba79635ffe380eb0e428e0b49259734ad2c86945c6b3238155b0753d8bcf858c6b99966b3fdb536062f6e204675e4542269f065e34210bb3a6f602f9d + languageName: node + linkType: hard + +"resolve@npm:^1.0.0, resolve@npm:^1.1.5, resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0": version: 1.22.3 resolution: "resolve@npm:1.22.3" dependencies: @@ -11921,7 +12293,14 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.12.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin": +"resolve@patch:resolve@^0.6.1#~builtin": + version: 0.6.3 + resolution: "resolve@patch:resolve@npm%3A0.6.3#~builtin::version=0.6.3&hash=3bafbf" + checksum: fbdc248b89f655da8ff1509c000027702455d36e99943307d6e939bbef8b6f2bf67f82aa82ceb968f121febea128dd9b3e544fc6497c105204b1633bee1efad9 + languageName: node + linkType: hard + +"resolve@patch:resolve@^1.0.0#~builtin, resolve@patch:resolve@^1.1.5#~builtin, resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.12.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin": version: 1.22.3 resolution: "resolve@patch:resolve@npm%3A1.22.3#~builtin::version=1.22.3&hash=c3c19d" dependencies: @@ -12000,6 +12379,15 @@ __metadata: languageName: node linkType: hard +"rxjs@npm:7.8.1": + version: 7.8.1 + resolution: "rxjs@npm:7.8.1" + dependencies: + tslib: ^2.1.0 + checksum: de4b53db1063e618ec2eca0f7965d9137cabe98cf6be9272efe6c86b47c17b987383df8574861bcced18ebd590764125a901d5506082be84a8b8e364bf05f119 + languageName: node + linkType: hard + "safe-buffer@npm:5.1.1": version: 5.1.1 resolution: "safe-buffer@npm:5.1.1" @@ -12014,7 +12402,7 @@ __metadata: languageName: node linkType: hard -"safe-buffer@npm:5.2.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0": +"safe-buffer@npm:5.2.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491 @@ -12187,6 +12575,13 @@ __metadata: languageName: node linkType: hard +"shallow-copy@npm:0.0.1": + version: 0.0.1 + resolution: "shallow-copy@npm:0.0.1" + checksum: 2d249a5a57a160b439d84fbf9ed7c0a107a3d656d1bda0b73edf9476c6e6ea9d2afa79829bf33fce6677fae35b15c14e5c28f9902dc4d07a302637a225d00634 + languageName: node + linkType: hard + "shallow-equal@npm:^1.2.1": version: 1.2.1 resolution: "shallow-equal@npm:1.2.1" @@ -12273,6 +12668,13 @@ __metadata: languageName: node linkType: hard +"skmeans@npm:0.11.3": + version: 0.11.3 + resolution: "skmeans@npm:0.11.3" + checksum: fd79f94074353b89462cc3993ce15d9c9ee3b6736b90ae99b45812d00ba5a992dd2f8451e381d8718d8bc47e279e0fd51193458beb5a07409d3696471377826c + languageName: node + linkType: hard + "slash@npm:^3.0.0": version: 3.0.0 resolution: "slash@npm:3.0.0" @@ -12353,6 +12755,15 @@ __metadata: languageName: node linkType: hard +"sparse-octree@npm:7.1.8": + version: 7.1.8 + resolution: "sparse-octree@npm:7.1.8" + peerDependencies: + three: 0.x.x + checksum: 07074c703cd9cee9e3c1becc0b125356ffcea72713d47c4229b1ba3cd56ffbf68223c4a75586a0c6923a56e322b6383dd37b37e58c83471d2632e111a60c0a71 + languageName: node + linkType: hard + "spdx-correct@npm:^3.0.0": version: 3.2.0 resolution: "spdx-correct@npm:3.2.0" @@ -12403,6 +12814,13 @@ __metadata: languageName: node linkType: hard +"stack-trace@npm:0.0.9": + version: 0.0.9 + resolution: "stack-trace@npm:0.0.9" + checksum: 5b1ff9708eaeae2518f70ea10027aa608892faedfd95d3c92b0e3b14cf49b013da22421a32b5bbe29ae711436e53fdf966793cf58a4bd0ad20a71859d27a894f + languageName: node + linkType: hard + "stackframe@npm:^1.3.4": version: 1.3.4 resolution: "stackframe@npm:1.3.4" @@ -12410,6 +12828,15 @@ __metadata: languageName: node linkType: hard +"static-eval@npm:^2.0.5": + version: 2.1.0 + resolution: "static-eval@npm:2.1.0" + dependencies: + escodegen: ^1.11.1 + checksum: 21297ee9af37cd23ef92b3a4b1fd535073539b870d2bb83a4b92f6b668183f7fb552d3c791bbdcd460c62583a2c33d46e5d56e86a7f5851b65b29e19e5d28b41 + languageName: node + linkType: hard + "statuses@npm:2.0.1": version: 2.0.1 resolution: "statuses@npm:2.0.1" @@ -12479,6 +12906,13 @@ __metadata: languageName: node linkType: hard +"string_decoder@npm:~0.10.x": + version: 0.10.31 + resolution: "string_decoder@npm:0.10.31" + checksum: fe00f8e303647e5db919948ccb5ce0da7dea209ab54702894dd0c664edd98e5d4df4b80d6fabf7b9e92b237359d21136c95bf068b2f7760b772ca974ba970202 + languageName: node + linkType: hard + "string_decoder@npm:~1.1.1": version: 1.1.1 resolution: "string_decoder@npm:1.1.1" @@ -12749,6 +13183,15 @@ __metadata: languageName: node linkType: hard +"text-segmentation@npm:^1.0.3": + version: 1.0.3 + resolution: "text-segmentation@npm:1.0.3" + dependencies: + utrie: ^1.0.2 + checksum: 2e24632d59567c55ab49ac324815e2f7a8043e63e26b109636322ac3e30692cee8679a448fd5d0f0598a345f407afd0e34ba612e22524cf576d382d84058c013 + languageName: node + linkType: hard + "three@npm:0.152.2": version: 0.152.2 resolution: "three@npm:0.152.2" @@ -12756,7 +13199,17 @@ __metadata: languageName: node linkType: hard -"through2@npm:^2.0.3": +"through2@npm:^0.6.3": + version: 0.6.5 + resolution: "through2@npm:0.6.5" + dependencies: + readable-stream: ">=1.0.33-1 <1.1.0-0" + xtend: ">=4.0.0 <4.1.0-0" + checksum: dfea228e3134a33219a588448847250897a9994a687807dab52f850fac8b4eb1dc18e3b2c1d3d60dd0d78eb492d2032fdf814ac6576ba5b8d5ba0dade29a3544 + languageName: node + linkType: hard + +"through2@npm:^2.0.1, through2@npm:^2.0.3": version: 2.0.5 resolution: "through2@npm:2.0.5" dependencies: @@ -13136,6 +13589,15 @@ __metadata: languageName: node linkType: hard +"utrie@npm:^1.0.2": + version: 1.0.2 + resolution: "utrie@npm:1.0.2" + dependencies: + base64-arraybuffer: ^1.0.2 + checksum: c96fbb7d4d8855a154327da0b18e39b7511cc70a7e4bcc3658e24f424bb884312d72b5ba777500b8858e34d365dc6b1a921dc5ca2f0d341182519c6b78e280a5 + languageName: node + linkType: hard + "uuid@npm:^9.0.0": version: 9.0.0 resolution: "uuid@npm:9.0.0" @@ -13524,13 +13986,20 @@ __metadata: languageName: node linkType: hard -"xtend@npm:~4.0.1": +"xtend@npm:>=4.0.0 <4.1.0-0, xtend@npm:^4.0.0, xtend@npm:~4.0.1": version: 4.0.2 resolution: "xtend@npm:4.0.2" checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a languageName: node linkType: hard +"xtend@npm:^2.1.2": + version: 2.2.0 + resolution: "xtend@npm:2.2.0" + checksum: 9fcd1ddabefdb3c68a698b08177525ad14a6df3423b13bad9a53900d19374e476a43c219b0756d39675776b2326a35fe477c547cfb8a05ae9fea4ba2235bebe2 + languageName: node + linkType: hard + "y18n@npm:^5.0.5": version: 5.0.8 resolution: "y18n@npm:5.0.8" From 9d92258e3c82379a6e3aa91aa7322996521ee055 Mon Sep 17 00:00:00 2001 From: Christopher Tannum Date: Mon, 26 Jun 2023 15:04:00 +0200 Subject: [PATCH 9/9] fix: QA --- .../CogniteCadModelContainer.tsx | 36 ++++++++++++------- .../CogniteCadModelContainer.stories.tsx | 36 ++++++++++++------- 2 files changed, 47 insertions(+), 25 deletions(-) diff --git a/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx b/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx index 63ed49c6734..f53f939b553 100644 --- a/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx +++ b/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx @@ -1,39 +1,51 @@ import { useEffect, useRef } from "react"; -import { AddModelOptions, CogniteCadModel } from '@cognite/reveal'; +import { AddModelOptions, CogniteCadModel } from "@cognite/reveal"; import { useReveal } from "../RevealContainer/RevealContext"; import { Matrix4 } from "three"; type Cognite3dModelProps = { addModelOptions: AddModelOptions; transform?: THREE.Matrix4; -} +}; -export default function CogniteCadModelContainer({ addModelOptions, transform }: Cognite3dModelProps) { +export default function CogniteCadModelContainer({ + addModelOptions, + transform, +}: Cognite3dModelProps) { const modelRef = useRef(); const viewer = useReveal(); const { modelId, revisionId } = addModelOptions; useEffect(() => { - addModel(modelId, revisionId, transform) - .catch(console.error); + addModel(modelId, revisionId, transform).catch(console.error); return () => { - if (modelRef.current === undefined || !viewer.models.includes(modelRef.current)) return; + if ( + modelRef.current === undefined || + !viewer.models.includes(modelRef.current) + ) { + return; + } viewer.removeModel(modelRef.current); modelRef.current = undefined; - } + }; }, [addModelOptions]); - if (modelRef.current !== undefined && transform !== undefined) { + useEffect(() => { + if (modelRef.current === undefined || transform === undefined) return; modelRef.current.setModelTransformation(transform); - } + }, [transform]); + return <>; - async function addModel(modelId: number, revisionId: number, transform?: Matrix4) { + async function addModel( + modelId: number, + revisionId: number, + transform?: Matrix4 + ) { const cadModel = await viewer.addCadModel({ modelId, revisionId }); if (transform !== undefined) { cadModel.setModelTransformation(transform); } - viewer.fitCameraToModel(cadModel); modelRef.current = cadModel; } -} \ No newline at end of file +} diff --git a/react-components/src/stories/CogniteCadModelContainer.stories.tsx b/react-components/src/stories/CogniteCadModelContainer.stories.tsx index fee69f7cbe3..549b14401eb 100644 --- a/react-components/src/stories/CogniteCadModelContainer.stories.tsx +++ b/react-components/src/stories/CogniteCadModelContainer.stories.tsx @@ -1,31 +1,41 @@ -import type { Meta, StoryObj } from '@storybook/react'; -import { CogniteCadModelContainer, RevealContainer } from '..'; -import { CogniteClient } from '@cognite/sdk'; -import { Color, Matrix4 } from 'three'; +import type { Meta, StoryObj } from "@storybook/react"; +import { CogniteCadModelContainer, RevealContainer } from ".."; +import { CogniteClient } from "@cognite/sdk"; +import { Color, Matrix4 } from "three"; const meta = { - title: 'Example/CogniteCadModelContainer', + title: "Example/CogniteCadModelContainer", component: CogniteCadModelContainer, - tags: ['autodocs'] + tags: ["autodocs"], } satisfies Meta; export default meta; type Story = StoryObj; -const token = new URLSearchParams(window.location.search).get('token')!; -const sdk = new CogniteClient({ appId: 'reveal.example', baseUrl: 'https://greenfield.cognitedata.com', project: '3d-test', getToken: () => Promise.resolve(token) }); +// TODO: See if we can improve this with some proper authentication +const token = new URLSearchParams(window.location.search).get("token")!; +const sdk = new CogniteClient({ + appId: "reveal.example", + baseUrl: "https://greenfield.cognitedata.com", + project: "3d-test", + getToken: () => Promise.resolve(token), +}); export const Main: Story = { args: { addModelOptions: { modelId: 1791160622840317, - revisionId: 498427137020189 + revisionId: 498427137020189, }, - transform: new Matrix4().makeTranslation(0, 10, 0) + transform: new Matrix4().makeTranslation(0, 10, 0), }, - render: ({ addModelOptions, transform }) => - + render: ({ addModelOptions, transform }) => ( + - + + ), };