extension-develop 4.0.26 → 4.0.27

package/dist/0~rspack-config.mjs

@@ -12,7 +12,7 @@ import { filterKeysForThisBrowser as external_browser_extension_manifest_fields_
 import content_security_policy_parser from "content-security-policy-parser";
 import node_fs from "node:fs";
 import node_path from "node:path";
-import { debugExtensionsToLoad, package_namespaceObject, getDirs, asAbsolute, browserRunnerDisabled, treeWithDistFilesBrowser, packagingDistributionFiles, toPosixPath, resolveCompanionExtensionDirs, debugContextPath, PlaywrightPlugin, isGeckoBasedBrowser, spacerLine, messages_ready, CHROMIUM_FAMILY_ALIASES, treeWithSourceAndDistFiles, computeExtensionsToLoad, noCompanionExtensionsResolved, treeWithSourceFiles, bundlerFatalError, bundlerRecompiling, noEntrypointsDetected, GECKO_FAMILY_ALIASES, packagingSourceFiles, debugBrowser, debugOutputPath, manifestInvalidJson, isChromiumBasedBrowser, getSpecialFoldersDataForCompiler } from "./101.mjs";
+import { debugExtensionsToLoad, package_namespaceObject, getDirs, asAbsolute, browserRunnerDisabled, treeWithDistFilesBrowser, packagingDistributionFiles, toPosixPath, resolveCompanionExtensionDirs, debugContextPath, PlaywrightPlugin, isWebkitBasedBrowser, spacerLine, isGeckoBasedBrowser, messages_ready, CHROMIUM_FAMILY_ALIASES, treeWithSourceAndDistFiles, computeExtensionsToLoad, noCompanionExtensionsResolved, treeWithSourceFiles, bundlerFatalError, bundlerRecompiling, noEntrypointsDetected, GECKO_FAMILY_ALIASES, packagingSourceFiles, debugBrowser, debugOutputPath, manifestInvalidJson, isChromiumBasedBrowser, getSpecialFoldersDataForCompiler } from "./101.mjs";
 import { stripBom, parseJsonSafe } from "./23.mjs";
 import { isResourceUnderDirs, canonicalizeDir, toResourceKey } from "./93.mjs";
 import { prefix as messaging_prefix, isDebug } from "./349.mjs";
@@ -377,6 +377,7 @@ class BoringPlugin {
     browser;
     sawUserInvalidation = false;
     printedStartupSuccess = false;
+    printedStartupWarning = false;
     lastKnownManifestName;
     constructor(options){
         this.manifestPath = options.manifestPath;
@@ -386,6 +387,7 @@ class BoringPlugin {
         compiler.hooks.watchClose.tap('develop:brand:watch-close', ()=>{
             this.sawUserInvalidation = false;
             this.printedStartupSuccess = false;
+            this.printedStartupWarning = false;
         });
         compiler.hooks.done.tap('develop:brand', (stats)=>{
             const hasErrors = Boolean(stats?.hasErrors?.());
@@ -396,8 +398,10 @@ class BoringPlugin {
             let manifestName;
             try {
                 const parsedName = parseJsonSafe(__rspack_external_node_fs_5ea92f0c.readFileSync(this.manifestPath, 'utf-8')).name;
-                if ('string' == typeof parsedName && parsedName) this.lastKnownManifestName = parsedName;
-                manifestName = parsedName;
+                if ('string' == typeof parsedName && parsedName) {
+                    this.lastKnownManifestName = parsedName;
+                    manifestName = parsedName;
+                } else manifestName = this.lastKnownManifestName;
             } catch  {
                 manifestName = this.lastKnownManifestName;
             }
@@ -413,16 +417,22 @@ class BoringPlugin {
                 ].map((file)=>String(file).replace(/\\/g, '/'));
                 if (!this.sawUserInvalidation && modifiedFiles.length > 0) {
                     const context = String(compiler?.options?.context || '').replace(/\\/g, '/');
+                    const outputPath = String(compiler?.options?.output?.path || '').replace(/\\/g, '/');
+                    const distRoot = context ? `${context}/dist` : '';
+                    const isUnderRoot = (file, root)=>'' !== root && (file === root || file.startsWith(`${root}/`));
                     const hasUserFileChange = modifiedFiles.some((file)=>{
                         const inProject = !context || file.startsWith(`${context}/`);
-                        const isGenerated = file.includes('/dist/') || file.includes('/extension-js/profiles/');
+                        const isGenerated = isUnderRoot(file, outputPath) || isUnderRoot(file, distRoot) || file.includes('/extension-js/profiles/');
                         return inProject && !isGenerated;
                     });
                     if (hasUserFileChange) this.sawUserInvalidation = true;
                 }
-                if (browserLaunchEnabled && !hasErrors && !hasWarnings) {
-                    if (!this.sawUserInvalidation) if (this.printedStartupSuccess) return;
-                    else this.printedStartupSuccess = true;
+                if (browserLaunchEnabled && !hasErrors && !this.sawUserInvalidation) if (hasWarnings) {
+                    if (this.printedStartupWarning) return;
+                    this.printedStartupWarning = true;
+                } else {
+                    if (this.printedStartupSuccess) return;
+                    this.printedStartupSuccess = true;
                 }
                 humanLine(line);
             } catch  {}
@@ -436,7 +446,8 @@ class CleanDistFolderPlugin {
     }
     apply(compiler) {
         const logger = compiler.getInfrastructureLogger('plugin-compilation:clean');
-        const distPath = __rspack_external_node_path_c5b9b54f.join(compiler.options.context, 'dist', this.options.browser);
+        const configuredOutputPath = compiler.options.output?.path;
+        const distPath = 'string' == typeof configuredOutputPath && configuredOutputPath ? configuredOutputPath : __rspack_external_node_path_c5b9b54f.join(compiler.options.context, 'dist', this.options.browser);
         if (__rspack_external_node_fs_5ea92f0c.existsSync(distPath)) {
             const removedCount = countFilesRecursively(distPath);
             if (isDebug()) console.log(cleanDistStarting(distPath));
@@ -1305,6 +1316,23 @@ function isCompanionExtension(file) {
     const [first] = toPosix(file).split('/');
     return first === COMPANION_DIR;
 }
+const DENIED_SEGMENTS = new Set([
+    '.git',
+    '.extension-js',
+    'node_modules'
+]);
+const SESSION_ARTIFACTS_PREFIX = 'dist/extension-js';
+function isDeniedEnvFile(basename) {
+    if (!basename.startsWith('.env')) return false;
+    return !basename.endsWith('.example');
+}
+function isDeniedFromSourceZip(file) {
+    const posix = toPosix(file);
+    const segments = posix.split('/');
+    if (segments.some((segment)=>DENIED_SEGMENTS.has(segment))) return true;
+    if (isDeniedEnvFile(segments[segments.length - 1])) return true;
+    return posix === SESSION_ARTIFACTS_PREFIX || posix.startsWith(`${SESSION_ARTIFACTS_PREFIX}/`);
+}
 async function getFilesToZip(projectDir) {
     const gitignorePath = __rspack_external_node_path_c5b9b54f.join(projectDir, '.gitignore');
     const ig = ignore();
@@ -1314,9 +1342,11 @@ async function getFilesToZip(projectDir) {
     } catch  {}
     const files = await tiny_glob('**/*', {
         cwd: projectDir,
-        dot: true
+        dot: true,
+        filesOnly: true,
+        flush: true
     });
-    return files.filter((file)=>!ig.ignores(file) && !isCompanionExtension(file));
+    return files.filter((file)=>!isDeniedFromSourceZip(file) && !ig.ignores(file) && !isCompanionExtension(file));
 }
 class ZipPlugin {
     options;
@@ -2928,7 +2958,7 @@ const cloneParsedHtmlAsset = (assets)=>({
         ]
     });
 const assetsFromHtmlCache = new Map();
-function getAssetsFromHtml(htmlFilePath, htmlContent, publicPath = 'public') {
+function getAssetsFromHtml(htmlFilePath, htmlContent) {
     const assets = {
         css: [],
         js: [],
@@ -2939,7 +2969,7 @@ function getAssetsFromHtml(htmlFilePath, htmlContent, publicPath = 'public') {
     let cacheKey;
     if (void 0 === htmlContent) try {
         const stat = __rspack_external_node_fs_5ea92f0c.statSync(htmlFilePath);
-        cacheKey = `${stat.mtimeMs}:${stat.size}:${publicPath}`;
+        cacheKey = `${stat.mtimeMs}:${stat.size}`;
         const cached = assetsFromHtmlCache.get(htmlFilePath);
         if (cached && cached.key === cacheKey) return cloneParsedHtmlAsset(cached.assets);
     } catch  {
@@ -2983,6 +3013,11 @@ function getAssetsFromHtml(htmlFilePath, htmlContent, publicPath = 'public') {
             }
         });
     } catch (error) {
+        const code = error?.code;
+        if (void 0 === htmlContent && 'ENOENT' === code) {
+            assetsFromHtmlCache.delete(htmlFilePath);
+            throw error;
+        }
         return assets;
     }
     if (cacheKey) assetsFromHtmlCache.set(htmlFilePath, {
@@ -2995,6 +3030,7 @@ function getHtmlPageDeclaredAssetPath(filepathList, filePath, extension) {
     const entryname = Object.keys(filepathList).find((key)=>{
         const includePath = filepathList[key];
         if (includePath === filePath) return true;
+        if (!includePath || !__rspack_external_node_fs_5ea92f0c.existsSync(includePath)) return false;
         const assets = getAssetsFromHtml(includePath);
         return Boolean(assets?.js?.includes(filePath) || assets?.css?.includes(filePath));
     }) || '';
@@ -3872,6 +3908,7 @@ class PerfBudgetsPlugin {
         });
     }
 }
+const CONTROL_PORT_ASSET_NAME = 'extension-js-control.json';
 const BRIDGE_PRODUCER_SOURCE = `;(function () {
   try {
     var g = (typeof globalThis === "object" && globalThis) ? globalThis : this;
@@ -3913,12 +3950,24 @@ const BRIDGE_PRODUCER_SOURCE = `;(function () {
       } catch (e) { /* non-fatal: trigger falls back to its no-listener reply */ }
     }
 
-    // Use g.chrome (not the hoisted chrome var below). This runs first.
+    // Use the raw globals (not the hoisted chrome var below). This runs first.
+    // On Gecko browser.* is a DISTINCT wrapper object: hook BOTH namespaces.
     var actionClickedListeners = [];
     var commandListeners = [];
-    if (g.chrome) {
-      captureEvent(g.chrome.action && g.chrome.action.onClicked, actionClickedListeners);
-      captureEvent(g.chrome.commands && g.chrome.commands.onCommand, commandListeners);
+    var capturedEvents = [];
+    function captureEventOnce(event, sink) {
+      // Polyfilled extensions expose ONE event object on both namespaces:
+      // wrap it once, and the sink dedupes callbacks shared across wrappers.
+      if (!event || capturedEvents.indexOf(event) !== -1) return;
+      capturedEvents.push(event);
+      captureEvent(event, sink);
+    }
+    var captureNamespaces = [g.chrome, g.browser];
+    for (var cn = 0; cn < captureNamespaces.length; cn++) {
+      var capNS = captureNamespaces[cn];
+      if (!capNS) continue;
+      captureEventOnce(capNS.action && capNS.action.onClicked, actionClickedListeners);
+      captureEventOnce(capNS.commands && capNS.commands.onCommand, commandListeners);
     }
 
     var LEVELS = ["log", "info", "warn", "error", "debug", "trace"];
@@ -3927,6 +3976,7 @@ const BRIDGE_PRODUCER_SOURCE = `;(function () {
     var queue = [];
     var backoff = 250;
     var MAX_BACKOFF = 5000;
+    var connectFailures = 0;
     var MAX_QUEUE = 1000;
     var MAX_RESULT_BYTES = 256 * 1024;
 
@@ -4695,10 +4745,36 @@ const BRIDGE_PRODUCER_SOURCE = `;(function () {
       if (queue.length < MAX_QUEUE) queue.push(frame);
     }
 
+    // The baked PORT is a snapshot of an ephemeral port. After a dev-server
+    // restart, the port file shipped in the unpacked extension names the
+    // live one, and unpacked resources are read from disk on every fetch.
+    function refreshControlPort(done) {
+      try {
+        var runtime = (g.chrome && g.chrome.runtime) || (g.browser && g.browser.runtime);
+        if (!runtime || typeof runtime.getURL !== "function" || typeof g.fetch !== "function") { done(); return; }
+        g.fetch(runtime.getURL("extension-js-control.json"), {cache: "no-store"})
+          .then(function (res) { return res.json(); })
+          .then(function (data) {
+            var next = data && parseInt(data.port, 10);
+            if (next && next > 0 && next < 65536 && next !== PORT) PORT = next;
+            done();
+          })
+          .catch(function () { done(); });
+      } catch (e) { done(); }
+    }
+
     function schedule() {
       var delay = backoff;
       backoff = Math.min(backoff * 2, MAX_BACKOFF);
-      try { setTimeout(connect, delay); } catch (e) {
+      connectFailures++;
+      try {
+        setTimeout(function () {
+          // Two straight failures make the baked port suspect (a restarted
+          // server dials out on a new port): re-resolve before re-dialing.
+          if (connectFailures >= 2) refreshControlPort(connect);
+          else connect();
+        }, delay);
+      } catch (e) {
         // Ignore
       }
     }
@@ -4713,6 +4789,7 @@ const BRIDGE_PRODUCER_SOURCE = `;(function () {
       socket.onopen = function () {
         open = true;
         backoff = 250;
+        connectFailures = 0;
         try {
           socket.send(JSON.stringify({type: "hello", v: 1, role: "producer", instanceId: INSTANCE_ID}));
         } catch (e) {
@@ -5171,6 +5248,10 @@ class InjectBridgeProducer {
                 name: InjectBridgeProducer.name,
                 stage: core_Compilation.PROCESS_ASSETS_STAGE_REPORT + 101
             }, ()=>{
+                if (!compilation.getAsset(CONTROL_PORT_ASSET_NAME)) compilation.emitAsset(CONTROL_PORT_ASSET_NAME, new core_sources.RawSource(JSON.stringify({
+                    port: controlPort,
+                    instanceId
+                })));
                 for (const asset of compilation.getAssets()){
                     if (!BACKGROUND_ASSET.test(asset.name)) continue;
                     const original = asset.source.source().toString();
@@ -7485,31 +7566,29 @@ class StaticAssetsPlugin {
                 }
             }
         };
-        const hasCustomSvgRule = compiler.options.module.rules.some((thisRule)=>{
+        const isFullCustomRuleFor = (thisRule, sample)=>{
             const rule = thisRule;
-            return Boolean(rule && rule.test instanceof RegExp && rule.test.test('.svg') && void 0 !== rule.use);
-        });
+            return Boolean(rule && rule.test instanceof RegExp && rule.test.test(sample) && (void 0 !== rule.type || void 0 !== rule.use) && void 0 === rule.resourceQuery);
+        };
+        const scopedQueriesFor = (sample)=>compiler.options.module.rules.map((thisRule)=>thisRule).filter((rule)=>Boolean(rule && rule.test instanceof RegExp && rule.test.test(sample) && (void 0 !== rule.type || void 0 !== rule.use) && rule.resourceQuery instanceof RegExp)).map((rule)=>rule?.resourceQuery);
+        const hasCustomSvgRule = compiler.options.module.rules.some((thisRule)=>isFullCustomRuleFor(thisRule, '.svg'));
         const hasUrlResourceQueryRule = compiler.options.module.rules.some((thisRule)=>{
             const rule = thisRule;
             const resourceQuery = rule?.resourceQuery;
             if (!(resourceQuery instanceof RegExp)) return false;
             return resourceQuery.test('?url');
         });
-        const hasCustomFontsRule = compiler.options.module.rules.some((thisRule)=>{
-            const rule = thisRule;
-            if (!rule || !(rule.test instanceof RegExp)) return false;
-            if (!rule.test.test('.woff')) return false;
-            return void 0 !== rule.type || void 0 !== rule.use;
-        });
+        const hasCustomFontsRule = compiler.options.module.rules.some((thisRule)=>isFullCustomRuleFor(thisRule, '.woff'));
+        const svgScopedQueries = scopedQueriesFor('.svg');
+        const fontsScopedQueries = scopedQueriesFor('.woff');
         const loaders = [
-            ...hasUrlResourceQueryRule ? [] : [
-                {
-                    resourceQuery: /(?:^\?|&)url(?:&|=|$)/,
-                    type: 'asset/resource'
-                }
-            ],
             ...hasCustomSvgRule ? [] : [
-                defaultSvgRule
+                svgScopedQueries.length ? {
+                    ...defaultSvgRule,
+                    resourceQuery: {
+                        not: svgScopedQueries
+                    }
+                } : defaultSvgRule
             ],
             {
                 test: /\.(png|jpg|jpeg|gif|webp|avif|ico|bmp)$/i,
@@ -7529,7 +7608,12 @@ class StaticAssetsPlugin {
                     type: 'asset',
                     generator: {
                         filename: filenamePattern
-                    }
+                    },
+                    ...fontsScopedQueries.length ? {
+                        resourceQuery: {
+                            not: fontsScopedQueries
+                        }
+                    } : {}
                 }
             ],
             {
@@ -7543,7 +7627,16 @@ class StaticAssetsPlugin {
                         maxSize: 2048
                     }
                 }
-            }
+            },
+            ...hasUrlResourceQueryRule ? [] : [
+                {
+                    resourceQuery: /(?:^\?|&)url(?:&|=|$)/,
+                    type: 'asset/resource',
+                    generator: {
+                        filename: filenamePattern
+                    }
+                }
+            ]
         ];
         compiler.options.module.rules = [
             ...compiler.options.module.rules,
@@ -8347,9 +8440,9 @@ class AddToFileDependencies {
                 for (const field of Object.entries(allEntries)){
                     const [, resource] = field;
                     if (resource) {
-                        const resourceData = getAssetsFromHtml(resource);
                         const fileDependencies = new Set(compilation.fileDependencies);
                         if (__rspack_external_node_fs_5ea92f0c.existsSync(resource)) {
+                            const resourceData = getAssetsFromHtml(resource);
                             const fileResources = [
                                 resource,
                                 ...resourceData?.static || []
@@ -8576,8 +8669,9 @@ class ThrowIfRecompileIsNeeded {
             if (changedFile && this.initialHtmlAssets[changedFile]) {
                 const isRemoteUrl = (p)=>/^(https?:)?\/\//i.test(p);
                 const looksLikePublicRootUrl = (p)=>p.startsWith('/') && !__rspack_external_node_fs_5ea92f0c.existsSync(p);
-                const updatedJsEntries = (getAssetsFromHtml(changedFile)?.js || []).filter((p)=>!looksLikePublicRootUrl(p) && !isRemoteUrl(p));
-                const updatedCssEntries = (getAssetsFromHtml(changedFile)?.css || []).filter((p)=>!looksLikePublicRootUrl(p) && !isRemoteUrl(p));
+                const updatedAssets = __rspack_external_node_fs_5ea92f0c.existsSync(changedFile) ? getAssetsFromHtml(changedFile) : void 0;
+                const updatedJsEntries = (updatedAssets?.js || []).filter((p)=>!looksLikePublicRootUrl(p) && !isRemoteUrl(p));
+                const updatedCssEntries = (updatedAssets?.css || []).filter((p)=>!looksLikePublicRootUrl(p) && !isRemoteUrl(p));
                 const { js, css } = this.initialHtmlAssets[changedFile];
                 if (this.hasEntriesChanged(updatedCssEntries, css) || this.hasEntriesChanged(updatedJsEntries, js)) {
                     const projectRoot = __rspack_external_node_path_c5b9b54f.dirname(this.manifestPath);
@@ -8985,6 +9079,24 @@ function invalidRulesetStructure(manifestField, file) {
         "Update the file to contain an array of rules."
     ].join('\n');
 }
+function invalidRulesetRule(manifestField, file, ruleIndex, reason) {
+    return [
+        `The Declarative Net Request ruleset listed in ${pintor.blue(manifestField)} has a rule Chrome rejects at load.`,
+        `${pintor.gray('PATH')} ${pintor.underline(file)}`,
+        `${pintor.gray('RULE')} ${pintor.underline(`index ${ruleIndex}`)}`,
+        `${pintor.gray('REASON')} ${pintor.underline(reason)}`,
+        "Give every rule an integer id of 1 or more, an action with a type, and a condition object."
+    ].join('\n');
+}
+function rulesetRuleShapeIssue(manifestField, file, ruleIndex, reason) {
+    return [
+        `A rule in the Declarative Net Request ruleset listed in ${pintor.blue(manifestField)} may not behave as intended.`,
+        `${pintor.gray('PATH')} ${pintor.underline(file)}`,
+        `${pintor.gray('RULE')} ${pintor.underline(`index ${ruleIndex}`)}`,
+        `${pintor.gray('REASON')} ${pintor.underline(reason)}`,
+        `Check the rule against the Declarative Net Request rule schema.\nThe build continues.`
+    ].join('\n');
+}
 function invalidManagedSchemaStructure(manifestField, file) {
     return [
         `The managed storage schema listed in ${pintor.blue(manifestField)} isn't a schema object.`,
@@ -9005,6 +9117,22 @@ function jsonIncludeSummary(totalFeatures, criticalCount) {
 function isCriticalJsonFeature(feature) {
     return feature.startsWith('declarative_net_request') || 'storage.managed_schema' === feature;
 }
+function isPlainObject(value) {
+    return 'object' == typeof value && null !== value && !Array.isArray(value);
+}
+function getDnrRuleRejection(rule) {
+    if (!isPlainObject(rule)) return 'the rule is not an object';
+    const id = rule.id;
+    if ('number' != typeof id || !Number.isInteger(id) || id < 1) return 'the rule id is not a positive integer';
+    const action = rule.action;
+    if (!isPlainObject(action)) return 'the rule has no action object';
+    if ('string' != typeof action.type || 0 === action.type.length) return 'the rule action has no type';
+    if (!isPlainObject(rule.condition)) return 'the rule has no condition object';
+}
+function getDnrRuleSoftIssue(rule) {
+    const priority = rule.priority;
+    if (void 0 !== priority && ('number' != typeof priority || !Number.isInteger(priority) || priority < 1)) return 'the rule priority is not a positive integer';
+}
 function validateJsonAsset(compilation, feature, filePath, buf) {
     let parsed;
     try {
@@ -9024,6 +9152,23 @@ function validateJsonAsset(compilation, feature, filePath, buf) {
             compilation.errors.push(err);
             return false;
         }
+        for(let index = 0; index < parsed.length; index++){
+            const rejection = getDnrRuleRejection(parsed[index]);
+            if (rejection) {
+                const err = new core_WebpackError(invalidRulesetRule(feature, filePath, index, rejection));
+                err.file = filePath;
+                err.name = 'DNRInvalidRule';
+                compilation.errors.push(err);
+                return false;
+            }
+            const softIssue = getDnrRuleSoftIssue(parsed[index]);
+            if (softIssue) {
+                const warn = new core_WebpackError(rulesetRuleShapeIssue(feature, filePath, index, softIssue));
+                warn.file = filePath;
+                warn.name = 'DNRRuleShapeIssue';
+                compilation.warnings.push(warn);
+            }
+        }
     } else if ('storage.managed_schema' === feature) {
         if (null === parsed || Array.isArray(parsed) || 'object' != typeof parsed) {
             const err = new core_WebpackError(invalidManagedSchemaStructure(feature, filePath));
@@ -9462,6 +9607,12 @@ function invalidThemeValue(field, detail, value) {
     lines.push(`${pintor.red('INVALID VALUE')} ${value}`);
     return lines.join('\n');
 }
+function themeNotSupportedByBrowser(browser) {
+    const lines = [];
+    lines.push(`${messaging_prefix('warn')} ${pintor.blue(browser)} does not support the ${pintor.yellow('theme')} field.`);
+    lines.push("The field ships unchanged in the manifest and Safari ignores it.");
+    return lines.join('\n');
+}
 function missingGeckoDataCollectionPermissions() {
     const lines = [];
     lines.push(`${messaging_prefix('warn')} addons.mozilla.org requires ${pintor.blue('browser_specific_settings.gecko.data_collection_permissions')} for new add-ons.`);
@@ -9933,6 +10084,99 @@ class ManifestLegacyWarnings {
         });
     }
 }
+const EMITTED_ASSET_REF_PATTERN = /assets\/[A-Za-z0-9._-]+(?:\/[A-Za-z0-9._-]+)*/g;
+function forEachStringKey(objectOrMap, callback) {
+    if (!objectOrMap) return;
+    if (objectOrMap instanceof Map) {
+        const keys = objectOrMap.keys();
+        for (const key of keys)callback(String(key));
+    } else if ('object' == typeof objectOrMap) {
+        const objectKeys = Object.keys(objectOrMap);
+        for (const key of objectKeys)callback(key);
+    }
+}
+function getAssetSource(compilation, filename) {
+    let assetGetFunction;
+    if ('function' == typeof compilation.getAsset) assetGetFunction = compilation.getAsset(filename);
+    let assetViaAssets;
+    if (!assetGetFunction && compilation.assets) assetViaAssets = compilation.assets[filename];
+    const asset = assetGetFunction || assetViaAssets;
+    if (!asset) return '';
+    let src;
+    src = 'function' == typeof asset.source ? asset.source() : asset.source?.source ? asset.source.source() : asset.source;
+    if ('string' == typeof src) return src;
+    return '';
+}
+function collectContentScriptEntryImports(compilation, includeList) {
+    const entryImports = {};
+    const contentEntryNames = new Set(Object.keys(includeList || {}).filter((k)=>k.startsWith("content_scripts")));
+    const chunkGraph = compilation.chunkGraph;
+    compilation.entrypoints.forEach((_entry, entryName)=>{
+        if (String(entryName).startsWith("content_scripts/")) contentEntryNames.add(entryName);
+    });
+    compilation.entrypoints.forEach((entry, entryName)=>{
+        if (!contentEntryNames.has(entryName)) return;
+        const collectedFilesSet = new Set();
+        function addFileIfRelevant(file) {
+            if (null == file) return;
+            const fileNameStr = String(file);
+            const isJavaScript = fileNameStr.endsWith('.js');
+            const isSourceMap = fileNameStr.endsWith('.map');
+            if (isJavaScript || isSourceMap) return;
+            collectedFilesSet.add(fileNameStr);
+        }
+        entry.chunks.forEach((chunk)=>{
+            const currentChunk = chunk;
+            const chunkFilesArray = Array.isArray(currentChunk.files) ? currentChunk.files : [];
+            for(let i = 0; i < chunkFilesArray.length; i++)addFileIfRelevant(chunkFilesArray[i]);
+            let chunkAuxFilesArray = [];
+            if (Array.isArray(currentChunk.auxiliaryFiles)) chunkAuxFilesArray = currentChunk.auxiliaryFiles;
+            for(let i = 0; i < chunkAuxFilesArray.length; i++)addFileIfRelevant(chunkAuxFilesArray[i]);
+            const modulesArray = Array.from(chunkGraph.getChunkModulesIterable(chunk));
+            for(let j = 0; j < modulesArray.length; j++){
+                const moduleObj = modulesArray[j];
+                const moduleChunksArray = Array.from(chunkGraph.getModuleChunks(moduleObj));
+                for(let k = 0; k < moduleChunksArray.length; k++){
+                    const mk = moduleChunksArray[k];
+                    const mkAuxFilesArr = Array.isArray(mk.auxiliaryFiles) ? mk.auxiliaryFiles : [];
+                    for(let l = 0; l < mkAuxFilesArr.length; l++)addFileIfRelevant(mkAuxFilesArr[l]);
+                }
+                const moduleWithBuildInfo = moduleObj;
+                const buildInfo = moduleWithBuildInfo.buildInfo;
+                forEachStringKey(buildInfo?.assets, (key)=>{
+                    addFileIfRelevant(key);
+                });
+                forEachStringKey(buildInfo?.assetsInfo, (key)=>{
+                    addFileIfRelevant(key);
+                });
+            }
+            for(let i = 0; i < chunkFilesArray.length; i++){
+                const chunkFileName = chunkFilesArray[i];
+                if (!String(chunkFileName).endsWith('.js')) continue;
+                const jsSource = getAssetSource(compilation, chunkFileName);
+                if (!jsSource) continue;
+                const matchedStrings = jsSource.match(EMITTED_ASSET_REF_PATTERN) || [];
+                for(let m = 0; m < matchedStrings.length; m++)addFileIfRelevant(matchedStrings[m]);
+            }
+        });
+        const logicalJsAssetName = `${entryName}.js`;
+        const logicalJsAssetSource = getAssetSource(compilation, logicalJsAssetName);
+        if (logicalJsAssetSource) {
+            const matchedStrings = logicalJsAssetSource.match(EMITTED_ASSET_REF_PATTERN) || [];
+            for(let n = 0; n < matchedStrings.length; n++)addFileIfRelevant(matchedStrings[n]);
+        }
+        entryImports[entryName] = Array.from(collectedFilesSet);
+    });
+    const entryImportsEntries = Object.entries(entryImports);
+    for(let i = 0; i < entryImportsEntries.length; i++){
+        const name = entryImportsEntries[i][0];
+        const files = entryImportsEntries[i][1];
+        const normalizedFiles = [];
+        for(let j = 0; j < files.length; j++)normalizedFiles.push(unixify(files[j]));
+        entryImports[name] = normalizedFiles;
+    }
+    return entryImports;
+}
 function cleanMatches(matches) {
     return matches.map((match)=>{
         try {
@@ -10072,6 +10316,9 @@ function resolve_war_findSourceSibling(absOutputPath) {
 function isFirefox(browser) {
     return !!browser && isGeckoBasedBrowser(browser.toLowerCase());
 }
+function isWebkit(browser) {
+    return !!browser && isWebkitBasedBrowser(browser.toLowerCase());
+}
 function isValidChromeMatchPattern(pattern) {
     if ('<all_urls>' === pattern) return true;
     if (/[?#]/.test(pattern)) return false;
@@ -10085,7 +10332,7 @@ function isValidChromeMatchPattern(pattern) {
     }
 }
 function validateMatchesOrReport(compilation, matches, browser) {
-    if (!matches || isFirefox(browser)) return;
+    if (!matches || isFirefox(browser) || isWebkit(browser)) return;
     compilation.errors ||= [];
     for (const m of matches)if (!isValidChromeMatchPattern(m)) {
         const msg = warInvalidMatchPattern(m);
@@ -10227,7 +10474,7 @@ function resolveUserDeclaredWAR(compilation, manifestPath, manifest, browser) {
         v3
     };
 }
-function getAssetSource(compilation, filename) {
+function generate_manifest_getAssetSource(compilation, filename) {
     const byGet = 'function' == typeof compilation.getAsset ? compilation.getAsset(filename) : void 0;
     const byAssets = !byGet && compilation.assets ? compilation.assets[filename] : void 0;
     const asset = byGet || byAssets;
@@ -10318,10 +10565,9 @@ function generateManifestPatches(compilation, manifestPath, entryImports, browse
             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);
+                const source = generate_manifest_getAssetSource(compilation, jsFile);
                 if (!source) continue;
-                const re = /assets\/[A-Za-z0-9._-]+/g;
-                const found = source.match(re) || [];
+                const found = source.match(EMITTED_ASSET_REF_PATTERN) || [];
                 filtered = Array.from(new Set(found.filter((r)=>!r.endsWith('.js') && !r.endsWith('.map')))).sort();
                 if (cacheKey) assetScanCache.set(cacheKey, filtered);
             }
@@ -10967,7 +11213,9 @@ class ValidateThemeValues {
         this.browser = options.browser || 'chrome';
     }
     apply(compiler) {
-        if (!isChromiumBasedBrowser(String(this.browser))) return;
+        const browserName = String(this.browser);
+        const webkitTarget = isWebkitBasedBrowser(browserName);
+        if (!isChromiumBasedBrowser(browserName) && !webkitTarget) return;
         compiler.hooks.thisCompilation.tap(ValidateThemeValues.name, (compilation)=>{
             compilation.hooks.processAssets.tap({
                 name: ValidateThemeValues.name,
@@ -10979,6 +11227,10 @@ class ValidateThemeValues {
                 } catch  {
                     return;
                 }
+                if (webkitTarget) {
+                    if (manifest.theme) reportToCompilation(compilation, compiler, themeNotSupportedByBrowser(browserName), 'warning', 'manifest.json');
+                    return;
+                }
                 for (const issue of collectThemeValueIssues(manifest))reportToCompilation(compilation, compiler, invalidThemeValue(issue.field, issue.detail, issue.value), 'error', 'manifest.json');
             });
         });
@@ -11436,100 +11688,6 @@ class ScriptsPlugin {
         new ValidateContentScriptSyntax().apply(compiler);
     }
 }
-function forEachStringKey(objectOrMap, callback) {
-    if (!objectOrMap) return;
-    if (objectOrMap instanceof Map) {
-        const keys = objectOrMap.keys();
-        for (const key of keys)callback(String(key));
-    } else if ('object' == typeof objectOrMap) {
-        const objectKeys = Object.keys(objectOrMap);
-        for (const key of objectKeys)callback(key);
-    }
-}
-function collect_entry_imports_getAssetSource(compilation, filename) {
-    let assetGetFunction;
-    if ('function' == typeof compilation.getAsset) assetGetFunction = compilation.getAsset(filename);
-    let assetViaAssets;
-    if (!assetGetFunction && compilation.assets) assetViaAssets = compilation.assets[filename];
-    const asset = assetGetFunction || assetViaAssets;
-    if (!asset) return '';
-    let src;
-    src = 'function' == typeof asset.source ? asset.source() : asset.source?.source ? asset.source.source() : asset.source;
-    if ('string' == typeof src) return src;
-    return '';
-}
-function collectContentScriptEntryImports(compilation, includeList) {
-    const entryImports = {};
-    const contentEntryNames = new Set(Object.keys(includeList || {}).filter((k)=>k.startsWith("content_scripts")));
-    const chunkGraph = compilation.chunkGraph;
-    compilation.entrypoints.forEach((_entry, entryName)=>{
-        if (String(entryName).startsWith("content_scripts/")) contentEntryNames.add(entryName);
-    });
-    compilation.entrypoints.forEach((entry, entryName)=>{
-        if (!contentEntryNames.has(entryName)) return;
-        const collectedFilesSet = new Set();
-        function addFileIfRelevant(file) {
-            if (null == file) return;
-            const fileNameStr = String(file);
-            const isJavaScript = fileNameStr.endsWith('.js');
-            const isSourceMap = fileNameStr.endsWith('.map');
-            if (isJavaScript || isSourceMap) return;
-            collectedFilesSet.add(fileNameStr);
-        }
-        entry.chunks.forEach((chunk)=>{
-            const currentChunk = chunk;
-            const chunkFilesArray = Array.isArray(currentChunk.files) ? currentChunk.files : [];
-            for(let i = 0; i < chunkFilesArray.length; i++)addFileIfRelevant(chunkFilesArray[i]);
-            let chunkAuxFilesArray = [];
-            if (Array.isArray(currentChunk.auxiliaryFiles)) chunkAuxFilesArray = currentChunk.auxiliaryFiles;
-            for(let i = 0; i < chunkAuxFilesArray.length; i++)addFileIfRelevant(chunkAuxFilesArray[i]);
-            const modulesArray = Array.from(chunkGraph.getChunkModulesIterable(chunk));
-            for(let j = 0; j < modulesArray.length; j++){
-                const moduleObj = modulesArray[j];
-                const moduleChunksArray = Array.from(chunkGraph.getModuleChunks(moduleObj));
-                for(let k = 0; k < moduleChunksArray.length; k++){
-                    const mk = moduleChunksArray[k];
-                    const mkAuxFilesArr = Array.isArray(mk.auxiliaryFiles) ? mk.auxiliaryFiles : [];
-                    for(let l = 0; l < mkAuxFilesArr.length; l++)addFileIfRelevant(mkAuxFilesArr[l]);
-                }
-                const moduleWithBuildInfo = moduleObj;
-                const buildInfo = moduleWithBuildInfo.buildInfo;
-                forEachStringKey(buildInfo?.assets, (key)=>{
-                    addFileIfRelevant(key);
-                });
-                forEachStringKey(buildInfo?.assetsInfo, (key)=>{
-                    addFileIfRelevant(key);
-                });
-            }
-            for(let i = 0; i < chunkFilesArray.length; i++){
-                const chunkFileName = chunkFilesArray[i];
-                if (!String(chunkFileName).endsWith('.js')) continue;
-                const jsSource = collect_entry_imports_getAssetSource(compilation, chunkFileName);
-                if (!jsSource) continue;
-                const assetPattern = /assets\/[A-Za-z0-9._-]+/g;
-                const matchedStrings = jsSource.match(assetPattern) || [];
-                for(let m = 0; m < matchedStrings.length; m++)addFileIfRelevant(matchedStrings[m]);
-            }
-        });
-        const logicalJsAssetName = `${entryName}.js`;
-        const logicalJsAssetSource = collect_entry_imports_getAssetSource(compilation, logicalJsAssetName);
-        if (logicalJsAssetSource) {
-            const assetPattern = /assets\/[A-Za-z0-9._-]+/g;
-            const matchedStrings = logicalJsAssetSource.match(assetPattern) || [];
-            for(let n = 0; n < matchedStrings.length; n++)addFileIfRelevant(matchedStrings[n]);
-        }
-        entryImports[entryName] = Array.from(collectedFilesSet);
-    });
-    const entryImportsEntries = Object.entries(entryImports);
-    for(let i = 0; i < entryImportsEntries.length; i++){
-        const name = entryImportsEntries[i][0];
-        const files = entryImportsEntries[i][1];
-        const normalizedFiles = [];
-        for(let j = 0; j < files.length; j++)normalizedFiles.push(unixify(files[j]));
-        entryImports[name] = normalizedFiles;
-    }
-    return entryImports;
-}
 class CollectContentEntryImports {
     includeList;
     constructor(options){
@@ -11800,6 +11958,7 @@ function webpackConfig(projectStructure, devOptions) {
     }
     const manifest = filterKeysForThisBrowser(rawManifest, devOptions.browser);
     const primaryExtensionOutputDir = asAbsolute(__rspack_external_node_path_c5b9b54f.isAbsolute(devOptions.output.path) ? devOptions.output.path : __rspack_external_node_path_c5b9b54f.resolve(packageJsonDir, devOptions.output.path));
+    const publishedExtensionOutputDir = devOptions.output.finalPath ? asAbsolute(__rspack_external_node_path_c5b9b54f.isAbsolute(devOptions.output.finalPath) ? devOptions.output.finalPath : __rspack_external_node_path_c5b9b54f.resolve(packageJsonDir, devOptions.output.finalPath)) : primaryExtensionOutputDir;
     const companionUnpackedExtensionDirs = resolveCompanionExtensionDirs({
         projectRoot: packageJsonDir,
         config: devOptions.extensions
@@ -11926,7 +12085,7 @@ function webpackConfig(projectStructure, devOptions) {
         browser: devOptions.browser,
         mode: devOptions.mode,
         command: devOptions.metadataCommand,
-        outputPath: primaryExtensionOutputDir,
+        outputPath: publishedExtensionOutputDir,
         manifestPath,
         port: devOptions.port,
         host: process.env.EXTENSION_DEV_SERVER_CONNECTABLE_HOST || devOptions.host,