extension-develop 4.0.30 → 4.0.33

package/dist/0~rspack-config.mjs

@@ -4,7 +4,7 @@ import { createRequire } from "node:module";
 import pintor from "pintor";
 import core, { Compilation as core_Compilation, DefinePlugin, ProvidePlugin, WebpackError as core_WebpackError, rspack, sources as core_sources } from "@rspack/core";
 import case_sensitive_paths_webpack_plugin from "case-sensitive-paths-webpack-plugin";
-import adm_zip from "adm-zip";
+import { zipSync } from "fflate";
 import ignore from "ignore";
 import tiny_glob from "tiny-glob";
 import { pathToFileURL } from "node:url";
@@ -12,7 +12,7 @@ import { filterKeysForThisBrowser as external_browser_extension_manifest_fields_
 import content_security_policy_parser from "content-security-policy-parser";
 import node_fs from "node:fs";
 import node_path from "node:path";
-import { debugExtensionsToLoad, package_namespaceObject, getDirs, asAbsolute, browserRunnerDisabled, treeWithDistFilesBrowser, packagingDistributionFiles, toPosixPath, resolveCompanionExtensionDirs, debugContextPath, PlaywrightPlugin, isWebkitBasedBrowser, spacerLine, isGeckoBasedBrowser, messages_ready, CHROMIUM_FAMILY_ALIASES, treeWithSourceAndDistFiles, computeExtensionsToLoad, noCompanionExtensionsResolved, treeWithSourceFiles, bundlerFatalError, bundlerRecompiling, noEntrypointsDetected, GECKO_FAMILY_ALIASES, packagingSourceFiles, debugBrowser, debugOutputPath, manifestInvalidJson, isChromiumBasedBrowser, getSpecialFoldersDataForCompiler } from "./101.mjs";
+import { debugExtensionsToLoad, package_namespaceObject, getDirs, asAbsolute, browserRunnerDisabled, treeWithDistFilesBrowser, packagingDistributionFiles, toPosixPath, resolveCompanionExtensionDirs, debugContextPath, PlaywrightPlugin, isGeckoBasedBrowser, spacerLine, isWebkitBasedBrowser, messages_ready, CHROMIUM_FAMILY_ALIASES, treeWithSourceAndDistFiles, computeExtensionsToLoad, noCompanionExtensionsResolved, treeWithSourceFiles, bundlerFatalError, bundlerRecompiling, noEntrypointsDetected, GECKO_FAMILY_ALIASES, packagingSourceFiles, debugBrowser, debugOutputPath, manifestInvalidJson, isChromiumBasedBrowser, getSpecialFoldersDataForCompiler } from "./101.mjs";
 import { stripBom, parseJsonSafe } from "./23.mjs";
 import { isResourceUnderDirs, canonicalizeDir, toResourceKey } from "./93.mjs";
 import { prefix as messaging_prefix, isDebug } from "./349.mjs";
@@ -246,6 +246,11 @@ class PolyfillPlugin {
         }
     }
 }
