@best-shot/preset-style 0.16.2 → 0.16.4

package/index.mjs

@@ -1,11 +1,54 @@
+import slashToRegexp from 'slash-to-regexp';
 import { applyScssLess } from './lib/apply-scss-less.mjs';
 import { applyStylesheet } from './lib/apply-stylesheet.mjs';
 
 export function apply({ config: { css: { extract } = {} } }) {
   return async (chain) => {
-    await applyStylesheet({ extract })(chain);
+    const hot = chain.devServer.get('hot');
+
+    const needExtract = extract ? true : !hot;
+
+    const { default: MiniCssExtractPlugin } =
+      await import('mini-css-extract-plugin');
+
+    await applyStylesheet({ needExtract, MiniCssExtractPlugin })(chain);
 
     applyScssLess()(chain);
+
+    if (needExtract) {
+      chain.plugin('extract-css').use(MiniCssExtractPlugin, [
+        {
+          ignoreOrder: true,
+          experimentalUseImportModule: true,
+        },
+      ]);
+    }
+
+    if (chain.module.rules.has('babel')) {
+      chain.module
+        .rule('babel')
+        .exclude.add(slashToRegexp('/node_modules/css-loader/'));
+
+      if (needExtract) {
+        chain.module
+          .rule('babel')
+          .exclude.add(slashToRegexp('/node_modules/mini-css-extract-plugin/'));
+      }
+    }
+
+    const minimize = chain.optimization.get('minimize');
+
+    if (minimize) {
+      const { default: CssMinimizerPlugin } =
+        await import('css-minimizer-webpack-plugin');
+      chain.optimization.minimizer('css-minimizer').use(CssMinimizerPlugin, [
+        {
+          minimizerOptions: {
+            preset: ['default', { discardComments: { removeAll: true } }],
+          },
+        },
+      ]);
+    }
   };
 }
 
@@ -22,13 +65,4 @@ export const schema = {
       },
     },
   },
-  output: {
-    type: 'object',
-    default: {},
-    properties: {
-      cssFilename: {
-        default: '.css',
-      },
-    },
-  },
 };

package/lib/apply-scss-less.mjs

@@ -8,10 +8,12 @@ function addExtname(rule) {
 }
 
 export function applyScssLess() {
-  return (chain) => {
+  // eslint-disable-next-line unicorn/consistent-function-scoping
+  return  (chain) => {
     chain.module.rule('style').batch(addExtname);
 
     chain.module
+      .rule('style')
       .rule('sass')
       .test(extToRegexp({ extname: ['scss', 'sass'] }))
       .use('resolve-url-loader')
@@ -28,6 +30,7 @@ export function applyScssLess() {
       });
 
     chain.module
+      .rule('style')
       .rule('less')
       .after('sass')
       .test(extToRegexp({ extname: ['less'] }))

package/lib/apply-stylesheet.mjs

@@ -2,29 +2,13 @@ import { fileURLToPath } from 'node:url';
 
 import extToRegexp from 'ext-to-regexp';
 import { haveDevDependencies, haveLocalDependencies } from 'settingz';
-import slashToRegexp from 'slash-to-regexp';
 
 const auto = (resourcePath, resourceQuery) =>
   /\.module\.\w+$/i.test(resourcePath) ||
   new URLSearchParams(resourceQuery).get('module');
 
-export function applyStylesheet({ extract }) {
+export function applyStylesheet({ needExtract, MiniCssExtractPlugin }) {
   return async (chain) => {
-    const minimize = chain.optimization.get('minimize');
-
-    if (minimize) {
-      const { default: CssMinimizerPlugin } = await import(
-        'css-minimizer-webpack-plugin'
-      );
-      chain.optimization.minimizer('css-minimizer').use(CssMinimizerPlugin, [
-        {
-          minimizerOptions: {
-            preset: ['default', { discardComments: { removeAll: true } }],
-          },
-        },
-      ]);
-    }
-
     const rule = chain.module
       .rule('style')
       .after('esm')
@@ -41,37 +25,7 @@ export function applyStylesheet({ extract }) {
       .dependency('url')
       .generator.filename(assetModuleFilename.replace('[ext]', cssFilename));
 
-    const { default: MiniCssExtractPlugin } = await import(
-      'mini-css-extract-plugin'
-    );
-
     const mode = chain.get('mode');
-    const hot = chain.devServer.get('hot');
-
-    const needExtract = extract ? true : !hot;
-
-    if (needExtract) {
-      chain.plugin('extract-css').use(MiniCssExtractPlugin, [
-        {
-          filename: `[name]${cssFilename}`,
-          // chunkFilename: '[id].css',
-          ignoreOrder: true,
-          experimentalUseImportModule: true,
-        },
-      ]);
-    }
-
-    if (chain.module.rules.has('babel')) {
-      chain.module
-        .rule('babel')
-        .exclude.add(slashToRegexp('/node_modules/css-loader/'));
-
-      if (needExtract) {
-        chain.module
-          .rule('babel')
-          .exclude.add(slashToRegexp('/node_modules/mini-css-extract-plugin/'));
-      }
-    }
 
     const parent = rule.rule('all').oneOf('not-url').dependency({ not: 'url' });
 
@@ -107,12 +61,12 @@ export function applyStylesheet({ extract }) {
       .options({
         postcssOptions: {
           plugins: haveLocalDependencies('tailwindcss')
-            ? [
-                haveDevDependencies('@tailwindcss/postcss')
-                  ? '@tailwindcss/postcss'
-                  : 'tailwindcss',
-                'postcss-preset-evergreen/lib/tailwind.cjs',
-              ]
+            ? haveDevDependencies('@tailwindcss/postcss')
+              ? [
+                  '@tailwindcss/postcss',
+                  'postcss-preset-evergreen/lib/tailwind.cjs',
+                ]
+              : ['tailwindcss', 'postcss-preset-evergreen']
             : ['postcss-preset-evergreen'],
         },
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@best-shot/preset-style",
-  "version": "0.16.2",
+  "version": "0.16.4",
   "description": "A `best-shot` preset for stylesheet",
   "license": "MIT",
   "author": {
@@ -34,28 +34,28 @@
   "main": "index.mjs",
   "type": "module",
   "dependencies": {
-    "css-loader": "^7.1.2",
+    "css-loader": "^7.1.3",
     "css-minimizer-webpack-plugin": "^7.0.4",
     "cssnano": "^7.1.2",
     "ext-to-regexp": "^0.1.0",
     "less": "^4.5.1",
-    "less-loader": "^12.3.0",
-    "mini-css-extract-plugin": "^2.9.4",
+    "less-loader": "^12.3.1",
+    "mini-css-extract-plugin": "^2.10.0",
     "postcss": "^8.5.6",
     "postcss-loader": "^8.2.0",
     "postcss-preset-evergreen": "^0.8.2",
     "resolve-url-loader": "^5.0.0",
-    "sass-embedded": "^1.97.0",
-    "sass-loader": "^16.0.6",
+    "sass-embedded": "^1.97.3",
+    "sass-loader": "^16.0.7",
     "settingz": "^0.2.0",
     "slash-to-regexp": "^0.1.0",
     "style-loader": "^4.0.0"
   },
   "peerDependencies": {
-    "@best-shot/core": "^0.13.9"
+    "@best-shot/core": "^0.13.11"
   },
   "engines": {
-    "node": ">=22.11.0"
+    "node": ">=22.18.0"
   },
   "publishConfig": {
     "access": "public",