@umijs/bundler-webpack 4.0.0-canary.20230227.1 → 4.0.0-canary.20230309.3

package/dist/build.d.ts

@@ -1,5 +1,5 @@
 import webpack from '../compiled/webpack';
-import { IOpts as IConfigOpts } from './config/config';
+import type { IOpts as IConfigOpts } from './config/config';
 import { IConfig } from './types';
 declare type IOpts = {
     cwd: string;

package/dist/build.js

@@ -35,14 +35,16 @@ module.exports = __toCommonJS(build_exports);
 var import_utils = require("@umijs/utils");
 var import_path = require("path");
 var import_webpack = __toESM(require("../compiled/webpack"));
-var import_config = require("./config/config");
 var import_types = require("./types");
+var configModule = (0, import_utils.importLazy)(
+  require.resolve("./config/config")
+);
 async function build(opts) {
   const cacheDirectoryPath = (0, import_path.resolve)(
     opts.rootDir || opts.cwd,
     opts.config.cacheDirectoryPath || "node_modules/.cache"
   );
-  const webpackConfig = await (0, import_config.getConfig)({
+  const webpackConfig = await configModule.getConfig({
     cwd: opts.cwd,
     rootDir: opts.rootDir,
     env: import_types.Env.production,
@@ -74,26 +76,21 @@ async function build(opts) {
     }
     const compiler = (0, import_webpack.default)(webpackConfig);
     let closeWatching;
-    const handler = (err, stats) => {
+    const handler = async (err, stats) => {
       var _a;
-      (_a = opts.onBuildComplete) == null ? void 0 : _a.call(opts, {
-        err,
+      const validErr = err || ((stats == null ? void 0 : stats.hasErrors()) ? new Error(stats.toString("errors-only")) : null);
+      await ((_a = opts.onBuildComplete) == null ? void 0 : _a.call(opts, {
+        err: validErr,
         stats,
         isFirstCompile,
         time: stats ? stats.endTime - stats.startTime : null,
         // pass close function to close watching
         ...opts.watch ? { close: closeWatching } : {}
-      });
+      }));
       isFirstCompile = false;
-      if (err || (stats == null ? void 0 : stats.hasErrors())) {
-        if (err) {
-          reject(err);
-        }
-        if (stats) {
-          const errorMsg = stats.toString("errors-only");
-          esbuildCompressErrorHelper(errorMsg);
-          reject(new Error(errorMsg));
-        }
+      if (validErr) {
+        (stats == null ? void 0 : stats.hasErrors()) && esbuildCompressErrorHelper(validErr.toString());
+        reject(validErr);
       } else {
         resolve2(stats);
       }

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/dev.d.ts

@@ -2,7 +2,7 @@
 import { MFSU } from '@umijs/mfsu';
 import type { Worker } from 'worker_threads';
 import webpack from '../compiled/webpack';
-import { IOpts as IConfigOpts } from './config/config';
+import type { IOpts as IConfigOpts } from './config/config';
 import { IConfig } from './types';
 declare type IOpts = {
     afterMiddlewares?: any[];

package/dist/dev.js

@@ -39,10 +39,12 @@ var import_utils = require("@umijs/utils");
 var import_fs = require("fs");
 var import_path = require("path");
 var import_webpack = __toESM(require("../compiled/webpack"));
-var import_config = require("./config/config");
 var import_constants = require("./constants");
 var import_server = require("./server/server");
 var import_types = require("./types");
+var configModule = (0, import_utils.importLazy)(
+  require.resolve("./config/config")
+);
 function ensureSerializableValue(obj) {
   return JSON.parse(
     JSON.stringify(
@@ -118,7 +120,7 @@ async function setup(opts) {
       cwd: opts.cwd
     });
   }
-  const webpackConfig = await (0, import_config.getConfig)({
+  const webpackConfig = await configModule.getConfig({
     cwd: opts.cwd,
     rootDir: opts.rootDir,
     env: import_types.Env.development,
@@ -149,7 +151,7 @@ async function setup(opts) {
     } : void 0,
     pkg: opts.pkg
   });
-  const depConfig = await (0, import_config.getConfig)({
+  const depConfig = await configModule.getConfig({
     cwd: opts.cwd,
     rootDir: opts.rootDir,
     env: import_types.Env.development,

package/dist/plugins/EsbuildMinifyFix.d.ts

@@ -3,5 +3,6 @@ export declare class EsbuildMinifyFix {
     private name;
     constructor();
     apply(compiler: Compiler): void;
+    private isIIFE;
     minifyFix(compilation: Compilation, assets: Record<string, sources.Source>): Promise<void>;
 }

package/dist/plugins/EsbuildMinifyFix.js

@@ -24,6 +24,7 @@ __export(EsbuildMinifyFix_exports, {
 module.exports = __toCommonJS(EsbuildMinifyFix_exports);
 var import_utils = require("@umijs/utils");
 var import_webpack = require("../../compiled/webpack");
+var JS_FILE_REG = /\.(js|mjs|cjs)$/;
 var EsbuildMinifyFix = class {
   constructor() {
     this.name = `EsbuildMinifyFix`;
@@ -40,9 +41,19 @@ var EsbuildMinifyFix = class {
       );
     });
   }
+  isIIFE(source) {
+    source = source.trim();
+    if (source.startsWith('(function(){"use strict";')) {
+      return true;
+    }
+    if (source.startsWith("(function(){") && (source.endsWith("})()") || source.endsWith("})();"))) {
+      return true;
+    }
+    return false;
+  }
   async minifyFix(compilation, assets) {
     const matchObject = import_webpack.ModuleFilenameHelpers.matchObject.bind(void 0, {
-      include: [/\.(js|mjs|cjs)$/]
+      include: [JS_FILE_REG]
     });
     const assetsForMinify = await Promise.all(
       Object.keys(assets).filter((name) => {
@@ -56,6 +67,9 @@ var EsbuildMinifyFix = class {
         if (info == null ? void 0 : info.EsbuildMinifyFix) {
           return false;
         }
+        if (name.endsWith(".worker.js")) {
+          return false;
+        }
         return true;
       }).map(async (name) => {
         const { info, source } = compilation.getAsset(name);
@@ -69,19 +83,37 @@ var EsbuildMinifyFix = class {
     for (const asset of assetsForMinify) {
       const { name, inputSource } = asset;
       const { source, map } = inputSource.sourceAndMap();
-      let code = source;
-      if (Buffer.isBuffer(code)) {
-        code = code.toString();
-      }
-      if (!code.startsWith('"use strict";(self.') && !code.startsWith('(function(){"use strict";') && !code.startsWith("(self.webpack")) {
-        const bundle = new import_utils.MagicString(code);
-        bundle.indent().prepend("!(function () {\n").append("}());");
-        code = bundle.toString();
+      const originCode = source.toString();
+      let newCode = originCode;
+      if (!newCode.startsWith('"use strict";(self.') && !newCode.startsWith("(self.webpack") && !this.isIIFE(newCode)) {
+        const bundle = new import_utils.MagicString(newCode);
+        bundle.prepend("!(function(){").append("}());");
+        newCode = bundle.toString();
         const output = {};
         if (map) {
-          output.source = new SourceMapSource(code, name, map, source, true);
+          const bundleMap = bundle.generateMap({
+            source: name,
+            file: `${name}.map`,
+            includeContent: true,
+            hires: true
+          });
+          const originMapAsString = JSON.stringify(map);
+          const mergedMap = (0, import_utils.remapping)(JSON.stringify(bundleMap), (file) => {
+            if (file === name) {
+              return originMapAsString;
+            }
+            return null;
+          });
+          output.source = new SourceMapSource(
+            newCode,
+            name,
+            mergedMap,
+            originCode,
+            map,
+            true
+          );
         } else {
-          output.source = new RawSource(code);
+          output.source = new RawSource(newCode);
         }
         compilation.updateAsset(name, output.source, {
           ...asset.info,

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.0-canary.20230227.1",
+  "version": "4.0.0-canary.20230309.3",
   "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.0-canary.20230227.1",
-    "@umijs/bundler-utils": "4.0.0-canary.20230227.1",
+    "@umijs/babel-preset-umi": "4.0.0-canary.20230309.3",
+    "@umijs/bundler-utils": "4.0.0-canary.20230309.3",
     "@umijs/case-sensitive-paths-webpack-plugin": "^1.0.1",
-    "@umijs/mfsu": "4.0.0-canary.20230227.1",
-    "@umijs/utils": "4.0.0-canary.20230227.1",
+    "@umijs/mfsu": "4.0.0-canary.20230309.3",
+    "@umijs/utils": "4.0.0-canary.20230309.3",
     "cors": "^2.8.5",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.78",