try to fix resource path

ACFUN-FOSS · Aug 15, 2023 · facfc7e · facfc7e
1 parent 18846cb
commit facfc7e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/neotool/src-tauri/Cargo.toml b/packages/neotool/src-tauri/Cargo.toml
@@ -15,7 +15,7 @@ tauri-build = { version = "1.4.0", features = [] }
 [dependencies]
 serde.workspace = true
 serde_json.workspace = true
-tauri = { version = "1.4.1", features = [ "protocol-asset", "devtools", "fs-all", "path-all"] }
+tauri = { version = "1.4.1", features = [ "devtools", "fs-all", "linux-protocol-headers", "path-all", "protocol-asset"] }
 tauri-plugin-acfunlive-neotool-base = { version = "0.1.0", path = "../../../plugins/tauri-plugin-acfunlive-neotool-base" }
 tauri-plugin-acfunlive-neotool-keyboard = { version = "0.1.0", path = "../../../plugins/tauri-plugin-acfunlive-neotool-keyboard" }
 tauri-plugin-websocket = { git = "https://github.com/orzogc/plugins-workspace.git", branch = "ac-live-fix" }

diff --git a/packages/neotool/src/lib/scripts/load.ts b/packages/neotool/src/lib/scripts/load.ts
@@ -1,4 +1,5 @@
 import type { AppShared } from '@acfunlive-neotool/shared';
+import { convertFileSrc } from "@tauri-apps/api/tauri";
 import { BaseDirectory, createDir, exists, readTextFile, writeTextFile } from '@tauri-apps/api/fs';
 import { join } from '@tauri-apps/api/path';
 import {
@@ -44,9 +45,9 @@ export async function loadApp(
   cssPath?: string
 ): Promise<void> {
   if (cssPath) {
-    await import(cssPath);
+    await import(convertFileSrc(cssPath));
   }
-  const module = await import(jsPath);
+  const module = await import(convertFileSrc(jsPath));
   const component = module.default;
 
   new component({