craft-native 0.0.330 → 0.0.338

package/dist/cli.js

@@ -126,7 +126,7 @@ var init_temp_dir = __esm(() => {
 });
 
 // src/package.ts
-import { spawn } from "child_process";
+import { spawn, spawnSync } from "child_process";
 import { createHash } from "crypto";
 import {
   chmodSync,
@@ -144,7 +144,7 @@ import {
   writeFileSync as writeFileSync3
 } from "fs";
 import { homedir } from "os";
-import { basename, join as join2, resolve } from "path";
+import { basename, dirname, join as join2, resolve } from "path";
 import { deflateRawSync } from "zlib";
 function crc32(data) {
   let c = 4294967295;
@@ -241,6 +241,15 @@ async function packageApp(config) {
   }
   return results;
 }
+function macOSAppStoreRuntimePath(providerPath) {
+  const runtime = basename(providerPath) === "craft-app-store" ? providerPath : join2(dirname(providerPath), "craft-app-store");
+  if (!existsSync4(runtime))
+    throw new Error("App Store packaging requires Pantry\u2019s craft-app-store runtime. Upgrade Craft with Pantry before building.");
+  const probe = spawnSync(runtime, ["--distribution"], { encoding: "utf8", timeout: 1e4 });
+  if (probe.status !== 0 || probe.stdout.trim() !== "app-store")
+    throw new Error("App Store packaging refused a runtime that includes private platform APIs.");
+  return runtime;
+}
 async function packageMacOS(config, outDir) {
   const results = [];
   const { name, version, bundleId = `com.myapp.${name.toLowerCase()}` } = config;
@@ -248,6 +257,14 @@ async function packageMacOS(config, outDir) {
   const hardenedRuntime = !opts.appStore;
   if (opts.appStore && (!opts.entitlements || !opts.provisioningProfile))
     return [{ success: false, platform: "macos", format: "app", error: "App Store packaging requires macos.entitlements and macos.provisioningProfile" }];
+  let nativeRuntimePath = opts.nativeRuntimePath;
+  if (opts.appStore && nativeRuntimePath) {
+    try {
+      nativeRuntimePath = macOSAppStoreRuntimePath(nativeRuntimePath);
+    } catch (error) {
+      return [{ success: false, platform: "macos", format: "app", error: error.message }];
+    }
+  }
   const appBundlePath = join2(outDir, `${name}.app`);
   const appBundle = opts.appBundlePath ? copyMacOSAppBundle(opts.appBundlePath, appBundlePath) : createMacOSAppBundle({
     name,
@@ -262,7 +279,9 @@ async function packageMacOS(config, outDir) {
     iconPath: config.iconPath,
     provisioningProfile: opts.provisioningProfile,
     additionalExecutables: opts.additionalExecutables,
-    nativeRuntimePath: opts.nativeRuntimePath,
+    nativeRuntimePath,
+    nativeHost: opts.appStore === true && Boolean(nativeRuntimePath),
+    nativeWindow: opts.nativeWindow,
     outputPath: appBundlePath
   });
   if (!appBundle.success) {
@@ -715,7 +734,7 @@ function createMacOSAppBundle(opts) {
     const macOS = join2(contents, "MacOS");
     mkdirSync(macOS, { recursive: true });
     mkdirSync(join2(contents, "Resources"), { recursive: true });
-    copyFileSync(binaryPath, join2(macOS, name));
+    copyFileSync(opts.nativeHost ? opts.nativeRuntimePath : binaryPath, join2(macOS, name));
     chmodSync(join2(macOS, name), 493);
     for (const executable of additionalExecutables || []) {
       if (!existsSync4(executable))
@@ -724,7 +743,18 @@ function createMacOSAppBundle(opts) {
       copyFileSync(executable, destination);
       chmodSync(destination, 493);
     }
-    if (opts.nativeRuntimePath) {
+    if (opts.nativeHost) {
+      const backend = join2(macOS, "craft-backend");
+      copyFileSync(binaryPath, backend);
+      chmodSync(backend, 493);
+      writeFileSync3(join2(contents, "Resources", "craft.json"), `${JSON.stringify({
+        title: name,
+        appName: name,
+        ...opts.nativeWindow,
+        backend: { executable: "craft-backend" }
+      }, null, 2)}
+`);
+    } else if (opts.nativeRuntimePath) {
       const helper = macOSRuntimeExecutablePath(outputPath);
       const helperContents = resolve(helper, "..", "..");
       mkdirSync(join2(helperContents, "MacOS"), { recursive: true });
@@ -2988,7 +3018,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.330";
+var version = "0.0.338";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -375,7 +375,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.330";
+var version = "0.0.338";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;
@@ -607,6 +607,15 @@ async function packageApp(config) {
   }
   return results;
 }
+function macOSAppStoreRuntimePath(providerPath) {
+  const runtime = import_path.basename(providerPath) === "craft-app-store" ? providerPath : import_path.join(import_path.dirname(providerPath), "craft-app-store");
+  if (!import_fs.existsSync(runtime))
+    throw new Error("App Store packaging requires Pantry’s craft-app-store runtime. Upgrade Craft with Pantry before building.");
+  const probe = import_child_process.spawnSync(runtime, ["--distribution"], { encoding: "utf8", timeout: 1e4 });
+  if (probe.status !== 0 || probe.stdout.trim() !== "app-store")
+    throw new Error("App Store packaging refused a runtime that includes private platform APIs.");
+  return runtime;
+}
 async function packageMacOS(config, outDir) {
   const results = [];
   const { name, version, bundleId = `com.myapp.${name.toLowerCase()}` } = config;
@@ -614,6 +623,14 @@ async function packageMacOS(config, outDir) {
   const hardenedRuntime = !opts.appStore;
   if (opts.appStore && (!opts.entitlements || !opts.provisioningProfile))
     return [{ success: false, platform: "macos", format: "app", error: "App Store packaging requires macos.entitlements and macos.provisioningProfile" }];
+  let nativeRuntimePath = opts.nativeRuntimePath;
+  if (opts.appStore && nativeRuntimePath) {
+    try {
+      nativeRuntimePath = macOSAppStoreRuntimePath(nativeRuntimePath);
+    } catch (error) {
+      return [{ success: false, platform: "macos", format: "app", error: error.message }];
+    }
+  }
   const appBundlePath = import_path.join(outDir, `${name}.app`);
   const appBundle = opts.appBundlePath ? copyMacOSAppBundle(opts.appBundlePath, appBundlePath) : createMacOSAppBundle({
     name,
@@ -628,7 +645,9 @@ async function packageMacOS(config, outDir) {
     iconPath: config.iconPath,
     provisioningProfile: opts.provisioningProfile,
     additionalExecutables: opts.additionalExecutables,
-    nativeRuntimePath: opts.nativeRuntimePath,
+    nativeRuntimePath,
+    nativeHost: opts.appStore === true && Boolean(nativeRuntimePath),
+    nativeWindow: opts.nativeWindow,
     outputPath: appBundlePath
   });
   if (!appBundle.success) {
@@ -1082,7 +1101,7 @@ function createMacOSAppBundle(opts) {
     const macOS = import_path.join(contents, "MacOS");
     import_fs.mkdirSync(macOS, { recursive: true });
     import_fs.mkdirSync(import_path.join(contents, "Resources"), { recursive: true });
-    import_fs.copyFileSync(binaryPath, import_path.join(macOS, name));
+    import_fs.copyFileSync(opts.nativeHost ? opts.nativeRuntimePath : binaryPath, import_path.join(macOS, name));
     import_fs.chmodSync(import_path.join(macOS, name), 493);
     for (const executable of additionalExecutables || []) {
       if (!import_fs.existsSync(executable))
@@ -1091,7 +1110,18 @@ function createMacOSAppBundle(opts) {
       import_fs.copyFileSync(executable, destination);
       import_fs.chmodSync(destination, 493);
     }
-    if (opts.nativeRuntimePath) {
+    if (opts.nativeHost) {
+      const backend = import_path.join(macOS, "craft-backend");
+      import_fs.copyFileSync(binaryPath, backend);
+      import_fs.chmodSync(backend, 493);
+      import_fs.writeFileSync(import_path.join(contents, "Resources", "craft.json"), `${JSON.stringify({
+        title: name,
+        appName: name,
+        ...opts.nativeWindow,
+        backend: { executable: "craft-backend" }
+      }, null, 2)}
+`);
+    } else if (opts.nativeRuntimePath) {
       const helper = macOSRuntimeExecutablePath(outputPath);
       const helperContents = import_path.resolve(helper, "..", "..");
       import_fs.mkdirSync(import_path.join(helperContents, "MacOS"), { recursive: true });

package/dist/index.js

@@ -117,7 +117,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.330";
+var version = "0.0.338";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;
@@ -237,7 +237,7 @@ function removeTempDir(dir) {
 }
 
 // src/package.ts
-import { spawn } from "child_process";
+import { spawn, spawnSync } from "child_process";
 import { createHash } from "crypto";
 import {
   chmodSync,
@@ -255,7 +255,7 @@ import {
   writeFileSync as writeFileSync2
 } from "fs";
 import { homedir } from "os";
-import { basename, join as join2, resolve } from "path";
+import { basename, dirname, join as join2, resolve } from "path";
 import { deflateRawSync } from "zlib";
 var DEFAULT_DEB_DEPENDENCIES = ["libgtk-3-0", "libwebkit2gtk-4.1-37", "libnotify-bin"];
 var CRC32_TABLE = (() => {
@@ -363,6 +363,15 @@ async function packageApp(config) {
   }
   return results;
 }
+function macOSAppStoreRuntimePath(providerPath) {
+  const runtime = basename(providerPath) === "craft-app-store" ? providerPath : join2(dirname(providerPath), "craft-app-store");
+  if (!existsSync3(runtime))
+    throw new Error("App Store packaging requires Pantry\u2019s craft-app-store runtime. Upgrade Craft with Pantry before building.");
+  const probe = spawnSync(runtime, ["--distribution"], { encoding: "utf8", timeout: 1e4 });
+  if (probe.status !== 0 || probe.stdout.trim() !== "app-store")
+    throw new Error("App Store packaging refused a runtime that includes private platform APIs.");
+  return runtime;
+}
 async function packageMacOS(config, outDir) {
   const results = [];
   const { name, version, bundleId = `com.myapp.${name.toLowerCase()}` } = config;
@@ -370,6 +379,14 @@ async function packageMacOS(config, outDir) {
   const hardenedRuntime = !opts.appStore;
   if (opts.appStore && (!opts.entitlements || !opts.provisioningProfile))
     return [{ success: false, platform: "macos", format: "app", error: "App Store packaging requires macos.entitlements and macos.provisioningProfile" }];
+  let nativeRuntimePath = opts.nativeRuntimePath;
+  if (opts.appStore && nativeRuntimePath) {
+    try {
+      nativeRuntimePath = macOSAppStoreRuntimePath(nativeRuntimePath);
+    } catch (error) {
+      return [{ success: false, platform: "macos", format: "app", error: error.message }];
+    }
+  }
   const appBundlePath = join2(outDir, `${name}.app`);
   const appBundle = opts.appBundlePath ? copyMacOSAppBundle(opts.appBundlePath, appBundlePath) : createMacOSAppBundle({
     name,
@@ -384,7 +401,9 @@ async function packageMacOS(config, outDir) {
     iconPath: config.iconPath,
     provisioningProfile: opts.provisioningProfile,
     additionalExecutables: opts.additionalExecutables,
-    nativeRuntimePath: opts.nativeRuntimePath,
+    nativeRuntimePath,
+    nativeHost: opts.appStore === true && Boolean(nativeRuntimePath),
+    nativeWindow: opts.nativeWindow,
     outputPath: appBundlePath
   });
   if (!appBundle.success) {
@@ -838,7 +857,7 @@ function createMacOSAppBundle(opts) {
     const macOS = join2(contents, "MacOS");
     mkdirSync(macOS, { recursive: true });
     mkdirSync(join2(contents, "Resources"), { recursive: true });
-    copyFileSync(binaryPath, join2(macOS, name));
+    copyFileSync(opts.nativeHost ? opts.nativeRuntimePath : binaryPath, join2(macOS, name));
     chmodSync(join2(macOS, name), 493);
     for (const executable of additionalExecutables || []) {
       if (!existsSync3(executable))
@@ -847,7 +866,18 @@ function createMacOSAppBundle(opts) {
       copyFileSync(executable, destination);
       chmodSync(destination, 493);
     }
-    if (opts.nativeRuntimePath) {
+    if (opts.nativeHost) {
+      const backend = join2(macOS, "craft-backend");
+      copyFileSync(binaryPath, backend);
+      chmodSync(backend, 493);
+      writeFileSync2(join2(contents, "Resources", "craft.json"), `${JSON.stringify({
+        title: name,
+        appName: name,
+        ...opts.nativeWindow,
+        backend: { executable: "craft-backend" }
+      }, null, 2)}
+`);
+    } else if (opts.nativeRuntimePath) {
       const helper = macOSRuntimeExecutablePath(outputPath);
       const helperContents = resolve(helper, "..", "..");
       mkdirSync(join2(helperContents, "MacOS"), { recursive: true });
@@ -10387,7 +10417,7 @@ var commonOptimizations = {
 };
 // src/updater/index.ts
 import { createReadStream, createWriteStream, existsSync as existsSync5, mkdirSync as mkdirSync2, readFileSync as readFileSync2, rmdirSync, statSync as statSync3, unlinkSync, writeFileSync as writeFileSync3 } from "fs";
-import { join as join4, basename as basename3, dirname as dirname2 } from "path";
+import { join as join4, basename as basename3, dirname as dirname3 } from "path";
 import { tmpdir as tmpdir2 } from "os";
 import { execFileSync as execFileSync2, spawn as spawn3 } from "child_process";
 import { createHash as createHash2 } from "crypto";
@@ -10396,7 +10426,7 @@ import { EventEmitter as EventEmitter3 } from "events";
 // src/updater/macos-bundle.ts
 import { execFile, execFileSync } from "child_process";
 import { accessSync, constants, existsSync as existsSync4, renameSync, rmSync as rmSync3, statSync as statSync2 } from "fs";
-import { basename as basename2, dirname, join as join3 } from "path";
+import { basename as basename2, dirname as dirname2, join as join3 } from "path";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
 function isMacOS() {
@@ -10549,7 +10579,7 @@ async function extractBundle(archivePath, stagingDir) {
 async function swapBundle(stagedPath, installedPath) {
   if (!existsSync4(stagedPath))
     throw new Error(`Staged bundle is missing: ${stagedPath}`);
-  const parent = dirname(installedPath);
+  const parent = dirname2(installedPath);
   const stamp = `${Date.now()}.${process.pid}`;
   const incoming = join3(parent, `.${basename2(installedPath)}.${stamp}.incoming`);
   const retired = join3(parent, `.${basename2(installedPath)}.${stamp}.retired`);
@@ -10590,7 +10620,7 @@ async function swapBundle(stagedPath, installedPath) {
 }
 function canReplaceBundle(installedPath) {
   try {
-    const parent = dirname(installedPath);
+    const parent = dirname2(installedPath);
     accessSync(parent, constants.W_OK);
     if (existsSync4(installedPath))
       statSync2(installedPath);
@@ -10911,7 +10941,7 @@ class AutoUpdater extends EventEmitter3 {
       return;
     }
     if (!canReplaceBundle(appPath)) {
-      throw new Error(`Cannot replace ${appPath}: ${dirname2(appPath)} is not writable by this user. ` + "Install the update manually, or move the app somewhere you own.");
+      throw new Error(`Cannot replace ${appPath}: ${dirname3(appPath)} is not writable by this user. ` + "Install the update manually, or move the app somewhere you own.");
     }
     const staged = await extractBundle(downloadPath);
     try {
@@ -10957,7 +10987,7 @@ class AutoUpdater extends EventEmitter3 {
         stdio: "ignore"
       });
     } else if (downloadPath.endsWith(".zip")) {
-      const appDir = dirname2(this.config.appPath);
+      const appDir = dirname3(this.config.appPath);
       execFileSync2("powershell", [
         "-NoProfile",
         "-NonInteractive",
@@ -10979,7 +11009,7 @@ class AutoUpdater extends EventEmitter3 {
     } else if (downloadPath.endsWith(".rpm")) {
       execFileSync2("sudo", ["rpm", "-U", downloadPath]);
     } else if (downloadPath.endsWith(".tar.gz")) {
-      const appDir = dirname2(this.config.appPath);
+      const appDir = dirname3(this.config.appPath);
       execFileSync2("tar", ["-xzf", downloadPath, "-C", appDir]);
     }
   }

package/dist/ios/templates/CraftNativeScreen.swift

@@ -6919,10 +6919,12 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         }
         // The app script has no screen, so no bar and no tab bar to change.
         guard !isAppScript else { return }
+        // Prepared tabs have a window and a top controller too. Keep their
+        // options, but only the focused screen may change the shared chrome.
         if options.keys.contains("tabAccessory") {
             tabAccessory = options["tabAccessory"] as? [String: Any]
             tabAccessoryDeclared = true
-            if navigationController?.topViewController === self, view.window != nil {
+            if navigationController?.topViewController === self, isShownOnScreen {
                 CraftChrome.shared.updateTabAccessory(tabAccessory, owner: self)
             }
         }
@@ -6941,7 +6943,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         }
         if let hidden = options["tabBarHidden"] as? Bool {
             tabBarHidden = hidden
-            if navigationController?.topViewController === self, view.window != nil {
+            if navigationController?.topViewController === self, isShownOnScreen {
                 CraftChrome.shared.setHiddenByScreen(hidden)
             }
         }

package/dist/package.d.ts

@@ -4,6 +4,7 @@
  * Enables users to create installers for their Craft applications
  * across all platforms (macOS, Windows, Linux)
  */
+import type { WindowOptions } from './types.js';
 /** Runtime packages required by the default Linux DEB, including notify-send. */
 export declare const DEFAULT_DEB_DEPENDENCIES: readonly ['libgtk-3-0', 'libwebkit2gtk-4.1-37', 'libnotify-bin'];
 export interface PackageConfig {
@@ -89,6 +90,10 @@ export interface PackageConfig {
          * the GUI process to its own CFBundleExecutable.
          */
         nativeRuntimePath?: string;
+        /** Window settings for Craft's sandboxed App Store UI host. The compiled
+         * binary becomes its inherited backend and implements the bundle protocol.
+         */
+        nativeWindow?: Pick<WindowOptions, 'width' | 'height' | 'x' | 'y' | 'headless' | 'systemTray' | 'keepRunning' | 'hideDockIcon' | 'titlebarHidden' | 'frameless' | 'transparent' | 'alwaysOnTop' | 'resizable' | 'darkMode' | 'trayPopover'>;
         /**
          * Extra executables copied into `Contents/MacOS/` beside the app binary.
          *
@@ -175,6 +180,10 @@ export declare function formatPackagingCommandError(tool: string, code: number |
  * Package a Craft application for distribution
  */
 export declare function packageApp(config: PackageConfig): Promise<PackageResult[]>;
+/** Select the public-only runtime shipped beside Pantry's direct runtime.
+ * App Store packaging fails closed if an older provider has no public build.
+ */
+export declare function macOSAppStoreRuntimePath(providerPath: string): string;
 export interface MacOSBundleMetadata {
     name: string;
     /** Actual executable basename when it differs from the app's display name. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.330",
+  "version": "0.0.338",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",