@choochmeque/tauri-windows-bundle 0.1.13 → 0.1.15

package/README.md

@@ -73,6 +73,8 @@ Edit `src-tauri/gen/windows/bundle.config.json`:
 }
 ```
 
+`publisher` and `publisherDisplayName` are optional in `bundle.config.json`. If omitted, `publisher` falls back to `bundle.publisher` from `tauri.conf.json` or `tauri.windows.conf.json`. If `publisherDisplayName` is omitted, it defaults to the resolved `publisher` value.
+
 **Capabilities** are validated at build time. Three types are supported:
 
 ```json
@@ -91,14 +93,17 @@ Edit `src-tauri/gen/windows/bundle.config.json`:
 
 Note: `runFullTrust` is always auto-added (required for Tauri apps).
 
-**Auto-read from tauri.conf.json:**
+**Auto-read from tauri.conf.json / tauri.windows.conf.json:**
 - `displayName` ← `productName`
 - `version` ← `version` (auto-converted to 4-part: `1.0.0` → `1.0.0.0`)
 - `description` ← `bundle.shortDescription`
+- `publisher` ← `bundle.publisher` (fallback when not in bundle.config.json)
 - `icons` ← `bundle.icon`
 - `resources` ← `bundle.resources`
 - `signing` ← `bundle.windows.certificateThumbprint`
 
