@umijs/bundler-webpack 4.0.0-canary.20230210.1 → 4.0.0-canary.20230216.1

package/dist/build.d.ts

@@ -15,6 +15,7 @@ declare type IOpts = {
     extraBabelPlugins?: any[];
     extraBabelPresets?: any[];
     clean?: boolean;
+    watch?: boolean;
 } & Pick<IConfigOpts, 'cache' | 'pkg'>;
 export declare function build(opts: IOpts): Promise<webpack.Stats>;
 export {};

package/dist/build.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -69,13 +73,16 @@ async function build(opts) {
       import_utils.rimraf.sync(webpackConfig.output.path);
     }
     const compiler = (0, import_webpack.default)(webpackConfig);
-    compiler.run((err, stats) => {
+    let closeWatching;
+    const handler = (err, stats) => {
       var _a;
       (_a = opts.onBuildComplete) == null ? void 0 : _a.call(opts, {
         err,
         stats,
         isFirstCompile,
-        time: stats ? stats.endTime - stats.startTime : null
+        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())) {
@@ -89,9 +96,19 @@ async function build(opts) {
       } else {
         resolve2(stats);
       }
-      compiler.close(() => {
-      });
-    });
+      if (!opts.watch)
+        compiler.close(() => {
+        });
+    };
+    if (opts.watch) {
+      const watching = compiler.watch(
+        webpackConfig.watchOptions || {},
+        handler
+      );
+      closeWatching = watching.close.bind(watching);
+    } else {
+      compiler.run(handler);
+    }
   });
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/config/javaScriptRules.js

@@ -107,6 +107,7 @@ async function addJavaScriptRules(opts) {
       rule.use("babel-loader").loader(require.resolve("../../compiled/babel-loader")).options({
         sourceType: "unambiguous",
         babelrc: false,
+        configFile: false,
         cacheDirectory: false,
         browserslistConfigFile: false,
         targets: userConfig.targets,

package/dist/dev.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="node" />
+import { MFSU } from '@umijs/mfsu';
 import type { Worker } from 'worker_threads';
+import webpack from '../compiled/webpack';
 import { IOpts as IConfigOpts } from './config/config';
 import { IConfig } from './types';
 declare type IOpts = {
@@ -30,4 +32,8 @@ declare type IOpts = {
 } & Pick<IConfigOpts, 'cache' | 'pkg'>;
 export declare function ensureSerializableValue(obj: any): any;
 export declare function dev(opts: IOpts): Promise<void>;
+export declare function setup(opts: IOpts): Promise<{
+    mfsu: MFSU | null;
+    webpackConfig: webpack.Configuration;
+}>;
 export {};

package/dist/dev.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -26,7 +30,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var dev_exports = {};
 __export(dev_exports, {
   dev: () => dev,
-  ensureSerializableValue: () => ensureSerializableValue
+  ensureSerializableValue: () => ensureSerializableValue,
+  setup: () => setup
 });
 module.exports = __toCommonJS(dev_exports);
 var import_mfsu = require("@umijs/mfsu");
@@ -53,6 +58,25 @@ function ensureSerializableValue(obj) {
   );
 }
 async function dev(opts) {
+  const { mfsu, webpackConfig } = await setup(opts);
+  await (0, import_server.createServer)({
+    webpackConfig,
+    userConfig: opts.config,
+    cwd: opts.cwd,
+    beforeMiddlewares: [
+      ...(mfsu == null ? void 0 : mfsu.getMiddlewares()) || [],
+      ...opts.beforeMiddlewares || []
+    ],
+    port: opts.port,
+    host: opts.host,
+    ip: opts.ip,
+    afterMiddlewares: [...opts.afterMiddlewares || []],
+    onDevCompileDone: opts.onDevCompileDone,
+    onProgress: opts.onProgress,
+    onBeforeMiddleware: opts.onBeforeMiddleware
+  });
+}
+async function setup(opts) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   const cacheDirectoryPath = (0, import_path.resolve)(
     opts.rootDir || opts.cwd,
@@ -164,25 +188,14 @@ async function dev(opts) {
       import_utils.rimraf.sync(webpackConfig.cache.cacheDirectory);
     }
   }
-  await (0, import_server.createServer)({
-    webpackConfig,
-    userConfig: opts.config,
-    cwd: opts.cwd,
-    beforeMiddlewares: [
-      ...(mfsu == null ? void 0 : mfsu.getMiddlewares()) || [],
-      ...opts.beforeMiddlewares || []
-    ],
-    port: opts.port,
-    host: opts.host,
-    ip: opts.ip,
-    afterMiddlewares: [...opts.afterMiddlewares || []],
-    onDevCompileDone: opts.onDevCompileDone,
-    onProgress: opts.onProgress,
-    onBeforeMiddleware: opts.onBeforeMiddleware
-  });
+  return {
+    mfsu,
+    webpackConfig
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   dev,
-  ensureSerializableValue
+  ensureSerializableValue,
+  setup
 });

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-canary.20230210.1",
+  "version": "4.0.0-canary.20230216.1",
   "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.2.1",
     "@svgr/plugin-svgo": "^6.2.0",
     "@types/hapi__joi": "17.1.9",
-    "@umijs/babel-preset-umi": "4.0.0-canary.20230210.1",
-    "@umijs/bundler-utils": "4.0.0-canary.20230210.1",
+    "@umijs/babel-preset-umi": "4.0.0-canary.20230216.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20230216.1",
     "@umijs/case-sensitive-paths-webpack-plugin": "^1.0.1",
-    "@umijs/mfsu": "4.0.0-canary.20230210.1",
-    "@umijs/utils": "4.0.0-canary.20230210.1",
+    "@umijs/mfsu": "4.0.0-canary.20230216.1",
+    "@umijs/utils": "4.0.0-canary.20230216.1",
     "cors": "^2.8.5",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",