@umijs/bundler-webpack 4.0.0-canary.20230831.1 → 4.0.0-canary.20230927.1

package/compiled/webpack/lazy-compilation-node.js

@@ -3,11 +3,17 @@
 "use strict";
 
 var urlBase = decodeURIComponent(__resourceQuery.slice(1));
+
+/**
+ * @param {{ data: string, onError: (err: Error) => void, active: boolean, module: module }} options options
+ * @returns {() => void} function to destroy response
+ */
 exports.keepAlive = function (options) {
 	var data = options.data;
 	var onError = options.onError;
 	var active = options.active;
 	var module = options.module;
+	/** @type {import("http").IncomingMessage} */
 	var response;
 	var request = (
 		urlBase.startsWith("https") ? require("https") : require("http")
@@ -27,6 +33,10 @@ exports.keepAlive = function (options) {
 			}
 		}
 	);
+
+	/**
+	 * @param {Error} err error
+	 */
 	function errorHandler(err) {
 		err.message =
 			"Problem communicating active modules to the server: " + err.message;

package/compiled/webpack/lazy-compilation-web.js

@@ -9,6 +9,7 @@ if (typeof EventSource !== "function") {
 }
 
 var urlBase = decodeURIComponent(__resourceQuery.slice(1));
+/** @type {EventSource | undefined} */
 var activeEventSource;
 var activeKeys = new Map();
 var errorHandlers = new Set();
@@ -19,6 +20,10 @@ var updateEventSource = function updateEventSource() {
 		activeEventSource = new EventSource(
 			urlBase + Array.from(activeKeys.keys()).join("@")
 		);
+		/**
+		 * @this {EventSource}
+		 * @param {Event & { message?: string, filename?: string, lineno?: number, colno?: number, error?: Error }} event event
+		 */
 		activeEventSource.onerror = function (event) {
 			errorHandlers.forEach(function (onError) {
 				onError(
@@ -42,6 +47,10 @@ var updateEventSource = function updateEventSource() {
 	}
 };
 
+/**
+ * @param {{ data: string, onError: (err: Error) => void, active: boolean, module: module }} options options
+ * @returns {() => void} function to destroy response
+ */
 exports.keepAlive = function (options) {
 	var data = options.data;
 	var onError = options.onError;

package/dist/config/assetRules.js

@@ -36,7 +36,7 @@ async function addAssetRules(opts) {
       maxSize: inlineLimit
     }
   });
-  const fallback = rule.oneOf("fallback").exclude.add(/^$/).add(/\.(js|mjs|cjs|jsx|ts|tsx)$/).add(/\.(css|less|sass|scss|stylus)$/).add(/\.html$/).add(/\.json$/);
+  const fallback = rule.oneOf("fallback").exclude.add(/^$/).add(/\.(js|mjs|cjs|jsx|ts|tsx)$/).add(/\.(css|less|sass|scss|styl|stylus)$/).add(/\.html$/).add(/\.json$/);
   if (userConfig.mdx) {
     fallback.add(/\.mdx?$/);
   }

package/dist/config/cssRules.js

@@ -55,8 +55,15 @@ async function addCSSRules(opts) {
       test: /\.(sass|scss)(\?.*)?$/,
       loader: require.resolve("@umijs/bundler-webpack/compiled/sass-loader"),
       loaderOptions: userConfig.sassLoader || {}
+    },
+    {
+      name: "stylus",
+      test: /\.(styl|stylus)(\?.*)?$/,
+      loader: require.resolve("@umijs/bundler-webpack/compiled/stylus-loader"),
+      loaderOptions: userConfig.stylusLoader || {}
     }
   ];
+  const cssPublicPath = userConfig.cssPublicPath || "./";
   for (const { name, test, loader, loaderOptions } of rulesConfig) {
     const rule = config.module.rule(name);
     const nestRulesConfig = [
@@ -78,7 +85,7 @@ async function addCSSRules(opts) {
         rule2.use("mini-css-extract-plugin").loader(
           require.resolve("@umijs/bundler-webpack/compiled/mini-css-extract-plugin/loader")
         ).options({
-          publicPath: "./",
+          publicPath: cssPublicPath,
           emit: true,
           esModule: true
         });
@@ -134,7 +141,7 @@ async function addCSSRules(opts) {
         }
       });
       if (loader) {
-        rule2.use(loader).loader(typeof loader === "string" ? require.resolve(loader) : loader).options(loaderOptions || {});
+        rule2.use(`${name}-loader`).loader(loader).options(loaderOptions || {});
       }
     }
   }

package/dist/config/fastRefreshPlugin.js

@@ -32,7 +32,7 @@ __export(fastRefreshPlugin_exports, {
   addFastRefreshPlugin: () => addFastRefreshPlugin
 });
 module.exports = __toCommonJS(fastRefreshPlugin_exports);
-var import_lib = __toESM(require("@pmmmwh/react-refresh-webpack-plugin/lib"));
+var import_lib = __toESM(require("@umijs/react-refresh-webpack-plugin/lib"));
 var import_constants = require("../constants");
 var import_types = require("../types");
 async function addFastRefreshPlugin(opts) {

package/dist/config/ssrPlugin.js

@@ -96,5 +96,3 @@ function addSSRPlugin(opts) {
     opts.config.plugin("ssr-plugin").use(SSRPlugin, [opts]);
   }
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/index.js

@@ -22,3 +22,11 @@ __reExport(src_exports, require("./config/config"), module.exports);
 __reExport(src_exports, require("./dev"), module.exports);
 __reExport(src_exports, require("./schema"), module.exports);
 __reExport(src_exports, require("./constants"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("./build"),
+  ...require("./config/config"),
+  ...require("./dev"),
+  ...require("./schema"),
+  ...require("./constants")
+});

package/dist/loader/svgr.js

@@ -82,5 +82,3 @@ function svgrLoader(contents) {
   }
 }
 var svgr_default = svgrLoader;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/loader/swc.js

@@ -147,5 +147,3 @@ function swcLoader(contents, inputSourceMap) {
   }
 }
 var swc_default = swcLoader;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/plugins/ProgressPlugin.js

@@ -67,5 +67,3 @@ var UmiProgressPlugin = class extends import_webpack.ProgressPlugin {
   }
 };
 var ProgressPlugin_default = UmiProgressPlugin;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/plugins/_SamplePlugin.js

