diff --git a/.gitignore b/.gitignore index b2604fb..b947c8b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ *.iml venv/ +__pycache__/ diff --git a/assets/licenses.txt b/assets/licenses.txt index 5cb4c46..ae191a4 100644 --- a/assets/licenses.txt +++ b/assets/licenses.txt @@ -1011,7 +1011,7 @@ third-party archives. The following npm package may be included in this product: - - typescript@5.8.3 + - typescript@5.9.2 This package contains the following license: diff --git a/frontend/misc/scene.ts b/frontend/misc/scene.ts index a2e1e65..cce7ae3 100644 --- a/frontend/misc/scene.ts +++ b/frontend/misc/scene.ts @@ -99,7 +99,7 @@ export class SceneMgr { let transform = (new Matrix4()).makeTranslation(bb.getCenter(new Vector3())); newAxes(helpersDoc, bb.getSize(new Vector3()).multiplyScalar(0.5), transform); newGridBox(helpersDoc, bb.getSize(new Vector3()), transform); - let helpersUrl = URL.createObjectURL(new Blob([await toBuffer(helpersDoc)])); + let helpersUrl = URL.createObjectURL(new Blob([await toBuffer(helpersDoc) as ArrayBufferView])); let newDocument = await SceneMgr.loadModel(sceneUrl, document, extrasNameValueHelpers, helpersUrl, false, reloadScene); URL.revokeObjectURL(helpersUrl); return newDocument; @@ -112,7 +112,7 @@ export class SceneMgr { // Serialize the document into a GLB and update the viewerSrc let buffer = await toBuffer(document); - let blob = new Blob([buffer], {type: 'model/gltf-binary'}); + let blob = new Blob([buffer as ArrayBufferView], {type: 'model/gltf-binary'}); console.debug("Showing current doc", document, "with", buffer.length, "total bytes"); if (sceneUrl.value.startsWith("blob:")) URL.revokeObjectURL(sceneUrl.value); sceneUrl.value = URL.createObjectURL(blob); diff --git a/frontend/tools/PlaygroundDialogContent.vue b/frontend/tools/PlaygroundDialogContent.vue index 51af656..720f47e 100644 --- a/frontend/tools/PlaygroundDialogContent.vue +++ b/frontend/tools/PlaygroundDialogContent.vue @@ -145,7 +145,7 @@ function onModelData(modelData: string) { // - Save for upload and share link feature builtModelsGlb[modelMetadata.name] = binaryData; // - Create a Blob from the binary data to be used as a URL - const blob = new Blob([binaryData], {type: 'model/gltf-binary'}); + const blob = new Blob([binaryData as ArrayBufferView], {type: 'model/gltf-binary'}); modelMetadata.url = URL.createObjectURL(blob); // Set the hacked URL in the model metadata XXX: revoked on App.vue } else { delete builtModelsGlb[modelMetadata.name]; // Remove from built models if it's a remove request diff --git a/frontend/tools/upload-file.ts b/frontend/tools/upload-file.ts index 754eb15..0c08a43 100644 --- a/frontend/tools/upload-file.ts +++ b/frontend/tools/upload-file.ts @@ -53,7 +53,7 @@ export async function uploadFile(name: string, data: Uint8Array): Promise], {type: 'application/octet-stream'}), name); formData.append("name", encrypt(lockerName)); formData.append("passkey", encrypt(lockerName)); const response = await fetch(uploadUrl, { diff --git a/package.json b/package.json index fa618cf..2bc1fa6 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "generate-license-file": "^4.0.0", "npm-run-all2": "^8.0.0", "terser": "^5.36.0", - "typescript": "~5.8.0", + "typescript": "^5.9.2", "vite": "^7.0.0", "vite-plugin-static-copy": "^3.1.1", "vue-tsc": "^3.0.0" diff --git a/yarn.lock b/yarn.lock index c195e1a..d047e8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3014,10 +3014,10 @@ tuf-js@^3.0.1: debug "^4.4.1" make-fetch-happen "^14.0.3" -typescript@~5.8.0: - version "5.8.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.3.tgz#92f8a3e5e3cf497356f4178c34cd65a7f5e8440e" - integrity sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ== +typescript@^5.9.2: + version "5.9.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.2.tgz#d93450cddec5154a2d5cabe3b8102b83316fb2a6" + integrity sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A== undici-types@~6.21.0: version "6.21.0"