pake-cli 3.2.16 → 3.2.18

package/dist/cli.js

@@ -22,11 +22,12 @@ import sharp from 'sharp';
 import * as psl from 'psl';
 
 var name = "pake-cli";
-var version = "3.2.16";
+var version = "3.2.18";
 var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。";
 var engines = {
-	node: ">=16.0.0"
+	node: ">=18.0.0"
 };
+var packageManager = "pnpm@10.15.0";
 var bin = {
 	pake: "./dist/cli.js"
 };
@@ -51,29 +52,31 @@ var files = [
 	"src-tauri"
 ];
 var scripts = {
-	start: "npm run dev",
-	dev: "npm run tauri dev",
-	build: "npm run tauri build --",
-	"build:debug": "npm run tauri build -- --debug",
-	"build:mac": "npm run tauri build -- --target universal-apple-darwin",
+	start: "pnpm run dev",
+	dev: "pnpm run tauri dev",
+	build: "tauri build",
+	"build:debug": "tauri build --debug",
+	"build:mac": "tauri build --target universal-apple-darwin",
 	"build:config": "chmod +x scripts/configure-tauri.mjs && node scripts/configure-tauri.mjs",
 	analyze: "cd src-tauri && cargo bloat --release --crates",
 	tauri: "tauri",
 	cli: "cross-env NODE_ENV=development rollup -c -w",
 	"cli:build": "cross-env NODE_ENV=production rollup -c",
-	test: "npm run cli:build && cross-env PAKE_CREATE_APP=1 node tests/index.js",
+	test: "pnpm run cli:build && cross-env PAKE_CREATE_APP=1 node tests/index.js",
 	format: "prettier --write . --ignore-unknown && find tests -name '*.js' -exec sed -i '' 's/[[:space:]]*$//' {} \\; && cd src-tauri && cargo fmt --verbose",
-	prepublishOnly: "npm run cli:build"
+	"format:check": "prettier --check . --ignore-unknown",
+	update: "pnpm update --verbose && cd src-tauri && cargo update",
+	prepublishOnly: "pnpm run cli:build"
 };
 var type = "module";
 var exports = "./dist/cli.js";
 var license = "MIT";
 var dependencies = {
 	"@tauri-apps/api": "^2.8.0",
-	"@tauri-apps/cli": "^2.8.1",
+	"@tauri-apps/cli": "^2.8.3",
 	axios: "^1.11.0",
 	chalk: "^5.6.0",
-	commander: "^11.1.0",
+	commander: "^12.1.0",
 	execa: "^9.6.0",
 	"file-type": "^18.7.0",
 	"fs-extra": "^11.3.1",
@@ -82,7 +85,7 @@ var dependencies = {
 	ora: "^8.2.0",
 	prompts: "^2.4.2",
 	psl: "^1.15.0",
-	sharp: "^0.33.5",
+	sharp: "^0.34.3",
 	"tmp-promise": "^3.0.3",
 	"update-notifier": "^7.3.1"
 };
@@ -101,7 +104,7 @@ var devDependencies = {
 	"app-root-path": "^3.1.0",
 	"cross-env": "^7.0.3",
 	prettier: "^3.6.2",
-	rollup: "^4.46.3",
+	rollup: "^4.49.0",
 	"rollup-plugin-typescript2": "^0.36.0",
 	tslib: "^2.8.1",
 	typescript: "^5.9.2"
@@ -111,6 +114,7 @@ var packageJson = {
 	version: version,
 	description: description,
 	engines: engines,
+	packageManager: packageManager,
 	bin: bin,
 	repository: repository,
 	author: author,
@@ -344,8 +348,10 @@ async function mergeConfig(url, options, tauriConf) {
             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 { width, height, fullscreen, hideTitleBar, alwaysOnTop, appVersion, darkMode, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name, resizable = true, inject, proxyUrl, installerLanguage, hideOnClose, incognito, title, wasm, enableDragDrop, } = options;
     const { platform } = process;
+    // Platform-specific hide_on_close behavior: macOS keeps true, others default to false
+    const platformHideOnClose = hideOnClose ?? platform === 'darwin';
     // Set Windows parameters.
     const tauriConfWindowOptions = {
         width,
@@ -357,9 +363,11 @@ async function mergeConfig(url, options, tauriConf) {
         always_on_top: alwaysOnTop,
         dark_mode: darkMode,
         disabled_web_shortcuts: disabledWebShortcuts,
-        hide_on_close: hideOnClose,
+        hide_on_close: platformHideOnClose,
         incognito: incognito,
         title: title || null,
+        enable_wasm: wasm,
+        enable_drag_drop: enableDragDrop,
     };
     Object.assign(tauriConf.pake.windows[0], { url, ...tauriConfWindowOptions });
     tauriConf.productName = name;
@@ -540,11 +548,13 @@ StartupNotify=true
     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'))) {
+        // Ensure inject is an array before calling .every()
+        const injectArray = Array.isArray(inject) ? inject : [inject];
+        if (!injectArray.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));
+        const files = injectArray.map((filepath) => path.isAbsolute(filepath) ? filepath : path.join(process.cwd(), filepath));
         tauriConf.pake.inject = files;
         await combineFiles(files, injectFilePath);
     }
@@ -553,6 +563,15 @@ StartupNotify=true
         await fsExtra.writeFile(injectFilePath, '');
     }
     tauriConf.pake.proxy_url = proxyUrl || '';
+    // Configure WASM support with required HTTP headers
+    if (wasm) {
+        tauriConf.app.security = {
+            headers: {
+                'Cross-Origin-Opener-Policy': 'same-origin',
+                'Cross-Origin-Embedder-Policy': 'require-corp',
+            },
+        };
+    }
     // Save config file.
     const platformConfigPaths = {
         win32: 'tauri.windows.conf.json',
@@ -589,6 +608,32 @@ class BaseBuilder {
     getBuildTimeout() {
         return 900000; // 15 minutes for all builds
     }
+    async detectPackageManager() {
+        // 使用缓存避免重复检测
+        if (BaseBuilder.packageManagerCache) {
+            return BaseBuilder.packageManagerCache;
+        }
+        const { execa } = await import('execa');
+        // 优先使用pnpm（如果可用）
+        try {
+            await execa('pnpm', ['--version'], { stdio: 'ignore' });
+            logger.info('✺ Using pnpm for package management.');
+            BaseBuilder.packageManagerCache = 'pnpm';
+            return 'pnpm';
+        }
+        catch {
+            // pnpm不可用，回退到npm
+            try {
+                await execa('npm', ['--version'], { stdio: 'ignore' });
+                logger.info('✺ pnpm not available, using npm for package management.');
+                BaseBuilder.packageManagerCache = 'npm';
+                return 'npm';
+            }
+            catch {
+                throw new Error('Neither pnpm nor npm is available. Please install a package manager.');
+            }
+        }
+    }
     async prepare() {
         const tauriSrcPath = path.join(npmDirectory, 'src-tauri');
         const tauriTargetPath = path.join(tauriSrcPath, 'target');
@@ -616,22 +661,23 @@ class BaseBuilder {
         const rustProjectDir = path.join(tauriSrcPath, '.cargo');
         const projectConf = path.join(rustProjectDir, 'config.toml');
         await fsExtra.ensureDir(rustProjectDir);
-        // 统一使用npm，简单可靠
-        const packageManager = 'npm';
+        // 智能检测可用的包管理器
+        const packageManager = await this.detectPackageManager();
         const registryOption = isChina
             ? ' --registry=https://registry.npmmirror.com'
             : '';
-        const legacyPeerDeps = ' --legacy-peer-deps'; // 解决dependency conflicts
+        // 根据包管理器类型设置依赖冲突解决选项
+        const peerDepsOption = packageManager === 'npm' ? ' --legacy-peer-deps' : '';
         const timeout = this.getInstallTimeout();
         const buildEnv = this.getBuildEnvironment();
         if (isChina) {
-            logger.info('✺ Located in China, using npm/rsProxy CN mirror.');
+            logger.info(`✺ Located in China, using ${packageManager}/rsProxy CN mirror.`);
             const projectCnConf = path.join(tauriSrcPath, 'rust_proxy.toml');
             await fsExtra.copy(projectCnConf, projectConf);
-            await shellExec(`cd "${npmDirectory}" && ${packageManager} install${registryOption}${legacyPeerDeps} --silent`, timeout, buildEnv);
+            await shellExec(`cd "${npmDirectory}" && ${packageManager} install${registryOption}${peerDepsOption} --silent`, timeout, buildEnv);
         }
         else {
-            await shellExec(`cd "${npmDirectory}" && ${packageManager} install${legacyPeerDeps} --silent`, timeout, buildEnv);
+            await shellExec(`cd "${npmDirectory}" && ${packageManager} install${peerDepsOption} --silent`, timeout, buildEnv);
         }
         spinner.succeed(chalk.green('Package installed!'));
         if (!tauriTargetPathExists) {
@@ -647,15 +693,17 @@ class BaseBuilder {
     async buildAndCopy(url, target) {
         const { name } = this.options;
         await mergeConfig(url, this.options, tauriConfig);
+        // Detect available package manager
+        const packageManager = await this.detectPackageManager();
         // Build app
         const buildSpinner = getSpinner('Building app...');
-        // Let spinner run for a moment so user can see it, then stop before npm command
+        // Let spinner run for a moment so user can see it, then stop before package manager command
         await new Promise((resolve) => setTimeout(resolve, 500));
         buildSpinner.stop();
         // Show static message to keep the status visible
         logger.warn('✸ Building app...');
         const buildEnv = this.getBuildEnvironment();
-        await shellExec(`cd "${npmDirectory}" && ${this.getBuildCommand()}`, this.getBuildTimeout(), buildEnv);
+        await shellExec(`cd "${npmDirectory}" && ${this.getBuildCommand(packageManager)}`, this.getBuildTimeout(), buildEnv);
         // Copy app
         const fileName = this.getFileName();
         const fileType = this.getFileType(target);
@@ -669,18 +717,48 @@ class BaseBuilder {
     getFileType(target) {
         return target;
     }
-    getBuildCommand() {
+    /**
+     * 解析目标架构
+     */
+    resolveTargetArch(requestedArch) {
+        if (requestedArch === 'auto' || !requestedArch) {
+            return process.arch;
+        }
+        return requestedArch;
+    }
+    /**
+     * 获取Tauri构建目标
+     */
+    getTauriTarget(arch, platform = process.platform) {
+        const platformMappings = BaseBuilder.ARCH_MAPPINGS[platform];
+        if (!platformMappings)
+            return null;
+        return platformMappings[arch] || null;
+    }
+    /**
+     * 获取架构显示名称（用于文件名）
+     */
+    getArchDisplayName(arch) {
+        return BaseBuilder.ARCH_DISPLAY_NAMES[arch] || arch;
+    }
+    /**
+     * 构建基础构建命令
+     */
+    buildBaseCommand(packageManager, configPath, target) {
         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';
+            ? `${packageManager} run build:debug`
+            : `${packageManager} run build`;
+        const argSeparator = packageManager === 'npm' ? ' --' : '';
+        let fullCommand = `${baseCommand}${argSeparator} -c "${configPath}"`;
+        if (target) {
+            fullCommand += ` --target ${target}`;
         }
-        // Add features
+        return fullCommand;
+    }
+    /**
+     * 获取构建特性列表
+     */
+    getBuildFeatures() {
         const features = ['cli-build'];
         // Add macos-proxy feature for modern macOS (Darwin 23+ = macOS 14+)
         if (IS_MAC) {
@@ -689,6 +767,18 @@ class BaseBuilder {
                 features.push('macos-proxy');
             }
         }
+        return features;
+    }
+    getBuildCommand(packageManager = 'pnpm') {
+        // Use temporary config directory to avoid modifying source files
+        const configPath = path.join(npmDirectory, 'src-tauri', '.pake', 'tauri.conf.json');
+        let fullCommand = this.buildBaseCommand(packageManager, configPath);
+        // For macOS, use app bundles by default unless DMG is explicitly requested
+        if (IS_MAC && this.options.targets === 'app') {
+            fullCommand += ' --bundles app';
+        }
+        // Add features
+        const features = this.getBuildFeatures();
         if (features.length > 0) {
             fullCommand += ` --features ${features.join(',')}`;
         }
@@ -715,12 +805,40 @@ class BaseBuilder {
         return path.join(npmDirectory, this.getBasePath(), bundleDir, `${fileName}.${fileType}`);
     }
 }
+BaseBuilder.packageManagerCache = null;
+// 架构映射配置
+BaseBuilder.ARCH_MAPPINGS = {
+    darwin: {
+        arm64: 'aarch64-apple-darwin',
+        x64: 'x86_64-apple-darwin',
+        universal: 'universal-apple-darwin',
+    },
+    win32: {
+        arm64: 'aarch64-pc-windows-msvc',
+        x64: 'x86_64-pc-windows-msvc',
+    },
+    linux: {
+        arm64: 'aarch64-unknown-linux-gnu',
+        x64: 'x86_64-unknown-linux-gnu',
+    },
+};
+// 架构名称映射（用于文件名生成）
+BaseBuilder.ARCH_DISPLAY_NAMES = {
+    arm64: 'aarch64',
+    x64: 'x64',
+    universal: 'universal',
+};
 
 class MacBuilder extends BaseBuilder {
     constructor(options) {
         super(options);
         // Store the original targets value for architecture selection
-        this.buildArch = options.targets || 'auto';
+        // For macOS, targets can be architecture names or format names
+        // Filter out non-architecture values
+        const validArchs = ['intel', 'apple', 'universal', 'auto', 'x64', 'arm64'];
+        this.buildArch = validArchs.includes(options.targets || '')
+            ? options.targets
+            : 'auto';
         // Use DMG by default for distribution
         // Only create app bundles for testing to avoid user interaction
         if (process.env.PAKE_CREATE_APP === '1') {
@@ -751,83 +869,42 @@ class MacBuilder extends BaseBuilder {
         }
         else {
             // Auto-detect based on current architecture
-            arch = process.arch === 'arm64' ? 'aarch64' : process.arch;
+            arch = this.getArchDisplayName(this.resolveTargetArch(this.buildArch));
         }
         return `${name}_${tauriConfig.version}_${arch}`;
     }
-    getBuildCommand() {
-        // Determine if we need universal build
-        const needsUniversal = this.buildArch === 'universal' || this.options.multiArch;
-        if (needsUniversal) {
-            const baseCommand = this.options.debug
-                ? 'npm run tauri build -- --debug'
-                : 'npm run tauri build --';
-            // Use temporary config directory to avoid modifying source files
-            const configPath = path.join('src-tauri', '.pake', 'tauri.conf.json');
-            let fullCommand = `${baseCommand} --target universal-apple-darwin -c "${configPath}"`;
-            // Add features
-            const features = ['cli-build'];
-            // Add macos-proxy feature for modern macOS (Darwin 23+ = macOS 14+)
-            const macOSVersion = this.getMacOSMajorVersion();
-            if (macOSVersion >= 23) {
-                features.push('macos-proxy');
-            }
-            if (features.length > 0) {
-                fullCommand += ` --features ${features.join(',')}`;
-            }
-            return fullCommand;
+    getActualArch() {
+        if (this.buildArch === 'universal' || this.options.multiArch) {
+            return 'universal';
         }
         else if (this.buildArch === 'apple') {
-            // Build for Apple Silicon only
-            const baseCommand = this.options.debug
-                ? 'npm run tauri build -- --debug'
-                : 'npm run tauri build --';
-            const configPath = path.join('src-tauri', '.pake', 'tauri.conf.json');
-            let fullCommand = `${baseCommand} --target aarch64-apple-darwin -c "${configPath}"`;
-            // Add features
-            const features = ['cli-build'];
-            const macOSVersion = this.getMacOSMajorVersion();
-            if (macOSVersion >= 23) {
-                features.push('macos-proxy');
-            }
-            if (features.length > 0) {
-                fullCommand += ` --features ${features.join(',')}`;
-            }
-            return fullCommand;
+            return 'arm64';
         }
         else if (this.buildArch === 'intel') {
-            // Build for Intel only
-            const baseCommand = this.options.debug
-                ? 'npm run tauri build -- --debug'
-                : 'npm run tauri build --';
-            const configPath = path.join('src-tauri', '.pake', 'tauri.conf.json');
-            let fullCommand = `${baseCommand} --target x86_64-apple-darwin -c "${configPath}"`;
-            // Add features
-            const features = ['cli-build'];
-            const macOSVersion = this.getMacOSMajorVersion();
-            if (macOSVersion >= 23) {
-                features.push('macos-proxy');
-            }
-            if (features.length > 0) {
-                fullCommand += ` --features ${features.join(',')}`;
-            }
-            return fullCommand;
+            return 'x64';
         }
-        return super.getBuildCommand();
+        return this.resolveTargetArch(this.buildArch);
     }
-    getBasePath() {
-        const needsUniversal = this.buildArch === 'universal' || this.options.multiArch;
-        const basePath = this.options.debug ? 'debug' : 'release';
-        if (needsUniversal) {
-            return `src-tauri/target/universal-apple-darwin/${basePath}/bundle`;
-        }
-        else if (this.buildArch === 'apple') {
-            return `src-tauri/target/aarch64-apple-darwin/${basePath}/bundle`;
+    getBuildCommand(packageManager = 'pnpm') {
+        const configPath = path.join('src-tauri', '.pake', 'tauri.conf.json');
+        const actualArch = this.getActualArch();
+        const buildTarget = this.getTauriTarget(actualArch, 'darwin');
+        if (!buildTarget) {
+            throw new Error(`Unsupported architecture: ${actualArch} for macOS`);
         }
-        else if (this.buildArch === 'intel') {
-            return `src-tauri/target/x86_64-apple-darwin/${basePath}/bundle`;
+        let fullCommand = this.buildBaseCommand(packageManager, configPath, buildTarget);
+        // Add features
+        const features = this.getBuildFeatures();
+        if (features.length > 0) {
+            fullCommand += ` --features ${features.join(',')}`;
         }
-        return super.getBasePath();
+        return fullCommand;
+    }
+    getBasePath() {
+        const basePath = this.options.debug ? 'debug' : 'release';
+        const actualArch = this.getActualArch();
+        const target = this.getTauriTarget(actualArch, 'darwin');
+        return `src-tauri/target/${target}/${basePath}/bundle`;
     }
 }
 
@@ -835,57 +912,29 @@ class WinBuilder extends BaseBuilder {
     constructor(options) {
         super(options);
         this.buildFormat = 'msi';
-        // Store the original targets value for architecture selection
-        this.buildArch = options.targets || 'auto';
-        // Set targets to msi format for Tauri
+        // For Windows, targets can be architecture names or format names
+        // Filter out non-architecture values
+        const validArchs = ['x64', 'arm64', 'auto'];
+        this.buildArch = validArchs.includes(options.targets || '')
+            ? this.resolveTargetArch(options.targets)
+            : this.resolveTargetArch('auto');
         this.options.targets = this.buildFormat;
     }
     getFileName() {
         const { name } = this.options;
         const language = tauriConfig.bundle.windows.wix.language[0];
-        // Determine architecture name based on explicit targets option or auto-detect
-        let targetArch;
-        if (this.buildArch === 'arm64') {
-            targetArch = 'aarch64';
-        }
-        else if (this.buildArch === 'x64') {
-            targetArch = 'x64';
-        }
-        else {
-            // Auto-detect based on current architecture if no explicit target
-            const archMap = {
-                x64: 'x64',
-                arm64: 'aarch64',
-            };
-            targetArch = archMap[process.arch] || process.arch;
-        }
+        const targetArch = this.getArchDisplayName(this.buildArch);
         return `${name}_${tauriConfig.version}_${targetArch}_${language}`;
     }
-    getBuildCommand() {
-        const baseCommand = this.options.debug
-            ? 'npm run build:debug'
-            : 'npm run build';
-        // Use temporary config directory to avoid modifying source files
+    getBuildCommand(packageManager = 'pnpm') {
         const configPath = path.join('src-tauri', '.pake', 'tauri.conf.json');
-        let fullCommand = `${baseCommand} -- -c "${configPath}"`;
-        // Determine build target based on explicit targets option or auto-detect
-        let buildTarget;
-        if (this.buildArch === 'arm64') {
-            buildTarget = 'aarch64-pc-windows-msvc';
-        }
-        else if (this.buildArch === 'x64') {
-            buildTarget = 'x86_64-pc-windows-msvc';
+        const buildTarget = this.getTauriTarget(this.buildArch, 'win32');
+        if (!buildTarget) {
+            throw new Error(`Unsupported architecture: ${this.buildArch} for Windows`);
         }
-        else {
-            // Auto-detect based on current architecture if no explicit target
-            buildTarget =
-                process.arch === 'arm64'
-                    ? 'aarch64-pc-windows-msvc'
-                    : 'x86_64-pc-windows-msvc';
-        }
-        fullCommand += ` --target ${buildTarget}`;
+        let fullCommand = this.buildBaseCommand(packageManager, configPath, buildTarget);
         // Add features
-        const features = ['cli-build'];
+        const features = this.getBuildFeatures();
         if (features.length > 0) {
             fullCommand += ` --features ${features.join(',')}`;
         }
@@ -893,21 +942,7 @@ class WinBuilder extends BaseBuilder {
     }
     getBasePath() {
         const basePath = this.options.debug ? 'debug' : 'release';
-        // Determine target based on explicit targets option or auto-detect
-        let target;
-        if (this.buildArch === 'arm64') {
-            target = 'aarch64-pc-windows-msvc';
-        }
-        else if (this.buildArch === 'x64') {
-            target = 'x86_64-pc-windows-msvc';
-        }
-        else {
-            // Auto-detect based on current architecture if no explicit target
-            target =
-                process.arch === 'arm64'
-                    ? 'aarch64-pc-windows-msvc'
-                    : 'x86_64-pc-windows-msvc';
-        }
+        const target = this.getTauriTarget(this.buildArch, 'win32');
         return `src-tauri/target/${target}/${basePath}/bundle/`;
     }
 }
@@ -923,7 +958,7 @@ class LinuxBuilder extends BaseBuilder {
         }
         else {
             this.buildFormat = target;
-            this.buildArch = 'auto';
+            this.buildArch = this.resolveTargetArch('auto');
         }
         // Set targets to format for Tauri
         this.options.targets = this.buildFormat;
@@ -931,15 +966,17 @@ class LinuxBuilder extends BaseBuilder {
     getFileName() {
         const { name, targets } = this.options;
         const version = tauriConfig.version;
-        // Determine architecture based on explicit target or auto-detect
+        // Determine architecture display name
         let arch;
         if (this.buildArch === 'arm64') {
             arch = targets === 'rpm' || targets === 'appimage' ? 'aarch64' : 'arm64';
         }
         else {
             // Auto-detect or default to current architecture
-            arch = process.arch === 'x64' ? 'amd64' : process.arch;
-            if (arch === 'arm64' && (targets === 'rpm' || targets === 'appimage')) {
+            const resolvedArch = this.buildArch === 'x64' ? 'amd64' : this.buildArch;
+            arch = resolvedArch;
+            if (resolvedArch === 'arm64' &&
+                (targets === 'rpm' || targets === 'appimage')) {
                 arch = 'aarch64';
             }
         }
@@ -958,19 +995,15 @@ class LinuxBuilder extends BaseBuilder {
             }
         }
     }
-    getBuildCommand() {
-        const baseCommand = this.options.debug
-            ? 'npm run build:debug'
-            : 'npm run build';
-        // Use temporary config directory to avoid modifying source files
+    getBuildCommand(packageManager = 'pnpm') {
         const configPath = path.join('src-tauri', '.pake', 'tauri.conf.json');
-        let fullCommand = `${baseCommand} -- -c "${configPath}"`;
-        // Add ARM64 target if explicitly specified
-        if (this.buildArch === 'arm64') {
-            fullCommand += ' --target aarch64-unknown-linux-gnu';
-        }
+        // Only add target if it's ARM64
+        const buildTarget = this.buildArch === 'arm64'
+            ? this.getTauriTarget(this.buildArch, 'linux')
+            : undefined;
+        let fullCommand = this.buildBaseCommand(packageManager, configPath, buildTarget);
         // Add features
-        const features = ['cli-build'];
+        const features = this.getBuildFeatures();
         if (features.length > 0) {
             fullCommand += ` --features ${features.join(',')}`;
         }
@@ -979,7 +1012,8 @@ class LinuxBuilder extends BaseBuilder {
     getBasePath() {
         const basePath = this.options.debug ? 'debug' : 'release';
         if (this.buildArch === 'arm64') {
-            return `src-tauri/target/aarch64-unknown-linux-gnu/${basePath}/bundle/`;
+            const target = this.getTauriTarget(this.buildArch, 'linux');
+            return `src-tauri/target/${target}/${basePath}/bundle/`;
         }
         return super.getBasePath();
     }
@@ -1028,8 +1062,10 @@ const DEFAULT_PAKE_OPTIONS = {
     debug: false,
     inject: [],
     installerLanguage: 'en-US',
-    hideOnClose: true,
+    hideOnClose: undefined, // Platform-specific: true for macOS, false for others
     incognito: false,
+    wasm: false,
+    enableDragDrop: false,
 };
 
 async function checkUpdateTips() {
@@ -1474,13 +1510,19 @@ program
     .addOption(new Option('--system-tray-icon <string>', 'Custom system tray icon')
     .default(DEFAULT_PAKE_OPTIONS.systemTrayIcon)
     .hideHelp())
-    .addOption(new Option('--hide-on-close', 'Hide window on close instead of exiting')
+    .addOption(new Option('--hide-on-close', 'Hide window on close instead of exiting (default: true for macOS, false for others)')
     .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('--wasm', 'Enable WebAssembly support (Flutter Web, etc.)')
+    .default(DEFAULT_PAKE_OPTIONS.wasm)
+    .hideHelp())
+    .addOption(new Option('--enable-drag-drop', 'Enable drag and drop functionality')
+    .default(DEFAULT_PAKE_OPTIONS.enableDragDrop)
+    .hideHelp())
     .addOption(new Option('--installer-language <string>', 'Installer language')
     .default(DEFAULT_PAKE_OPTIONS.installerLanguage)
     .hideHelp())
@@ -1488,13 +1530,10 @@ program
     .action(async (url, options) => {
     await checkUpdateTips();
     if (!url) {
-        program.outputHelp((str) => {
-            return str
-                .split('\n')
-                .filter((line) => !/((-h,|--help)|((-v|-V),|--version))\s+.+$/.test(line))
-                .join('\n');
+        program.help({
+            error: false,
         });
-        process.exit(0);
+        return;
     }
     log.setDefaultLevel('info');
     if (options.debug) {