@umijs/bundler-webpack 4.0.6 → 4.0.7

package/dist/build.js

@@ -5,10 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.build = void 0;
 const utils_1 = require("@umijs/utils");
+const path_1 = require("path");
 const webpack_1 = __importDefault(require("../compiled/webpack"));
 const config_1 = require("./config/config");
 const types_1 = require("./types");
 async function build(opts) {
+    const cacheDirectoryPath = (0, path_1.resolve)(opts.rootDir || opts.cwd, opts.config.cacheDirectoryPath || 'node_modules/.cache');
     const webpackConfig = await (0, config_1.getConfig)({
         cwd: opts.cwd,
         rootDir: opts.rootDir,
@@ -28,7 +30,12 @@ async function build(opts) {
         extraBabelIncludes: opts.config.extraBabelIncludes,
         chainWebpack: opts.chainWebpack,
         modifyWebpackConfig: opts.modifyWebpackConfig,
-        cache: opts.cache,
+        cache: opts.cache
+            ? {
+                ...opts.cache,
+                cacheDirectory: (0, path_1.join)(cacheDirectoryPath, 'bundler-webpack'),
+            }
+            : undefined,
     });
     let isFirstCompile = true;
     return new Promise((resolve, reject) => {

package/dist/config/definePlugin.d.ts

@@ -8,6 +8,7 @@ interface IOpts {
 }
 export declare function resolveDefine(opts: {
     define: any;
+    publicPath?: string;
 }): {
     'process.env': Record<string, any>;
 };

package/dist/config/definePlugin.js

@@ -11,6 +11,9 @@ function resolveDefine(opts) {
             env[key] = process.env[key];
         }
     });
+    // Useful for resolving the correct path to static assets in `public`.
+    // For example, <img src={process.env.PUBLIC_PATH + '/img/logo.png'} />.
+    env.PUBLIC_PATH = opts.publicPath || '/';
     for (const key in env) {
         env[key] = JSON.stringify(env[key]);
     }
@@ -31,6 +34,7 @@ async function addDefinePlugin(opts) {
     config.plugin('define').use(webpack_1.DefinePlugin, [
         resolveDefine({
             define: userConfig.define || {},
+            publicPath: userConfig.publicPath,
         }),
     ]);
 }

package/dist/dev.js

@@ -25,6 +25,7 @@ exports.stripUndefined = stripUndefined;
 async function dev(opts) {
     var _a, _b, _c, _d, _e, _f;
     var _g;
+    const cacheDirectoryPath = (0, path_1.resolve)(opts.rootDir || opts.cwd, opts.config.cacheDirectoryPath || 'node_modules/.cache');
     const enableMFSU = opts.config.mfsu !== false;
     let mfsu = null;
     if (enableMFSU) {
@@ -42,8 +43,7 @@ async 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.rootDir || opts.cwd, 'node_modules/.cache/mfsu'),
+            tmpBase: ((_d = opts.config.mfsu) === null || _d === void 0 ? void 0 : _d.cacheDirectory) || (0, path_1.join)(cacheDirectoryPath, 'mfsu'),
             onMFSUProgress: opts.onMFSUProgress,
             getCacheDependency() {
                 return stripUndefined({
@@ -80,7 +80,12 @@ async function dev(opts) {
         modifyWebpackConfig: opts.modifyWebpackConfig,
         hmr: process.env.HMR !== 'none',
         analyze: process.env.ANALYZE,
-        cache: opts.cache,
+        cache: opts.cache
+            ? {
+                ...opts.cache,
+                cacheDirectory: (0, path_1.join)(cacheDirectoryPath, 'bundler-webpack'),
+            }
+            : undefined,
     });
     const depConfig = await (0, config_1.getConfig)({
         cwd: opts.cwd,
@@ -94,7 +99,7 @@ async 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.rootDir || opts.cwd, 'node_modules', '.cache', 'mfsu-deps'),
+            cacheDirectory: (0, path_1.join)(cacheDirectoryPath, 'mfsu-deps'),
         },
     });
     (_g = webpackConfig.resolve).alias || (_g.alias = {});

package/dist/schema.js

@@ -37,6 +37,7 @@ function getSchemas() {
         alias: (Joi) => Joi.object(),
         autoCSSModules: (Joi) => Joi.boolean(),
         autoprefixer: (Joi) => Joi.object(),
+        cacheDirectoryPath: (Joi) => Joi.string(),
         chainWebpack: (Joi) => Joi.function(),
         copy: (Joi) => Joi.array().items(Joi.alternatives().try(Joi.object({
             from: Joi.string(),

package/dist/server/server.js

@@ -27,21 +27,21 @@ async function createServer(opts) {
     }));
     // compression
     app.use(require('@umijs/bundler-webpack/compiled/compression')());
-    // TODO: headers
-    // before middlewares
-    (opts.beforeMiddlewares || []).forEach((m) => app.use(m));
-    // TODO: add to before middleware
+    // debug all js file
     app.use((req, res, next) => {
         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)) {
+            utils_1.logger.info('[dev]', `${file} is responded with ${filePath}, remove it to use original file`);
             res.sendFile(filePath);
         }
         else {
             next();
         }
     });
+    // before middlewares
+    (opts.beforeMiddlewares || []).forEach((m) => app.use(m));
     // webpack dev middleware
     const configs = Array.isArray(webpackConfig)
         ? webpackConfig

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.6",
+  "version": "4.0.7",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi/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.6",
-    "@umijs/bundler-utils": "4.0.6",
-    "@umijs/mfsu": "4.0.6",
-    "@umijs/utils": "4.0.6",
+    "@umijs/babel-preset-umi": "4.0.7",
+    "@umijs/bundler-utils": "4.0.7",
+    "@umijs/mfsu": "4.0.7",
+    "@umijs/utils": "4.0.7",
     "cors": "^2.8.5",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",