From 7e6d302fd0c33a877fce766bfb2fcec6386a4339 Mon Sep 17 00:00:00 2001 From: jeasonnow Date: Fri, 28 Jul 2023 17:44:43 +0800 Subject: [PATCH] style: fmt rust code --- .gitattributes | 1 + bin/cli.ts | 4 ++-- bin/defaults.ts | 5 ++--- bin/helpers/merge.ts | 2 +- src-tauri/src/app/window.rs | 2 +- src-tauri/src/inject/_INJECT_.js | 0 src-tauri/src/inject/custom.js | 2 ++ src-tauri/src/util.rs | 4 ++-- src-tauri/tauri.conf.json | 8 ++++---- src-tauri/tauri.macos.conf.json | 6 ++---- 10 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 src-tauri/src/inject/_INJECT_.js create mode 100644 src-tauri/src/inject/custom.js diff --git a/.gitattributes b/.gitattributes index cdd4590..ec23583 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,3 +8,4 @@ script/* linguist-vendored /icns2png.py linguist-vendored /rollup.config.js linguist-vendored src-tauri/src/inject/* linguist-vendored +src-tauri/src/.pake/* linguist-vendored \ No newline at end of file diff --git a/bin/cli.ts b/bin/cli.ts index e7ff5f6..5e4e856 100644 --- a/bin/cli.ts +++ b/bin/cli.ts @@ -38,8 +38,8 @@ program .option('--iter-copy-file', 'Copy files when URL is a local file', DEFAULT.iterCopyFile) .option('--multi-arch', 'Only for Mac, supports both Intel and M1', DEFAULT.multiArch) .option('--targets ', 'Only for Linux, option "deb" or "appimage"', DEFAULT.targets) - .option('--inject [injects...]', 'inject .js or .css for this app', DEFAULT.inject) - .option('--safe-domain [domains...]', 'domains that can call window.__TAURI__ and use ipc', DEFAULT.safeDomain) + .option('--inject [injects...]', 'Inject .js or .css for this app', DEFAULT.inject) + .option('--safe-domain [domains...]', 'Please enter the security domains that need to be configured', DEFAULT.safeDomain) .option('--debug', 'Debug mode', DEFAULT.debug) .version(packageJson.version, '-v, --version', 'Output the current version') .action(async (url: string, options: PakeCliOptions) => { diff --git a/bin/defaults.ts b/bin/defaults.ts index 1d2b6d6..23464d9 100644 --- a/bin/defaults.ts +++ b/bin/defaults.ts @@ -22,7 +22,6 @@ export const DEFAULT_PAKE_OPTIONS: PakeCliOptions = { // just for cli development export const DEFAULT_DEV_PAKE_OPTIONS: PakeCliOptions & {url: string} = { ...DEFAULT_PAKE_OPTIONS, - url: 'https://zbook.lol', - name: 'Zbook', - safeDomain: ['zbook.eu.org'] + url: 'https://weread.qq.com', + name: 'Weread', } \ No newline at end of file diff --git a/bin/helpers/merge.ts b/bin/helpers/merge.ts index 4f38e20..c7438aa 100644 --- a/bin/helpers/merge.ts +++ b/bin/helpers/merge.ts @@ -184,7 +184,7 @@ export async function mergeConfig(url: string, options: PakeAppOptions, tauriCon } tauriConf.tauri.systemTray.iconPath = trayIconPath; - const injectFilePath = path.join(npmDirectory, `src-tauri/src/inject/_INJECT_.js`); + const injectFilePath = path.join(npmDirectory, `src-tauri/src/inject/custom.js`); // inject js or css files 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 83126ad..c8485db 100644 --- a/src-tauri/src/app/window.rs +++ b/src-tauri/src/app/window.rs @@ -30,7 +30,7 @@ pub fn get_window(app: &mut App, config: PakeConfig, _data_dir: PathBuf) -> Wind .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. + .initialization_script(include_str!("../inject/custom.js")); //Very annoying, otherwise dragging files to the window will not work. #[cfg(target_os = "macos")] { diff --git a/src-tauri/src/inject/_INJECT_.js b/src-tauri/src/inject/_INJECT_.js deleted file mode 100644 index e69de29..0000000 diff --git a/src-tauri/src/inject/custom.js b/src-tauri/src/inject/custom.js new file mode 100644 index 0000000..9c01303 --- /dev/null +++ b/src-tauri/src/inject/custom.js @@ -0,0 +1,2 @@ +// This file is used to merge the injected external js and css files +// and you can also directly add script files that you want to attach to the application in this fil \ No newline at end of file diff --git a/src-tauri/src/util.rs b/src-tauri/src/util.rs index df2730c..4b82e87 100644 --- a/src-tauri/src/util.rs +++ b/src-tauri/src/util.rs @@ -5,8 +5,8 @@ use tauri::{api, Config, Window}; pub fn get_pake_config() -> (PakeConfig, Config) { #[cfg(feature = "cli-build")] - let pake_config: PakeConfig = - serde_json::from_str(include_str!("../.pake/pake.json")).expect("Failed to parse pake config"); + let pake_config: PakeConfig = serde_json::from_str(include_str!("../.pake/pake.json")) + .expect("Failed to parse pake config"); #[cfg(not(feature = "cli-build"))] let pake_config: PakeConfig = serde_json::from_str(include_str!("../pake.json")).expect("Failed to parse pake config"); diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index c4df1a4..306cb1f 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,4 +1,8 @@ { + "package": { + "productName": "WeRead", + "version": "1.0.0" + }, "tauri": { "security": { "csp": null, @@ -29,10 +33,6 @@ } } }, - "package": { - "productName": "WeRead", - "version": "1.0.0" - }, "build": { "withGlobalTauri": true, "devPath": "../dist", diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json index 76cfbdd..e1d0328 100644 --- a/src-tauri/tauri.macos.conf.json +++ b/src-tauri/tauri.macos.conf.json @@ -1,10 +1,8 @@ { "tauri": { "bundle": { - "icon": [ - "icons/icon.icns" - ], - "identifier": "com.pake.5b8ae9", + "icon": ["icons/weread.icns"], + "identifier": "com.pake.weread", "active": true, "category": "DeveloperTool", "copyright": "",