pake-cli 3.2.0-beta → 3.2.0-beta11

package/dist/cli.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 import chalk from 'chalk';
 import { InvalidArgumentError, program, Option } from 'commander';
 import log from 'loglevel';
@@ -19,13 +20,13 @@ import { fileTypeFromBuffer } from 'file-type';
 import * as psl from 'psl';
 
 var name = "pake-cli";
-var version$1 = "3.2.0-beta";
+var version$1 = "3.2.0-beta11";
 var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。";
 var engines = {
 	node: ">=16.0.0"
 };
 var bin = {
-	pake: "./cli.js"
+	pake: "./dist/cli.js"
 };
 var repository = {
 	type: "git",
@@ -45,13 +46,12 @@ var keywords = [
 ];
 var files = [
 	"dist",
-	"src-tauri",
-	"cli.js"
+	"src-tauri"
 ];
 var scripts = {
 	start: "npm run dev",
 	dev: "npm run tauri dev",
-	build: "npm run tauri build --release",
+	build: "npm run tauri build --",
 	"build:debug": "npm run tauri build -- --debug",
 	"build:mac": "npm run tauri build -- --target universal-apple-darwin",
 	"build:config": "chmod +x script/app_config.mjs && node script/app_config.mjs",
@@ -60,11 +60,13 @@ var scripts = {
 	cli: "rollup -c rollup.config.js --watch",
 	"cli:dev": "cross-env NODE_ENV=development rollup -c rollup.config.js -w",
 	"cli:build": "cross-env NODE_ENV=production rollup -c rollup.config.js",
-	format: "npx prettier --write . --ignore-unknown && cd src-tauri && cargo fmt --verbose",
+	test: "npm run cli:build && PAKE_CREATE_APP=1 node tests/index.js",
+	format: "prettier --write . --ignore-unknown && cd src-tauri && cargo fmt --verbose",
+	"hooks:setup": "bash .githooks/setup.sh",
 	prepublishOnly: "npm run cli:build"
 };
 var type = "module";
-var exports = "./dist/pake.js";
+var exports = "./dist/cli.js";
 var license = "MIT";
 var dependencies = {
 	"@tauri-apps/api": "^2.7.0",
@@ -77,6 +79,7 @@ var dependencies = {
 	"fs-extra": "^11.3.1",
 	loglevel: "^1.9.2",
 	ora: "^8.2.0",
+	"pake-cli": "file:.yalc/pake-cli",
 	prompts: "^2.4.2",
 	psl: "^1.15.0",
 	"tmp-promise": "^3.0.3",
@@ -97,6 +100,7 @@ var devDependencies = {
 	"@types/update-notifier": "^6.0.8",
 	"app-root-path": "^3.1.0",
 	"cross-env": "^7.0.3",
+	prettier: "^3.4.2",
 	rollup: "^4.46.2",
 	"rollup-plugin-typescript2": "^0.36.0",
 	tslib: "^2.8.1",
@@ -133,7 +137,8 @@ var windows = [
 		dark_mode: false,
 		activation_shortcut: "",
 		disabled_web_shortcuts: false,
-		hide_on_close: true
+		hide_on_close: true,
+		incognito: false
 	}
 ];
 var user_agent = {
@@ -222,10 +227,10 @@ var MacConf = {
 	bundle: bundle$1
 };
 
-var productName = "we-read";
+var productName = "weekly";
 var bundle = {
 	icon: [
-		"png/weekly.png"
+		"png/weekly_512.png"
 	],
 	active: true,
 	linux: {
@@ -312,18 +317,25 @@ const IS_LINUX = platform$1 === 'linux';
 const currentModulePath = fileURLToPath(import.meta.url);
 // Resolve the parent directory of the current module
 const npmDirectory = path.join(path.dirname(currentModulePath), '..');
-const tauriConfigDirectory = path.join(npmDirectory, 'src-tauri');
+const tauriConfigDirectory = path.join(npmDirectory, 'src-tauri', '.pake');
 
-async function shellExec(command) {
+async function shellExec(command, timeout = 300000) {
     try {
         const { exitCode } = await execa(command, {
             cwd: npmDirectory,
             stdio: 'inherit',
+            shell: true,
+            timeout,
         });
         return exitCode;
     }
     catch (error) {
-        throw new Error(`Error occurred while executing command "${command}". Exit code: ${error.exitCode}`);
+        const exitCode = error.exitCode ?? 'unknown';
+        const errorMessage = error.message || 'Unknown error occurred';
+        if (error.timedOut) {
+            throw new Error(`Command timed out after ${timeout}ms: "${command}". Try increasing timeout or check network connectivity.`);
+        }
+        throw new Error(`Error occurred while executing command "${command}". Exit code: ${exitCode}. Details: ${errorMessage}`);
     }
 }
 
@@ -435,7 +447,26 @@ async function combineFiles(files, output) {
 }
 
 async function mergeConfig(url, options, tauriConf) {
-    const { width, height, fullscreen, hideTitleBar, alwaysOnTop, appVersion, darkMode, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name, resizable = true, inject, proxyUrl, installerLanguage, hideOnClose, } = options;
+    // Ensure .pake directory exists and copy source templates if needed
+    const srcTauriDir = path.join(npmDirectory, 'src-tauri');
+    await fsExtra.ensureDir(tauriConfigDirectory);
+    // Copy source config files to .pake directory (as templates)
+    const sourceFiles = [
+        'tauri.conf.json',
+        'tauri.macos.conf.json',
+        'tauri.windows.conf.json',
+        'tauri.linux.conf.json',
+        'pake.json',
+    ];
+    await Promise.all(sourceFiles.map(async (file) => {
+        const sourcePath = path.join(srcTauriDir, file);
+        const destPath = path.join(tauriConfigDirectory, file);
+        if ((await fsExtra.pathExists(sourcePath)) &&
+            !(await fsExtra.pathExists(destPath))) {
+            await fsExtra.copy(sourcePath, destPath);
+        }
+    }));
+    const { width, height, fullscreen, hideTitleBar, alwaysOnTop, appVersion, darkMode, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name, resizable = true, inject, proxyUrl, installerLanguage, hideOnClose, incognito, title, } = options;
     const { platform } = process;
     // Set Windows parameters.
     const tauriConfWindowOptions = {
@@ -449,6 +480,8 @@ async function mergeConfig(url, options, tauriConf) {
         dark_mode: darkMode,
         disabled_web_shortcuts: disabledWebShortcuts,
         hide_on_close: hideOnClose,
+        incognito: incognito,
+        title: title || null,
     };
     Object.assign(tauriConf.pake.windows[0], { url, ...tauriConfWindowOptions });
     tauriConf.productName = name;
@@ -642,14 +675,21 @@ class BaseBuilder {
         const rustProjectDir = path.join(tauriSrcPath, '.cargo');
         const projectConf = path.join(rustProjectDir, 'config.toml');
         await fsExtra.ensureDir(rustProjectDir);
+        // For global CLI installation, always use npm
+        const packageManager = 'npm';
+        const registryOption = isChina
+            ? ' --registry=https://registry.npmmirror.com'
+            : '';
+        // Windows环境下需要更长的超时时间
+        const timeout = process.platform === 'win32' ? 600000 : 300000;
         if (isChina) {
             logger.info('✺ Located in China, using npm/rsProxy CN mirror.');
             const projectCnConf = path.join(tauriSrcPath, 'rust_proxy.toml');
             await fsExtra.copy(projectCnConf, projectConf);
-            await shellExec(`cd "${npmDirectory}" && npm install --registry=https://registry.npmmirror.com`);
+            await shellExec(`cd "${npmDirectory}" && ${packageManager} install${registryOption}`, timeout);
         }
         else {
-            await shellExec(`cd "${npmDirectory}" && npm install`);
+            await shellExec(`cd "${npmDirectory}" && ${packageManager} install`, timeout);
         }
         spinner.succeed(chalk.green('Package installed!'));
         if (!tauriTargetPathExists) {
@@ -683,25 +723,66 @@ class BaseBuilder {
         return target;
     }
     getBuildCommand() {
-        // the debug option should support `--debug` and `--release`
-        return this.options.debug ? 'npm run build:debug' : 'npm run build';
+        const baseCommand = this.options.debug
+            ? 'npm run build:debug'
+            : 'npm run build';
+        // Use temporary config directory to avoid modifying source files
+        const configPath = path.join(npmDirectory, 'src-tauri', '.pake', 'tauri.conf.json');
+        let fullCommand = `${baseCommand} -- -c "${configPath}"`;
+        // For macOS, use app bundles by default unless DMG is explicitly requested
+        if (IS_MAC && this.options.targets === 'app') {
+            fullCommand += ' --bundles app';
+        }
+        // Add macos-proxy feature for modern macOS (Darwin 23+ = macOS 14+)
+        if (IS_MAC) {
+            const macOSVersion = this.getMacOSMajorVersion();
+            if (macOSVersion >= 23) {
+                fullCommand += ' --features macos-proxy';
+            }
+        }
+        return fullCommand;
+    }
+    getMacOSMajorVersion() {
+        try {
+            const os = require('os');
+            const release = os.release();
+            const majorVersion = parseInt(release.split('.')[0], 10);
+            return majorVersion;
+        }
+        catch (error) {
+            return 0; // Disable proxy feature if version detection fails
+        }
     }
     getBasePath() {
         const basePath = this.options.debug ? 'debug' : 'release';
         return `src-tauri/target/${basePath}/bundle/`;
     }
     getBuildAppPath(npmDirectory, fileName, fileType) {
-        return path.join(npmDirectory, this.getBasePath(), fileType.toLowerCase(), `${fileName}.${fileType}`);
+        // For app bundles on macOS, the directory is 'macos', not 'app'
+        const bundleDir = fileType.toLowerCase() === 'app' ? 'macos' : fileType.toLowerCase();
+        return path.join(npmDirectory, this.getBasePath(), bundleDir, `${fileName}.${fileType}`);
     }
 }
 
 class MacBuilder extends BaseBuilder {
     constructor(options) {
         super(options);
-        this.options.targets = 'dmg';
+        // Use DMG by default for distribution
+        // Only create app bundles for testing to avoid user interaction
+        if (process.env.PAKE_CREATE_APP === '1') {
+            this.options.targets = 'app';
+        }
+        else {
+            this.options.targets = 'dmg';
+        }
     }
     getFileName() {
         const { name } = this.options;
+        // For app bundles, use simple name without version/arch
+        if (this.options.targets === 'app') {
+            return name;
+        }
+        // For DMG files, use versioned filename
         let arch;
         if (this.options.multiArch) {
             arch = 'universal';
@@ -808,6 +889,7 @@ const DEFAULT_PAKE_OPTIONS = {
     inject: [],
     installerLanguage: 'en-US',
     hideOnClose: true,
+    incognito: false,
 };
 
 async function checkUpdateTips() {
@@ -1051,6 +1133,10 @@ program
     .addOption(new Option('--hide-on-close', 'Hide window on close instead of exiting')
     .default(DEFAULT_PAKE_OPTIONS.hideOnClose)
     .hideHelp())
+    .addOption(new Option('--title <string>', 'Window title').hideHelp())
+    .addOption(new Option('--incognito', 'Launch app in incognito/private mode')
+    .default(DEFAULT_PAKE_OPTIONS.incognito)
+    .hideHelp())
     .addOption(new Option('--installer-language <string>', 'Installer language')
     .default(DEFAULT_PAKE_OPTIONS.installerLanguage)
     .hideHelp())