extension-develop 3.5.0-next.21 → 3.5.0-next.22

package/dist/extension-js-devtools/firefox/scripts/logger-client.js

@@ -1 +1 @@
-(()=>{"use strict";var r={},t={};function e(s){var o=t[s];if(void 0!==o)return o.exports;var u=t[s]={exports:{}};return r[s](u,u.exports,e),u.exports}e.rv=()=>"1.7.2",e.ruid="bundler=rspack@1.7.2"})();
+(()=>{"use strict";var r={},t={};function e(s){var o=t[s];if(void 0!==o)return o.exports;var u=t[s]={exports:{}};return r[s](u,u.exports,e),u.exports}e.rv=()=>"1.7.5",e.ruid="bundler=rspack@1.7.5"})();

package/dist/module.cjs

@@ -127238,14 +127238,16 @@ var __webpack_modules__ = {
         __webpack_require__.d(__webpack_exports__, {
             Bf: ()=>getLastCDPPort,
             Ef: ()=>getInstancePorts,
-            UF: ()=>setInstancePorts
+            UF: ()=>setInstancePorts,
+            mm: ()=>getLastRDPPort
         });
         const instanceIdToRecord = new Map();
         let lastCDPPort;
+        let lastRDPPort;
         function setInstancePorts(instanceId, ports) {
             try {
                 if ('number' == typeof ports.cdpPort) lastCDPPort = ports.cdpPort;
-                if ('number' == typeof ports.rdpPort) ports.rdpPort;
+                if ('number' == typeof ports.rdpPort) lastRDPPort = ports.rdpPort;
                 if (!instanceId) return;
                 const prev = instanceIdToRecord.get(instanceId) || {};
                 instanceIdToRecord.set(instanceId, {
@@ -127261,6 +127263,9 @@ var __webpack_modules__ = {
         function getLastCDPPort() {
             return lastCDPPort;
         }
+        function getLastRDPPort() {
+            return lastRDPPort;
+        }
     },
     "./webpack/plugin-browsers/browsers-lib/messages.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         "use strict";
@@ -128596,6 +128601,33 @@ var __webpack_modules__ = {
             else obj[key] = value;
             return obj;
         }
+        async function waitForManifest(outPath, timeoutMs = 8000) {
+            const manifestPath = `${outPath}/manifest.json`;
+            const start = Date.now();
+            while(Date.now() - start < timeoutMs){
+                try {
+                    if (external_fs_.existsSync(manifestPath)) return true;
+                } catch  {}
+                await new Promise((resolve)=>setTimeout(resolve, 150));
+            }
+            return false;
+        }
+        async function maybePrintDevBanner(args) {
+            const mode = args.compilation?.options?.mode || 'development';
+            if ('development' !== mode) return;
+            const loadExtensionFlag = args.chromiumConfig.find((flag)=>flag.startsWith('--load-extension='));
+            const extensionOutputPath = (0, extension_output_path.W)(args.compilation, loadExtensionFlag);
+            if (!extensionOutputPath) return;
+            const ready = await waitForManifest(extensionOutputPath, 10000);
+            if (!ready) return;
+            await (0, banner.a)({
+                browser: args.browser,
+                outPath: extensionOutputPath,
+                hostPort: args.hostPort,
+                getInfo: async ()=>null,
+                browserVersionLine: args.browserVersionLine
+            });
+        }
         class ChromiumLaunchPlugin {
             async runOnce(compilation, opts) {
                 if (!this.logger) this.logger = {
@@ -128895,6 +128927,15 @@ var __webpack_modules__ = {
                 instance_registry.UF(this.options.instanceId, {
                     cdpPort: selectedPort
                 });
+                await maybePrintDevBanner({
+                    compilation,
+                    chromiumConfig,
+                    browser: this.options.browser,
+                    hostPort: {
+                        host: '127.0.0.1',
+                        port: selectedPort
+                    }
+                });
                 if (this.options.dryRun) return void logChromiumDryRun(browserBinaryLocation, chromiumConfig);
                 await this.launchWithDirectSpawn(browserBinaryLocation, chromiumConfig);
                 try {
@@ -128905,8 +128946,8 @@ var __webpack_modules__ = {
                             if (vLine && vLine.trim().length > 0) browserVersionLine = vLine.trim();
                         }
                     } catch  {}
+                    const mode = compilation?.options?.mode || 'development';
                     try {
-                        const mode = compilation?.options?.mode || 'development';
                         if ('production' === mode) {
                             const loadExtensionFlag = chromiumConfig.find((flag)=>flag.startsWith('--load-extension='));
                             const extensionOutputPath = (0, extension_output_path.W)(compilation, loadExtensionFlag);
@@ -129155,6 +129196,17 @@ var __webpack_modules__ = {
         }
         var external_path_ = __webpack_require__("path");
         var banner = __webpack_require__("./webpack/plugin-browsers/browsers-lib/banner.ts");
+        async function waitForManifest(outPath, timeoutMs = 8000) {
+            const manifestPath = external_path_.join(outPath, 'manifest.json');
+            const start = Date.now();
+            while(Date.now() - start < timeoutMs){
+                try {
+                    if (external_fs_.existsSync(manifestPath)) return true;
+                } catch  {}
+                await new Promise((resolve)=>setTimeout(resolve, 150));
+            }
+            return false;
+        }
         async function printRunningInDevelopmentSummary(candidateAddonPaths, browser, extensionId, browserVersionLine) {
             try {
                 let chosenPath = null;
@@ -129170,26 +129222,30 @@ var __webpack_modules__ = {
                     }
                 }
                 if (!chosenPath && candidateAddonPaths.length > 0) chosenPath = candidateAddonPaths[candidateAddonPaths.length - 1];
-                if (chosenPath) {
-                    const manifestPath = external_path_.join(chosenPath, 'manifest.json');
-                    if (external_fs_.existsSync(manifestPath)) {
-                        const manifest = JSON.parse(external_fs_.readFileSync(manifestPath, 'utf-8'));
-                        await (0, banner.a)({
-                            browser,
-                            outPath: chosenPath,
-                            hostPort: {
-                                host: '127.0.0.1'
-                            },
-                            getInfo: async ()=>({
-                                    extensionId: extensionId || '(temporary)',
-                                    name: manifest.name,
-                                    version: manifest.version
-                                }),
-                            browserVersionLine
-                        });
-                    }
+                if (!chosenPath) return false;
+                const manifestPath = external_path_.join(chosenPath, 'manifest.json');
+                if (!external_fs_.existsSync(manifestPath)) {
+                    const ready = await waitForManifest(chosenPath, 10000);
+                    if (!ready) return false;
                 }
-            } catch  {}
+                const manifest = JSON.parse(external_fs_.readFileSync(manifestPath, 'utf-8'));
+                const printed = await (0, banner.a)({
+                    browser,
+                    outPath: chosenPath,
+                    hostPort: {
+                        host: '127.0.0.1'
+                    },
+                    getInfo: async ()=>({
+                            extensionId: extensionId || '(temporary)',
+                            name: manifest.name,
+                            version: manifest.version
+                        }),
+                    browserVersionLine
+                });
+                return printed;
+            } catch  {
+                return false;
+            }
         }
         function printSourceInspection(html) {
             console.log(messages.sew());
@@ -129386,6 +129442,16 @@ var __webpack_modules__ = {
         const MAX_RETRIES = 150;
         const RETRY_INTERVAL = 1000;
         class RemoteFirefox {
+            resolveRdpPort(compilation) {
+                const instanceId = this.options?.instanceId;
+                const devPort = compilation?.options?.devServer?.port;
+                const optionPort = this.options?.port;
+                const normalizedOptionPort = 'string' == typeof optionPort ? parseInt(optionPort, 10) : optionPort;
+                const basePort = normalizedOptionPort || devPort;
+                const desired = (0, shared_utils.jl)(basePort, instanceId);
+                const fromInstance = instanceId ? (0, instance_registry.Ef)(instanceId)?.rdpPort : void 0;
+                return fromInstance || (0, instance_registry.mm)() || desired;
+            }
             async connectClient(port) {
                 let lastError;
                 for (const _ of Array.from({
@@ -129422,15 +129488,13 @@ var __webpack_modules__ = {
                     return 0;
                 });
                 const extensionsToLoad = userFirst;
-                const devPort = compilation.options?.devServer?.port;
-                const optionPort = this.options?.port;
-                const normalizedOptionPort = 'string' == typeof optionPort ? parseInt(optionPort, 10) : optionPort;
-                const port = normalizedOptionPort || (devPort ? devPort + 100 : 9222);
+                const port = this.resolveRdpPort(compilation);
                 const client = await this.connectClient(port);
                 let addonsActor = await getAddonsActorWithRetry(client, this.cachedAddonsActor);
                 if (addonsActor) this.cachedAddonsActor = addonsActor;
                 const candidateAddonPaths = computeCandidateAddonPaths(compilation, extensionsToLoad);
                 for (const [index, addonPath] of candidateAddonPaths.entries()){
+                    const isManager = /extensions\/[a-z-]+-manager/.test(String(addonPath));
                     const isDevtoolsEnabled = 0 === index && Boolean(devtools);
                     try {
                         const installResponse = await installTemporaryAddon(client, String(addonsActor || ''), addonPath, isDevtoolsEnabled);
@@ -129438,7 +129502,7 @@ var __webpack_modules__ = {
                             const maybeId = installResponse?.addon?.id;
                             if ('string' == typeof maybeId && maybeId.length > 0) this.derivedExtensionId = maybeId;
                         }
-                        if (1 === index || 0 === index && /extensions\/[a-z-]+-manager/.test(String(addonPath))) await waitForManagerWelcome(client);
+                        if (isManager) await waitForManagerWelcome(client);
                     } catch (err) {
                         const message = requestErrorToMessage(err);
                         throw new Error(messages.WVu(this.options.browser, message));
@@ -129460,7 +129524,8 @@ var __webpack_modules__ = {
                     if (!this.derivedExtensionId) this.derivedExtensionId = await deriveMozExtensionId(client);
                 } catch  {}
                 this.lastInstalledAddonPath = candidateAddonPaths[0];
-                printRunningInDevelopmentSummary(candidateAddonPaths, 'firefox', this.derivedExtensionId, this.options.browserVersionLine);
+                const bannerPrinted = await printRunningInDevelopmentSummary(candidateAddonPaths, 'firefox', this.derivedExtensionId, this.options.browserVersionLine);
+                if (!bannerPrinted) throw new Error(messages.WVu(this.options.browser, 'Failed to print runningInDevelopment banner; add-on may not be installed.'));
             }
             markNeedsReinstall() {
                 this.needsReinstall = true;
@@ -129512,10 +129577,7 @@ var __webpack_modules__ = {
             }
             async hardReloadIfNeeded(compilation, changedAssets) {
                 try {
-                    const devPort = compilation.options.devServer?.port;
-                    const optionPort = this.options?.port;
-                    const normalizedOptionPort = 'string' == typeof optionPort ? parseInt(optionPort, 10) : optionPort;
-                    const rdpPort = normalizedOptionPort || (devPort ? devPort + 100 : 9222);
+                    const rdpPort = this.resolveRdpPort(compilation);
                     const client = this.client || await this.connectClient(rdpPort);
                     const normalized = (changedAssets || []).map((n)=>String(n || '')).map((n)=>n.replace(/\\/g, '/'));
                     const isManifestChanged = normalized.includes('manifest.json');
@@ -129540,10 +129602,7 @@ var __webpack_modules__ = {
             }
             async inspectSource(compilation, opts) {
                 try {
-                    const devServerPort = compilation.options.devServer?.port;
-                    const optionPort = this.options?.port;
-                    const normalizedOptionPort = 'string' == typeof optionPort ? parseInt(optionPort, 10) : optionPort;
-                    const rdpPort = normalizedOptionPort || (devServerPort ? devServerPort + 100 : 9222);
+                    const rdpPort = this.resolveRdpPort(compilation);
                     const client = this.client || await this.connectClient(rdpPort);
                     const urlToInspect = 'string' == typeof opts.source && 'true' !== opts.source ? opts.source : opts.startingUrl;
                     const tab = await (0, source_inspect.oc)(client, urlToInspect);
@@ -129559,9 +129618,7 @@ var __webpack_modules__ = {
             async enableUnifiedLogging(opts) {
                 try {
                     if (this.loggingAttached) return;
-                    const devPort = this.options?.port;
-                    const normalized = 'string' == typeof devPort ? parseInt(devPort, 10) : devPort;
-                    const rdpPort = normalized || 9222;
+                    const rdpPort = this.resolveRdpPort();
                     const client = this.client || await this.connectClient(rdpPort);
                     await attachConsoleListeners(client);
                     const wantLevel = String(opts.level || 'info').toLowerCase();
@@ -129789,29 +129846,31 @@ var __webpack_modules__ = {
                     });
                     profilePath = tmp;
                 }
-                external_fs_.mkdirSync(profilePath, {
-                    recursive: true
-                });
-                try {
-                    const prefs = getPreferences(configOptions?.preferences || {});
-                    function serializeValue(value) {
-                        if ('string' == typeof value) return JSON.stringify(value);
-                        if ('boolean' == typeof value) return String(value);
-                        if ('number' == typeof value && Number.isFinite(value)) return String(value);
-                        return JSON.stringify(value);
-                    }
-                    function prefsToUserJs(prefsObject) {
-                        return Object.entries(prefsObject).map(([key, val])=>`user_pref(${JSON.stringify(key)}, ${serializeValue(val)});`).join('\n');
-                    }
-                    const userJsPath = external_path_.join(profilePath, 'user.js');
-                    const userJsContent = prefsToUserJs(prefs);
-                    external_fs_.writeFileSync(userJsPath, userJsContent);
-                } catch  {}
                 try {
                     const maxAgeHours = parseInt(String(process.env.EXTENSION_TMP_PROFILE_MAX_AGE_HOURS || ''), 10);
                     (0, shared_utils.CW)(base, external_path_.basename(profilePath), Number.isFinite(maxAgeHours) ? maxAgeHours : 12);
                 } catch  {}
             }
+            if (profilePath) try {
+                external_fs_.mkdirSync(profilePath, {
+                    recursive: true
+                });
+            } catch  {}
+            if (profilePath) try {
+                const prefs = getPreferences(configOptions?.preferences || {});
+                function serializeValue(value) {
+                    if ('string' == typeof value) return JSON.stringify(value);
+                    if ('boolean' == typeof value) return String(value);
+                    if ('number' == typeof value && Number.isFinite(value)) return String(value);
+                    return JSON.stringify(value);
+                }
+                function prefsToUserJs(prefsObject) {
+                    return Object.entries(prefsObject).map(([key, val])=>`user_pref(${JSON.stringify(key)}, ${serializeValue(val)});`).join('\n');
+                }
+                const userJsPath = external_path_.join(profilePath, 'user.js');
+                const userJsContent = prefsToUserJs(prefs);
+                external_fs_.writeFileSync(userJsPath, userJsContent);
+            } catch  {}
             const parts = [
                 `--binary-args="${binaryArgs.join(' ')}"`,
                 '--verbose'
@@ -133277,7 +133336,8 @@ var __webpack_modules__ = {
         function normalizeBrowser(browser, chromiumBinary, geckoBinary) {
             const requested = String(browser || '');
             if (chromiumBinary) {
-                if (!requested || 'chromium' === requested || 'chromium-based' === requested) return 'chromium-based';
+                if (!requested || 'chromium-based' === requested) return 'chromium-based';
+                if ('chromium' === requested) return 'chromium';
                 if ('edge' === requested) return 'edge';
                 if ('chrome' === requested) return 'chrome';
             }
@@ -133520,7 +133580,7 @@ var __webpack_modules__ = {
     },
     "./package.json" (module) {
         "use strict";
-        module.exports = JSON.parse('{"rE":"3.5.0-next.21","El":{"@rspack/core":"^1.7.2","@rspack/dev-server":"^1.1.5","@swc/core":"^1.15.8","@swc/helpers":"^0.5.18","adm-zip":"^0.5.16","browser-extension-manifest-fields":"^2.2.1","case-sensitive-paths-webpack-plugin":"^2.4.0","chrome-location2":"4.0.0","chromium-location":"2.0.0","content-security-policy-parser":"^0.6.0","cross-spawn":"^7.0.6","dotenv":"^17.2.3","edge-location":"2.2.0","firefox-location2":"3.0.0","go-git-it":"^5.1.1","ignore":"^7.0.5","loader-utils":"^3.3.1","magic-string":"^0.30.21","parse5":"^8.0.0","parse5-utilities":"^1.0.0","pintor":"0.3.0","schema-utils":"^4.3.3","tiny-glob":"^0.2.9","unique-names-generator":"^4.7.1","webextension-polyfill":"^0.12.0","webpack-merge":"^6.0.1","webpack-target-webextension":"^2.1.3","ws":"^8.19.0"}}');
+        module.exports = JSON.parse('{"rE":"3.5.0-next.22","El":{"@rspack/core":"^1.7.5","@rspack/dev-server":"^1.1.5","@swc/core":"^1.15.8","@swc/helpers":"^0.5.18","adm-zip":"^0.5.16","browser-extension-manifest-fields":"^2.2.1","case-sensitive-paths-webpack-plugin":"^2.4.0","chrome-location2":"4.0.0","chromium-location":"2.0.0","content-security-policy-parser":"^0.6.0","cross-spawn":"^7.0.6","dotenv":"^17.2.3","edge-location":"2.2.0","firefox-location2":"3.0.0","go-git-it":"^5.1.1","ignore":"^7.0.5","loader-utils":"^3.3.1","magic-string":"^0.30.21","parse5":"^8.0.0","parse5-utilities":"^1.0.0","pintor":"0.3.0","schema-utils":"^4.3.3","tiny-glob":"^0.2.9","unique-names-generator":"^4.7.1","webextension-polyfill":"^0.12.0","webpack-merge":"^6.0.1","webpack-target-webextension":"^2.1.3","ws":"^8.19.0"}}');
     }
 };
 var __webpack_module_cache__ = {};

package/package.json

@@ -24,7 +24,7 @@
     "webpack/webpack-lib/build-dependencies.json"
   ],
   "name": "extension-develop",
-  "version": "3.5.0-next.21",
+  "version": "3.5.0-next.22",
   "description": "Develop, build, preview, and package Extension.js projects.",
   "author": {
     "name": "Cezar Augusto",
@@ -72,7 +72,7 @@
     "edge-extension"
   ],
   "dependencies": {
-    "@rspack/core": "^1.7.2",
+    "@rspack/core": "^1.7.5",
     "@rspack/dev-server": "^1.1.5",
     "@swc/core": "^1.15.8",
     "@swc/helpers": "^0.5.18",