@umijs/bundler-webpack 4.0.56 → 4.0.57

package/dist/config/cssRules.js

@@ -62,14 +62,14 @@ async function addCSSRules(opts) {
     const nestRulesConfig = [
       userConfig.autoCSSModules && {
         rule: rule.test(test).oneOf("css-modules").resourceQuery(/modules/),
-        isCSSModules: true
+        isAutoCSSModuleRule: true
       },
       {
         rule: rule.test(test).oneOf("css").sideEffects(true),
-        isCSSModules: false
+        isAutoCSSModuleRule: false
       }
     ].filter(Boolean);
-    for (const { rule: rule2, isCSSModules } of nestRulesConfig) {
+    for (const { rule: rule2, isAutoCSSModuleRule } of nestRulesConfig) {
       if (userConfig.styleLoader) {
         rule2.use("style-loader").loader(
           require.resolve("@umijs/bundler-webpack/compiled/style-loader")
@@ -83,6 +83,23 @@ async function addCSSRules(opts) {
           esModule: true
         });
       }
+      const getLocalIdent = userConfig.ssr && getLocalIdentForSSR;
+      const localIdentName = "[local]___[hash:base64:5]";
+      let cssLoaderModulesConfig;
+      if (isAutoCSSModuleRule) {
+        cssLoaderModulesConfig = {
+          localIdentName,
+          ...userConfig.cssLoaderModules,
+          getLocalIdent
+        };
+      } else if (userConfig.normalCSSLoaderModules) {
+        cssLoaderModulesConfig = {
+          localIdentName,
+          auto: true,
+          ...userConfig.normalCSSLoaderModules,
+          getLocalIdent
+        };
+      }
       rule2.use("css-loader").loader(require.resolve("css-loader")).options({
         importLoaders: 1,
         esModule: true,
@@ -94,25 +111,7 @@ async function addCSSRules(opts) {
           }
         },
         import: true,
-        ...isCSSModules ? {
-          modules: {
-            localIdentName: "[local]___[hash:base64:5]",
-            ...userConfig.cssLoaderModules,
-            // If SSR is enabled, we need to handling the css modules name hashing
-            // and save the class names mapping into opts.cssModulesMapping
-            // so the esbuild can use it to generate the correct name for the server side
-            getLocalIdent: userConfig.ssr && ((context, localIdentName, localName, opt) => {
-              const classIdent = ((0, import_utils.winPath)(context.resourcePath).replace(
-                (0, import_utils.winPath)(ensureLastSlash(opt.context)),
-                ""
-              ) + "@" + localName).trim();
-              let hash = Buffer.from(classIdent).toString("base64").replace(/=/g, "");
-              hash = hash.substring(hash.length - 5);
-              const result = localIdentName.replace(/\[local]/g, localName).replace(/\[hash[^\[]*?]/g, hash);
-              return result;
-            })
-          }
-        } : {},
+        modules: cssLoaderModulesConfig,
         ...userConfig.cssLoader
       });
       rule2.use("postcss-loader").loader(
@@ -143,6 +142,16 @@ async function addCSSRules(opts) {
 function ensureLastSlash(path) {
   return path.endsWith("/") ? path : path + "/";
 }
+function getLocalIdentForSSR(context, localIdentName, localName, opt) {
+  const classIdent = ((0, import_utils.winPath)(context.resourcePath).replace(
+    (0, import_utils.winPath)(ensureLastSlash(opt.context)),
+    ""
+  ) + "@" + localName).trim();
+  let hash = Buffer.from(classIdent).toString("base64").replace(/=/g, "");
+  hash = hash.substring(hash.length - 5);
+  const result = localIdentName.replace(/\[local]/g, localName).replace(/\[hash[^\[]*?]/g, hash);
+  return result;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   addCSSRules

package/dist/schema.js

@@ -135,6 +135,7 @@ function getSchemas() {
       }),
       Joi.boolean()
     ),
+    normalCSSLoaderModules: (Joi) => Joi.object(),
     outputPath: (Joi) => Joi.string(),
     postcssLoader: (Joi) => Joi.object(),
     proxy: (Joi) => Joi.alternatives().try(Joi.object(), Joi.array()),

package/dist/server/ws.d.ts

@@ -8,6 +8,6 @@ import { Server as HttpsServer } from 'https';
 import WebSocket from '../../compiled/ws';
 export declare function createWebSocketServer(server: HttpServer | HttpsServer | Http2Server | Server): {
     send(message: string): void;
-    wss: WebSocket.Server<WebSocket.WebSocket>;
+    wss: WebSocket.Server;
     close(): void;
 };

package/dist/types.d.ts

@@ -90,6 +90,9 @@ export interface IConfig {
     lessLoader?: {
         [key: string]: any;
     };
+    normalCSSLoaderModules?: {
+        [key: string]: any;
+    };
     outputPath?: string;
     postcssLoader?: {
         [key: string]: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.56",
+  "version": "4.0.57",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -33,11 +33,11 @@
     "@svgr/plugin-jsx": "^6.5.1",
     "@svgr/plugin-svgo": "^6.5.1",
     "@types/hapi__joi": "17.1.9",
-    "@umijs/babel-preset-umi": "4.0.56",
-    "@umijs/bundler-utils": "4.0.56",
+    "@umijs/babel-preset-umi": "4.0.57",
+    "@umijs/bundler-utils": "4.0.57",
     "@umijs/case-sensitive-paths-webpack-plugin": "^1.0.1",
-    "@umijs/mfsu": "4.0.56",
-    "@umijs/utils": "4.0.56",
+    "@umijs/mfsu": "4.0.57",
+    "@umijs/utils": "4.0.57",
     "cors": "^2.8.5",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.78",