extension-develop 3.18.4 → 3.18.5-canary.local-34c11c8f

package/dist/0~rspack-config.mjs

@@ -375,7 +375,9 @@ function getFilename(feature, filePath) {
         '.js',
         '.jsx',
         '.tsx',
-        '.ts'
+        '.ts',
+        '.vue',
+        '.svelte'
     ].includes(entryExt)) fileOutputpath = fileOutputpath.replace(entryExt, '.js');
     if ([
         '.html',
@@ -399,10 +401,7 @@ function background_background(manifest) {
             ...manifest.background,
             ...manifest.background.scripts && {
                 scripts: [
-                    ...manifest.background.scripts.map((script)=>(()=>{
-                            const raw = String(script);
-                            return getFilename("background/scripts.js", raw);
-                        })())
+                    ...new Set(manifest.background.scripts.map((script)=>getFilename("background/scripts.js", String(script))))
                 ]
             }
         }
@@ -426,12 +425,12 @@ function browserAction(manifest) {
             ...manifest.browser_action.default_icon && {
                 default_icon: 'string' == typeof manifest.browser_action.default_icon ? (()=>{
                     const raw = String(manifest.browser_action.default_icon);
-                    const isPublic = /^(?:\/.+|(?:\.\/)?public\/)/i.test(raw);
+                    const isPublic = /^(?:\/public\/|(?:\.\/)?public\/)/i.test(raw);
                     const target = isPublic ? normalizeManifestOutputPath(raw) : `icons/${__rspack_external_path.basename(raw)}`;
                     return getFilename(target, raw);
                 })() : Object.fromEntries(Object.entries(manifest.browser_action.default_icon).map(([size, icon])=>{
                     const raw = String(icon);
-                    const isPublic = /^(?:\/.+|(?:\.\/)?public\/)/i.test(raw);
+                    const isPublic = /^(?:\/public\/|(?:\.\/)?public\/)/i.test(raw);
                     const target = isPublic ? normalizeManifestOutputPath(raw) : `icons/${__rspack_external_path.basename(raw)}`;
                     return [
                         size,
@@ -445,7 +444,7 @@ function browserAction(manifest) {
                         ...themeIcon.light && {
                             light: (()=>{
                                 const raw = String(themeIcon.light);
-                                const isPublic = /^(?:\/.+|(?:\.\/)?public\/)/i.test(raw);
+                                const isPublic = /^(?:\/public\/|(?:\.\/)?public\/)/i.test(raw);
                                 const target = isPublic ? normalizeManifestOutputPath(raw) : `browser_action/${__rspack_external_path.basename(raw)}`;
                                 return getFilename(target, raw);
                             })()
@@ -453,7 +452,7 @@ function browserAction(manifest) {
                         ...themeIcon.dark && {
                             dark: (()=>{
                                 const raw = String(themeIcon.dark);
-                                const isPublic = /^(?:\/.+|(?:\.\/)?public\/)/i.test(raw);
+                                const isPublic = /^(?:\/public\/|(?:\.\/)?public\/)/i.test(raw);
                                 const target = isPublic ? normalizeManifestOutputPath(raw) : `browser_action/${__rspack_external_path.basename(raw)}`;
                                 return getFilename(target, raw);
                             })()
@@ -497,12 +496,12 @@ function pageAction(manifest) {
             ...manifest.page_action.default_icon && {
                 default_icon: 'string' == typeof manifest.page_action.default_icon ? (()=>{
                     const raw = String(manifest.page_action.default_icon);
-                    const isPublic = /^(?:\/.+|(?:\.\/)?public\/)/i.test(raw);
+                    const isPublic = /^(?:\/public\/|(?:\.\/)?public\/)/i.test(raw);
                     const target = isPublic ? normalizeManifestOutputPath(raw) : `icons/${__rspack_external_path.basename(raw)}`;
                     return getFilename(target, raw);
                 })() : Object.fromEntries(Object.entries(manifest.page_action.default_icon).map(([size, icon])=>{
                     const raw = String(icon);
-                    const isPublic = /^(?:\/.+|(?:\.\/)?public\/)/i.test(raw);
+                    const isPublic = /^(?:\/public\/|(?:\.\/)?public\/)/i.test(raw);
                     const target = isPublic ? normalizeManifestOutputPath(raw) : `icons/${__rspack_external_path.basename(raw)}`;
                     return [
                         size,
@@ -523,12 +522,12 @@ function sidebarAction(manifest) {
             ...manifest.sidebar_action.default_icon && {
                 default_icon: 'string' == typeof manifest.sidebar_action.default_icon ? (()=>{
                     const raw = String(manifest.sidebar_action.default_icon);
-                    const isPublic = /^(?:\/.+|(?:\.\/)?public\/)/i.test(raw);
+                    const isPublic = /^(?:\/public\/|(?:\.\/)?public\/)/i.test(raw);
                     const target = isPublic ? normalizeManifestOutputPath(raw) : `icons/${__rspack_external_path.basename(raw)}`;
                     return getFilename(target, raw);
                 })() : Object.fromEntries(Object.entries(manifest.sidebar_action.default_icon).map(([size, icon])=>{
                     const raw = String(icon);
-                    const isPublic = /^(?:\/.+|(?:\.\/)?public\/)/i.test(raw);
+                    const isPublic = /^(?:\/public\/|(?:\.\/)?public\/)/i.test(raw);
                     const target = isPublic ? normalizeManifestOutputPath(raw) : `icons/${__rspack_external_path.basename(raw)}`;
                     return [
                         size,
@@ -545,7 +544,7 @@ function themeExperiment(manifest) {
     return te && {
         theme_experiment: {
             ...te,
-            ...te.stylesheet && {
+            ...'string' == typeof te.stylesheet && {
                 stylesheet: getFilename(`theme_experiment/${getBasename(te.stylesheet)}`, te.stylesheet)
             },
             ...Array.isArray(te.stylesheets) && {
@@ -574,12 +573,12 @@ function action_action(manifest) {
             ...manifest.action.default_icon && {
                 default_icon: 'string' == typeof manifest.action.default_icon ? (()=>{
                     const raw = String(manifest.action.default_icon);
-                    const isPublic = /^(?:\/.+|(?:\.\/)?public\/)/i.test(raw);
+                    const isPublic = /^(?:\/public\/|(?:\.\/)?public\/)/i.test(raw);
                     const target = isPublic ? normalizeManifestOutputPath(raw) : `icons/${__rspack_external_path.basename(raw)}`;
                     return getFilename(target, raw);
                 })() : Object.fromEntries(Object.entries(manifest.action.default_icon).map(([size, icon])=>{
                     const raw = String(icon);
-                    const isPublic = /^(?:\/.+|(?:\.\/)?public\/)/i.test(raw);
+                    const isPublic = /^(?:\/public\/|(?:\.\/)?public\/)/i.test(raw);
                     const target = isPublic ? normalizeManifestOutputPath(raw) : `icons/${__rspack_external_path.basename(raw)}`;
                     return [
                         size,
@@ -753,7 +752,7 @@ function icons_icons(manifest) {
     return manifest.icons && {
         icons: Object.fromEntries(Object.entries(manifest.icons).map(([size, icon])=>{
             const raw = String(icon);
-            const isPublic = /^(?:\/.+|(?:\.\/)?public\/)/i.test(raw);
+            const isPublic = /^(?:\/public\/|(?:\.\/)?public\/)/i.test(raw);
             const target = isPublic ? normalizeManifestOutputPath(raw) : `icons/${__rspack_external_path.basename(raw)}`;
             return [
                 size,
@@ -817,6 +816,7 @@ function storage(manifest) {
     };
 }
 const theme_getBasename = (filepath)=>__rspack_external_path.basename(filepath);
+const rewriteThemeImage = (value)=>getFilename(`theme/images/${theme_getBasename(value)}`, value);
 function theme(manifest) {
     return manifest.theme && {
         theme: {
@@ -824,7 +824,7 @@ function theme(manifest) {
             ...manifest.theme.images && {
                 images: Object.fromEntries(Object.entries(manifest.theme.images).map(([key, value])=>[
                         key,
-                        getFilename(`theme/images/${theme_getBasename(value)}`, value)
+                        Array.isArray(value) ? value.map(rewriteThemeImage) : rewriteThemeImage(value)
                     ]))
             }
         }
@@ -851,16 +851,18 @@ function normalizeOutputPath(originalPath) {
 }
 function webAccessibleResources(manifest) {
     if (!manifest.web_accessible_resources || !manifest.web_accessible_resources.length) return;
-    if (Array.isArray(manifest.web_accessible_resources) && 'string' == typeof manifest.web_accessible_resources[0]) return {
-        web_accessible_resources: manifest.web_accessible_resources.map((resource)=>getFilename(normalizeOutputPath(resource), resource))
-    };
-    const v3 = manifest.web_accessible_resources.filter((entry)=>Array.isArray(entry.resources)).map((entry)=>({
+    const mapResource = (resource)=>getFilename(normalizeOutputPath(resource), resource);
+    const entries = manifest.web_accessible_resources.map((entry)=>{
+        if ('string' == typeof entry) return mapResource(entry);
+        if (!entry || !Array.isArray(entry.resources)) return;
+        return {
             ...entry,
-            resources: (entry.resources || []).map((res)=>getFilename(normalizeOutputPath(res), res))
-        }));
-    if (0 === v3.length) return;
+            resources: entry.resources.map(mapResource)
+        };
+    }).filter((entry)=>void 0 !== entry);
+    if (0 === entries.length) return;
     return {
-        web_accessible_resources: v3
+        web_accessible_resources: entries
     };
 }
 function contentSecurityPolicy(manifest) {
@@ -869,12 +871,13 @@ function contentSecurityPolicy(manifest) {
     };
 }
 const omnibox_getBasename = (filepath)=>__rspack_external_path.basename(filepath);
-function omnibox(manifest) {
-    return manifest.omnibox && {
+function omnibox_omnibox(manifest) {
+    const omnibox = manifest.omnibox;
+    return omnibox && {
         omnibox: {
-            ...manifest.omnibox,
-            ...manifest.omnibox.default_icon && {
-                default_icon: 'string' == typeof manifest.omnibox.default_icon ? getFilename(`icons/${omnibox_getBasename(manifest.omnibox.default_icon)}`, manifest.omnibox.default_icon) : Object.fromEntries(Object.entries(manifest.omnibox.default_icon).map(([size, icon])=>[
+            ...omnibox,
+            ...omnibox.default_icon && {
+                default_icon: 'string' == typeof omnibox.default_icon ? getFilename(`icons/${omnibox_getBasename(omnibox.default_icon)}`, omnibox.default_icon) : Object.fromEntries(Object.entries(omnibox.default_icon).map(([size, icon])=>[
                         size,
                         getFilename(`icons/${omnibox_getBasename(icon)}`, icon)
                     ]))
@@ -899,7 +902,7 @@ function manifestCommon(manifest, manifestPath) {
         ...userScripts(manifest),
         ...webAccessibleResources(manifest),
         ...contentSecurityPolicy(manifest),
-        ...omnibox(manifest)
+        ...omnibox_omnibox(manifest)
     };
 }
 function getManifestOverrides(manifestPath, manifest) {
@@ -909,14 +912,18 @@ function getManifestOverrides(manifestPath, manifest) {
         const { [key]: _ignored, ...rest } = obj;
         return rest;
     };
+    const pickBackground = (obj)=>{
+        const value = obj.background;
+        return value && 'object' == typeof value ? value : {};
+    };
     const common = manifestCommon(manifestContent, manifestPath);
     const mv2 = manifestV2(manifestContent);
     const mv3 = manifestV3(manifestContent);
     const backgroundMerged = {
         ...manifestContent.background || {},
-        ...common.background || {},
-        ...mv2.background || {},
-        ...mv3.background || {}
+        ...pickBackground(common),
+        ...pickBackground(mv2),
+        ...pickBackground(mv3)
     };
     const merged = {
         ...manifestContent,
@@ -2910,6 +2917,7 @@ class JsFrameworksPlugin {
                 issuerLayer: {
                     not: EXTENSIONJS_CONTENT_SCRIPT_LAYER
                 },
+                type: "javascript/esm",
                 exclude: [
                     ...swcRuleBase.exclude,
                     (resourcePath)=>isfeatureScriptsContentLike(resourcePath)
@@ -3134,10 +3142,12 @@ class UpdateManifest {
         this.manifestPath = options.manifestPath;
         this.browser = options.browser || 'chrome';
     }
-    applyDevOverrides(overrides) {
-        if (!overrides.content_scripts) return {};
-        return overrides.content_scripts.map((contentObj, index)=>{
-            if (contentObj.css.length && !contentObj.js.length) contentObj.js = [
+    applyDevOverrides(manifest) {
+        if (!manifest.content_scripts) return [];
+        return manifest.content_scripts.map((contentObj, index)=>{
+            const css = contentObj.css ?? [];
+            const js = contentObj.js ?? [];
+            if (css.length && !js.length) contentObj.js = [
                 getFilename(`content_scripts-${index}`, 'dev.js')
             ];
             return contentObj;
@@ -3165,7 +3175,7 @@ class UpdateManifest {
                     if ('development' === compiler.options.mode && Array.isArray(patchedManifest.content_scripts)) for (const cs of patchedManifest.content_scripts)try {
                         const hasCss = Array.isArray(cs.css) && cs.css.length > 0;
                         const hasJs = Array.isArray(cs.js) && cs.js.length > 0;
-                        if (hasCss && hasJs && 1 === cs.js.length) devCssStubsAdded++;
+                        if (hasCss && hasJs && cs.js?.length === 1) devCssStubsAdded++;
                     } catch  {}
                     console.log(manifestOverridesSummary(overrideKeys, devCssStubsAdded));
                 } catch  {}
@@ -3189,6 +3199,18 @@ function getSharedFor(compilation) {
     }
     return shared;
 }
+function cleanMatches(matches) {
+    return matches.map((match)=>{
+        try {
+            const url = new URL(match.replace(/^\*:\/\//, 'https://'));
+            if (match.endsWith(url.pathname)) return `${match.substring(0, match.length - url.pathname.length)}/*`;
+            if ('/' === url.pathname) return `${match}/*`;
+            return match;
+        } catch  {
+            return match;
+        }
+    });
+}
 function warFieldError(filePath, opts) {
     const displayPath = opts?.overrideNotFoundPath || filePath;
     const lines = [];
@@ -3199,6 +3221,10 @@ function warFieldError(filePath, opts) {
         lines.push(`To reference files in ${pintor.yellow('public/')}, use a leading '/' (e.g. ${pintor.yellow('/open-panel.gif')}). These resolve from the built extension root.`);
         lines.push('');
         lines.push(`Fix: Add the file to ${pintor.yellow('public/')} or update the path to the correct '/...' location.`);
+    } else if (opts?.sourceSibling) {
+        lines.push(`Found ${pintor.yellow(opts.sourceSibling)}, but web_accessible_resources entries are copied as-is, not compiled.`);
+        lines.push('');
+        lines.push(`Fix: Import the file from a script so it gets bundled, or move a prebuilt copy to ${pintor.yellow('public/')} and reference it with a leading '/'.`);
     } else {
         lines.push("Relative paths must point to a real source file so the build can emit it.");
         lines.push('');
@@ -3209,6 +3235,16 @@ function warFieldError(filePath, opts) {
     lines.push(`${pintor.red('NOT FOUND')} ${pintor.underline(displayPath)}`);
     return lines.join('\n');
 }
+function warStringEntryInMv3(entry) {
+    const lines = [];
+    lines.push(`Check the ${pintor.yellow('web_accessible_resources')} field in your ${pintor.yellow('manifest.json')} file.`);
+    lines.push(`Manifest V3 requires object entries with ${pintor.yellow('resources')} and ${pintor.yellow('matches')} (or ${pintor.yellow('extension_ids')}). Plain string entries are the Manifest V2 format and Chrome rejects them at load time.`);
+    lines.push('');
+    lines.push(`Fix: Wrap it like ${pintor.yellow(`{"resources": ["${entry}"], "matches": ["<all_urls>"]}`)} with the matches your pages need.`);
+    lines.push('');
+    lines.push(`${pintor.red('INVALID MV3 ENTRY')} ${pintor.underline(entry)}`);
+    return lines.join('\n');
+}
 function warInvalidMatchPattern(pattern) {
     const lines = [];
     lines.push(`Check the ${pintor.yellow('web_accessible_resources')} field in your ${pintor.yellow('manifest.json')} file.`);
@@ -3249,6 +3285,33 @@ function emitFileAsAsset(compilation, absPath) {
     compilation.fileDependencies.add(absPath);
     return unixify(outName);
 }
+function findSourceSibling(absOutputPath) {
+    const candidatesByExt = {
+        '.js': [
+            '.ts',
+            '.tsx',
+            '.jsx',
+            '.vue',
+            '.svelte'
+        ],
+        '.css': [
+            '.scss',
+            '.sass',
+            '.less'
+        ],
+        '.html': [
+            '.njk',
+            '.nunjucks'
+        ]
+    };
+    const ext = __rspack_external_path.extname(absOutputPath);
+    const sourceExts = candidatesByExt[ext];
+    if (!sourceExts) return;
+    for (const sourceExt of sourceExts){
+        const candidate = absOutputPath.slice(0, -ext.length) + sourceExt;
+        if (__rspack_external_fs.existsSync(candidate)) return candidate;
+    }
+}
 function isFirefox(browser) {
     return !!browser && browser.toLowerCase().includes('firefox');
 }
@@ -3284,30 +3347,33 @@ function resolveUserDeclaredWAR(compilation, manifestPath, manifest, browser) {
         v2,
         v3
     };
-    const isV2 = Array.isArray(war) && 'string' == typeof war[0];
+    const isMv2 = 3 !== manifestObj.manifest_version;
     const manifestDir = __rspack_external_path.dirname(manifestPath);
     const projectPath = compilation.options?.context || manifestDir;
-    const pushResource = (matches, resource)=>{
-        if (2 === manifestObj.manifest_version || isV2) return void v2.add(resource);
+    const pushResource = (matches, resource, extra)=>{
+        if (isMv2) return void v2.add(resource);
         const key = (matches || []).join(',');
         let group = v3.find((g)=>g.matches.join(',') === key);
-        if (!group) {
+        if (group) {
+            if (extra && !group.extra) group.extra = extra;
+        } else {
             group = {
                 matches: matches || [],
-                resources: new Set()
+                resources: new Set(),
+                extra
             };
             v3.push(group);
         }
         group.resources.add(resource);
     };
-    const handleOne = (matches, res)=>{
+    const handleOne = (matches, res, extra)=>{
         compilation.errors = compilation.errors || [];
         compilation.warnings = compilation.warnings || [];
         const normalizedOutput = normalizeManifestOutputPath(res);
         const publicCandidate = __rspack_external_path.join(projectPath, 'public', normalizedOutput);
-        if (__rspack_external_fs.existsSync(publicCandidate)) return void pushResource(matches, normalizedOutput);
+        if (__rspack_external_fs.existsSync(publicCandidate)) return void pushResource(matches, normalizedOutput, extra);
         __rspack_external_path.isAbsolute(res) || __rspack_external_path.join(manifestDir, isPublicRootLike(res) ? toPublicOutput(res) : res);
-        if (/[*?\[\]{}]/.test(res)) return void pushResource(matches, res);
+        if (/[*?\[\]{}]/.test(res)) return void pushResource(matches, res, extra);
         if (isPublicRootLike(res)) {
             const output = normalizeManifestOutputPath(res);
             const publicAbs = __rspack_external_path.join(projectPath, 'public', output);
@@ -3338,7 +3404,7 @@ function resolveUserDeclaredWAR(compilation, manifestPath, manifest, browser) {
                 err.file = 'manifest.json';
                 compilation.warnings.push(err);
             }
-            pushResource(matches, output);
+            pushResource(matches, output, extra);
             return;
         }
         const abs = __rspack_external_path.isAbsolute(res) ? res : __rspack_external_path.join(manifestDir, res);
@@ -3350,46 +3416,47 @@ function resolveUserDeclaredWAR(compilation, manifestPath, manifest, browser) {
             const assetEmitted = Boolean(asset2 && asset2.name === res) || __rspack_external_fs.existsSync(builtAbs);
             if (__rspack_external_fs.existsSync(publicAbsMaybe) || assetEmitted) {
                 const output = toPublicOutput('/' + res);
-                pushResource(matches, output);
+                pushResource(matches, output, extra);
                 return;
             }
+            const sourceSibling = findSourceSibling(abs);
             const msg = warFieldError(abs, {
-                relativeRef: res
+                relativeRef: res,
+                sourceSibling: sourceSibling ? __rspack_external_path.relative(manifestDir, sourceSibling) : void 0
             });
             const warn = new core_WebpackError(msg);
             warn.file = 'manifest.json';
             warn.name = 'WARRelativeAssetMissing';
             compilation.warnings.push(warn);
-            pushResource(matches, res);
             return;
         }
         const emitted = emitFileAsAsset(compilation, abs);
-        pushResource(matches, emitted);
+        pushResource(matches, emitted, extra);
     };
-    if (isV2) war.forEach((res)=>handleOne(void 0, res));
-    else war.forEach((group)=>{
-        const matches = group.matches || [];
+    war.forEach((entry)=>{
+        if ('string' == typeof entry) {
+            if (isMv2) return void handleOne(void 0, entry);
+            const msg = warStringEntryInMv3(entry);
+            const err = new core_WebpackError(msg);
+            err.file = 'manifest.json';
+            err.name = 'WARStringEntryInMv3';
+            compilation.errors = compilation.errors || [];
+            compilation.errors.push(err);
+            return;
+        }
+        if (!entry || 'object' != typeof entry) return;
+        const matches = entry.matches || [];
         validateMatchesOrReport(compilation, matches, browser);
-        if (!Array.isArray(group.resources)) return;
-        group.resources.forEach((res)=>handleOne(matches, res));
+        if (!Array.isArray(entry.resources)) return;
+        const { resources: _resources, matches: _matches, ...extra } = entry;
+        const extraFields = Object.keys(extra).length > 0 ? extra : void 0;
+        entry.resources.forEach((res)=>handleOne(matches, res, extraFields));
     });
     return {
         v2,
         v3
     };
 }
-function cleanMatches(matches) {
-    return matches.map((match)=>{
-        try {
-            const url = new URL(match.replace(/^\*:\/\//, 'https://'));
-            if (match.endsWith(url.pathname)) return `${match.substring(0, match.length - url.pathname.length)}/*`;
-            if ('/' === url.pathname) return `${match}/*`;
-            return match;
-        } catch  {
-            return match;
-        }
-    });
-}
 function getAssetSource(compilation, filename) {
     const byGet = 'function' == typeof compilation.getAsset ? compilation.getAsset(filename) : void 0;
     const byAssets = !byGet && compilation.assets ? compilation.assets[filename] : void 0;
@@ -3454,6 +3521,7 @@ function mergeIntoV3Group(groups, normalizedMatches, resources, options) {
         ].sort()
     });
 }
+const assetScanCache = new WeakMap();
 function isCanonicalContentScriptCss(resource) {
     return /^content_scripts\/content-\d+\.css$/.test(resource);
 }
@@ -3466,6 +3534,7 @@ function generateManifestPatches(compilation, manifestPath, entryImports, browse
     const canonicalManifest = getManifestContent(compilation, manifestPath);
     const resolved = resolveUserDeclaredWAR(compilation, manifestPath, canonicalManifest, browser);
     const webAccessibleResourcesV3 = 3 === canonicalManifest.manifest_version ? resolved.v3.map((g)=>({
+            ...g.extra || {},
             matches: g.matches,
             resources: Array.from(g.resources)
         })) : [];
@@ -3475,11 +3544,17 @@ function generateManifestPatches(compilation, manifestPath, entryImports, browse
         const normalizedMatches = cleanMatches(matches);
         const jsFiles = Array.isArray(contentScript.js) ? contentScript.js : [];
         for (const jsFile of jsFiles){
-            const source = getAssetSource(compilation, jsFile);
-            if (!source) continue;
-            const re = /assets\/[A-Za-z0-9._-]+/g;
-            const found = source.match(re) || [];
-            const filtered = Array.from(new Set(found.filter((r)=>!r.endsWith('.js') && !r.endsWith('.map')))).sort();
+            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 = getAssetSource(compilation, jsFile);
+                if (!source) continue;
+                const re = /assets\/[A-Za-z0-9._-]+/g;
+                const found = source.match(re) || [];
+                filtered = Array.from(new Set(found.filter((r)=>!r.endsWith('.js') && !r.endsWith('.map')))).sort();
+                if (cacheKey) assetScanCache.set(cacheKey, filtered);
+            }
             if (0 !== filtered.length) mergeIntoV3Group(webAccessibleResourcesV3, normalizedMatches, filtered);
         }
     }
@@ -3533,7 +3608,8 @@ function generateManifestPatches(compilation, manifestPath, entryImports, browse
     const emittedCssUnderContentScripts = assetKeys.filter((k)=>k.startsWith("content_scripts/")).filter((k)=>k.endsWith('.css'));
     const onDiskCssUnderContentScripts = [];
     const outputPath = compilation.options.output?.path;
-    if (outputPath) try {
+    const isDevModeBuild = 'production' !== (compilation.options?.mode || 'development');
+    if (outputPath && isDevModeBuild) try {
         const csDir = __rspack_external_path.join(outputPath, "content_scripts");
         if (__rspack_external_fs.existsSync(csDir)) {
             for (const name of __rspack_external_fs.readdirSync(csDir))if (name.endsWith('.css')) onDiskCssUnderContentScripts.push(`content_scripts/${name}`);
@@ -3562,6 +3638,7 @@ function generateManifestPatches(compilation, manifestPath, entryImports, browse
     }
     if (3 === canonicalManifest.manifest_version) {
         if (webAccessibleResourcesV3.length > 0) canonicalManifest.web_accessible_resources = webAccessibleResourcesV3.map((entry)=>({
+                ...entry,
                 resources: Array.from(new Set(entry.resources)).sort(),
                 matches: Array.from(new Set(entry.matches)).sort()
             })).sort((a, b)=>a.matches.join(',').localeCompare(b.matches.join(',')));
@@ -5242,6 +5319,7 @@ function getScriptEntries(scriptPath) {
     ] : [];
     const fileAssets = scriptEntries.filter((scriptAsset)=>{
         const validFile = __rspack_external_fs.existsSync(scriptAsset);
+        if (/\.d\.[cm]?ts$/i.test(scriptAsset)) return false;
         const assetExtension = __rspack_external_path.extname(scriptAsset);
         return validFile && ('.js' === assetExtension || '.cjs' === assetExtension || '.mjs' === assetExtension || '.jsx' === assetExtension || '.mjsx' === assetExtension || '.ts' === assetExtension || '.mts' === assetExtension || '.mtsx' === assetExtension || '.tsx' === assetExtension);
     });
@@ -5319,6 +5397,9 @@ class AddContentScriptWrapper {
     resolveLoader() {
         return resolveDevelopDistFile("feature-scripts-content-script-wrapper");
     }
+    resolveConcatLoader() {
+        return resolveDevelopDistFile("feature-scripts-classic-concat-loader");
+    }
     apply(compiler) {
         const manifestDir = __rspack_external_path.dirname(this.manifestPath);
         const packageJsonPath = findNearestPackageJsonSync(this.manifestPath);
@@ -5329,6 +5410,26 @@ class AddContentScriptWrapper {
             manifestDir,
             packageJsonDir
         ];
+        compiler.options.module.rules.push({
+            test: /\.(js|cjs|mjs|jsx|mjsx|ts|mts|tsx|mtsx)$/,
+            resourceQuery: /__extensionjs_classic_concat__/,
+            include: includeDirs,
+            exclude: [
+                /([\\/])node_modules\1/
+            ],
+            use: [
+                {
+                    loader: this.resolveLoader(),
+                    options: {
+                        manifestPath: this.manifestPath,
+                        mode: compiler.options.mode
+                    }
+                },
+                {
+                    loader: this.resolveConcatLoader()
+                }
+            ]
+        });
         compiler.options.module.rules.push({
             test: /\.(js|cjs|mjs|jsx|mjsx|ts|mts|tsx|mtsx)$/,
             include: includeDirs,
@@ -5350,7 +5451,28 @@ class AddContentScriptWrapper {
 const add_scripts_isRemoteUrl = (entry)=>/^([a-z][a-z0-9+.-]*:)?\/\//i.test(entry);
 const isContentScriptFeature = (feature)=>feature.startsWith("content_scripts/");
 const isScriptsFolderFeature = (feature)=>feature.startsWith("scripts/");
+const isBackgroundScriptsFeature = (feature)=>"background/scripts" === feature;
 function createSequentialEntryModule(feature, entryImports) {
+    const isCss = (p)=>/\.css$/i.test(p);
+    const jsFiles = entryImports.filter((p)=>!isCss(p));
+    const cssFiles = entryImports.filter(isCss);
+    const isClassic = (p)=>{
+        try {
+            const src = __rspack_external_fs.readFileSync(p, 'utf8');
+            return !/^\s*import[\s{('"*]/m.test(src) && !/^\s*export[\s{*( ]/m.test(src);
+        } catch  {
+            return false;
+        }
+    };
+    const concatenateClassic = jsFiles.length > 1 && jsFiles.every(isClassic);
+    if (concatenateClassic) {
+        const queryData = encodeURIComponent(JSON.stringify({
+            feature,
+            js: jsFiles,
+            css: cssFiles
+        }));
+        return `${jsFiles[0]}?__extensionjs_classic_concat__=${queryData}`;
+    }
     const source = [
         `/* extension.js sequential entry: ${feature} */`,
         ...entryImports.map((entryImport)=>`import ${JSON.stringify(String(entryImport))};`)
@@ -5428,7 +5550,7 @@ class AddScripts {
                     ...cssImports
                 ])
             ];
-            const shouldUseSequentialEntryModule = isContentScriptFeature(feature) && scriptImports.length > 1;
+            const shouldUseSequentialEntryModule = (isContentScriptFeature(feature) || isBackgroundScriptsFeature(feature)) && scriptImports.length > 1;
             const finalEntryImports = shouldUseSequentialEntryModule ? [
                 createSequentialEntryModule(feature, entryImports)
             ] : entryImports;
@@ -7608,13 +7730,17 @@ function validateLocales(compiler, compilation, manifestPath) {
                         return false;
                     }
                 }
-            } catch  {}
+            } catch (error) {
+                if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(localesValidationDetected(`could not scan __MSG__ placeholders in _locales/${defaultLocale}/messages.json: ${String(error?.message || error)}`));
+            }
         } else if (hasLocalesRoot) {
             if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(localesValidationDetected('_locales present but no default_locale'));
             pushCompilationError(compiler, compilation, 'LocalesValidationError', localesPresentButNoDefaultLocale(), 'manifest.json');
             return false;
         }
-    } catch  {}
+    } catch (error) {
+        if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(localesValidationDetected(`manifest.json could not be read for locale validation, deferring to manifest validation: ${String(error?.message || error)}`));
+    }
     try {
         const localesRoot = resolveLocalesFolder(manifestPath, projectRoot);
         if (localesRoot && __rspack_external_fs.existsSync(localesRoot)) {
@@ -7631,7 +7757,9 @@ function validateLocales(compiler, compilation, manifestPath) {
                 }
             }
         }
-    } catch  {}
+    } catch (error) {
+        if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(localesValidationDetected(`could not scan _locales for JSON validity: ${String(error?.message || error)}`));
+    }
     return true;
 }
 function processLocaleAssets(compiler, compilation, manifestPath) {
@@ -8073,6 +8201,7 @@ class EmitFile {
                         let outputDir = group;
                         if (('action' === group || 'browser_action' === group || 'page_action' === group || 'sidebar_action' === group) && 'default_icon' === sub) outputDir = 'icons';
                         else if ('browser_action' === group && 'theme_icons' === sub) outputDir = 'browser_action';
+                        else if ('theme' === group && 'images' === sub) outputDir = 'theme/images';
                         const filename = `${outputDir}/${basename}`;
                         compilation.emitAsset(filename, rawSource);
                         emittedCount++;
@@ -8476,7 +8605,10 @@ class plugin_web_extension_WebExtensionPlugin {
         }).apply(compiler);
         new IconsPlugin({
             manifestPath,
-            includeList: manifestFieldsData.icons,
+            includeList: {
+                ...manifestFieldsData.icons,
+                ...manifestFieldsData.theme
+            },
             browser: this.browser
         }).apply(compiler);
         new WebResourcesPlugin({
@@ -8769,6 +8901,7 @@ function webpackConfig(projectStructure, devOptions) {
         console.log(debugExtensionsToLoad(unpackedExtensionDirsToLoad));
         if (void 0 !== devOptions.extensions && 0 === companionUnpackedExtensionDirs.length) console.warn(noCompanionExtensionsResolved());
     }
+    const missingCssAssets = new Set();
     const plugins = [
         new CompilationPlugin({
             manifestPath,
@@ -8809,7 +8942,47 @@ function webpackConfig(projectStructure, devOptions) {
         }),
         new PerfBudgetsPlugin({
             budgets: devOptions.perfBudgets
-        })
+        }),
+        {
+            apply (compiler) {
+                compiler.hooks.afterCompile.tap('warn-missing-css-assets', (compilation)=>{
+                    if (0 === missingCssAssets.size) return;
+                    const ErrorCtor = compiler.rspack?.WebpackError || Error;
+                    for (const request of missingCssAssets){
+                        const warning = new ErrorCtor(`CSS asset "${request}" was not found on disk; the url() is left unresolved. The browser requests it at runtime and loads the extension regardless. Fix the path if it's a typo, or add the asset if it should ship.`);
+                        warning.name = 'MissingCssAssetWarning';
+                        compilation.warnings.push(warning);
+                    }
+                    missingCssAssets.clear();
+                });
+            }
+        },
+        {
+            apply (compiler) {
+                const target = String(devOptions.browser);
+                const isChromiumTarget = [
+                    'chrome',
+                    'edge'
+                ].includes(target) || target.includes('chromium');
+                if (manifest?.manifest_version !== 2 || !isChromiumTarget) return;
+                compiler.hooks.thisCompilation.tap('warn-mv2-on-chromium', (compilation)=>{
+                    const ErrorCtor = compiler.rspack?.WebpackError || Error;
+                    const usesBlockingWebRequest = Array.isArray(manifest.permissions) && manifest.permissions.includes('webRequestBlocking');
+                    const warning = new ErrorCtor([
+                        "This extension declares Manifest V2, which Chrome and Edge no longer load — ",
+                        `the ${target} build will not install. Options:`,
+                        "",
+                        "  • Build for Firefox (still supports MV2):  extension build --browser firefox",
+                        "  • Migrate the manifest to MV3 (action, background.service_worker, host_permissions)",
+                        "  • Or ship both from one source with browser-prefixed keys",
+                        "    (chromium:manifest_version: 3, firefox:manifest_version: 2, …)",
+                        usesBlockingWebRequest ? `\n  Note: this extension uses webRequestBlocking, which MV3 replaces with\n  declarativeNetRequest — a code change, not just a manifest edit.` : ''
+                    ].filter((line)=>'' !== line).join('\n'));
+                    warning.name = 'ManifestV2OnChromiumWarning';
+                    compilation.warnings.push(warning);
+                });
+            }
+        }
     ];
     plugins.push(new PlaywrightPlugin({
         packageJsonDir,
@@ -8832,6 +9005,22 @@ function webpackConfig(projectStructure, devOptions) {
         mode: devOptions.mode || 'development',
         entry: {},
         target: 'web',
+        externals: [
+            ({ request, dependencyType, context }, callback)=>{
+                if ('string' != typeof request) return callback();
+                if (/^(chrome|moz)-extension:/i.test(request)) return callback(null, request, 'asset');
+                if ('url' === dependencyType && context && !/^[a-z][\w+.-]*:/i.test(request) && !/^[/#]/.test(request) && !request.startsWith('//')) {
+                    const assetPath = request.split(/[?#]/)[0];
+                    try {
+                        if (assetPath && !__rspack_external_fs.existsSync(__rspack_external_path.resolve(context, assetPath))) {
+                            missingCssAssets.add(request);
+                            return callback(null, request, 'asset');
+                        }
+                    } catch  {}
+                }
+                callback();
+            }
+        ],
         context: packageJsonDir,
         cache: false,
         devtool: 'production' === (devOptions.mode || 'development') ? false : 3 === manifest.manifest_version ? 'cheap-source-map' : 'eval-cheap-source-map',