@@ -35,5 +35,3 @@ var _SamplePlugin = class {
   }
 };
 var SamplePlugin_default = _SamplePlugin;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/schema.js

@@ -77,6 +77,7 @@ function getSchemas() {
       import_types.CSSMinifier.none
     ]),
     cssMinifierOptions: ({ zod }) => zod.record(zod.string(), zod.any()),
+    cssPublicPath: ({ zod }) => zod.string(),
     deadCode: ({ zod }) => zod.object({
       context: zod.string(),
       detectUnusedExport: zod.boolean(),
@@ -168,6 +169,7 @@ function getSchemas() {
       swc: zod.record(zod.string(), zod.any())
     }).deepPartial(),
     styleLoader: ({ zod }) => zod.record(zod.string(), zod.any()),
+    stylusLoader: ({ zod }) => zod.record(zod.string(), zod.any()),
     svgo: ({ zod }) => zod.union([zod.record(zod.string(), zod.any()), zod.boolean()]),
     svgr: ({ zod }) => zod.record(zod.string(), zod.any()),
     targets: ({ zod }) => zod.record(zod.string(), zod.any()),

package/dist/swcPlugins/autoCSSModules.js

@@ -61,5 +61,3 @@ var AutoCSSModule = class extends import_Visitor.default {
   }
 };
 var autoCSSModules_default = AutoCSSModule;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/swcPlugins/lockCoreJS.js

@@ -54,5 +54,3 @@ var LockCoreJS = class extends import_Visitor.default {
   }
 };
 var lockCoreJS_default = LockCoreJS;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-canary.20230831.1",
+  "version": "4.0.0-canary.20230927.1",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -21,12 +21,12 @@
     "dist"
   ],
   "dependencies": {
-    "@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/case-sensitive-paths-webpack-plugin": "^1.0.1",
+    "@umijs/react-refresh-webpack-plugin": "0.5.11",
     "cors": "^2.8.5",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.78",
@@ -38,10 +38,10 @@
     "postcss-preset-env": "7.5.0",
     "react-error-overlay": "6.0.9",
     "react-refresh": "0.14.0",
-    "@umijs/babel-preset-umi": "4.0.0-canary.20230831.1",
-    "@umijs/bundler-utils": "4.0.0-canary.20230831.1",
-    "@umijs/mfsu": "4.0.0-canary.20230831.1",
-    "@umijs/utils": "4.0.0-canary.20230831.1"
+    "@umijs/babel-preset-umi": "4.0.0-canary.20230927.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20230927.1",
+    "@umijs/mfsu": "4.0.0-canary.20230927.1",
+    "@umijs/utils": "4.0.0-canary.20230927.1"
   },
   "devDependencies": {
     "@swc/core": "1.3.67",
@@ -66,12 +66,13 @@
     "schema-utils": "4.0.0",
     "speed-measure-webpack-plugin": "1.5.0",
     "style-loader": "3.3.1",
+    "stylus-loader": "7.1.3",
     "svgo-loader": "3.0.0",
     "swc-plugin-auto-css-modules": "1.5.0",
     "terser": "5.16.1",
     "terser-webpack-plugin": "5.3.6",
     "url-loader": "4.1.1",
-    "webpack": "5.76.1",
+    "webpack": "5.88.2",
     "webpack-5-chain": "8.0.1",
     "webpack-bundle-analyzer": "4.7.0",
     "webpack-dev-middleware": "6.0.1",
@@ -117,7 +118,8 @@
       "webpack-sources",
       "webpackbar",
       "ws",
-      "./bundles/webpack/bundle"
+      "./bundles/webpack/bundle",
+      "stylus-loader"
     ],
     "externals": {
       "@swc/core": "@swc/core",
@@ -178,7 +180,8 @@
       "file-loader",
       "webpack-bundle-analyzer",
       "webpack-dev-middleware",
-      "webpack-manifest-plugin"
+      "webpack-manifest-plugin",
+      "stylus-loader"
     ]
   },
   "scripts": {