extension-develop 4.1.10 → 4.1.11

package/dist/0~rspack-config.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('?');
@@ -8099,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;
@@ -8120,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) {
@@ -8171,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);
@@ -8201,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;
@@ -8239,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":
@@ -8262,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:
@@ -9352,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);
@@ -9417,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);
 }
@@ -9442,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,
@@ -9505,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;
@@ -9512,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++;

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.10","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/839.mjs

@@ -1255,28 +1255,79 @@ async function dispatchReload(instruction, executor) {
         if (warning) console.warn(warning);
     }
 }
+function isForcedFullPath(normalized) {
+    return normalized.includes('manifest.json') || normalized.includes('_locales/');
+}
+function isHotAsset(normalized) {
+    return normalized.startsWith('hot/') || normalized.includes('.hot-update.');
+}
+function normalizeChangedPath(file, contextDir) {
+    const raw = String(file || '');
+    if (!raw) return;
+    const normalized = __rspack_external_node_path_c5b9b54f.isAbsolute(raw) ? __rspack_external_node_path_c5b9b54f.relative(contextDir, raw).replace(/\\/g, '/') : raw.replace(/\\/g, '/');
+    if (!normalized) return;
+    return normalized;
+}
+function pushChanged(into, file, contextDir, markForced) {
+    const normalized = normalizeChangedPath(file, contextDir);
+    if (!normalized) return;
+    if (!into.includes(normalized)) into.push(normalized);
+    if (isForcedFullPath(normalized)) markForced();
+}
 function createChangedSourcesTracker(compiler) {
     let forcedFull = false;
     let changedSources = [];
+    let heldForcedFull = false;
+    let heldSources = [];
+    let writtenAssets = [];
+    const contextDir = ()=>compiler.options.context || '';
+    const ingest = (files, into, markForced)=>{
+        if (!files) return;
+        const ctx = contextDir();
+        for (const file of files)pushChanged(into, file, ctx, markForced);
+    };
+    const foldRecoveryIntoCurrent = ()=>{
+        const recovering = heldSources.length > 0 || heldForcedFull;
+        if (!recovering) return;
+        for (const file of heldSources)if (!changedSources.includes(file)) changedSources.push(file);
+        for (const file of writtenAssets)if (!changedSources.includes(file)) changedSources.push(file);
+        forcedFull = forcedFull || heldForcedFull || writtenAssets.some((file)=>isForcedFullPath(file));
+        heldSources = [];
+        heldForcedFull = false;
+    };
+    const markForced = ()=>{
+        forcedFull = true;
+    };
     compiler.hooks.watchRun.tap('extjs-reload-changed-sources', ()=>{
         forcedFull = false;
         changedSources = [];
-        const modifiedFiles = compiler.modifiedFiles;
-        if (!modifiedFiles || 0 === modifiedFiles.size) return;
-        const contextDir = compiler.options.context || '';
-        for (const file of modifiedFiles){
-            const normalized = __rspack_external_node_path_c5b9b54f.relative(contextDir, file).replace(/\\/g, '/');
-            if (normalized) {
-                changedSources.push(normalized);
-                if (normalized.includes('manifest.json') || normalized.includes('_locales/')) forcedFull = true;
-            }
+        writtenAssets = [];
+        ingest(compiler.modifiedFiles, changedSources, markForced);
+    });
+    compiler.hooks.done?.tap?.('extjs-reload-changed-sources-done', (stats)=>{
+        const compilation = stats?.compilation;
+        ingest(compilation?.modifiedFiles, changedSources, markForced);
+        ingest(compiler.modifiedFiles, changedSources, markForced);
+        if (compilation?.errors && compilation.errors.length > 0) {
+            heldForcedFull = heldForcedFull || forcedFull;
+            for (const file of changedSources)if (!heldSources.includes(file)) heldSources.push(file);
+            return;
         }
+        foldRecoveryIntoCurrent();
+    });
+    compiler.hooks.assetEmitted?.tap?.('extjs-reload-changed-sources-emitted', (file)=>{
+        const normalized = normalizeChangedPath(file, contextDir());
+        if (!normalized || isHotAsset(normalized)) return;
+        if (!writtenAssets.includes(normalized)) writtenAssets.push(normalized);
     });
     return {
-        snapshot: ()=>({
+        snapshot: ()=>{
+            foldRecoveryIntoCurrent();
+            return {
                 forcedFull,
                 changedSources
-            })
+            };
+        }
     };
 }
 function formatReloadContextLabel(context, files) {

package/dist/feature-scripts-native-geturl-import-loader.mjs

@@ -1,17 +1,79 @@
 import { createRequire as __extjsCreateRequire } from "node:module"; const require = __extjsCreateRequire(import.meta.url);
 const GETURL_ARG = /\bruntime\s*\.\s*getURL\s*\(/;
 const BARE_IDENTIFIER = /^[A-Za-z_$][\w$]*$/;
-function identifierBoundToGetURL(source, name) {
-    const id = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    const rhs = '[^;\\n]*\\bruntime\\s*\\.\\s*getURL\\s*\\(';
-    const declared = new RegExp('\\b(?:const|let|var)\\s+' + id + '\\s*=' + rhs);
-    const assigned = new RegExp('(?:^|[^\\w$.])' + id + '\\s*=(?!=)' + rhs);
-    return declared.test(source) || assigned.test(source);
+const MEMBER_PATH = /^[A-Za-z_$][\w$]*(?:\s*\.\s*[A-Za-z_$][\w$]*)+$/;
+const escapeId = (name)=>name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+function codeOnly(source) {
+    let out = '';
+    const n = source.length;
+    let i = 0;
+    let prevSignificant = '';
+    while(i < n){
+        const char = source[i];
+        const next = source[i + 1];
+        if ('/' === char && '/' === next) {
+            while(i < n && '\n' !== source[i])i++;
+            continue;
+        }
+        if ('/' === char && '*' === next) {
+            const end = source.indexOf('*/', i + 2);
+            i = -1 === end ? n : end + 2;
+            continue;
+        }
+        if ('"' === char || "'" === char || '`' === char) {
+            const close = skipString(source, i, n);
+            out += source.slice(i, close + 1);
+            i = close + 1;
+            prevSignificant = char;
+            continue;
+        }
+        if ('/' === char && regexCanStart(prevSignificant)) {
+            i = skipRegex(source, i, n) + 1;
+            prevSignificant = '/';
+            continue;
+        }
+        out += char;
+        if (!/\s/.test(char)) prevSignificant = char;
+        i++;
+    }
+    return out;
+}
+const RHS = '[\\s\\S]{0,400}?\\bruntime\\s*\\.\\s*getURL\\s*\\(';
+const TYPE_ANNOTATION = '(?:\\s*:[^=;\\n]{0,120})?';
+function identifierBoundToGetURL(code, name) {
+    const id = escapeId(name);
+    const declared = new RegExp('\\b(?:const|let|var)\\s+' + id + TYPE_ANNOTATION + '\\s*=' + RHS);
+    const assigned = new RegExp('(?:^|[^\\w$.])' + id + '\\s*=(?!=)' + RHS);
+    return declared.test(code) || assigned.test(code);
+}
+function memberBoundToGetURL(code, path) {
+    const parts = path.split('.').map((p)=>p.trim());
+    const leaf = escapeId(parts[parts.length - 1]);
+    const root = escapeId(parts[0]);
+    const property = new RegExp('\\b(?:const|let|var)\\s+' + root + TYPE_ANNOTATION + '\\s*=[\\s\\S]{0,400}?\\b' + leaf + '\\s*:[^,}]{0,200}?\\bruntime\\s*\\.\\s*getURL\\s*\\(');
+    const assigned = new RegExp('(?:^|[^\\w$])' + escapeId(path.replace(/\s+/g, '')) + '\\s*=(?!=)' + RHS);
+    return property.test(code) || assigned.test(code.replace(/\s*\.\s*/g, '.'));
+}
+function firstArgument(args) {
+    let depth = 0;
+    for(let i = 0; i < args.length; i++){
+        const char = args[i];
+        if ('"' === char || "'" === char || '`' === char) {
+            i = skipString(args, i, args.length);
+            continue;
+        }
+        if ('(' === char || '[' === char || '{' === char) depth++;
+        else if (')' === char || ']' === char || '}' === char) depth--;
+        else if (',' === char && 0 === depth) return args.slice(0, i);
+    }
+    return args;
 }
 function annotateGetURLDynamicImports(source) {
     const insertions = [];
     const n = source.length;
     let i = 0;
+    let cachedCode = null;
+    const bindingSource = ()=>cachedCode ??= codeOnly(source);
     let prevSignificant = '';
     while(i < n){
         const char = source[i];
@@ -41,9 +103,11 @@ function annotateGetURLDynamicImports(source) {
             if ('(' === source[j]) {
                 const args = readBalancedArgs(source, j);
                 if (null != args && !args.includes('webpackIgnore')) {
-                    const direct = GETURL_ARG.test(args);
-                    const name = args.trim();
-                    if (direct || BARE_IDENTIFIER.test(name) && identifierBoundToGetURL(source, name)) insertions.push(j + 1);
+                    const specifier = firstArgument(args);
+                    const direct = GETURL_ARG.test(specifier);
+                    const name = specifier.trim();
+                    const code = bindingSource();
+                    if (direct || BARE_IDENTIFIER.test(name) && identifierBoundToGetURL(code, name) || MEMBER_PATH.test(name) && memberBoundToGetURL(code, name)) insertions.push(j + 1);
                 }
             }
             prevSignificant = 't';

package/dist/plugin-reload/reload-dispatch.d.ts

@@ -17,7 +17,7 @@ export declare function dispatchReload(instruction: ReloadInstruction | undefine
 export interface ChangedSourcesSnapshot {
     /** A manifest.json / _locales change, forces a full reload regardless of which other files changed. */
     forcedFull: boolean;
-    /** Project-relative, forward-slashed paths of every file changed since the last compile. */
+    /** Project-relative, forward-slashed paths of every file changed since the last successful compile. */
     changedSources: string[];
 }
 export interface ChangedSourcesTracker {

package/dist/plugin-web-extension/feature-html/html-lib/assets.d.ts

@@ -1,3 +1,4 @@
-import * as parse5utilities from 'parse5-utilities';
+import type * as parse5utilities from 'parse5-utilities';
 import type { FilepathList } from '../../../types';
-export declare function handleStaticAsset(compilation: unknown, htmlEntry: string, htmlDir: string, absolutePath: string, assetType: 'staticSrc' | 'staticHref', cleanPath: string, search: string | undefined, hash: string | undefined, baseHref: string | undefined, includeList: FilepathList, extname: string, childNode: parse5utilities.ParsedNode): parse5utilities.ParsedNode;
+import type { HtmlStaticAttribute } from './parse-html';
+export declare function handleStaticAsset(compilation: unknown, htmlEntry: string, htmlDir: string, absolutePath: string, assetType: 'staticSrc' | 'staticHref', cleanPath: string, search: string | undefined, hash: string | undefined, baseHref: string | undefined, includeList: FilepathList, extname: string, childNode: parse5utilities.ParsedNode, attributeName?: HtmlStaticAttribute): parse5utilities.ParsedNode;

package/dist/plugin-web-extension/feature-html/html-lib/parse-html.d.ts

@@ -1,8 +1,10 @@
 import type * as parse5utilities from 'parse5-utilities';
+export type HtmlStaticAttribute = 'src' | 'href' | 'poster' | 'srcset' | 'imagesrcset';
 interface OnResourceFoundOptions {
     filePath: string;
     childNode: ReturnType<typeof parse5utilities.createNode>;
     assetType: 'script' | 'css' | 'staticSrc' | 'staticHref';
+    attributeName?: HtmlStaticAttribute;
 }
 export declare function parseHtml(node: ReturnType<typeof parse5utilities.createNode>, onResourceFound: (options: OnResourceFoundOptions) => void): void;
 export {};

package/dist/plugin-web-extension/feature-html/html-lib/utils.d.ts

@@ -1,4 +1,6 @@
+import * as parse5utilities from 'parse5-utilities';
 import type { FilepathList } from '../../../types';
+import { type HtmlStaticAttribute } from './parse-html';
 export interface ParsedHtmlAsset {
     css?: string[];
     js?: string[];
@@ -12,6 +14,10 @@ export declare function getExtname(filePath: string): string;
 export declare function getFilePath(filePath: string, extension: string, isPublic: boolean): string;
 export declare function isFromIncludeList(filePath: string, includeList?: FilepathList): boolean;
 export declare function isUrl(src: string): boolean;
+export type { HtmlStaticAttribute };
+export declare function resolveStaticAttributeName(assetType: 'staticSrc' | 'staticHref', attributeName?: HtmlStaticAttribute): HtmlStaticAttribute;
+export declare function rewriteSrcsetCandidate(srcset: string, fromCleanPath: string, toUrl: string): string;
+export declare function applyRewrittenStaticUrl(node: parse5utilities.ParsedNode, attributeName: HtmlStaticAttribute, cleanPath: string, value: string): parse5utilities.ParsedNode;
 export declare function cleanAssetUrl(url: string): {
     cleanPath: string;
     hash: string;

package/dist/plugin-web-extension/feature-json/resolve-json-resource.d.ts

@@ -0,0 +1,6 @@
+export interface ResolvedJsonResource {
+    abs: string;
+    isUnderPublic: boolean;
+    isPublicRoot: boolean;
+}
+export declare function resolveJsonResource(thisResource: string, manifestDir: string, projectPath: string): ResolvedJsonResource;

package/dist/plugin-web-extension/feature-manifest/manifest-overrides/common/storage.d.ts

@@ -1,5 +1,5 @@
 import type { Manifest } from '../../../../types';
-export declare function storage(manifest: Manifest): {
+export declare function storage(manifest: Manifest, manifestPath?: string): {
     storage: {
         managed_schema?: string | undefined;
     };

package/dist/plugin-web-extension/feature-manifest/manifest-overrides/mv3/declarative_net_request.d.ts

@@ -1,2 +1,2 @@
 import type { Manifest } from '../../../../types';
-export declare function declarativeNetRequest(manifest: Manifest): any;
+export declare function declarativeNetRequest(manifest: Manifest, manifestPath?: string): any;

package/dist/plugin-web-extension/feature-manifest/manifest-overrides/mv3/index.d.ts

@@ -1,2 +1,2 @@
 import type { Manifest } from '../../../../types';
-export declare function manifestV3(manifest: Manifest): any;
+export declare function manifestV3(manifest: Manifest, manifestPath?: string): any;

package/package.json

@@ -43,7 +43,7 @@
     "runtime"
   ],
   "name": "extension-develop",
-  "version": "4.1.10",
+  "version": "4.1.11",
   "description": "Develop, build, preview, and package Extension.js projects.",
   "author": {
     "name": "Cezar Augusto",
@@ -99,7 +99,7 @@
     "@rspack/plugin-react-refresh": "2.0.2",
     "@vue/compiler-sfc": "3.5.26",
     "acorn": "^8.16.0",
-    "browser-extension-manifest-fields": "^2.3.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",