Comparing version 2.5.2 to 2.6.0
@@ -23,3 +23,3 @@ import chalk from 'chalk'; | ||
var name = "pake-cli"; | ||
var version = "2.5.2"; | ||
var version = "2.6.0"; | ||
var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。"; | ||
@@ -71,5 +71,5 @@ var engines = { | ||
var dependencies = { | ||
"@tauri-apps/api": "^1.5.4", | ||
"@tauri-apps/cli": "^1.5.13", | ||
axios: "^1.6.8", | ||
"@tauri-apps/api": "^1.6.0", | ||
"@tauri-apps/cli": "^1.6.1", | ||
axios: "^1.7.7", | ||
chalk: "^5.3.0", | ||
@@ -80,3 +80,3 @@ commander: "^11.1.0", | ||
"is-url": "^1.2.4", | ||
loglevel: "^1.9.1", | ||
loglevel: "^1.9.2", | ||
ora: "^7.0.1", | ||
@@ -87,13 +87,13 @@ prompts: "^2.4.2", | ||
"tmp-promise": "^3.0.3", | ||
"update-notifier": "^7.0.0" | ||
"update-notifier": "^7.3.1" | ||
}; | ||
var devDependencies = { | ||
"@rollup/plugin-alias": "^5.1.0", | ||
"@rollup/plugin-commonjs": "^25.0.7", | ||
"@rollup/plugin-commonjs": "^25.0.8", | ||
"@rollup/plugin-json": "^6.1.0", | ||
"@rollup/plugin-replace": "^5.0.5", | ||
"@rollup/plugin-replace": "^5.0.7", | ||
"@rollup/plugin-terser": "^0.4.4", | ||
"@types/fs-extra": "^11.0.4", | ||
"@types/is-url": "^1.2.32", | ||
"@types/node": "^20.12.10", | ||
"@types/node": "^20.16.5", | ||
"@types/page-icon": "^0.3.6", | ||
@@ -107,6 +107,6 @@ "@types/prompts": "^2.4.9", | ||
"cross-env": "^7.0.3", | ||
rollup: "^4.17.2", | ||
rollup: "^4.21.3", | ||
"rollup-plugin-typescript2": "^0.36.0", | ||
tslib: "^2.6.2", | ||
typescript: "^5.4.5" | ||
tslib: "^2.7.0", | ||
typescript: "^5.6.2" | ||
}; | ||
@@ -140,2 +140,3 @@ var packageJson = { | ||
resizable: true, | ||
dark_mode: false, | ||
always_on_top: false, | ||
@@ -485,3 +486,3 @@ activation_shortcut: "", | ||
async function mergeConfig(url, options, tauriConf) { | ||
const { width, height, fullscreen, hideTitleBar, alwaysOnTop, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name, resizable = true, inject, safeDomain, } = options; | ||
const { width, height, fullscreen, hideTitleBar, alwaysOnTop, darkMode, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name, resizable = true, inject, safeDomain, installerLanguage, } = options; | ||
const { platform } = process; | ||
@@ -497,2 +498,3 @@ // Set Windows parameters. | ||
always_on_top: alwaysOnTop, | ||
dark_mode: darkMode, | ||
disabled_web_shortcuts: disabledWebShortcuts, | ||
@@ -503,2 +505,5 @@ }; | ||
tauriConf.tauri.bundle.identifier = identifier; | ||
if (platform == "win32") { | ||
tauriConf.tauri.bundle.windows.wix.language[0] = installerLanguage; | ||
} | ||
//Judge the type of URL, whether it is a file or a website. | ||
@@ -846,2 +851,3 @@ const pathExists = await fsExtra.pathExists(url); | ||
alwaysOnTop: false, | ||
darkMode: false, | ||
disabledWebShortcuts: false, | ||
@@ -858,2 +864,3 @@ activationShortcut: '', | ||
safeDomain: [], | ||
installerLanguage: 'en-US', | ||
}; | ||
@@ -1047,2 +1054,3 @@ | ||
.addOption(new Option('--always-on-top', 'Always on the top level').default(DEFAULT_PAKE_OPTIONS.alwaysOnTop).hideHelp()) | ||
.addOption(new Option('--dark-mode', 'Force Mac app to use dark mode').default(DEFAULT_PAKE_OPTIONS.darkMode).hideHelp()) | ||
.addOption(new Option('--disabled-web-shortcuts', 'Disabled webPage shortcuts') | ||
@@ -1056,2 +1064,3 @@ .default(DEFAULT_PAKE_OPTIONS.disabledWebShortcuts) | ||
.addOption(new Option('--system-tray-icon <string>', 'Custom system tray icon').default(DEFAULT_PAKE_OPTIONS.systemTrayIcon).hideHelp()) | ||
.addOption(new Option('--installer-language <string>', 'Installer language').default(DEFAULT_PAKE_OPTIONS.installerLanguage).hideHelp()) | ||
.version(packageJson.version, '-v, --version', 'Output the current version') | ||
@@ -1058,0 +1067,0 @@ .action(async (url, options) => { |
{ | ||
"name": "pake-cli", | ||
"version": "2.5.2", | ||
"version": "2.6.0", | ||
"description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。", | ||
@@ -50,5 +50,5 @@ "engines": { | ||
"dependencies": { | ||
"@tauri-apps/api": "^1.5.4", | ||
"@tauri-apps/cli": "^1.5.13", | ||
"axios": "^1.6.8", | ||
"@tauri-apps/api": "^1.6.0", | ||
"@tauri-apps/cli": "^1.6.1", | ||
"axios": "^1.7.7", | ||
"chalk": "^5.3.0", | ||
@@ -59,3 +59,3 @@ "commander": "^11.1.0", | ||
"is-url": "^1.2.4", | ||
"loglevel": "^1.9.1", | ||
"loglevel": "^1.9.2", | ||
"ora": "^7.0.1", | ||
@@ -66,13 +66,13 @@ "prompts": "^2.4.2", | ||
"tmp-promise": "^3.0.3", | ||
"update-notifier": "^7.0.0" | ||
"update-notifier": "^7.3.1" | ||
}, | ||
"devDependencies": { | ||
"@rollup/plugin-alias": "^5.1.0", | ||
"@rollup/plugin-commonjs": "^25.0.7", | ||
"@rollup/plugin-commonjs": "^25.0.8", | ||
"@rollup/plugin-json": "^6.1.0", | ||
"@rollup/plugin-replace": "^5.0.5", | ||
"@rollup/plugin-replace": "^5.0.7", | ||
"@rollup/plugin-terser": "^0.4.4", | ||
"@types/fs-extra": "^11.0.4", | ||
"@types/is-url": "^1.2.32", | ||
"@types/node": "^20.12.10", | ||
"@types/node": "^20.16.5", | ||
"@types/page-icon": "^0.3.6", | ||
@@ -86,7 +86,7 @@ "@types/prompts": "^2.4.9", | ||
"cross-env": "^7.0.3", | ||
"rollup": "^4.17.2", | ||
"rollup": "^4.21.3", | ||
"rollup-plugin-typescript2": "^0.36.0", | ||
"tslib": "^2.6.2", | ||
"typescript": "^5.4.5" | ||
"tslib": "^2.7.0", | ||
"typescript": "^5.6.2" | ||
} | ||
} |
@@ -375,2 +375,9 @@ <h4 align="right"><strong>English</strong> | <a href="https://github.com/tw93/Pake/blob/master/README_CN.md">简体中文</a> | <a href="https://github.com/tw93/Pake/blob/master/README_JP.md">日本語</a></h4> | ||
<td align="center"> | ||
<a href="https://github.com/mattbajorek"> | ||
<img src="https://avatars.githubusercontent.com/u/17235301?v=4" width="90;" alt="mattbajorek"/> | ||
<br /> | ||
<sub><b>Matt Bajorek</b></sub> | ||
</a> | ||
</td> | ||
<td align="center"> | ||
<a href="https://github.com/Milo123459"> | ||
@@ -390,2 +397,9 @@ <img src="https://avatars.githubusercontent.com/u/50248166?v=4" width="90;" alt="Milo123459"/> | ||
<td align="center"> | ||
<a href="https://github.com/Tianj0o"> | ||
<img src="https://avatars.githubusercontent.com/u/68584284?v=4" width="90;" alt="Tianj0o"/> | ||
<br /> | ||
<sub><b>Qitianjia</b></sub> | ||
</a> | ||
</td> | ||
<td align="center"> | ||
<a href="https://github.com/geekvest"> | ||
@@ -396,3 +410,4 @@ <img src="https://avatars.githubusercontent.com/u/126322776?v=4" width="90;" alt="geekvest"/> | ||
</a> | ||
</td> | ||
</td></tr> | ||
<tr> | ||
<td align="center"> | ||
@@ -411,4 +426,3 @@ <a href="https://github.com/houhoz"> | ||
</a> | ||
</td></tr> | ||
<tr> | ||
</td> | ||
<td align="center"> | ||
@@ -415,0 +429,0 @@ <a href="https://github.com/liudonghua123"> |
@@ -11,2 +11,3 @@ { | ||
"resizable": true, | ||
"dark_mode": false, | ||
"always_on_top": false, | ||
@@ -13,0 +14,0 @@ "activation_shortcut": "", |
@@ -46,3 +46,3 @@ const shortcuts = { | ||
'jpg', 'm3u8', 'mov', 'mp3', 'mp4', 'mpa', 'mpg', 'mpeg', 'msi', 'odt', | ||
'ogg', 'ogv', 'pdf', 'png', 'ppt', 'pptx', 'psd', 'rar', 'raw', 'rss', | ||
'ogg', 'ogv', 'pdf', 'png', 'ppt', 'pptx', 'psd', 'rar', 'raw', | ||
'svg', 'swf', 'tar', 'tif', 'tiff', 'ts', 'txt', 'wav', 'webm', 'webp', | ||
@@ -60,6 +60,2 @@ 'wma', 'wmv', 'xls', 'xlsx', 'xml', 'zip', 'json', 'yaml', '7zip', 'mkv' | ||
// Directly jumping out without hostname address. | ||
function externalTargetLink() { | ||
return ['zbook.lol'].indexOf(location.hostname) > -1; | ||
} | ||
@@ -181,4 +177,2 @@ document.addEventListener('DOMContentLoaded', () => { | ||
downloadFromDataUri(url, filename); | ||
} else if (isDownloadLink(url) || anchorEle.host !== window.location.host) { | ||
handleExternalLink(e, url); | ||
} | ||
@@ -193,3 +187,2 @@ }, | ||
const isExternalLink = link => window.location.host !== link.host; | ||
// process special download protocol['data:','blob:'] | ||
@@ -221,8 +214,2 @@ const isSpecialDownload = url => ['blob', 'data'].some(protocol => url.startsWith(protocol)); | ||
// Handling external link redirection. | ||
if ((isExternalLink(absoluteUrl) && ['_blank', '_new'].includes(anchorElement.target)) || externalTargetLink()) { | ||
handleExternalLink(e, absoluteUrl); | ||
return; | ||
} | ||
// Process download links for Rust to handle. | ||
@@ -247,3 +234,3 @@ if (isDownloadRequired(absoluteUrl, anchorElement, e) && !externalDownLoadLink() && !isSpecialDownload(absoluteUrl)) { | ||
//do nothing | ||
} else if (specs.includes('height=') || specs.includes('width=')) { | ||
} else if (specs && (specs.includes('height=') || specs.includes('width='))) { | ||
location.href = url; | ||
@@ -250,0 +237,0 @@ } else { |
@@ -345,2 +345,6 @@ window.addEventListener('DOMContentLoaded', _event => { | ||
#__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 { | ||
padding-top: 6px; | ||
} | ||
#__next > div.AnnouncementWrapper_container__Z51yh > div > aside.SidebarLayout_sidebar__SXeDJ.SidebarLayout_left__k163a > div > div > header{ | ||
@@ -347,0 +351,0 @@ padding-left: 84px; |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
11314852
2777
465
Updated@tauri-apps/api@^1.6.0
Updated@tauri-apps/cli@^1.6.1
Updatedaxios@^1.7.7
Updatedloglevel@^1.9.2
Updatedupdate-notifier@^7.3.1