Merge branch 'main' into feature/undo-redo

frontend/apps/editor3d/package.json

@@ -21,7 +21,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@storyteller/api": "workspace:*",
+    "@storyteller/api": "file:../../libs/api",
     "@awesome.me/kit-fde2be5eb0": "^1.0.7",
     "@fortawesome/fontawesome-svg-core": "^6.5.1",
     "@fortawesome/free-brands-svg-icons": "^6.5.2",
@@ -45,14 +45,12 @@
     "@zip.js/zip.js": "^2.7.51",
     "ammo.js": "^0.0.10",
     "ccapture.js": "github:aceslowman/ccapture.js#npm-fix",
-    "common": "file:common",
     "csstype": "^3.1.3",
     "dayjs": "^1.11.10",
     "deep-equal": "^2.2.3",
     "detect-gpu": "^5.0.38",
     "http-proxy-middleware": "^3.0.0",
     "isbot": "^4.1.0",
-    "kalidokit": "file:./vendor/kalidokit",
     "lodash.debounce": "^4.0.8",
     "posthog-js": "^1.141.0",
     "react": "^18.2.0",

frontend/package-lock.json

@@ -15,6 +15,7 @@
       "dependencies": {
         "@preact/signals-react": "^3.0.1",
         "@remix-run/serve": "^2.15.0",
+        "pnpm": "^10.8.1",
         "react": "18.2.0",
         "react-dom": "18.2.0"
       },
@@ -1194,20 +1195,19 @@
         "@remix-run/react": "^2.8.1",
         "@remix-run/router": "^1.15.3",
         "@remix-run/serve": "^2.8.1",
+        "@storyteller/api": "file:../../libs/api",
         "@tweenjs/tween.js": "^18.6.4",
         "@types/lodash": "^4.17.6",
         "@types/react-virtualized": "^9.22.2",
         "@zip.js/zip.js": "^2.7.51",
         "ammo.js": "^0.0.10",
         "ccapture.js": "github:aceslowman/ccapture.js#npm-fix",
-        "common": "file:common",
         "csstype": "^3.1.3",
         "dayjs": "^1.11.10",
         "deep-equal": "^2.2.3",
         "detect-gpu": "^5.0.38",
         "http-proxy-middleware": "^3.0.0",
         "isbot": "^4.1.0",
-        "kalidokit": "file:./vendor/kalidokit",
         "lodash.debounce": "^4.0.8",
         "posthog-js": "^1.141.0",
         "react": "^18.2.0",
@@ -1275,7 +1275,9 @@
         "node": ">=18.0.0"
       }
     },
-    "apps/editor3d/common": {},
+    "apps/editor3d/common": {
+      "extraneous": true
+    },
     "apps/editor3d/node_modules/@esbuild/aix-ppc64": {
       "version": "0.21.5",
       "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
@@ -2011,7 +2013,9 @@
         }
       }
     },
-    "apps/editor3d/vendor/kalidokit": {},
+    "apps/editor3d/vendor/kalidokit": {
+      "extraneous": true
+    },
     "libs/api": {
       "name": "@storyteller/api",
       "version": "0.0.1"
@@ -14836,10 +14840,6 @@
         "node": ">= 10"
       }
     },
-    "node_modules/common": {
-      "resolved": "apps/editor3d/common",
-      "link": true
-    },
     "node_modules/compare-versions": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz",
@@ -20531,10 +20531,6 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/kalidokit": {
-      "resolved": "apps/editor3d/vendor/kalidokit",
-      "link": true
-    },
     "node_modules/keygrip": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz",
@@ -27429,6 +27425,22 @@
       "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==",
       "license": "MIT"
     },
+    "node_modules/pnpm": {
+      "version": "10.8.1",
+      "resolved": "https://registry.npmjs.org/pnpm/-/pnpm-10.8.1.tgz",
+      "integrity": "sha512-xQCIupmMZ7jKjJnfil4C/Sri4rKaryOP6qnhJCSNP0j5+22yQklJ/5Ac/7teDwzBrWrttgLNKUUHUdEcNQI2dw==",
+      "license": "MIT",
+      "bin": {
+        "pnpm": "bin/pnpm.cjs",
+        "pnpx": "bin/pnpx.cjs"
+      },
+      "engines": {
+        "node": ">=18.12"
+      },
+      "funding": {
+        "url": "https://opencollective.com/pnpm"
+      }
+    },
     "node_modules/polished": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/polished/-/polished-4.3.1.tgz",

frontend/package.json

@@ -7,6 +7,7 @@
   "dependencies": {
     "@preact/signals-react": "^3.0.1",
     "@remix-run/serve": "^2.15.0",
+    "pnpm": "^10.8.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },

frontend/pnpm-workspace.yaml

@@ -0,0 +1,4 @@
+packages:
+  - 'apps/*'
+  - 'libs/*'
+