@stacksjs/browser-extension 0.70.138 → 0.70.140

package/dist/firefox-addons.d.ts

@@ -1,6 +1,8 @@
 import type { ExtensionConfig, FirefoxAddonsConfig } from './types';
 /** Metadata accepted by AMO v5 when web-ext creates the first listed version. */
 export declare function firefoxListingMetadata(config: ExtensionConfig, store: FirefoxAddonsConfig): Record<string, unknown> | undefined;
+/** Resolve web-ext from PATH or from this package's declared dependency. */
+export declare function resolveWebExtExecutable(which?: (command: string) => string | null): string | undefined;
 /** Build and submit a Firefox extension through Mozilla's official web-ext/AMO v5 flow. */
 export declare function publishFirefoxExtension(config: ExtensionConfig, options: FirefoxPublishOptions): Promise<FirefoxPublishResult>;
 export declare interface FirefoxAddonsAuth {

package/dist/firefox-addons.js

@@ -1,5 +1,6 @@
-import { existsSync, readdirSync } from "node:fs";
+import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { mkdir, mkdtemp, rm } from "node:fs/promises";
+import { createRequire } from "node:module";
 import { tmpdir } from "node:os";
 import { join, resolve } from "node:path";
 import { buildExtension, resolveOutdir } from "./build";
@@ -23,13 +24,27 @@ export function firefoxListingMetadata(config, store) {
     requires_payment: store.requiresPayment ?? !1
   };
 }
