diff --git a/examples/package.json b/examples/package.json index f57f4e1c1ae..96a311b232a 100644 --- a/examples/package.json +++ b/examples/package.json @@ -40,12 +40,12 @@ "@types/react-dom": "18.2.4", "@types/stats.js": "^0.17.0", "@types/styled-components": "^5.1.26", - "@types/three": "0.152.0", + "@types/three": "0.154.0", "css-loader": "^6.7.1", "dotenv-webpack": "^7.1.0", "html-webpack-plugin": "^5.5.0", "prettier": "^2.8.4", - "three": "0.152.2", + "three": "0.154.0", "ts-loader": "9.4.4", "typescript": "^5.0.4", "webpack": "^5.76.0", diff --git a/examples/yarn.lock b/examples/yarn.lock index 9b96a32f3ec..a3827b47cab 100644 --- a/examples/yarn.lock +++ b/examples/yarn.lock @@ -196,25 +196,23 @@ commander "^2.15.1" "@cognite/reveal@link:../viewer": - version "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" + version "0.0.0" + uid "" + +"@cognite/sdk-core@^4.9.0": + version "4.9.0" + resolved "https://registry.yarnpkg.com/@cognite/sdk-core/-/sdk-core-4.9.0.tgz#a7ad2c1eaf527ef011526724518331bbe6b0eed2" + integrity sha512-pBqbT2SbEev87PSaTrVw0rwBGjofVoLMb4Y2B7ufq43p5s2+5OycRJKTK+2kEwL9g5lsArTkoX4M5KZ98x5B3g== + dependencies: + cross-fetch "^3.0.4" + is-buffer "^2.0.5" + lodash "^4.17.11" + query-string "^5.1.1" + url "^0.11.0" "@cognite/sdk@link:../viewer/node_modules/@cognite/sdk": version "0.0.0" + uid "" "@discoveryjs/json-ext@^0.5.0": version "0.5.7" @@ -429,6 +427,11 @@ "@types/qs" "*" "@types/serve-static" "*" +"@types/geojson@^7946.0.8": + version "7946.0.10" + resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.10.tgz#6dfbf5ea17142f7f9a043809f1cd4c448cb68249" + integrity sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA== + "@types/hoist-non-react-statics@*": version "3.3.1" resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f" @@ -590,16 +593,17 @@ dependencies: "@types/jest" "*" -"@types/three@0.152.0": - version "0.152.0" - resolved "https://registry.yarnpkg.com/@types/three/-/three-0.152.0.tgz#23d8a61461bac007e56dc0c0081fe22ca1e38421" - integrity sha512-9QdaV5bfZEqeQi0xkXLdnoJt7lgYZbppdBAgJSWRicdtZoCYJ34nS2QkdeuzXt+UXExofk4OWqMzdX71HeDOVg== +"@types/three@0.154.0": + version "0.154.0" + resolved "https://registry.yarnpkg.com/@types/three/-/three-0.154.0.tgz#91f4384930ed050a14d7f13c09d5785cc167a064" + integrity sha512-IioqpGhch6FdLDh4zazRn3rXHj6Vn2nVOziJdXVbJFi9CaI65LtP9qqUtpzbsHK2Ezlox8NtsLNHSw3AQzucjA== dependencies: "@tweenjs/tween.js" "~18.6.4" "@types/stats.js" "*" "@types/webxr" "*" fflate "~0.6.9" lil-gui "~0.17.0" + meshoptimizer "~0.18.1" "@types/webxr@*", "@types/webxr@^0.5.2": version "0.5.2" @@ -1258,6 +1262,13 @@ core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= +cross-fetch@^3.0.4: + version "3.1.8" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.8.tgz#0327eba65fd68a7d119f8fb2bf9334a1a7956f82" + integrity sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg== + dependencies: + node-fetch "^2.6.12" + cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" @@ -1862,6 +1873,11 @@ functions-have-names@^1.2.2: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== +geojson@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/geojson/-/geojson-0.5.0.tgz#3cd6c96399be65b56ee55596116fe9191ce701c0" + integrity sha512-/Bx5lEn+qRF4TfQ5aLu6NH+UKtvIv7Lhc487y/c8BdludrCTpiWf9wyI0RTyqg49MFefIAvFDuEi5Dfd/zgNxQ== + get-intrinsic@^1.0.2: version "1.1.1" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" @@ -2346,6 +2362,11 @@ is-boolean-object@^1.1.0: call-bind "^1.0.2" has-tostringtag "^1.0.0" +is-buffer@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" + integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== + is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.4: version "1.2.6" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.6.tgz#fd6170b0b8c7e2cc73de342ef8284a2202023c44" @@ -2607,7 +2628,7 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" -lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21: +lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -2672,6 +2693,11 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== +meshoptimizer@~0.18.1: + version "0.18.1" + resolved "https://registry.yarnpkg.com/meshoptimizer/-/meshoptimizer-0.18.1.tgz#cdb90907f30a7b5b1190facd3b7ee6b7087797d8" + integrity sha512-ZhoIoL7TNV4s5B6+rx5mC//fw8/POGyNxS/DZyCJeiZ12ScLfVwRE/GfsxwiTkMYYD5DmK2/JXnEVXqL4rF+Sw== + methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" @@ -2795,6 +2821,13 @@ no-case@^3.0.4: lower-case "^2.0.2" tslib "^2.0.3" +node-fetch@^2.6.12: + version "2.6.12" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.12.tgz#02eb8e22074018e3d5a83016649d04df0e348fba" + integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g== + dependencies: + whatwg-url "^5.0.0" + node-forge@^1: version "1.3.1" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" @@ -2824,6 +2857,11 @@ nth-check@^2.0.1: dependencies: boolbase "^1.0.0" +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== + object-inspect@^1.12.2: version "1.12.2" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" @@ -3120,6 +3158,11 @@ proxy-addr@~2.0.7: forwarded "0.2.0" ipaddr.js "1.9.1" +punycode@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ== + punycode@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" @@ -3132,6 +3175,22 @@ qs@6.10.3: dependencies: side-channel "^1.0.4" +qs@^6.11.0: + version "6.11.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9" + integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA== + dependencies: + side-channel "^1.0.4" + +query-string@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb" + integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw== + dependencies: + decode-uri-component "^0.2.0" + object-assign "^4.1.0" + strict-uri-encode "^1.0.0" + random-seed@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/random-seed/-/random-seed-0.3.0.tgz#d945f2e1f38f49e8d58913431b8bf6bb937556cd" @@ -3597,6 +3656,11 @@ stream-shift@^1.0.0: resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== +strict-uri-encode@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" + integrity sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ== + string.prototype.codepointat@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz#004ad44c8afc727527b108cd462b4d971cd469bc" @@ -3750,10 +3814,10 @@ three-stdlib@2.23.10: potpack "^1.0.1" zstddec "^0.0.2" -three@0.152.2: - version "0.152.2" - resolved "https://registry.yarnpkg.com/three/-/three-0.152.2.tgz#2ee0f2c504d31a4bc29b45495c12bded9fda7bfc" - integrity sha512-Ff9zIpSfkkqcBcpdiFo2f35vA9ZucO+N8TNacJOqaEE6DrB0eufItVMib8bK8Pcju/ZNT6a7blE1GhTpkdsILw== +three@0.154.0: + version "0.154.0" + resolved "https://registry.yarnpkg.com/three/-/three-0.154.0.tgz#dbef21e10fe6015ec283acc60d0eb58733991e27" + integrity sha512-Uzz8C/5GesJzv8i+Y2prEMYUwodwZySPcNhuJUdsVMH2Yn4Nm8qlbQe6qRN5fOhg55XB0WiLfTPBxVHxpE60ug== through2@^0.6.3: version "0.6.5" @@ -3798,6 +3862,11 @@ toidentifier@1.0.1: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== + ts-loader@9.4.4: version "9.4.4" resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.4.tgz#6ceaf4d58dcc6979f84125335904920884b7cee4" @@ -3860,6 +3929,14 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" +url@^0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/url/-/url-0.11.1.tgz#26f90f615427eca1b9f4d6a28288c147e2302a32" + integrity sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA== + dependencies: + punycode "^1.4.1" + qs "^6.11.0" + util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -3919,6 +3996,11 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== + webpack-cli@^4.10.0: version "4.10.0" resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31" @@ -4050,6 +4132,14 @@ websocket-extensions@>=0.1.1: resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" diff --git a/react-components/package.json b/react-components/package.json index 650de277fde..99e464eef2d 100644 --- a/react-components/package.json +++ b/react-components/package.json @@ -40,7 +40,7 @@ "@types/lodash": "^4.14.190", "@types/react": "18.2.7", "@types/styled-components": "5.1.26", - "@types/three": "0.152.0", + "@types/three": "0.154.0", "@typescript-eslint/eslint-plugin": "^5.50.0", "eslint": "^8.0.1", "eslint-config-prettier": "^8.8.0", @@ -58,10 +58,10 @@ "react-dom": "18.2.0", "storybook": "7.0.27", "styled-components": "5.3.11", - "three": "0.152.2", + "three": "0.154.0", "ts-loader": "9.4.3", "typescript": "5.1.6", - "webpack": "5.88.1", + "webpack": "5.88.2", "webpack-cli": "5.1.4", "webpack-node-externals": "3.0.0" }, diff --git a/react-components/yarn.lock b/react-components/yarn.lock index fd4d9b6efc7..ff487d12e48 100644 --- a/react-components/yarn.lock +++ b/react-components/yarn.lock @@ -2191,7 +2191,7 @@ __metadata: "@types/lodash": ^4.14.190 "@types/react": 18.2.7 "@types/styled-components": 5.1.26 - "@types/three": 0.152.0 + "@types/three": 0.154.0 "@typescript-eslint/eslint-plugin": ^5.50.0 eslint: ^8.0.1 eslint-config-prettier: ^8.8.0 @@ -2211,10 +2211,10 @@ __metadata: storybook: 7.0.27 style-loader: ^3.3.3 styled-components: 5.3.11 - three: 0.152.2 + three: 0.154.0 ts-loader: 9.4.3 typescript: 5.1.6 - webpack: 5.88.1 + webpack: 5.88.2 webpack-cli: 5.1.4 webpack-node-externals: 3.0.0 peerDependencies: @@ -5056,16 +5056,17 @@ __metadata: languageName: node linkType: hard -"@types/three@npm:0.152.0": - version: 0.152.0 - resolution: "@types/three@npm:0.152.0" +"@types/three@npm:0.154.0": + version: 0.154.0 + resolution: "@types/three@npm:0.154.0" dependencies: "@tweenjs/tween.js": ~18.6.4 "@types/stats.js": "*" "@types/webxr": "*" fflate: ~0.6.9 lil-gui: ~0.17.0 - checksum: 23182ba26bc8793755536731a9605e8fa3a8b66e91461b1da56009c5103388f92b996c39d97c3e50ca91f874fc8dd0a2b8443b4416540870ad3031eab973e6ed + meshoptimizer: ~0.18.1 + checksum: 623067f84e342afc2641b4e547a95d25882b01a108abd8987df6e3c9af5d83d710e13cc974174867c0298573c93b4e0f1b2233d9bab650a7c2ef3cbb73a5e842 languageName: node linkType: hard @@ -10643,6 +10644,13 @@ __metadata: languageName: node linkType: hard +"meshoptimizer@npm:~0.18.1": + version: 0.18.1 + resolution: "meshoptimizer@npm:0.18.1" + checksum: 101dbed8abd4cf167cdb7a0bc13db90dd0743332c689e43b18cc5254d238f0766750752432401fa63dc7e9e32399ef68daacf48f0d89db1484042c1761c7362d + languageName: node + linkType: hard + "methods@npm:~1.1.2": version: 1.1.2 resolution: "methods@npm:1.1.2" @@ -13700,10 +13708,10 @@ __metadata: languageName: node linkType: hard -"three@npm:0.152.2": - version: 0.152.2 - resolution: "three@npm:0.152.2" - checksum: 6d2d990dbff60b99c7e58b7f1446bb4bd235c7db5dd848a671385e01ae5c72bec865265be7f5a82907ecc96186acc13177d7de1252bc9592f5c9ebaffd1da1e7 +"three@npm:0.154.0": + version: 0.154.0 + resolution: "three@npm:0.154.0" + checksum: 90ad3cafef8b866641366977ab7189d56f7352c6cdc014cbab946544e42782ec4ea7e56b959b43590433a0fcdc4bd8f8029b18a75074ba10005182c5a73bcc88 languageName: node linkType: hard @@ -14382,9 +14390,9 @@ __metadata: languageName: node linkType: hard -"webpack@npm:5.88.1": - version: 5.88.1 - resolution: "webpack@npm:5.88.1" +"webpack@npm:5.88.2": + version: 5.88.2 + resolution: "webpack@npm:5.88.2" dependencies: "@types/eslint-scope": ^3.7.3 "@types/estree": ^1.0.0 @@ -14415,7 +14423,7 @@ __metadata: optional: true bin: webpack: bin/webpack.js - checksum: 726e7e05ab2e7c142609a673dd6aa1a711ed97f349418a2a393d650c5ddad172d191257f60e1e37f6b2a77261571c202aabd5ce9240791a686774f0801cf5ec2 + checksum: 79476a782da31a21f6dd38fbbd06b68da93baf6a62f0d08ca99222367f3b8668f5a1f2086b7bb78e23172e31fa6df6fa7ab09b25e827866c4fc4dc2b30443ce2 languageName: node linkType: hard diff --git a/viewer/package.json b/viewer/package.json index ef171fe7066..c29a37a7e80 100644 --- a/viewer/package.json +++ b/viewer/package.json @@ -94,7 +94,7 @@ "@types/random-seed": "0.3.3", "@types/skmeans": "0.11.4", "@types/stats": "0.16.30", - "@types/three": "0.152.1", + "@types/three": "0.154.0", "@types/tween.js": "18.5.1", "@typescript-eslint/eslint-plugin": "5.60.0", "@typescript-eslint/parser": "5.60.0", @@ -131,13 +131,13 @@ "resize-observer-polyfill": "1.5.1", "shx": "0.3.4", "stats.js": "0.17.0", - "three": "0.152.2", + "three": "0.154.0", "ts-jest": "29.1.1", "ts-loader": "9.4.3", "tsc-alias": "1.8.7", "typescript": "5.1.6", "wasm-pack": "0.12.1", - "webpack": "5.88.1", + "webpack": "5.88.2", "webpack-cli": "5.1.4", "webpack-dev-server": "4.15.1", "webpack-node-externals": "3.0.0", @@ -146,7 +146,7 @@ }, "peerDependencies": { "@cognite/sdk": "^7.16.0 || ^8.0.0", - "three": "0.152.2" + "three": "0.154.0" }, "glslify": { "transform": [ diff --git a/viewer/packages/pointclouds/src/potree-three-loader/loading/EptBinaryLoader.ts b/viewer/packages/pointclouds/src/potree-three-loader/loading/EptBinaryLoader.ts index c9b6718bbb7..ee97710fd9f 100644 --- a/viewer/packages/pointclouds/src/potree-three-loader/loading/EptBinaryLoader.ts +++ b/viewer/packages/pointclouds/src/potree-three-loader/loading/EptBinaryLoader.ts @@ -117,8 +117,8 @@ function createTightBoundingBox(data: ParsedEptData): THREE.Box3 { function createGeometryFromEptData(data: ParsedEptData): THREE.BufferGeometry { const geometry = new THREE.BufferGeometry(); - function addAttributeIfPresent>( - typedArrayConstructor: { new (data: ArrayBuffer): TypedArray }, + function addAttributeIfPresent( + typedArrayConstructor: { new (data: ArrayBuffer): THREE.TypedArray }, name: string, componentCount: number, data?: ArrayBuffer | undefined, @@ -130,12 +130,12 @@ function createGeometryFromEptData(data: ParsedEptData): THREE.BufferGeometry { } } - addAttributeIfPresent(Float32Array, 'position', 3, data.position); - addAttributeIfPresent(Uint8Array, 'indices', 4, data.indices); - addAttributeIfPresent(Uint8Array, 'color', 4, data.color, true); - addAttributeIfPresent(Float32Array, 'intensity', 1, data.intensity); - addAttributeIfPresent(Uint8Array, 'classification', 1, data.classification); - addAttributeIfPresent(Uint16Array, 'objectId', 1, data.objectId); + addAttributeIfPresent(Float32Array, 'position', 3, data.position); + addAttributeIfPresent(Uint8Array, 'indices', 4, data.indices); + addAttributeIfPresent(Uint8Array, 'color', 4, data.color, true); + addAttributeIfPresent(Float32Array, 'intensity', 1, data.intensity); + addAttributeIfPresent(Uint8Array, 'classification', 1, data.classification); + addAttributeIfPresent(Uint16Array, 'objectId', 1, data.objectId); (geometry.attributes.indices as THREE.BufferAttribute).normalized = true; diff --git a/viewer/packages/sector-parser/src/GltfSectorParser.ts b/viewer/packages/sector-parser/src/GltfSectorParser.ts index 72638124538..68bdad49df8 100644 --- a/viewer/packages/sector-parser/src/GltfSectorParser.ts +++ b/viewer/packages/sector-parser/src/GltfSectorParser.ts @@ -351,7 +351,7 @@ export class GltfSectorParser { stride: number, transformAttributeName: (attributeName: string) => string, bufferGeometry: THREE.BufferGeometry | THREE.InstancedBufferGeometry, - bufferType: { new (array: ArrayLike, stride: number): T } + bufferType: { new (array: THREE.TypedArray, stride: number): T } ) { const componentTypes = Object.values(attributes).map(accessorId => json.accessors[accessorId].componentType); @@ -408,7 +408,7 @@ export class GltfSectorParser { byteOffset: number, byteLength: number, byteStride: number, - bufferType: new (array: ArrayLike, stride: number) => T + bufferType: new (array: THREE.TypedArray, stride: number) => T ) { const typedArrays = [...new Set(componentTypes)].map(componentType => { const TypedArray = DATA_TYPE_BYTE_SIZES.get(componentType)!; diff --git a/viewer/yarn.lock b/viewer/yarn.lock index 216a03ddac7..0ac56e0439a 100644 --- a/viewer/yarn.lock +++ b/viewer/yarn.lock @@ -763,7 +763,7 @@ __metadata: "@types/random-seed": 0.3.3 "@types/skmeans": 0.11.4 "@types/stats": 0.16.30 - "@types/three": 0.152.1 + "@types/three": 0.154.0 "@types/tween.js": 18.5.1 "@typescript-eslint/eslint-plugin": 5.60.0 "@typescript-eslint/parser": 5.60.0 @@ -812,13 +812,13 @@ __metadata: skmeans: 0.11.3 sparse-octree: 7.1.8 stats.js: 0.17.0 - three: 0.152.2 + three: 0.154.0 ts-jest: 29.1.1 ts-loader: 9.4.3 tsc-alias: 1.8.7 typescript: 5.1.6 wasm-pack: 0.12.1 - webpack: 5.88.1 + webpack: 5.88.2 webpack-cli: 5.1.4 webpack-dev-server: 4.15.1 webpack-node-externals: 3.0.0 @@ -826,7 +826,7 @@ __metadata: workerize-loader: 2.0.2 peerDependencies: "@cognite/sdk": ^7.16.0 || ^8.0.0 - three: 0.152.2 + three: 0.154.0 languageName: unknown linkType: soft @@ -2482,16 +2482,17 @@ __metadata: languageName: node linkType: hard -"@types/three@npm:0.152.1": - version: 0.152.1 - resolution: "@types/three@npm:0.152.1" +"@types/three@npm:0.154.0": + version: 0.154.0 + resolution: "@types/three@npm:0.154.0" dependencies: "@tweenjs/tween.js": ~18.6.4 "@types/stats.js": "*" "@types/webxr": "*" fflate: ~0.6.9 lil-gui: ~0.17.0 - checksum: 25388e5c65414d4dd586ff0ec1615418838ceba293918b66755c08e263975db7913fc75dbe26b3342ba00ea0bc09af7428668194612bbd6ef7dd6cef3e4d4758 + meshoptimizer: ~0.18.1 + checksum: 623067f84e342afc2641b4e547a95d25882b01a108abd8987df6e3c9af5d83d710e13cc974174867c0298573c93b4e0f1b2233d9bab650a7c2ef3cbb73a5e842 languageName: node linkType: hard @@ -8423,6 +8424,13 @@ __metadata: languageName: node linkType: hard +"meshoptimizer@npm:~0.18.1": + version: 0.18.1 + resolution: "meshoptimizer@npm:0.18.1" + checksum: 101dbed8abd4cf167cdb7a0bc13db90dd0743332c689e43b18cc5254d238f0766750752432401fa63dc7e9e32399ef68daacf48f0d89db1484042c1761c7362d + languageName: node + linkType: hard + "methods@npm:~1.1.2": version: 1.1.2 resolution: "methods@npm:1.1.2" @@ -11301,10 +11309,10 @@ resolve@~1.19.0: languageName: node linkType: hard -"three@npm:0.152.2": - version: 0.152.2 - resolution: "three@npm:0.152.2" - checksum: 6d2d990dbff60b99c7e58b7f1446bb4bd235c7db5dd848a671385e01ae5c72bec865265be7f5a82907ecc96186acc13177d7de1252bc9592f5c9ebaffd1da1e7 +"three@npm:0.154.0": + version: 0.154.0 + resolution: "three@npm:0.154.0" + checksum: 90ad3cafef8b866641366977ab7189d56f7352c6cdc014cbab946544e42782ec4ea7e56b959b43590433a0fcdc4bd8f8029b18a75074ba10005182c5a73bcc88 languageName: node linkType: hard @@ -12053,9 +12061,9 @@ typescript@~4.8.4: languageName: node linkType: hard -"webpack@npm:5.88.1": - version: 5.88.1 - resolution: "webpack@npm:5.88.1" +"webpack@npm:5.88.2": + version: 5.88.2 + resolution: "webpack@npm:5.88.2" dependencies: "@types/eslint-scope": ^3.7.3 "@types/estree": ^1.0.0 @@ -12086,7 +12094,7 @@ typescript@~4.8.4: optional: true bin: webpack: bin/webpack.js - checksum: 726e7e05ab2e7c142609a673dd6aa1a711ed97f349418a2a393d650c5ddad172d191257f60e1e37f6b2a77261571c202aabd5ce9240791a686774f0801cf5ec2 + checksum: 79476a782da31a21f6dd38fbbd06b68da93baf6a62f0d08ca99222367f3b8668f5a1f2086b7bb78e23172e31fa6df6fa7ab09b25e827866c4fc4dc2b30443ce2 languageName: node linkType: hard