extension-develop 4.0.3 → 4.0.4-canary.1783011904.8c709c91

package/dist/0~rspack-config.mjs

@@ -2204,7 +2204,7 @@ class StaticAssetsPlugin {
             const rule = thisRule;
             const resourceQuery = rule?.resourceQuery;
             if (!(resourceQuery instanceof RegExp)) return false;
-            return resourceQuery.test('url');
+            return resourceQuery.test('?url');
         });
         const hasCustomFontsRule = compiler.options.module.rules.some((thisRule)=>{
             const rule = thisRule;
@@ -2215,7 +2215,7 @@ class StaticAssetsPlugin {
         const loaders = [
             ...hasUrlResourceQueryRule ? [] : [
                 {
-                    resourceQuery: /url/,
+                    resourceQuery: /(?:^\?|&)url(?:&|=|$)/,
                     type: 'asset/resource'
                 }
             ],
@@ -2864,6 +2864,9 @@ class JsFrameworksPlugin {
                 issuerLayer: {
                     not: EXTENSIONJS_CONTENT_SCRIPT_LAYER
                 },
+                resourceQuery: {
+                    not: /__extensionjs_classic_concat__/
+                },
                 type: "javascript/esm",
                 exclude: [
                     ...swcRuleBase.exclude,
@@ -5437,10 +5440,8 @@ const add_scripts_isRemoteUrl = (entry)=>/^([a-z][a-z0-9+.-]*:)?\/\//i.test(entr
 const isContentScriptFeature = (feature)=>feature.startsWith("content_scripts/");
 const isScriptsFolderFeature = (feature)=>feature.startsWith("scripts/");
 const isBackgroundScriptsFeature = (feature)=>"background/scripts" === feature;
-function createSequentialEntryModule(feature, entryImports) {
-    const isCss = (p)=>/\.css$/i.test(p);
-    const jsFiles = entryImports.filter((p)=>!isCss(p));
-    const cssFiles = entryImports.filter(isCss);
+function createSequentialEntryModule(feature, scriptImports) {
+    const jsFiles = scriptImports;
     const isClassic = (p)=>{
         try {
             const src = __rspack_external_fs.readFileSync(p, 'utf8');
@@ -5454,13 +5455,13 @@ function createSequentialEntryModule(feature, entryImports) {
         const queryData = encodeURIComponent(JSON.stringify({
             feature,
             js: jsFiles,
-            css: cssFiles
+            css: []
         }));
         return `${jsFiles[0]}?__extensionjs_classic_concat__=${queryData}`;
     }
     const source = [
         `/* extension.js sequential entry: ${feature} */`,
-        ...entryImports.map((entryImport)=>`import ${JSON.stringify(String(entryImport))};`)
+        ...jsFiles.map((entryImport)=>`import ${JSON.stringify(String(entryImport))};`)
     ].join('\n');
     return `data:text/javascript;charset=utf-8,${encodeURIComponent(source)}`;
 }
@@ -5522,12 +5523,20 @@ class AddScripts {
             if (__rspack_external_path.isAbsolute(entry)) return entry;
             return __rspack_external_path.join(manifestDir, entry);
         };
+        const claimedByContentScript = new Set();
+        for (const [feature, scriptPath] of Object.entries(scriptFields)){
+            if (!isContentScriptFeature(feature)) continue;
+            const rawEntries = Array.isArray(scriptPath) ? scriptPath || [] : scriptPath ? [
+                scriptPath
+            ] : [];
+            for (const resolved of getScriptEntries(rawEntries.map(resolveEntryPath)))claimedByContentScript.add(__rspack_external_path.resolve(resolved));
+        }
         for (const [feature, scriptPath] of Object.entries(scriptFields)){
             const rawEntries = Array.isArray(scriptPath) ? scriptPath || [] : scriptPath ? [
                 scriptPath
             ] : [];
             const resolvedEntries = rawEntries.map(resolveEntryPath);
-            const scriptImports = getScriptEntries(resolvedEntries);
+            const scriptImports = isScriptsFolderFeature(feature) ? getScriptEntries(resolvedEntries).filter((p)=>!claimedByContentScript.has(__rspack_external_path.resolve(p))) : getScriptEntries(resolvedEntries);
             const cssImports = getCssEntries(resolvedEntries);
             const entryImports = [
                 ...new Set([
@@ -5537,7 +5546,8 @@ class AddScripts {
             ];
             const shouldUseSequentialEntryModule = (isContentScriptFeature(feature) || isBackgroundScriptsFeature(feature)) && scriptImports.length > 1;
             const finalEntryImports = shouldUseSequentialEntryModule ? [
-                createSequentialEntryModule(feature, entryImports)
+                createSequentialEntryModule(feature, scriptImports),
+                ...cssImports
             ] : entryImports;
             if (finalEntryImports.length) newEntries[feature] = 'background/service_worker' === feature ? {
                 import: finalEntryImports,

package/dist/101.mjs

@@ -665,7 +665,7 @@ async function config_loader_isUsingExperimentalConfig(projectPath) {
     }
     return false;
 }
-var package_namespaceObject = /*#__PURE__*/ JSON.parse('{"rE":"4.0.3","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","adm-zip":"^0.5.16","browser-extension-manifest-fields":"^2.2.8","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.1.1","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.10","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","typescript":"5.9.3","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.0.4-canary.1783011904.8c709c91","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","adm-zip":"^0.5.16","browser-extension-manifest-fields":"^2.2.8","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.1.1","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.10","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","typescript":"5.9.3","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_path.isAbsolute(p) ? p : __rspack_external_path.resolve(p);
 }