extension 4.1.34 → 4.1.35

package/README.md

@@ -120,6 +120,7 @@ Useful flags:
 - `--zip` packages the build into a ZIP ready for store upload
 - `--zip-source` includes source files for store source-code review
 - `--zip-filename <name>` controls the output filename, written as `dist/<name>-<browser>.zip`
+- `--out-dir <path>` writes the build to `<path>/<browser>` instead of `dist/<browser>`, so a build can run beside a dev session
 - `--polyfill` enables the cross-browser webextension polyfill
 
 ## Manage browser binaries

package/dist/597.cjs

@@ -81,6 +81,10 @@ exports.modules = {
             if (PROTOCOL_ERROR_CODES.has(result.code) || !result.message) return {
                 status: 'unknown'
             };
+            if ('number' != typeof result.code) return {
+                status: 'unknown',
+                transportError: result.message
+            };
             return {
                 status: 'refused',
                 reason: result.message

package/dist/browsers.cjs

@@ -507,7 +507,8 @@ var __webpack_modules__ = {
         var _helpers_messaging__rspack_import_9 = __webpack_require__("./helpers/messaging.ts");
         var _run_firefox_firefox_launch_librewolf_overrides__rspack_import_10 = __webpack_require__("./browsers/run-firefox/firefox-launch/librewolf-overrides.ts");
         var _browser_family__rspack_import_11 = __webpack_require__("./browsers/browsers-lib/browser-family.ts");
-        var _output_binaries_resolver__rspack_import_12 = __webpack_require__("./browsers/browsers-lib/output-binaries-resolver.ts");
+        var _official_chrome__rspack_import_12 = __webpack_require__("./browsers/browsers-lib/official-chrome.ts");
+        var _output_binaries_resolver__rspack_import_13 = __webpack_require__("./browsers/browsers-lib/output-binaries-resolver.ts");
         const require1 = (0, node_module__rspack_import_1.createRequire)(__rslib_import_meta_url__);
         function getLoggingPrefix(type) {
             return (0, _helpers_messaging__rspack_import_9.Pl)(type);
@@ -591,7 +592,7 @@ var __webpack_modules__ = {
             if (opts?.pinned) return '';
             const managedKey = 'chromium' === browser || 'chromium-based' === browser ? 'chromium' : 'chrome' === browser || 'edge' === browser || 'firefox' === browser ? browser : void 0;
             if (managedKey) try {
-                const managed = (0, _output_binaries_resolver__rspack_import_12.kI)({}, managedKey);
+                const managed = (0, _output_binaries_resolver__rspack_import_13.kI)({}, managedKey);
                 if (managed && node_fs__rspack_import_0.existsSync(managed)) {
                     if ('chromium' === managedKey) return (0, chromium_location__rspack_import_5.getChromiumVersion)(managed) || 'Chromium';
                     if ('chrome' === managedKey) return (0, chrome_location2__rspack_import_4.getChromeVersion)(managed) || 'Chrome';
@@ -602,22 +603,23 @@ var __webpack_modules__ = {
             try {
                 if ('chromium' === browser || 'chromium-based' === browser) {
                     const p = chromium_location__rspack_import_5_default()(true, {
-                        env: (0, _output_binaries_resolver__rspack_import_12.Gg)('chromium')
+                        env: (0, _output_binaries_resolver__rspack_import_13.Gg)('chromium')
                     });
                     if (p && 'string' == typeof p && node_fs__rspack_import_0.existsSync(p)) return (0, chromium_location__rspack_import_5.getChromiumVersion)(p) || 'Chromium';
                 } else if ('chrome' === browser) {
                     const p = chrome_location2__rspack_import_4_default()(true, {
-                        env: (0, _output_binaries_resolver__rspack_import_12.Gg)('chrome')
+                        env: (0, _output_binaries_resolver__rspack_import_13.Gg)('chrome')
                     });
+                    if (p && 'string' == typeof p && (0, _official_chrome__rspack_import_12.g)(p)) return '';
                     if (p && 'string' == typeof p && node_fs__rspack_import_0.existsSync(p)) return (0, chrome_location2__rspack_import_4.getChromeVersion)(p) || 'Chrome';
                 } else if ('edge' === browser) {
                     const p = edge_location__rspack_import_6_default()(true, {
-                        env: (0, _output_binaries_resolver__rspack_import_12.Gg)('edge')
+                        env: (0, _output_binaries_resolver__rspack_import_13.Gg)('edge')
                     });
                     if (p && 'string' == typeof p && node_fs__rspack_import_0.existsSync(p)) return (0, edge_location__rspack_import_6.getEdgeVersion)(p) || 'Microsoft Edge';
                 } else if ('firefox' === browser) {
                     const p = firefox_location2__rspack_import_7_default()(true, {
-                        env: (0, _output_binaries_resolver__rspack_import_12.Gg)('firefox')
+                        env: (0, _output_binaries_resolver__rspack_import_13.Gg)('firefox')
                     });
                     if (p && 'string' == typeof p && node_fs__rspack_import_0.existsSync(p)) return (0, firefox_location2__rspack_import_7.getFirefoxVersion)(p) || 'Firefox';
                 }
@@ -1339,6 +1341,24 @@ var __webpack_modules__ = {
             c: ()=>manifestDeclaresNewtabOverride
         });
     },
+    "./browsers/browsers-lib/official-chrome.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
+        var _wsl_support__rspack_import_0 = __webpack_require__("./browsers/browsers-lib/wsl-support.ts");
+        function looksOfficialChromeBinaryPath(bin) {
+            const p = String(bin || '');
+            if (!p) return false;
+            if (/\/Applications\/Google Chrome(?: (?:Beta|Dev|Canary))?\.app\/Contents\/MacOS\/Google Chrome/i.test(p)) return true;
+            if (/\\Google\\Chrome\\Application\\chrome\.exe$/i.test(p)) return true;
+            if (/\/opt\/google\/chrome\//i.test(p)) return true;
+            if (/\/google-chrome(?:-stable)?$/i.test(p)) return true;
+            return false;
+        }
+        function isRefusedOfficialChrome(bin) {
+            return looksOfficialChromeBinaryPath(bin) && !(0, _wsl_support__rspack_import_0.EV)();
+        }
+        __webpack_require__.d(__webpack_exports__, {
+            g: ()=>isRefusedOfficialChrome
+        });
+    },
     "./browsers/browsers-lib/output-binaries-resolver.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         var node_fs__rspack_import_0 = __webpack_require__("node:fs");
         var node_path__rspack_import_1 = __webpack_require__("node:path");
@@ -1795,11 +1815,12 @@ var __webpack_modules__ = {
         var external_node_fs_ = __webpack_require__("node:fs");
         var external_node_path_ = __webpack_require__("node:path");
         var messaging = __webpack_require__("./helpers/messaging.ts");
+        var rename_with_retry = __webpack_require__("./browsers/browsers-lib/rename-with-retry.ts");
         function writeJsonAtomic(filePath, value) {
             const tmpPath = `${filePath}.tmp-${process.pid}`;
             try {
                 external_node_fs_.writeFileSync(tmpPath, JSON.stringify(value, null, 2), 'utf-8');
-                external_node_fs_.renameSync(tmpPath, filePath);
+                (0, rename_with_retry.O)(tmpPath, filePath);
                 return true;
             } catch  {
                 try {
@@ -1891,7 +1912,10 @@ var __webpack_modules__ = {
                 if ('number' == typeof details?.browserPid && Number.isFinite(details.browserPid)) ready.browserPid = details.browserPid;
                 if ('number' == typeof details?.launcherPid && Number.isFinite(details.launcherPid)) ready.launcherPid = details.launcherPid;
                 const extensionId = String(details?.extensionId || '').trim();
-                if (extensionId) ready.extensionId = extensionId;
+                if (extensionId && 'browser' !== ready.extensionIdSource) {
+                    ready.extensionId = extensionId;
+                    ready.extensionIdSource = 'derived';
+                }
                 const binary = String(details?.binary || '').trim();
                 if (binary) ready.binary = binary;
                 const provenance = String(details?.binaryProvenance || '').trim();
@@ -1953,8 +1977,9 @@ var __webpack_modules__ = {
                 const readyPath = readyPathFor(extensionOutputPath);
                 if (!external_node_fs_.existsSync(readyPath)) return;
                 const ready = JSON.parse(external_node_fs_.readFileSync(readyPath, 'utf-8'));
-                if (ready.extensionId === id) return;
+                if (ready.extensionId === id && 'browser' === ready.extensionIdSource) return;
                 ready.extensionId = id;
+                ready.extensionIdSource = 'browser';
                 writeJsonAtomic(readyPath, ready);
             } catch  {}
         }
@@ -2013,6 +2038,42 @@ var __webpack_modules__ = {
             } catch  {}
         }
     },
+    "./browsers/browsers-lib/rename-with-retry.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
+        var node_fs__rspack_import_0 = __webpack_require__("node:fs");
+        const RETRYABLE_RENAME_CODES = new Set([
+            'EPERM',
+            'EACCES',
+            'EBUSY'
+        ]);
+        const RENAME_RETRY_DELAYS_MS = [
+            10,
+            20,
+            40,
+            80,
+            160,
+            320
+        ];
+        function sleepSync(ms) {
+            Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+        }
+        function renameSyncWithRetry(from, to, options = {}) {
+            const platform = options.platform ?? process.platform;
+            const rename = options.rename ?? node_fs__rspack_import_0.renameSync;
+            const sleep = options.sleep ?? sleepSync;
+            for(let attempt = 0;; attempt++)try {
+                rename(from, to);
+                return;
+            } catch (error) {
+                const code = error?.code;
+                const delay = RENAME_RETRY_DELAYS_MS[attempt];
+                if ('win32' !== platform || !code || !RETRYABLE_RENAME_CODES.has(code) || void 0 === delay) throw error;
+                sleep(delay);
+            }
+        }
+        __webpack_require__.d(__webpack_exports__, {
+            O: ()=>renameSyncWithRetry
+        });
+    },
     "./browsers/browsers-lib/resolve-live-pid.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         var node_child_process__rspack_import_0 = __webpack_require__("node:child_process");
         var node_fs__rspack_import_1 = __webpack_require__("node:fs");
@@ -2448,22 +2509,33 @@ var __webpack_modules__ = {
         }
         function mergeChromiumFeatureSwitches(flags) {
             const merged = [];
+            const prefixes = [
+                '--enable-features=',
+                '--disable-features='
+            ];
             const featureValues = {
                 '--enable-features=': [],
                 '--disable-features=': []
             };
+            const featureName = (value)=>value.split(/[<:]/)[0].trim();
             for (const flag of flags){
-                const prefix = Object.keys(featureValues).find((p)=>flag.startsWith(p));
+                const prefix = prefixes.find((p)=>flag.startsWith(p));
                 if (!prefix) {
                     merged.push(flag);
                     continue;
                 }
                 for (const value of flag.slice(prefix.length).split(',')){
                     const trimmed = value.trim();
-                    if (trimmed && !featureValues[prefix].includes(trimmed)) featureValues[prefix].push(trimmed);
+                    if (!trimmed) continue;
+                    const name = featureName(trimmed);
+                    for (const other of prefixes)featureValues[other] = featureValues[other].filter((existing)=>featureName(existing) !== name);
+                    featureValues[prefix].push(trimmed);
                 }
             }
-            for (const [prefix, values] of Object.entries(featureValues))if (values.length) merged.push(`${prefix}${values.join(',')}`);
+            for (const prefix of prefixes){
+                const values = featureValues[prefix];
+                if (values.length) merged.push(`${prefix}${values.join(',')}`);
+            }
             return merged;
         }
         async function findAvailablePortNear(startPort, maxAttempts = 20, host = '127.0.0.1') {
@@ -3268,8 +3340,8 @@ var __webpack_modules__ = {
         var messaging = __webpack_require__("./helpers/messaging.ts");
         var banner = __webpack_require__("./browsers/browsers-lib/banner.ts");
         var browser_family = __webpack_require__("./browsers/browsers-lib/browser-family.ts");
-        const external_node_readline_namespaceObject = require("node:readline");
-        var external_node_readline_default = /*#__PURE__*/ __webpack_require__.n(external_node_readline_namespaceObject);
+        var external_node_readline_ = __webpack_require__("node:readline");
+        var external_node_readline_default = /*#__PURE__*/ __webpack_require__.n(external_node_readline_);
         var browser_install_outcome = __webpack_require__("./helpers/browser-install-outcome.ts");
         var messages = __webpack_require__("./browsers/browsers-lib/messages.ts");
         var output_binaries_resolver = __webpack_require__("./browsers/browsers-lib/output-binaries-resolver.ts");
@@ -3548,6 +3620,7 @@ var __webpack_modules__ = {
                 return false;
             }
         }
+        var official_chrome = __webpack_require__("./browsers/browsers-lib/official-chrome.ts");
         var pinned_binary = __webpack_require__("./browsers/browsers-lib/pinned-binary.ts");
         var process_teardown = __webpack_require__("./browsers/browsers-lib/process-teardown.ts");
         var ready_message = __webpack_require__("./browsers/browsers-lib/ready-message.ts");
@@ -4281,15 +4354,6 @@ var __webpack_modules__ = {
                 }
                 if (!binaryPinnedByFlag) browserBinaryLocation = preferRealChromeBinary(browserBinaryLocation);
                 const getBrowserVersionLine = (bin)=>(0, version_probe.yO)(bin, String(browser || ''));
-                const looksOfficialChromeBinaryPath = (bin)=>{
-                    const p = String(bin || '');
-                    if (!p) return false;
-                    if (/\/Applications\/Google Chrome(?: (?:Beta|Dev|Canary))?\.app\/Contents\/MacOS\/Google Chrome/i.test(p)) return true;
-                    if (/\\Google\\Chrome\\Application\\chrome\.exe$/i.test(p)) return true;
-                    if (/\/opt\/google\/chrome\//i.test(p)) return true;
-                    if (/\/google-chrome(?:-stable)?$/i.test(p)) return true;
-                    return false;
-                };
                 const managedCacheRoot = output_binaries_resolver.LB(compilation);
                 const managedEnvFor = (b)=>(0, locator_env.i)(process.env, output_binaries_resolver.$4(String(managedCacheRoot), b));
                 const isAuthorMode = (0, messaging._o)();
@@ -4303,7 +4367,7 @@ var __webpack_modules__ = {
                             if (!located) throw new Error(getInstallGuidanceText('chrome'));
                             const normalized = normalizePath(located || null);
                             if (isUsableBinary(normalized)) {
-                                if (looksOfficialChromeBinaryPath(normalized) && !(0, wsl_support.EV)()) {
+                                if ((0, official_chrome.g)(normalized)) {
                                     printInstallGuidance(getInstallGuidanceText('chrome'), browser);
                                     return null;
                                 }
@@ -4317,7 +4381,7 @@ var __webpack_modules__ = {
                             }) || null;
                             const normalized = normalizePath(candidate || null);
                             if (normalized) {
-                                if (looksOfficialChromeBinaryPath(normalized) && !(0, wsl_support.EV)()) {
+                                if ((0, official_chrome.g)(normalized)) {
                                     printInstallGuidance(getInstallGuidanceText('chrome'), browser);
                                     candidate = null;
                                 }
@@ -5884,7 +5948,10 @@ var __webpack_modules__ = {
                         await client.connect(port);
                         this.client = client;
                         this.invalidateConnectionScopedCaches();
-                        client.on('reconnected', ()=>this.invalidateConnectionScopedCaches());
+                        client.on('reconnected', ()=>{
+                            this.invalidateConnectionScopedCaches();
+                            if (this.loggingAttached) attachConsoleListeners(client);
+                        });
                         return client;
                     } catch (error) {
                         if (isErrorWithCode('ECONNREFUSED', error)) {
@@ -6837,6 +6904,7 @@ var __webpack_modules__ = {
         var node_fs__rspack_import_0 = __webpack_require__("node:fs");
         var node_path__rspack_import_1 = __webpack_require__("node:path");
         __webpack_require__("./browsers/browsers-lib/output-binaries-resolver.ts");
+        var _browsers_lib_rename_with_retry__rspack_import_3 = __webpack_require__("./browsers/browsers-lib/rename-with-retry.ts");
         const MANAGED_GECKO_POLICIES = {
             DisableAppUpdate: true
         };
@@ -6917,7 +6985,9 @@ var __webpack_modules__ = {
                     recursive: true
                 });
                 fs.writeFileSync(tempPath, `${JSON.stringify(next, null, 2)}\n`, 'utf8');
-                fs.renameSync(tempPath, policyPath);
+                (0, _browsers_lib_rename_with_retry__rspack_import_3.O)(tempPath, policyPath, {
+                    rename: (from, to)=>fs.renameSync(from, to)
+                });
                 return {
                     status: 'written',
                     policyPath
@@ -9762,6 +9832,7 @@ function describeButton(b) {
             E_POLYFILL_NOT_FOUND: 'E_POLYFILL_NOT_FOUND',
             E_LOCALES_LAYOUT: 'E_LOCALES_LAYOUT',
             E_WAR_INVALID: 'E_WAR_INVALID',
+            E_DEV_SESSION_DIST_SHARED: 'E_DEV_SESSION_DIST_SHARED',
             E_BACKGROUND_REQUIRED: 'E_BACKGROUND_REQUIRED',
             E_CONTENT_SCRIPT_SYNTAX: 'E_CONTENT_SCRIPT_SYNTAX',
             E_NO_ENTRYPOINTS: 'E_NO_ENTRYPOINTS',
@@ -9876,6 +9947,9 @@ function describeButton(b) {
     "node:path" (module) {
         module.exports = require("node:path");
     },
+    "node:readline" (module) {
+        module.exports = require("node:readline");
+    },
     pintor (module) {
         module.exports = require("pintor");
     },