extension-develop 4.1.6 → 4.1.7

package/dist/0~rspack-config.mjs

@@ -6617,6 +6617,65 @@ class WebExtensionPlugin {
     }
 }
 const webpack_target_webextension_fork = WebExtensionPlugin;
+function getBackgroundEntryName(manifest, browser) {
+    if (manifest.background) {
+        if (isGeckoBasedBrowser(String(browser))) return {
+            pageEntry: "background/script",
+            tryCatchWrapper: true,
+            eagerChunkLoading: false
+        };
+        if (3 === manifest.manifest_version) return {
+            serviceWorkerEntry: 'background/service_worker',
+            tryCatchWrapper: true,
+            eagerChunkLoading: false
+        };
+        if (2 === manifest.manifest_version) return {
+            pageEntry: "background/script",
+            tryCatchWrapper: true,
+            eagerChunkLoading: false
+        };
+    }
+    return {
+        pageEntry: 'background',
+        tryCatchWrapper: true,
+        eagerChunkLoading: false
+    };
+}
+function buildContentScriptsMeta(patchedManifest) {
+    const contentScriptsMeta = {};
+    try {
+        const csList = Array.isArray(patchedManifest.content_scripts) ? patchedManifest.content_scripts : [];
+        const originalCount = csList.length;
+        let bridgeOrdinal = 0;
+        for(let i = 0; i < csList.length; i++){
+            const cs = csList[i];
+            const bundleId = getCanonicalContentScriptJsAssetName(i);
+            const isMain = cs?.world === 'MAIN';
+            if (isMain) {
+                const bridgeIndex = originalCount + bridgeOrdinal++;
+                const bridgeBundleId = getCanonicalContentScriptJsAssetName(bridgeIndex);
+                contentScriptsMeta[bundleId] = {
+                    index: i,
+                    bundleId,
+                    world: 'main',
+                    bridgeBundleId
+                };
+                contentScriptsMeta[bridgeBundleId] = {
+                    index: bridgeIndex,
+                    bundleId: bridgeBundleId,
+                    world: 'extension',
+                    role: 'main_world_bridge',
+                    mainBundleId: bundleId
+                };
+            } else contentScriptsMeta[bundleId] = {
+                index: i,
+                bundleId,
+                world: 'extension'
+            };
+        }
+    } catch  {}
+    return contentScriptsMeta;
+}
 class SetupReloadStrategy {
     manifestPath;
     browser;
@@ -6624,71 +6683,16 @@ class SetupReloadStrategy {
         this.manifestPath = options.manifestPath;
         this.browser = options.browser || 'chrome';
     }
-    getEntryName(manifest) {
-        if (manifest.background) {
-            if (isGeckoBasedBrowser(String(this.browser))) return {
-                pageEntry: "background/script",
-                tryCatchWrapper: true,
-                eagerChunkLoading: false
-            };
-            if (3 === manifest.manifest_version) return {
-                serviceWorkerEntry: 'background/service_worker',
-                tryCatchWrapper: true,
-                eagerChunkLoading: false
-            };
-            if (2 === manifest.manifest_version) return {
-                pageEntry: "background/script",
-                tryCatchWrapper: true,
-                eagerChunkLoading: false
-            };
-        }
-        return {
-            pageEntry: 'background',
-            tryCatchWrapper: true,
-            eagerChunkLoading: false
-        };
-    }
     apply(compiler) {
         const manifest = JSON.parse(stripBom(__rspack_external_node_fs_5ea92f0c.readFileSync(this.manifestPath, 'utf-8')));
         const patchedManifest = filterKeysForThisBrowser(manifest, this.browser);
-        const contentScriptsMeta = {};
-        try {
-            const csList = Array.isArray(patchedManifest.content_scripts) ? patchedManifest.content_scripts : [];
-            const originalCount = csList.length;
-            let bridgeOrdinal = 0;
-            for(let i = 0; i < csList.length; i++){
-                const cs = csList[i];
-                const bundleId = getCanonicalContentScriptJsAssetName(i);
-                const isMain = cs?.world === 'MAIN';
-                if (isMain) {
-                    const bridgeIndex = originalCount + bridgeOrdinal++;
-                    const bridgeBundleId = getCanonicalContentScriptJsAssetName(bridgeIndex);
-                    contentScriptsMeta[bundleId] = {
-                        index: i,
-                        bundleId,
-                        world: 'main',
-                        bridgeBundleId
-                    };
-                    contentScriptsMeta[bridgeBundleId] = {
-                        index: bridgeIndex,
-                        bundleId: bridgeBundleId,
-                        world: 'extension',
-                        role: 'main_world_bridge',
-                        mainBundleId: bundleId
-                    };
-                } else contentScriptsMeta[bundleId] = {
-                    index: i,
-                    bundleId,
-                    world: 'extension'
-                };
-            }
-        } catch  {}
+        const contentScriptsMeta = buildContentScriptsMeta(patchedManifest);
         new SetupBackgroundEntry({
             manifestPath: this.manifestPath,
             browser: this.browser
         }).apply(compiler);
         new webpack_target_webextension_fork({
-            background: this.getEntryName(patchedManifest),
+            background: getBackgroundEntryName(patchedManifest, this.browser),
             hmrConfig: false,
             weakRuntimeCheck: true,
             contentScriptsMeta
@@ -6793,6 +6797,35 @@ class ReloadPlugin {
         new PruneStaleHotUpdates().apply(compiler);
     }
 }
+class SetupChunkLoadingTarget {
+    manifestPath;
+    browser;
+    constructor(options){
+        this.manifestPath = options.manifestPath;
+        this.browser = options.browser || 'chrome';
+    }
+    apply(compiler) {
+        if ('production' !== compiler.options.mode) return;
+        const hasValidManifest = !!this.manifestPath && __rspack_external_node_fs_5ea92f0c.existsSync(this.manifestPath) && __rspack_external_node_fs_5ea92f0c.lstatSync(this.manifestPath).isFile();
+        if (!hasValidManifest) return;
+        let patchedManifest;
+        try {
+            const manifest = JSON.parse(stripBom(__rspack_external_node_fs_5ea92f0c.readFileSync(this.manifestPath, 'utf-8')));
+            patchedManifest = filterKeysForThisBrowser(manifest, this.browser);
+        } catch  {
+            return;
+        }
+        new webpack_target_webextension_fork({
+            background: {
+                ...getBackgroundEntryName(patchedManifest, this.browser),
+                classicLoader: false
+            },
+            hmrConfig: false,
+            weakRuntimeCheck: true,
+            contentScriptsMeta: buildContentScriptsMeta(patchedManifest)
+        }).apply(compiler);
+    }
+}
 function checkManifestInPublic(compilation, publicDir) {
     try {
         const manifestInPublic = __rspack_external_node_path_c5b9b54f.join(publicDir, 'manifest.json');
@@ -13214,6 +13247,10 @@ function webpackConfig(projectStructure, devOptions) {
             manifestPath,
             browser: devOptions.browser
         }),
+        new SetupChunkLoadingTarget({
+            manifestPath,
+            browser: devOptions.browser
+        }),
         new SpecialFoldersPlugin({
             manifestPath
         }),

package/dist/101.mjs

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

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

@@ -2,6 +2,7 @@ import type { Compiler } from '@rspack/core';
 import type { DevOptions, PluginInterface } from '../types';
 export { buildSourceFeatureIndex, classifyReloadFromSources, formatReloadContextLabel, pageContextFromSources, type ReloadInstruction, type ReloadType, readContentScriptCount, type SourceFeatureIndex } from './classify-reload';
 export { type ChangedSourcesSnapshot, type ChangedSourcesTracker, createChangedSourcesTracker, dispatchReload, type ReloadBroker, type ReloadExecutor } from './reload-dispatch';
+export { SetupChunkLoadingTarget } from './steps/setup-chunk-loading-target';
 /**
  * ReloadPlugin owns the dev-only reload/HMR strategy end to end:
  *

package/dist/plugin-reload/steps/setup-chunk-loading-target.d.ts

@@ -0,0 +1,21 @@
+import type { Compiler } from '@rspack/core';
+import type { PluginInterface } from '../../types';
+/**
+ * How a chunk gets loaded is a property of the extension platform, not of dev
+ * mode. Without this, a production build falls back to rspack's web target,
+ * whose loader appends a `<script>` to the host document: that runs in the MAIN
+ * world while the content script lives in the isolated world, so the chunk never
+ * reaches the requester and a dynamic `import()` dies with ChunkLoadError. Dev
+ * looked fine only because the target rode along inside the reload plugin
+ * (issue #507).
+ *
+ * This is the target ALONE. Everything reload-specific, including the
+ * synthesized background entry, stays in SetupReloadStrategy: production must
+ * never gain a background script the author did not write.
+ */
+export declare class SetupChunkLoadingTarget {
+    private readonly manifestPath;
+    private readonly browser;
+    constructor(options: PluginInterface);
+    apply(compiler: Compiler): void;
+}

package/dist/plugin-reload/steps/setup-reload-strategy/index.d.ts

@@ -1,9 +1,20 @@
 import type { Compiler } from '@rspack/core';
-import type { PluginInterface } from '../../../types';
+import type { DevOptions, Manifest, PluginInterface } from '../../../types';
+export declare function getBackgroundEntryName(manifest: Manifest, browser: DevOptions['browser']): {
+    pageEntry: string;
+    tryCatchWrapper: boolean;
+    eagerChunkLoading: boolean;
+    serviceWorkerEntry?: undefined;
+} | {
+    pageEntry?: undefined;
+    serviceWorkerEntry: string;
+    tryCatchWrapper: boolean;
+    eagerChunkLoading: boolean;
+};
+export declare function buildContentScriptsMeta(patchedManifest: Manifest): Record<string, unknown>;
 export declare class SetupReloadStrategy {
     private readonly manifestPath;
     private readonly browser;
     constructor(options: PluginInterface);
-    private getEntryName;
     apply(compiler: Compiler): void;
 }

package/package.json

@@ -43,7 +43,7 @@
     "runtime"
   ],
   "name": "extension-develop",
-  "version": "4.1.6",
+  "version": "4.1.7",
   "description": "Develop, build, preview, and package Extension.js projects.",
   "author": {
     "name": "Cezar Augusto",