+function polyfillSkipReason(browser) {
+    if (isGeckoBasedBrowser(String(browser))) return 'Firefox bundles browser.* APIs';
+    if (isWebkitBasedBrowser(String(browser))) return 'Safari ships a native promise-based browser.* namespace';
+    return null;
+}
 class CompatibilityPlugin {
     static name = 'plugin-compatibility';
     manifestPath;
@@ -257,9 +262,9 @@ class CompatibilityPlugin {
         this.polyfill = options.polyfill || false;
     }
     apply(compiler) {
-        const isGeckoFamily = isGeckoBasedBrowser(String(this.browser));
-        if (this.polyfill) if (isGeckoFamily) {
-            if (isDebug()) console.log(compatibilityPolyfillSkipped('Firefox bundles browser.* APIs', this.browser));
+        const skipReason = polyfillSkipReason(this.browser);
+        if (this.polyfill) if (skipReason) {
+            if (isDebug()) console.log(compatibilityPolyfillSkipped(skipReason, this.browser));
         } else {
             if (isDebug()) console.log(compatibilityPolyfillEnabled(this.browser, 'webextension-polyfill'));
             new PolyfillPlugin({
@@ -671,7 +676,7 @@ function contentSecurityPolicy(manifest) {
         content_security_policy: manifest.content_security_policy
     };
 }
-function devtoolsPage(manifest, manifestPath) {
+function devtools_page_devtoolsPage(manifest, manifestPath) {
     return manifest.devtools_page && {
         devtools_page: (()=>{
             const raw = String(manifest.devtools_page);
@@ -805,7 +810,7 @@ function manifestCommon(manifest, manifestPath) {
         ...backgroundPage(manifest),
         ...chromeUrlOverrides(manifest, manifestPath),
         ...content_scripts_contentScripts(manifest, manifestPath),
-        ...devtoolsPage(manifest, manifestPath),
+        ...devtools_page_devtoolsPage(manifest, manifestPath),
         ...icons_icons(manifest),
         ...commands_commands(manifest),
         ...permissions(manifest),
@@ -1001,10 +1006,12 @@ function declarativeNetRequest(manifest) {
     return manifest.declarative_net_request && {
         declarative_net_request: {
             ...manifest.declarative_net_request,
-            rule_resources: manifest.declarative_net_request.rule_resources.map((resourceObj)=>({
-                    ...resourceObj,
-                    path: resourceObj.path && getFilename(`declarative_net_request/${resourceObj.id}.json`, resourceObj.path)
-                }))
+            ...Array.isArray(manifest.declarative_net_request.rule_resources) && {
+                rule_resources: manifest.declarative_net_request.rule_resources.map((resourceObj)=>({
+                        ...resourceObj,
+                        path: resourceObj.path && getFilename(`declarative_net_request/${resourceObj.id}.json`, resourceObj.path)
+                    }))
+            }
         }
     };
 }
@@ -1254,6 +1261,7 @@ class EnvPlugin {
         if (processShim) new ProvidePlugin({
             process: processShim
         }).apply(compiler);
+        const templateVars = buildTemplateVars(combinedVars, this.browser, mode);
         compiler.hooks.thisCompilation.tap('manifest:update-manifest', (compilation)=>{
             compilation.hooks.processAssets.tap({
                 name: 'env:module',
@@ -1264,29 +1272,11 @@ class EnvPlugin {
                     if (filename.endsWith('.json') || filename.endsWith('.html')) {
                         let fileContent = String(compilation.assets[filename]?.source() ?? '');
                         const resolveVar = (name)=>{
-                            if (Object.prototype.hasOwnProperty.call(process.env, name)) {
-                                const systemValue = process.env[name];
-                                if ('string' == typeof systemValue) return systemValue;
-                            }
-                            if (Object.prototype.hasOwnProperty.call(envVars, name)) {
-                                const explicitEnvValue = envVars[name];
-                                if ('string' == typeof explicitEnvValue) return explicitEnvValue;
-                            }
-                            if (Object.prototype.hasOwnProperty.call(defaultsVars, name)) {
-                                const defaultsValue = defaultsVars[name];
-                                if ('string' == typeof defaultsValue) return defaultsValue;
-                            }
-                            const combinedValue = combinedVars[name];
-                            return 'string' == typeof combinedValue ? combinedValue : `$${name}`;
+                            if (Object.prototype.hasOwnProperty.call(templateVars, name)) return templateVars[name];
+                            return `$${name}`;
                         };
-                        fileContent = fileContent.replace(/\$EXTENSION_PUBLIC_[A-Z_]+/g, (match)=>{
-                            const envVarName = match.slice(1);
-                            return resolveVar(envVarName);
-                        });
-                        fileContent = fileContent.replace(/\$EXTENSION_[A-Z_]+/g, (match)=>{
-                            const envVarName = match.slice(1);
-                            return resolveVar(envVarName);
-                        });
+                        fileContent = fileContent.replace(/\$EXTENSION_PUBLIC_[A-Z0-9_]+/g, (match)=>resolveVar(match.slice(1)));
+                        fileContent = fileContent.replace(/\$EXTENSION_[A-Z0-9_]+/g, (match)=>resolveVar(match.slice(1)));
                         compilation.updateAsset(filename, new core_sources.RawSource(fileContent));
                         if ('manifest.json' === filename) setCurrentManifestContent(compilation, fileContent);
                     }
@@ -1295,6 +1285,17 @@ class EnvPlugin {
         });
     }
 }
+function buildTemplateVars(combinedVars, browser, mode) {
+    const vars = {};
+    for (const [key, value] of Object.entries(combinedVars))if ('string' == typeof value && key.startsWith('EXTENSION_')) vars[key] = value;
+    const browserValue = String(browser);
+    const modeValue = String(mode);
+    vars.EXTENSION_BROWSER = browserValue;
+    vars.EXTENSION_PUBLIC_BROWSER = browserValue;
+    vars.EXTENSION_MODE = modeValue;
+    vars.EXTENSION_PUBLIC_MODE = modeValue;
+    return vars;
+}
 function sanitize(input) {
     return input.toLowerCase().replace(/[^a-z0-9 ]/gi, '').trim().replace(/\s+/g, '-');
 }
@@ -1318,6 +1319,46 @@ function resolveManifestName(rawName, manifest, searchRoots, fallback) {
     return fallback;
 }
 const toPosix = (p)=>p.replace(/\\/g, '/');
+function zipEntryFor(absPath) {
+    const stat = __rspack_external_node_fs_5ea92f0c.statSync(absPath);
+    return [
+        new Uint8Array(__rspack_external_node_fs_5ea92f0c.readFileSync(absPath)),
+        {
+            mtime: stat.mtime,
+            os: 3,
+            attrs: (4095 & stat.mode | 32768) << 16 >>> 0
+        }
+    ];
+}
+function writeZipFile(zipPath, entries) {
+    const zippable = {};
+    for (const entry of entries)zippable[toPosix(entry.name)] = zipEntryFor(entry.absPath);
+    __rspack_external_node_fs_5ea92f0c.writeFileSync(zipPath, zipSync(zippable));
+}
+function listFilesUnder(root, skipNames) {
+    const out = [];
+    const stack = [
+        ''
+    ];
+    while(stack.length){
+        const relDir = stack.pop();
+        const absDir = __rspack_external_node_path_c5b9b54f.join(root, relDir);
+        let entries = [];
+        try {
+            entries = __rspack_external_node_fs_5ea92f0c.readdirSync(absDir, {
+                withFileTypes: true
+            });
+        } catch  {
+            continue;
+        }
+        for (const entry of entries){
+            const rel = relDir ? __rspack_external_node_path_c5b9b54f.join(relDir, entry.name) : entry.name;
+            if (entry.isDirectory()) stack.push(rel);
+            else if (entry.isFile() && !skipNames.has(toPosix(rel))) out.push(rel);
+        }
+    }
+    return out.sort();
+}
 const COMPANION_DIR = 'extensions';
 function isCompanionExtension(file) {
     const [first] = toPosix(file).split('/');
@@ -1333,10 +1374,12 @@ function isDeniedEnvFile(basename) {
     if (!basename.startsWith('.env')) return false;
     return !basename.endsWith('.example');
 }
+const STAGING_DIR_PREFIX = '.extension-build-';
 function isDeniedFromSourceZip(file) {
     const posix = toPosix(file);
     const segments = posix.split('/');
     if (segments.some((segment)=>DENIED_SEGMENTS.has(segment))) return true;
+    if (segments.some((segment)=>segment.startsWith(STAGING_DIR_PREFIX))) return true;
     if (isDeniedEnvFile(segments[segments.length - 1])) return true;
     return posix === SESSION_ARTIFACTS_PREFIX || posix.startsWith(`${SESSION_ARTIFACTS_PREFIX}/`);
 }
@@ -1385,27 +1428,28 @@ class ZipPlugin {
                 ], __rspack_external_node_path_c5b9b54f.basename(packageJsonDir)));
                 const name = `${base}-${manifest.version || '0.0.0'}`;
                 if (this.zipData.zipSource) {
-                    const sourceZip = new adm_zip();
                     const files = await getFilesToZip(packageJsonDir);
-                    files.forEach((file)=>{
-                        const root = __rspack_external_node_path_c5b9b54f.dirname(file);
-                        sourceZip.addLocalFile(__rspack_external_node_path_c5b9b54f.join(packageJsonDir, file), '.' === root ? '' : toPosix(root));
-                    });
                     const sourcePath = __rspack_external_node_path_c5b9b54f.join(__rspack_external_node_path_c5b9b54f.dirname(outPath), `${name}-source.zip`);
                     if (isDebug()) console.log(packagingSourceFiles(sourcePath));
-                    sourceZip.writeZip(sourcePath);
+                    writeZipFile(sourcePath, files.map((file)=>({
+                            name: file,
+                            absPath: __rspack_external_node_path_c5b9b54f.join(packageJsonDir, file)
+                        })));
                     created.push({
                         kind: 'source',
                         path: sourcePath
                     });
                 }
                 if (this.zipData.zip) {
-                    const distZip = new adm_zip();
-                    distZip.addLocalFolder(outPath);
                     const zipName = this.zipData.zipFilename ? explicitZipFilename(this.zipData.zipFilename) : `${name}.zip`;
                     const distPath = __rspack_external_node_path_c5b9b54f.join(outPath, zipName);
                     if (isDebug()) console.log(packagingDistributionFiles(distPath));
-                    distZip.writeZip(distPath);
+                    writeZipFile(distPath, listFilesUnder(outPath, new Set([
+                        toPosix(zipName)
+                    ])).map((file)=>({
+                            name: file,
+                            absPath: __rspack_external_node_path_c5b9b54f.join(outPath, file)
+                        })));
                     created.push({
                         kind: 'dist',
                         path: distPath
@@ -3544,13 +3588,33 @@ class JsFrameworksPlugin {
             manifestDir,
             ...resolveTranspilePackageDirs(projectPath, this.transpilePackages)
         ]));
+        const expandWithRealpaths = (dirs)=>{
+            const out = new Set();
+            for (const dir of dirs)if (dir) {
+                out.add(dir);
+                try {
+                    out.add(__rspack_external_node_fs_5ea92f0c.realpathSync(dir));
+                } catch  {}
+            }
+            return Array.from(out);
+        };
+        const addBothPathForms = (set, absPath)=>{
+            set.add(toResourceKey(absPath));
+            try {
+                set.add(toResourceKey(__rspack_external_node_fs_5ea92f0c.realpathSync(absPath)));
+            } catch  {}
+        };
         const contentScriptLikePaths = new Set();
-        const scriptsDir = toResourceKey(__rspack_external_node_path_c5b9b54f.resolve(projectPath, "scripts"));
+        const scriptsDirs = expandWithRealpaths([
+            __rspack_external_node_path_c5b9b54f.resolve(projectPath, "scripts")
+        ]).map(toResourceKey);
         const isfeatureScriptsContentLike = (resourcePath)=>{
             const normalized = toResourceKey(resourcePath);
             if (contentScriptLikePaths.has(normalized)) return true;
-            const relToScripts = __rspack_external_node_path_c5b9b54f.relative(scriptsDir, normalized);
-            return !!relToScripts && !relToScripts.startsWith('..') && !__rspack_external_node_path_c5b9b54f.isAbsolute(relToScripts);
+            return scriptsDirs.some((scriptsDir)=>{
+                const relToScripts = __rspack_external_node_path_c5b9b54f.relative(scriptsDir, normalized);
+                return !!relToScripts && !relToScripts.startsWith('..') && !__rspack_external_node_path_c5b9b54f.isAbsolute(relToScripts);
+            });
         };
         const devtool = compiler.options.devtool;
         const wantsSourceMaps = false !== devtool && ('development' === mode || null != devtool);
@@ -3561,13 +3625,13 @@ class JsFrameworksPlugin {
         const contentScripts = Array.isArray(manifest?.content_scripts) ? manifest.content_scripts : [];
         for (const contentScript of contentScripts){
             const jsList = Array.isArray(contentScript?.js) ? contentScript.js : [];
-            for (const jsFile of jsList)contentScriptLikePaths.add(toResourceKey(__rspack_external_node_path_c5b9b54f.resolve(manifestDir, jsFile)));
+            for (const jsFile of jsList)addBothPathForms(contentScriptLikePaths, __rspack_external_node_path_c5b9b54f.resolve(manifestDir, jsFile));
         }
         const platformModulePaths = new Set();
         try {
             const browserManifest = external_browser_extension_manifest_fields_filterKeysForThisBrowser(manifest, this.browser);
             const background = browserManifest?.background;
-            if (background?.type === 'module' && 'string' == typeof background?.service_worker) platformModulePaths.add(toResourceKey(__rspack_external_node_path_c5b9b54f.resolve(manifestDir, background.service_worker)));
+            if (background?.type === 'module' && 'string' == typeof background?.service_worker) addBothPathForms(platformModulePaths, __rspack_external_node_path_c5b9b54f.resolve(manifestDir, background.service_worker));
             const htmlPages = {
                 ...getManifestFieldsData({
                     manifestPath: this.manifestPath,
@@ -3575,7 +3639,7 @@ class JsFrameworksPlugin {
                 }).html,
                 ...getSpecialFoldersDataForCompiler(compiler).pages
             };
-            for (const htmlPage of Object.values(htmlPages))if ('string' == typeof htmlPage) for (const moduleScript of getAssetsFromHtml(htmlPage)?.moduleJs || [])platformModulePaths.add(toResourceKey(moduleScript));
+            for (const htmlPage of Object.values(htmlPages))if ('string' == typeof htmlPage) for (const moduleScript of getAssetsFromHtml(htmlPage)?.moduleJs || [])addBothPathForms(platformModulePaths, moduleScript);
         } catch  {}
         const maybeInstallReact = await maybeUseReact(projectPath, {
             disableRefresh: 'development' !== mode,
@@ -3587,7 +3651,7 @@ class JsFrameworksPlugin {
         const tsConfigPath = getUserTypeScriptConfigFile(projectPath);
         const tsRoot = tsConfigPath ? __rspack_external_node_path_c5b9b54f.dirname(tsConfigPath) : manifestDir;
         const transpilePackageDirs = swcIncludeDirs.filter((dir)=>dir !== projectPath && dir !== manifestDir);
-        const preferTypeScript = !!tsConfigPath || isUsingTypeScript(projectPath);
+        const preferTypeScript = !!tsConfigPath;
         let targets = [
             'chrome >= 100'
         ];
@@ -3622,10 +3686,10 @@ class JsFrameworksPlugin {
         const swcRuleBase = {
             test: /\.(js|cjs|mjs|jsx|mjsx|ts|mts|tsx|mtsx)$/,
             type: "javascript/auto",
-            include: Array.from(new Set([
+            include: expandWithRealpaths(Array.from(new Set([
                 tsRoot,
                 ...swcIncludeDirs
-            ])),
+            ]))),
             exclude: [
                 (resourcePath)=>{
                     const isInNodeModules = /[\\/]node_modules[\\/]/.test(resourcePath);
@@ -3674,10 +3738,10 @@ class JsFrameworksPlugin {
             {
                 ...swcRuleBase,
                 layer: EXTENSIONJS_CONTENT_SCRIPT_LAYER,
-                include: (resourcePath)=>Array.from(new Set([
+                include: (resourcePath)=>expandWithRealpaths(Array.from(new Set([
                         tsRoot,
                         ...swcIncludeDirs
-                    ])).some((dir)=>isSubPath(resourcePath, dir)) && isfeatureScriptsContentLike(resourcePath),
+                    ]))).some((dir)=>isSubPath(resourcePath, dir)) && isfeatureScriptsContentLike(resourcePath),
                 use: {
                     ...swcLoaderBase,
                     options: {
@@ -3831,12 +3895,14 @@ function categorizeAsset(rawName) {
     if (/(^|\/)content_scripts\//.test(name)) return "content-script";
     if (/(^|\/)background\//.test(name) || /(^|\/)service[-_]?worker\.(js|css|wasm)$/i.test(name)) return 'service-worker';
     for (const dir of PAGE_DIRS)if (new RegExp(`(^|\\/)${dir}\\/`).test(name)) return 'page';
+    if (!name.includes('/') || /\.wasm$/i.test(name)) return 'runtime';
     return 'ignored';
 }
 const BUDGET_BYTES = {
     "content-script": 524288,
     'service-worker': 524288,
     page: 1048576,
+    runtime: 1048576,
     ignored: 1 / 0
 };
 function fmtKiB(bytes) {
@@ -3862,6 +3928,8 @@ function categoryRole(c) {
             return 'service worker / background, wakes from cold each session';
         case 'page':
             return 'UI page, opened on demand';
+        case 'runtime':
+            return 'runtime payload, shipped at the output root';
         default:
             return 'asset';
     }
@@ -7517,7 +7585,7 @@ class SpecialFoldersPlugin {
                 });
             });
             const copyIgnore = [
-                'manifest.json'
+                __rspack_external_node_path_c5b9b54f.join(publicDir, 'manifest.json').replace(/\\/g, '/')
             ];
             new rspack.CopyRspackPlugin({
                 patterns: [
@@ -7689,12 +7757,30 @@ class WasmPlugin {
         this.manifestPath = options.manifestPath;
         this.mode = options.mode;
     }
+    collectSearchRoots(projectRoot) {
+        const roots = [];
+        const seen = new Set();
+        const addAncestors = (startDir)=>{
+            let current = __rspack_external_node_path_c5b9b54f.resolve(startDir);
+            while(true){
+                if (!seen.has(current)) {
+                    seen.add(current);
+                    roots.push(current);
+                }
+                const parent = __rspack_external_node_path_c5b9b54f.dirname(current);
+                if (parent === current) break;
+                current = parent;
+            }
+        };
+        addAncestors(projectRoot);
+        addAncestors(process.cwd());
+        return roots;
+    }
     resolveAssetPath(projectRoot, relativePath) {
-        const candidates = [
-            __rspack_external_node_path_c5b9b54f.join(projectRoot, 'node_modules', relativePath),
-            __rspack_external_node_path_c5b9b54f.join(process.cwd(), 'node_modules', relativePath)
-        ];
-        for (const candidate of candidates)if (__rspack_external_node_fs_5ea92f0c.existsSync(candidate)) return candidate;
+        for (const root of this.collectSearchRoots(projectRoot)){
+            const candidate = __rspack_external_node_path_c5b9b54f.join(root, 'node_modules', relativePath);
+            if (__rspack_external_node_fs_5ea92f0c.existsSync(candidate)) return candidate;
+        }
         return null;
     }
     buildAssetAliases(projectRoot) {
@@ -8672,11 +8758,16 @@ class ThrowIfRecompileIsNeeded {
         this.storeInitialHtmlAssets(htmlFields);
         compiler.hooks.make.tapAsync('html:throw-if-recompile-is-needed', (compilation, done)=>{
             const files = compiler.modifiedFiles || new Set();
-            const changedFile = Array.from(files)[0];
-            if (changedFile && this.initialHtmlAssets[changedFile]) {
-                const isRemoteUrl = (p)=>/^(https?:)?\/\//i.test(p);
-                const looksLikePublicRootUrl = (p)=>p.startsWith('/') && !__rspack_external_node_fs_5ea92f0c.existsSync(p);
-                const updatedAssets = __rspack_external_node_fs_5ea92f0c.existsSync(changedFile) ? getAssetsFromHtml(changedFile) : void 0;
+            const isRemoteUrl = (p)=>/^(https?:)?\/\//i.test(p);
+            const looksLikePublicRootUrl = (p)=>p.startsWith('/') && !__rspack_external_node_fs_5ea92f0c.existsSync(p);
+            for (const changedFile of files){
+                if (!this.initialHtmlAssets[changedFile]) continue;
+                let updatedAssets;
+                try {
+                    updatedAssets = getAssetsFromHtml(changedFile, __rspack_external_node_fs_5ea92f0c.readFileSync(changedFile, 'utf8'));
+                } catch  {
+                    updatedAssets = void 0;
+                }
                 const updatedJsEntries = (updatedAssets?.js || []).filter((p)=>!looksLikePublicRootUrl(p) && !isRemoteUrl(p));
                 const updatedCssEntries = (updatedAssets?.css || []).filter((p)=>!looksLikePublicRootUrl(p) && !isRemoteUrl(p));
                 const { js, css } = this.initialHtmlAssets[changedFile];
@@ -9591,11 +9682,11 @@ function serverRestartRequiredFromManifestError(fileAdded, fileRemoved) {
     lines.push("Restart the dev server to pick up changes to manifest entrypoints.");
     return lines.join('\n');
 }
-function legacyManifestPathWarning(legacyPath) {
+function legacyManifestPathWarning(field, legacyPath, modernPath) {
     const lines = [];
-    lines.push(`${messaging_prefix('warn')} The manifest uses a deprecated path.`);
+    lines.push(`${messaging_prefix('warn')} The ${pintor.blue(field)} field uses a deprecated scaffold path.`);
     lines.push(`${pintor.gray('PATH')} ${pintor.underline(legacyPath)}`);
-    lines.push("Extension.js rewrites it to the standardized folders in the next major.");
+    lines.push(`Point it at ${pintor.underline(modernPath)}, Extension.js already emits the page there.`);
     return lines.join('\n');
 }
 function fatalManifestShapeFixed(field, detail) {
@@ -9865,7 +9956,9 @@ function patchWebResourcesV2(manifest) {
         '/*.gif',
         '/*.webp',
         '/*.ico',
-        '/*.avif'
+        '/*.avif',
+        '/*.wasm',
+        '/*.bin'
     ];
     const resources = manifest.web_accessible_resources;
     if (!resources || 0 === resources.length) return defaultResources;
@@ -9892,7 +9985,9 @@ function patchWebResourcesV3(manifest) {
         '/*.gif',
         '/*.webp',
         '/*.ico',
-        '/*.avif'
+        '/*.avif',
+        '/*.wasm',
+        '/*.bin'
     ];
     return [
         ...manifest.web_accessible_resources || [],
@@ -10053,45 +10148,131 @@ class EmitManifest {
         });
     }
 }
+const LEGACY_MANIFEST_PATH_RULES = [
+    {
+        field: 'devtools_page',
+        legacyPath: 'devtools_page/devtools_page.html',
+        modernPath: 'devtools/index.html'
+    },
+    {
+        field: 'options_ui.page',
+        legacyPath: 'options_ui/page.html',
+        modernPath: 'options/index.html'
+    },
+    {
+        field: 'background.page',
+        legacyPath: 'background/page.html',
+        modernPath: 'background/index.html'
+    },
+    {
+        field: 'browser_action.default_popup',
+        legacyPath: 'browser_action/default_popup.html',
+        modernPath: 'action/index.html'
+    },
+    {
+        field: 'page_action.default_popup',
+        legacyPath: 'page_action/default_popup.html',
+        modernPath: 'action/index.html'
+    },
+    {
+        field: 'side_panel.default_path',
+        legacyPath: 'side_panel/default_path.html',
+        modernPath: 'sidebar/index.html'
+    },
+    {
+        field: 'sidebar_action.default_panel',
+        legacyPath: 'sidebar_action/default_panel.html',
+        modernPath: 'sidebar/index.html'
+    }
+];
+function normalizeLegacyPathRef(raw) {
+    return String(raw || '').replace(/\\/g, '/').replace(/^\.\//, '').replace(/^\//, '');
+}
+function readField(manifest, field) {
+    if (!manifest || 'object' != typeof manifest || Array.isArray(manifest)) return;
+    let current = manifest;
+    for (const part of field.split('.')){
+        if (!current || 'object' != typeof current || Array.isArray(current) || !(part in current)) return;
+        current = current[part];
+    }
+    return current;
+}
+function findLegacyManifestPathHits(manifest) {
+    const hits = [];
+    for (const rule of LEGACY_MANIFEST_PATH_RULES){
+        const value = readField(manifest, rule.field);
+        if ('string' == typeof value && value.trim()) {
+            if (normalizeLegacyPathRef(value) === rule.legacyPath) hits.push({
+                field: rule.field,
+                legacyPath: rule.legacyPath,
+                modernPath: rule.modernPath
+            });
+        }
+    }
+    return hits;
+}
 class ManifestLegacyWarnings {
     static name = 'manifest:legacy-warnings';
+    reportedHits = new Set();
     apply(compiler) {
-        if ('production' === (compiler.options.mode || 'development')) return;
-        const legacy = [
-            'devtools_page/devtools_page.html',
-            'options_ui/page.html',
-            'background/page.html',
-            'browser_action/default_popup.html',
-            'page_action/default_popup.html',
-            'side_panel/default_path.html',
-            'sidebar_action/default_panel.html'
-        ];
         compiler.hooks.thisCompilation.tap(ManifestLegacyWarnings.name, (compilation)=>{
             compilation.hooks.processAssets.tap({
                 name: ManifestLegacyWarnings.name,
                 stage: core_Compilation.PROCESS_ASSETS_STAGE_REPORT
             }, ()=>{
-                const asset = compilation.getAsset('manifest.json');
-                if (!asset) return;
-                const text = asset.source.source().toString();
-                let count = 0;
-                legacy.forEach((needle)=>{
-                    if (text.includes(needle)) {
-                        const message = legacyManifestPathWarning(needle);
-                        humanLine(message);
-                        const warn = new core_WebpackError(message);
-                        warn.name = 'ManifestLegacyWarning';
-                        warn.file = 'manifest.json';
-                        compilation.warnings.push(warn);
-                        count++;
+                const original = getOriginalManifestContent(compilation);
+                if (!original) return;
+                const manifest = parseJsonSafe(original);
+                const hits = findLegacyManifestPathHits(manifest);
+                if (0 === hits.length) return;
+                const isDev = 'development' === compiler.options.mode;
+                let printed = 0;
+                for (const hit of hits){
+                    const signature = `${hit.field}\0${hit.legacyPath}`;
+                    if (isDev) {
+                        if (this.reportedHits.has(signature)) continue;
+                        this.reportedHits.add(signature);
                     }
-                });
-                if (isDebug()) console.log(manifestLegacyWarningsSummary(count));
+                    const message = legacyManifestPathWarning(hit.field, hit.legacyPath, hit.modernPath);
+                    humanLine(message);
+                    const warn = new core_WebpackError(message);
+                    warn.name = 'ManifestLegacyWarning';
+                    warn.file = 'manifest.json';
+                    compilation.warnings.push(warn);
+                    printed++;
+                }
+                if (isDebug()) console.log(manifestLegacyWarningsSummary(printed));
             });
         });
     }
 }
+function toFileArray(value) {
+    if (!value) return [];
+    return Array.isArray(value) ? value : Array.from(value);
+}
 const EMITTED_ASSET_REF_PATTERN = /assets\/[A-Za-z0-9._-]+(?:\/[A-Za-z0-9._-]+)*/g;
+function isExcludedFromWar(fileName) {
+    const name = String(fileName || '');
+    if (!name || 'manifest.json' === name) return true;
+    if (name.endsWith('.js') || name.endsWith('.map')) return true;
+    if (/(^|\/)hot\//.test(name)) return true;
+    return false;
+}
+function listEmittedAssetNames(compilation) {
+    if ('function' == typeof compilation.getAssets) try {
+        return compilation.getAssets().map((asset)=>String(asset.name));
+    } catch  {}
+    return Object.keys(compilation.assets || {});
+}
+function collectReferencedRuntimePayloads(source, emittedAssetNames) {
+    if (!source) return [];
+    const found = new Set();
+    const patternHits = source.match(EMITTED_ASSET_REF_PATTERN) || [];
+    for (const hit of patternHits)if (!isExcludedFromWar(hit)) found.add(hit);
+    const eligible = emittedAssetNames.filter((name)=>!isExcludedFromWar(name)).sort((a, b)=>b.length - a.length);
+    for (const asset of eligible)if (source.includes(asset)) found.add(unixify(asset));
+    return Array.from(found);
+}
 function forEachStringKey(objectOrMap, callback) {
     if (!objectOrMap) return;
     if (objectOrMap instanceof Map) {
@@ -10134,10 +10315,9 @@ function collectContentScriptEntryImports(compilation, includeList) {
         }
         entry.chunks.forEach((chunk)=>{
             const currentChunk = chunk;
-            const chunkFilesArray = Array.isArray(currentChunk.files) ? currentChunk.files : [];
+            const chunkFilesArray = toFileArray(currentChunk.files);
             for(let i = 0; i < chunkFilesArray.length; i++)addFileIfRelevant(chunkFilesArray[i]);
-            let chunkAuxFilesArray = [];
-            if (Array.isArray(currentChunk.auxiliaryFiles)) chunkAuxFilesArray = currentChunk.auxiliaryFiles;
+            const chunkAuxFilesArray = toFileArray(currentChunk.auxiliaryFiles);
             for(let i = 0; i < chunkAuxFilesArray.length; i++)addFileIfRelevant(chunkAuxFilesArray[i]);
             const modulesArray = Array.from(chunkGraph.getChunkModulesIterable(chunk));
             for(let j = 0; j < modulesArray.length; j++){
@@ -10145,7 +10325,7 @@ function collectContentScriptEntryImports(compilation, includeList) {
                 const moduleChunksArray = Array.from(chunkGraph.getModuleChunks(moduleObj));
                 for(let k = 0; k < moduleChunksArray.length; k++){
                     const mk = moduleChunksArray[k];
-                    const mkAuxFilesArr = Array.isArray(mk.auxiliaryFiles) ? mk.auxiliaryFiles : [];
+                    const mkAuxFilesArr = toFileArray(mk.auxiliaryFiles);
                     for(let l = 0; l < mkAuxFilesArr.length; l++)addFileIfRelevant(mkAuxFilesArr[l]);
                 }
                 const moduleWithBuildInfo = moduleObj;
@@ -10157,20 +10337,21 @@ function collectContentScriptEntryImports(compilation, includeList) {
                     addFileIfRelevant(key);
                 });
             }
+            const emittedAssetNames = listEmittedAssetNames(compilation);
             for(let i = 0; i < chunkFilesArray.length; i++){
                 const chunkFileName = chunkFilesArray[i];
                 if (!String(chunkFileName).endsWith('.js')) continue;
                 const jsSource = getAssetSource(compilation, chunkFileName);
                 if (!jsSource) continue;
-                const matchedStrings = jsSource.match(EMITTED_ASSET_REF_PATTERN) || [];
-                for(let m = 0; m < matchedStrings.length; m++)addFileIfRelevant(matchedStrings[m]);
+                const referenced = collectReferencedRuntimePayloads(jsSource, emittedAssetNames);
+                for(let m = 0; m < referenced.length; m++)addFileIfRelevant(referenced[m]);
             }
         });
         const logicalJsAssetName = `${entryName}.js`;
         const logicalJsAssetSource = getAssetSource(compilation, logicalJsAssetName);
         if (logicalJsAssetSource) {
-            const matchedStrings = logicalJsAssetSource.match(EMITTED_ASSET_REF_PATTERN) || [];
-            for(let n = 0; n < matchedStrings.length; n++)addFileIfRelevant(matchedStrings[n]);
+            const referenced = collectReferencedRuntimePayloads(logicalJsAssetSource, listEmittedAssetNames(compilation));
+            for(let n = 0; n < referenced.length; n++)addFileIfRelevant(referenced[n]);
         }
         entryImports[entryName] = Array.from(collectedFilesSet);
     });
@@ -10489,6 +10670,10 @@ function generate_manifest_getAssetSource(compilation, filename) {
     const source = asset.source;
     if (!source) return '';
     if ('string' == typeof source) return source;
+    if ('function' == typeof source) {
+        const out = source();
+        return 'string' == typeof out ? out : '';
+    }
     if ('function' == typeof source.source) {
         const out = source.source();
         return 'string' == typeof out ? out : '';
@@ -10563,22 +10748,28 @@ function generateManifestPatches(compilation, manifestPath, entryImports, browse
             resources: Array.from(g.resources)
         })) : [];
     const webAccessibleResourcesV2 = 2 === canonicalManifest.manifest_version ? Array.from(resolved.v2) : [];
-    if (3 === canonicalManifest.manifest_version && Array.isArray(canonicalManifest.content_scripts)) for (const contentScript of canonicalManifest.content_scripts){
-        const matches = contentScript.matches || [];
-        const normalizedMatches = cleanMatches(matches);
-        const jsFiles = Array.isArray(contentScript.js) ? contentScript.js : [];
-        for (const jsFile of jsFiles){
-            const assetForCache = 'function' == typeof compilation.getAsset ? compilation.getAsset(jsFile) : void 0;
-            const cacheKey = assetForCache && 'object' == typeof assetForCache.source ? assetForCache.source : void 0;
-            let filtered = cacheKey ? assetScanCache.get(cacheKey) : void 0;
-            if (!filtered) {
-                const source = generate_manifest_getAssetSource(compilation, jsFile);
-                if (!source) continue;
-                const found = source.match(EMITTED_ASSET_REF_PATTERN) || [];
-                filtered = Array.from(new Set(found.filter((r)=>!r.endsWith('.js') && !r.endsWith('.map')))).sort();
-                if (cacheKey) assetScanCache.set(cacheKey, filtered);
+    if (Array.isArray(canonicalManifest.content_scripts)) {
+        const emittedAssetNames = listEmittedAssetNames(compilation);
+        for (const contentScript of canonicalManifest.content_scripts){
+            const matches = contentScript.matches || [];
+            const jsFiles = Array.isArray(contentScript.js) ? contentScript.js : [];
+            const referenced = [];
+            for (const jsFile of jsFiles){
+                const assetForCache = 'function' == typeof compilation.getAsset ? compilation.getAsset(jsFile) : void 0;
+                const cacheKey = assetForCache && 'object' == typeof assetForCache.source ? assetForCache.source : void 0;
+                let filtered = cacheKey ? assetScanCache.get(cacheKey) : void 0;
+                if (!filtered) {
+                    const source = generate_manifest_getAssetSource(compilation, jsFile);
+                    if (!source) continue;
+                    filtered = collectReferencedRuntimePayloads(source, emittedAssetNames);
+                    if (cacheKey) assetScanCache.set(cacheKey, filtered);
+                }
+                for (const resource of filtered)referenced.push(resource);
+            }
+            if (0 !== referenced.length) {
+                if (3 === canonicalManifest.manifest_version) mergeIntoV3Group(webAccessibleResourcesV3, cleanMatches(matches), referenced);
+                else for (const resource of referenced)if (!webAccessibleResourcesV2.includes(resource)) webAccessibleResourcesV2.push(resource);
             }
-            if (0 !== filtered.length) mergeIntoV3Group(webAccessibleResourcesV3, normalizedMatches, filtered);
         }
     }
     for (const [entryName, resources] of Object.entries(entryImports)){
@@ -11953,6 +12144,7 @@ function patchGeckoBackground(manifest, browser) {
 class UpdateManifest {
     manifestPath;
     browser;
+    reportedFatalFixes = new Set();
     constructor(options){
         this.manifestPath = options.manifestPath;
         this.browser = options.browser || 'chrome';
@@ -12001,7 +12193,13 @@ class UpdateManifest {
                 } catch  {}
                 const sanitized = sanitizeFatalManifestShapes(patchedManifest, __rspack_external_node_path_c5b9b54f.dirname(this.manifestPath));
                 patchedManifest = sanitized.manifest;
+                const isDev = 'development' === compiler.options.mode;
                 for (const fix of sanitized.fixes){
+                    if (isDev) {
+                        const signature = `${fix.field}\0${fix.detail}`;
+                        if (this.reportedFatalFixes.has(signature)) continue;
+                        this.reportedFatalFixes.add(signature);
+                    }
                     const message = fatalManifestShapeFixed(fix.field, fix.detail);
                     humanLine(message);
                     const warn = new core_WebpackError(message);
@@ -12547,6 +12745,102 @@ class WebResourcesPlugin {
         }).apply(compiler);
     }
 }
+const PANELS_CREATE_PATTERN = /panels\s*\.\s*create\s*\(\s*(['"`])(?:(?!\1).)*\1\s*,\s*(['"`])(?:(?!\2).)*\2\s*,\s*(['"`])((?:(?!\3).)*)\3/g;
+const SCRIPT_SRC_PATTERN = /<script[^>]*\ssrc\s*=\s*["']([^"']+)["']/gi;
+const RELATIVE_IMPORT_PATTERN = /(?:import\s[^'"]*|import\s*\(\s*|require\s*\(\s*|from\s*)['"](\.{1,2}\/[^'"]+)['"]/g;
+const discover_devtools_panels_SOURCE_SIBLING_EXTENSIONS = [
+    '.ts',
+    '.mts',
+    '.tsx',
+    '.jsx',
+    '.mjs'
+];
+const MAX_IMPORT_DEPTH = 3;
+function readIfFile(absPath) {
+    try {
+        if (__rspack_external_node_fs_5ea92f0c.statSync(absPath).isFile()) return __rspack_external_node_fs_5ea92f0c.readFileSync(absPath, 'utf-8');
+    } catch  {}
+}
+function readScriptSource(absPath) {
+    const direct = readIfFile(absPath);
+    if (void 0 !== direct) return direct;
+    const parsed = __rspack_external_node_path_c5b9b54f.parse(absPath);
+    for (const ext of discover_devtools_panels_SOURCE_SIBLING_EXTENSIONS){
+        const sibling = readIfFile(__rspack_external_node_path_c5b9b54f.join(parsed.dir, parsed.name + ext));
+        if (void 0 !== sibling) return sibling;
+    }
+}
+function collectPanelLiterals(source) {
+    const literals = [];
+    for (const match of source.matchAll(PANELS_CREATE_PATTERN)){
+        const literal = String(match[4] || '').trim();
+        if (literal) literals.push(literal);
+    }
+    return literals;
+}
+function collectRelativeImports(source) {
+    const specifiers = [];
+    for (const match of source.matchAll(RELATIVE_IMPORT_PATTERN))specifiers.push(match[1]);
+    return specifiers;
+}
+function scanScriptGraph(entryAbsPath, found) {
+    const queue = [
+        {
+            file: entryAbsPath,
+            depth: 0
+        }
+    ];
+    const seen = new Set();
+    while(queue.length){
+        const { file, depth } = queue.shift();
+        if (seen.has(file)) continue;
+        seen.add(file);
+        const source = readScriptSource(file);
+        if (void 0 === source) continue;
+        found.push(...collectPanelLiterals(source));
+        if (depth >= MAX_IMPORT_DEPTH) continue;
+        for (const specifier of collectRelativeImports(source)){
+            const resolved = __rspack_external_node_path_c5b9b54f.resolve(__rspack_external_node_path_c5b9b54f.dirname(file), specifier);
+            const withExt = __rspack_external_node_path_c5b9b54f.extname(resolved) ? resolved : `${resolved}.js`;
+            queue.push({
+                file: withExt,
+                depth: depth + 1
+            });
+        }
+    }
+}
+function discoverDevtoolsPanelPages(manifestPath) {
+    const projectDir = __rspack_external_node_path_c5b9b54f.dirname(manifestPath);
+    let devtoolsPage = '';
+    try {
+        const manifest = JSON.parse(__rspack_external_node_fs_5ea92f0c.readFileSync(manifestPath, 'utf-8'));
+        if ('string' == typeof manifest?.devtools_page) devtoolsPage = manifest.devtools_page;
+    } catch  {}
+    if (!devtoolsPage) return {};
+    const devtoolsHtmlPath = __rspack_external_node_path_c5b9b54f.join(projectDir, devtoolsPage.replace(/^\/+/, ''));
+    const devtoolsHtml = readIfFile(devtoolsHtmlPath);
+    if (void 0 === devtoolsHtml) return {};
+    const literals = [];
+    literals.push(...collectPanelLiterals(devtoolsHtml));
+    for (const match of devtoolsHtml.matchAll(SCRIPT_SRC_PATTERN)){
+        const src = String(match[1] || '');
+        if (/^(https?:)?\/\//i.test(src)) continue;
+        const scriptAbs = src.startsWith('/') ? __rspack_external_node_path_c5b9b54f.join(projectDir, src.slice(1)) : __rspack_external_node_path_c5b9b54f.resolve(__rspack_external_node_path_c5b9b54f.dirname(devtoolsHtmlPath), src);
+        scanScriptGraph(scriptAbs, literals);
+    }
+    const pages = {};
+    for (const literal of literals){
+        const rootRel = literal.replace(/^\.?\/+/, '');
+        if (!rootRel || !/\.html?$/i.test(rootRel)) continue;
+        const absPage = __rspack_external_node_path_c5b9b54f.join(projectDir, rootRel);
+        const relToProject = __rspack_external_node_path_c5b9b54f.relative(projectDir, absPage);
+        if (!relToProject || relToProject.startsWith('..')) continue;
+        if (!__rspack_external_node_fs_5ea92f0c.existsSync(absPage)) continue;
+        const key = rootRel.replace(/\.html?$/i, '').replace(/\\/g, '/');
+        pages[key] = absPage;
+    }
+    return pages;
+}
 function isCriticalJsonFeatureKey(key) {
     return key.startsWith('declarative_net_request') || 'storage.managed_schema' === key;
 }
@@ -12730,6 +13024,7 @@ class plugin_web_extension_WebExtensionPlugin {
             browser: this.browser,
             includeList: {
                 ...manifestFieldsData.html,
+                ...discoverDevtoolsPanelPages(manifestPath),
                 ...specialFoldersData.pages
             }
         }).apply(compiler);