extension-develop 3.9.0-next.1 → 3.9.0-next.3

package/dist/{535.cjs → 946.cjs}

@@ -3,9 +3,72 @@ const __rslib_import_meta_url__ = /*#__PURE__*/ function() {
     return "u" < typeof document ? new (require('url'.replace('', ''))).URL('file:' + __filename).href : document.currentScript && document.currentScript.src || new URL('main.js', document.baseURI).href;
 }();
 exports.ids = [
-    "535"
+    "946"
 ];
 exports.modules = {
+    "./webpack/dev-server/compiler-hooks.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
+        __webpack_require__.d(__webpack_exports__, {
+            N: ()=>setupCompilerLifecycleHooks,
+            Z: ()=>setupCompilerDoneDiagnostics
+        });
+        var _messages__rspack_import_0 = __webpack_require__("./webpack/dev-server/messages.ts");
+        var _webpack_lib_branding__rspack_import_1 = __webpack_require__("./webpack/webpack-lib/branding.ts");
+        function setupCompilerLifecycleHooks(compiler) {
+            const verbose = '1' === String(process.env.EXTENSION_VERBOSE || '').trim();
+            compiler.hooks.invalid.tap('extension.js:invalid', ()=>{
+                if (verbose) console.log(_messages__rspack_import_0.eP());
+            });
+            compiler.hooks.failed.tap('extension.js:failed', (error)=>{
+                console.error(_messages__rspack_import_0.Nq(error));
+            });
+        }
+        function setupCompilerDoneDiagnostics(compiler, port) {
+            let reportedNoEntries = false;
+            compiler.hooks.done.tap('extension.js:done', (stats)=>{
+                try {
+                    if (stats?.hasErrors?.()) {
+                        const str = stats?.toString?.({
+                            colors: true,
+                            all: false,
+                            errors: true,
+                            warnings: true
+                        });
+                        if (str) console.error((0, _webpack_lib_branding__rspack_import_1.h)(str));
+                    } else if (stats?.hasWarnings?.()) {
+                        const str = stats?.toString?.({
+                            colors: true,
+                            all: false,
+                            errors: false,
+                            warnings: true
+                        });
+                        if (str) console.warn((0, _webpack_lib_branding__rspack_import_1.h)(str));
+                    }
+                    if (!reportedNoEntries && 'number' == typeof port) {
+                        const info = stats.toJson({
+                            all: false,
+                            assets: true,
+                            entrypoints: true
+                        });
+                        const hasAssets = Array.isArray(info?.assets) && info.assets.length > 0;
+                        const entrypoints = info?.entrypoints || {};
+                        const hasEntrypoints = entrypoints && Object.keys(entrypoints).length > 0;
+                        if (!hasAssets && !hasEntrypoints) {
+                            reportedNoEntries = true;
+                            console.warn(_messages__rspack_import_0.nI(port));
+                        }
+                    }
+                } catch (error) {
+                    const str = stats?.toString({
+                        colors: true,
+                        all: false,
+                        errors: true,
+                        warnings: true
+                    });
+                    if (str) console.error((0, _webpack_lib_branding__rspack_import_1.h)(str));
+                }
+            });
+        }
+    },
     "./webpack/webpack-config.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.r(__webpack_exports__);
         __webpack_require__.d(__webpack_exports__, {
@@ -213,6 +276,17 @@ exports.modules = {
             return obj;
         }
         class WarnUponFolderChanges {
+            getContextDependencyPaths(projectPath) {
+                const dependencies = new Set();
+                for (const folder of [
+                    'pages',
+                    "scripts"
+                ]){
+                    const folderPath = external_path_.join(projectPath, folder);
+                    dependencies.add(external_fs_.existsSync(folderPath) ? folderPath : projectPath);
+                }
+                return Array.from(dependencies);
+            }
             throwCompilationError(compilation, folder, filePath, isAddition) {
                 const addingOrRemoving = isAddition ? 'Adding' : 'Removing';
                 const typeOfAsset = 'pages' === folder ? 'HTML pages' : "script files";
@@ -272,10 +346,7 @@ exports.modules = {
                 });
                 compiler.hooks.thisCompilation.tap('special-folders:warn-upon-folder-changes', (compilation)=>{
                     const projectPath = compiler.options.context || process.cwd();
-                    const pagesPath = external_path_.join(projectPath, 'pages');
-                    const scriptsPath = external_path_.join(projectPath, "scripts");
-                    compilation.contextDependencies?.add(pagesPath);
-                    compilation.contextDependencies?.add(scriptsPath);
+                    for (const dependencyPath of this.getContextDependencyPaths(projectPath))compilation.contextDependencies?.add(dependencyPath);
                     this.applyPendingChanges(compilation);
                 });
             }
@@ -752,6 +823,7 @@ exports.modules = {
             }
         }
         boring_define_property(BoringPlugin, "name", 'plugin-boring');
+        var compiler_hooks = __webpack_require__("./webpack/dev-server/compiler-hooks.ts");
         function plugin_compilation_define_property(obj, key, value) {
             if (key in obj) Object.defineProperty(obj, key, {
                 value: value,
@@ -777,6 +849,7 @@ exports.modules = {
                         if (message.includes('Critical dependency: the request of a dependency is an expression') && /[\\\/]@ffmpeg[\\\/]ffmpeg[\\\/]dist[\\\/]esm[\\\/](classes|worker)\.js$/.test(modulePath)) return true;
                         if (message.includes('Critical dependency: the request of a dependency is an expression') && /[\\\/]@techstark[\\\/]opencv-js[\\\/]dist[\\\/]opencv\.js$/.test(modulePath)) return true;
                         if (message.includes('Critical dependency: the request of a dependency is an expression') && /[\\\/]@sqlite\.org[\\\/]sqlite-wasm[\\\/]dist[\\\/]sqlite3-worker1\.mjs$/.test(modulePath)) return true;
+                        if (message.includes('Critical dependency: require function is used in a way in which dependencies cannot be statically extracted') && /[\\\/]@vue[\\\/]compiler-sfc[\\\/]dist[\\\/]compiler-sfc\.esm-browser\.js$/.test(modulePath)) return true;
                         return message.includes('Accessing import.meta directly is unsupported') && /[\\\/]@huggingface[\\\/]transformers[\\\/].*transformers\.web\.js$/.test(modulePath);
                     } catch  {
                         return false;
@@ -817,6 +890,7 @@ exports.modules = {
                     manifestPath: this.manifestPath,
                     browser: this.browser || 'chrome'
                 }).apply(compiler);
+                (0, compiler_hooks.Z)(compiler, this.port);
             }
             constructor(options){
                 plugin_compilation_define_property(this, "manifestPath", void 0);
@@ -825,12 +899,14 @@ exports.modules = {
                 plugin_compilation_define_property(this, "zip", void 0);
                 plugin_compilation_define_property(this, "zipSource", void 0);
                 plugin_compilation_define_property(this, "zipFilename", void 0);
+                plugin_compilation_define_property(this, "port", void 0);
                 this.manifestPath = options.manifestPath;
                 this.browser = options.browser || 'chrome';
                 this.clean = options.clean ?? true;
                 this.zip = options.zip;
                 this.zipSource = options.zipSource;
                 this.zipFilename = options.zipFilename;
+                this.port = options.port;
             }
         }
         plugin_compilation_define_property(CompilationPlugin, "name", 'plugin-compilation');
@@ -1424,7 +1500,7 @@ exports.modules = {
                 }
                 compiler.options.module.rules = [
                     {
-                        test: /\.(js|mjs|jsx|mjsx|ts|mts|tsx|mtsx)$/,
+                        test: /\.(js|cjs|mjs|jsx|mjsx|ts|mts|tsx|mtsx)$/,
                         include: Array.from(new Set([
                             tsRoot,
                             manifestDir,
@@ -1565,46 +1641,6 @@ exports.modules = {
             ].filter(Boolean);
             return parts.join(' — ');
         }
-        function emit_manifest_define_property(obj, key, value) {
-            if (key in obj) Object.defineProperty(obj, key, {
-                value: value,
-                enumerable: true,
-                configurable: true,
-                writable: true
-            });
-            else obj[key] = value;
-            return obj;
-        }
-        class EmitManifest {
-            apply(compiler) {
-                compiler.hooks.thisCompilation.tap('manifest:emit-manifest', (compilation)=>{
-                    compilation.hooks.processAssets.tap({
-                        name: 'manifest:emit-manifest',
-                        stage: core_.Compilation.PROCESS_ASSETS_STAGE_PRE_PROCESS
-                    }, ()=>{
-                        let jsonContent;
-                        try {
-                            const content = external_fs_.readFileSync(this.manifestPath, 'utf-8');
-                            jsonContent = JSON.parse(content);
-                            if ('$schema' in jsonContent) delete jsonContent['$schema'];
-                        } catch (error) {
-                            const err = new (core_default()).WebpackError(manifestInvalidError(error));
-                            err.file = 'manifest.json';
-                            compilation.errors.push(err);
-                            return;
-                        }
-                        const jsonString = JSON.stringify(jsonContent, null, 2);
-                        const outputFilename = 'manifest.json';
-                        compilation.emitAsset(outputFilename, new core_.sources.RawSource(jsonString));
-                        if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(manifestEmitSuccess());
-                    });
-                });
-            }
-            constructor(options){
-                emit_manifest_define_property(this, "manifestPath", void 0);
-                this.manifestPath = options.manifestPath;
-            }
-        }
         function getFilename(feature, filePath) {
             const entryExt = external_path_.extname(filePath);
             let fileOutputpath = feature;
@@ -1921,9 +1957,24 @@ exports.modules = {
                 }
             };
         }
+        function isBundledContentPath(filePath, ext) {
+            const normalized = String(filePath || '').replace(/\\/g, '/');
+            return new RegExp(`^content_scripts/content-\\d+\\.${ext}$`).test(normalized);
+        }
+        function isAlreadyBundledContentScripts(contentScripts) {
+            if (!Array.isArray(contentScripts) || 0 === contentScripts.length) return false;
+            return contentScripts.every((contentObj)=>{
+                const js = Array.isArray(contentObj?.js) ? contentObj.js : [];
+                const css = Array.isArray(contentObj?.css) ? contentObj.css : [];
+                return js.every((filePath)=>isBundledContentPath(filePath, 'js')) && css.every((filePath)=>isBundledContentPath(filePath, 'css'));
+            });
+        }
         function content_scripts_contentScripts(manifest, manifestPath) {
             if (!manifest.content_scripts) return;
             const original = manifest.content_scripts;
+            if (isAlreadyBundledContentScripts(original)) return {
+                content_scripts: original
+            };
             const originalCount = original.length;
             const result = [];
             let bridgeOrdinal = 0;
@@ -2064,6 +2115,7 @@ exports.modules = {
         function normalizeOutputPath(originalPath) {
             if (!originalPath) return originalPath;
             const unix = originalPath.replace(/\\/g, '/');
+            if (/[*?\[\]{}]/.test(unix)) return unix;
             if (/^\/public\//i.test(unix)) return unix.replace(/^\/public\//i, '');
             if (/^(?:\.\/)?public\//i.test(unix)) return unix.replace(/^(?:\.\/)?public\//i, '');
             if (/^\//.test(unix)) return unix.replace(/^\//, '');
@@ -2147,35 +2199,48 @@ exports.modules = {
             if (Object.keys(backgroundMerged).length) merged.background = backgroundMerged;
             return JSON.stringify(merged, null, 2);
         }
+        const INTERNAL_MANIFEST_SOURCE = '__extensionjs_manifest_source__';
+        function manifest_parseJsonSafe(text) {
+            const normalized = text && 0xfeff === text.charCodeAt(0) ? text.slice(1) : text;
+            return JSON.parse(normalized || '{}');
+        }
+        function readAssetSource(asset) {
+            if (!asset) return '';
+            const source = asset.source;
+            if ('string' == typeof source) return source;
+            if ('function' == typeof source) {
+                const out = source();
+                return 'string' == typeof out ? out : String(out || '');
+            }
+            if (source && 'function' == typeof source.source) {
+                const out = source.source();
+                return 'string' == typeof out ? out : String(out || '');
+            }
+            return '';
+        }
+        function setOriginalManifestContent(compilation, source) {
+            compilation[INTERNAL_MANIFEST_SOURCE] = source;
+        }
+        function getOriginalManifestContent(compilation) {
+            return compilation[INTERNAL_MANIFEST_SOURCE];
+        }
         function getManifestContent(compilation, manifestPath) {
-            const readAssetSource = (asset)=>{
-                if (!asset) return '';
-                const source = asset.source;
-                if ('string' == typeof source) return source;
-                if ('function' == typeof source) {
-                    const out = source();
-                    return 'string' == typeof out ? out : String(out || '');
-                }
-                if (source && 'function' == typeof source.source) {
-                    const out = source.source();
-                    return 'string' == typeof out ? out : String(out || '');
-                }
-                return '';
-            };
             const getAsset = compilation.getAsset;
             if ('function' == typeof getAsset) {
                 const manifestAsset = getAsset.call(compilation, 'manifest.json');
                 const manifest = readAssetSource(manifestAsset);
-                if (manifest) return JSON.parse(manifest);
+                if (manifest) return manifest_parseJsonSafe(manifest);
             }
             const manifestAsset = compilation.assets?.['manifest.json'];
             if (manifestAsset) {
                 const manifest = readAssetSource(manifestAsset);
-                if (manifest) return JSON.parse(manifest);
+                if (manifest) return manifest_parseJsonSafe(manifest);
             }
+            const originalManifest = getOriginalManifestContent(compilation);
+            if (originalManifest) return manifest_parseJsonSafe(originalManifest);
             try {
                 const text = external_fs_.readFileSync(manifestPath, 'utf8');
-                return JSON.parse(text);
+                return manifest_parseJsonSafe(text);
             } catch  {
                 return require(manifestPath);
             }
@@ -2207,6 +2272,53 @@ exports.modules = {
             });
             return patchedManifest;
         }
+        function buildCanonicalManifest(manifestPath, manifest, browser) {
+            const filteredManifest = manifest_filterKeysForThisBrowser(manifest, browser);
+            return {
+                ...filteredManifest,
+                ...JSON.parse(getManifestOverrides(manifestPath, filteredManifest))
+            };
+        }
+        function emit_manifest_define_property(obj, key, value) {
+            if (key in obj) Object.defineProperty(obj, key, {
+                value: value,
+                enumerable: true,
+                configurable: true,
+                writable: true
+            });
+            else obj[key] = value;
+            return obj;
+        }
+        class EmitManifest {
+            apply(compiler) {
+                compiler.hooks.thisCompilation.tap('manifest:emit-manifest', (compilation)=>{
+                    compilation.hooks.processAssets.tap({
+                        name: 'manifest:emit-manifest',
+                        stage: core_.Compilation.PROCESS_ASSETS_STAGE_PRE_PROCESS
+                    }, ()=>{
+                        let jsonContent;
+                        try {
+                            const content = external_fs_.readFileSync(this.manifestPath, 'utf-8');
+                            jsonContent = JSON.parse(content);
+                            if ('$schema' in jsonContent) delete jsonContent['$schema'];
+                        } catch (error) {
+                            const err = new (core_default()).WebpackError(manifestInvalidError(error));
+                            err.file = 'manifest.json';
+                            compilation.errors.push(err);
+                            return;
+                        }
+                        const jsonString = JSON.stringify(jsonContent, null, 2);
+                        setOriginalManifestContent(compilation, jsonString);
+                        compilation.emitAsset('manifest.json', new core_.sources.RawSource(jsonString));
+                        if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(manifestEmitSuccess());
+                    });
+                });
+            }
+            constructor(options){
+                emit_manifest_define_property(this, "manifestPath", void 0);
+                this.manifestPath = options.manifestPath;
+            }
+        }
         function update_manifest_define_property(obj, key, value) {
             if (key in obj) Object.defineProperty(obj, key, {
                 value: value,
@@ -2231,16 +2343,12 @@ exports.modules = {
                 compiler.hooks.thisCompilation.tap('manifest:update-manifest', (compilation)=>{
                     compilation.hooks.processAssets.tap({
                         name: 'manifest:update-manifest',
-                        stage: core_.Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE
+                        stage: core_.Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE + 1
                     }, ()=>{
                         if (compilation.errors.length > 0) return;
                         const manifest = getManifestContent(compilation, this.manifestPath);
-                        const manifestForBrowser = manifest_filterKeysForThisBrowser(manifest, this.browser);
-                        const overrides = getManifestOverrides(this.manifestPath, manifestForBrowser);
-                        const patchedManifest = {
-                            ...manifestForBrowser,
-                            ...JSON.parse(overrides)
-                        };
+                        const patchedManifest = buildCanonicalManifest(this.manifestPath, manifest, this.browser);
+                        const overrides = getManifestOverrides(this.manifestPath, manifest);
                         if ('development' === compiler.options.mode) {
                             if (patchedManifest.content_scripts) patchedManifest.content_scripts = this.applyDevOverrides(patchedManifest);
                         }
@@ -2257,7 +2365,8 @@ exports.modules = {
                         } catch  {}
                         const source = JSON.stringify(patchedManifest, null, 2);
                         const rawSource = new core_.sources.RawSource(source);
-                        compilation.updateAsset('manifest.json', rawSource);
+                        if (compilation.getAsset('manifest.json')) compilation.updateAsset('manifest.json', rawSource);
+                        else compilation.emitAsset('manifest.json', rawSource);
                     });
                 });
             }
@@ -2268,6 +2377,39 @@ exports.modules = {
                 this.browser = options.browser || 'chrome';
             }
         }
+        function writeFileAtomically(targetPath, content) {
+            const directory = external_path_.dirname(targetPath);
+            const tempPath = external_path_.join(directory, `.manifest.${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}.tmp`);
+            external_fs_.mkdirSync(directory, {
+                recursive: true
+            });
+            external_fs_.writeFileSync(tempPath, content, 'utf-8');
+            external_fs_.renameSync(tempPath, targetPath);
+        }
+        class PersistManifestToDisk {
+            apply(compiler) {
+                compiler.hooks.thisCompilation.tap('manifest:persist-manifest', (compilation)=>{
+                    compilation.hooks.processAssets.tap({
+                        name: 'manifest:persist-manifest',
+                        stage: core_.Compilation.PROCESS_ASSETS_STAGE_REPORT + 1000
+                    }, ()=>{
+                        if (compilation.errors.length > 0) return;
+                        const manifestAsset = compilation.getAsset('manifest.json');
+                        const outputPath = compilation.outputOptions.path || compiler.options.output?.path;
+                        if (!manifestAsset || !outputPath) return;
+                        const manifestSource = manifestAsset.source.source().toString();
+                        const manifestOutputPath = external_path_.join(outputPath, 'manifest.json');
+                        try {
+                            writeFileAtomically(manifestOutputPath, manifestSource);
+                        } catch (error) {
+                            const err = new (core_default()).WebpackError(`Failed to persist manifest.json to disk: ${error.message}`);
+                            err.file = 'manifest.json';
+                            compilation.errors.push(err);
+                        }
+                    });
+                });
+            }
+        }
         function add_dependencies_define_property(obj, key, value) {
             if (key in obj) Object.defineProperty(obj, key, {
                 value: value,
@@ -2410,20 +2552,25 @@ exports.modules = {
                     'sidebar_action/default_panel.html'
                 ];
                 compiler.hooks.thisCompilation.tap(ManifestLegacyWarnings.name, (compilation)=>{
-                    const asset = compilation.getAsset('manifest.json');
-                    if (!asset) return;
-                    const text = asset.source.source().toString();
-                    let count = 0;
-                    legacy.forEach((needle)=>{
-                        if (text.includes(needle)) {
-                            const warn = new core_.WebpackError(legacyManifestPathWarning(needle));
-                            warn.name = 'ManifestLegacyWarning';
-                            warn.file = 'manifest.json';
-                            compilation.warnings.push(warn);
-                            count++;
-                        }
+                    compilation.hooks.processAssets.tap({
+                        name: ManifestLegacyWarnings.name,
+                        stage: core_.Compilation.PROCESS_ASSETS_STAGE_REPORT
+                    }, ()=>{
+                        const asset = compilation.getAsset('manifest.json');
+                        if (!asset) return;
+                        const text = asset.source.source().toString();
+                        let count = 0;
+                        legacy.forEach((needle)=>{
+                            if (text.includes(needle)) {
+                                const warn = new core_.WebpackError(legacyManifestPathWarning(needle));
+                                warn.name = 'ManifestLegacyWarning';
+                                warn.file = 'manifest.json';
+                                compilation.warnings.push(warn);
+                                count++;
+                            }
+                        });
+                        if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(manifestLegacyWarningsSummary(count));
                     });
-                    if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(manifestLegacyWarningsSummary(count));
                 });
             }
         }
@@ -2442,12 +2589,14 @@ exports.modules = {
             apply(compiler) {
                 if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(manifestIncludeSummary(String(this.browser || 'chrome'), this.manifestPath));
                 new EmitManifest({
-                    manifestPath: this.manifestPath
+                    manifestPath: this.manifestPath,
+                    browser: this.browser
                 }).apply(compiler);
                 new UpdateManifest({
                     manifestPath: this.manifestPath,
                     browser: this.browser
                 }).apply(compiler);
+                new PersistManifestToDisk().apply(compiler);
                 new AddDependencies([
                     this.manifestPath
                 ]).apply(compiler);
@@ -3699,7 +3848,7 @@ exports.modules = {
                     browser: this.browser
                 }).apply(compiler);
                 if ('production' !== (compiler.options.mode || 'development')) compiler.options.module.rules.push({
-                    test: /\.(js|mjs|jsx|mjsx|ts|mts|tsx|mtsx)$/,
+                    test: /\.(js|cjs|mjs|jsx|mjsx|ts|mts|tsx|mtsx)$/,
                     include: [
                         external_path_.dirname(this.manifestPath)
                     ],
@@ -3765,7 +3914,7 @@ exports.modules = {
             const fileAssets = scriptEntries.filter((scriptAsset)=>{
                 const validFile = external_fs_.existsSync(scriptAsset);
                 const assetExtension = external_path_.extname(scriptAsset);
-                return validFile && ('.js' === assetExtension || '.mjs' === assetExtension || '.jsx' === assetExtension || '.ts' === assetExtension || '.tsx' === assetExtension);
+                return validFile && ('.js' === assetExtension || '.cjs' === assetExtension || '.mjs' === assetExtension || '.jsx' === assetExtension || '.mjsx' === assetExtension || '.ts' === assetExtension || '.mts' === assetExtension || '.mtsx' === assetExtension || '.tsx' === assetExtension);
             });
             return fileAssets;
         }
@@ -3788,19 +3937,34 @@ exports.modules = {
                 current = parent;
             }
         }
+        function resolveExistingFile(candidates) {
+            const suffixes = [
+                '',
+                '.js',
+                '.cjs',
+                '.mjs'
+            ];
+            for (const candidate of candidates)if (candidate) for (const suffix of suffixes){
+                const resolved = suffix ? `${candidate}${suffix}` : candidate;
+                if (external_fs_default().existsSync(resolved)) return resolved;
+            }
+        }
+        function resolveMainWorldBridgeSourcePath(options) {
+            const lookupDir = options?.lookupDir || __dirname;
+            const packageRoot = options?.packageRoot || findPackageRoot(lookupDir);
+            return resolveExistingFile([
+                external_path_default().resolve(lookupDir, 'main-world-bridge'),
+                packageRoot ? external_path_default().resolve(packageRoot, "webpack/plugin-web-extension/feature-scripts/steps/setup-reload-strategy/add-content-script-wrapper/main-world-bridge") : void 0,
+                packageRoot ? external_path_default().resolve(packageRoot, 'dist', 'main-world-bridge') : void 0
+            ]);
+        }
         function getMainWorldBridgeScripts(manifestPath) {
             const bridgeScripts = {};
             try {
                 const raw = JSON.parse(external_fs_default().readFileSync(manifestPath, 'utf-8'));
                 const contentScripts = Array.isArray(raw?.content_scripts) ? raw.content_scripts : [];
                 const originalCount = contentScripts.length;
-                const packageRoot = findPackageRoot(__dirname);
-                const bridgeSourceCandidates = [
-                    external_path_default().resolve(__dirname, 'main-world-bridge.js'),
-                    packageRoot ? external_path_default().resolve(packageRoot, "webpack/plugin-extension/feature-scripts/steps/setup-reload-strategy/add-content-script-wrapper/main-world-bridge.js") : void 0,
-                    packageRoot ? external_path_default().resolve(packageRoot, 'main-world-bridge.js') : void 0
-                ].filter((candidate)=>Boolean(candidate));
-                const bridgeSource = bridgeSourceCandidates.find((p)=>external_fs_default().existsSync(p)) || void 0;
+                const bridgeSource = resolveMainWorldBridgeSourcePath();
                 if (!bridgeSource) return bridgeScripts;
                 let bridgeOrdinal = 0;
                 for(let i = 0; i < contentScripts.length; i++){
@@ -3849,7 +4013,7 @@ exports.modules = {
                     packageJsonDir
                 ];
                 compiler.options.module.rules.push({
-                    test: /\.(js|mjs|jsx|mjsx|ts|mts|tsx|mtsx)$/,
+                    test: /\.(js|cjs|mjs|jsx|mjsx|ts|mts|tsx|mtsx)$/,
                     include: includeDirs,
                     exclude: [
                         /([\\/])node_modules\1/
@@ -3866,7 +4030,7 @@ exports.modules = {
                 });
                 if ('production' !== compiler.options.mode) {
                     compiler.options.module.rules.push({
-                        test: /\.(js|mjs|jsx|mjsx|ts|mts|tsx|mtsx)$/,
+                        test: /\.(js|cjs|mjs|jsx|mjsx|ts|mts|tsx|mtsx)$/,
                         include: includeDirs,
                         exclude: [
                             /([\\/])node_modules\1/
@@ -3883,7 +4047,7 @@ exports.modules = {
                         enforce: 'pre'
                     });
                     compiler.options.module.rules.push({
-                        test: /\.(js|mjs|jsx|mjsx|ts|mts|tsx|mtsx)$/,
+                        test: /\.(js|cjs|mjs|jsx|mjsx|ts|mts|tsx|mtsx)$/,
                         include: includeDirs,
                         exclude: [
                             /([\\/])node_modules\1/
@@ -4978,64 +5142,10 @@ Set background.noDynamicEntryWarning to true to disable this warning.
         }
         const webpack_target_webextension_fork = WebExtensionPlugin;
         function manifest_getManifestContent(compilation, manifestPath) {
-            const readAssetSource = (asset)=>{
-                if (!asset) return '';
-                const source = asset.source;
-                if ('string' == typeof source) return source;
-                if ('function' == typeof source) {
-                    const out = source();
-                    return 'string' == typeof out ? out : String(out || '');
-                }
-                if (source && 'function' == typeof source.source) {
-                    const out = source.source();
-                    return 'string' == typeof out ? out : String(out || '');
-                }
-                return '';
-            };
-            const getAsset = compilation.getAsset;
-            if ('function' == typeof getAsset) {
-                const manifestAsset = getAsset.call(compilation, 'manifest.json');
-                const manifest = readAssetSource(manifestAsset);
-                if (manifest) return JSON.parse(manifest);
-            }
-            const manifestAsset = compilation.assets?.['manifest.json'];
-            if (manifestAsset) {
-                const manifest = readAssetSource(manifestAsset);
-                if (manifest) return JSON.parse(manifest);
-            }
-            try {
-                const text = external_fs_.readFileSync(manifestPath, 'utf8');
-                return JSON.parse(text);
-            } catch  {
-                return require(manifestPath);
-            }
+            return getManifestContent(compilation, manifestPath);
         }
         function scripts_lib_manifest_filterKeysForThisBrowser(manifest, browser) {
-            const CHROMIUM_BASED_BROWSERS = [
-                'chrome',
-                'edge'
-            ];
-            const GECKO_BASED_BROWSERS = [
-                'firefox'
-            ];
-            const isChromiumTarget = CHROMIUM_BASED_BROWSERS.includes(browser) || String(browser).includes('chromium');
-            const isGeckoTarget = GECKO_BASED_BROWSERS.includes(browser) || String(browser).includes('gecko');
-            const chromiumPrefixes = new Set([
-                'chromium',
-                'chrome',
-                'edge'
-            ]);
-            const geckoPrefixes = new Set([
-                'gecko',
-                'firefox'
-            ]);
-            const patchedManifest = JSON.parse(JSON.stringify(manifest), function(key, value) {
-                const indexOfColon = key.indexOf(':');
-                if (-1 === indexOfColon) return value;
-                const prefix = key.substring(0, indexOfColon);
-                if (prefix === browser || isChromiumTarget && chromiumPrefixes.has(prefix) || isGeckoTarget && geckoPrefixes.has(prefix)) this[key.substring(indexOfColon + 1)] = value;
-            });
-            return patchedManifest;
+            return manifest_filterKeysForThisBrowser(manifest, browser);
         }
         function backgroundIsRequiredMessageOnly(backgroundChunkName) {
             return `Check the ${external_pintor_default().yellow(backgroundChunkName.replace('/', '.'))} field in your ${external_pintor_default().yellow('manifest.json')} file.`;
@@ -5319,18 +5429,16 @@ Set background.noDynamicEntryWarning to true to disable this warning.
         }
         class ApplyManifestDevDefaults {
             generateManifestPatches(compilation) {
-                const manifest = manifest_getManifestContent(compilation, this.manifestPath);
-                const browser = this.browser;
-                const filtered = scripts_lib_manifest_filterKeysForThisBrowser(manifest, browser);
+                const canonicalManifest = manifest_getManifestContent(compilation, this.manifestPath);
                 const patchedManifest = {
-                    ...filtered,
-                    content_security_policy: 3 === filtered.manifest_version ? patchV3CSP(filtered) : patchV2CSP(filtered),
-                    ...3 === filtered.manifest_version ? filtered.permissions ? {
+                    ...canonicalManifest,
+                    content_security_policy: 3 === canonicalManifest.manifest_version ? patchV3CSP(canonicalManifest) : patchV2CSP(canonicalManifest),
+                    ...3 === canonicalManifest.manifest_version ? canonicalManifest.permissions ? {
                         permissions: [
                             ...new Set([
                                 "scripting",
                                 'management',
-                                ...filtered.permissions
+                                ...canonicalManifest.permissions
                             ])
                         ]
                     } : {
@@ -5339,9 +5447,9 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                             'management'
                         ]
                     } : {},
-                    ...patchBackground(filtered, this.browser),
-                    ...patchExternallyConnectable(manifest),
-                    web_accessible_resources: 3 === filtered.manifest_version ? patchWebResourcesV3(filtered) : patchWebResourcesV2(filtered)
+                    ...patchBackground(canonicalManifest, this.browser),
+                    ...patchExternallyConnectable(canonicalManifest),
+                    web_accessible_resources: 3 === canonicalManifest.manifest_version ? patchWebResourcesV3(canonicalManifest) : patchWebResourcesV2(canonicalManifest)
                 };
                 const source = JSON.stringify(patchedManifest, null, 2);
                 const rawSource = new core_.sources.RawSource(source);
@@ -6987,14 +7095,14 @@ Set background.noDynamicEntryWarning to true to disable this warning.
             return false;
         }
         function generateManifestPatches(compilation, manifestPath, entryImports, browser) {
-            const manifest = getManifestContent(compilation, manifestPath);
-            const resolved = resolveUserDeclaredWAR(compilation, manifestPath, manifest, browser);
-            const webAccessibleResourcesV3 = 3 === manifest.manifest_version ? resolved.v3.map((g)=>({
+            const canonicalManifest = getManifestContent(compilation, manifestPath);
+            const resolved = resolveUserDeclaredWAR(compilation, manifestPath, canonicalManifest, browser);
+            const webAccessibleResourcesV3 = 3 === canonicalManifest.manifest_version ? resolved.v3.map((g)=>({
                     matches: g.matches,
                     resources: Array.from(g.resources)
                 })) : [];
-            const webAccessibleResourcesV2 = 2 === manifest.manifest_version ? Array.from(resolved.v2) : [];
-            if (3 === manifest.manifest_version && Array.isArray(manifest.content_scripts)) for (const contentScript of manifest.content_scripts){
+            const webAccessibleResourcesV2 = 2 === canonicalManifest.manifest_version ? Array.from(resolved.v2) : [];
+            if (3 === canonicalManifest.manifest_version && Array.isArray(canonicalManifest.content_scripts)) for (const contentScript of canonicalManifest.content_scripts){
                 const matches = contentScript.matches || [];
                 const normalizedMatches = cleanMatches(matches);
                 const jsFiles = Array.isArray(contentScript.js) ? contentScript.js : [];
@@ -7029,12 +7137,12 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                 }
             }
             for (const [entryName, resources] of Object.entries(entryImports)){
-                const contentScript = manifest.content_scripts?.find((script)=>script.js?.some((jsFile)=>jsFile.includes(entryName)));
+                const contentScript = canonicalManifest.content_scripts?.find((script)=>script.js?.some((jsFile)=>jsFile.includes(entryName)));
                 if (contentScript) {
                     const matches = contentScript.matches || [];
                     const filteredResources = resources.filter((resource)=>!resource.endsWith('.map') && !resource.endsWith('.js'));
                     if (0 === filteredResources.length) continue;
-                    if (3 === manifest.manifest_version) {
+                    if (3 === canonicalManifest.manifest_version) {
                         const normalizedMatches = cleanMatches(matches);
                         const existingResource = webAccessibleResourcesV3.find((resourceEntry)=>{
                             const a = [
@@ -7066,11 +7174,11 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                     });
                 }
             }
-            if (3 === manifest.manifest_version) {
+            if (3 === canonicalManifest.manifest_version) {
                 const assetKeys = Object.keys(compilation.assets || {});
                 const staticAssets = assetKeys.filter((k)=>k.startsWith('assets/')).filter((k)=>!k.endsWith('.js') && !k.endsWith('.map')).sort();
                 if (staticAssets.length > 0) {
-                    const allMatches = Array.from(new Set((manifest.content_scripts || []).flatMap((cs)=>cs.matches || [])));
+                    const allMatches = Array.from(new Set((canonicalManifest.content_scripts || []).flatMap((cs)=>cs.matches || [])));
                     const normalizedMatches = cleanMatches(allMatches);
                     const existing = webAccessibleResourcesV3.find((entry)=>{
                         const a = [
@@ -7096,11 +7204,11 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                 }
             }
             const fontExtRe = /\.(woff2?|eot|ttf|otf)$/i;
-            if (3 === manifest.manifest_version) {
+            if (3 === canonicalManifest.manifest_version) {
                 const assetKeys = Object.keys(compilation.assets || {});
                 const fontAssets = assetKeys.filter((k)=>fontExtRe.test(k)).filter((k)=>!k.startsWith('assets/')).filter((k)=>!k.startsWith("content_scripts/")).sort();
                 if (fontAssets.length > 0) {
-                    const allMatches = Array.from(new Set((manifest.content_scripts || []).flatMap((cs)=>cs.matches || [])));
+                    const allMatches = Array.from(new Set((canonicalManifest.content_scripts || []).flatMap((cs)=>cs.matches || [])));
                     const normalizedMatches = cleanMatches(allMatches);
                     if (normalizedMatches.length > 0) {
                         const existing = webAccessibleResourcesV3.find((entry)=>{
@@ -7126,18 +7234,18 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                         });
                     }
                 }
-            } else if (2 === manifest.manifest_version) {
+            } else if (2 === canonicalManifest.manifest_version) {
                 const assetKeys = Object.keys(compilation.assets || {});
                 const fontAssets = assetKeys.filter((k)=>fontExtRe.test(k)).sort();
                 if (fontAssets.length > 0) {
                     for (const r of fontAssets)if (!webAccessibleResourcesV2.includes(r)) webAccessibleResourcesV2.push(r);
                 }
             }
-            if (3 === manifest.manifest_version) {
+            if (3 === canonicalManifest.manifest_version) {
                 const assetKeys = Object.keys(compilation.assets || {});
                 const cssUnderContentScripts = assetKeys.filter((k)=>k.startsWith("content_scripts/")).filter((k)=>k.endsWith('.css')).sort();
                 if (cssUnderContentScripts.length > 0) {
-                    const allMatches = Array.from(new Set((manifest.content_scripts || []).flatMap((cs)=>cs.matches || [])));
+                    const allMatches = Array.from(new Set((canonicalManifest.content_scripts || []).flatMap((cs)=>cs.matches || [])));
                     const normalizedMatches = cleanMatches(allMatches);
                     if (normalizedMatches.length > 0) {
                         const existing = webAccessibleResourcesV3.find((entry)=>{
@@ -7164,18 +7272,18 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                     }
                 }
             }
-            if (3 === manifest.manifest_version) {
-                if (webAccessibleResourcesV3.length > 0) manifest.web_accessible_resources = webAccessibleResourcesV3.map((entry)=>({
+            if (3 === canonicalManifest.manifest_version) {
+                if (webAccessibleResourcesV3.length > 0) canonicalManifest.web_accessible_resources = webAccessibleResourcesV3.map((entry)=>({
                         resources: Array.from(new Set(entry.resources)).sort(),
                         matches: Array.from(new Set(entry.matches)).sort()
                     })).sort((a, b)=>a.matches.join(',').localeCompare(b.matches.join(',')));
-            } else if (webAccessibleResourcesV2.length > 0) manifest.web_accessible_resources = Array.from(new Set(webAccessibleResourcesV2)).sort();
-            const source = JSON.stringify(manifest, null, 2);
+            } else if (webAccessibleResourcesV2.length > 0) canonicalManifest.web_accessible_resources = Array.from(new Set(webAccessibleResourcesV2)).sort();
+            const source = JSON.stringify(canonicalManifest, null, 2);
             const rawSource = new core_.sources.RawSource(source);
             if ('true' === process.env.EXTENSION_AUTHOR_MODE) try {
-                const v3Groups = 3 === manifest.manifest_version ? webAccessibleResourcesV3.length : 0;
-                const v3ResourcesTotal = 3 === manifest.manifest_version ? webAccessibleResourcesV3.reduce((sum, g)=>sum + (g.resources?.length || 0), 0) : 0;
-                const v2Resources = 2 === manifest.manifest_version ? webAccessibleResourcesV2.length : 0;
+                const v3Groups = 3 === canonicalManifest.manifest_version ? webAccessibleResourcesV3.length : 0;
+                const v3ResourcesTotal = 3 === canonicalManifest.manifest_version ? webAccessibleResourcesV3.reduce((sum, g)=>sum + (g.resources?.length || 0), 0) : 0;
+                const v2Resources = 2 === canonicalManifest.manifest_version ? webAccessibleResourcesV2.length : 0;
                 console.log(warPatchedSummary(v3Groups, v3ResourcesTotal, v2Resources));
             } catch  {}
             if (compilation.getAsset('manifest.json')) compilation.updateAsset('manifest.json', rawSource);
@@ -7345,9 +7453,6 @@ Set background.noDynamicEntryWarning to true to disable this warning.
         function compatibilityPolyfillDisabled(browser) {
             return `${external_pintor_default().gray('►►►')} Compatibility: Polyfill ${external_pintor_default().gray('disabled')} for ${capitalizedBrowserName(browser)}`;
         }
-        function compatibilityManifestFilteredKeys(browser, filteredCount) {
-            return `${external_pintor_default().gray('►►►')} Compatibility: Filtered ${external_pintor_default().gray(String(filteredCount))} manifest key(s) for ${capitalizedBrowserName(browser)}`;
-        }
         function feature_polyfill_define_property(obj, key, value) {
             if (key in obj) Object.defineProperty(obj, key, {
                 value: value,
@@ -7389,117 +7494,6 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                 this.browser = options.browser || 'chrome';
             }
         }
-        function manifest_parseJsonSafe(text) {
-            const s = text && 0xfeff === text.charCodeAt(0) ? text.slice(1) : text;
-            return JSON.parse(s || '{}');
-        }
-        function compatibility_lib_manifest_getManifestContent(compilation, manifestPath) {
-            const readAssetSource = (asset)=>{
-                if (!asset) return '';
-                const source = asset.source;
-                if ('string' == typeof source) return source;
-                if ('function' == typeof source) {
-                    const out = source();
-                    return 'string' == typeof out ? out : String(out || '');
-                }
-                if (source && 'function' == typeof source.source) {
-                    const out = source.source();
-                    return 'string' == typeof out ? out : String(out || '');
-                }
-                return '';
-            };
-            const getAsset = compilation.getAsset;
-            if ('function' == typeof getAsset) {
-                const manifestAsset = getAsset.call(compilation, 'manifest.json');
-                const manifest = readAssetSource(manifestAsset);
-                if (manifest) return manifest_parseJsonSafe(manifest);
-            }
-            const manifestAsset = compilation.assets?.['manifest.json'];
-            if (manifestAsset) {
-                const manifest = readAssetSource(manifestAsset);
-                if (manifest) return manifest_parseJsonSafe(manifest);
-            }
-            try {
-                const text = external_fs_.readFileSync(manifestPath, 'utf8');
-                return manifest_parseJsonSafe(text);
-            } catch  {
-                return require(manifestPath);
-            }
-        }
-        function compatibility_lib_manifest_filterKeysForThisBrowser(manifest, browser) {
-            const CHROMIUM_BASED_BROWSERS = [
-                'chrome',
-                'edge'
-            ];
-            const GECKO_BASED_BROWSERS = [
-                'firefox'
-            ];
-            const isChromiumTarget = CHROMIUM_BASED_BROWSERS.includes(browser) || String(browser).includes('chromium');
-            const isGeckoTarget = GECKO_BASED_BROWSERS.includes(browser) || String(browser).includes('gecko');
-            const chromiumPrefixes = new Set([
-                'chromium',
-                'chrome',
-                'edge'
-            ]);
-            const geckoPrefixes = new Set([
-                'gecko',
-                'firefox'
-            ]);
-            const patchedManifest = JSON.parse(JSON.stringify(manifest), function(key, value) {
-                const indexOfColon = key.indexOf(':');
-                if (-1 === indexOfColon) return value;
-                const prefix = key.substring(0, indexOfColon);
-                if (prefix === browser || isChromiumTarget && chromiumPrefixes.has(prefix) || isGeckoTarget && geckoPrefixes.has(prefix)) this[key.substring(indexOfColon + 1)] = value;
-            });
-            return patchedManifest;
-        }
-        function feature_browser_specific_fields_define_property(obj, key, value) {
-            if (key in obj) Object.defineProperty(obj, key, {
-                value: value,
-                enumerable: true,
-                configurable: true,
-                writable: true
-            });
-            else obj[key] = value;
-            return obj;
-        }
-        function countBrowserPrefixedKeys(obj) {
-            if (!obj || 'object' != typeof obj) return 0;
-            if (Array.isArray(obj)) return obj.reduce((sum, v)=>sum + countBrowserPrefixedKeys(v), 0);
-            let total = 0;
-            for (const key of Object.keys(obj)){
-                if (key.includes(':')) total++;
-                total += countBrowserPrefixedKeys(obj[key]);
-            }
-            return total;
-        }
-        class BrowserSpecificFieldsPlugin {
-            patchManifest(manifest) {
-                const patchedManifest = compatibility_lib_manifest_filterKeysForThisBrowser(manifest, this.browser);
-                return JSON.stringify(patchedManifest, null, 2);
-            }
-            apply(compiler) {
-                compiler.hooks.compilation.tap('compatibility:browser-specific-fields', (compilation)=>{
-                    compilation.hooks.processAssets.tap({
-                        name: 'compatibility:browser-specific-fields',
-                        stage: core_.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE
-                    }, ()=>{
-                        const manifest = compatibility_lib_manifest_getManifestContent(compilation, this.manifestPath);
-                        const filteredCount = countBrowserPrefixedKeys(manifest);
-                        const patchedSource = this.patchManifest(manifest);
-                        const rawSource = new core_.sources.RawSource(patchedSource);
-                        compilation.updateAsset('manifest.json', rawSource);
-                        if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(compatibilityManifestFilteredKeys(this.browser, filteredCount));
-                    });
-                });
-            }
-            constructor(options){
-                feature_browser_specific_fields_define_property(this, "browser", void 0);
-                feature_browser_specific_fields_define_property(this, "manifestPath", void 0);
-                this.manifestPath = options.manifestPath;
-                this.browser = options.browser || 'chrome';
-            }
-        }
         function plugin_compatibility_define_property(obj, key, value) {
             if (key in obj) Object.defineProperty(obj, key, {
                 value: value,
@@ -7521,10 +7515,6 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                         }).apply(compiler);
                     } else if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(compatibilityPolyfillSkipped('Firefox bundles browser.* APIs', this.browser));
                 } else if ('true' === process.env.EXTENSION_AUTHOR_MODE) console.log(compatibilityPolyfillDisabled(this.browser));
-                new BrowserSpecificFieldsPlugin({
-                    manifestPath: this.manifestPath,
-                    browser: this.browser || 'chrome'
-                }).apply(compiler);
             }
             constructor(options){
                 plugin_compatibility_define_property(this, "manifestPath", void 0);
@@ -8047,6 +8037,7 @@ Set background.noDynamicEntryWarning to true to disable this warning.
         function formatHtmlSentinelEnd() {
             return '<<<EXTJS_HTML_END>>>';
         }
+        var manifest_readiness = __webpack_require__("./webpack/plugin-browsers/run-chromium/manifest-readiness.ts");
         function chromium_hard_reload_define_property(obj, key, value) {
             if (key in obj) Object.defineProperty(obj, key, {
                 value: value,
@@ -8140,6 +8131,13 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                         reason: reason || 'unknown',
                         browser: this.options?.browser
                     });
+                    const extensionRoot = this.ctx.getExtensionRoot();
+                    if (extensionRoot) {
+                        const manifestReady = await (0, manifest_readiness.f)(extensionRoot, {
+                            timeoutMs: 8000
+                        });
+                        if (!manifestReady) return void this.logger?.warn?.('[reload] manifest.json did not stabilize before hard reload');
+                    }
                     const reloadTimeoutMs = 8000;
                     const ok = await Promise.race([
                         ctrl.hardReload(),
@@ -10265,7 +10263,8 @@ Set background.noDynamicEntryWarning to true to disable this warning.
                     clean: devOptions.output.clean,
                     zip: true === devOptions.zip,
                     zipSource: true === devOptions.zipSource,
-                    zipFilename: devOptions.zipFilename
+                    zipFilename: devOptions.zipFilename,
+                    port: 'string' == typeof devOptions.port ? parseInt(devOptions.port, 10) : devOptions.port
                 }),
                 new StaticAssetsPlugin({
                     manifestPath,