@choochmeque/tauri-windows-bundle 0.1.2 → 0.1.4

package/dist/cli.js

@@ -483,8 +483,9 @@ function updatePackageJson(projectRoot) {
 
 function prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion) {
     const target = arch === 'x64' ? 'x86_64-pc-windows-msvc' : 'aarch64-pc-windows-msvc';
-    const buildDir = path.join(projectRoot, 'target', target, 'release');
-    const appxDir = path.join(projectRoot, 'target', 'appx', arch);
+    const srcTauriDir = path.join(projectRoot, 'src-tauri');
+    const buildDir = path.join(srcTauriDir, 'target', target, 'release');
+    const appxDir = path.join(srcTauriDir, 'target', 'appx', arch);
     // Create directories
     fs.mkdirSync(path.join(appxDir, 'Assets'), { recursive: true });
     // Copy exe
@@ -544,6 +545,33 @@ function copyBundledResources(projectRoot, appxDir, tauriConfig) {
 }
 
 const execPromise = promisify(exec);
+const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+class Spinner {
+    frameIndex = 0;
+    intervalId = null;
+    message;
+    constructor(message) {
+        this.message = message;
+    }
+    start() {
+        this.intervalId = setInterval(() => {
+            const frame = SPINNER_FRAMES[this.frameIndex];
+            process.stdout.write(`\r${frame} ${this.message}`);
+            this.frameIndex = (this.frameIndex + 1) % SPINNER_FRAMES.length;
+        }, 80);
+    }
+    stop(success = true) {
+        if (this.intervalId) {
+            clearInterval(this.intervalId);
+            this.intervalId = null;
+        }
+        const symbol = success ? '✓' : '✗';
+        process.stdout.write(`\r${symbol} ${this.message}\n`);
+    }
+    fail() {
+        this.stop(false);
+    }
+}
 async function execAsync(command, options) {
     const result = await execPromise(command, { ...options, encoding: 'utf8' });
     return { stdout: result.stdout, stderr: result.stderr };
@@ -596,6 +624,8 @@ async function promptInstall(message) {
     });
 }
 async function execWithProgress(command, options) {
+    const verbose = options?.verbose ?? false;
+    const message = options?.message ?? 'Running...';
     return new Promise((resolve, reject) => {
         const [cmd, ...args] = command.split(' ');
         const child = spawn(cmd, args, {
@@ -603,21 +633,46 @@ async function execWithProgress(command, options) {
             stdio: ['inherit', 'pipe', 'pipe'],
             shell: true,
         });
+        let spinner = null;
+        let capturedOutput = '';
+        if (!verbose) {
+            spinner = new Spinner(message);
+            spinner.start();
+        }
         child.stdout?.on('data', (data) => {
-            process.stdout.write(data);
+            if (verbose) {
+                process.stdout.write(data);
+            }
+            else {
+                capturedOutput += data.toString();
+            }
         });
         child.stderr?.on('data', (data) => {
-            process.stderr.write(data);
+            if (verbose) {
+                process.stderr.write(data);
+            }
+            else {
+                capturedOutput += data.toString();
+            }
         });
         child.on('close', (code) => {
             if (code === 0) {
+                spinner?.stop(true);
                 resolve();
             }
             else {
+                spinner?.fail();
+                if (!verbose && capturedOutput) {
+                    console.error('\nBuild output:\n' + capturedOutput);
+                }
                 reject(new Error(`Command failed with exit code ${code}`));
             }
         });
         child.on('error', (error) => {
+            spinner?.fail();
+            if (!verbose && capturedOutput) {
+                console.error('\nBuild output:\n' + capturedOutput);
+            }
             reject(error);
         });
     });
@@ -629,10 +684,11 @@ 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...\n');
             try {
-                await execWithProgress('cargo install msixbundle-cli');
-                console.log('\n  msixbundle-cli installed\n');
+                await execWithProgress('cargo install msixbundle-cli', {
+                    verbose: options.verbose,
+                    message: 'Installing msixbundle-cli...',
+                });
             }
             catch (error) {
                 console.error('Failed to install msixbundle-cli:', error);
@@ -677,27 +733,28 @@ async function build(options) {
     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
-        // --bundles none skips MSI/NSIS bundling since we're creating MSIX
+        // --no-bundle skips MSI/NSIS bundling since we're creating MSIX
         let buildCommand;
         if (runner === 'npm') {
             // npm requires -- to pass args to the script
-            buildCommand =
-                `npm run tauri build -- --target ${target} --bundles none ${releaseFlag}`.trim();
+            buildCommand = `npm run tauri build -- --target ${target} --no-bundle ${releaseFlag}`.trim();
         }
         else {
             // cargo, pnpm, yarn, bun, etc.
-            buildCommand =
-                `${runner} tauri build --target ${target} --bundles none ${releaseFlag}`.trim();
+            buildCommand = `${runner} tauri build --target ${target} --no-bundle ${releaseFlag}`.trim();
         }
         try {
-            console.log(`  Running: ${buildCommand}\n`);
+            if (options.verbose) {
+                console.log(`  Running: ${buildCommand}\n`);
+            }
             await execWithProgress(buildCommand, {
                 cwd: projectRoot,
+                verbose: options.verbose,
+                message: `Building for ${arch}...`,
             });
         }
         catch (error) {
@@ -712,7 +769,7 @@ async function build(options) {
     }
     // Call msixbundle-cli
     console.log('\nCreating MSIX package...');
-    const outDir = path.join(projectRoot, 'target', 'msix');
+    const outDir = path.join(projectRoot, 'src-tauri', 'target', 'msix');
     const args = [
         '--out-dir',
         outDir,
@@ -1472,6 +1529,7 @@ program
     .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')
+    .option('--verbose', 'Show full build output instead of spinner')
     .action(async (options) => {
     try {
         await build(options);

package/dist/index.js

@@ -481,8 +481,9 @@ function updatePackageJson(projectRoot) {
 
 function prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion) {
     const target = arch === 'x64' ? 'x86_64-pc-windows-msvc' : 'aarch64-pc-windows-msvc';
-    const buildDir = path.join(projectRoot, 'target', target, 'release');
-    const appxDir = path.join(projectRoot, 'target', 'appx', arch);
+    const srcTauriDir = path.join(projectRoot, 'src-tauri');
+    const buildDir = path.join(srcTauriDir, 'target', target, 'release');
+    const appxDir = path.join(srcTauriDir, 'target', 'appx', arch);
     // Create directories
     fs.mkdirSync(path.join(appxDir, 'Assets'), { recursive: true });
     // Copy exe
@@ -542,6 +543,33 @@ function copyBundledResources(projectRoot, appxDir, tauriConfig) {
 }
 
 const execPromise = promisify(exec);
+const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+class Spinner {
+    frameIndex = 0;
+    intervalId = null;
+    message;
+    constructor(message) {
+        this.message = message;
+    }
+    start() {
+        this.intervalId = setInterval(() => {
+            const frame = SPINNER_FRAMES[this.frameIndex];
+            process.stdout.write(`\r${frame} ${this.message}`);
+            this.frameIndex = (this.frameIndex + 1) % SPINNER_FRAMES.length;
+        }, 80);
+    }
+    stop(success = true) {
+        if (this.intervalId) {
+            clearInterval(this.intervalId);
+            this.intervalId = null;
+        }
+        const symbol = success ? '✓' : '✗';
+        process.stdout.write(`\r${symbol} ${this.message}\n`);
+    }
+    fail() {
+        this.stop(false);
+    }
+}
 async function execAsync(command, options) {
     const result = await execPromise(command, { ...options, encoding: 'utf8' });
     return { stdout: result.stdout, stderr: result.stderr };
@@ -594,6 +622,8 @@ async function promptInstall(message) {
     });
 }
 async function execWithProgress(command, options) {
+    const verbose = options?.verbose ?? false;
+    const message = options?.message ?? 'Running...';
     return new Promise((resolve, reject) => {
         const [cmd, ...args] = command.split(' ');
         const child = spawn(cmd, args, {
@@ -601,21 +631,46 @@ async function execWithProgress(command, options) {
             stdio: ['inherit', 'pipe', 'pipe'],
             shell: true,
         });
+        let spinner = null;
+        let capturedOutput = '';
+        if (!verbose) {
+            spinner = new Spinner(message);
+            spinner.start();
+        }
         child.stdout?.on('data', (data) => {
-            process.stdout.write(data);
+            if (verbose) {
+                process.stdout.write(data);
+            }
+            else {
+                capturedOutput += data.toString();
+            }
         });
         child.stderr?.on('data', (data) => {
-            process.stderr.write(data);
+            if (verbose) {
+                process.stderr.write(data);
+            }
+            else {
+                capturedOutput += data.toString();
+            }
         });
         child.on('close', (code) => {
             if (code === 0) {
+                spinner?.stop(true);
                 resolve();
             }
             else {
+                spinner?.fail();
+                if (!verbose && capturedOutput) {
+                    console.error('\nBuild output:\n' + capturedOutput);
+                }
                 reject(new Error(`Command failed with exit code ${code}`));
             }
         });
         child.on('error', (error) => {
+            spinner?.fail();
+            if (!verbose && capturedOutput) {
+                console.error('\nBuild output:\n' + capturedOutput);
+            }
             reject(error);
         });
     });
@@ -627,10 +682,11 @@ 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...\n');
             try {
-                await execWithProgress('cargo install msixbundle-cli');
-                console.log('\n  msixbundle-cli installed\n');
+                await execWithProgress('cargo install msixbundle-cli', {
+                    verbose: options.verbose,
+                    message: 'Installing msixbundle-cli...',
+                });
             }
             catch (error) {
                 console.error('Failed to install msixbundle-cli:', error);
@@ -675,27 +731,28 @@ async function build(options) {
     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
-        // --bundles none skips MSI/NSIS bundling since we're creating MSIX
+        // --no-bundle skips MSI/NSIS bundling since we're creating MSIX
         let buildCommand;
         if (runner === 'npm') {
             // npm requires -- to pass args to the script
-            buildCommand =
-                `npm run tauri build -- --target ${target} --bundles none ${releaseFlag}`.trim();
+            buildCommand = `npm run tauri build -- --target ${target} --no-bundle ${releaseFlag}`.trim();
         }
         else {
             // cargo, pnpm, yarn, bun, etc.
-            buildCommand =
-                `${runner} tauri build --target ${target} --bundles none ${releaseFlag}`.trim();
+            buildCommand = `${runner} tauri build --target ${target} --no-bundle ${releaseFlag}`.trim();
         }
         try {
-            console.log(`  Running: ${buildCommand}\n`);
+            if (options.verbose) {
+                console.log(`  Running: ${buildCommand}\n`);
+            }
             await execWithProgress(buildCommand, {
                 cwd: projectRoot,
+                verbose: options.verbose,
+                message: `Building for ${arch}...`,
             });
         }
         catch (error) {
@@ -710,7 +767,7 @@ async function build(options) {
     }
     // Call msixbundle-cli
     console.log('\nCreating MSIX package...');
-    const outDir = path.join(projectRoot, 'target', 'msix');
+    const outDir = path.join(projectRoot, 'src-tauri', 'target', 'msix');
     const args = [
         '--out-dir',
         outDir,

package/dist/types.d.ts

@@ -103,6 +103,7 @@ export interface BuildOptions {
     release?: boolean;
     minWindows?: string;
     runner?: string;
+    verbose?: boolean;
 }
 export declare const DEFAULT_RUNNER = "cargo";
 export interface MsixAsset {

package/dist/utils/exec.d.ts

@@ -1,3 +1,12 @@
+export declare class Spinner {
+    private frameIndex;
+    private intervalId;
+    private message;
+    constructor(message: string);
+    start(): void;
+    stop(success?: boolean): void;
+    fail(): void;
+}
 export declare function execAsync(command: string, options?: {
     cwd?: string;
 }): Promise<{
@@ -9,6 +18,9 @@ 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?: {
+export interface ExecWithProgressOptions {
     cwd?: string;
-}): Promise<void>;
+    verbose?: boolean;
+    message?: string;
+}
+export declare function execWithProgress(command: string, options?: ExecWithProgressOptions): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@choochmeque/tauri-windows-bundle",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "MSIX packaging tool for Tauri apps - Windows Store ready bundles",
   "type": "module",
   "bin": {