+export function resolveWebExtExecutable(which = Bun.which) {
+  const fromPath = which("web-ext");
+  if (fromPath)
+    return fromPath;
+  try {
+    const packagePath = createRequire(import.meta.url).resolve("web-ext/package.json"), packageJson = JSON.parse(readFileSync(packagePath, "utf8")), relativeBin = typeof packageJson.bin === "string" ? packageJson.bin : packageJson.bin?.["web-ext"];
+    if (!relativeBin)
+      return;
+    const executable = resolve(packagePath, "..", relativeBin);
+    return existsSync(executable) ? executable : void 0;
+  } catch {
+    return;
+  }
+}
 export async function publishFirefoxExtension(config, options) {
   if (!config.geckoId)
     throw Error("[browser-extension] Firefox publishing needs geckoId in config/extension.ts");
   const store = config.firefoxAddons ?? {}, auth = resolveFirefoxAuth(options), cwd = options.cwd ?? process.cwd();
   if (options.build !== !1)
     await buildExtension(config, { target: "firefox", version: options.version, cwd });
-  const sourceDir = resolve(cwd, resolveOutdir(config, "firefox")), artifactsDir = resolve(cwd, store.artifactsDir ?? "web-ext-artifacts"), executable = Bun.which("web-ext");
+  const sourceDir = resolve(cwd, resolveOutdir(config, "firefox")), artifactsDir = resolve(cwd, store.artifactsDir ?? "web-ext-artifacts"), executable = resolveWebExtExecutable();
   if (!executable)
     throw Error("[browser-extension] web-ext is unavailable; reinstall @stacksjs/browser-extension dependencies");
   await mkdir(artifactsDir, { recursive: !0 });

package/dist/safari.d.ts

@@ -18,6 +18,8 @@ import type { ExtensionConfig } from './types';
 export declare function safariAppName(config: ExtensionConfig): string;
 /** Directory the container app is scaffolded into. */
 export declare function safariProjectDir(cwd?: unknown, dir?: string): string;
+/** Upgrade a Stacks-generated project that copied Resources as a nested folder. */
+export declare function migrateSafariResourceBuildPhase(project: string, appName: string): string;
 /**
  * Scaffold the macOS container app (Xcode project + SwiftUI app + appex) from
  * the tokenized template. Idempotent: existing files are kept unless `force`.

package/dist/safari.js

@@ -17,8 +17,43 @@ function templateRoot() {
 function fillTemplate(text, vars) {
   return text.replaceAll("__EXT_BUNDLE_ID__", vars.extBundleId).replaceAll("__BUNDLE_ID__", vars.bundleId).replaceAll("__APP_DISPLAY_NAME__", vars.displayName).replaceAll("__APP_NAME__", vars.appName).replaceAll("__MARKETING_VERSION__", vars.version).replaceAll("__DEVELOPMENT_TEAM__", vars.teamId).replaceAll("__YEAR__", String(new Date().getFullYear()));
 }
+function safariResourceCopyBuildPhase(appName) {
+  return `/* Begin PBXShellScriptBuildPhase section */
+		0D0000000000000000000023 /* Copy Web Extension Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"$(SRCROOT)/${appName} Extension/Resources.inputs.xcfilelist",
+			);
+			name = "Copy Web Extension Resources";
+			outputFileListPaths = (
+				"$(SRCROOT)/${appName} Extension/Resources.outputs.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "set -e\\nresources_root=\\"\${SRCROOT}/${appName} Extension/Resources/\\"\\nwhile IFS= read -r source_file; do\\n  relative_path=\\"\${source_file#$resources_root}\\"\\n  output_file=\\"\${TARGET_BUILD_DIR}/\${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\${relative_path}\\"\\n  /bin/mkdir -p \\"$(/usr/bin/dirname \\"$output_file\\")\\"\\n  /bin/cp \\"$source_file\\" \\"$output_file\\"\\ndone < \\"$SCRIPT_INPUT_FILE_LIST_0\\"\\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+`;
+}
+export function migrateSafariResourceBuildPhase(project, appName) {
+  if (project.includes("SCRIPT_INPUT_FILE_LIST_0"))
+    return project;
+  if (project.includes("0D0000000000000000000023 /* Copy Web Extension Resources */"))
+    return project.replace(/\/\* Begin PBXShellScriptBuildPhase section \*\/[\s\S]*?\/\* End PBXShellScriptBuildPhase section \*\/\n/, safariResourceCopyBuildPhase(appName));
+  if (!project.includes("0C0000000000000000000023 /* Resources in Resources */"))
+    return project;
+  return project.replace(/^\s*0C0000000000000000000023 \/\* Resources in Resources \*\/.*\n/m, "").replace(/^\s*0C0000000000000000000023 \/\* Resources in Resources \*\/,\n/mg, "").replace(`				0D0000000000000000000022 /* Resources */,
+`, `				0D0000000000000000000022 /* Resources */,
+				0D0000000000000000000023 /* Copy Web Extension Resources */,
+`).replace("/* Begin PBXSourcesBuildPhase section */", `${safariResourceCopyBuildPhase(appName)}/* Begin PBXSourcesBuildPhase section */`);
+}
 function* walk(dir, prefix = "") {
-  for (const entry of readdirSync(dir)) {
+  for (const entry of readdirSync(dir).sort()) {
     const rel = prefix ? `${prefix}/${entry}` : entry;
     if (statSync(join(dir, entry)).isDirectory())
       yield* walk(join(dir, entry), rel);
@@ -92,7 +127,13 @@ export async function syncSafariResources(config, options = {}) {
   const cwd = options.cwd ?? process.cwd(), outdir = resolve(cwd, options.outdir ?? resolveOutdir(config, "safari"));
   if (!existsSync(join(outdir, "manifest.json")))
     throw Error(`[browser-extension] ${outdir}/manifest.json is missing. Run extension:build --target safari first.`);
-  const appName = safariAppName(config), resources = join(safariProjectDir(cwd, options.dir), `${appName} Extension`, "Resources"), exclude = new Set(config.safariExclude ?? []);
+  const appName = safariAppName(config), projectDir = safariProjectDir(cwd, options.dir), projectPath = join(projectDir, `${appName}.xcodeproj`, "project.pbxproj");
+  if (existsSync(projectPath)) {
+    const project = await Bun.file(projectPath).text(), migrated = migrateSafariResourceBuildPhase(project, appName);
+    if (migrated !== project)
+      await Bun.write(projectPath, migrated);
+  }
+  const resources = join(projectDir, `${appName} Extension`, "Resources"), exclude = new Set(config.safariExclude ?? []);
   if (existsSync(resources)) {
     for (const entry of readdirSync(resources))
       if (entry !== ".gitkeep")
@@ -100,14 +141,23 @@ export async function syncSafariResources(config, options = {}) {
   }
   await mkdir(resources, { recursive: !0 });
   let files = 0;
+  const synced = [];
   for (const rel of walk(outdir)) {
-    if (exclude.has(rel))
+    if (exclude.has(rel) || rel.split("/").includes(".DS_Store"))
       continue;
     const dest = join(resources, rel);
     await mkdir(dirname(dest), { recursive: !0 });
     cpSync(join(outdir, rel), dest);
+    synced.push(rel);
     files += 1;
   }
+  const inputs = synced.map((rel) => join(resources, rel)).join(`
+`), outputs = synced.map((rel) => `$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/${rel}`).join(`
+`);
+  await Bun.write(join(projectDir, `${appName} Extension`, "Resources.inputs.xcfilelist"), `${inputs}
+`);
+  await Bun.write(join(projectDir, `${appName} Extension`, "Resources.outputs.xcfilelist"), `${outputs}
+`);
   return { resources, files };
 }
 export async function buildSafariApp(config, options = {}) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/browser-extension",
   "type": "module",
-  "version": "0.70.138",
+  "version": "0.70.140",
   "description": "Build MV3 browser extensions (Chrome, Firefox, Safari) the Stacks way — manifest, content/background scripts, DNR rules, packaging, Safari container app, all config-driven.",
   "author": "Chris Breuer",
   "contributors": [

package/safari-template/__APP_NAME__ Extension/Resources.inputs.xcfilelist

@@ -0,0 +1 @@
+

package/safari-template/__APP_NAME__ Extension/Resources.outputs.xcfilelist

@@ -0,0 +1 @@
+

package/safari-template/__APP_NAME__.xcodeproj/project.pbxproj

@@ -11,7 +11,6 @@
 		0C0000000000000000000011 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B0000000000000000000011 /* ContentView.swift */; };
 		0C0000000000000000000012 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0B0000000000000000000012 /* Assets.xcassets */; };
 		0C0000000000000000000020 /* SafariWebExtensionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B0000000000000000000020 /* SafariWebExtensionHandler.swift */; };
-		0C0000000000000000000023 /* Resources in Resources */ = {isa = PBXBuildFile; fileRef = 0B0000000000000000000023 /* Resources */; };
 		0C0000000000000000000030 /* __APP_NAME__ Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 0B0000000000000000000002 /* __APP_NAME__ Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
@@ -141,6 +140,7 @@
 				0D0000000000000000000020 /* Sources */,
 				0D0000000000000000000021 /* Frameworks */,
 				0D0000000000000000000022 /* Resources */,
+				0D0000000000000000000023 /* Copy Web Extension Resources */,
 			);
 			buildRules = (
 			);
@@ -201,12 +201,31 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0C0000000000000000000023 /* Resources in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		0D0000000000000000000023 /* Copy Web Extension Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"$(SRCROOT)/__APP_NAME__ Extension/Resources.inputs.xcfilelist",
+			);
+			name = "Copy Web Extension Resources";
+			outputFileListPaths = (
+				"$(SRCROOT)/__APP_NAME__ Extension/Resources.outputs.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "set -e\nresources_root=\"${SRCROOT}/__APP_NAME__ Extension/Resources/\"\nwhile IFS= read -r source_file; do\n  relative_path=\"${source_file#$resources_root}\"\n  output_file=\"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/${relative_path}\"\n  /bin/mkdir -p \"$(/usr/bin/dirname \"$output_file\")\"\n  /bin/cp \"$source_file\" \"$output_file\"\ndone < \"$SCRIPT_INPUT_FILE_LIST_0\"\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		0D0000000000000000000010 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;