diff --git a/package-lock.json b/package-lock.json index cc8d7e6..e6a6a71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,7 +51,6 @@ "terser-webpack-plugin": "^5.3.7", "typescript": "^5.0.4", "vite-plugin-checker": "^0.5.6", - "vite-plugin-conditional-compiler": "^0.1.1", "vue-tsc": "^1.2.0" } }, @@ -5308,27 +5307,6 @@ "node": ">=14.14" } }, - "node_modules/vite-plugin-conditional-compiler": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/vite-plugin-conditional-compiler/-/vite-plugin-conditional-compiler-0.1.1.tgz", - "integrity": "sha512-1QKTJ9/kWuqwWxtIEhtxENUQlfRfgjDyeAtic91ArQFjzI71necB7Sp9F5IGR/L1zIQXkkXBvidLLJkTJcp/OQ==", - "dev": true, - "dependencies": { - "magic-string": "^0.30.0" - } - }, - "node_modules/vite-plugin-conditional-compiler/node_modules/magic-string": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz", - "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==", - "dev": true, - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.13" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/vscode-jsonrpc": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz", @@ -9136,26 +9114,6 @@ } } }, - "vite-plugin-conditional-compiler": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/vite-plugin-conditional-compiler/-/vite-plugin-conditional-compiler-0.1.1.tgz", - "integrity": "sha512-1QKTJ9/kWuqwWxtIEhtxENUQlfRfgjDyeAtic91ArQFjzI71necB7Sp9F5IGR/L1zIQXkkXBvidLLJkTJcp/OQ==", - "dev": true, - "requires": { - "magic-string": "^0.30.0" - }, - "dependencies": { - "magic-string": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz", - "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==", - "dev": true, - "requires": { - "@jridgewell/sourcemap-codec": "^1.4.13" - } - } - } - }, "vscode-jsonrpc": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz", diff --git a/package.json b/package.json index 50003fc..4b58a84 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "terser-webpack-plugin": "^5.3.7", "typescript": "^5.0.4", "vite-plugin-checker": "^0.5.6", - "vite-plugin-conditional-compiler": "^0.1.1", "vue-tsc": "^1.2.0" }, "dependencies": { diff --git a/src/vm/worker.ts b/src/vm/worker.ts index 9c6497a..c3375b3 100644 --- a/src/vm/worker.ts +++ b/src/vm/worker.ts @@ -1,12 +1,7 @@ import wasmUrl from "../lib/v86.wasm?url"; -//import isoUrl from "val-loader!../../fetchIso.js?raw"; -let prodIsoUrl: string | undefined; -// #v-ifdef DEV import isoUrl from "../../../buildroot/output/images/rootfs.iso9660?url"; -// #v-else -prodIsoUrl = import.meta.env.VITE_ISO_URL; -// #v-endif +let overrideIsoUrl: string | undefined = import.meta.env.VITE_ISO_URL; self.importScripts = () => {}; @@ -133,7 +128,7 @@ const emulator = new V86Starter({ url: "https://raw.githubusercontent.com/copy/v86/master/bios/vgabios.bin", }, cdrom: { - url: prodIsoUrl ?? isoUrl, + url: overrideIsoUrl ?? isoUrl, }, hda: null, hdb: null, diff --git a/vite.config.js b/vite.config.js index 2fde79f..d6f74a0 100644 --- a/vite.config.js +++ b/vite.config.js @@ -2,13 +2,11 @@ import path from "path"; import vue from "@vitejs/plugin-vue"; import checker from "vite-plugin-checker"; -import ConditionalCompile from "vite-plugin-conditional-compiler"; /** @type {import("vite").UserConfig} */ const config = { root: "./src", plugins: [ - ConditionalCompile(), vue(), checker({ typescript: true,