extension-develop 3.10.1 → 3.10.2-canary.247.0e1303f

package/dist/270.cjs

@@ -2662,6 +2662,14 @@ exports.modules = {
             } catch  {}
             return false;
         }
+        function isCanonicalContentScriptCss(resource) {
+            return /^content_scripts\/content-\d+\.css$/.test(resource);
+        }
+        function toCanonicalContentScriptCss(jsFile) {
+            const normalized = String(jsFile || '');
+            if (!/^content_scripts\/content-\d+\.js$/.test(normalized)) return;
+            return normalized.replace(/\.js$/, '.css');
+        }
         function generateManifestPatches(compilation, manifestPath, entryImports, browser) {
             const canonicalManifest = getManifestContent(compilation, manifestPath);
             const resolved = resolveUserDeclaredWAR(compilation, manifestPath, canonicalManifest, browser);
@@ -2709,6 +2717,11 @@ exports.modules = {
                 if (contentScript) {
                     const matches = contentScript.matches || [];
                     const filteredResources = resources.filter((resource)=>!resource.endsWith('.map') && !resource.endsWith('.js'));
+                    const importedContentCss = filteredResources.filter((resource)=>resource.endsWith('.css')).filter(isCanonicalContentScriptCss);
+                    if (importedContentCss.length > 0) contentScript.css = Array.from(new Set([
+                        ...contentScript.css || [],
+                        ...importedContentCss
+                    ])).sort();
                     if (0 === filteredResources.length) continue;
                     if (3 === canonicalManifest.manifest_version) {
                         const normalizedMatches = cleanMatches(matches);
@@ -2812,6 +2825,14 @@ exports.modules = {
             if (3 === canonicalManifest.manifest_version) {
                 const assetKeys = Object.keys(compilation.assets || {});
                 const cssUnderContentScripts = assetKeys.filter((k)=>k.startsWith("content_scripts/")).filter((k)=>k.endsWith('.css')).sort();
+                if (Array.isArray(canonicalManifest.content_scripts)) for (const contentScript of canonicalManifest.content_scripts){
+                    const jsFiles = Array.isArray(contentScript.js) ? contentScript.js : [];
+                    const canonicalCss = jsFiles.map(toCanonicalContentScriptCss).filter((resource)=>Boolean(resource && cssUnderContentScripts.includes(resource)));
+                    if (canonicalCss.length > 0) contentScript.css = Array.from(new Set([
+                        ...contentScript.css || [],
+                        ...canonicalCss
+                    ])).sort();
+                }
                 if (cssUnderContentScripts.length > 0) {
                     const allMatches = Array.from(new Set((canonicalManifest.content_scripts || []).flatMap((cs)=>cs.matches || [])));
                     const normalizedMatches = cleanMatches(allMatches);