Move models out of assets

Assets is a Vite managed folder - the model files are not hashed so not safe to cache unlike everything else Not easy to convert to be imported as one file references the other. There's probably a Vite plugin that could do the job but one for another time.
microbit-foundation · Dec 6, 2023 · e7ccac7 · e7ccac7
1 parent cae6018
commit e7ccac7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/public/assets/models/license.txt → public/models/license.txt b/public/assets/models/license.txt → public/models/license.txt
diff --git a/public/assets/models/microbit.bin → public/models/microbit.bin b/public/assets/models/microbit.bin → public/models/microbit.bin
diff --git a/public/assets/models/microbit.gltf → public/models/microbit.gltf b/public/assets/models/microbit.gltf → public/models/microbit.gltf
diff --git a/src/components/3d-inspector/View3DUtility.ts b/src/components/3d-inspector/View3DUtility.ts
@@ -123,7 +123,12 @@ class Live3DUtility {
         resolve(group);
       };
 
-      this.loader.load('/assets/models/microbit.gltf', onFinished, onProgress, reject);
+      this.loader.load(
+        `${import.meta.env.BASE_URL}/models/microbit.gltf`,
+        onFinished,
+        onProgress,
+        reject,
+      );
     });
   }
 }

diff --git a/tsconfig.json b/tsconfig.json
@@ -18,7 +18,7 @@
     "src/setup_tests.ts"
   ],
   "compilerOptions": {
-    "module": "ES6",
+    "module": "esnext",
     "lib": [
       "DOM",
       "ES6",