@choochmeque/tauri-windows-bundle 0.1.0 → 0.1.1

package/README.md

@@ -77,7 +77,7 @@ Edit `src-tauri/gen/windows/bundle.config.json`:
 ### Build
 
 ```bash
-# Build x64 only (default)
+# Build x64 only (default, uses cargo)
 pnpm tauri:windows:build
 
 # Build multiarch bundle (x64 + arm64)
@@ -85,6 +85,10 @@ pnpm tauri:windows:build --arch x64,arm64
 
 # Release build
 pnpm tauri:windows:build --release
+
+# Use different build runner (pnpm, npm, yarn, bun, etc.)
+pnpm tauri:windows:build --runner pnpm
+pnpm tauri:windows:build --runner npm
 ```
 
 ### Output

package/dist/cli.js

@@ -4,7 +4,7 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { glob } from 'glob';
-import { exec } from 'node:child_process';
+import { exec, spawn } from 'node:child_process';
 import { promisify } from 'node:util';
 import * as readline from 'node:readline';
 
@@ -64,6 +64,7 @@ function toFourPartVersion(version) {
     return parts.slice(0, 4).join('.');
 }
 
+const DEFAULT_RUNNER = 'cargo';
 const MSIX_ASSETS = [
     { name: 'StoreLogo.png', size: 50 },
     { name: 'Square44x44Logo.png', size: 44 },
@@ -594,6 +595,33 @@ async function promptInstall(message) {
         });
     });
 }
