From cfd7bc366e6d8f275300e1ab3877a72a3802c6af Mon Sep 17 00:00:00 2001 From: Uriel Date: Tue, 9 Apr 2024 17:20:09 -0300 Subject: [PATCH] Revert packages that are broken (#980) --- gui/package.json | 8 +-- pnpm-lock.yaml | 151 ++++++++++++++++++++++++++++------------------- 2 files changed, 93 insertions(+), 66 deletions(-) diff --git a/gui/package.json b/gui/package.json index ec6ce48161..44e97fde81 100644 --- a/gui/package.json +++ b/gui/package.json @@ -6,9 +6,9 @@ "@fluent/bundle": "^0.18.0", "@fluent/react": "^0.15.2", "@fontsource/poppins": "^5.0.12", - "@formatjs/intl-localematcher": "^0.5.4", - "@react-three/drei": "^9.97.0", - "@react-three/fiber": "^8.15.16", + "@formatjs/intl-localematcher": "^0.2.32", + "@react-three/drei": "^9.105.1", + "@react-three/fiber": "^8.16.1", "@tauri-apps/api": "=2.0.0-beta.7", "@tauri-apps/plugin-dialog": "=2.0.0-beta.2", "@tauri-apps/plugin-fs": "=2.0.0-beta.2", @@ -39,7 +39,7 @@ "react-router-dom": "^6.22.3", "semver": "^7.6.0", "solarxr-protocol": "file:../solarxr-protocol", - "three": "^0.161.0", + "three": "^0.163.0", "ts-pattern": "^5.0.8", "typescript": "^5.4.3" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cb6ad2c1bc..a34e55d2d8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27,14 +27,14 @@ importers: specifier: ^5.0.12 version: 5.0.12 '@formatjs/intl-localematcher': - specifier: ^0.5.4 - version: 0.5.4 + specifier: ^0.2.32 + version: 0.2.32 '@react-three/drei': - specifier: ^9.97.0 - version: 9.97.6(@react-three/fiber@8.15.16)(@types/react@18.2.73)(@types/three@0.163.0)(react-dom@18.2.0)(react@18.2.0)(three@0.161.0) + specifier: ^9.105.1 + version: 9.105.1(@react-three/fiber@8.16.1)(@types/react@18.2.73)(@types/three@0.163.0)(react-dom@18.2.0)(react@18.2.0)(three@0.163.0) '@react-three/fiber': - specifier: ^8.15.16 - version: 8.15.16(react-dom@18.2.0)(react@18.2.0)(three@0.161.0) + specifier: ^8.16.1 + version: 8.16.1(react-dom@18.2.0)(react@18.2.0)(three@0.163.0) '@tauri-apps/api': specifier: '=2.0.0-beta.7' version: 2.0.0-beta.7 @@ -126,8 +126,8 @@ importers: specifier: file:../solarxr-protocol version: file:solarxr-protocol three: - specifier: ^0.161.0 - version: 0.161.0 + specifier: ^0.163.0 + version: 0.163.0 ts-pattern: specifier: ^5.0.8 version: 5.0.8 @@ -2594,8 +2594,8 @@ packages: resolution: {integrity: sha512-0qzBxtIJLh82iMJ9pCXKYwGs1zyS+jyUmwVJ59+JdYnEaFVkDsxVOk9yDWfVOs14ALUneodU2m5YSGma6dCYCw==} dev: false - /@formatjs/intl-localematcher@0.5.4: - resolution: {integrity: sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==} + /@formatjs/intl-localematcher@0.2.32: + resolution: {integrity: sha512-k/MEBstff4sttohyEpXxCmC3MqbUn9VvHGlZ8fauLzkbwXmVrEeyzS+4uhrvAk9DWU9/7otYWxyDox4nT/KVLQ==} dependencies: tslib: 2.6.2 dev: false @@ -2702,6 +2702,15 @@ packages: yargs: 16.2.0 dev: true + /@monogrid/gainmap-js@3.0.5(three@0.163.0): + resolution: {integrity: sha512-53sCTG4FaJBaAq/tcufARtVYDMDGqyBT9i7F453pWGhZ5LqubDHDWtYoHo9VhQqMcHTEexdJqSsR58y+9HVmQA==} + peerDependencies: + three: '>= 0.159.0' + dependencies: + promise-worker-transferable: 1.0.4 + three: 0.163.0 + dev: false + /@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1: resolution: {integrity: sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==} dependencies: @@ -2769,7 +2778,7 @@ packages: react: 18.2.0 dev: false - /@react-spring/three@9.6.1(@react-three/fiber@8.15.16)(react@18.2.0)(three@0.161.0): + /@react-spring/three@9.6.1(@react-three/fiber@8.16.1)(react@18.2.0)(three@0.163.0): resolution: {integrity: sha512-Tyw2YhZPKJAX3t2FcqvpLRb71CyTe1GvT3V+i+xJzfALgpk10uPGdGaQQ5Xrzmok1340DAeg2pR/MCfaW7b8AA==} peerDependencies: '@react-three/fiber': '>=6.0' @@ -2780,17 +2789,17 @@ packages: '@react-spring/core': 9.6.1(react@18.2.0) '@react-spring/shared': 9.6.1(react@18.2.0) '@react-spring/types': 9.6.1 - '@react-three/fiber': 8.15.16(react-dom@18.2.0)(react@18.2.0)(three@0.161.0) + '@react-three/fiber': 8.16.1(react-dom@18.2.0)(react@18.2.0)(three@0.163.0) react: 18.2.0 - three: 0.161.0 + three: 0.163.0 dev: false /@react-spring/types@9.6.1: resolution: {integrity: sha512-POu8Mk0hIU3lRXB3bGIGe4VHIwwDsQyoD1F394OK7STTiX9w4dG3cTLljjYswkQN+hDSHRrj4O36kuVa7KPU8Q==} dev: false - /@react-three/drei@9.97.6(@react-three/fiber@8.15.16)(@types/react@18.2.73)(@types/three@0.163.0)(react-dom@18.2.0)(react@18.2.0)(three@0.161.0): - resolution: {integrity: sha512-8Vdle+YklXTBEFNOaKlF0zgiQDvIZNU/OSKT2FPUmrFQiMrUFGaKXcYg7xUkOUq1ajqFscKOUETLnOD0yKCHhg==} + /@react-three/drei@9.105.1(@react-three/fiber@8.16.1)(@types/react@18.2.73)(@types/three@0.163.0)(react-dom@18.2.0)(react@18.2.0)(three@0.163.0): + resolution: {integrity: sha512-yDplhbP8MOGIJmYpBqSzgQ1oZ2e3J6172Q95M69PT37jLcpTQKrVDAlMktoGdAlqSV+924XVr75ZYaHDP0Zhfw==} peerDependencies: '@react-three/fiber': '>=8.0' react: '>=18.0' @@ -2800,28 +2809,29 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.24.1 '@mediapipe/tasks-vision': 0.10.8 - '@react-spring/three': 9.6.1(@react-three/fiber@8.15.16)(react@18.2.0)(three@0.161.0) - '@react-three/fiber': 8.15.16(react-dom@18.2.0)(react@18.2.0)(three@0.161.0) + '@monogrid/gainmap-js': 3.0.5(three@0.163.0) + '@react-spring/three': 9.6.1(@react-three/fiber@8.16.1)(react@18.2.0)(three@0.163.0) + '@react-three/fiber': 8.16.1(react-dom@18.2.0)(react@18.2.0)(three@0.163.0) '@use-gesture/react': 10.2.27(react@18.2.0) - camera-controls: 2.7.0(three@0.161.0) + camera-controls: 2.7.0(three@0.163.0) cross-env: 7.0.3 detect-gpu: 5.0.36 glsl-noise: 0.0.0 - maath: 0.10.7(@types/three@0.163.0)(three@0.161.0) - meshline: 3.1.6(three@0.161.0) + hls.js: 1.3.5 + maath: 0.10.7(@types/three@0.163.0)(three@0.163.0) + meshline: 3.1.6(three@0.163.0) react: 18.2.0 react-composer: 5.0.3(react@18.2.0) react-dom: 18.2.0(react@18.2.0) - react-merge-refs: 1.1.0 stats-gl: 2.0.1 stats.js: 0.17.0 suspend-react: 0.1.3(react@18.2.0) - three: 0.161.0 - three-mesh-bvh: 0.7.2(three@0.161.0) - three-stdlib: 2.29.4(three@0.161.0) - troika-three-text: 0.47.2(three@0.161.0) + three: 0.163.0 + three-mesh-bvh: 0.7.2(three@0.163.0) + three-stdlib: 2.29.4(three@0.163.0) + troika-three-text: 0.49.0(three@0.163.0) tunnel-rat: 0.1.2(@types/react@18.2.73)(react@18.2.0) utility-types: 3.10.0 uuid: 9.0.1 @@ -2832,8 +2842,8 @@ packages: - immer dev: false - /@react-three/fiber@8.15.16(react-dom@18.2.0)(react@18.2.0)(three@0.161.0): - resolution: {integrity: sha512-4f47K9e2mP8W/guNtu3e2J/Nt6GwKTsX/YP2dktPZRcpHYEsqfXCO8kSfvVMb+lQ8wR0HoFzggqdnGuhZaui0g==} + /@react-three/fiber@8.16.1(react-dom@18.2.0)(react@18.2.0)(three@0.163.0): + resolution: {integrity: sha512-Rgjn+xcR+6Do2Ic4b6RROIvCGs3RhoVJEamfmtMSfkgIRH3PeiPdqRxcfJlO9y6KDvYA5fIUGruz9h/sTeLlpw==} peerDependencies: expo: '>=43.0' expo-asset: '>=8.4' @@ -2857,9 +2867,9 @@ packages: react-native: optional: true dependencies: - '@babel/runtime': 7.23.1 + '@babel/runtime': 7.24.1 '@types/react-reconciler': 0.26.7 - '@types/webxr': 0.5.5 + '@types/webxr': 0.5.14 base64-js: 1.5.1 buffer: 6.0.3 its-fine: 1.1.1(react@18.2.0) @@ -2869,7 +2879,7 @@ packages: react-use-measure: 2.1.1(react-dom@18.2.0)(react@18.2.0) scheduler: 0.21.0 suspend-react: 0.1.3(react@18.2.0) - three: 0.161.0 + three: 0.163.0 zustand: 3.7.2(react@18.2.0) dev: false @@ -3281,10 +3291,6 @@ packages: /@types/webxr@0.5.14: resolution: {integrity: sha512-UEMMm/Xn3DtEa+gpzUrOcDj+SJS1tk5YodjwOxcqStNhCfPcwgyC5Srg2ToVKyg2Fhq16Ffpb0UWUQHqoT9AMA==} - /@types/webxr@0.5.5: - resolution: {integrity: sha512-HVOsSRTQYx3zpVl0c0FBmmmcY/60BkQLzVnpE9M1aG4f2Z0aKlBWfj4XZ2zr++XNBfkQWYcwhGlmuu44RJPDqg==} - dev: false - /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.57.0)(typescript@5.4.3): resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -4144,12 +4150,12 @@ packages: engines: {node: '>= 6'} dev: true - /camera-controls@2.7.0(three@0.161.0): + /camera-controls@2.7.0(three@0.163.0): resolution: {integrity: sha512-HONMoMYHieOCQOoweS639bdWHP/P/fvVGR08imnECGVUp04mqGfsX/zp1ZufLeiAA5hA6i1JhP6SrnOwh01C0w==} peerDependencies: three: '>=0.126.1' dependencies: - three: 0.161.0 + three: 0.163.0 dev: false /caniuse-lite@1.0.30001600: @@ -5808,6 +5814,10 @@ packages: dependencies: function-bind: 1.1.2 + /hls.js@1.3.5: + resolution: {integrity: sha512-uybAvKS6uDe0MnWNEPnO0krWVr+8m2R0hJ/viql8H3MVK+itq8gGQuIYoFHL3rECkIpNH98Lw8YuuWMKZxp3Ew==} + dev: false + /human-signals@1.1.1: resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==} engines: {node: '>=8.12.0'} @@ -5848,6 +5858,10 @@ packages: resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==} engines: {node: '>= 4'} + /immediate@3.0.6: + resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==} + dev: false + /immer@9.0.21: resolution: {integrity: sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==} dev: false @@ -6037,6 +6051,10 @@ packages: resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} engines: {node: '>=8'} + /is-promise@2.2.2: + resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==} + dev: false + /is-regex@1.1.4: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} @@ -6260,6 +6278,12 @@ packages: prelude-ls: 1.2.1 type-check: 0.4.0 + /lie@3.3.0: + resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==} + dependencies: + immediate: 3.0.6 + dev: false + /lilconfig@2.1.0: resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} engines: {node: '>=10'} @@ -6376,14 +6400,14 @@ packages: dependencies: yallist: 4.0.0 - /maath@0.10.7(@types/three@0.163.0)(three@0.161.0): + /maath@0.10.7(@types/three@0.163.0)(three@0.163.0): resolution: {integrity: sha512-zQ2xd7dNOIVTjAS+hj22fyj1EFYmOJX6tzKjZ92r6WDoq8hyFxjuGA2q950tmR4iC/EKXoMQdSipkaJVuUHDTg==} peerDependencies: '@types/three': '>=0.144.0' three: '>=0.144.0' dependencies: '@types/three': 0.163.0 - three: 0.161.0 + three: 0.163.0 dev: false /make-error@1.3.6: @@ -6410,12 +6434,12 @@ packages: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} - /meshline@3.1.6(three@0.161.0): + /meshline@3.1.6(three@0.163.0): resolution: {integrity: sha512-8JZJOdaL5oz3PI/upG8JvP/5FfzYUOhrkJ8np/WKvXzl0/PZ2V9pqTvCIjSKv+w9ccg2xb+yyBhXAwt6ier3ug==} peerDependencies: three: '>=0.137' dependencies: - three: 0.161.0 + three: 0.163.0 dev: false /meshoptimizer@0.18.1: @@ -7292,6 +7316,13 @@ packages: tslib: 2.6.2 dev: true + /promise-worker-transferable@1.0.4: + resolution: {integrity: sha512-bN+0ehEnrXfxV2ZQvU2PetO0n4gqBD4ulq3MI1WOPLgr7/Mg9yRQkX5+0v1vagr74ZTsl7XtzlaYDo2EuCeYJw==} + dependencies: + is-promise: 2.2.2 + lie: 3.3.0 + dev: false + /prompts@2.4.2: resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==} engines: {node: '>= 6'} @@ -7433,10 +7464,6 @@ packages: resolution: {integrity: sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==} dev: false - /react-merge-refs@1.1.0: - resolution: {integrity: sha512-alTKsjEL0dKH/ru1Iyn7vliS2QRcBp9zZPGoWxUOvRGWPUYgjo+V01is7p04It6KhgrzhJGnIj9GgX8W4bZoCQ==} - dev: false - /react-modal@3.16.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==} engines: {node: '>=8'} @@ -8202,30 +8229,30 @@ packages: any-promise: 1.3.0 dev: true - /three-mesh-bvh@0.7.2(three@0.161.0): + /three-mesh-bvh@0.7.2(three@0.163.0): resolution: {integrity: sha512-HKRGZDKIUwwjL2mApYIAN8AYA5WAfFvc50PY8TL/9aGWzrRN1WLfPKAvTjv35F8PdPZzTmzHotCvIMFEN9FUSw==} peerDependencies: three: '>= 0.151.0' dependencies: - three: 0.161.0 + three: 0.163.0 dev: false - /three-stdlib@2.29.4(three@0.161.0): + /three-stdlib@2.29.4(three@0.163.0): resolution: {integrity: sha512-XNzGCrz/uAk9XoLwd35eN7dQyI4ggXZTeqjcN034YdYBpBlNO9kmLHehl/0Nw9jCelblB7jla+unHAOIyLyV6Q==} peerDependencies: three: '>=0.128.0' dependencies: '@types/draco3d': 1.4.2 '@types/offscreencanvas': 2019.7.0 - '@types/webxr': 0.5.5 + '@types/webxr': 0.5.14 draco3d: 1.5.6 fflate: 0.6.10 potpack: 1.0.2 - three: 0.161.0 + three: 0.163.0 dev: false - /three@0.161.0: - resolution: {integrity: sha512-LC28VFtjbOyEu5b93K0bNRLw1rQlMJ85lilKsYj6dgTu+7i17W+JCCEbvrpmNHF1F3NAUqDSWq50UD7w9H2xQw==} + /three@0.163.0: + resolution: {integrity: sha512-HlMgCb2TF/dTLRtknBnjUTsR8FsDqBY43itYop2+Zg822I+Kd0Ua2vs8CvfBVefXkBdNDrLMoRTGCIIpfCuDew==} dev: false /tinycolor2@1.6.0: @@ -8242,28 +8269,28 @@ packages: dependencies: is-number: 7.0.0 - /troika-three-text@0.47.2(three@0.161.0): - resolution: {integrity: sha512-qylT0F+U7xGs+/PEf3ujBdJMYWbn0Qci0kLqI5BJG2kW1wdg4T1XSxneypnF05DxFqJhEzuaOR9S2SjiyknMng==} + /troika-three-text@0.49.0(three@0.163.0): + resolution: {integrity: sha512-sn9BNC6eIX8OO3iAkPwjecJ7Pn21Ve8P1UNFMNeQzXx759rrqS4i4pSZs7FLMYdWyCKVXBFGimBySFwRKLjq/Q==} peerDependencies: three: '>=0.125.0' dependencies: bidi-js: 1.0.3 - three: 0.161.0 - troika-three-utils: 0.47.2(three@0.161.0) - troika-worker-utils: 0.47.2 + three: 0.163.0 + troika-three-utils: 0.49.0(three@0.163.0) + troika-worker-utils: 0.49.0 webgl-sdf-generator: 1.1.1 dev: false - /troika-three-utils@0.47.2(three@0.161.0): - resolution: {integrity: sha512-/28plhCxfKtH7MSxEGx8e3b/OXU5A0xlwl+Sbdp0H8FXUHKZDoksduEKmjQayXYtxAyuUiCRunYIv/8Vi7aiyg==} + /troika-three-utils@0.49.0(three@0.163.0): + resolution: {integrity: sha512-umitFL4cT+Fm/uONmaQEq4oZlyRHWwVClaS6ZrdcueRvwc2w+cpNQ47LlJKJswpqtMFWbEhOLy0TekmcPZOdYA==} peerDependencies: three: '>=0.125.0' dependencies: - three: 0.161.0 + three: 0.163.0 dev: false - /troika-worker-utils@0.47.2: - resolution: {integrity: sha512-mzss4MeyzUkYBppn4x5cdAqrhBHFEuVmMMgLMTyFV23x6GvQMyo+/R5E5Lsbrt7WSt5RfvewjcwD1DChRTA9lA==} + /troika-worker-utils@0.49.0: + resolution: {integrity: sha512-1xZHoJrG0HFfCvT/iyN41DvI/nRykiBtHqFkGaGgJwq5iXfIZFBiPPEHFpPpgyKM3Oo5ITHXP5wM2TNQszYdVg==} dev: false /ts-api-utils@1.3.0(typescript@5.4.3):