+**Platform-specific config:** Values in `tauri.windows.conf.json` override `tauri.conf.json` using [JSON Merge Patch (RFC 7396)](https://datatracker.ietf.org/doc/html/rfc7396). This lets you define Windows-specific settings like `identifier`, `productName`, or `bundle.publisher` separately.
+
 ### Build
 
 ```bash

package/dist/cli.js

@@ -72,6 +72,26 @@ function readBundleConfig$1(windowsDir) {
 function getWindowsDir(projectRoot) {
     return path.join(projectRoot, 'src-tauri', 'gen', 'windows');
 }
+function resolveVersion(version, tauriConfigDir) {
+    const resolvedPath = path.resolve(tauriConfigDir, version);
+    if (fs.existsSync(resolvedPath) && fs.statSync(resolvedPath).isFile()) {
+        try {
+            const content = fs.readFileSync(resolvedPath, 'utf-8');
+            const json = JSON.parse(content);
+            if (!json.version || typeof json.version !== 'string') {
+                throw new Error(`File ${version} does not contain a valid "version" field`);
+            }
+            return json.version;
+        }
+        catch (error) {
+            if (error instanceof SyntaxError) {
+                throw new Error(`Failed to parse ${version} as JSON: ${error.message}`);
+            }
+            throw error;
+        }
+    }
+    return version;
+}
 function toFourPartVersion(version) {
     const parts = version.split('.');
     while (parts.length < 4)
@@ -382,18 +402,22 @@ function getPackageVersion() {
 function loadTemplate(templatePath) {
     return fs.readFileSync(templatePath, 'utf-8');
 }
-function getManifestTemplate() {
-    return loadTemplate(path.join(TEMPLATES_DIR, 'AppxManifest.xml.template'));
+function getManifestTemplate(windowsDir) {
+    const localPath = path.join(windowsDir, 'AppxManifest.xml.template');
+    if (!fs.existsSync(localPath)) {
+        throw new Error(`AppxManifest.xml.template not found at ${localPath}. Run 'tauri-windows-bundle init' first.`);
+    }
+    return loadTemplate(localPath);
 }
 function getExtensionTemplate(name) {
     return loadTemplate(path.join(EXTENSIONS_DIR, `${name}.xml`));
 }
 function generateManifestTemplate(windowsDir) {
     const templatePath = path.join(windowsDir, 'AppxManifest.xml.template');
-    const template = getManifestTemplate();
+    const template = loadTemplate(path.join(TEMPLATES_DIR, 'AppxManifest.xml.template'));
     fs.writeFileSync(templatePath, template);
 }
-function generateManifest(config, arch, minVersion) {
+function generateManifest(config, arch, minVersion, windowsDir) {
     const variables = {
         PACKAGE_NAME: config.identifier,
         PUBLISHER: config.publisher,
@@ -407,7 +431,7 @@ function generateManifest(config, arch, minVersion) {
         EXTENSIONS: generateExtensions(config),
         CAPABILITIES: generateCapabilities(config.capabilities || DEFAULT_CAPABILITIES),
     };
-    return replaceTemplateVariables(getManifestTemplate(), variables);
+    return replaceTemplateVariables(getManifestTemplate(windowsDir), variables);
 }
 function generateExtensions(config) {
     const extensions = [];
@@ -615,7 +639,6 @@ async function init(options) {
     const windowsDir = getWindowsDir(projectRoot);
     // Create directories
     fs.mkdirSync(path.join(windowsDir, 'Assets'), { recursive: true });
-    fs.mkdirSync(path.join(windowsDir, 'extensions'), { recursive: true });
     // Generate bundle.config.json
     generateBundleConfig(windowsDir);
     console.log('  Created bundle.config.json');
@@ -686,7 +709,7 @@ function jsonMergePatch(target, patch) {
     return result;
 }
 
-function prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion) {
+function prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion, windowsDir) {
     const target = arch === 'x64' ? 'x86_64-pc-windows-msvc' : 'aarch64-pc-windows-msvc';
     const srcTauriDir = path.join(projectRoot, 'src-tauri');
     const buildDir = path.join(srcTauriDir, 'target', target, 'release');
@@ -701,7 +724,7 @@ function prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion)
     }
     fs.copyFileSync(srcExe, path.join(appxDir, exeName));
     // Generate AppxManifest.xml
-    const manifest = generateManifest(config, arch, minVersion);
+    const manifest = generateManifest(config, arch, minVersion, windowsDir);
     fs.writeFileSync(path.join(appxDir, 'AppxManifest.xml'), manifest);
     // Copy MSIX Assets
     const windowsAssetsDir = path.join(projectRoot, 'src-tauri', 'gen', 'windows', 'Assets');
@@ -939,13 +962,22 @@ async function build(options) {
             process.exit(1);
         }
     }
+    // Resolve publisher with fallback to tauriConfig
+    const publisher = bundleConfig.publisher || tauriConfig.bundle?.publisher;
+    if (!publisher) {
+        console.error('Publisher is required. Set it in bundle.config.json or in tauri.conf.json / tauri.windows.conf.json under bundle.publisher');
+        process.exit(1);
+    }
+    const publisherDisplayName = bundleConfig.publisherDisplayName || publisher;
     // Merge config
     const config = {
         displayName: tauriConfig.productName || 'App',
-        version: toFourPartVersion(tauriConfig.version || '1.0.0'),
+        version: toFourPartVersion(resolveVersion(tauriConfig.version || '1.0.0', path.join(projectRoot, 'src-tauri'))),
         description: tauriConfig.bundle?.shortDescription || '',
         identifier: tauriConfig.identifier || 'com.example.app',
         ...bundleConfig,
+        publisher,
+        publisherDisplayName,
     };
     // Architectures from CLI flag
     const architectures = options.arch?.split(',') || ['x64'];
@@ -984,7 +1016,7 @@ async function build(options) {
         }
         // Prepare AppxContent directory
         console.log(`  Preparing AppxContent for ${arch}...`);
-        const appxDir = prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion);
+        const appxDir = prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion, windowsDir);
         appxDirs.push({ arch, dir: appxDir });
         console.log(`  AppxContent ready: ${appxDir}`);
     }

package/dist/core/appx-content.d.ts

@@ -1,2 +1,2 @@
 import type { MergedConfig, TauriConfig } from '../types.js';
-export declare function prepareAppxContent(projectRoot: string, arch: string, config: MergedConfig, tauriConfig: TauriConfig, minVersion: string): string;
+export declare function prepareAppxContent(projectRoot: string, arch: string, config: MergedConfig, tauriConfig: TauriConfig, minVersion: string, windowsDir: string): string;

package/dist/core/manifest.d.ts

@@ -1,4 +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;
+export declare function generateManifest(config: MergedConfig, arch: string, minVersion: string, windowsDir: string): string;

package/dist/core/project-discovery.d.ts

@@ -4,4 +4,5 @@ export declare function readTauriConfig(projectRoot: string): TauriConfig;
 export declare function readTauriWindowsConfig(projectRoot: string): TauriConfig | null;
 export declare function readBundleConfig(windowsDir: string): BundleConfig;
 export declare function getWindowsDir(projectRoot: string): string;
+export declare function resolveVersion(version: string, tauriConfigDir: string): string;
 export declare function toFourPartVersion(version: string): string;

package/dist/index.js

@@ -153,6 +153,26 @@ function readBundleConfig$1(windowsDir) {
 function getWindowsDir(projectRoot) {
     return path.join(projectRoot, 'src-tauri', 'gen', 'windows');
 }
+function resolveVersion(version, tauriConfigDir) {
+    const resolvedPath = path.resolve(tauriConfigDir, version);
+    if (fs.existsSync(resolvedPath) && fs.statSync(resolvedPath).isFile()) {
+        try {
+            const content = fs.readFileSync(resolvedPath, 'utf-8');
+            const json = JSON.parse(content);
+            if (!json.version || typeof json.version !== 'string') {
+                throw new Error(`File ${version} does not contain a valid "version" field`);
+            }
+            return json.version;
+        }
+        catch (error) {
+            if (error instanceof SyntaxError) {
+                throw new Error(`Failed to parse ${version} as JSON: ${error.message}`);
+            }
+            throw error;
+        }
+    }
+    return version;
+}
 function toFourPartVersion(version) {
     const parts = version.split('.');
     while (parts.length < 4)
@@ -379,18 +399,22 @@ function getPackageVersion() {
 function loadTemplate(templatePath) {
     return fs.readFileSync(templatePath, 'utf-8');
 }
-function getManifestTemplate() {
-    return loadTemplate(path.join(TEMPLATES_DIR, 'AppxManifest.xml.template'));
+function getManifestTemplate(windowsDir) {
+    const localPath = path.join(windowsDir, 'AppxManifest.xml.template');
+    if (!fs.existsSync(localPath)) {
+        throw new Error(`AppxManifest.xml.template not found at ${localPath}. Run 'tauri-windows-bundle init' first.`);
+    }
+    return loadTemplate(localPath);
 }
 function getExtensionTemplate(name) {
     return loadTemplate(path.join(EXTENSIONS_DIR, `${name}.xml`));
 }
 function generateManifestTemplate(windowsDir) {
     const templatePath = path.join(windowsDir, 'AppxManifest.xml.template');
-    const template = getManifestTemplate();
+    const template = loadTemplate(path.join(TEMPLATES_DIR, 'AppxManifest.xml.template'));
     fs.writeFileSync(templatePath, template);
 }
-function generateManifest(config, arch, minVersion) {
+function generateManifest(config, arch, minVersion, windowsDir) {
     const variables = {
         PACKAGE_NAME: config.identifier,
         PUBLISHER: config.publisher,
@@ -404,7 +428,7 @@ function generateManifest(config, arch, minVersion) {
         EXTENSIONS: generateExtensions(config),
         CAPABILITIES: generateCapabilities(config.capabilities || DEFAULT_CAPABILITIES),
     };
-    return replaceTemplateVariables(getManifestTemplate(), variables);
+    return replaceTemplateVariables(getManifestTemplate(windowsDir), variables);
 }
 function generateExtensions(config) {
     const extensions = [];
@@ -612,7 +636,6 @@ async function init(options) {
     const windowsDir = getWindowsDir(projectRoot);
     // Create directories
     fs.mkdirSync(path.join(windowsDir, 'Assets'), { recursive: true });
-    fs.mkdirSync(path.join(windowsDir, 'extensions'), { recursive: true });
     // Generate bundle.config.json
     generateBundleConfig(windowsDir);
     console.log('  Created bundle.config.json');
@@ -683,7 +706,7 @@ function jsonMergePatch(target, patch) {
     return result;
 }
 
-function prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion) {
+function prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion, windowsDir) {
     const target = arch === 'x64' ? 'x86_64-pc-windows-msvc' : 'aarch64-pc-windows-msvc';
     const srcTauriDir = path.join(projectRoot, 'src-tauri');
     const buildDir = path.join(srcTauriDir, 'target', target, 'release');
@@ -698,7 +721,7 @@ function prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion)
     }
     fs.copyFileSync(srcExe, path.join(appxDir, exeName));
     // Generate AppxManifest.xml
-    const manifest = generateManifest(config, arch, minVersion);
+    const manifest = generateManifest(config, arch, minVersion, windowsDir);
     fs.writeFileSync(path.join(appxDir, 'AppxManifest.xml'), manifest);
     // Copy MSIX Assets
     const windowsAssetsDir = path.join(projectRoot, 'src-tauri', 'gen', 'windows', 'Assets');
@@ -936,13 +959,22 @@ async function build(options) {
             process.exit(1);
         }
     }
+    // Resolve publisher with fallback to tauriConfig
+    const publisher = bundleConfig.publisher || tauriConfig.bundle?.publisher;
+    if (!publisher) {
+        console.error('Publisher is required. Set it in bundle.config.json or in tauri.conf.json / tauri.windows.conf.json under bundle.publisher');
+        process.exit(1);
+    }
+    const publisherDisplayName = bundleConfig.publisherDisplayName || publisher;
     // Merge config
     const config = {
         displayName: tauriConfig.productName || 'App',
-        version: toFourPartVersion(tauriConfig.version || '1.0.0'),
+        version: toFourPartVersion(resolveVersion(tauriConfig.version || '1.0.0', path.join(projectRoot, 'src-tauri'))),
         description: tauriConfig.bundle?.shortDescription || '',
         identifier: tauriConfig.identifier || 'com.example.app',
         ...bundleConfig,
+        publisher,
+        publisherDisplayName,
     };
     // Architectures from CLI flag
     const architectures = options.arch?.split(',') || ['x64'];
@@ -981,7 +1013,7 @@ async function build(options) {
         }
         // Prepare AppxContent directory
         console.log(`  Preparing AppxContent for ${arch}...`);
-        const appxDir = prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion);
+        const appxDir = prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion, windowsDir);
         appxDirs.push({ arch, dir: appxDir });
         console.log(`  AppxContent ready: ${appxDir}`);
     }
@@ -1723,4 +1755,4 @@ async function extensionRemove(type, name, options) {
     }
 }
 
-export { DEFAULT_CAPABILITIES, DEFAULT_MIN_WINDOWS_VERSION, DEFAULT_RUNNER, DEVICE_CAPABILITIES, GENERAL_CAPABILITIES, MSIX_ASSETS, RESTRICTED_CAPABILITIES, 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, readTauriWindowsConfig, toFourPartVersion, validateCapabilities };
+export { DEFAULT_CAPABILITIES, DEFAULT_MIN_WINDOWS_VERSION, DEFAULT_RUNNER, DEVICE_CAPABILITIES, GENERAL_CAPABILITIES, MSIX_ASSETS, RESTRICTED_CAPABILITIES, 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, readTauriWindowsConfig, resolveVersion, toFourPartVersion, validateCapabilities };

package/dist/types.d.ts

@@ -6,6 +6,7 @@ export interface TauriConfig {
         icon?: string[];
         shortDescription?: string;
         longDescription?: string;
+        publisher?: string;
         resources?: (string | {
             src: string;
             target: string;
@@ -21,8 +22,8 @@ export interface CapabilitiesConfig {
     restricted?: string[];
 }
 export interface BundleConfig {
-    publisher: string;
-    publisherDisplayName: string;
+    publisher?: string;
+    publisherDisplayName?: string;
     capabilities?: CapabilitiesConfig;
     extensions?: {
         shareTarget?: boolean;
@@ -95,6 +96,8 @@ export interface PreviewHandler {
     fileTypes: string[];
 }
 export interface MergedConfig extends BundleConfig {
+    publisher: string;
+    publisherDisplayName: string;
     displayName: string;
     version: string;
     description: string;

package/package.json

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