extension-develop 4.1.9 → 4.1.11

package/dist/0~rspack-config.mjs

@@ -18,7 +18,7 @@ import { isResourceUnderDirs, canonicalizeDir, toResourceKey } from "./93.mjs";
 import { prefix as messaging_prefix, isDebug } from "./349.mjs";
 import { jsFrameworksHmrSummary, isUsingTypeScript, resolvePackageManager, humanLine, jsFrameworksIntegrationsEnabled, jsFrameworksConfigsDetected, recordZipArtifact, hasDependency, resolveDevelopInstallRoot, resolveDevelopDistFile, isUsingCustomLoader, ensureTypeScriptConfig, isUsingIntegration as messages_isUsingIntegration, getUserTypeScriptConfigFile } from "./839.mjs";
 import { renderStatsBlocks, makeSanitizedConsole } from "./0~stats-handler.mjs";
-import { getCanonicalContentScriptEntryName, parseCanonicalContentScriptAsset, EXTENSIONJS_CONTENT_SCRIPT_LAYER, isCanonicalContentScriptAsset, getCanonicalContentScriptJsAssetName, getCanonicalContentScriptCssAssetName } from "./291.mjs";
+import { EXTENSIONJS_CONTENT_SCRIPT_LAYER, getCanonicalContentScriptEntryName, parseCanonicalContentScriptAsset, CONTENT_SCRIPT_CSS_PROBE_MARKER_PREFIX, createContentScriptCssProbeMarkerPattern, getCanonicalContentScriptJsAssetName, getCanonicalContentScriptCssAssetName, isCanonicalContentScriptAsset } from "./291.mjs";
 import { hasProjectDependency, findNearestProjectManifestSync, PROJECT_MANIFEST_FILENAMES, readProjectDependencies } from "./80.mjs";
 import { cssIntegrationsEnabled, cssConfigsDetected, deadCssUrlRef, missingSassDependency, isUsingIntegration, postCssPluginNotResolved } from "./845.mjs";
 import { toPosixPath } from "./86.mjs";
@@ -747,11 +747,14 @@ function sandbox(manifest) {
         }
     };
 }
-function storage(manifest) {
+function storage(manifest, manifestPath) {
     return manifest.storage && {
         storage: {
             ...manifest.storage.managed_schema && {
-                managed_schema: getFilename('storage/managed_schema.json', manifest.storage.managed_schema)
+                managed_schema: (()=>{
+                    const raw = String(manifest.storage.managed_schema);
+                    return getFilename(manifestPageOutputTarget(raw, 'storage/managed_schema.json', manifestPath), raw);
+                })()
             }
         }
     };
@@ -818,7 +821,7 @@ function manifestCommon(manifest, manifestPath) {
         ...optionsPage(manifest, manifestPath),
         ...optionsUi(manifest, manifestPath),
         ...sandbox(manifest),
-        ...storage(manifest),
+        ...storage(manifest, manifestPath),
         ...theme_theme(manifest),
         ...userScripts(manifest),
         ...webAccessibleResources(manifest),
@@ -1003,14 +1006,14 @@ function backgroundServiceWorker(manifest) {
         }
     };
 }
-function declarativeNetRequest(manifest) {
+function declarativeNetRequest(manifest, manifestPath) {
     return manifest.declarative_net_request && {
         declarative_net_request: {
             ...manifest.declarative_net_request,
             ...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)
+                        path: resourceObj.path && getFilename(manifestPageOutputTarget(resourceObj.path, `declarative_net_request/${resourceObj.id}.json`, manifestPath), resourceObj.path)
                     }))
             }
         }
@@ -1034,11 +1037,11 @@ function sidePanel(manifest) {
         }
     };
 }
