extension-develop 3.15.0 → 3.15.1

package/dist/442.cjs

@@ -2209,14 +2209,14 @@ exports.modules = {
                 {
                     test: /\.css$/,
                     exclude: /\.module\.css$/,
-                    type: 'asset',
+                    type: 'asset/inline',
                     loader: null
                 },
                 ...useSass ? [
                     {
                         test: /\.(sass|scss)$/,
                         exclude: /\.module\.(sass|scss)$/,
-                        type: 'asset',
+                        type: 'asset/inline',
                         loader: 'sass-loader'
                     },
                     {
@@ -2229,7 +2229,7 @@ exports.modules = {
                     {
                         test: /\.less$/,
                         exclude: /\.module\.less$/,
-                        type: 'asset',
+                        type: 'asset/inline',
                         loader: 'less-loader'
                     },
                     {
@@ -2239,32 +2239,22 @@ exports.modules = {
                     }
                 ] : []
             ];
-            const rules = await Promise.all(fileTypes.map(async ({ test, exclude, type = 'asset', loader })=>{
-                const baseConfig = {
+            const rules = await Promise.all(fileTypes.map(async ({ test, exclude, type, loader })=>{
+                const use = loader ? await commonStyleLoaders(projectPath, {
+                    mode: mode,
+                    loader: resolvePreprocessorLoader(loader, projectPath),
+                    loaderOptions: 'sass-loader' === loader ? createSassLoaderOptions(projectPath, mode) : {
+                        sourceMap: true
+                    }
+                }) : await commonStyleLoaders(projectPath, {
+                    mode: mode
+                });
+                return {
                     test,
                     exclude,
                     type,
-                    issuer: isContentScript
-                };
-                if ('asset' === type) baseConfig.generator = {
-                    filename: "content_scripts/[name].[contenthash:8].css"
-                };
-                if (!loader) return {
-                    ...baseConfig,
-                    use: await commonStyleLoaders(projectPath, {
-                        mode: mode
-                    })
-                };
-                const loaderOptions = 'sass-loader' === loader ? createSassLoaderOptions(projectPath, mode) : {
-                    sourceMap: true
-                };
-                return {
-                    ...baseConfig,
-                    use: await commonStyleLoaders(projectPath, {
-                        mode: mode,
-                        loader: resolvePreprocessorLoader(loader, projectPath),
-                        loaderOptions
-                    })
+                    issuer: isContentScript,
+                    use
                 };
             }));
             return rules;
@@ -2315,28 +2305,21 @@ exports.modules = {
                 ] : []
             ];
             const rules = await Promise.all(fileTypes.map(async ({ test, exclude, type, loader })=>{
-                const baseConfig = {
+                const use = loader ? await commonStyleLoaders(projectPath, {
+                    mode: mode,
+                    loader: css_in_html_loader_resolvePreprocessorLoader(loader, projectPath),
+                    loaderOptions: 'sass-loader' === loader ? createSassLoaderOptions(projectPath, mode) : {
+                        sourceMap: true
+                    }
+                }) : await commonStyleLoaders(projectPath, {
+                    mode: mode
+                });
+                return {
                     test,
                     exclude,
                     type,
-                    issuer: isNotContentScript
-                };
-                if (!loader) return {
-                    ...baseConfig,
-                    use: await commonStyleLoaders(projectPath, {
-                        mode: mode
-                    })
-                };
-                const loaderOptions = 'sass-loader' === loader ? createSassLoaderOptions(projectPath, mode) : {
-                    sourceMap: true
-                };
-                return {
-                    ...baseConfig,
-                    use: await commonStyleLoaders(projectPath, {
-                        mode: mode,
-                        loader: css_in_html_loader_resolvePreprocessorLoader(loader, projectPath),
-                        loaderOptions
-                    })
+                    issuer: isNotContentScript,
+                    use
                 };
             }));
             return rules;
@@ -2390,8 +2373,8 @@ exports.modules = {
                 const usingLess = (0, has_dependency.w)(projectPath, 'less');
                 const maybeInstallStylelint = await maybeUseStylelint(projectPath);
                 plugins.push(...maybeInstallStylelint);
-                const maybeInstallSass = await maybeUseSass(projectPath);
-                const maybeInstallLess = await maybeUseLess(projectPath, manifestPath);
+                await maybeUseSass(projectPath);
+                await maybeUseLess(projectPath, manifestPath);
                 const loaders = [
                     ...await cssInContentScriptLoader(projectPath, manifestPath, mode, {
                         useSass: usingSass,
@@ -2402,24 +2385,6 @@ exports.modules = {
                         useLess: usingLess
                     })
                 ];
-                if (maybeInstallSass.length) loaders.push({
-                    test: /\.(sass|scss)$/,
-                    exclude: /\.module\.(sass|scss)$/,
-                    type: 'asset/resource',
-                    generator: {
-                        filename: "content_scripts/[name].[contenthash:8].css"
-                    },
-                    issuer: (issuer)=>isContentScriptEntry(issuer, manifestPath, projectPath)
-                });
-                if (maybeInstallLess.length) loaders.push({
-                    test: /\.less$/,
-                    exclude: /\.module\.less$/,
-                    type: 'asset/resource',
-                    generator: {
-                        filename: "content_scripts/[name].[contenthash:8].css"
-                    },
-                    issuer: (issuer)=>isContentScriptEntry(issuer, manifestPath, projectPath)
-                });
                 compiler.options.output.cssFilename = '[name].css';
                 compiler.options.output.cssChunkFilename = '[name].css';
                 compiler.options.plugins = [
@@ -2658,9 +2623,6 @@ exports.modules = {
                 dependencyId: '@rspack/plugin-preact-refresh',
                 moduleAdapter: (mod)=>mod && mod.default || mod
             });
-            const preactPlugins = [
-                new PreactRefreshPlugin({})
-            ];
             const requireFromProject = (0, external_module_.createRequire)(external_path_.join(projectPath, 'package.json'));
             const resolveFromProject = (id)=>{
                 try {
@@ -2669,11 +2631,19 @@ exports.modules = {
                     return;
                 }
             };
+            const preactPkgJson = resolveFromProject('preact/package.json');
+            const preactDir = preactPkgJson ? external_path_.dirname(preactPkgJson) : void 0;
             const preactCompat = resolveFromProject('preact/compat');
             const preactTestUtils = resolveFromProject('preact/test-utils');
             const preactJsxRuntime = resolveFromProject('preact/jsx-runtime');
             const preactJsxDevRuntime = resolveFromProject('preact/jsx-dev-runtime');
+            const preactPlugins = [
+                new PreactRefreshPlugin(preactDir ? {
+                    preactPath: preactDir
+                } : {})
+            ];
             const alias = {};
+            if (preactDir) alias.preact = preactDir;
             if (preactCompat) {
                 alias.react = preactCompat;
                 alias['react-dom'] = preactCompat;
@@ -2830,7 +2800,7 @@ exports.modules = {
             const defaultPlugins = [
                 new VueLoaderPlugin(),
                 new core_.DefinePlugin({
-                    __VUE_OPTIONS_API__: JSON.stringify(true),
+                    __VUE_OPTIONS_API__: JSON.stringify(!isProd),
                     __VUE_PROD_DEVTOOLS__: JSON.stringify(!isProd),
                     __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: JSON.stringify(!isProd)
                 })
@@ -3425,13 +3395,20 @@ exports.modules = {
             if (!outputPath) return;
             const csDir = external_path_.join(outputPath, "content_scripts");
             if (!external_fs_.existsSync(csDir)) return;
-            const hashedRe = /^content-\d+\.[a-f0-9]+\.(js|css)(\.map)?$/i;
+            const emittedNames = new Set();
+            const assets = 'function' == typeof compilation.getAssets ? compilation.getAssets() : [];
+            for (const asset of assets){
+                const name = asset?.name || '';
+                if (name.startsWith("content_scripts/")) emittedNames.add(name);
+            }
+            const hashedRe = /^[A-Za-z0-9._-]+\.[a-f0-9]{6,}\.(js|css)(\.map)?$/i;
             try {
                 for (const name of external_fs_.readdirSync(csDir)){
                     if (!hashedRe.test(name)) continue;
                     const rel = `content_scripts/${name}`;
-                    if (!currentNames.has(rel)) {
-                        if (!currentNames.has(rel.replace(/\.map$/, ''))) try {
+                    const relNoMap = rel.replace(/\.map$/, '');
+                    if (!(currentNames.has(rel) || currentNames.has(relNoMap))) {
+                        if (!(emittedNames.has(rel) || emittedNames.has(relNoMap))) try {
                             external_fs_.unlinkSync(external_path_.join(csDir, name));
                         } catch  {}
                     }
@@ -3909,7 +3886,19 @@ exports.modules = {
                 }
             }
             const assetKeys = Object.keys(compilation.assets || {});
-            const cssUnderContentScripts = assetKeys.filter((k)=>k.startsWith("content_scripts/")).filter((k)=>k.endsWith('.css')).sort();
+            const emittedCssUnderContentScripts = assetKeys.filter((k)=>k.startsWith("content_scripts/")).filter((k)=>k.endsWith('.css'));
+            const onDiskCssUnderContentScripts = [];
+            const outputPath = compilation.options.output?.path;
+            if (outputPath) try {
+                const csDir = external_path_.join(outputPath, "content_scripts");
+                if (external_fs_.existsSync(csDir)) {
+                    for (const name of external_fs_.readdirSync(csDir))if (name.endsWith('.css')) onDiskCssUnderContentScripts.push(`content_scripts/${name}`);
+                }
+            } catch  {}
+            const cssUnderContentScripts = Array.from(new Set([
+                ...emittedCssUnderContentScripts,
+                ...onDiskCssUnderContentScripts
+            ])).sort();
             if (Array.isArray(canonicalManifest.content_scripts)) for (const contentScript of canonicalManifest.content_scripts){
                 const jsFiles = Array.isArray(contentScript.js) ? contentScript.js : [];
                 const canonicalCss = jsFiles.map(toCanonicalContentScriptCss).filter((resource)=>Boolean(resource && cssUnderContentScripts.includes(resource)));
@@ -8937,7 +8926,7 @@ Set background.noDynamicEntryWarning to true to disable this warning.
             return 'ignored';
         }
         const BUDGET_BYTES = {
-            "content-script": 153600,
+            "content-script": 262144,
             'service-worker': 204800,
             page: 512000,
             ignored: 1 / 0