@umijs/bundler-webpack 4.0.0-canary.20220412.2 → 4.0.0-canary.20220418.1

package/dist/build.d.ts

@@ -3,6 +3,7 @@ import { IOpts as IConfigOpts } from './config/config';
 import { IConfig } from './types';
 declare type IOpts = {
     cwd: string;
+    rootDir?: string;
     entry: Record<string, string>;
     config: IConfig;
     onBuildComplete?: Function;

package/dist/build.js

@@ -21,6 +21,7 @@ function build(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         const webpackConfig = yield (0, config_1.getConfig)({
             cwd: opts.cwd,
+            rootDir: opts.rootDir,
             env: types_1.Env.production,
             entry: opts.entry,
             userConfig: opts.config,

package/dist/config/config.d.ts

@@ -2,6 +2,7 @@ import { Configuration } from '../../compiled/webpack';
 import { Env, IConfig } from '../types';
 export interface IOpts {
     cwd: string;
+    rootDir?: string;
     env: Env;
     entry: Record<string, string>;
     extraBabelPresets?: any[];

package/dist/config/config.js

@@ -169,7 +169,8 @@ function getConfig(opts) {
                     config: opts.cache.buildDependencies || [],
                 },
                 cacheDirectory: opts.cache.cacheDirectory ||
-                    (0, path_1.join)(opts.cwd, 'node_modules', '.cache', 'bundler-webpack'),
+                    // 使用 rootDir 是在有 APP_ROOT 时，把 cache 目录放在根目录下
+                    (0, path_1.join)(opts.rootDir || opts.cwd, 'node_modules', '.cache', 'bundler-webpack'),
             });
             // tnpm 安装依赖的情况 webpack 默认的 managedPaths 不生效
             // 使用 immutablePaths 避免 node_modules 的内容被写入缓存
@@ -178,7 +179,8 @@ function getConfig(opts) {
             if ( /*isTnpm*/require('@umijs/utils/package').__npminstall_done) {
                 config.snapshot({
                     immutablePaths: [
-                        opts.cache.absNodeModulesPath || (0, path_1.join)(opts.cwd, 'node_modules'),
+                        opts.cache.absNodeModulesPath ||
+                            (0, path_1.join)(opts.rootDir || opts.cwd, 'node_modules'),
                     ],
                 });
             }

package/dist/dev.d.ts

@@ -16,8 +16,10 @@ declare type IOpts = {
     extraBabelPlugins?: any[];
     extraBabelPresets?: any[];
     cwd: string;
+    rootDir?: string;
     config: IConfig;
     entry: Record<string, string>;
 } & Pick<IConfigOpts, 'cache'>;
+export declare function stripUndefined(obj: any): any;
 export declare function dev(opts: IOpts): Promise<void>;
 export {};

package/dist/dev.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dev = void 0;
+exports.dev = exports.stripUndefined = void 0;
 const mfsu_1 = require("@umijs/mfsu");
 const utils_1 = require("@umijs/utils");
 const path_1 = require("path");
@@ -21,6 +21,15 @@ const config_1 = require("./config/config");
 const constants_1 = require("./constants");
 const server_1 = require("./server/server");
 const types_1 = require("./types");
+function stripUndefined(obj) {
+    Object.keys(obj).forEach((key) => {
+        if (obj[key] === undefined) {
+            delete obj[key];
+        }
+    });
+    return obj;
+}
+exports.stripUndefined = stripUndefined;
 function dev(opts) {
     var _a, _b, _c, _d, _e, _f;
     var _g;
@@ -40,24 +49,25 @@ function dev(opts) {
                 mfName: (_c = opts.config.mfsu) === null || _c === void 0 ? void 0 : _c.mfName,
                 runtimePublicPath: opts.config.runtimePublicPath,
                 tmpBase: ((_d = opts.config.mfsu) === null || _d === void 0 ? void 0 : _d.cacheDirectory) ||
-                    (0, path_1.join)(opts.cwd, 'node_modules/.cache/mfsu'),
+                    (0, path_1.join)(opts.rootDir || opts.cwd, 'node_modules/.cache/mfsu'),
                 onMFSUProgress: opts.onMFSUProgress,
                 getCacheDependency() {
                     var _a;
-                    return {
+                    return stripUndefined({
                         version: require('../package.json').version,
                         esbuildMode: !!((_a = opts.config.mfsu) === null || _a === void 0 ? void 0 : _a.esbuild),
                         alias: opts.config.alias,
                         externals: opts.config.externals,
                         theme: opts.config.theme,
-                        runtimePublicPath: !!opts.config.runtimePublicPath,
+                        runtimePublicPath: opts.config.runtimePublicPath,
                         publicPath: opts.config.publicPath,
-                    };
+                    });
                 },
             });
         }
         const webpackConfig = yield (0, config_1.getConfig)({
             cwd: opts.cwd,
+            rootDir: opts.rootDir,
             env: types_1.Env.development,
             entry: opts.entry,
             userConfig: opts.config,
@@ -80,6 +90,7 @@ function dev(opts) {
         });
         const depConfig = yield (0, config_1.getConfig)({
             cwd: opts.cwd,
+            rootDir: opts.rootDir,
             env: types_1.Env.development,
             entry: opts.entry,
             userConfig: opts.config,
@@ -89,7 +100,7 @@ function dev(opts) {
             chainWebpack: (_e = opts.config.mfsu) === null || _e === void 0 ? void 0 : _e.chainWebpack,
             cache: {
                 buildDependencies: (_f = opts.cache) === null || _f === void 0 ? void 0 : _f.buildDependencies,
-                cacheDirectory: (0, path_1.join)(opts.cwd, 'node_modules', '.cache', 'mfsu-deps'),
+                cacheDirectory: (0, path_1.join)(opts.rootDir || opts.cwd, 'node_modules', '.cache', 'mfsu-deps'),
             },
         });
         (_g = webpackConfig.resolve).alias || (_g.alias = {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-canary.20220412.2",
+  "version": "4.0.0-canary.20220418.1",
   "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",
@@ -35,10 +35,10 @@
     "@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-canary.20220412.2",
-    "@umijs/bundler-utils": "4.0.0-canary.20220412.2",
-    "@umijs/mfsu": "4.0.0-canary.20220412.2",
-    "@umijs/utils": "4.0.0-canary.20220412.2",
+    "@umijs/babel-preset-umi": "4.0.0-canary.20220418.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20220418.1",
+    "@umijs/mfsu": "4.0.0-canary.20220418.1",
+    "@umijs/utils": "4.0.0-canary.20220418.1",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",
     "jest-worker": "27.5.1",