extension 4.1.32 → 4.1.33

package/dist/browsers.cjs

@@ -938,7 +938,7 @@ var __webpack_modules__ = {
             return `${getLoggingPrefix('info')} WebDriver session ${pintor__rspack_import_8_default().gray(sessionId)} on port ${pintor__rspack_import_8_default().yellow(String(port))}.\nready.json carries it as ${pintor__rspack_import_8_default().gray('webdriverPort')} and ${pintor__rspack_import_8_default().gray('webdriverSessionId')}, attach to it instead of opening another.`;
         }
         function safariWebDriverUnavailable(reason) {
-            return `${getLoggingPrefix('info')} No WebDriver session for this run: ${reason}\nRun ${pintor__rspack_import_8_default().gray('safaridriver --enable')} once and turn on Safari ▸ Develop ▸ Allow Remote Automation so tools can read Safari pages.`;
+            return `${getLoggingPrefix('info')} No WebDriver session for this run: ${reason}\nRun ${pintor__rspack_import_8_default().gray('safaridriver --enable')} once and turn on Safari ▸ Settings ▸ Developer ▸ Allow remote automation (Safari ▸ Develop ▸ Allow Remote Automation on older Safari) so tools can read Safari pages.`;
         }
         function safariRebuilt(appName) {
             return `${getLoggingPrefix('success')} Rebuilt ${pintor__rspack_import_8_default().yellow(appName)}.`;
@@ -7372,6 +7372,62 @@ var __webpack_modules__ = {
             (0, messaging._w)(messages.Aj(xcodebuildCmd));
         }
         var safari_config = __webpack_require__("./browsers/run-safari/safari-launch/safari-config.ts");
+        const RAISE_WAIT_MS = 5000;
+        const QUIT_MS = 3000;
+        const POLL_MS = 250;
+        const raisedApps = new Set();
+        let handlersInstalled = false;
+        function sleep(ms) {
+            return new Promise((resolve)=>setTimeout(resolve, ms));
+        }
+        function processAlive(pid) {
+            try {
+                process.kill(pid, 0);
+                return true;
+            } catch  {
+                return false;
+            }
+        }
+        function terminate(pid) {
+            try {
+                process.kill(pid, 'SIGTERM');
+            } catch  {}
+        }
+        function quitAllOnExit() {
+            for (const pid of raisedApps)terminate(pid);
+        }
+        function quitAllOnSignal() {
+            closeSafariContainerApps();
+        }
+        function installHandlersOnce() {
+            if (handlersInstalled) return;
+            handlersInstalled = true;
+            process.on('SIGINT', quitAllOnSignal);
+            process.on('SIGTERM', quitAllOnSignal);
+            process.on('SIGHUP', quitAllOnSignal);
+            process.on('exit', quitAllOnExit);
+        }
+        async function rememberRaisedContainerApp(tools, appPath, before) {
+            const deadline = Date.now() + RAISE_WAIT_MS;
+            let raised = [];
+            while(Date.now() < deadline){
+                raised = (await tools.listAppPids(appPath)).filter((pid)=>!before.has(pid));
+                if (raised.length > 0) break;
+                await sleep(POLL_MS);
+            }
+            for (const pid of raised)raisedApps.add(pid);
+            if (raised.length > 0) installHandlersOnce();
+            return raised;
+        }
+        async function closeSafariContainerApps() {
+            const pids = [
+                ...raisedApps
+            ];
+            raisedApps.clear();
+            for (const pid of pids)terminate(pid);
+            const deadline = Date.now() + QUIT_MS;
+            while(Date.now() < deadline && pids.some(processAlive))await sleep(POLL_MS);
+        }
         var external_node_child_process_ = __webpack_require__("node:child_process");
         function isMacOS() {
             return 'darwin' === process.platform;
@@ -7443,6 +7499,15 @@ var __webpack_modules__ = {
             const name = exe.slice(exe.lastIndexOf('/') + 1);
             return 'Safari' === name && tokens.includes('--automation');
         }
+        function isContainerAppArgs(appPath, args) {
+            return args.trim().startsWith(`${appPath}/Contents/MacOS/`);
+        }
+        function openAppArgs(target) {
+            return [
+                '-g',
+                target
+            ];
+        }
         function listPidsWhere(matches) {
             return new Promise((resolve)=>{
                 const child = (0, external_node_child_process_.spawn)('ps', [
@@ -7548,9 +7613,7 @@ var __webpack_modules__ = {
                 detectToolchain: ()=>detectSafariToolchain(),
                 runConverter: (args)=>runTool('xcrun', args),
                 runXcodebuild: (args)=>runTool('xcodebuild', args),
-                openApp: (target)=>runTool('open', [
-                        target
-                    ]),
+                openApp: (target)=>runTool('open', openAppArgs(target)),
                 openSafari: (binary)=>runTool('open', [
                         '-a',
                         binary
@@ -7568,7 +7631,8 @@ var __webpack_modules__ = {
                         '-p',
                         String(port)
                     ]),
-                listAutomationPids: ()=>listPidsWhere(isAutomationSafariArgs)
+                listAutomationPids: ()=>listPidsWhere(isAutomationSafariArgs),
+                listAppPids: (appPath)=>listPidsWhere((args)=>isContainerAppArgs(appPath, args))
             };
         }
         var external_node_http_ = __webpack_require__("node:http");
@@ -7580,7 +7644,7 @@ var __webpack_modules__ = {
         const AUTOMATION_QUIT_MS = 3000;
         const activeSessions = new Set();
         const activeDrivers = new Set();
-        let handlersInstalled = false;
+        let webdriver_handlersInstalled = false;
         function freePort() {
             return new Promise((resolve, reject)=>{
                 const server = external_node_net_.createServer();
@@ -7660,9 +7724,9 @@ var __webpack_modules__ = {
         function closeAllOnSignal() {
             closeSafariWebDriverSessions();
         }
-        function installHandlersOnce() {
-            if (handlersInstalled) return;
-            handlersInstalled = true;
+        function webdriver_installHandlersOnce() {
+            if (webdriver_handlersInstalled) return;
+            webdriver_handlersInstalled = true;
             process.on('SIGINT', closeAllOnSignal);
             process.on('SIGTERM', closeAllOnSignal);
             process.on('SIGHUP', closeAllOnSignal);
@@ -7673,7 +7737,7 @@ var __webpack_modules__ = {
                 ...activeSessions
             ].map((session)=>session.close()));
         }
-        function processAlive(pid) {
+        function webdriver_processAlive(pid) {
             try {
                 process.kill(pid, 0);
                 return true;
@@ -7687,7 +7751,7 @@ var __webpack_modules__ = {
                 process.kill(pid, 'SIGTERM');
             } catch  {}
             const deadline = Date.now() + AUTOMATION_QUIT_MS;
-            while(Date.now() < deadline && raised.some(processAlive))await new Promise((resolve)=>setTimeout(resolve, DRIVER_POLL_MS));
+            while(Date.now() < deadline && raised.some(webdriver_processAlive))await new Promise((resolve)=>setTimeout(resolve, DRIVER_POLL_MS));
         }
         async function openSafariWebDriverSession(tools) {
             let port;
@@ -7704,7 +7768,7 @@ var __webpack_modules__ = {
                 reason: `safaridriver could not start: ${driver.output}`
             };
             activeDrivers.add(driver);
-            installHandlersOnce();
+            webdriver_installHandlersOnce();
             const stopDriver = async ()=>{
                 driver.stop();
                 activeDrivers.delete(driver);
@@ -7939,7 +8003,9 @@ var __webpack_modules__ = {
             }
             const target = external_node_fs_.existsSync(appPath) ? appPath : (0, safari_config.Gi)(config);
             logger.info?.(messages.fw(target));
+            const appsBefore = new Set(await tools.listAppPids(appPath));
             await tools.openApp(target);
+            if (host.announceDevReady) await rememberRaisedContainerApp(tools, appPath, appsBefore);
             if (config.safariBinary) await tools.openSafari(config.safariBinary);
             const raisedBundleId = config.safariBinary ? 'com.apple.Safari' : config.bundleIdentifier;
             const browserPid = await tools.resolvePid(raisedBundleId);

package/dist/cli.cjs

@@ -939,7 +939,7 @@ var __webpack_modules__ = {
             return `${getLoggingPrefix('info')} WebDriver session ${pintor__rspack_import_8_default().gray(sessionId)} on port ${pintor__rspack_import_8_default().yellow(String(port))}.\nready.json carries it as ${pintor__rspack_import_8_default().gray('webdriverPort')} and ${pintor__rspack_import_8_default().gray('webdriverSessionId')}, attach to it instead of opening another.`;
         }
         function safariWebDriverUnavailable(reason) {
-            return `${getLoggingPrefix('info')} No WebDriver session for this run: ${reason}\nRun ${pintor__rspack_import_8_default().gray('safaridriver --enable')} once and turn on Safari ▸ Develop ▸ Allow Remote Automation so tools can read Safari pages.`;
+            return `${getLoggingPrefix('info')} No WebDriver session for this run: ${reason}\nRun ${pintor__rspack_import_8_default().gray('safaridriver --enable')} once and turn on Safari ▸ Settings ▸ Developer ▸ Allow remote automation (Safari ▸ Develop ▸ Allow Remote Automation on older Safari) so tools can read Safari pages.`;
         }
         function safariRebuilt(appName) {
             return `${getLoggingPrefix('success')} Rebuilt ${pintor__rspack_import_8_default().yellow(appName)}.`;
@@ -7380,6 +7380,62 @@ var __webpack_modules__ = {
             (0, messaging._w)(messages.Aj(xcodebuildCmd));
         }
         var safari_config = __webpack_require__("./browsers/run-safari/safari-launch/safari-config.ts");
+        const RAISE_WAIT_MS = 5000;
+        const QUIT_MS = 3000;
+        const POLL_MS = 250;
+        const raisedApps = new Set();
+        let handlersInstalled = false;
+        function sleep(ms) {
+            return new Promise((resolve)=>setTimeout(resolve, ms));
+        }
+        function processAlive(pid) {
+            try {
+                process.kill(pid, 0);
+                return true;
+            } catch  {
+                return false;
+            }
+        }
+        function terminate(pid) {
+            try {
+                process.kill(pid, 'SIGTERM');
+            } catch  {}
+        }
+        function quitAllOnExit() {
+            for (const pid of raisedApps)terminate(pid);
+        }
+        function quitAllOnSignal() {
+            closeSafariContainerApps();
+        }
+        function installHandlersOnce() {
+            if (handlersInstalled) return;
+            handlersInstalled = true;
+            process.on('SIGINT', quitAllOnSignal);
+            process.on('SIGTERM', quitAllOnSignal);
+            process.on('SIGHUP', quitAllOnSignal);
+            process.on('exit', quitAllOnExit);
+        }
+        async function rememberRaisedContainerApp(tools, appPath, before) {
+            const deadline = Date.now() + RAISE_WAIT_MS;
+            let raised = [];
+            while(Date.now() < deadline){
+                raised = (await tools.listAppPids(appPath)).filter((pid)=>!before.has(pid));
+                if (raised.length > 0) break;
+                await sleep(POLL_MS);
+            }
+            for (const pid of raised)raisedApps.add(pid);
+            if (raised.length > 0) installHandlersOnce();
+            return raised;
+        }
+        async function closeSafariContainerApps() {
+            const pids = [
+                ...raisedApps
+            ];
+            raisedApps.clear();
+            for (const pid of pids)terminate(pid);
+            const deadline = Date.now() + QUIT_MS;
+            while(Date.now() < deadline && pids.some(processAlive))await sleep(POLL_MS);
+        }
         var external_node_child_process_ = __webpack_require__("node:child_process");
         function isMacOS() {
             return 'darwin' === process.platform;
@@ -7451,6 +7507,15 @@ var __webpack_modules__ = {
             const name = exe.slice(exe.lastIndexOf('/') + 1);
             return 'Safari' === name && tokens.includes('--automation');
         }
+        function isContainerAppArgs(appPath, args) {
+            return args.trim().startsWith(`${appPath}/Contents/MacOS/`);
+        }
+        function openAppArgs(target) {
+            return [
+                '-g',
+                target
+            ];
+        }
         function listPidsWhere(matches) {
             return new Promise((resolve)=>{
                 const child = (0, external_node_child_process_.spawn)('ps', [
@@ -7556,9 +7621,7 @@ var __webpack_modules__ = {
                 detectToolchain: ()=>detectSafariToolchain(),
                 runConverter: (args)=>runTool('xcrun', args),
                 runXcodebuild: (args)=>runTool('xcodebuild', args),
-                openApp: (target)=>runTool('open', [
-                        target
-                    ]),
+                openApp: (target)=>runTool('open', openAppArgs(target)),
                 openSafari: (binary)=>runTool('open', [
                         '-a',
                         binary
@@ -7576,7 +7639,8 @@ var __webpack_modules__ = {
                         '-p',
                         String(port)
                     ]),
-                listAutomationPids: ()=>listPidsWhere(isAutomationSafariArgs)
+                listAutomationPids: ()=>listPidsWhere(isAutomationSafariArgs),
+                listAppPids: (appPath)=>listPidsWhere((args)=>isContainerAppArgs(appPath, args))
             };
         }
         var external_node_http_ = __webpack_require__("node:http");
@@ -7588,7 +7652,7 @@ var __webpack_modules__ = {
         const AUTOMATION_QUIT_MS = 3000;
         const activeSessions = new Set();
         const activeDrivers = new Set();
-        let handlersInstalled = false;
+        let webdriver_handlersInstalled = false;
         function freePort() {
             return new Promise((resolve, reject)=>{
                 const server = external_node_net_.createServer();
@@ -7668,9 +7732,9 @@ var __webpack_modules__ = {
         function closeAllOnSignal() {
             closeSafariWebDriverSessions();
         }
-        function installHandlersOnce() {
-            if (handlersInstalled) return;
-            handlersInstalled = true;
+        function webdriver_installHandlersOnce() {
+            if (webdriver_handlersInstalled) return;
+            webdriver_handlersInstalled = true;
             process.on('SIGINT', closeAllOnSignal);
             process.on('SIGTERM', closeAllOnSignal);
             process.on('SIGHUP', closeAllOnSignal);
@@ -7681,7 +7745,7 @@ var __webpack_modules__ = {
                 ...activeSessions
             ].map((session)=>session.close()));
         }
-        function processAlive(pid) {
+        function webdriver_processAlive(pid) {
             try {
                 process.kill(pid, 0);
                 return true;
@@ -7695,7 +7759,7 @@ var __webpack_modules__ = {
                 process.kill(pid, 'SIGTERM');
             } catch  {}
             const deadline = Date.now() + AUTOMATION_QUIT_MS;
-            while(Date.now() < deadline && raised.some(processAlive))await new Promise((resolve)=>setTimeout(resolve, DRIVER_POLL_MS));
+            while(Date.now() < deadline && raised.some(webdriver_processAlive))await new Promise((resolve)=>setTimeout(resolve, DRIVER_POLL_MS));
         }
         async function openSafariWebDriverSession(tools) {
             let port;
@@ -7712,7 +7776,7 @@ var __webpack_modules__ = {
                 reason: `safaridriver could not start: ${driver.output}`
             };
             activeDrivers.add(driver);
-            installHandlersOnce();
+            webdriver_installHandlersOnce();
             const stopDriver = async ()=>{
                 driver.stop();
                 activeDrivers.delete(driver);
@@ -7947,7 +8011,9 @@ var __webpack_modules__ = {
             }
             const target = external_node_fs_.existsSync(appPath) ? appPath : (0, safari_config.Gi)(config);
             logger.info?.(messages.fw(target));
+            const appsBefore = new Set(await tools.listAppPids(appPath));
             await tools.openApp(target);
+            if (host.announceDevReady) await rememberRaisedContainerApp(tools, appPath, appsBefore);
             if (config.safariBinary) await tools.openSafari(config.safariBinary);
             const raisedBundleId = config.safariBinary ? 'com.apple.Safari' : config.bundleIdentifier;
             const browserPid = await tools.resolvePid(raisedBundleId);
@@ -9632,7 +9698,7 @@ var __webpack_modules__ = {
             return Math.min(Math.max(n, min), max);
         }
         const TEMPLATE_CORPUS_REPO = 'extension-js/examples';
-        const TEMPLATE_CORPUS_REF = '2a8c4bae43ba6e883bf9ce7f6d108963ed162516';
+        const TEMPLATE_CORPUS_REF = 'd69e46b311c27d11a98d241494023101b337281f';
         const TEMPLATE_CORPUS_SLUGS = [
             'action',
             'action-locales',
@@ -9966,6 +10032,14 @@ var __webpack_modules__ = {
             if (listTemplates().includes(name)) return name;
             if (templateAliasFor(name)) return name;
         }
+        const CREATE_SOURCES = new Set([
+            'cli',
+            'templates'
+        ]);
+        function createSourceTag(value) {
+            const tag = String(value ?? '').trim().toLowerCase();
+            return CREATE_SOURCES.has(tag) ? tag : 'cli';
+        }
         function telemetryCommandContext(command, argv = process.argv) {
             const install = (0, browser_install_outcome.w6)();
             const installContext = install ? {
@@ -9982,9 +10056,9 @@ var __webpack_modules__ = {
                     '--template',
                     '-t'
                 ])),
-                source: readArgValue(argv, [
+                source: createSourceTag(readArgValue(argv, [
                     '--source'
-                ]) || 'cli'
+                ]))
             };
         }
         const consent = resolveTelemetryConsent(process.argv);

package/dist/extension/browsers/__spec__/safari-fake-tools.d.ts

@@ -19,6 +19,7 @@ export interface FakeSafariToolsOptions {
         spawnError: string;
     };
     automationMatch?: string;
+    appMatch?: string;
 }
 export interface FakeSafariTools extends SafariPipelineTools {
     calls: {

package/dist/extension/browsers/run-safari/safari-launch/container-app.d.ts

@@ -0,0 +1,3 @@
+import type { SafariPipelineTools } from './tools.js';
+export declare function rememberRaisedContainerApp(tools: SafariPipelineTools, appPath: string, before: Set<number>): Promise<number[]>;
+export declare function closeSafariContainerApps(): Promise<void>;

package/dist/extension/browsers/run-safari/safari-launch/index.d.ts

@@ -1,6 +1,7 @@
 import type { BrowserLogger } from '../../browsers-types.js';
 import type { SafariPluginLike } from '../safari-types.js';
-export { isAutomationSafariArgs, listPidsWhere, type SafariPipelineTools, type SafariToolResult, type SafariWebDriverProcess, spawnWebDriverProcess, toolOutputTail } from './tools.js';
+export { closeSafariContainerApps } from './container-app.js';
+export { isAutomationSafariArgs, isContainerAppArgs, listPidsWhere, openAppArgs, type SafariPipelineTools, type SafariToolResult, type SafariWebDriverProcess, spawnWebDriverProcess, toolOutputTail } from './tools.js';
 export { closeSafariWebDriverSessions } from './webdriver.js';
 export declare function converterWarnings(output: string): string[];
 export type SafariPipelineMode = 'full' | 'resync';

package/dist/extension/browsers/run-safari/safari-launch/tools.d.ts

@@ -21,8 +21,11 @@ export interface SafariPipelineTools {
     pluginkitList(): Promise<string>;
     startWebDriver(port: number): Promise<SafariWebDriverProcess>;
     listAutomationPids(): Promise<number[]>;
+    listAppPids(appPath: string): Promise<number[]>;
 }
 export declare function isAutomationSafariArgs(args: string): boolean;
+export declare function isContainerAppArgs(appPath: string, args: string): boolean;
+export declare function openAppArgs(target: string): string[];
 export declare function listPidsWhere(matches: (args: string) => boolean): Promise<number[]>;
 export declare function spawnWebDriverProcess(bin: string, args: string[]): Promise<SafariWebDriverProcess>;
 export declare function createSafariTools(): SafariPipelineTools;

package/dist/extension/helpers/telemetry-cli.d.ts

@@ -3,6 +3,7 @@ type KnownCommand = 'build' | 'capabilities' | 'create' | 'dev' | 'doctor' | 'ev
 export declare const KNOWN_COMMANDS: ReadonlySet<KnownCommand>;
 export declare function detectInvokedCommand(argv: string[]): KnownCommand;
 export declare function advertisedTemplateName(value: string | undefined): string | undefined;
+export declare function createSourceTag(value: string | undefined): string;
 export declare function telemetryCommandContext(command: string, argv?: string[]): {
     template?: string;
     source?: string;

package/dist/extension/helpers/template-catalog.d.ts

@@ -1,6 +1,6 @@
 export declare const DEFAULT_TEMPLATE = "typescript";
 export declare const BUNDLED_TEMPLATES: readonly string[];
-export declare const TEMPLATE_CATALOG_URL = "https://github.com/extension-js/examples/tree/2a8c4bae43ba6e883bf9ce7f6d108963ed162516/examples";
+export declare const TEMPLATE_CATALOG_URL = "https://github.com/extension-js/examples/tree/d69e46b311c27d11a98d241494023101b337281f/examples";
 export interface TemplateGroup {
     title: string;
     summary: string;

package/dist/extension/helpers/template-corpus.generated.d.ts

@@ -1,3 +1,3 @@
 export declare const TEMPLATE_CORPUS_REPO = "extension-js/examples";
-export declare const TEMPLATE_CORPUS_REF = "2a8c4bae43ba6e883bf9ce7f6d108963ed162516";
+export declare const TEMPLATE_CORPUS_REF = "d69e46b311c27d11a98d241494023101b337281f";
 export declare const TEMPLATE_CORPUS_SLUGS: readonly string[];

package/package.json

@@ -38,7 +38,7 @@
     "extension": "./bin/extension.cjs"
   },
   "name": "extension",
-  "version": "4.1.32",
+  "version": "4.1.33",
   "description": "The cross-browser extension framework. Build Chrome, Edge, Firefox, and Safari extensions with no build configuration.",
   "homepage": "https://extension.js.org/",
   "funding": "https://github.com/sponsors/cezaraugusto",
@@ -104,9 +104,9 @@
     "chromium-location": "2.1.2",
     "commander": "^15.0.0",
     "edge-location": "2.3.1",
-    "extension-create": "4.1.32",
-    "extension-develop": "4.1.32",
-    "extension-install": "4.1.32",
+    "extension-create": "4.1.33",
+    "extension-develop": "4.1.33",
+    "extension-install": "4.1.33",
     "firefox-location2": "3.2.0",
     "floorp-location": "1.0.0",
     "librewolf-location": "1.2.1",