craft-native 0.0.348 → 0.0.351

package/dist/binary-resolver.d.ts

@@ -29,7 +29,7 @@
  * @returns The string to pass to `spawn(...)`. Either `explicit`,
  *   `process.env.CRAFT_BIN`, or the bare `'craft'` for PATH lookup.
  */
-export declare function resolveCraftBinary(explicit?: string): string;
+export declare function resolveCraftBinary(explicit?: string, profile?: 'full' | 'webview'): string;
 /**
  * Set on the child environment whenever the CLI spawns what it believes is
  * the native binary.

package/dist/cli.js

@@ -242,7 +242,9 @@ async function packageApp(config) {
   return results;
 }
 function macOSAppStoreRuntimePath(providerPath) {
-  const runtime = basename(providerPath) === "craft-app-store" ? providerPath : join2(dirname(providerPath), "craft-app-store");
+  const providerName = basename(providerPath);
+  const storeName = providerName.startsWith("craft-webview") ? "craft-webview-app-store" : "craft-app-store";
+  const runtime = providerName === storeName ? providerPath : join2(dirname(providerPath), storeName);
   if (!existsSync4(runtime))
     throw new Error("App Store packaging requires Pantry\u2019s craft-app-store runtime. Upgrade Craft with Pantry before building.");
   const bytes = readFileSync2(runtime);
@@ -299,6 +301,17 @@ async function packageMacOS(config, outDir) {
   }
   try {
     const contents = join2(appBundlePath, "Contents");
+    if (opts.appStore && opts.appBundlePath && existsSync4(join2(contents, "Resources", "craft.json"))) {
+      if (!nativeRuntimePath)
+        throw new Error("App Store packaging of a prebuilt Craft bundle requires macos.nativeRuntimePath from Pantry.");
+      const plist = join2(contents, "Info.plist");
+      const executable = spawnSync("plutil", ["-extract", "CFBundleExecutable", "raw", "-o", "-", plist], { encoding: "utf8" });
+      const name = executable.stdout.trim();
+      if (executable.status !== 0 || !name || basename(name) !== name || name === "." || name === "..")
+        throw new Error("Prebuilt Craft bundle has an invalid CFBundleExecutable");
+      copyFileSync(nativeRuntimePath, join2(contents, "MacOS", name));
+      chmodSync(join2(contents, "MacOS", name), 493);
+    }
     if (opts.provisioningProfile) {
       const profile = join2(contents, "embedded.provisionprofile");
       copyFileSync(opts.provisioningProfile, profile);
@@ -343,7 +356,19 @@ async function packageMacOS(config, outDir) {
   results.push({ success: true, platform: "macos", format: "app", outputPath: appBundlePath });
   if (opts.dmg !== false) {
     const outputPath = join2(outDir, `${name}-${version}.dmg`);
-    const dmgResult = await createDMG({ appBundlePath, outputPath, volumeName: name });
+    let dmgResult = await createDMG({ appBundlePath, outputPath, volumeName: name });
+    if (dmgResult.success && opts.signIdentity) {
+      const signed = await runTool("codesign", codesignArguments({
+        path: outputPath,
+        identity: opts.signIdentity,
+        keychain: opts.signingKeychain,
+        hardenedRuntime: false,
+        deep: false
+      }));
+      const verified = signed.success ? await runTool("codesign", ["--verify", "--strict", outputPath]) : signed;
+      if (!verified.success)
+        dmgResult = { success: false, error: verified.error };
+    }
     results.push({
       success: dmgResult.success,
       platform: "macos",
@@ -2947,7 +2972,7 @@ import process6 from "process";
 
 // src/binary-resolver.ts
 import { existsSync as existsSync2 } from "fs";
-function resolveCraftBinary(explicit) {
+function resolveCraftBinary(explicit, profile = "full") {
   if (explicit) {
     if (!existsSync2(explicit)) {
       throw new Error(`Custom Craft binary path not found: ${explicit}`);
@@ -2961,7 +2986,7 @@ function resolveCraftBinary(explicit) {
     }
     return fromEnv;
   }
-  return "craft";
+  return profile === "webview" ? "craft-webview" : "craft";
 }
 var CRAFT_CLI_SPAWN_MARKER = "CRAFT_CLI_SPAWNED_FROM";
 function craftBinaryIsCliShimMessage(spawnedFrom) {
@@ -3022,7 +3047,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.348";
+var version = "0.0.351";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -341,7 +341,7 @@ var import_node_util = require("node:util");
 
 // src/binary-resolver.ts
 var import_node_fs = require("node:fs");
-function resolveCraftBinary(explicit) {
+function resolveCraftBinary(explicit, profile = "full") {
   if (explicit) {
     if (!import_node_fs.existsSync(explicit)) {
       throw new Error(`Custom Craft binary path not found: ${explicit}`);
@@ -355,7 +355,7 @@ function resolveCraftBinary(explicit) {
     }
     return fromEnv;
   }
-  return "craft";
+  return profile === "webview" ? "craft-webview" : "craft";
 }
 var CRAFT_CLI_SPAWN_MARKER = "CRAFT_CLI_SPAWNED_FROM";
 function craftBinaryNotFoundMessage(triedPath) {
@@ -375,7 +375,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.348";
+var version = "0.0.351";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;
@@ -608,7 +608,9 @@ 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");
+  const providerName = import_path.basename(providerPath);
+  const storeName = providerName.startsWith("craft-webview") ? "craft-webview-app-store" : "craft-app-store";
+  const runtime = providerName === storeName ? providerPath : import_path.join(import_path.dirname(providerPath), storeName);
   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 bytes = import_fs.readFileSync(runtime);
@@ -665,6 +667,17 @@ async function packageMacOS(config, outDir) {
   }
   try {
     const contents = import_path.join(appBundlePath, "Contents");
+    if (opts.appStore && opts.appBundlePath && import_fs.existsSync(import_path.join(contents, "Resources", "craft.json"))) {
+      if (!nativeRuntimePath)
+        throw new Error("App Store packaging of a prebuilt Craft bundle requires macos.nativeRuntimePath from Pantry.");
+      const plist = import_path.join(contents, "Info.plist");
+      const executable = import_child_process.spawnSync("plutil", ["-extract", "CFBundleExecutable", "raw", "-o", "-", plist], { encoding: "utf8" });
+      const name = executable.stdout.trim();
+      if (executable.status !== 0 || !name || import_path.basename(name) !== name || name === "." || name === "..")
+        throw new Error("Prebuilt Craft bundle has an invalid CFBundleExecutable");
+      import_fs.copyFileSync(nativeRuntimePath, import_path.join(contents, "MacOS", name));
+      import_fs.chmodSync(import_path.join(contents, "MacOS", name), 493);
+    }
     if (opts.provisioningProfile) {
       const profile = import_path.join(contents, "embedded.provisionprofile");
       import_fs.copyFileSync(opts.provisioningProfile, profile);
@@ -709,7 +722,19 @@ async function packageMacOS(config, outDir) {
   results.push({ success: true, platform: "macos", format: "app", outputPath: appBundlePath });
   if (opts.dmg !== false) {
     const outputPath = import_path.join(outDir, `${name}-${version}.dmg`);
-    const dmgResult = await createDMG({ appBundlePath, outputPath, volumeName: name });
+    let dmgResult = await createDMG({ appBundlePath, outputPath, volumeName: name });
+    if (dmgResult.success && opts.signIdentity) {
+      const signed = await runTool("codesign", codesignArguments({
+        path: outputPath,
+        identity: opts.signIdentity,
+        keychain: opts.signingKeychain,
+        hardenedRuntime: false,
+        deep: false
+      }));
+      const verified = signed.success ? await runTool("codesign", ["--verify", "--strict", outputPath]) : signed;
+      if (!verified.success)
+        dmgResult = { success: false, error: verified.error };
+    }
     results.push({
       success: dmgResult.success,
       platform: "macos",
@@ -11785,7 +11810,7 @@ class CraftApp {
     return args;
   }
   async findCraftBinary() {
-    return resolveCraftBinary(this.config.craftPath);
+    return resolveCraftBinary(this.config.craftPath, this.config.runtimeProfile);
   }
 }
 function createApp(config) {

package/dist/index.js

@@ -83,7 +83,7 @@ import { promisify as promisify2 } from "util";
 
 // src/binary-resolver.ts
 import { existsSync } from "fs";
-function resolveCraftBinary(explicit) {
+function resolveCraftBinary(explicit, profile = "full") {
   if (explicit) {
     if (!existsSync(explicit)) {
       throw new Error(`Custom Craft binary path not found: ${explicit}`);
@@ -97,7 +97,7 @@ function resolveCraftBinary(explicit) {
     }
     return fromEnv;
   }
-  return "craft";
+  return profile === "webview" ? "craft-webview" : "craft";
 }
 var CRAFT_CLI_SPAWN_MARKER = "CRAFT_CLI_SPAWNED_FROM";
 function craftBinaryNotFoundMessage(triedPath) {
@@ -117,7 +117,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.348";
+var version = "0.0.351";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;
@@ -364,7 +364,9 @@ async function packageApp(config) {
   return results;
 }
 function macOSAppStoreRuntimePath(providerPath) {
-  const runtime = basename(providerPath) === "craft-app-store" ? providerPath : join2(dirname(providerPath), "craft-app-store");
+  const providerName = basename(providerPath);
+  const storeName = providerName.startsWith("craft-webview") ? "craft-webview-app-store" : "craft-app-store";
+  const runtime = providerName === storeName ? providerPath : join2(dirname(providerPath), storeName);
   if (!existsSync3(runtime))
     throw new Error("App Store packaging requires Pantry\u2019s craft-app-store runtime. Upgrade Craft with Pantry before building.");
   const bytes = readFileSync(runtime);
@@ -421,6 +423,17 @@ async function packageMacOS(config, outDir) {
   }
   try {
     const contents = join2(appBundlePath, "Contents");
+    if (opts.appStore && opts.appBundlePath && existsSync3(join2(contents, "Resources", "craft.json"))) {
+      if (!nativeRuntimePath)
+        throw new Error("App Store packaging of a prebuilt Craft bundle requires macos.nativeRuntimePath from Pantry.");
+      const plist = join2(contents, "Info.plist");
+      const executable = spawnSync("plutil", ["-extract", "CFBundleExecutable", "raw", "-o", "-", plist], { encoding: "utf8" });
+      const name = executable.stdout.trim();
+      if (executable.status !== 0 || !name || basename(name) !== name || name === "." || name === "..")
+        throw new Error("Prebuilt Craft bundle has an invalid CFBundleExecutable");
+      copyFileSync(nativeRuntimePath, join2(contents, "MacOS", name));
+      chmodSync(join2(contents, "MacOS", name), 493);
+    }
     if (opts.provisioningProfile) {
       const profile = join2(contents, "embedded.provisionprofile");
       copyFileSync(opts.provisioningProfile, profile);
@@ -465,7 +478,19 @@ async function packageMacOS(config, outDir) {
   results.push({ success: true, platform: "macos", format: "app", outputPath: appBundlePath });
   if (opts.dmg !== false) {
     const outputPath = join2(outDir, `${name}-${version}.dmg`);
-    const dmgResult = await createDMG({ appBundlePath, outputPath, volumeName: name });
+    let dmgResult = await createDMG({ appBundlePath, outputPath, volumeName: name });
+    if (dmgResult.success && opts.signIdentity) {
+      const signed = await runTool("codesign", codesignArguments({
+        path: outputPath,
+        identity: opts.signIdentity,
+        keychain: opts.signingKeychain,
+        hardenedRuntime: false,
+        deep: false
+      }));
+      const verified = signed.success ? await runTool("codesign", ["--verify", "--strict", outputPath]) : signed;
+      if (!verified.success)
+        dmgResult = { success: false, error: verified.error };
+    }
     results.push({
       success: dmgResult.success,
       platform: "macos",
@@ -11541,7 +11566,7 @@ class CraftApp {
     return args;
   }
   async findCraftBinary() {
-    return resolveCraftBinary(this.config.craftPath);
+    return resolveCraftBinary(this.config.craftPath, this.config.runtimeProfile);
   }
 }
 function createApp(config) {

package/dist/types.d.ts

@@ -558,6 +558,8 @@ export interface AppConfig {
      * Path to Craft binary (auto-detected if not provided)
      */
     craftPath?: string;
+    /** macOS webview apps may omit the separate headless scripting engine. */
+    runtimeProfile?: 'full' | 'webview';
     /**
      * Suppress all non-error output from the native binary.
      * When true, the binary runs with --quiet and stdio is piped.

package/package.json

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