pake-cli 2.5.2 → 2.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +17 -3
- package/dist/cli.js +22 -13
- package/package.json +12 -12
- package/src-tauri/Cargo.lock +120 -106
- package/src-tauri/Cargo.toml +4 -3
- package/src-tauri/pake.json +1 -0
- package/src-tauri/src/app/config.rs +1 -0
- package/src-tauri/src/app/window.rs +12 -7
- package/src-tauri/src/inject/event.js +2 -15
- package/src-tauri/src/inject/style.js +4 -0
- package/src-tauri/src/main.rs +21 -14
package/README.md
CHANGED
|
@@ -371,6 +371,13 @@ Pake's development can not be without these Hackers. They contributed a lot of c
|
|
|
371
371
|
<sub><b>Jiaqi Gu</b></sub>
|
|
372
372
|
</a>
|
|
373
373
|
</td>
|
|
374
|
+
<td align="center">
|
|
375
|
+
<a href="https://github.com/mattbajorek">
|
|
376
|
+
<img src="https://avatars.githubusercontent.com/u/17235301?v=4" width="90;" alt="mattbajorek"/>
|
|
377
|
+
<br />
|
|
378
|
+
<sub><b>Matt Bajorek</b></sub>
|
|
379
|
+
</a>
|
|
380
|
+
</td>
|
|
374
381
|
<td align="center">
|
|
375
382
|
<a href="https://github.com/Milo123459">
|
|
376
383
|
<img src="https://avatars.githubusercontent.com/u/50248166?v=4" width="90;" alt="Milo123459"/>
|
|
@@ -385,13 +392,21 @@ Pake's development can not be without these Hackers. They contributed a lot of c
|
|
|
385
392
|
<sub><b>Po Chen</b></sub>
|
|
386
393
|
</a>
|
|
387
394
|
</td>
|
|
395
|
+
<td align="center">
|
|
396
|
+
<a href="https://github.com/Tianj0o">
|
|
397
|
+
<img src="https://avatars.githubusercontent.com/u/68584284?v=4" width="90;" alt="Tianj0o"/>
|
|
398
|
+
<br />
|
|
399
|
+
<sub><b>Qitianjia</b></sub>
|
|
400
|
+
</a>
|
|
401
|
+
</td>
|
|
388
402
|
<td align="center">
|
|
389
403
|
<a href="https://github.com/geekvest">
|
|
390
404
|
<img src="https://avatars.githubusercontent.com/u/126322776?v=4" width="90;" alt="geekvest"/>
|
|
391
405
|
<br />
|
|
392
406
|
<sub><b>Null</b></sub>
|
|
393
407
|
</a>
|
|
394
|
-
</td>
|
|
408
|
+
</td></tr>
|
|
409
|
+
<tr>
|
|
395
410
|
<td align="center">
|
|
396
411
|
<a href="https://github.com/houhoz">
|
|
397
412
|
<img src="https://avatars.githubusercontent.com/u/19684376?v=4" width="90;" alt="houhoz"/>
|
|
@@ -405,8 +420,7 @@ Pake's development can not be without these Hackers. They contributed a lot of c
|
|
|
405
420
|
<br />
|
|
406
421
|
<sub><b>Null</b></sub>
|
|
407
422
|
</a>
|
|
408
|
-
</td
|
|
409
|
-
<tr>
|
|
423
|
+
</td>
|
|
410
424
|
<td align="center">
|
|
411
425
|
<a href="https://github.com/liudonghua123">
|
|
412
426
|
<img src="https://avatars.githubusercontent.com/u/2276718?v=4" width="90;" alt="liudonghua123"/>
|
package/dist/cli.js
CHANGED
|
@@ -20,7 +20,7 @@ import psl from 'psl';
|
|
|
20
20
|
import isUrl from 'is-url';
|
|
21
21
|
|
|
22
22
|
var name = "pake-cli";
|
|
23
|
-
var version = "2.
|
|
23
|
+
var version = "2.6.0";
|
|
24
24
|
var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。";
|
|
25
25
|
var engines = {
|
|
26
26
|
node: ">=16.0.0"
|
|
@@ -67,31 +67,31 @@ var type = "module";
|
|
|
67
67
|
var exports = "./dist/pake.js";
|
|
68
68
|
var license = "MIT";
|
|
69
69
|
var dependencies = {
|
|
70
|
-
"@tauri-apps/api": "^1.
|
|
71
|
-
"@tauri-apps/cli": "^1.
|
|
72
|
-
axios: "^1.
|
|
70
|
+
"@tauri-apps/api": "^1.6.0",
|
|
71
|
+
"@tauri-apps/cli": "^1.6.1",
|
|
72
|
+
axios: "^1.7.7",
|
|
73
73
|
chalk: "^5.3.0",
|
|
74
74
|
commander: "^11.1.0",
|
|
75
75
|
"file-type": "^18.7.0",
|
|
76
76
|
"fs-extra": "^11.2.0",
|
|
77
77
|
"is-url": "^1.2.4",
|
|
78
|
-
loglevel: "^1.9.
|
|
78
|
+
loglevel: "^1.9.2",
|
|
79
79
|
ora: "^7.0.1",
|
|
80
80
|
prompts: "^2.4.2",
|
|
81
81
|
psl: "^1.9.0",
|
|
82
82
|
shelljs: "^0.8.5",
|
|
83
83
|
"tmp-promise": "^3.0.3",
|
|
84
|
-
"update-notifier": "^7.
|
|
84
|
+
"update-notifier": "^7.3.1"
|
|
85
85
|
};
|
|
86
86
|
var devDependencies = {
|
|
87
87
|
"@rollup/plugin-alias": "^5.1.0",
|
|
88
|
-
"@rollup/plugin-commonjs": "^25.0.
|
|
88
|
+
"@rollup/plugin-commonjs": "^25.0.8",
|
|
89
89
|
"@rollup/plugin-json": "^6.1.0",
|
|
90
|
-
"@rollup/plugin-replace": "^5.0.
|
|
90
|
+
"@rollup/plugin-replace": "^5.0.7",
|
|
91
91
|
"@rollup/plugin-terser": "^0.4.4",
|
|
92
92
|
"@types/fs-extra": "^11.0.4",
|
|
93
93
|
"@types/is-url": "^1.2.32",
|
|
94
|
-
"@types/node": "^20.
|
|
94
|
+
"@types/node": "^20.16.5",
|
|
95
95
|
"@types/page-icon": "^0.3.6",
|
|
96
96
|
"@types/prompts": "^2.4.9",
|
|
97
97
|
"@types/psl": "^1.1.3",
|
|
@@ -100,10 +100,10 @@ var devDependencies = {
|
|
|
100
100
|
"@types/update-notifier": "^6.0.8",
|
|
101
101
|
"app-root-path": "^3.1.0",
|
|
102
102
|
"cross-env": "^7.0.3",
|
|
103
|
-
rollup: "^4.
|
|
103
|
+
rollup: "^4.21.3",
|
|
104
104
|
"rollup-plugin-typescript2": "^0.36.0",
|
|
105
|
-
tslib: "^2.
|
|
106
|
-
typescript: "^5.
|
|
105
|
+
tslib: "^2.7.0",
|
|
106
|
+
typescript: "^5.6.2"
|
|
107
107
|
};
|
|
108
108
|
var packageJson = {
|
|
109
109
|
name: name,
|
|
@@ -132,6 +132,7 @@ var windows = [
|
|
|
132
132
|
width: 1200,
|
|
133
133
|
height: 780,
|
|
134
134
|
resizable: true,
|
|
135
|
+
dark_mode: false,
|
|
135
136
|
always_on_top: false,
|
|
136
137
|
activation_shortcut: "",
|
|
137
138
|
disabled_web_shortcuts: false
|
|
@@ -476,7 +477,7 @@ async function combineFiles(files, output) {
|
|
|
476
477
|
}
|
|
477
478
|
|
|
478
479
|
async function mergeConfig(url, options, tauriConf) {
|
|
479
|
-
const { width, height, fullscreen, hideTitleBar, alwaysOnTop, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name, resizable = true, inject, safeDomain, } = options;
|
|
480
|
+
const { width, height, fullscreen, hideTitleBar, alwaysOnTop, darkMode, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name, resizable = true, inject, safeDomain, installerLanguage, } = options;
|
|
480
481
|
const { platform } = process;
|
|
481
482
|
// Set Windows parameters.
|
|
482
483
|
const tauriConfWindowOptions = {
|
|
@@ -487,11 +488,15 @@ async function mergeConfig(url, options, tauriConf) {
|
|
|
487
488
|
hide_title_bar: hideTitleBar,
|
|
488
489
|
activation_shortcut: activationShortcut,
|
|
489
490
|
always_on_top: alwaysOnTop,
|
|
491
|
+
dark_mode: darkMode,
|
|
490
492
|
disabled_web_shortcuts: disabledWebShortcuts,
|
|
491
493
|
};
|
|
492
494
|
Object.assign(tauriConf.pake.windows[0], { url, ...tauriConfWindowOptions });
|
|
493
495
|
tauriConf.package.productName = name;
|
|
494
496
|
tauriConf.tauri.bundle.identifier = identifier;
|
|
497
|
+
if (platform == "win32") {
|
|
498
|
+
tauriConf.tauri.bundle.windows.wix.language[0] = installerLanguage;
|
|
499
|
+
}
|
|
495
500
|
//Judge the type of URL, whether it is a file or a website.
|
|
496
501
|
const pathExists = await fsExtra.pathExists(url);
|
|
497
502
|
if (pathExists) {
|
|
@@ -834,6 +839,7 @@ const DEFAULT_PAKE_OPTIONS = {
|
|
|
834
839
|
resizable: true,
|
|
835
840
|
hideTitleBar: false,
|
|
836
841
|
alwaysOnTop: false,
|
|
842
|
+
darkMode: false,
|
|
837
843
|
disabledWebShortcuts: false,
|
|
838
844
|
activationShortcut: '',
|
|
839
845
|
userAgent: '',
|
|
@@ -845,6 +851,7 @@ const DEFAULT_PAKE_OPTIONS = {
|
|
|
845
851
|
debug: false,
|
|
846
852
|
inject: [],
|
|
847
853
|
safeDomain: [],
|
|
854
|
+
installerLanguage: 'en-US',
|
|
848
855
|
};
|
|
849
856
|
|
|
850
857
|
async function checkUpdateTips() {
|
|
@@ -1033,6 +1040,7 @@ program
|
|
|
1033
1040
|
.addOption(new Option('--user-agent <string>', 'Custom user agent').default(DEFAULT_PAKE_OPTIONS.userAgent).hideHelp())
|
|
1034
1041
|
.addOption(new Option('--targets <string>', 'Only for Linux, option "deb" or "appimage"').default(DEFAULT_PAKE_OPTIONS.targets).hideHelp())
|
|
1035
1042
|
.addOption(new Option('--always-on-top', 'Always on the top level').default(DEFAULT_PAKE_OPTIONS.alwaysOnTop).hideHelp())
|
|
1043
|
+
.addOption(new Option('--dark-mode', 'Force Mac app to use dark mode').default(DEFAULT_PAKE_OPTIONS.darkMode).hideHelp())
|
|
1036
1044
|
.addOption(new Option('--disabled-web-shortcuts', 'Disabled webPage shortcuts')
|
|
1037
1045
|
.default(DEFAULT_PAKE_OPTIONS.disabledWebShortcuts)
|
|
1038
1046
|
.hideHelp())
|
|
@@ -1041,6 +1049,7 @@ program
|
|
|
1041
1049
|
.hideHelp())
|
|
1042
1050
|
.addOption(new Option('--show-system-tray', 'Show system tray in app').default(DEFAULT_PAKE_OPTIONS.showSystemTray).hideHelp())
|
|
1043
1051
|
.addOption(new Option('--system-tray-icon <string>', 'Custom system tray icon').default(DEFAULT_PAKE_OPTIONS.systemTrayIcon).hideHelp())
|
|
1052
|
+
.addOption(new Option('--installer-language <string>', 'Installer language').default(DEFAULT_PAKE_OPTIONS.installerLanguage).hideHelp())
|
|
1044
1053
|
.version(packageJson.version, '-v, --version', 'Output the current version')
|
|
1045
1054
|
.action(async (url, options) => {
|
|
1046
1055
|
await checkUpdateTips();
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "pake-cli",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.6.0",
|
|
4
4
|
"description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=16.0.0"
|
|
@@ -47,31 +47,31 @@
|
|
|
47
47
|
"exports": "./dist/pake.js",
|
|
48
48
|
"license": "MIT",
|
|
49
49
|
"dependencies": {
|
|
50
|
-
"@tauri-apps/api": "^1.
|
|
51
|
-
"@tauri-apps/cli": "^1.
|
|
52
|
-
"axios": "^1.
|
|
50
|
+
"@tauri-apps/api": "^1.6.0",
|
|
51
|
+
"@tauri-apps/cli": "^1.6.1",
|
|
52
|
+
"axios": "^1.7.7",
|
|
53
53
|
"chalk": "^5.3.0",
|
|
54
54
|
"commander": "^11.1.0",
|
|
55
55
|
"file-type": "^18.7.0",
|
|
56
56
|
"fs-extra": "^11.2.0",
|
|
57
57
|
"is-url": "^1.2.4",
|
|
58
|
-
"loglevel": "^1.9.
|
|
58
|
+
"loglevel": "^1.9.2",
|
|
59
59
|
"ora": "^7.0.1",
|
|
60
60
|
"prompts": "^2.4.2",
|
|
61
61
|
"psl": "^1.9.0",
|
|
62
62
|
"shelljs": "^0.8.5",
|
|
63
63
|
"tmp-promise": "^3.0.3",
|
|
64
|
-
"update-notifier": "^7.
|
|
64
|
+
"update-notifier": "^7.3.1"
|
|
65
65
|
},
|
|
66
66
|
"devDependencies": {
|
|
67
67
|
"@rollup/plugin-alias": "^5.1.0",
|
|
68
|
-
"@rollup/plugin-commonjs": "^25.0.
|
|
68
|
+
"@rollup/plugin-commonjs": "^25.0.8",
|
|
69
69
|
"@rollup/plugin-json": "^6.1.0",
|
|
70
|
-
"@rollup/plugin-replace": "^5.0.
|
|
70
|
+
"@rollup/plugin-replace": "^5.0.7",
|
|
71
71
|
"@rollup/plugin-terser": "^0.4.4",
|
|
72
72
|
"@types/fs-extra": "^11.0.4",
|
|
73
73
|
"@types/is-url": "^1.2.32",
|
|
74
|
-
"@types/node": "^20.
|
|
74
|
+
"@types/node": "^20.16.5",
|
|
75
75
|
"@types/page-icon": "^0.3.6",
|
|
76
76
|
"@types/prompts": "^2.4.9",
|
|
77
77
|
"@types/psl": "^1.1.3",
|
|
@@ -80,9 +80,9 @@
|
|
|
80
80
|
"@types/update-notifier": "^6.0.8",
|
|
81
81
|
"app-root-path": "^3.1.0",
|
|
82
82
|
"cross-env": "^7.0.3",
|
|
83
|
-
"rollup": "^4.
|
|
83
|
+
"rollup": "^4.21.3",
|
|
84
84
|
"rollup-plugin-typescript2": "^0.36.0",
|
|
85
|
-
"tslib": "^2.
|
|
86
|
-
"typescript": "^5.
|
|
85
|
+
"tslib": "^2.7.0",
|
|
86
|
+
"typescript": "^5.6.2"
|
|
87
87
|
}
|
|
88
88
|
}
|
package/src-tauri/Cargo.lock
CHANGED
|
@@ -58,9 +58,9 @@ dependencies = [
|
|
|
58
58
|
|
|
59
59
|
[[package]]
|
|
60
60
|
name = "anyhow"
|
|
61
|
-
version = "1.0.
|
|
61
|
+
version = "1.0.86"
|
|
62
62
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
63
|
-
checksum = "
|
|
63
|
+
checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
|
|
64
64
|
|
|
65
65
|
[[package]]
|
|
66
66
|
name = "app"
|
|
@@ -73,6 +73,7 @@ dependencies = [
|
|
|
73
73
|
"tauri-build",
|
|
74
74
|
"tauri-plugin-oauth",
|
|
75
75
|
"tauri-plugin-window-state",
|
|
76
|
+
"tokio",
|
|
76
77
|
]
|
|
77
78
|
|
|
78
79
|
[[package]]
|
|
@@ -108,12 +109,11 @@ dependencies = [
|
|
|
108
109
|
|
|
109
110
|
[[package]]
|
|
110
111
|
name = "async-channel"
|
|
111
|
-
version = "2.
|
|
112
|
+
version = "2.3.1"
|
|
112
113
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
113
|
-
checksum = "
|
|
114
|
+
checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
|
|
114
115
|
dependencies = [
|
|
115
116
|
"concurrent-queue",
|
|
116
|
-
"event-listener 5.3.0",
|
|
117
117
|
"event-listener-strategy 0.5.2",
|
|
118
118
|
"futures-core",
|
|
119
119
|
"pin-project-lite",
|
|
@@ -201,7 +201,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
|
|
|
201
201
|
dependencies = [
|
|
202
202
|
"proc-macro2",
|
|
203
203
|
"quote",
|
|
204
|
-
"syn 2.0.
|
|
204
|
+
"syn 2.0.65",
|
|
205
205
|
]
|
|
206
206
|
|
|
207
207
|
[[package]]
|
|
@@ -236,7 +236,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
|
|
|
236
236
|
dependencies = [
|
|
237
237
|
"proc-macro2",
|
|
238
238
|
"quote",
|
|
239
|
-
"syn 2.0.
|
|
239
|
+
"syn 2.0.65",
|
|
240
240
|
]
|
|
241
241
|
|
|
242
242
|
[[package]]
|
|
@@ -412,9 +412,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
|
|
|
412
412
|
|
|
413
413
|
[[package]]
|
|
414
414
|
name = "bytemuck"
|
|
415
|
-
version = "1.
|
|
415
|
+
version = "1.16.0"
|
|
416
416
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
417
|
-
checksum = "
|
|
417
|
+
checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
|
|
418
418
|
|
|
419
419
|
[[package]]
|
|
420
420
|
name = "byteorder"
|
|
@@ -483,9 +483,9 @@ dependencies = [
|
|
|
483
483
|
|
|
484
484
|
[[package]]
|
|
485
485
|
name = "cc"
|
|
486
|
-
version = "1.0.
|
|
486
|
+
version = "1.0.98"
|
|
487
487
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
488
|
-
checksum = "
|
|
488
|
+
checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
|
|
489
489
|
|
|
490
490
|
[[package]]
|
|
491
491
|
name = "cesu8"
|
|
@@ -682,18 +682,18 @@ dependencies = [
|
|
|
682
682
|
|
|
683
683
|
[[package]]
|
|
684
684
|
name = "crc32fast"
|
|
685
|
-
version = "1.4.
|
|
685
|
+
version = "1.4.2"
|
|
686
686
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
687
|
-
checksum = "
|
|
687
|
+
checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
|
|
688
688
|
dependencies = [
|
|
689
689
|
"cfg-if",
|
|
690
690
|
]
|
|
691
691
|
|
|
692
692
|
[[package]]
|
|
693
693
|
name = "crossbeam-channel"
|
|
694
|
-
version = "0.5.
|
|
694
|
+
version = "0.5.13"
|
|
695
695
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
696
|
-
checksum = "
|
|
696
|
+
checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
|
|
697
697
|
dependencies = [
|
|
698
698
|
"crossbeam-utils",
|
|
699
699
|
]
|
|
@@ -719,9 +719,9 @@ dependencies = [
|
|
|
719
719
|
|
|
720
720
|
[[package]]
|
|
721
721
|
name = "crossbeam-utils"
|
|
722
|
-
version = "0.8.
|
|
722
|
+
version = "0.8.20"
|
|
723
723
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
724
|
-
checksum = "
|
|
724
|
+
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
|
|
725
725
|
|
|
726
726
|
[[package]]
|
|
727
727
|
name = "crypto-common"
|
|
@@ -757,7 +757,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
757
757
|
checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
|
|
758
758
|
dependencies = [
|
|
759
759
|
"quote",
|
|
760
|
-
"syn 2.0.
|
|
760
|
+
"syn 2.0.65",
|
|
761
761
|
]
|
|
762
762
|
|
|
763
763
|
[[package]]
|
|
@@ -767,14 +767,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
767
767
|
checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"
|
|
768
768
|
dependencies = [
|
|
769
769
|
"quote",
|
|
770
|
-
"syn 2.0.
|
|
770
|
+
"syn 2.0.65",
|
|
771
771
|
]
|
|
772
772
|
|
|
773
773
|
[[package]]
|
|
774
774
|
name = "darling"
|
|
775
|
-
version = "0.20.
|
|
775
|
+
version = "0.20.9"
|
|
776
776
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
777
|
-
checksum = "
|
|
777
|
+
checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
|
|
778
778
|
dependencies = [
|
|
779
779
|
"darling_core",
|
|
780
780
|
"darling_macro",
|
|
@@ -782,27 +782,27 @@ dependencies = [
|
|
|
782
782
|
|
|
783
783
|
[[package]]
|
|
784
784
|
name = "darling_core"
|
|
785
|
-
version = "0.20.
|
|
785
|
+
version = "0.20.9"
|
|
786
786
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
787
|
-
checksum = "
|
|
787
|
+
checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
|
|
788
788
|
dependencies = [
|
|
789
789
|
"fnv",
|
|
790
790
|
"ident_case",
|
|
791
791
|
"proc-macro2",
|
|
792
792
|
"quote",
|
|
793
793
|
"strsim",
|
|
794
|
-
"syn 2.0.
|
|
794
|
+
"syn 2.0.65",
|
|
795
795
|
]
|
|
796
796
|
|
|
797
797
|
[[package]]
|
|
798
798
|
name = "darling_macro"
|
|
799
|
-
version = "0.20.
|
|
799
|
+
version = "0.20.9"
|
|
800
800
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
801
|
-
checksum = "
|
|
801
|
+
checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
|
|
802
802
|
dependencies = [
|
|
803
803
|
"darling_core",
|
|
804
804
|
"quote",
|
|
805
|
-
"syn 2.0.
|
|
805
|
+
"syn 2.0.65",
|
|
806
806
|
]
|
|
807
807
|
|
|
808
808
|
[[package]]
|
|
@@ -823,7 +823,7 @@ checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad"
|
|
|
823
823
|
dependencies = [
|
|
824
824
|
"proc-macro2",
|
|
825
825
|
"quote",
|
|
826
|
-
"syn 2.0.
|
|
826
|
+
"syn 2.0.65",
|
|
827
827
|
]
|
|
828
828
|
|
|
829
829
|
[[package]]
|
|
@@ -921,7 +921,7 @@ dependencies = [
|
|
|
921
921
|
"cc",
|
|
922
922
|
"memchr",
|
|
923
923
|
"rustc_version",
|
|
924
|
-
"toml 0.8.
|
|
924
|
+
"toml 0.8.13",
|
|
925
925
|
"vswhom",
|
|
926
926
|
"winreg 0.52.0",
|
|
927
927
|
]
|
|
@@ -965,7 +965,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
|
|
|
965
965
|
dependencies = [
|
|
966
966
|
"proc-macro2",
|
|
967
967
|
"quote",
|
|
968
|
-
"syn 2.0.
|
|
968
|
+
"syn 2.0.65",
|
|
969
969
|
]
|
|
970
970
|
|
|
971
971
|
[[package]]
|
|
@@ -976,9 +976,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
|
|
|
976
976
|
|
|
977
977
|
[[package]]
|
|
978
978
|
name = "errno"
|
|
979
|
-
version = "0.3.
|
|
979
|
+
version = "0.3.9"
|
|
980
980
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
981
|
-
checksum = "
|
|
981
|
+
checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
|
|
982
982
|
dependencies = [
|
|
983
983
|
"libc",
|
|
984
984
|
"windows-sys 0.52.0",
|
|
@@ -1124,7 +1124,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
|
|
|
1124
1124
|
dependencies = [
|
|
1125
1125
|
"proc-macro2",
|
|
1126
1126
|
"quote",
|
|
1127
|
-
"syn 2.0.
|
|
1127
|
+
"syn 2.0.65",
|
|
1128
1128
|
]
|
|
1129
1129
|
|
|
1130
1130
|
[[package]]
|
|
@@ -1211,7 +1211,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
|
|
|
1211
1211
|
dependencies = [
|
|
1212
1212
|
"proc-macro2",
|
|
1213
1213
|
"quote",
|
|
1214
|
-
"syn 2.0.
|
|
1214
|
+
"syn 2.0.65",
|
|
1215
1215
|
]
|
|
1216
1216
|
|
|
1217
1217
|
[[package]]
|
|
@@ -1846,9 +1846,9 @@ dependencies = [
|
|
|
1846
1846
|
|
|
1847
1847
|
[[package]]
|
|
1848
1848
|
name = "instant"
|
|
1849
|
-
version = "0.1.
|
|
1849
|
+
version = "0.1.13"
|
|
1850
1850
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
1851
|
-
checksum = "
|
|
1851
|
+
checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
|
|
1852
1852
|
dependencies = [
|
|
1853
1853
|
"cfg-if",
|
|
1854
1854
|
]
|
|
@@ -1991,9 +1991,9 @@ dependencies = [
|
|
|
1991
1991
|
|
|
1992
1992
|
[[package]]
|
|
1993
1993
|
name = "libc"
|
|
1994
|
-
version = "0.2.
|
|
1994
|
+
version = "0.2.155"
|
|
1995
1995
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
1996
|
-
checksum = "
|
|
1996
|
+
checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
|
|
1997
1997
|
|
|
1998
1998
|
[[package]]
|
|
1999
1999
|
name = "libloading"
|
|
@@ -2033,9 +2033,9 @@ checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e"
|
|
|
2033
2033
|
|
|
2034
2034
|
[[package]]
|
|
2035
2035
|
name = "linux-raw-sys"
|
|
2036
|
-
version = "0.4.
|
|
2036
|
+
version = "0.4.14"
|
|
2037
2037
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
2038
|
-
checksum = "
|
|
2038
|
+
checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
|
|
2039
2039
|
|
|
2040
2040
|
[[package]]
|
|
2041
2041
|
name = "lock_api"
|
|
@@ -2172,9 +2172,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
|
|
2172
2172
|
|
|
2173
2173
|
[[package]]
|
|
2174
2174
|
name = "miniz_oxide"
|
|
2175
|
-
version = "0.7.
|
|
2175
|
+
version = "0.7.3"
|
|
2176
2176
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
2177
|
-
checksum = "
|
|
2177
|
+
checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
|
|
2178
2178
|
dependencies = [
|
|
2179
2179
|
"adler",
|
|
2180
2180
|
"simd-adler32",
|
|
@@ -2501,7 +2501,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
|
|
|
2501
2501
|
dependencies = [
|
|
2502
2502
|
"proc-macro2",
|
|
2503
2503
|
"quote",
|
|
2504
|
-
"syn 2.0.
|
|
2504
|
+
"syn 2.0.65",
|
|
2505
2505
|
]
|
|
2506
2506
|
|
|
2507
2507
|
[[package]]
|
|
@@ -2638,9 +2638,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
|
|
|
2638
2638
|
|
|
2639
2639
|
[[package]]
|
|
2640
2640
|
name = "petgraph"
|
|
2641
|
-
version = "0.6.
|
|
2641
|
+
version = "0.6.5"
|
|
2642
2642
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
2643
|
-
checksum = "
|
|
2643
|
+
checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
|
|
2644
2644
|
dependencies = [
|
|
2645
2645
|
"fixedbitset",
|
|
2646
2646
|
"indexmap 2.2.6",
|
|
@@ -2750,7 +2750,7 @@ dependencies = [
|
|
|
2750
2750
|
"phf_shared 0.11.2",
|
|
2751
2751
|
"proc-macro2",
|
|
2752
2752
|
"quote",
|
|
2753
|
-
"syn 2.0.
|
|
2753
|
+
"syn 2.0.65",
|
|
2754
2754
|
]
|
|
2755
2755
|
|
|
2756
2756
|
[[package]]
|
|
@@ -2800,9 +2800,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
|
|
2800
2800
|
|
|
2801
2801
|
[[package]]
|
|
2802
2802
|
name = "piper"
|
|
2803
|
-
version = "0.2.
|
|
2803
|
+
version = "0.2.2"
|
|
2804
2804
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
2805
|
-
checksum = "
|
|
2805
|
+
checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf"
|
|
2806
2806
|
dependencies = [
|
|
2807
2807
|
"atomic-waker",
|
|
2808
2808
|
"fastrand",
|
|
@@ -2926,9 +2926,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
|
|
|
2926
2926
|
|
|
2927
2927
|
[[package]]
|
|
2928
2928
|
name = "proc-macro2"
|
|
2929
|
-
version = "1.0.
|
|
2929
|
+
version = "1.0.83"
|
|
2930
2930
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
2931
|
-
checksum = "
|
|
2931
|
+
checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43"
|
|
2932
2932
|
dependencies = [
|
|
2933
2933
|
"unicode-ident",
|
|
2934
2934
|
]
|
|
@@ -3179,9 +3179,9 @@ dependencies = [
|
|
|
3179
3179
|
|
|
3180
3180
|
[[package]]
|
|
3181
3181
|
name = "rustc-demangle"
|
|
3182
|
-
version = "0.1.
|
|
3182
|
+
version = "0.1.24"
|
|
3183
3183
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
3184
|
-
checksum = "
|
|
3184
|
+
checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
|
|
3185
3185
|
|
|
3186
3186
|
[[package]]
|
|
3187
3187
|
name = "rustc_version"
|
|
@@ -3216,9 +3216,9 @@ dependencies = [
|
|
|
3216
3216
|
|
|
3217
3217
|
[[package]]
|
|
3218
3218
|
name = "rustversion"
|
|
3219
|
-
version = "1.0.
|
|
3219
|
+
version = "1.0.17"
|
|
3220
3220
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
3221
|
-
checksum = "
|
|
3221
|
+
checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
|
|
3222
3222
|
|
|
3223
3223
|
[[package]]
|
|
3224
3224
|
name = "ryu"
|
|
@@ -3316,29 +3316,29 @@ dependencies = [
|
|
|
3316
3316
|
|
|
3317
3317
|
[[package]]
|
|
3318
3318
|
name = "serde"
|
|
3319
|
-
version = "1.0.
|
|
3319
|
+
version = "1.0.202"
|
|
3320
3320
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
3321
|
-
checksum = "
|
|
3321
|
+
checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
|
|
3322
3322
|
dependencies = [
|
|
3323
3323
|
"serde_derive",
|
|
3324
3324
|
]
|
|
3325
3325
|
|
|
3326
3326
|
[[package]]
|
|
3327
3327
|
name = "serde_derive"
|
|
3328
|
-
version = "1.0.
|
|
3328
|
+
version = "1.0.202"
|
|
3329
3329
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
3330
|
-
checksum = "
|
|
3330
|
+
checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
|
|
3331
3331
|
dependencies = [
|
|
3332
3332
|
"proc-macro2",
|
|
3333
3333
|
"quote",
|
|
3334
|
-
"syn 2.0.
|
|
3334
|
+
"syn 2.0.65",
|
|
3335
3335
|
]
|
|
3336
3336
|
|
|
3337
3337
|
[[package]]
|
|
3338
3338
|
name = "serde_json"
|
|
3339
|
-
version = "1.0.
|
|
3339
|
+
version = "1.0.117"
|
|
3340
3340
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
3341
|
-
checksum = "
|
|
3341
|
+
checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
|
|
3342
3342
|
dependencies = [
|
|
3343
3343
|
"indexmap 2.2.6",
|
|
3344
3344
|
"itoa 1.0.11",
|
|
@@ -3354,14 +3354,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
|
|
|
3354
3354
|
dependencies = [
|
|
3355
3355
|
"proc-macro2",
|
|
3356
3356
|
"quote",
|
|
3357
|
-
"syn 2.0.
|
|
3357
|
+
"syn 2.0.65",
|
|
3358
3358
|
]
|
|
3359
3359
|
|
|
3360
3360
|
[[package]]
|
|
3361
3361
|
name = "serde_spanned"
|
|
3362
|
-
version = "0.6.
|
|
3362
|
+
version = "0.6.6"
|
|
3363
3363
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
3364
|
-
checksum = "
|
|
3364
|
+
checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
|
|
3365
3365
|
dependencies = [
|
|
3366
3366
|
"serde",
|
|
3367
3367
|
]
|
|
@@ -3405,7 +3405,7 @@ dependencies = [
|
|
|
3405
3405
|
"darling",
|
|
3406
3406
|
"proc-macro2",
|
|
3407
3407
|
"quote",
|
|
3408
|
-
"syn 2.0.
|
|
3408
|
+
"syn 2.0.65",
|
|
3409
3409
|
]
|
|
3410
3410
|
|
|
3411
3411
|
[[package]]
|
|
@@ -3604,9 +3604,9 @@ dependencies = [
|
|
|
3604
3604
|
|
|
3605
3605
|
[[package]]
|
|
3606
3606
|
name = "strsim"
|
|
3607
|
-
version = "0.
|
|
3607
|
+
version = "0.11.1"
|
|
3608
3608
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
3609
|
-
checksum = "
|
|
3609
|
+
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
|
|
3610
3610
|
|
|
3611
3611
|
[[package]]
|
|
3612
3612
|
name = "syn"
|
|
@@ -3621,9 +3621,9 @@ dependencies = [
|
|
|
3621
3621
|
|
|
3622
3622
|
[[package]]
|
|
3623
3623
|
name = "syn"
|
|
3624
|
-
version = "2.0.
|
|
3624
|
+
version = "2.0.65"
|
|
3625
3625
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
3626
|
-
checksum = "
|
|
3626
|
+
checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106"
|
|
3627
3627
|
dependencies = [
|
|
3628
3628
|
"proc-macro2",
|
|
3629
3629
|
"quote",
|
|
@@ -3692,7 +3692,7 @@ dependencies = [
|
|
|
3692
3692
|
"cfg-expr 0.15.8",
|
|
3693
3693
|
"heck 0.5.0",
|
|
3694
3694
|
"pkg-config",
|
|
3695
|
-
"toml 0.8.
|
|
3695
|
+
"toml 0.8.13",
|
|
3696
3696
|
"version-compare 0.2.0",
|
|
3697
3697
|
]
|
|
3698
3698
|
|
|
@@ -3775,9 +3775,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
|
|
|
3775
3775
|
|
|
3776
3776
|
[[package]]
|
|
3777
3777
|
name = "tauri"
|
|
3778
|
-
version = "1.6.
|
|
3778
|
+
version = "1.6.6"
|
|
3779
3779
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
3780
|
-
checksum = "
|
|
3780
|
+
checksum = "f3f99c42ed6e39885ad1bb14317b0379bc99aad7ffe20db517cd761267b30343"
|
|
3781
3781
|
dependencies = [
|
|
3782
3782
|
"anyhow",
|
|
3783
3783
|
"bytes",
|
|
@@ -3939,9 +3939,9 @@ dependencies = [
|
|
|
3939
3939
|
|
|
3940
3940
|
[[package]]
|
|
3941
3941
|
name = "tauri-runtime-wry"
|
|
3942
|
-
version = "0.14.
|
|
3942
|
+
version = "0.14.7"
|
|
3943
3943
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
3944
|
-
checksum = "
|
|
3944
|
+
checksum = "ef2af45aeb15b1cadb4ca91248423f4438a0864b836298cecb436892afbfdff4"
|
|
3945
3945
|
dependencies = [
|
|
3946
3946
|
"arboard",
|
|
3947
3947
|
"cocoa",
|
|
@@ -4050,22 +4050,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
|
|
|
4050
4050
|
|
|
4051
4051
|
[[package]]
|
|
4052
4052
|
name = "thiserror"
|
|
4053
|
-
version = "1.0.
|
|
4053
|
+
version = "1.0.61"
|
|
4054
4054
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
4055
|
-
checksum = "
|
|
4055
|
+
checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
|
|
4056
4056
|
dependencies = [
|
|
4057
4057
|
"thiserror-impl",
|
|
4058
4058
|
]
|
|
4059
4059
|
|
|
4060
4060
|
[[package]]
|
|
4061
4061
|
name = "thiserror-impl"
|
|
4062
|
-
version = "1.0.
|
|
4062
|
+
version = "1.0.61"
|
|
4063
4063
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
4064
|
-
checksum = "
|
|
4064
|
+
checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
|
|
4065
4065
|
dependencies = [
|
|
4066
4066
|
"proc-macro2",
|
|
4067
4067
|
"quote",
|
|
4068
|
-
"syn 2.0.
|
|
4068
|
+
"syn 2.0.65",
|
|
4069
4069
|
]
|
|
4070
4070
|
|
|
4071
4071
|
[[package]]
|
|
@@ -4146,11 +4146,25 @@ dependencies = [
|
|
|
4146
4146
|
"libc",
|
|
4147
4147
|
"mio",
|
|
4148
4148
|
"num_cpus",
|
|
4149
|
+
"parking_lot",
|
|
4149
4150
|
"pin-project-lite",
|
|
4151
|
+
"signal-hook-registry",
|
|
4150
4152
|
"socket2",
|
|
4153
|
+
"tokio-macros",
|
|
4151
4154
|
"windows-sys 0.48.0",
|
|
4152
4155
|
]
|
|
4153
4156
|
|
|
4157
|
+
[[package]]
|
|
4158
|
+
name = "tokio-macros"
|
|
4159
|
+
version = "2.2.0"
|
|
4160
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
4161
|
+
checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
|
|
4162
|
+
dependencies = [
|
|
4163
|
+
"proc-macro2",
|
|
4164
|
+
"quote",
|
|
4165
|
+
"syn 2.0.65",
|
|
4166
|
+
]
|
|
4167
|
+
|
|
4154
4168
|
[[package]]
|
|
4155
4169
|
name = "tokio-native-tls"
|
|
4156
4170
|
version = "0.3.1"
|
|
@@ -4197,21 +4211,21 @@ dependencies = [
|
|
|
4197
4211
|
|
|
4198
4212
|
[[package]]
|
|
4199
4213
|
name = "toml"
|
|
4200
|
-
version = "0.8.
|
|
4214
|
+
version = "0.8.13"
|
|
4201
4215
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
4202
|
-
checksum = "
|
|
4216
|
+
checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba"
|
|
4203
4217
|
dependencies = [
|
|
4204
4218
|
"serde",
|
|
4205
4219
|
"serde_spanned",
|
|
4206
4220
|
"toml_datetime",
|
|
4207
|
-
"toml_edit 0.22.
|
|
4221
|
+
"toml_edit 0.22.13",
|
|
4208
4222
|
]
|
|
4209
4223
|
|
|
4210
4224
|
[[package]]
|
|
4211
4225
|
name = "toml_datetime"
|
|
4212
|
-
version = "0.6.
|
|
4226
|
+
version = "0.6.6"
|
|
4213
4227
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
4214
|
-
checksum = "
|
|
4228
|
+
checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
|
|
4215
4229
|
dependencies = [
|
|
4216
4230
|
"serde",
|
|
4217
4231
|
]
|
|
@@ -4242,9 +4256,9 @@ dependencies = [
|
|
|
4242
4256
|
|
|
4243
4257
|
[[package]]
|
|
4244
4258
|
name = "toml_edit"
|
|
4245
|
-
version = "0.22.
|
|
4259
|
+
version = "0.22.13"
|
|
4246
4260
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
4247
|
-
checksum = "
|
|
4261
|
+
checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"
|
|
4248
4262
|
dependencies = [
|
|
4249
4263
|
"indexmap 2.2.6",
|
|
4250
4264
|
"serde",
|
|
@@ -4278,7 +4292,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
|
|
|
4278
4292
|
dependencies = [
|
|
4279
4293
|
"proc-macro2",
|
|
4280
4294
|
"quote",
|
|
4281
|
-
"syn 2.0.
|
|
4295
|
+
"syn 2.0.65",
|
|
4282
4296
|
]
|
|
4283
4297
|
|
|
4284
4298
|
[[package]]
|
|
@@ -4519,7 +4533,7 @@ dependencies = [
|
|
|
4519
4533
|
"once_cell",
|
|
4520
4534
|
"proc-macro2",
|
|
4521
4535
|
"quote",
|
|
4522
|
-
"syn 2.0.
|
|
4536
|
+
"syn 2.0.65",
|
|
4523
4537
|
"wasm-bindgen-shared",
|
|
4524
4538
|
]
|
|
4525
4539
|
|
|
@@ -4553,7 +4567,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
|
|
|
4553
4567
|
dependencies = [
|
|
4554
4568
|
"proc-macro2",
|
|
4555
4569
|
"quote",
|
|
4556
|
-
"syn 2.0.
|
|
4570
|
+
"syn 2.0.65",
|
|
4557
4571
|
"wasm-bindgen-backend",
|
|
4558
4572
|
"wasm-bindgen-shared",
|
|
4559
4573
|
]
|
|
@@ -4877,7 +4891,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
|
|
|
4877
4891
|
dependencies = [
|
|
4878
4892
|
"proc-macro2",
|
|
4879
4893
|
"quote",
|
|
4880
|
-
"syn 2.0.
|
|
4894
|
+
"syn 2.0.65",
|
|
4881
4895
|
]
|
|
4882
4896
|
|
|
4883
4897
|
[[package]]
|
|
@@ -4888,7 +4902,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
|
|
|
4888
4902
|
dependencies = [
|
|
4889
4903
|
"proc-macro2",
|
|
4890
4904
|
"quote",
|
|
4891
|
-
"syn 2.0.
|
|
4905
|
+
"syn 2.0.65",
|
|
4892
4906
|
]
|
|
4893
4907
|
|
|
4894
4908
|
[[package]]
|
|
@@ -5261,9 +5275,9 @@ dependencies = [
|
|
|
5261
5275
|
|
|
5262
5276
|
[[package]]
|
|
5263
5277
|
name = "wry"
|
|
5264
|
-
version = "0.24.
|
|
5278
|
+
version = "0.24.10"
|
|
5265
5279
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
5266
|
-
checksum = "
|
|
5280
|
+
checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45"
|
|
5267
5281
|
dependencies = [
|
|
5268
5282
|
"base64 0.13.1",
|
|
5269
5283
|
"block",
|
|
@@ -5358,9 +5372,9 @@ dependencies = [
|
|
|
5358
5372
|
|
|
5359
5373
|
[[package]]
|
|
5360
5374
|
name = "zbus"
|
|
5361
|
-
version = "4.2.
|
|
5375
|
+
version = "4.2.2"
|
|
5362
5376
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
5363
|
-
checksum = "
|
|
5377
|
+
checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f"
|
|
5364
5378
|
dependencies = [
|
|
5365
5379
|
"async-broadcast",
|
|
5366
5380
|
"async-executor",
|
|
@@ -5396,14 +5410,14 @@ dependencies = [
|
|
|
5396
5410
|
|
|
5397
5411
|
[[package]]
|
|
5398
5412
|
name = "zbus_macros"
|
|
5399
|
-
version = "4.2.
|
|
5413
|
+
version = "4.2.2"
|
|
5400
5414
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
5401
|
-
checksum = "
|
|
5415
|
+
checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1"
|
|
5402
5416
|
dependencies = [
|
|
5403
5417
|
"proc-macro-crate 3.1.0",
|
|
5404
5418
|
"proc-macro2",
|
|
5405
5419
|
"quote",
|
|
5406
|
-
"syn
|
|
5420
|
+
"syn 2.0.65",
|
|
5407
5421
|
"zvariant_utils",
|
|
5408
5422
|
]
|
|
5409
5423
|
|
|
@@ -5420,9 +5434,9 @@ dependencies = [
|
|
|
5420
5434
|
|
|
5421
5435
|
[[package]]
|
|
5422
5436
|
name = "zvariant"
|
|
5423
|
-
version = "4.
|
|
5437
|
+
version = "4.1.1"
|
|
5424
5438
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
5425
|
-
checksum = "
|
|
5439
|
+
checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7"
|
|
5426
5440
|
dependencies = [
|
|
5427
5441
|
"endi",
|
|
5428
5442
|
"enumflags2",
|
|
@@ -5433,24 +5447,24 @@ dependencies = [
|
|
|
5433
5447
|
|
|
5434
5448
|
[[package]]
|
|
5435
5449
|
name = "zvariant_derive"
|
|
5436
|
-
version = "4.
|
|
5450
|
+
version = "4.1.1"
|
|
5437
5451
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
5438
|
-
checksum = "
|
|
5452
|
+
checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8"
|
|
5439
5453
|
dependencies = [
|
|
5440
5454
|
"proc-macro-crate 3.1.0",
|
|
5441
5455
|
"proc-macro2",
|
|
5442
5456
|
"quote",
|
|
5443
|
-
"syn
|
|
5457
|
+
"syn 2.0.65",
|
|
5444
5458
|
"zvariant_utils",
|
|
5445
5459
|
]
|
|
5446
5460
|
|
|
5447
5461
|
[[package]]
|
|
5448
5462
|
name = "zvariant_utils"
|
|
5449
|
-
version = "
|
|
5463
|
+
version = "2.0.0"
|
|
5450
5464
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
5451
|
-
checksum = "
|
|
5465
|
+
checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786"
|
|
5452
5466
|
dependencies = [
|
|
5453
5467
|
"proc-macro2",
|
|
5454
5468
|
"quote",
|
|
5455
|
-
"syn
|
|
5469
|
+
"syn 2.0.65",
|
|
5456
5470
|
]
|
package/src-tauri/Cargo.toml
CHANGED
|
@@ -15,11 +15,12 @@ rust-version = "1.78.0"
|
|
|
15
15
|
tauri-build = { version = "1.5.2", features = [] }
|
|
16
16
|
|
|
17
17
|
[dependencies]
|
|
18
|
-
serde_json = "1.0.
|
|
19
|
-
serde = { version = "1.0.
|
|
20
|
-
tauri = { version = "1.6.
|
|
18
|
+
serde_json = "1.0.117"
|
|
19
|
+
serde = { version = "1.0.202", features = ["derive"] }
|
|
20
|
+
tauri = { version = "1.6.6", features = ["api-all", "system-tray"] }
|
|
21
21
|
tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
|
|
22
22
|
tauri-plugin-oauth = { git = "https://github.com/FabianLars/tauri-plugin-oauth", branch = "main" }
|
|
23
|
+
tokio = { version = "1", features = ["full"] }
|
|
23
24
|
|
|
24
25
|
[dev-dependencies]
|
|
25
26
|
cargo-bloat = "0.11.1"
|
package/src-tauri/pake.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
use crate::app::config::PakeConfig;
|
|
2
2
|
use std::path::PathBuf;
|
|
3
|
-
use tauri::{App, Window, WindowBuilder, WindowUrl};
|
|
3
|
+
use tauri::{App, Theme, Window, WindowBuilder, WindowUrl};
|
|
4
4
|
|
|
5
5
|
#[cfg(target_os = "macos")]
|
|
6
6
|
use tauri::TitleBarStyle;
|
|
7
7
|
|
|
8
|
-
pub fn
|
|
8
|
+
pub fn build_window(app: &mut App, config: PakeConfig, _data_dir: PathBuf) -> Window {
|
|
9
9
|
let window_config = config
|
|
10
10
|
.windows
|
|
11
11
|
.first()
|
|
@@ -26,18 +26,16 @@ pub fn get_window(app: &mut App, config: PakeConfig, _data_dir: PathBuf) -> Wind
|
|
|
26
26
|
|
|
27
27
|
let mut window_builder = WindowBuilder::new(app, "pake", url)
|
|
28
28
|
.title("")
|
|
29
|
+
.visible(false)
|
|
29
30
|
.user_agent(user_agent)
|
|
30
|
-
.visible(false) // Prevent initial shaking
|
|
31
31
|
.resizable(window_config.resizable)
|
|
32
32
|
.fullscreen(window_config.fullscreen)
|
|
33
33
|
.inner_size(window_config.width, window_config.height)
|
|
34
|
-
.disable_file_drop_handler()
|
|
35
34
|
.always_on_top(window_config.always_on_top)
|
|
36
35
|
.initialization_script(&config_script)
|
|
37
36
|
.initialization_script(include_str!("../inject/component.js"))
|
|
38
37
|
.initialization_script(include_str!("../inject/event.js"))
|
|
39
38
|
.initialization_script(include_str!("../inject/style.js"))
|
|
40
|
-
//This is necessary to allow for file injection by external developers for customization purposes.
|
|
41
39
|
.initialization_script(include_str!("../inject/custom.js"));
|
|
42
40
|
|
|
43
41
|
#[cfg(target_os = "macos")]
|
|
@@ -47,12 +45,19 @@ pub fn get_window(app: &mut App, config: PakeConfig, _data_dir: PathBuf) -> Wind
|
|
|
47
45
|
} else {
|
|
48
46
|
TitleBarStyle::Visible
|
|
49
47
|
};
|
|
50
|
-
|
|
48
|
+
|
|
49
|
+
window_builder = window_builder.title_bar_style(title_bar_style);
|
|
50
|
+
|
|
51
|
+
if window_config.dark_mode {
|
|
52
|
+
window_builder = window_builder.theme(Some(Theme::Dark));
|
|
53
|
+
}
|
|
51
54
|
}
|
|
52
55
|
|
|
53
56
|
#[cfg(not(target_os = "macos"))]
|
|
54
57
|
{
|
|
55
|
-
window_builder = window_builder
|
|
58
|
+
window_builder = window_builder
|
|
59
|
+
.data_directory(_data_dir)
|
|
60
|
+
.title(app.package_info().name.clone())
|
|
56
61
|
}
|
|
57
62
|
|
|
58
63
|
window_builder.build().expect("Failed to build window")
|
|
@@ -43,7 +43,7 @@ function isDownloadLink(url) {
|
|
|
43
43
|
'3gp', '7z', 'ai', 'apk', 'avi', 'bmp', 'csv', 'dmg', 'doc', 'docx',
|
|
44
44
|
'fla', 'flv', 'gif', 'gz', 'gzip', 'ico', 'iso', 'indd', 'jar', 'jpeg',
|
|
45
45
|
'jpg', 'm3u8', 'mov', 'mp3', 'mp4', 'mpa', 'mpg', 'mpeg', 'msi', 'odt',
|
|
46
|
-
'ogg', 'ogv', 'pdf', 'png', 'ppt', 'pptx', 'psd', 'rar', 'raw',
|
|
46
|
+
'ogg', 'ogv', 'pdf', 'png', 'ppt', 'pptx', 'psd', 'rar', 'raw',
|
|
47
47
|
'svg', 'swf', 'tar', 'tif', 'tiff', 'ts', 'txt', 'wav', 'webm', 'webp',
|
|
48
48
|
'wma', 'wmv', 'xls', 'xlsx', 'xml', 'zip', 'json', 'yaml', '7zip', 'mkv'
|
|
49
49
|
];
|
|
@@ -56,10 +56,6 @@ function externalDownLoadLink() {
|
|
|
56
56
|
return ['quickref.me'].indexOf(location.hostname) > -1;
|
|
57
57
|
}
|
|
58
58
|
|
|
59
|
-
// Directly jumping out without hostname address.
|
|
60
|
-
function externalTargetLink() {
|
|
61
|
-
return ['zbook.lol'].indexOf(location.hostname) > -1;
|
|
62
|
-
}
|
|
63
59
|
|
|
64
60
|
document.addEventListener('DOMContentLoaded', () => {
|
|
65
61
|
const tauri = window.__TAURI__;
|
|
@@ -176,8 +172,6 @@ document.addEventListener('DOMContentLoaded', () => {
|
|
|
176
172
|
// case: download from dataURL -> convert dataURL ->
|
|
177
173
|
} else if (url.startsWith('data:')) {
|
|
178
174
|
downloadFromDataUri(url, filename);
|
|
179
|
-
} else if (isDownloadLink(url) || anchorEle.host !== window.location.host) {
|
|
180
|
-
handleExternalLink(e, url);
|
|
181
175
|
}
|
|
182
176
|
},
|
|
183
177
|
true,
|
|
@@ -187,7 +181,6 @@ document.addEventListener('DOMContentLoaded', () => {
|
|
|
187
181
|
};
|
|
188
182
|
}
|
|
189
183
|
|
|
190
|
-
const isExternalLink = link => window.location.host !== link.host;
|
|
191
184
|
// process special download protocol['data:','blob:']
|
|
192
185
|
const isSpecialDownload = url => ['blob', 'data'].some(protocol => url.startsWith(protocol));
|
|
193
186
|
|
|
@@ -214,12 +207,6 @@ document.addEventListener('DOMContentLoaded', () => {
|
|
|
214
207
|
const absoluteUrl = hrefUrl.href;
|
|
215
208
|
let filename = anchorElement.download || getFilenameFromUrl(absoluteUrl);
|
|
216
209
|
|
|
217
|
-
// Handling external link redirection.
|
|
218
|
-
if ((isExternalLink(absoluteUrl) && ['_blank', '_new'].includes(anchorElement.target)) || externalTargetLink()) {
|
|
219
|
-
handleExternalLink(e, absoluteUrl);
|
|
220
|
-
return;
|
|
221
|
-
}
|
|
222
|
-
|
|
223
210
|
// Process download links for Rust to handle.
|
|
224
211
|
if (isDownloadRequired(absoluteUrl, anchorElement, e) && !externalDownLoadLink() && !isSpecialDownload(absoluteUrl)) {
|
|
225
212
|
handleDownloadLink(e, absoluteUrl, filename);
|
|
@@ -239,7 +226,7 @@ document.addEventListener('DOMContentLoaded', () => {
|
|
|
239
226
|
// Apple login and google login
|
|
240
227
|
if (name === 'AppleAuthentication') {
|
|
241
228
|
//do nothing
|
|
242
|
-
} else if (specs.includes('height=') || specs.includes('width=')) {
|
|
229
|
+
} else if (specs && (specs.includes('height=') || specs.includes('width='))) {
|
|
243
230
|
location.href = url;
|
|
244
231
|
} else {
|
|
245
232
|
const baseUrl = window.location.origin + window.location.pathname;
|
|
@@ -342,6 +342,10 @@ window.addEventListener('DOMContentLoaded', _event => {
|
|
|
342
342
|
padding-top: 20px;
|
|
343
343
|
}
|
|
344
344
|
|
|
345
|
+
#__next > div.relative.z-0.flex.h-full.w-full.overflow-hidden > div.flex-shrink-0.overflow-x-hidden.bg-token-sidebar-surface-primary > div > div > div > div > nav, #__next > div.relative.z-0.flex.h-full.w-full.overflow-hidden > div.relative.flex.h-full.max-w-full.flex-1.flex-col.overflow-hidden > main {
|
|
346
|
+
padding-top: 6px;
|
|
347
|
+
}
|
|
348
|
+
|
|
345
349
|
#__next > div.AnnouncementWrapper_container__Z51yh > div > aside.SidebarLayout_sidebar__SXeDJ.SidebarLayout_left__k163a > div > div > header{
|
|
346
350
|
padding-left: 84px;
|
|
347
351
|
padding-top: 10px;
|
package/src-tauri/src/main.rs
CHANGED
|
@@ -9,10 +9,10 @@ mod util;
|
|
|
9
9
|
use app::{invoke, menu, window};
|
|
10
10
|
use invoke::{download_file, download_file_by_binary};
|
|
11
11
|
use menu::{get_system_tray, system_tray_handle};
|
|
12
|
+
use std::time::Duration;
|
|
12
13
|
use tauri::{GlobalShortcutManager, Manager};
|
|
13
|
-
use tauri_plugin_window_state::Builder as windowStatePlugin;
|
|
14
14
|
use util::{get_data_dir, get_pake_config};
|
|
15
|
-
use window::
|
|
15
|
+
use window::build_window;
|
|
16
16
|
|
|
17
17
|
pub fn run_app() {
|
|
18
18
|
let (pake_config, tauri_config) = get_pake_config();
|
|
@@ -33,28 +33,25 @@ pub fn run_app() {
|
|
|
33
33
|
let activation_shortcut = pake_config.windows[0].activation_shortcut.clone();
|
|
34
34
|
|
|
35
35
|
tauri_app
|
|
36
|
-
.plugin(
|
|
36
|
+
.plugin(tauri_plugin_window_state::Builder::default().build())
|
|
37
37
|
.plugin(tauri_plugin_oauth::init())
|
|
38
38
|
.invoke_handler(tauri::generate_handler![
|
|
39
39
|
download_file,
|
|
40
40
|
download_file_by_binary
|
|
41
41
|
])
|
|
42
42
|
.setup(move |app| {
|
|
43
|
-
let _window =
|
|
44
|
-
// Prevent initial shaking
|
|
43
|
+
let _window = build_window(app, pake_config, data_dir);
|
|
45
44
|
_window.show().unwrap();
|
|
46
|
-
|
|
47
45
|
if !activation_shortcut.is_empty() {
|
|
48
46
|
let app_handle = app.app_handle().clone();
|
|
49
47
|
app_handle
|
|
50
48
|
.global_shortcut_manager()
|
|
51
49
|
.register(activation_shortcut.as_str(), move || {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
true => window.hide().unwrap(),
|
|
50
|
+
match _window.is_visible().unwrap() {
|
|
51
|
+
true => _window.hide().unwrap(),
|
|
55
52
|
false => {
|
|
56
|
-
|
|
57
|
-
|
|
53
|
+
_window.show().unwrap();
|
|
54
|
+
_window.set_focus().unwrap();
|
|
58
55
|
}
|
|
59
56
|
}
|
|
60
57
|
})
|
|
@@ -65,14 +62,24 @@ pub fn run_app() {
|
|
|
65
62
|
})
|
|
66
63
|
.on_window_event(|event| {
|
|
67
64
|
if let tauri::WindowEvent::CloseRequested { api, .. } = event.event() {
|
|
65
|
+
let window = event.window();
|
|
66
|
+
|
|
68
67
|
#[cfg(target_os = "macos")]
|
|
69
68
|
{
|
|
70
|
-
|
|
71
|
-
|
|
69
|
+
let window_handle = window.clone();
|
|
70
|
+
tauri::async_runtime::spawn(async move {
|
|
71
|
+
if window_handle.is_fullscreen().unwrap_or(false) {
|
|
72
|
+
window_handle.set_fullscreen(false).unwrap();
|
|
73
|
+
// Give a small delay to ensure the full-screen exit operation is completed.
|
|
74
|
+
tokio::time::sleep(Duration::from_millis(900)).await;
|
|
75
|
+
}
|
|
76
|
+
window_handle.minimize().unwrap();
|
|
77
|
+
window_handle.hide().unwrap();
|
|
78
|
+
});
|
|
72
79
|
}
|
|
73
80
|
|
|
74
81
|
#[cfg(not(target_os = "macos"))]
|
|
75
|
-
|
|
82
|
+
window.close().unwrap();
|
|
76
83
|
|
|
77
84
|
api.prevent_close();
|
|
78
85
|
}
|