@choochmeque/tauri-windows-bundle 0.1.5 → 0.1.7

package/README.md

@@ -47,9 +47,12 @@ npx @choochmeque/tauri-windows-bundle init
 This creates:
 - `src-tauri/gen/windows/bundle.config.json` - MSIX-specific configuration
 - `src-tauri/gen/windows/AppxManifest.xml.template` - Manifest template
-- `src-tauri/gen/windows/Assets/` - Placeholder icons
+- `src-tauri/gen/windows/Assets/` - Icons (copied from `src-tauri/icons/` or placeholders)
+- Adds `@choochmeque/tauri-windows-bundle` as devDependency
 - Adds `tauri:windows:build` script to package.json
 
+**Note:** If Tauri icons exist in `src-tauri/icons/`, they are automatically copied. The wide tile (310x150) is generated by centering the square icon.
+
 ### Configure
 
 Edit `src-tauri/gen/windows/bundle.config.json`:
@@ -110,6 +113,8 @@ npx @choochmeque/tauri-windows-bundle build [options]
   --arch <archs>       Architectures (comma-separated: x64,arm64) [default: x64]
   --release            Build in release mode
   --min-windows <ver>  Minimum Windows version [default: 10.0.17763.0]
+  --runner <runner>    Build runner (cargo, pnpm, npm, yarn, bun) [default: cargo]
+  --verbose            Show full build output instead of spinner
 
 npx @choochmeque/tauri-windows-bundle extension list
   -p, --path <path>    Path to Tauri project

package/dist/cli.js

@@ -2,6 +2,7 @@
 import { Command } from 'commander';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
+import { Jimp } from 'jimp';
 import { fileURLToPath } from 'node:url';
 import { glob } from 'glob';
 import { exec, spawn } from 'node:child_process';
@@ -101,18 +102,80 @@ function generateGitignore(windowsDir) {
     fs.writeFileSync(gitignorePath, content);
 }
 