-function manifestV3(manifest) {
+function manifestV3(manifest, manifestPath) {
     return {
         ...action_action(manifest),
         ...backgroundServiceWorker(manifest),
-        ...declarativeNetRequest(manifest),
+        ...declarativeNetRequest(manifest, manifestPath),
         ...hostPermissions(manifest),
         ...sidePanel(manifest)
     };
@@ -1056,7 +1059,7 @@ function getManifestOverrides(manifestPath, manifest) {
     };
     const common = manifestCommon(manifestContent, manifestPath);
     const mv2 = manifestV2(manifestContent);
-    const mv3 = manifestV3(manifestContent);
+    const mv3 = manifestV3(manifestContent, manifestPath);
     const backgroundMerged = {
         ...manifestContent.background || {},
         ...pickBackground(common),
@@ -2920,6 +2923,19 @@ function parse_html_isUrl(src) {
         return false;
     }
 }
+function emitSrcsetCandidates(srcset, node, assetType, attributeName, onResourceFound) {
+    for (const candidate of srcset.split(',')){
+        const url = candidate.trim().split(/\s+/)[0];
+        if (!url) continue;
+        const { cleanPath } = cleanAssetUrl(url);
+        if (cleanPath && !parse_html_isUrl(cleanPath)) onResourceFound({
+            filePath: url,
+            childNode: node,
+            assetType,
+            attributeName
+        });
+    }
+}
 function parseHtml(node, onResourceFound) {
     if ('#comment' === node.nodeName || '#text' === node.nodeName) return;
     if ("script" === node.nodeName) {
@@ -2935,16 +2951,7 @@ function parseHtml(node, onResourceFound) {
         const href = node.attrs?.find((attr)=>'href' === attr.name)?.value;
         const rel = node.attrs?.find((attr)=>'rel' === attr.name)?.value;
         const imagesrcset = node.attrs?.find((attr)=>'imagesrcset' === attr.name)?.value;
-        if (imagesrcset) for (const candidate of imagesrcset.split(',')){
-            const url = candidate.trim().split(/\s+/)[0];
-            if (!url) continue;
-            const { cleanPath } = cleanAssetUrl(url);
-            if (cleanPath && !parse_html_isUrl(cleanPath)) onResourceFound({
-                filePath: cleanPath,
-                childNode: node,
-                assetType: 'staticHref'
-            });
-        }
+        if (imagesrcset) emitSrcsetCandidates(imagesrcset, node, 'staticHref', 'imagesrcset', onResourceFound);
         if (!href) return;
         if (parse_html_isUrl(href)) return;
         const nonStylesheetRelTokens = [
@@ -2964,7 +2971,8 @@ function parseHtml(node, onResourceFound) {
         onResourceFound(relTokens.some((token)=>nonStylesheetRelTokens.includes(token)) ? {
             filePath: href,
             childNode: node,
-            assetType: 'staticHref'
+            assetType: 'staticHref',
+            attributeName: 'href'
         } : {
             filePath: href,
             childNode: node,
@@ -2972,38 +2980,22 @@ function parseHtml(node, onResourceFound) {
         });
     } else if ('audio' === node.nodeName || 'embed' === node.nodeName || 'iframe' === node.nodeName || 'img' === node.nodeName || 'input' === node.nodeName || 'source' === node.nodeName || 'track' === node.nodeName || 'video' === node.nodeName) {
         const src = node.attrs?.find((attr)=>'src' === attr.name)?.value;
-        if (!src) return;
-        if (parse_html_isUrl(src)) return;
-        onResourceFound({
+        if (src && !parse_html_isUrl(src)) onResourceFound({
             filePath: src,
             childNode: node,
-            assetType: 'staticSrc'
+            assetType: 'staticSrc',
+            attributeName: 'src'
         });
         const srcset = node.attrs?.find((attr)=>'srcset' === attr.name)?.value;
-        if (srcset) {
-            const candidates = srcset.split(',');
-            for (const candidate of candidates){
-                const parts = candidate.trim().split(/\s+/);
-                const url = parts[0];
-                if (!url) continue;
-                const { cleanPath } = cleanAssetUrl(url);
-                if (cleanPath && !parse_html_isUrl(cleanPath)) onResourceFound({
-                    filePath: cleanPath,
-                    childNode: node,
-                    assetType: 'staticSrc'
-                });
-            }
-        }
+        if (srcset) emitSrcsetCandidates(srcset, node, 'staticSrc', 'srcset', onResourceFound);
         if ('video' === node.nodeName) {
             const poster = node.attrs?.find((attr)=>'poster' === attr.name)?.value;
-            if (poster && !parse_html_isUrl(poster)) {
-                const { cleanPath } = cleanAssetUrl(poster);
-                if (cleanPath) onResourceFound({
-                    filePath: cleanPath,
-                    childNode: node,
-                    assetType: 'staticSrc'
-                });
-            }
+            if (poster && !parse_html_isUrl(poster)) onResourceFound({
+                filePath: poster,
+                childNode: node,
+                assetType: 'staticSrc',
+                attributeName: 'poster'
+            });
         }
     }
     const { childNodes = [] } = node;
@@ -3122,6 +3114,27 @@ function utils_isUrl(src) {
         return false;
     }
 }
+function resolveStaticAttributeName(assetType, attributeName) {
+    if (attributeName) return attributeName;
+    return 'staticSrc' === assetType ? 'src' : 'href';
+}
+function rewriteSrcsetCandidate(srcset, fromCleanPath, toUrl) {
+    return srcset.split(',').map((candidate)=>{
+        const match = candidate.match(/^(\s*)(\S+)(.*)$/);
+        if (!match) return candidate;
+        const [, lead, url, rest] = match;
+        const { cleanPath } = cleanAssetUrl(url);
+        if (cleanPath !== fromCleanPath && url !== fromCleanPath) return candidate;
+        return `${lead}${toUrl}${rest}`;
+    }).join(',');
+}
+function applyRewrittenStaticUrl(node, attributeName, cleanPath, value) {
+    if ('srcset' === attributeName || 'imagesrcset' === attributeName) {
+        const current = __rspack_external_parse5_utilities_78b19c6a.getAttribute(node, attributeName) || '';
+        return __rspack_external_parse5_utilities_78b19c6a.setAttribute(node, attributeName, rewriteSrcsetCandidate(current, cleanPath, value));
+    }
+    return __rspack_external_parse5_utilities_78b19c6a.setAttribute(node, attributeName, value);
+}
 function cleanAssetUrl(url) {
     const hashIndex = url.indexOf('#');
     const queryIndex = url.indexOf('?');
@@ -5591,6 +5604,53 @@ class PruneStaleHotUpdates {
         });
     }
 }
+const utils_isRemoteUrl = (entry)=>/^([a-z][a-z0-9+.-]*:)?\/\//i.test(entry);
+function resolveScriptEntryPath(entry, manifestDir, projectPath) {
+    if (!entry || utils_isRemoteUrl(entry)) return entry;
+    if (entry.startsWith('/') && !__rspack_external_node_path_c5b9b54f.isAbsolute(entry)) return __rspack_external_node_path_c5b9b54f.join(projectPath, entry.slice(1));
+    if (__rspack_external_node_path_c5b9b54f.isAbsolute(entry)) return entry;
+    return __rspack_external_node_path_c5b9b54f.join(manifestDir, entry);
+}
+function getBackgroundWorkerEntryName(options) {
+    const { manifest, browser, manifestDir } = options;
+    if (3 !== Number(manifest.manifest_version)) return;
+    if (isGeckoBasedBrowser(String(browser))) return;
+    const background = manifest.background;
+    if (!background) return;
+    const projectPath = options.projectPath || manifestDir;
+    const resolve = (entry)=>resolveScriptEntryPath(entry, manifestDir, projectPath);
+    if (background.service_worker) {
+        const workerEntries = getScriptEntries([
+            resolve(String(background.service_worker))
+        ]);
+        if (workerEntries.length > 0) return 'background/service_worker';
+    }
+    const scripts = Array.isArray(background.scripts) ? background.scripts : [];
+    const scriptEntries = getScriptEntries(scripts.filter((script)=>'string' == typeof script).map(resolve));
+    if (scriptEntries.length > 0) return "background/scripts";
+}
+function getScriptEntries(scriptPath) {
+    const scriptEntries = Array.isArray(scriptPath) ? scriptPath || [] : scriptPath ? [
+        scriptPath
+    ] : [];
+    const fileAssets = scriptEntries.filter((scriptAsset)=>{
+        const validFile = __rspack_external_node_fs_5ea92f0c.existsSync(scriptAsset);
+        if (/\.d\.[cm]?ts$/i.test(scriptAsset)) return false;
+        const assetExtension = __rspack_external_node_path_c5b9b54f.extname(scriptAsset);
+        return validFile && ('.js' === assetExtension || '.cjs' === assetExtension || '.mjs' === assetExtension || '.jsx' === assetExtension || '.mjsx' === assetExtension || '.ts' === assetExtension || '.mts' === assetExtension || '.mtsx' === assetExtension || '.tsx' === assetExtension);
+    });
+    return fileAssets;
+}
+function getCssEntries(scriptPath) {
+    const scriptEntries = Array.isArray(scriptPath) ? scriptPath || [] : scriptPath ? [
+        scriptPath
+    ] : [];
+    const fileAssets = scriptEntries.filter((scriptAsset)=>{
+        const validFile = __rspack_external_node_fs_5ea92f0c.existsSync(scriptAsset);
+        return validFile && (scriptAsset.endsWith('.css') || scriptAsset.endsWith('.scss') || scriptAsset.endsWith('.sass') || scriptAsset.endsWith('.less'));
+    });
+    return fileAssets;
+}
 function createIssue(compiler, message, type = 'error') {
     const ErrorCtor = compiler?.rspack?.WebpackError || Error;
     const issue = new ErrorCtor(message);
@@ -6617,18 +6677,30 @@ class WebExtensionPlugin {
     }
 }
 const webpack_target_webextension_fork = WebExtensionPlugin;
-function getBackgroundEntryName(manifest, browser) {
+function getBackgroundEntryName(manifest, browser, context) {
     if (manifest.background) {
         if (isGeckoBasedBrowser(String(browser))) return {
             pageEntry: "background/script",
             tryCatchWrapper: true,
             eagerChunkLoading: false
         };
-        if (3 === manifest.manifest_version) return {
-            serviceWorkerEntry: 'background/service_worker',
-            tryCatchWrapper: true,
-            eagerChunkLoading: false
-        };
+        if (3 === manifest.manifest_version) {
+            const serviceWorkerEntry = getBackgroundWorkerEntryName({
+                manifest,
+                browser,
+                manifestDir: context.manifestDir,
+                projectPath: context.projectPath
+            });
+            if (!serviceWorkerEntry) return {
+                tryCatchWrapper: true,
+                eagerChunkLoading: false
+            };
+            return {
+                serviceWorkerEntry,
+                tryCatchWrapper: true,
+                eagerChunkLoading: false
+            };
+        }
         if (2 === manifest.manifest_version) return {
             pageEntry: "background/script",
             tryCatchWrapper: true,
@@ -6692,7 +6764,10 @@ class SetupReloadStrategy {
             browser: this.browser
         }).apply(compiler);
         new webpack_target_webextension_fork({
-            background: getBackgroundEntryName(patchedManifest, this.browser),
+            background: getBackgroundEntryName(patchedManifest, this.browser, {
+                manifestDir: __rspack_external_node_path_c5b9b54f.dirname(this.manifestPath),
+                projectPath: compiler.options.context
+            }),
             hmrConfig: false,
             weakRuntimeCheck: true,
             contentScriptsMeta
@@ -6817,7 +6892,10 @@ class SetupChunkLoadingTarget {
         }
         new webpack_target_webextension_fork({
             background: {
-                ...getBackgroundEntryName(patchedManifest, this.browser),
+                ...getBackgroundEntryName(patchedManifest, this.browser, {
+                    manifestDir: __rspack_external_node_path_c5b9b54f.dirname(this.manifestPath),
+                    projectPath: compiler.options.context
+                }),
                 classicLoader: false
             },
             hmrConfig: false,
@@ -8034,19 +8112,20 @@ function resolveCssAsset(compilation, feature) {
         href: void 0
     };
 }
-function handleStaticAsset(compilation, htmlEntry, htmlDir, absolutePath, assetType, cleanPath, search, hash, baseHref, includeList, extname, childNode) {
+function handleStaticAsset(compilation, htmlEntry, htmlDir, absolutePath, assetType, cleanPath, search, hash, baseHref, includeList, extname, childNode, attributeName) {
     const isFilepathListEntry = isFromFilepathList(absolutePath, includeList);
     __rspack_external_node_path_c5b9b54f.posix.join('/', cleanPath);
+    const attrName = resolveStaticAttributeName(assetType, attributeName);
     let node = childNode;
     if (isFilepathListEntry) {
         const filepath = getHtmlPageDeclaredAssetPath(includeList, absolutePath, extname);
-        node = __rspack_external_parse5_utilities_78b19c6a.setAttribute(node, 'staticSrc' === assetType ? 'src' : 'href', filepath + (search || '') + (hash || ''));
+        node = applyRewrittenStaticUrl(node, attrName, cleanPath, filepath + (search || '') + (hash || ''));
         return node;
     }
     if (cleanPath.startsWith('/')) {
         const projectDir = __rspack_external_node_path_c5b9b54f.dirname(__rspack_external_node_path_c5b9b54f.dirname(htmlEntry));
         __rspack_external_node_path_c5b9b54f.join(projectDir, 'public', cleanPath.slice(1));
-        node = __rspack_external_parse5_utilities_78b19c6a.setAttribute(node, 'staticSrc' === assetType ? 'src' : 'href', cleanPath + (search || '') + (hash || ''));
+        node = applyRewrittenStaticUrl(node, attrName, cleanPath, cleanPath + (search || '') + (hash || ''));
         return node;
     }
     const baseJoin = baseHref && !/^\w+:\/\//.test(baseHref) ? __rspack_external_node_path_c5b9b54f.resolve(htmlDir, baseHref) : htmlDir;
@@ -8055,7 +8134,7 @@ function handleStaticAsset(compilation, htmlEntry, htmlDir, absolutePath, assetT
     const relativeFromHtml = fromRoot && toRoot && String(fromRoot).toLowerCase() !== String(toRoot).toLowerCase() ? __rspack_external_node_path_c5b9b54f.basename(absolutePath) : __rspack_external_node_path_c5b9b54f.relative(baseJoin, absolutePath);
     const posixRelative = relativeFromHtml.split(__rspack_external_node_path_c5b9b54f.sep).join('/');
     const filepath = joinEmittedAssetName('assets', posixRelative);
-    if (__rspack_external_node_fs_5ea92f0c.existsSync(absolutePath)) node = __rspack_external_parse5_utilities_78b19c6a.setAttribute(node, 'staticSrc' === assetType ? 'src' : 'href', getFilePath(filepath, '', true) + (search || '') + (hash || ''));
+    if (__rspack_external_node_fs_5ea92f0c.existsSync(absolutePath)) node = applyRewrittenStaticUrl(node, attrName, cleanPath, getFilePath(filepath, '', true) + (search || '') + (hash || ''));
     return node;
 }
 function injectJsScript(bodyNode, feature, firstScriptAttrs) {
@@ -8106,7 +8185,7 @@ function patchHtml(compilation, feature, htmlEntry, includeList) {
     let bodyNode;
     for (const node of htmlDocument.childNodes)if ('html' === node.nodeName) {
         for (const htmlChildNode of node.childNodes){
-            if ('head' === htmlChildNode.nodeName || 'body' === htmlChildNode.nodeName) parseHtml(htmlChildNode, ({ filePath, childNode, assetType })=>{
+            if ('head' === htmlChildNode.nodeName || 'body' === htmlChildNode.nodeName) parseHtml(htmlChildNode, ({ filePath, childNode, assetType, attributeName })=>{
                 const htmlDir = __rspack_external_node_path_c5b9b54f.dirname(htmlEntry);
                 const { cleanPath, hash, search } = cleanAssetUrl(filePath);
                 const absolutePath = __rspack_external_node_path_c5b9b54f.resolve(htmlDir, cleanPath);
@@ -8136,7 +8215,7 @@ function patchHtml(compilation, feature, htmlEntry, includeList) {
                         break;
                     case 'staticHref':
                     case 'staticSrc':
-                        thisChildNode = handleStaticAsset(compilation, htmlEntry, htmlDir, absolutePath, assetType, cleanPath, search, hash, baseHref, includeList, extname, thisChildNode);
+                        thisChildNode = handleStaticAsset(compilation, htmlEntry, htmlDir, absolutePath, assetType, cleanPath, search, hash, baseHref, includeList, extname, thisChildNode, attributeName);
                         break;
                     default:
                         break;
@@ -8174,11 +8253,12 @@ function patchHtmlNested(compilation, htmlEntry) {
         encoding: 'utf8'
     });
     const htmlDocument = __rspack_external_parse5_utilities_78b19c6a.parse(htmlFile);
-    for (const node of htmlDocument.childNodes)if ('html' === node.nodeName) for (const htmlChildNode of node.childNodes){
-        if ('head' === htmlChildNode.nodeName || 'body' === htmlChildNode.nodeName) parseHtml(htmlChildNode, ({ filePath, childNode, assetType })=>{
+    for (const node of htmlDocument.childNodes)if ('html' === node.nodeName) {
+        for (const htmlChildNode of node.childNodes)if ('head' === htmlChildNode.nodeName || 'body' === htmlChildNode.nodeName) parseHtml(htmlChildNode, ({ filePath, childNode, assetType, attributeName })=>{
             const htmlDir = __rspack_external_node_path_c5b9b54f.dirname(htmlEntry);
             const { cleanPath, hash, search } = cleanAssetUrl(filePath);
             const absolutePath = __rspack_external_node_path_c5b9b54f.resolve(htmlDir, cleanPath);
+            const attrName = 'staticSrc' === assetType || 'staticHref' === assetType ? resolveStaticAttributeName(assetType, attributeName) : void 0;
             let thisChildNode = childNode;
             switch(assetType){
                 case "script":
@@ -8197,12 +8277,12 @@ function patchHtmlNested(compilation, htmlEntry) {
                 case 'staticSrc':
                     if (cleanPath.startsWith('/')) {
                         warnIfPublicRootAssetMissing(compilation, htmlEntry, cleanPath);
-                        thisChildNode = __rspack_external_parse5_utilities_78b19c6a.setAttribute(thisChildNode, 'staticSrc' === assetType ? 'src' : 'href', cleanPath + (search || '') + (hash || ''));
+                        thisChildNode = applyRewrittenStaticUrl(thisChildNode, attrName || resolveStaticAttributeName(assetType), cleanPath, cleanPath + (search || '') + (hash || ''));
                     } else if (__rspack_external_node_fs_5ea92f0c.existsSync(absolutePath)) {
                         const relativeFromHtml = __rspack_external_node_path_c5b9b54f.relative(htmlDir, absolutePath);
                         const posixRelative = relativeFromHtml.split(__rspack_external_node_path_c5b9b54f.sep).join('/');
                         const filepath = joinEmittedAssetName('assets', posixRelative);
-                        thisChildNode = __rspack_external_parse5_utilities_78b19c6a.setAttribute(thisChildNode, 'staticSrc' === assetType ? 'src' : 'href', getFilePath(filepath, '', true) + (search || '') + (hash || ''));
+                        thisChildNode = applyRewrittenStaticUrl(thisChildNode, attrName || resolveStaticAttributeName(assetType), cleanPath, getFilePath(filepath, '', true) + (search || '') + (hash || ''));
                     }
                     break;
                 default:
@@ -9287,7 +9367,7 @@ function jsonIncludeSummary(totalFeatures, criticalCount) {
     return `${messaging_prefix('debug')} json     include features=${String(totalFeatures)} critical=${String(criticalCount)}`;
 }
 function isCriticalJsonFeature(feature) {
-    return feature.startsWith('declarative_net_request') || 'storage.managed_schema' === feature;
+    return feature.startsWith('declarative_net_request') || 'storage.managed_schema' === feature || 'storage/managed_schema' === feature;
 }
 function isPlainObject(value) {
     return 'object' == typeof value && null !== value && !Array.isArray(value);
@@ -9352,6 +9432,34 @@ function validateJsonAsset(compilation, feature, filePath, buf) {
     }
     return true;
 }
+function isInsideDir(abs, dir) {
+    const rel = __rspack_external_node_path_c5b9b54f.relative(dir, abs);
+    return Boolean(rel && !rel.startsWith('..') && !__rspack_external_node_path_c5b9b54f.isAbsolute(rel));
+}
+function firstExisting(candidates) {
+    for (const candidate of candidates)if (candidate && __rspack_external_node_fs_5ea92f0c.existsSync(candidate)) return candidate;
+}
+function resolveJsonResource(thisResource, manifestDir, projectPath) {
+    const publicDir = __rspack_external_node_path_c5b9b54f.join(projectPath, 'public');
+    const rawRef = String(thisResource);
+    const looksLikeRootRef = rawRef.startsWith('/') && !rawRef.startsWith('//') && !(projectPath && rawRef.startsWith(projectPath));
+    const isPublicRoot = looksLikeRootRef && (!__rspack_external_node_path_c5b9b54f.isAbsolute(rawRef) || __rspack_external_node_path_c5b9b54f.dirname(rawRef) === __rspack_external_node_path_c5b9b54f.parse(rawRef).root);
+    const joined = __rspack_external_node_path_c5b9b54f.isAbsolute(rawRef) ? rawRef : __rspack_external_node_path_c5b9b54f.join(manifestDir, rawRef);
+    const publicFromProject = isInsideDir(joined, projectPath) ? __rspack_external_node_path_c5b9b54f.join(publicDir, __rspack_external_node_path_c5b9b54f.relative(projectPath, joined)) : '';
+    const publicFromSlash = looksLikeRootRef ? __rspack_external_node_path_c5b9b54f.join(publicDir, rawRef.replace(/^\/+/, '')) : '';
+    const publicFromRelative = __rspack_external_node_path_c5b9b54f.isAbsolute(rawRef) || rawRef.startsWith('public/') ? '' : __rspack_external_node_path_c5b9b54f.join(publicDir, rawRef);
+    const abs = firstExisting([
+        joined,
+        publicFromProject,
+        publicFromSlash,
+        publicFromRelative
+    ]) || joined;
+    return {
+        abs,
+        isUnderPublic: isInsideDir(abs, publicDir),
+        isPublicRoot
+    };
+}
 function getProjectPathFromCompilation(compilation, manifestPath) {
     return compilation.compiler.options.context || compilation.options.context || __rspack_external_node_path_c5b9b54f.dirname(manifestPath);
 }
@@ -9377,14 +9485,10 @@ function processJsonAssets(compilation, manifestPath, includeList) {
             resource
         ];
         for (const thisResource of resourceArr)if (thisResource) {
-            const abs = __rspack_external_node_path_c5b9b54f.isAbsolute(thisResource) ? thisResource : __rspack_external_node_path_c5b9b54f.join(manifestDir, thisResource);
-            const relToPublic = __rspack_external_node_path_c5b9b54f.relative(publicDir, abs);
-            const isUnderPublic = relToPublic && !relToPublic.startsWith('..') && !__rspack_external_node_path_c5b9b54f.isAbsolute(relToPublic);
+            const { abs, isUnderPublic, isPublicRoot } = resolveJsonResource(thisResource, manifestDir, projectPath);
             if (!__rspack_external_node_fs_5ea92f0c.existsSync(abs)) {
-                const rawRef = String(thisResource);
-                const isPublicRoot = rawRef.startsWith('/') && !__rspack_external_node_path_c5b9b54f.isAbsolute(rawRef);
                 const outputRoot = compilation?.options?.output?.path || '';
-                const displayPath = isPublicRoot ? __rspack_external_node_path_c5b9b54f.join(outputRoot, rawRef.slice(1)) : abs;
+                const displayPath = isPublicRoot ? __rspack_external_node_path_c5b9b54f.join(outputRoot || publicDir, String(thisResource).slice(1)) : abs;
                 const isFatal = isCriticalJsonFeature(feature);
                 const notFound = new core_WebpackError(jsonMissingFile(feature, displayPath, {
                     publicRootHint: isPublicRoot,
@@ -9440,6 +9544,7 @@ function trackJsonDependencies(compilation, manifestPath, includeList) {
     if (compilation.errors?.length) return;
     const jsonFields = includeList || {};
     const manifestDir = __rspack_external_node_path_c5b9b54f.dirname(manifestPath);
+    const projectPath = compilation.compiler.options.context || compilation.options.context || manifestDir;
     let added = 0;
     for (const field of Object.entries(jsonFields)){
         const [, resource] = field;
@@ -9447,7 +9552,7 @@ function trackJsonDependencies(compilation, manifestPath, includeList) {
             resource
         ];
         for (const thisResource of resourceArr)if (thisResource) {
-            const abs = __rspack_external_node_path_c5b9b54f.isAbsolute(thisResource) ? thisResource : __rspack_external_node_path_c5b9b54f.join(manifestDir, thisResource);
+            const { abs } = resolveJsonResource(thisResource, manifestDir, projectPath);
             if (__rspack_external_node_fs_5ea92f0c.existsSync(abs) && !compilation.fileDependencies.has(abs)) {
                 compilation.fileDependencies.add(abs);
                 added++;
@@ -12415,6 +12520,16 @@ function getMainWorldBridgeScripts(manifestPath, browser = 'chrome') {
     } catch  {}
     return bridgeScripts;
 }
+function resolveBundleCssProbeMarker(cssPath, hasAsset, assetNames) {
+    if (hasAsset(cssPath)) return cssPath;
+    const wanted = parseCanonicalContentScriptAsset(cssPath);
+    if (!wanted || 'css' !== wanted.extension) return '';
+    for (const name of assetNames()){
+        const parsed = parseCanonicalContentScriptAsset(name);
+        if (parsed && 'css' === parsed.extension && parsed.index === wanted.index) return name;
+    }
+    return '';
+}
 class AddContentScriptWrapper {
     static getBridgeScripts(manifestPath, browser = 'chrome') {
         return getMainWorldBridgeScripts(manifestPath, browser);
@@ -12482,6 +12597,29 @@ class AddContentScriptWrapper {
                 }
             ]
         });
+        compiler.hooks.thisCompilation.tap("scripts:add-content-script-wrapper", (compilation)=>{
+            compilation.hooks.processAssets.tap({
+                name: "scripts:resolve-bundle-css-probe",
+                stage: core_Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE
+            }, ()=>{
+                const assetNames = ()=>compilation.getAssets().map((asset)=>asset.name);
+                for (const asset of compilation.getAssets()){
+                    if (!/\.(?:js|mjs)$/.test(asset.name)) continue;
+                    const text = asset.source.source().toString();
+                    if (!text.includes(CONTENT_SCRIPT_CSS_PROBE_MARKER_PREFIX)) continue;
+                    const pattern = createContentScriptCssProbeMarkerPattern();
+                    const replaced = new core_sources.ReplaceSource(asset.source);
+                    let match = pattern.exec(text);
+                    let touched = false;
+                    while(match){
+                        replaced.replace(match.index, match.index + match[0].length - 1, resolveBundleCssProbeMarker(match[1], (name)=>Boolean(compilation.getAsset(name)), assetNames));
+                        touched = true;
+                        match = pattern.exec(text);
+                    }
+                    if (touched) compilation.updateAsset(asset.name, replaced);
+                }
+            });
+        });
     }
 }
 const basic = [
@@ -12539,29 +12677,6 @@ function add_public_path_runtime_module_PublicPathRuntimeModule(compiler) {
     }
     return new PublicPathRuntimeModule();
 }
-function getScriptEntries(scriptPath) {
-    const scriptEntries = Array.isArray(scriptPath) ? scriptPath || [] : scriptPath ? [
-        scriptPath
-    ] : [];
-    const fileAssets = scriptEntries.filter((scriptAsset)=>{
-        const validFile = __rspack_external_node_fs_5ea92f0c.existsSync(scriptAsset);
-        if (/\.d\.[cm]?ts$/i.test(scriptAsset)) return false;
-        const assetExtension = __rspack_external_node_path_c5b9b54f.extname(scriptAsset);
-        return validFile && ('.js' === assetExtension || '.cjs' === assetExtension || '.mjs' === assetExtension || '.jsx' === assetExtension || '.mjsx' === assetExtension || '.ts' === assetExtension || '.mts' === assetExtension || '.mtsx' === assetExtension || '.tsx' === assetExtension);
-    });
-    return fileAssets;
-}
-function getCssEntries(scriptPath) {
-    const scriptEntries = Array.isArray(scriptPath) ? scriptPath || [] : scriptPath ? [
-        scriptPath
-    ] : [];
-    const fileAssets = scriptEntries.filter((scriptAsset)=>{
-        const validFile = __rspack_external_node_fs_5ea92f0c.existsSync(scriptAsset);
-        return validFile && (scriptAsset.endsWith('.css') || scriptAsset.endsWith('.scss') || scriptAsset.endsWith('.sass') || scriptAsset.endsWith('.less'));
-    });
-    return fileAssets;
-}
-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;
@@ -12601,7 +12716,7 @@ class AddScripts {
                         raw
                     ] : [];
                     for (const entry of rawEntries){
-                        if (!entry || 'string' != typeof entry || add_scripts_isRemoteUrl(entry)) continue;
+                        if (!entry || 'string' != typeof entry || utils_isRemoteUrl(entry)) continue;
                         let resolved = entry;
                         if (!__rspack_external_node_fs_5ea92f0c.existsSync(resolved)) resolved = __rspack_external_node_path_c5b9b54f.isAbsolute(entry) ? entry : entry.startsWith('/') ? __rspack_external_node_path_c5b9b54f.join(manifestDir, entry.slice(1)) : __rspack_external_node_path_c5b9b54f.join(manifestDir, entry);
                         if (__rspack_external_node_fs_5ea92f0c.existsSync(resolved)) continue;
@@ -12630,12 +12745,7 @@ class AddScripts {
         } catch  {
             manifestJson = {};
         }
-        const resolveEntryPath = (entry)=>{
-            if (!entry || add_scripts_isRemoteUrl(entry)) return entry;
-            if (entry.startsWith('/') && !__rspack_external_node_path_c5b9b54f.isAbsolute(entry)) return __rspack_external_node_path_c5b9b54f.join(projectPath, entry.slice(1));
-            if (__rspack_external_node_path_c5b9b54f.isAbsolute(entry)) return entry;
-            return __rspack_external_node_path_c5b9b54f.join(manifestDir, entry);
-        };
+        const resolveEntryPath = (entry)=>resolveScriptEntryPath(entry, manifestDir, projectPath);
         const claimedByContentScript = new Set();
         for (const [feature, scriptPath] of Object.entries(scriptFields)){
             if (!isContentScriptFeature(feature)) continue;

package/dist/101.mjs

@@ -699,7 +699,7 @@ async function config_loader_isUsingExperimentalConfig(projectPath) {
     }
     return false;
 }
-var package_namespaceObject = /*#__PURE__*/ JSON.parse('{"rE":"4.1.9","El":{"@prefresh/core":"1.5.9","@prefresh/utils":"1.2.1","@rspack/core":"^2.1.1","@rspack/dev-server":"2.1.0","@rspack/plugin-preact-refresh":"2.0.1","@rspack/plugin-react-refresh":"2.0.2","@vue/compiler-sfc":"3.5.26","acorn":"^8.16.0","browser-extension-manifest-fields":"^2.3.0","case-sensitive-paths-webpack-plugin":"^2.4.0","content-security-policy-parser":"^0.6.0","dotenv":"^17.2.3","es-module-lexer":"^2.1.0","extension-from-store":"^0.2.5","fflate":"^0.8.3","go-git-it":"^5.1.5","ignore":"^7.0.5","less":"4.6.7","less-loader":"13.0.0","parse5-utilities":"^1.0.0","pintor":"0.3.0","postcss":"8.5.23","postcss-loader":"8.2.1","postcss-preset-env":"11.1.1","postcss-scss":"4.0.9","preact":"10.27.3","prefers-yarn":"2.0.1","react-refresh":"0.18.0","sass-loader":"17.0.0","schema-utils":"^4.3.3","svelte-loader":"3.2.4","tiny-glob":"^0.2.9","vue":"3.5.26","vue-loader":"17.4.2","webextension-polyfill":"^0.12.0","webpack-merge":"^6.0.1","webpack-target-webextension":"^2.1.3","ws":"^8.20.1"}}');
+var package_namespaceObject = /*#__PURE__*/ JSON.parse('{"rE":"4.1.11","El":{"@prefresh/core":"1.5.9","@prefresh/utils":"1.2.1","@rspack/core":"^2.1.1","@rspack/dev-server":"2.1.0","@rspack/plugin-preact-refresh":"2.0.1","@rspack/plugin-react-refresh":"2.0.2","@vue/compiler-sfc":"3.5.26","acorn":"^8.16.0","browser-extension-manifest-fields":"^2.3.1","case-sensitive-paths-webpack-plugin":"^2.4.0","content-security-policy-parser":"^0.6.0","dotenv":"^17.2.3","es-module-lexer":"^2.1.0","extension-from-store":"^0.2.5","fflate":"^0.8.3","go-git-it":"^5.1.5","ignore":"^7.0.5","less":"4.6.7","less-loader":"13.0.0","parse5-utilities":"^1.0.0","pintor":"0.3.0","postcss":"8.5.23","postcss-loader":"8.2.1","postcss-preset-env":"11.1.1","postcss-scss":"4.0.9","preact":"10.27.3","prefers-yarn":"2.0.1","react-refresh":"0.18.0","sass-loader":"17.0.0","schema-utils":"^4.3.3","svelte-loader":"3.2.4","tiny-glob":"^0.2.9","vue":"3.5.26","vue-loader":"17.4.2","webextension-polyfill":"^0.12.0","webpack-merge":"^6.0.1","webpack-target-webextension":"^2.1.3","ws":"^8.20.1"}}');
 function asAbsolute(p) {
     return __rspack_external_node_path_c5b9b54f.isAbsolute(p) ? p : __rspack_external_node_path_c5b9b54f.resolve(p);
 }

package/dist/291.mjs

@@ -23,4 +23,11 @@ function parseCanonicalContentScriptAsset(assetName) {
 function isCanonicalContentScriptAsset(assetName) {
     return void 0 !== parseCanonicalContentScriptAsset(assetName);
 }
-export { CANONICAL_CONTENT_SCRIPT_ENTRY_PREFIX, EXTENSIONJS_CONTENT_SCRIPT_LAYER, getCanonicalContentScriptCssAssetName, getCanonicalContentScriptEntryName, getCanonicalContentScriptJsAssetName, isCanonicalContentScriptAsset, parseCanonicalContentScriptAsset };
+const CONTENT_SCRIPT_CSS_PROBE_MARKER_PREFIX = '__EXTENSIONJS_CSS_PROBE__';
+function getContentScriptCssProbeMarker(entryName) {
+    return `${CONTENT_SCRIPT_CSS_PROBE_MARKER_PREFIX}${entryName}.css__`;
+}
+function createContentScriptCssProbeMarkerPattern() {
+    return /__EXTENSIONJS_CSS_PROBE__([^"'`\s\\]+?\.css)__/g;
+}
+export { CANONICAL_CONTENT_SCRIPT_ENTRY_PREFIX, CONTENT_SCRIPT_CSS_PROBE_MARKER_PREFIX, EXTENSIONJS_CONTENT_SCRIPT_LAYER, createContentScriptCssProbeMarkerPattern, getCanonicalContentScriptCssAssetName, getCanonicalContentScriptEntryName, getCanonicalContentScriptJsAssetName, getContentScriptCssProbeMarker, isCanonicalContentScriptAsset, parseCanonicalContentScriptAsset };