+async function execWithProgress(command, options) {
+    return new Promise((resolve, reject) => {
+        const [cmd, ...args] = command.split(' ');
+        const child = spawn(cmd, args, {
+            cwd: options?.cwd,
+            stdio: ['inherit', 'pipe', 'pipe'],
+            shell: true,
+        });
+        child.stdout?.on('data', (data) => {
+            process.stdout.write(data);
+        });
+        child.stderr?.on('data', (data) => {
+            process.stderr.write(data);
+        });
+        child.on('close', (code) => {
+            if (code === 0) {
+                resolve();
+            }
+            else {
+                reject(new Error(`Command failed with exit code ${code}`));
+            }
+        });
+        child.on('error', (error) => {
+            reject(error);
+        });
+    });
+}
 
 async function build(options) {
     console.log('Building MSIX package...\n');
@@ -601,10 +629,10 @@ async function build(options) {
     if (!(await isMsixbundleCliInstalled())) {
         const shouldInstall = await promptInstall('msixbundle-cli is required but not installed.\n' + 'Install it now? (requires Rust/Cargo)');
         if (shouldInstall) {
-            console.log('Installing msixbundle-cli...');
+            console.log('Installing msixbundle-cli...\n');
             try {
-                await execAsync('cargo install msixbundle-cli');
-                console.log('  msixbundle-cli installed\n');
+                await execWithProgress('cargo install msixbundle-cli');
+                console.log('\n  msixbundle-cli installed\n');
             }
             catch (error) {
                 console.error('Failed to install msixbundle-cli:', error);
@@ -647,14 +675,25 @@ async function build(options) {
     const architectures = options.arch?.split(',') || ['x64'];
     const minVersion = options.minWindows || DEFAULT_MIN_WINDOWS_VERSION;
     const appxDirs = [];
+    const runner = options.runner || DEFAULT_RUNNER;
     for (const arch of architectures) {
         console.log(`Building for ${arch}...`);
         // Build Tauri app
         const target = arch === 'x64' ? 'x86_64-pc-windows-msvc' : 'aarch64-pc-windows-msvc';
         const releaseFlag = options.release ? '--release' : '';
+        // Build command based on runner
+        let buildCommand;
+        if (runner === 'npm') {
+            // npm requires -- to pass args to the script
+            buildCommand = `npm run tauri build -- --target ${target} ${releaseFlag}`.trim();
+        }
+        else {
+            // cargo, pnpm, yarn, bun, etc.
+            buildCommand = `${runner} tauri build --target ${target} ${releaseFlag}`.trim();
+        }
         try {
-            console.log(`  Running: cargo tauri build --target ${target} ${releaseFlag}`);
-            await execAsync(`cargo tauri build --target ${target} ${releaseFlag}`.trim(), {
+            console.log(`  Running: ${buildCommand}\n`);
+            await execWithProgress(buildCommand, {
                 cwd: projectRoot,
             });
         }
@@ -1429,6 +1468,7 @@ program
     .option('--arch <architectures>', 'Architectures to build (comma-separated: x64,arm64)', 'x64')
     .option('--release', 'Build in release mode')
     .option('--min-windows <version>', 'Minimum Windows version', '10.0.17763.0')
+    .option('--runner <runner>', 'Build runner (cargo, pnpm, npm, yarn, etc.)', 'cargo')
     .action(async (options) => {
     try {
         await build(options);

package/dist/index.js

@@ -2,10 +2,11 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { glob } from 'glob';
-import { exec } from 'node:child_process';
+import { exec, spawn } from 'node:child_process';
 import { promisify } from 'node:util';
 import * as readline from 'node:readline';
 
+const DEFAULT_RUNNER = 'cargo';
 const MSIX_ASSETS = [
     { name: 'StoreLogo.png', size: 50 },
     { name: 'Square44x44Logo.png', size: 44 },
@@ -592,6 +593,33 @@ async function promptInstall(message) {
         });
     });
 }
+async function execWithProgress(command, options) {
+    return new Promise((resolve, reject) => {
+        const [cmd, ...args] = command.split(' ');
+        const child = spawn(cmd, args, {
+            cwd: options?.cwd,
+            stdio: ['inherit', 'pipe', 'pipe'],
+            shell: true,
+        });
+        child.stdout?.on('data', (data) => {
+            process.stdout.write(data);
+        });
+        child.stderr?.on('data', (data) => {
+            process.stderr.write(data);
+        });
+        child.on('close', (code) => {
+            if (code === 0) {
+                resolve();
+            }
+            else {
+                reject(new Error(`Command failed with exit code ${code}`));
+            }
+        });
+        child.on('error', (error) => {
+            reject(error);
+        });
+    });
+}
 
 async function build(options) {
     console.log('Building MSIX package...\n');
@@ -599,10 +627,10 @@ async function build(options) {
     if (!(await isMsixbundleCliInstalled())) {
         const shouldInstall = await promptInstall('msixbundle-cli is required but not installed.\n' + 'Install it now? (requires Rust/Cargo)');
         if (shouldInstall) {
-            console.log('Installing msixbundle-cli...');
+            console.log('Installing msixbundle-cli...\n');
             try {
-                await execAsync('cargo install msixbundle-cli');
-                console.log('  msixbundle-cli installed\n');
+                await execWithProgress('cargo install msixbundle-cli');
+                console.log('\n  msixbundle-cli installed\n');
             }
             catch (error) {
                 console.error('Failed to install msixbundle-cli:', error);
@@ -645,14 +673,25 @@ async function build(options) {
     const architectures = options.arch?.split(',') || ['x64'];
     const minVersion = options.minWindows || DEFAULT_MIN_WINDOWS_VERSION;
     const appxDirs = [];
+    const runner = options.runner || DEFAULT_RUNNER;
     for (const arch of architectures) {
         console.log(`Building for ${arch}...`);
         // Build Tauri app
         const target = arch === 'x64' ? 'x86_64-pc-windows-msvc' : 'aarch64-pc-windows-msvc';
         const releaseFlag = options.release ? '--release' : '';
+        // Build command based on runner
+        let buildCommand;
+        if (runner === 'npm') {
+            // npm requires -- to pass args to the script
+            buildCommand = `npm run tauri build -- --target ${target} ${releaseFlag}`.trim();
+        }
+        else {
+            // cargo, pnpm, yarn, bun, etc.
+            buildCommand = `${runner} tauri build --target ${target} ${releaseFlag}`.trim();
+        }
         try {
-            console.log(`  Running: cargo tauri build --target ${target} ${releaseFlag}`);
-            await execAsync(`cargo tauri build --target ${target} ${releaseFlag}`.trim(), {
+            console.log(`  Running: ${buildCommand}\n`);
+            await execWithProgress(buildCommand, {
                 cwd: projectRoot,
             });
         }
@@ -1403,4 +1442,4 @@ async function extensionRemove(type, name, options) {
     }
 }
 
-export { DEFAULT_CAPABILITIES, DEFAULT_MIN_WINDOWS_VERSION, MSIX_ASSETS, build, extensionAddAppExecutionAlias, extensionAddAppService, extensionAddAutoplay, extensionAddBackgroundTask, extensionAddContextMenu, extensionAddFileAssociation, extensionAddPreviewHandler, extensionAddProtocol, extensionAddThumbnailHandler, extensionDisablePrintTaskSettings, extensionDisableShareTarget, extensionDisableStartupTask, extensionDisableToastActivation, extensionEnablePrintTaskSettings, extensionEnableShareTarget, extensionEnableStartupTask, extensionEnableToastActivation, extensionList, extensionRemove, findProjectRoot, generateManifest, generateManifestTemplate, getWindowsDir, init, prepareAppxContent, readBundleConfig$1 as readBundleConfig, readTauriConfig, toFourPartVersion };
+export { DEFAULT_CAPABILITIES, DEFAULT_MIN_WINDOWS_VERSION, DEFAULT_RUNNER, MSIX_ASSETS, build, extensionAddAppExecutionAlias, extensionAddAppService, extensionAddAutoplay, extensionAddBackgroundTask, extensionAddContextMenu, extensionAddFileAssociation, extensionAddPreviewHandler, extensionAddProtocol, extensionAddThumbnailHandler, extensionDisablePrintTaskSettings, extensionDisableShareTarget, extensionDisableStartupTask, extensionDisableToastActivation, extensionEnablePrintTaskSettings, extensionEnableShareTarget, extensionEnableStartupTask, extensionEnableToastActivation, extensionList, extensionRemove, findProjectRoot, generateManifest, generateManifestTemplate, getWindowsDir, init, prepareAppxContent, readBundleConfig$1 as readBundleConfig, readTauriConfig, toFourPartVersion };

package/dist/types.d.ts

@@ -102,7 +102,9 @@ export interface BuildOptions {
     arch?: string;
     release?: boolean;
     minWindows?: string;
+    runner?: string;
 }
+export declare const DEFAULT_RUNNER = "cargo";
 export interface MsixAsset {
     name: string;
     size?: number;

package/dist/utils/exec.d.ts

@@ -9,3 +9,6 @@ export declare function getMsixbundleCliVersion(): Promise<string | null>;
 export declare function isVersionSufficient(version: string, minVersion: string): boolean;
 export declare const MIN_MSIXBUNDLE_CLI_VERSION = "1.0.0";
 export declare function promptInstall(message: string): Promise<boolean>;
+export declare function execWithProgress(command: string, options?: {
+    cwd?: string;
+}): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@choochmeque/tauri-windows-bundle",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "MSIX packaging tool for Tauri apps - Windows Store ready bundles",
   "type": "module",
   "bin": {
@@ -8,17 +8,6 @@
   },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
-  "scripts": {
-    "build": "rollup -c",
-    "prepublishOnly": "pnpm build",
-    "pretest": "pnpm build",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "test:coverage": "vitest run --coverage",
-    "lint": "eslint .",
-    "format": "prettier --write \"./**/*.{cjs,mjs,js,jsx,mts,ts,tsx,html,css,json}\"",
-    "format:check": "prettier --check \"./**/*.{cjs,mjs,js,jsx,mts,ts,tsx,html,css,json}\""
-  },
   "keywords": [
     "tauri",
     "windows",
@@ -55,5 +44,14 @@
     "typescript": "^5.3.3",
     "vitest": "^2.0.0"
   },
-  "packageManager": "pnpm@10.16.0+sha512.8066e7b034217b700a9a4dbb3a005061d641ba130a89915213a10b3ca4919c19c037bec8066afdc559b89635fdb806b16ea673f2468fbb28aabfa13c53e3f769"
-}
+  "scripts": {
+    "build": "rollup -c",
+    "pretest": "pnpm build",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage",
+    "lint": "eslint .",
+    "format": "prettier --write \"./**/*.{cjs,mjs,js,jsx,mts,ts,tsx,html,css,json}\"",
+    "format:check": "prettier --check \"./**/*.{cjs,mjs,js,jsx,mts,ts,tsx,html,css,json}\""
+  }
+}