-async function generateAssets(windowsDir) {
+// Map MSIX asset names to Tauri icon names
+const TAURI_ICON_MAP = {
+    'StoreLogo.png': 'StoreLogo.png',
+    'Square44x44Logo.png': 'Square44x44Logo.png',
+    'Square150x150Logo.png': 'Square150x150Logo.png',
+    'LargeTile.png': 'Square310x310Logo.png',
+};
+function getTauriIconsDir(projectRoot) {
+    return path.join(projectRoot, 'src-tauri', 'icons');
+}
+async function generateAssets(windowsDir, projectRoot) {
     const assetsDir = path.join(windowsDir, 'Assets');
     fs.mkdirSync(assetsDir, { recursive: true });
+    const tauriIconsDir = projectRoot ? getTauriIconsDir(projectRoot) : null;
+    let copiedFromTauri = false;
     for (const asset of MSIX_ASSETS) {
         const width = asset.width || asset.size || 50;
         const height = asset.height || asset.size || 50;
         const assetPath = path.join(assetsDir, asset.name);
-        // Generate a simple placeholder PNG
-        const pngData = createPlaceholderPng(width, height);
-        fs.writeFileSync(assetPath, pngData);
+        // Check if we can copy from Tauri icons
+        const tauriIconName = TAURI_ICON_MAP[asset.name];
+        const tauriIconPath = tauriIconsDir && tauriIconName ? path.join(tauriIconsDir, tauriIconName) : null;
+        if (tauriIconPath && fs.existsSync(tauriIconPath)) {
+            fs.copyFileSync(tauriIconPath, assetPath);
+            copiedFromTauri = true;
+        }
+        else if (asset.name === 'Wide310x150Logo.png' && tauriIconsDir) {
+            // Generate wide tile from square icon
+            const generated = await generateWideTile(tauriIconsDir, assetPath);
+            if (!generated) {
+                const pngData = createPlaceholderPng(width, height);
+                fs.writeFileSync(assetPath, pngData);
+            }
+            else {
+                copiedFromTauri = true;
+            }
+        }
+        else {
+            // Fall back to placeholder
+            const pngData = createPlaceholderPng(width, height);
+            fs.writeFileSync(assetPath, pngData);
+        }
+    }
+    if (copiedFromTauri) {
+        console.log('  Copied assets from src-tauri/icons');
+    }
+    else {
+        console.log('  Generated placeholder assets - replace with real icons before publishing');
     }
-    console.log('  Generated placeholder assets - replace with real icons before publishing');
+    return copiedFromTauri;
+}
+async function generateWideTile(tauriIconsDir, outputPath) {
+    // Try to find a square icon to use as source
+    const sourceIcons = ['Square150x150Logo.png', 'Square142x142Logo.png', 'icon.png', '128x128.png'];
+    for (const iconName of sourceIcons) {
+        const iconPath = path.join(tauriIconsDir, iconName);
+        if (fs.existsSync(iconPath)) {
+            try {
+                const image = await Jimp.read(iconPath);
+                const iconSize = 150; // Height of the wide tile
+                const resized = image.clone().resize({ w: iconSize, h: iconSize });
+                // Create 310x150 canvas with transparent background
+                const canvas = new Jimp({ width: 310, height: 150, color: 0x00000000 });
+                const x = Math.floor((310 - iconSize) / 2);
+                canvas.composite(resized, x, 0);
+                await canvas.write(outputPath);
+                return true;
+            }
+            catch {
+                // Try next icon
+            }
+        }
+    }
+    return false;
 }
 function createPlaceholderPng(width, height) {
     // Create a minimal valid PNG file (solid gray square)
@@ -225,6 +288,10 @@ function findPackageRoot(startDir) {
 const PACKAGE_ROOT = findPackageRoot(__dirname$1);
 const TEMPLATES_DIR = path.join(PACKAGE_ROOT, 'templates');
 const EXTENSIONS_DIR = path.join(TEMPLATES_DIR, 'extensions');
+function getPackageVersion() {
+    const pkg = JSON.parse(fs.readFileSync(path.join(PACKAGE_ROOT, 'package.json'), 'utf-8'));
+    return pkg.version;
+}
 function loadTemplate(templatePath) {
     return fs.readFileSync(templatePath, 'utf-8');
 }
@@ -410,7 +477,14 @@ function generateExtensions(config) {
     return `      <Extensions>\n${extensions.join('\n\n')}\n      </Extensions>`;
 }
 function generateCapabilities(capabilities) {
-    return capabilities.map((cap) => `    <Capability Name="${cap}" />`).join('\n');
+    const caps = [];
+    // runFullTrust is always required for Tauri apps using Windows.FullTrustApplication
+    caps.push('    <rescap:Capability Name="runFullTrust" />');
+    // Add user-specified capabilities
+    for (const cap of capabilities) {
+        caps.push(`    <Capability Name="${cap}" />`);
+    }
+    return caps.join('\n');
 }
 function generateClsid(seed) {
     // Generate a deterministic GUID-like string from the seed
@@ -447,20 +521,25 @@ async function init(options) {
     // Generate AppxManifest.xml template
     generateManifestTemplate(windowsDir);
     console.log('  Created AppxManifest.xml.template');
-    // Generate placeholder assets
-    await generateAssets(windowsDir);
+    // Generate assets (copy from src-tauri/icons or generate placeholders)
+    const assetsCopied = await generateAssets(windowsDir, projectRoot);
     // Generate .gitignore
     generateGitignore(windowsDir);
-    // Update package.json with build script
+    // Update package.json with devDependency and build script
     updatePackageJson(projectRoot);
-    console.log('  Added tauri:windows:build script to package.json');
     console.log('\n Windows bundle configuration created!');
     console.log(`\nNext steps:`);
-    console.log(`  1. Edit src-tauri/gen/windows/bundle.config.json`);
+    console.log(`  1. Run: pnpm install`);
+    console.log(`  2. Edit src-tauri/gen/windows/bundle.config.json`);
     console.log(`     - Set your publisher CN (from your code signing certificate)`);
     console.log(`     - Set your publisher display name`);
-    console.log(`  2. Replace placeholder icons in src-tauri/gen/windows/Assets/`);
-    console.log(`  3. Run: pnpm tauri:windows:build`);
+    if (!assetsCopied) {
+        console.log(`  3. Replace placeholder icons in src-tauri/gen/windows/Assets/`);
+        console.log(`  4. Run: pnpm tauri:windows:build`);
+    }
+    else {
+        console.log(`  3. Run: pnpm tauri:windows:build`);
+    }
 }
 function updatePackageJson(projectRoot) {
     const packageJsonPath = path.join(projectRoot, 'package.json');
@@ -471,13 +550,16 @@ function updatePackageJson(projectRoot) {
     try {
         const content = fs.readFileSync(packageJsonPath, 'utf-8');
         const pkg = JSON.parse(content);
-        if (!pkg.scripts) {
-            pkg.scripts = {};
-        }
+        // Add devDependency
+        pkg.devDependencies = pkg.devDependencies || {};
+        pkg.devDependencies['@choochmeque/tauri-windows-bundle'] = `^${getPackageVersion()}`;
+        // Add script
+        pkg.scripts = pkg.scripts || {};
         if (!pkg.scripts['tauri:windows:build']) {
             pkg.scripts['tauri:windows:build'] = 'tauri-windows-bundle build';
-            fs.writeFileSync(packageJsonPath, JSON.stringify(pkg, null, 2) + '\n');
         }
+        fs.writeFileSync(packageJsonPath, JSON.stringify(pkg, null, 2) + '\n');
+        console.log('  Updated package.json with devDependency and build script');
     }
     catch (error) {
         console.log(`  Warning: Could not update package.json: ${error instanceof Error ? error.message : error}`);

package/dist/core/manifest.d.ts

@@ -1,3 +1,4 @@
 import type { MergedConfig } from '../types.js';
+export declare function getPackageVersion(): string;
 export declare function generateManifestTemplate(windowsDir: string): void;
 export declare function generateManifest(config: MergedConfig, arch: string, minVersion: string): string;

package/dist/generators/assets.d.ts

@@ -1 +1 @@
-export declare function generateAssets(windowsDir: string): Promise<void>;
+export declare function generateAssets(windowsDir: string, projectRoot?: string): Promise<boolean>;

package/dist/index.js

@@ -1,5 +1,6 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
+import { Jimp } from 'jimp';
 import { fileURLToPath } from 'node:url';
 import { glob } from 'glob';
 import { exec, spawn } from 'node:child_process';
@@ -99,18 +100,80 @@ function generateGitignore(windowsDir) {
     fs.writeFileSync(gitignorePath, content);
 }
 
-async function generateAssets(windowsDir) {
+// Map MSIX asset names to Tauri icon names
+const TAURI_ICON_MAP = {
+    'StoreLogo.png': 'StoreLogo.png',
+    'Square44x44Logo.png': 'Square44x44Logo.png',
+    'Square150x150Logo.png': 'Square150x150Logo.png',
+    'LargeTile.png': 'Square310x310Logo.png',
+};
+function getTauriIconsDir(projectRoot) {
+    return path.join(projectRoot, 'src-tauri', 'icons');
+}
+async function generateAssets(windowsDir, projectRoot) {
     const assetsDir = path.join(windowsDir, 'Assets');
     fs.mkdirSync(assetsDir, { recursive: true });
+    const tauriIconsDir = projectRoot ? getTauriIconsDir(projectRoot) : null;
+    let copiedFromTauri = false;
     for (const asset of MSIX_ASSETS) {
         const width = asset.width || asset.size || 50;
         const height = asset.height || asset.size || 50;
         const assetPath = path.join(assetsDir, asset.name);
-        // Generate a simple placeholder PNG
-        const pngData = createPlaceholderPng(width, height);
-        fs.writeFileSync(assetPath, pngData);
+        // Check if we can copy from Tauri icons
+        const tauriIconName = TAURI_ICON_MAP[asset.name];
+        const tauriIconPath = tauriIconsDir && tauriIconName ? path.join(tauriIconsDir, tauriIconName) : null;
+        if (tauriIconPath && fs.existsSync(tauriIconPath)) {
+            fs.copyFileSync(tauriIconPath, assetPath);
+            copiedFromTauri = true;
+        }
+        else if (asset.name === 'Wide310x150Logo.png' && tauriIconsDir) {
+            // Generate wide tile from square icon
+            const generated = await generateWideTile(tauriIconsDir, assetPath);
+            if (!generated) {
+                const pngData = createPlaceholderPng(width, height);
+                fs.writeFileSync(assetPath, pngData);
+            }
+            else {
+                copiedFromTauri = true;
+            }
+        }
+        else {
+            // Fall back to placeholder
+            const pngData = createPlaceholderPng(width, height);
+            fs.writeFileSync(assetPath, pngData);
+        }
+    }
+    if (copiedFromTauri) {
+        console.log('  Copied assets from src-tauri/icons');
+    }
+    else {
+        console.log('  Generated placeholder assets - replace with real icons before publishing');
     }
-    console.log('  Generated placeholder assets - replace with real icons before publishing');
+    return copiedFromTauri;
+}
+async function generateWideTile(tauriIconsDir, outputPath) {
+    // Try to find a square icon to use as source
+    const sourceIcons = ['Square150x150Logo.png', 'Square142x142Logo.png', 'icon.png', '128x128.png'];
+    for (const iconName of sourceIcons) {
+        const iconPath = path.join(tauriIconsDir, iconName);
+        if (fs.existsSync(iconPath)) {
+            try {
+                const image = await Jimp.read(iconPath);
+                const iconSize = 150; // Height of the wide tile
+                const resized = image.clone().resize({ w: iconSize, h: iconSize });
+                // Create 310x150 canvas with transparent background
+                const canvas = new Jimp({ width: 310, height: 150, color: 0x00000000 });
+                const x = Math.floor((310 - iconSize) / 2);
+                canvas.composite(resized, x, 0);
+                await canvas.write(outputPath);
+                return true;
+            }
+            catch {
+                // Try next icon
+            }
+        }
+    }
+    return false;
 }
 function createPlaceholderPng(width, height) {
     // Create a minimal valid PNG file (solid gray square)
@@ -223,6 +286,10 @@ function findPackageRoot(startDir) {
 const PACKAGE_ROOT = findPackageRoot(__dirname$1);
 const TEMPLATES_DIR = path.join(PACKAGE_ROOT, 'templates');
 const EXTENSIONS_DIR = path.join(TEMPLATES_DIR, 'extensions');
+function getPackageVersion() {
+    const pkg = JSON.parse(fs.readFileSync(path.join(PACKAGE_ROOT, 'package.json'), 'utf-8'));
+    return pkg.version;
+}
 function loadTemplate(templatePath) {
     return fs.readFileSync(templatePath, 'utf-8');
 }
@@ -408,7 +475,14 @@ function generateExtensions(config) {
     return `      <Extensions>\n${extensions.join('\n\n')}\n      </Extensions>`;
 }
 function generateCapabilities(capabilities) {
-    return capabilities.map((cap) => `    <Capability Name="${cap}" />`).join('\n');
+    const caps = [];
+    // runFullTrust is always required for Tauri apps using Windows.FullTrustApplication
+    caps.push('    <rescap:Capability Name="runFullTrust" />');
+    // Add user-specified capabilities
+    for (const cap of capabilities) {
+        caps.push(`    <Capability Name="${cap}" />`);
+    }
+    return caps.join('\n');
 }
 function generateClsid(seed) {
     // Generate a deterministic GUID-like string from the seed
@@ -445,20 +519,25 @@ async function init(options) {
     // Generate AppxManifest.xml template
     generateManifestTemplate(windowsDir);
     console.log('  Created AppxManifest.xml.template');
-    // Generate placeholder assets
-    await generateAssets(windowsDir);
+    // Generate assets (copy from src-tauri/icons or generate placeholders)
+    const assetsCopied = await generateAssets(windowsDir, projectRoot);
     // Generate .gitignore
     generateGitignore(windowsDir);
-    // Update package.json with build script
+    // Update package.json with devDependency and build script
     updatePackageJson(projectRoot);
-    console.log('  Added tauri:windows:build script to package.json');
     console.log('\n Windows bundle configuration created!');
     console.log(`\nNext steps:`);
-    console.log(`  1. Edit src-tauri/gen/windows/bundle.config.json`);
+    console.log(`  1. Run: pnpm install`);
+    console.log(`  2. Edit src-tauri/gen/windows/bundle.config.json`);
     console.log(`     - Set your publisher CN (from your code signing certificate)`);
     console.log(`     - Set your publisher display name`);
-    console.log(`  2. Replace placeholder icons in src-tauri/gen/windows/Assets/`);
-    console.log(`  3. Run: pnpm tauri:windows:build`);
+    if (!assetsCopied) {
+        console.log(`  3. Replace placeholder icons in src-tauri/gen/windows/Assets/`);
+        console.log(`  4. Run: pnpm tauri:windows:build`);
+    }
+    else {
+        console.log(`  3. Run: pnpm tauri:windows:build`);
+    }
 }
 function updatePackageJson(projectRoot) {
     const packageJsonPath = path.join(projectRoot, 'package.json');
@@ -469,13 +548,16 @@ function updatePackageJson(projectRoot) {
     try {
         const content = fs.readFileSync(packageJsonPath, 'utf-8');
         const pkg = JSON.parse(content);
-        if (!pkg.scripts) {
-            pkg.scripts = {};
-        }
+        // Add devDependency
+        pkg.devDependencies = pkg.devDependencies || {};
+        pkg.devDependencies['@choochmeque/tauri-windows-bundle'] = `^${getPackageVersion()}`;
+        // Add script
+        pkg.scripts = pkg.scripts || {};
         if (!pkg.scripts['tauri:windows:build']) {
             pkg.scripts['tauri:windows:build'] = 'tauri-windows-bundle build';
-            fs.writeFileSync(packageJsonPath, JSON.stringify(pkg, null, 2) + '\n');
         }
+        fs.writeFileSync(packageJsonPath, JSON.stringify(pkg, null, 2) + '\n');
+        console.log('  Updated package.json with devDependency and build script');
     }
     catch (error) {
         console.log(`  Warning: Could not update package.json: ${error instanceof Error ? error.message : error}`);
@@ -1505,4 +1587,4 @@ async function extensionRemove(type, name, options) {
     }
 }
 
-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 };
+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, getPackageVersion, getWindowsDir, init, prepareAppxContent, readBundleConfig$1 as readBundleConfig, readTauriConfig, toFourPartVersion };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@choochmeque/tauri-windows-bundle",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "MSIX packaging tool for Tauri apps - Windows Store ready bundles",
   "type": "module",
   "bin": {
@@ -28,7 +28,8 @@
   ],
   "dependencies": {
     "commander": "^14.0.2",
-    "glob": "^13.0.0"
+    "glob": "^13.0.0",
+    "jimp": "^1.6.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.0.0",
@@ -37,11 +38,11 @@
     "@types/node": "^25.0.3",
     "@vitest/coverage-v8": "^2.0.0",
     "eslint": "^9.0.0",
-    "typescript-eslint": "^8.0.0",
     "prettier": "^3.0.0",
     "rollup": "^4.0.0",
     "tslib": "^2.6.0",
     "typescript": "^5.3.3",
+    "typescript-eslint": "^8.0.0",
     "vitest": "^2.0.0"
   },
   "scripts": {