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

package/dist/323.cjs

@@ -14,30 +14,69 @@ exports.modules = {
         var external_fs_ = __webpack_require__("fs");
         async function deriveExtensionIdFromTargetsHelper(cdp, outPath, maxRetries = 20, backoffMs = 200) {
             let expectedName;
+            let expectedVersion;
+            let expectedManifestVersion;
+            let expectedNameIsMsg = false;
             try {
                 const manifest = JSON.parse(external_fs_.readFileSync(external_path_.join(outPath, 'manifest.json'), 'utf-8'));
                 expectedName = manifest?.name;
+                expectedVersion = manifest?.version;
+                expectedManifestVersion = manifest?.manifest_version;
+                expectedNameIsMsg = 'string' == typeof expectedName && /__MSG_/i.test(expectedName);
+                if (expectedNameIsMsg) {
+                    const defaultLocale = String(manifest?.default_locale || '').trim();
+                    const msgKeyMatch = String(expectedName || '').match(/__MSG_([^_]+)__/i);
+                    const msgKey = msgKeyMatch ? msgKeyMatch[1] : '';
+                    if (defaultLocale && msgKey) try {
+                        const messagesPath = external_path_.join(outPath, '_locales', defaultLocale, 'messages.json');
+                        if (external_fs_.existsSync(messagesPath)) {
+                            const messagesJson = JSON.parse(external_fs_.readFileSync(messagesPath, 'utf-8'));
+                            const resolved = String(messagesJson?.[msgKey]?.message || '').trim();
+                            if (resolved) {
+                                expectedName = resolved;
+                                expectedNameIsMsg = false;
+                            }
+                        }
+                    } catch  {}
+                }
             } catch  {}
             let retries = 0;
             while(retries <= maxRetries){
                 try {
                     const targets = await cdp.getTargets();
-                    if (expectedName) for (const t of targets || []){
+                    let firstEvalId = null;
+                    let evalIdCount = 0;
+                    for (const t of targets || []){
                         const url = String(t?.url || '');
                         const type = String(t?.type || '');
-                        if (!('service_worker' === type && url.startsWith('chrome-extension://'))) continue;
+                        const typeOk = [
+                            'service_worker',
+                            'background_page',
+                            'worker'
+                        ].includes(type);
+                        if (!typeOk) continue;
+                        if (url && !url.startsWith('chrome-extension://')) continue;
                         const targetId = t?.targetId;
                         if (targetId) try {
                             const sessionId = await cdp.attachToTarget(targetId);
                             if (!sessionId) continue;
                             await cdp.sendCommand('Runtime.enable', {}, sessionId);
-                            const gotName = String(await cdp.evaluate(sessionId, '(()=>{try{return chrome.runtime.getManifest().name}catch(_){return null}})()'));
-                            if (gotName && String(gotName) === expectedName) {
-                                const gotIdStr = String(await cdp.evaluate(sessionId, '(()=>{try{return chrome.runtime.id}catch(_){return null}})()') || '');
-                                if (gotIdStr && gotIdStr.length > 0) return gotIdStr;
-                            }
+                            const info = await cdp.evaluate(sessionId, '(()=>{try{const m=chrome.runtime.getManifest?.();return {id:chrome.runtime?.id||"",name:m?.name||"",version:m?.version||"",manifestVersion:m?.manifest_version||0}}catch(_){return null}})()');
+                            const id = String(info?.id || '').trim();
+                            if (!id) continue;
+                            evalIdCount += 1;
+                            if (!firstEvalId) firstEvalId = id;
+                            const gotName = String(info?.name || '');
+                            const gotVersion = String(info?.version || '');
+                            const gotManifestVersion = Number(info?.manifestVersion || 0);
+                            const nameMatches = expectedName && !expectedNameIsMsg ? gotName === expectedName : false;
+                            const versionMatches = expectedVersion ? gotVersion === expectedVersion : false;
+                            const manifestVersionMatches = expectedManifestVersion ? gotManifestVersion === expectedManifestVersion : false;
+                            if (nameMatches) return id;
+                            if (expectedVersion && versionMatches && (expectedManifestVersion ? manifestVersionMatches : true)) return id;
                         } catch  {}
                     }
+                    if (1 === evalIdCount && firstEvalId) return firstEvalId;
                     for (const t of targets || []){
                         const url = String(t?.url || '');
                         const type = String(t?.type || '');
@@ -374,7 +413,12 @@ exports.modules = {
             };
             await retryAsync(()=>cdpExtensionController.connect());
             if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(messages.M3V('127.0.0.1', chromeRemoteDebugPort));
-            const extensionControllerInfo = await cdpExtensionController.ensureLoaded();
+            let extensionControllerInfo = null;
+            try {
+                extensionControllerInfo = await cdpExtensionController.ensureLoaded();
+            } catch (error) {
+                if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.warn(`[CDP] ensureLoaded failed: ${String(error?.message || error)}`);
+            }
             try {
                 const mode = compilation?.options?.mode || 'development';
                 if ('development' === mode) {
@@ -398,16 +442,19 @@ exports.modules = {
                         getInfo: async ()=>cdpExtensionController.getInfoBestEffort(),
                         browserVersionLine: plugin.browserVersionLine
                     });
-                } else if ('production' === mode) await (0, banner.M)({
-                    browser: plugin.browser,
-                    outPath: extensionOutputPath,
-                    browserVersionLine: plugin.browserVersionLine,
-                    runtime: {
+                } else if ('production' === mode) {
+                    const runtime = extensionControllerInfo ? {
                         extensionId: extensionControllerInfo.extensionId,
                         name: extensionControllerInfo.name,
                         version: extensionControllerInfo.version
-                    }
-                });
+                    } : void 0;
+                    await (0, banner.M)({
+                        browser: plugin.browser,
+                        outPath: extensionOutputPath,
+                        browserVersionLine: plugin.browserVersionLine,
+                        runtime
+                    });
+                }
             } catch (bannerErr) {
                 if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.warn(messages.$wD(String(bannerErr)));
                 try {

package/dist/547.cjs

@@ -6859,6 +6859,53 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                     manifestPath,
                     browser: this.browser
                 });
+                const extraHtmlEntries = (()=>{
+                    try {
+                        const manifestDir = external_path_.dirname(manifestPath);
+                        const raw = JSON.parse(external_fs_.readFileSync(manifestPath, 'utf-8'));
+                        const browser = String(this.browser || '').toLowerCase();
+                        const prefixes = 'chromium-based' === browser || 'chromium' === browser ? [
+                            'chromium',
+                            'chrome'
+                        ] : 'edge' === browser ? [
+                            'edge'
+                        ] : 'firefox' === browser || 'gecko-based' === browser ? [
+                            'firefox'
+                        ] : [
+                            'chrome'
+                        ];
+                        const candidates = [
+                            {
+                                key: 'side_panel',
+                                prop: 'default_path',
+                                entry: 'sidebar/index'
+                            },
+                            {
+                                key: 'sidebar_action',
+                                prop: 'default_panel',
+                                entry: 'sidebar/index'
+                            }
+                        ];
+                        const entries = {};
+                        for (const { key, prop, entry } of candidates){
+                            const direct = raw?.[key];
+                            if (direct && 'string' == typeof direct[prop]) {
+                                const resolved = external_path_.resolve(manifestDir, direct[prop]);
+                                if (external_fs_.existsSync(resolved)) entries[entry] = resolved;
+                            }
+                            for (const prefix of prefixes){
+                                const prefixed = raw?.[`${prefix}:${key}`];
+                                if (prefixed && 'string' == typeof prefixed[prop]) {
+                                    const resolved = external_path_.resolve(manifestDir, prefixed[prop]);
+                                    if (external_fs_.existsSync(resolved)) entries[entry] = resolved;
+                                }
+                            }
+                        }
+                        return entries;
+                    } catch  {
+                        return {};
+                    }
+                })();
                 const specialFoldersData = getSpecialFoldersDataForCompiler(compiler);
                 new ManifestPlugin({
                     browser: this.browser,
@@ -6875,6 +6922,7 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                     browser: this.browser,
                     includeList: {
                         ...manifestFieldsData.html,
+                        ...extraHtmlEntries,
                         ...specialFoldersData.pages
                     }
                 }).apply(compiler);

package/dist/extension-js-devtools/chrome/background/service_worker.js

@@ -23,4 +23,4 @@
 ██████████████████████████████████████████████████████████
 ██████████████████████████████████████████████████████████
 MIT (c) ${new Date().getFullYear()} - Cezar Augusto and the Extension.js Authors.
-`,"background: transparent; color: #0971fe; "),!t){try{await o()}catch{try{chrome.tabs.create({url:a})}catch{}}return}let n=String(t.url||"");if(n.startsWith(`${r}://newtab`)||n.startsWith(`${r}://welcome`))await o();else{let e;e="chrome://extensions/",chrome.tabs.query({url:e},r=>{r.length>0||chrome.tabs.create({url:e,active:!1},function(e){chrome.tabs.move(e.id,{index:0},()=>{setTimeout(()=>{chrome.tabs.update(t.id,{active:!0})},500)})})})}})}catch{}}r.rv=()=>"1.7.2",r.ruid="bundler=rspack@1.7.2",chrome.runtime.onStartup.addListener(async()=>{await c()}),chrome.runtime.onInstalled.addListener(async()=>{await c()})})();
+`,"background: transparent; color: #0971fe; "),!t){try{await o()}catch{try{chrome.tabs.create({url:a})}catch{}}return}let n=String(t.url||"");if(n.startsWith(`${r}://newtab`)||n.startsWith(`${r}://welcome`))await o();else{let e;e="chrome://extensions/",chrome.tabs.query({url:e},r=>{r.length>0||chrome.tabs.create({url:e,active:!1},function(e){chrome.tabs.move(e.id,{index:0},()=>{setTimeout(()=>{chrome.tabs.update(t.id,{active:!0})},500)})})})}})}catch{}}r.rv=()=>"1.7.5",r.ruid="bundler=rspack@1.7.5",chrome.runtime.onStartup.addListener(async()=>{await c()}),chrome.runtime.onInstalled.addListener(async()=>{await c()})})();

package/dist/extension-js-devtools/chrome/devtools/index.js

@@ -1 +1 @@
-(()=>{var e={},r={};function o(t){var s=r[t];if(void 0!==s)return s.exports;var n=r[t]={exports:{}};return e[t](n,n.exports,o),n.exports}o.rv=()=>"1.7.2",o.ruid="bundler=rspack@1.7.2";try{chrome.devtools?.panels.create("Extension Logs","images/logo.png","pages/centralized-logger.html")}catch{console.error("[Extension.js] Failed to create devtools panel")}})();
+(()=>{var e={},r={};function o(t){var s=r[t];if(void 0!==s)return s.exports;var n=r[t]={exports:{}};return e[t](n,n.exports,o),n.exports}o.rv=()=>"1.7.5",o.ruid="bundler=rspack@1.7.5";try{chrome.devtools?.panels.create("Extension Logs","images/logo.png","pages/centralized-logger.html")}catch{console.error("[Extension.js] Failed to create devtools panel")}})();