diff --git a/package.json b/package.json index 388dea432..ff5496985 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "test": "yarn workspace jan test:e2e", "test-local": "yarn lint && yarn build:test && yarn test", "copy:assets": "cpx \"pre-install/*.tgz\" \"electron/pre-install/\" && cpx \"themes/**\" \"electron/themes\"", + "copy:assets:tauri": "cpx \"pre-install/*.tgz\" \"src-tauri/resources/pre-install/\" && cpx \"themes/**\" \"src-tauri/resources/themes\"", "dev:electron": "yarn copy:assets && yarn workspace jan dev", "dev:web:standalone": "concurrently \"yarn workspace @janhq/web dev\" \"wait-on http://localhost:3000 && rsync -av --prune-empty-dirs --include '*/' --include 'dist/***' --include 'package.json' --include 'tsconfig.json' --exclude '*' ./extensions/ web/.next/static/extensions/\"", "dev:web": "yarn workspace @janhq/web dev", @@ -26,7 +27,7 @@ "install:cortex:linux:darwin": "cd src-tauri/binaries && ./download.sh", "install:cortex:win32": "cd src-tauri/binaries && download.bat", "install:cortex": "run-script-os", - "dev:tauri": "tauri dev", + "dev:tauri": "yarn copy:assets:tauri && tauri dev", "build:server": "cd server && yarn build", "build:core": "cd core && yarn build && yarn pack", "build:web": "yarn workspace @janhq/web build && cpx \"web/out/**\" \"electron/renderer/\"", diff --git a/src-tauri/src/core/setup.rs b/src-tauri/src/core/setup.rs index d6ee48530..7411a286c 100644 --- a/src-tauri/src/core/setup.rs +++ b/src-tauri/src/core/setup.rs @@ -39,7 +39,7 @@ pub fn install_extensions(app: tauri::AppHandle, force: bool) -> Result<(), Stri } } let extensions_path = get_jan_extensions_path(app.clone()); - let pre_install_path = PathBuf::from("./../pre-install"); + let pre_install_path = PathBuf::from("./resources/pre-install"); // Attempt to remove extensions folder if extensions_path.exists() { diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 69e17f3e8..d59949f8b 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -52,7 +52,8 @@ ], "resources": [ "binaries/engines/**/*", - "resources/themes/**/*" + "resources/themes/**/*", + "resources/pre-install/**/*" ], "externalBin": ["binaries/cortex-server"] }