extension-develop 4.0.33 → 4.0.35

package/dist/0~rspack-config.mjs

@@ -2720,6 +2720,9 @@ async function buildCssRules(projectPath, mode, usage, opts) {
         if (missingTool) use.push({
             loader: resolveDevelopDistFile('preprocessor-passthrough-loader')
         });
+        if ('css' === type || 'css/module' === type) use.unshift({
+            loader: resolveDevelopDistFile('late-css-import-loader')
+        });
         return {
             test,
             exclude,
@@ -7103,10 +7106,6 @@ function manifestDeclaredSourcePaths(manifest) {
     add(manifest.side_panel?.default_path);
     add(manifest.sidebar_action?.default_panel);
     for (const page of Object.values(manifest.chrome_url_overrides ?? {}))add(page);
-    for (const contentScript of manifest.content_scripts ?? []){
-        for (const js of contentScript?.js ?? [])add(js);
-        for (const css of contentScript?.css ?? [])add(css);
-    }
     return declared;
 }
 function extractGetURLLiterals(source) {
@@ -7646,16 +7645,85 @@ class StaticAssetsPlugin {
             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 IMAGE_EXTENSIONS = [
+            'png',
+            'jpg',
+            'jpeg',
+            'gif',
+            'webp',
+            'avif',
+            'ico',
+            'bmp'
+        ];
+        const FONT_EXTENSIONS = [
+            'woff',
+            'woff2',
+            'eot',
+            'ttf',
+            'otf'
+        ];
+        const FILE_EXTENSIONS = [
+            'txt',
+            'md',
+            'csv',
+            'tsv',
+            'xml',
+            'pdf',
+            'docx',
+            'doc',
+            'xls',
+            'xlsx',
+            'ppt',
+            'pptx',
+            'zip',
+            'gz',
+            'gzip',
+            'tgz'
+        ];
+        const unclaimedExtensions = (extensions)=>extensions.filter((ext)=>!compiler.options.module.rules.some((thisRule)=>isFullCustomRuleFor(thisRule, `.${ext}`)));
+        const scopedQueriesForAll = (extensions)=>{
+            const seen = new Set();
+            for (const ext of extensions)for (const query of scopedQueriesFor(`.${ext}`))seen.add(query);
+            return Array.from(seen);
+        };
+        const inlineKB = 2;
+        const defaultRuleFor = (extensions, inline)=>{
+            const remaining = unclaimedExtensions(extensions);
+            if (!remaining.length) return null;
+            const scoped = scopedQueriesForAll(remaining);
+            return {
+                test: new RegExp(`\\.(${remaining.join('|')})$`, 'i'),
+                type: 'asset',
+                generator: {
+                    filename: filenamePattern
+                },
+                ...inline ? {
+                    parser: {
+                        dataUrlCondition: {
+                            maxSize: 1024 * inlineKB
+                        }
+                    }
+                } : {},
+                ...scoped.length ? {
+                    resourceQuery: {
+                        not: scoped
+                    }
+                } : {}
+            };
+        };
+        const hasCustomSvgRule = 0 === unclaimedExtensions([
+            'svg'
+        ]).length;
+        const imagesRule = defaultRuleFor(IMAGE_EXTENSIONS, true);
+        const fontsRule = defaultRuleFor(FONT_EXTENSIONS, true);
+        const filesRule = defaultRuleFor(FILE_EXTENSIONS, true);
         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)=>isFullCustomRuleFor(thisRule, '.woff'));
         const svgScopedQueries = scopedQueriesFor('.svg');
-        const fontsScopedQueries = scopedQueriesFor('.woff');
         const loaders = [
             ...hasCustomSvgRule ? [] : [
                 svgScopedQueries.length ? {
@@ -7665,44 +7733,15 @@ class StaticAssetsPlugin {
                     }
                 } : defaultSvgRule
             ],
-            {
-                test: /\.(png|jpg|jpeg|gif|webp|avif|ico|bmp)$/i,
-                type: 'asset',
-                generator: {
-                    filename: filenamePattern
-                },
-                parser: {
-                    dataUrlCondition: {
-                        maxSize: 2048
-                    }
-                }
-            },
-            ...hasCustomFontsRule ? [] : [
-                {
-                    test: /\.(woff|woff2|eot|ttf|otf)$/i,
-                    type: 'asset',
-                    generator: {
-                        filename: filenamePattern
-                    },
-                    ...fontsScopedQueries.length ? {
-                        resourceQuery: {
-                            not: fontsScopedQueries
-                        }
-                    } : {}
-                }
-            ],
-            {
-                test: /\.(txt|md|csv|tsv|xml|pdf|docx|doc|xls|xlsx|ppt|pptx|zip|gz|gzip|tgz)$/i,
-                type: 'asset',
-                generator: {
-                    filename: filenamePattern
-                },
-                parser: {
-                    dataUrlCondition: {
-                        maxSize: 2048
-                    }
-                }
-            },
+            ...imagesRule ? [
+                imagesRule
+            ] : [],
+            ...fontsRule ? [
+                fontsRule
+            ] : [],
+            ...filesRule ? [
+                filesRule
+            ] : [],
             ...hasUrlResourceQueryRule ? [] : [
                 {
                     resourceQuery: /(?:^\?|&)url(?:&|=|$)/,
@@ -7720,11 +7759,10 @@ class StaticAssetsPlugin {
         if (isDebug()) {
             const rulesEnabled = [];
             rulesEnabled.push(hasCustomSvgRule ? 'SVG(custom)' : 'SVG(default)');
-            rulesEnabled.push('Images');
-            rulesEnabled.push('Fonts');
-            rulesEnabled.push('Files');
+            rulesEnabled.push(imagesRule ? 'Images' : 'Images(custom)');
+            rulesEnabled.push(fontsRule ? 'Fonts' : 'Fonts(custom)');
+            rulesEnabled.push(filesRule ? 'Files' : 'Files(custom)');
             console.log(assetsRulesEnabled(rulesEnabled));
-            const inlineKB = 2;
             console.log(assetsConfigsDetected(filenamePattern, hasCustomSvgRule ? 'custom' : 'default', hasCustomSvgRule ? void 0 : inlineKB, inlineKB, inlineKB));
             compiler.hooks.afterEmit.tap(StaticAssetsPlugin.name, (compilation)=>{
                 try {
@@ -12588,7 +12626,9 @@ class AddScripts {
                 createSequentialEntryModule(feature, scriptImports),
                 ...cssImports
             ] : entryImports;
-            if (finalEntryImports.length) newEntries[feature] = 'background/service_worker' === feature ? {
+            if (!finalEntryImports.length) continue;
+            const runsAsWorker = 'background/service_worker' === feature || isBackgroundScriptsFeature(feature) && 3 === Number(manifestJson.manifest_version) && !isGeckoBasedBrowser(String(this.browser));
+            newEntries[feature] = runsAsWorker ? {
                 import: finalEntryImports,
                 ...manifestJson.background?.type === 'module' ? {} : {
                     chunkLoading: "import-scripts"

package/dist/101.mjs

@@ -94,6 +94,9 @@ function manifestNotFoundError(manifestPath, candidates = []) {
     }).join('\n');
     return `${base}\n\n${pintor.gray(hint)}\n${pintor.blue(suggestions)}`;
 }
+function previewingSourceFallback(browser, distDir) {
+    return `${getLoggingPrefix('warn')} No production build found at ${distDir}, previewing the source manifest directory instead.\nRun \`extension build --browser ${String(browser)}\` first to preview the built output.`;
+}
 function previewing(browser, noBrowser) {
     const suffix = noBrowser ? ' (no-browser mode)' : '';
     return `${getLoggingPrefix('info')} Previewing on ${capitalizedBrowserName(browser)}${suffix}.`;
@@ -145,16 +148,19 @@ function buildFailed(errorCount) {
     const noun = 1 === count ? 'error' : 'errors';
     return `${getLoggingPrefix('error')} Build failed with ${count} ${noun}.`;
 }
+function stripModuleWarningWrapper(message) {
+    return message.replace(/^Module (?:Warning|Error) \(from [^)]*\):\s*/, '');
+}
 function getWarningMessage(warning) {
     if (!warning) return '';
-    if ('string' == typeof warning) return warning.trim();
+    if ('string' == typeof warning) return stripModuleWarningWrapper(warning.trim());
     const candidates = [
         warning.message,
         warning.details,
         warning.reason,
         warning.description
     ];
-    for (const candidate of candidates)if ('string' == typeof candidate && candidate.trim()) return candidate.trim();
+    for (const candidate of candidates)if ('string' == typeof candidate && candidate.trim()) return stripModuleWarningWrapper(candidate.trim());
     return '';
 }
 function getWarningSource(warning) {
@@ -682,7 +688,7 @@ async function config_loader_isUsingExperimentalConfig(projectPath) {
     }
     return false;
 }
-var package_namespaceObject = /*#__PURE__*/ JSON.parse('{"rE":"4.0.33","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.0.35","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);
 }
@@ -2471,6 +2477,7 @@ async function extensionPreview(pathOrRemoteUrl, previewOptions, browserLauncher
         return;
     }
     humanLine(runningMessage(browser));
+    if (!previewOptions.outputPath && __rspack_external_node_path_c5b9b54f.resolve(outputPath) !== __rspack_external_node_path_c5b9b54f.resolve(distPath)) humanLine(previewingSourceFallback(browser, distPath));
     const safeBrowserConfig = sanitize(browserConfig);
     const safeCommandConfig = sanitize(commandConfig);
     const safePreviewOptions = sanitize(previewOptions);

package/dist/845.mjs

@@ -63,4 +63,13 @@ function deadCssUrlRef(issuerPath, request) {
         `Set ${pintor.blue('EXTENSION_STRICT_REFS=true')} to make this a build error.`
     ].join('\n');
 }
-export { cssConfigsDetected, cssIntegrationsEnabled, cssParseErrorShippedVerbatim, deadCssUrlRef, isUsingIntegration, missingSassDependency, postCssPluginNotResolved, preprocessorShippedUncompiled };
+function lateCssImportIgnored(issuerPath, line) {
+    const where = line ? `${issuerPath}:${line}` : issuerPath;
+    return [
+        `An ${pintor.blue('@import')} rule comes after other rules, so browsers skip it.`,
+        `${pintor.gray('PATH')} ${pintor.underline(where)}`,
+        "Chrome applies the rest of the stylesheet and ignores this import, so the build kept going.",
+        `Move the ${pintor.blue('@import')} above every other rule to make it load.`
+    ].join('\n');
+}
+export { cssConfigsDetected, cssIntegrationsEnabled, cssParseErrorShippedVerbatim, deadCssUrlRef, isUsingIntegration, lateCssImportIgnored, missingSassDependency, postCssPluginNotResolved, preprocessorShippedUncompiled };

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

@@ -1,5 +1,13 @@
 import { createRequire as __extjsCreateRequire } from "node:module"; const require = __extjsCreateRequire(import.meta.url);
 const GETURL_ARG = /\bruntime\s*\.\s*getURL\s*\(/;
+const BARE_IDENTIFIER = /^[A-Za-z_$][\w$]*$/;
+function identifierBoundToGetURL(source, name) {
+    const id = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const rhs = '[^;\\n]*\\bruntime\\s*\\.\\s*getURL\\s*\\(';
+    const declared = new RegExp('\\b(?:const|let|var)\\s+' + id + '\\s*=' + rhs);
+    const assigned = new RegExp('(?:^|[^\\w$.])' + id + '\\s*=(?!=)' + rhs);
+    return declared.test(source) || assigned.test(source);
+}
 function annotateGetURLDynamicImports(source) {
     const insertions = [];
     const n = source.length;
@@ -32,7 +40,11 @@ function annotateGetURLDynamicImports(source) {
             while(j < n && /\s/.test(source[j]))j++;
             if ('(' === source[j]) {
                 const args = readBalancedArgs(source, j);
-                if (null != args && GETURL_ARG.test(args) && !args.includes('webpackIgnore')) insertions.push(j + 1);
+                if (null != args && !args.includes('webpackIgnore')) {
+                    const direct = GETURL_ARG.test(args);
+                    const name = args.trim();
+                    if (direct || BARE_IDENTIFIER.test(name) && identifierBoundToGetURL(source, name)) insertions.push(j + 1);
+                }
             }
             prevSignificant = 't';
             i += 6;

package/dist/late-css-import-loader.mjs

@@ -0,0 +1,47 @@
+import { createRequire as __extjsCreateRequire } from "node:module"; const require = __extjsCreateRequire(import.meta.url);
+import postcss from "postcss";
+import { lateCssImportIgnored } from "./845.mjs";
+import * as __rspack_external_node_path_c5b9b54f from "node:path";
+function findLateImports(css) {
+    let root;
+    try {
+        root = postcss.parse(css);
+    } catch  {
+        return [];
+    }
+    const firstBlock = root.nodes.findIndex((node)=>Array.isArray(node.nodes));
+    const late = [];
+    root.walkAtRules('import', (node)=>{
+        const start = node.source?.start?.offset;
+        const end = node.source?.end?.offset;
+        if ('number' != typeof start || 'number' != typeof end) return;
+        const atRoot = node.parent === root;
+        const index = atRoot ? root.index(node) : -1;
+        const isLate = !atRoot || -1 !== firstBlock && index > firstBlock;
+        if (!isLate) return;
+        late.push({
+            start,
+            end,
+            line: node.source?.start?.line || 0
+        });
+    });
+    return late.sort((a, b)=>a.start - b.start);
+}
+function blankLateImports(css, late) {
+    let out = css;
+    for (const { start, end } of late){
+        const blanked = out.slice(start, end).replace(/[^\n]/g, ' ');
+        out = out.slice(0, start) + blanked + out.slice(end);
+    }
+    return out;
+}
+function lateCssImportLoader(source, map) {
+    const late = findLateImports(source);
+    if (0 === late.length) return void this.callback(null, source, map);
+    const relative = this.rootContext ? __rspack_external_node_path_c5b9b54f.relative(this.rootContext, this.resourcePath) || this.resourcePath : this.resourcePath;
+    const issuer = relative.split(__rspack_external_node_path_c5b9b54f.sep).join('/');
+    for (const entry of late)this.emitWarning(new Error(lateCssImportIgnored(issuer, entry.line || void 0)));
+    this.callback(null, blankLateImports(source, late), map);
+}
+export default lateCssImportLoader;
+export { blankLateImports, findLateImports };

package/dist/lib/messages.d.ts

@@ -7,6 +7,7 @@ export declare function remoteFetchTimedOut(target: string, ms: number): string;
 export declare function manifestInvalidJson(manifestPath: string, error: unknown): string;
 export declare function notAnExtensionManifestError(manifestPath: string): string;
 export declare function manifestNotFoundError(manifestPath: string, candidates?: string[]): string;
+export declare function previewingSourceFallback(browser: DevOptions['browser'], distDir: string): string;
 export declare function previewing(browser: DevOptions['browser'], noBrowser?: boolean): string;
 export declare function starting(browser: DevOptions['browser'], noBrowser?: boolean): string;
 export declare function extensionLoadRecovered(): string;

package/dist/plugin-css/css-lib/messages.d.ts

@@ -7,3 +7,4 @@ export declare function postCssPluginNotResolved(pluginName: string, projectPath
 export declare function cssParseErrorShippedVerbatim(resourcePath: string, error: unknown): string;
 export declare function preprocessorShippedUncompiled(resourcePath: string, tool: 'sass' | 'less'): string;
 export declare function deadCssUrlRef(issuerPath: string, request: string): string;
+export declare function lateCssImportIgnored(issuerPath: string, line?: number): string;

package/dist/plugin-css/late-css-import-loader.d.ts

@@ -0,0 +1,15 @@
+interface LateCssImportLoaderContext {
+    resourcePath: string;
+    rootContext?: string;
+    callback(err: Error | null, content?: string, map?: unknown): void;
+    emitWarning(warning: Error): void;
+}
+export interface LateImport {
+    start: number;
+    end: number;
+    line: number;
+}
+export declare function findLateImports(css: string): LateImport[];
+export declare function blankLateImports(css: string, late: LateImport[]): string;
+export default function lateCssImportLoader(this: LateCssImportLoaderContext, source: string, map?: unknown): void;
+export {};

package/package.json

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