@umijs/bundler-webpack 4.0.0-rc.20 → 4.0.0-rc.23

package/dist/build.js

@@ -32,7 +32,9 @@ async function build(opts) {
     });
     let isFirstCompile = true;
     return new Promise((resolve, reject) => {
-        utils_1.rimraf.sync(webpackConfig.output.path);
+        if (opts.clean) {
+            utils_1.rimraf.sync(webpackConfig.output.path);
+        }
         const compiler = (0, webpack_1.default)(webpackConfig);
         compiler.run((err, stats) => {
             var _a;

package/dist/config/config.js

@@ -75,7 +75,7 @@ async function getConfig(opts) {
     config.output
         .path(absOutputPath)
         .filename(useHash ? `[name].[contenthash:8].js` : `[name].js`)
-        .chunkFilename(useHash ? `[name].[contenthash:8].async.js` : `[name].js`)
+        .chunkFilename(useHash ? `[name].[contenthash:8].async.js` : `[name].async.js`)
         .publicPath(userConfig.publicPath || 'auto')
         .pathinfo(isDev || disableCompress);
     // resolve
@@ -166,13 +166,14 @@ async function getConfig(opts) {
         // tnpm 安装依赖的情况 webpack 默认的 managedPaths 不生效
         // 使用 immutablePaths 避免 node_modules 的内容被写入缓存
         // tnpm 安装的依赖路径中同时包含包名和版本号，满足 immutablePaths 使用的条件
+        // 同时配置 managedPaths 将 tnpm 的软连接结构标记为可信，避免执行快照序列化时 OOM
         // ref: smallfish
         if ( /*isTnpm*/require('@umijs/utils/package').__npminstall_done) {
+            const nodeModulesPath = opts.cache.absNodeModulesPath ||
+                (0, path_1.join)(opts.rootDir || opts.cwd, 'node_modules');
             config.snapshot({
-                immutablePaths: [
-                    opts.cache.absNodeModulesPath ||
-                        (0, path_1.join)(opts.rootDir || opts.cwd, 'node_modules'),
-                ],
+                immutablePaths: [nodeModulesPath],
+                managedPaths: [nodeModulesPath],
             });
         }
         config.infrastructureLogging({

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import type webpack from '../compiled/webpack';
+import './requireHook';
 export type { RequestHandler } from '@umijs/bundler-utils/compiled/express';
 export type { Compiler, Stats } from '../compiled/webpack';
 export * from './build';

package/dist/index.js

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+require("./requireHook");
 __exportStar(require("./build"), exports);
 __exportStar(require("./config/config"), exports);
 __exportStar(require("./dev"), exports);

package/dist/plugins/RuntimePublicPathPlugin.js

@@ -10,6 +10,9 @@ class RuntimePublicPathPlugin {
                 // The hook to get the public path ('__webpack_require__.p')
                 // https://github.com/webpack/webpack/blob/master/lib/runtime/PublicPathRuntimeModule.js
                 if (module.constructor.name === 'PublicPathRuntimeModule') {
+                    // If current public path is handled by mini-css-extract-plugin, skip it
+                    if (module.getGeneratedCode().includes('webpack:///mini-css-extract-plugin'))
+                        return;
                     // @ts-ignore
                     module._cachedGeneratedCode = `__webpack_require__.p = (globalThis || window).publicPath || '/';`;
                 }

package/dist/server/server.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Configuration } from '@umijs/bundler-webpack/compiled/webpack';
 import http from 'http';
 import { IConfig } from '../types';

package/dist/server/server.js

@@ -32,9 +32,11 @@ async function createServer(opts) {
     (opts.beforeMiddlewares || []).forEach((m) => app.use(m));
     // TODO: add to before middleware
     app.use((req, res, next) => {
-        if (req.path === '/umi.js' && (0, fs_1.existsSync)((0, path_1.join)(opts.cwd, 'umi.js'))) {
-            res.setHeader('Content-Type', 'application/javascript');
-            (0, fs_1.createReadStream)((0, path_1.join)(opts.cwd, 'umi.js')).on('error', next).pipe(res);
+        const file = req.path;
+        const filePath = (0, path_1.join)(opts.cwd, file);
+        const ext = (0, path_1.extname)(filePath);
+        if (ext === '.js' && (0, fs_1.existsSync)(filePath)) {
+            res.sendFile(filePath);
         }
         else {
             next();

package/dist/server/ws.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import type { SpdyServer as Server } from '@umijs/bundler-utils';
 import { Server as HttpServer } from 'http';
 import { Http2Server } from 'http2';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-rc.20",
+  "version": "4.0.0-rc.23",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -29,16 +29,16 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@parcel/css": "1.8.2",
-    "@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
+    "@parcel/css": "1.9.0",
+    "@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",
     "@types/hapi__joi": "17.1.8",
-    "@umijs/babel-preset-umi": "4.0.0-rc.20",
-    "@umijs/bundler-utils": "4.0.0-rc.20",
-    "@umijs/mfsu": "4.0.0-rc.20",
-    "@umijs/utils": "4.0.0-rc.20",
+    "@umijs/babel-preset-umi": "4.0.0-rc.23",
+    "@umijs/bundler-utils": "4.0.0-rc.23",
+    "@umijs/mfsu": "4.0.0-rc.23",
+    "@umijs/utils": "4.0.0-rc.23",
     "cors": "^2.8.5",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",
@@ -76,10 +76,10 @@
     "terser": "5.12.1",
     "terser-webpack-plugin": "5.3.1",
     "url-loader": "4.1.1",
-    "webpack": "5.72.0",
+    "webpack": "5.72.1",
     "webpack-5-chain": "8.0.0",
     "webpack-bundle-analyzer": "4.5.0",
-    "webpack-dev-middleware": "5.3.1",
+    "webpack-dev-middleware": "5.3.3",
     "webpack-manifest-plugin": "5.0.0",
     "webpack-sources": "3.2.3",
     "ws": "8.5.0"