From 3b2e305a0c05b5b823d2c463e7571f76d624ab0a Mon Sep 17 00:00:00 2001 From: jeasonnow Date: Sat, 10 Jun 2023 10:35:27 +0800 Subject: [PATCH] refactor: The injection process does not affect the logic of the development environment. --- bin/builders/common.ts | 9 +-------- src-tauri/src/app/window.rs | 3 +++ {bin => src-tauri/src}/inject/component.js | 0 {bin => src-tauri/src}/inject/event.js | 0 {bin => src-tauri/src}/inject/style.js | 0 5 files changed, 4 insertions(+), 8 deletions(-) rename {bin => src-tauri/src}/inject/component.js (100%) rename {bin => src-tauri/src}/inject/event.js (100%) rename {bin => src-tauri/src}/inject/style.js (100%) diff --git a/bin/builders/common.ts b/bin/builders/common.ts index d091290..1995fa5 100644 --- a/bin/builders/common.ts +++ b/bin/builders/common.ts @@ -300,14 +300,7 @@ export async function mergeTauriConfig( // 设置安全调用 window.__TAURI__ 的安全域名为设置的应用域名 setSecurityConfigWithUrl(tauriConf, url); - // 内部注入文件 - const internalInjectScripts = [ - path.join(npmDirectory, 'bin/inject/component.js'), - path.join(npmDirectory, 'bin/inject/event.js'), - path.join(npmDirectory, 'bin/inject/style.js'), - ]; - - let injectFiles = [...internalInjectScripts]; + let injectFiles: string[] = []; // 注入外部 js css if (inject?.length > 0) { if (!inject.every(item => item.endsWith('.css') || item.endsWith('.js'))) { diff --git a/src-tauri/src/app/window.rs b/src-tauri/src/app/window.rs index c2c6c82..83126ad 100644 --- a/src-tauri/src/app/window.rs +++ b/src-tauri/src/app/window.rs @@ -27,6 +27,9 @@ pub fn get_window(app: &mut App, config: PakeConfig, _data_dir: PathBuf) -> Wind .fullscreen(window_config.fullscreen) .inner_size(window_config.width, window_config.height) .disable_file_drop_handler() + .initialization_script(include_str!("../inject/component.js")) + .initialization_script(include_str!("../inject/event.js")) + .initialization_script(include_str!("../inject/style.js")) .initialization_script(include_str!("../inject/_INJECT_.js")); //Very annoying, otherwise dragging files to the window will not work. #[cfg(target_os = "macos")] diff --git a/bin/inject/component.js b/src-tauri/src/inject/component.js similarity index 100% rename from bin/inject/component.js rename to src-tauri/src/inject/component.js diff --git a/bin/inject/event.js b/src-tauri/src/inject/event.js similarity index 100% rename from bin/inject/event.js rename to src-tauri/src/inject/event.js diff --git a/bin/inject/style.js b/src-tauri/src/inject/style.js similarity index 100% rename from bin/inject/style.js rename to src-tauri/src/inject/style.js