lostecho/Pake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update: 2.1.12-beta.0 cli

Browse Source
This commit is contained in:
jeasonnow
2023-07-14 14:51:25 +08:00
parent 363762b696
commit a597af490d
6 changed files with 736 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
dist/.gitkeep vendored
View File

16
dist/about_pake.html vendored
View File

@@ -1,16 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Document</title>
</head>
<body>
<h5>Welcome from Pake!</h5>
<p>version: 1.0.9</p>
<a href="https://github.com/tw93/Pake">Project link</a><br>
<a href="https://github.com/tw93/Pake/discussions">Discussions</a><br>
<a href="https://github.com/tw93/Pake/issues" >Issues</a><br>
<p>LICENSE: MIT</p>
</body>
</html>

87
dist/cli.js vendored
View File

@@ -11,16 +11,16 @@ import { fileURLToPath } from 'url';
import dns from 'dns'; import dns from 'dns';
import http from 'http'; import http from 'http';
import { promisify } from 'util'; import { promisify } from 'util';
import fs from 'fs';
import updateNotifier from 'update-notifier'; import updateNotifier from 'update-notifier';
import axios from 'axios'; import axios from 'axios';
import { dir } from 'tmp-promise'; import { dir } from 'tmp-promise';
import { fileTypeFromBuffer } from 'file-type'; import { fileTypeFromBuffer } from 'file-type';
import psl from 'psl'; import psl from 'psl';
import isUrl from 'is-url'; import isUrl from 'is-url';
import fs from 'fs';
var name = "pake-cli"; var name = "pake-cli";
var version = "2.1.12"; var version = "2.1.12-beta.0";
var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。"; var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。";
var engines = { var engines = {
node: ">=16.0.0" node: ">=16.0.0"
@@ -53,12 +53,14 @@ var scripts = {
start: "npm run dev", start: "npm run dev",
dev: "npm run tauri dev", dev: "npm run tauri dev",
build: "npm run tauri build --release", build: "npm run tauri build --release",
"build:debug": "npm run tauri build -- --debug",
"build:mac": "npm run tauri build -- --target universal-apple-darwin", "build:mac": "npm run tauri build -- --target universal-apple-darwin",
"build:all-unix": "chmod +x ./script/build.sh && ./script/build.sh", "build:all-unix": "chmod +x ./script/build.sh && ./script/build.sh",
"build:all-windows": "pwsh ./script/build.ps1", "build:all-windows": "pwsh ./script/build.ps1",
analyze: "cd src-tauri && cargo bloat --release --crates", analyze: "cd src-tauri && cargo bloat --release --crates",
tauri: "tauri", tauri: "tauri",
cli: "rollup -c rollup.config.js --watch", cli: "rollup -c rollup.config.js --watch",
"cli:dev": "cross-env DEV=true tsx watch ./bin/dev.ts & npm run dev",
"cli:build": "cross-env NODE_ENV=production rollup -c rollup.config.js", "cli:build": "cross-env NODE_ENV=production rollup -c rollup.config.js",
prepublishOnly: "npm run cli:build" prepublishOnly: "npm run cli:build"
}; };
@@ -123,7 +125,7 @@ var packageJson = {
var windows = [ var windows = [
{ {
url: "https://weread.qq.com/", url: "https://weread.qq.com/",
transparent: true, transparent: false,
fullscreen: false, fullscreen: false,
width: 1200, width: 1200,
height: 780, height: 780,
@@ -137,7 +139,7 @@ var user_agent = {
windows: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36" windows: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
}; };
var menu = { var menu = {
macos: true, macos: false,
linux: false, linux: false,
windows: false windows: false
}; };
@@ -146,11 +148,14 @@ var system_tray = {
linux: true, linux: true,
windows: true windows: true
}; };
var inject = [
];
var pakeConf = { var pakeConf = {
windows: windows, windows: windows,
user_agent: user_agent, user_agent: user_agent,
menu: menu, menu: menu,
system_tray: system_tray system_tray: system_tray,
inject: inject
}; };
var tauri$3 = { var tauri$3 = {
@@ -170,7 +175,7 @@ var tauri$3 = {
active: false active: false
}, },
systemTray: { systemTray: {
iconPath: "png/weread_512.png", iconPath: "png/icon_512.png",
iconAsTemplate: true iconAsTemplate: true
}, },
allowlist: { allowlist: {
@@ -191,11 +196,11 @@ var build = {
beforeDevCommand: "" beforeDevCommand: ""
}; };
var CommonConf = { var CommonConf = {
tauri: tauri$3,
"package": { "package": {
productName: "WeRead", productName: "WeRead",
version: "1.0.0" version: "1.0.0"
}, },
tauri: tauri$3,
build: build build: build
}; };
@@ -239,9 +244,9 @@ var WinConf = {
var tauri$1 = { var tauri$1 = {
bundle: { bundle: {
icon: [ icon: [
"icons/weread.icns" "icons/icon.icns"
], ],
identifier: "com.pake.weread", identifier: "com.pake.5b8ae9",
active: true, active: true,
category: "DeveloperTool", category: "DeveloperTool",
copyright: "", copyright: "",
@@ -323,7 +328,7 @@ let tauriConfig = {
// Generates an identifier based on the given URL. // Generates an identifier based on the given URL.
function getIdentifier(url) { function getIdentifier(url) {
const postFixHash = crypto.createHash('md5').update(url).digest('hex').substring(0, 6); const postFixHash = crypto.createHash('md5').update(url).digest('hex').substring(0, 6);
return `pake-${postFixHash}`; return `com.pake.${postFixHash}`;
} }
async function promptText(message, initial) { async function promptText(message, initial) {
const response = await prompts({ const response = await prompts({
@@ -357,7 +362,7 @@ const IS_LINUX = platform$1 === 'linux';
// Convert the current module URL to a file path // Convert the current module URL to a file path
const currentModulePath = fileURLToPath(import.meta.url); const currentModulePath = fileURLToPath(import.meta.url);
// Resolve the parent directory of the current module // Resolve the parent directory of the current module
const npmDirectory = path.join(path.dirname(currentModulePath), '..'); const npmDirectory = process.env.DEV === 'true' ? process.cwd() : path.join(path.dirname(currentModulePath), '..');
function shellExec(command) { function shellExec(command) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -456,8 +461,20 @@ function checkRustInstalled() {
return shelljs.exec('rustc --version', { silent: true }).code === 0; return shelljs.exec('rustc --version', { silent: true }).code === 0;
} }
async function combineFiles(files, output) {
const contents = files.map(file => {
const fileContent = fs.readFileSync(file);
if (file.endsWith('.css')) {
return "window.addEventListener('DOMContentLoaded', (_event) => { const css = `" + fileContent + "`; const style = document.createElement('style'); style.innerHTML = css; document.head.appendChild(style); });";
}
return "window.addEventListener('DOMContentLoaded', (_event) => { " + fileContent + " });";
});
fs.writeFileSync(output, contents.join('\n'));
return files;
}
async function mergeConfig(url, options, tauriConf) { async function mergeConfig(url, options, tauriConf) {
const { width, height, fullscreen, transparent, userAgent, showMenu, showSystemTray, systemTrayIcon, iterCopyFile, identifier, name, resizable = true, } = options; const { width, height, fullscreen, transparent, userAgent, showMenu, showSystemTray, systemTrayIcon, iterCopyFile, identifier, name, resizable = true, inject, safeDomain, } = options;
const { platform } = process; const { platform } = process;
// Set Windows parameters. // Set Windows parameters.
const tauriConfWindowOptions = { const tauriConfWindowOptions = {
@@ -495,7 +512,23 @@ async function mergeConfig(url, options, tauriConf) {
else { else {
tauriConf.pake.windows[0].url_type = 'web'; tauriConf.pake.windows[0].url_type = 'web';
// Set the secure domain for calling window.__TAURI__ to the application domain that has been set. // Set the secure domain for calling window.__TAURI__ to the application domain that has been set.
tauriConf.tauri.security.dangerousRemoteDomainIpcAccess[0].domain = new URL(url).hostname; tauriConf.tauri.security.dangerousRemoteDomainIpcAccess = [
{
domain: new URL(url).hostname,
windows: ['pake'],
enableTauriAPI: true,
},
];
}
if (safeDomain.length > 0) {
tauriConf.tauri.security.dangerousRemoteDomainIpcAccess = [
...tauriConf.tauri.security.dangerousRemoteDomainIpcAccess,
...safeDomain.map(domain => ({
domain,
windows: ['pake'],
enableTauriAPI: true,
})),
];
} }
const platformMap = { const platformMap = {
win32: 'windows', win32: 'windows',
@@ -513,8 +546,7 @@ async function mergeConfig(url, options, tauriConf) {
delete tauriConf.tauri.bundle.deb.files; delete tauriConf.tauri.bundle.deb.files;
const validTargets = ['all', 'deb', 'appimage']; const validTargets = ['all', 'deb', 'appimage'];
if (validTargets.includes(options.targets)) { if (validTargets.includes(options.targets)) {
tauriConf.tauri.bundle.targets = tauriConf.tauri.bundle.targets = options.targets === 'all' ? ['deb', 'appimage'] : [options.targets];
options.targets === 'all' ? ['deb', 'appimage'] : [options.targets];
} }
else { else {
logger.warn(`✼ The target must be one of ${validTargets.join(', ')}, the default 'deb' will be used.`); logger.warn(`✼ The target must be one of ${validTargets.join(', ')}, the default 'deb' will be used.`);
@@ -590,6 +622,21 @@ async function mergeConfig(url, options, tauriConf) {
} }
} }
tauriConf.tauri.systemTray.iconPath = trayIconPath; tauriConf.tauri.systemTray.iconPath = trayIconPath;
const injectFilePath = path.join(npmDirectory, `src-tauri/src/inject/_INJECT_.js`);
// inject js or css files
if (inject?.length > 0) {
if (!inject.every(item => item.endsWith('.css') || item.endsWith('.js'))) {
logger.error('The injected file must be in either CSS or JS format.');
return;
}
const files = inject.map(filepath => path.isAbsolute(filepath) ? filepath : path.join(process.cwd(), filepath));
tauriConf.pake.inject = files;
await combineFiles(files, injectFilePath);
}
else {
tauriConf.pake.inject = [];
await fsExtra.writeFile(injectFilePath, '');
}
// Save config file. // Save config file.
const platformConfigPaths = { const platformConfigPaths = {
win32: 'src-tauri/tauri.windows.conf.json', win32: 'src-tauri/tauri.windows.conf.json',
@@ -656,6 +703,9 @@ class BaseBuilder {
async build(url) { async build(url) {
await this.buildAndCopy(url, this.options.targets); await this.buildAndCopy(url, this.options.targets);
} }
async start(url) {
await mergeConfig(url, this.options, tauriConfig);
}
async buildAndCopy(url, target) { async buildAndCopy(url, target) {
const { name } = this.options; const { name } = this.options;
await mergeConfig(url, this.options, tauriConfig); await mergeConfig(url, this.options, tauriConfig);
@@ -677,7 +727,8 @@ class BaseBuilder {
return target; return target;
} }
getBuildCommand() { getBuildCommand() {
return 'npm run build'; // the debug option should support `--debug` and `--release`
return this.options.debug ? 'npm run build:debug' : 'npm run build';
} }
getBasePath() { getBasePath() {
return 'src-tauri/target/release/bundle/'; return 'src-tauri/target/release/bundle/';
@@ -783,6 +834,8 @@ const DEFAULT_PAKE_OPTIONS = {
iterCopyFile: false, iterCopyFile: false,
systemTrayIcon: '', systemTrayIcon: '',
debug: false, debug: false,
inject: [],
safeDomain: [],
}; };
async function checkUpdateTips() { async function checkUpdateTips() {
@@ -965,6 +1018,8 @@ program
.option('--iter-copy-file', 'Copy files when URL is a local file', DEFAULT_PAKE_OPTIONS.iterCopyFile) .option('--iter-copy-file', 'Copy files when URL is a local file', DEFAULT_PAKE_OPTIONS.iterCopyFile)
.option('--multi-arch', 'Only for Mac, supports both Intel and M1', DEFAULT_PAKE_OPTIONS.multiArch) .option('--multi-arch', 'Only for Mac, supports both Intel and M1', DEFAULT_PAKE_OPTIONS.multiArch)
.option('--targets <string>', 'Only for Linux, option "deb" or "appimage"', DEFAULT_PAKE_OPTIONS.targets) .option('--targets <string>', 'Only for Linux, option "deb" or "appimage"', DEFAULT_PAKE_OPTIONS.targets)
.option('--inject [injects...]', 'inject .js or .css for this app', DEFAULT_PAKE_OPTIONS.inject)
.option('--safe-domain [domains...]', 'domains that can call window.__TAURI__ and use ipc', DEFAULT_PAKE_OPTIONS.safeDomain)
.option('--debug', 'Debug mode', DEFAULT_PAKE_OPTIONS.debug) .option('--debug', 'Debug mode', DEFAULT_PAKE_OPTIONS.debug)
.version(packageJson.version, '-v, --version', 'Output the current version') .version(packageJson.version, '-v, --version', 'Output the current version')
.action(async (url, options) => { .action(async (url, options) => {

9
src-tauri/pake.json
View File

@@ -1,8 +1,8 @@
{ {
"windows": [ "windows": [
{ {
"url": "https://zbook.lol/", "url": "https://weread.qq.com/",
"transparent": true, "transparent": false,
"fullscreen": false, "fullscreen": false,
"width": 1200, "width": 1200,
"height": 780, "height": 780,
@@ -25,8 +25,5 @@
"linux": true, "linux": true,
"windows": true "windows": true
}, },
"inject": [ "inject": []
"/Users/guyifeng/workspace/seeyon/pake-patch/index.js",
"/Users/guyifeng/workspace/seeyon/pake-patch/index.css"
]
} }

11
src-tauri/tauri.conf.json
View File

@@ -4,14 +4,7 @@
"csp": null, "csp": null,
"dangerousRemoteDomainIpcAccess": [ "dangerousRemoteDomainIpcAccess": [
{ {
"domain": "zbook.lol", "domain": "weread.qq.com",
"windows": [
"pake"
],
"enableTauriAPI": true
},
{
"domain": "zbook.eu.org",
"windows": [ "windows": [
"pake" "pake"
], ],
@@ -37,7 +30,7 @@
} }
}, },
"package": { "package": {
"productName": "zBook", "productName": "WeRead",
"version": "1.0.0" "version": "1.0.0"
}, },
"build": { "build": {

44
src-tauri/tauri.macos.conf.json
View File

@@ -1,23 +1,27 @@
{ {
"tauri": { "tauri": {
"bundle": { "bundle": {
"icon": ["icons/weread.icns"], "icon": [
"identifier": "com.pake.weread", "icons/icon.icns"
"active": true, ],
"category": "DeveloperTool", "identifier": "com.pake.5b8ae9",
"copyright": "", "active": true,
"externalBin": [], "category": "DeveloperTool",
"longDescription": "", "copyright": "",
"macOS": { "externalBin": [],
"entitlements": null, "longDescription": "",
"exceptionDomain": "", "macOS": {
"frameworks": [], "entitlements": null,
"providerShortName": null, "exceptionDomain": "",
"signingIdentity": null "frameworks": [],
}, "providerShortName": null,
"resources": [], "signingIdentity": null
"shortDescription": "", },
"targets": ["dmg"] "resources": [],
"shortDescription": "",
"targets": [
"dmg"
]
}
} }
}
} }