@umijs/bundler-webpack 4.0.0-canary.20230224.1 → 4.0.0-canary.20230302.1

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/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.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`;
@@ -42,7 +43,7 @@ var EsbuildMinifyFix = class {
   }
   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) => {
@@ -53,6 +54,9 @@ var EsbuildMinifyFix = class {
         if (!(info == null ? void 0 : info.minimized)) {
           return false;
         }
+        if (info == null ? void 0 : info.EsbuildMinifyFix) {
+          return false;
+        }
         return true;
       }).map(async (name) => {
         const { info, source } = compilation.getAsset(name);
@@ -66,21 +70,40 @@ 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);
+      const originCode = source.toString();
+      let newCode = originCode;
+      if (!newCode.startsWith('"use strict";(self.') && !newCode.startsWith('(function(){"use strict";') && !newCode.startsWith("(self.webpack")) {
+        const bundle = new import_utils.MagicString(newCode);
         bundle.indent().prepend("!(function () {\n").append("}());");
-        code = bundle.toString();
+        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,
           EsbuildMinifyFix: true
         });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-canary.20230224.1",
+  "version": "4.0.0-canary.20230302.1",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -28,22 +28,22 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@pmmmwh/react-refresh-webpack-plugin": "0.5.7",
-    "@svgr/core": "6.2.1",
-    "@svgr/plugin-jsx": "^6.2.1",
-    "@svgr/plugin-svgo": "^6.2.0",
+    "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
+    "@svgr/core": "6.5.1",
+    "@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.20230224.1",
-    "@umijs/bundler-utils": "4.0.0-canary.20230224.1",
+    "@umijs/babel-preset-umi": "4.0.0-canary.20230302.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20230302.1",
     "@umijs/case-sensitive-paths-webpack-plugin": "^1.0.1",
-    "@umijs/mfsu": "4.0.0-canary.20230224.1",
-    "@umijs/utils": "4.0.0-canary.20230224.1",
+    "@umijs/mfsu": "4.0.0-canary.20230302.1",
+    "@umijs/utils": "4.0.0-canary.20230302.1",
     "cors": "^2.8.5",
     "css-loader": "6.7.1",
-    "es5-imcompatible-versions": "^0.1.73",
+    "es5-imcompatible-versions": "^0.1.78",
     "fork-ts-checker-webpack-plugin": "7.3.0",
-    "jest-worker": "29.3.1",
-    "lightningcss": "1.18.0",
+    "jest-worker": "29.4.3",
+    "lightningcss": "1.19.0",
     "node-libs-browser": "2.2.1",
     "postcss": "^8.4.21",
     "postcss-preset-env": "7.5.0",