npm - @umijs/preset-umi - Versions diffs - 4.0.28 → 4.0.30 - Mend

@umijs/preset-umi 4.0.28 → 4.0.30

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (42) hide show

package/assets/bundle-status.html +22 -0
package/dist/commands/build.js +12 -5
package/dist/commands/dev/createRouteMiddleware.js +2 -2
package/dist/commands/dev/depBuildWorker/depBuildWorker.js +1 -1
package/dist/commands/dev/depBuildWorker/depBuilder.js +3 -2
package/dist/commands/dev/dev.js +16 -7
package/dist/commands/dev/getAssetsMap.js +14 -2
package/dist/features/404/404.js +1 -0
package/dist/features/apiRoute/request.d.ts +1 -0
package/dist/features/codeSplitting/codeSplitting.d.ts +3 -0
package/dist/features/codeSplitting/codeSplitting.js +137 -0
package/dist/features/crossorigin/crossorigin.js +1 -1
package/dist/features/devTool/devTool.js +6 -4
package/dist/features/exportStatic/exportStatic.js +42 -8
package/dist/features/monorepo/redirect.js +3 -1
package/dist/features/overrides/overrides.js +13 -15
package/dist/features/polyfill/polyfill.js +2 -0
package/dist/features/ssr/ssr.js +18 -8
package/dist/features/ssr/webpack/webpack.d.ts +2 -0
package/dist/features/ssr/webpack/webpack.js +67 -0
package/dist/features/test/test.d.ts +3 -0
package/dist/features/test/test.js +84 -0
package/dist/features/tmpFiles/configTypes.js +11 -8
package/dist/features/tmpFiles/routes.js +6 -0
package/dist/features/tmpFiles/tmpFiles.js +6 -10
package/dist/index.js +2 -0
package/dist/libs/folderCache/AutoUpdateFolderCache.d.ts +1 -8
package/dist/libs/folderCache/AutoUpdateSourceCodeCache.d.ts +2 -1
package/dist/libs/folderCache/AutoUpdateSourceCodeCache.js +4 -15
package/dist/libs/folderCache/FolderWatch.d.ts +18 -0
package/dist/libs/folderCache/FolderWatch.js +95 -0
package/dist/libs/folderCache/LazySourceCodeCache.d.ts +33 -0
package/dist/libs/folderCache/LazySourceCodeCache.js +180 -0
package/dist/libs/folderCache/constant.d.ts +1 -0
package/dist/libs/folderCache/constant.js +41 -0
package/dist/libs/folderCache/types.d.ts +9 -0
package/dist/libs/folderCache/types.js +17 -0
package/dist/registerMethods.js +1 -0
package/dist/types.d.ts +8 -2
package/package.json +13 -12
package/templates/TestBrowser.tpl +79 -0
package/templates/server.tpl +16 -6

package/assets/bundle-status.html CHANGED Viewed

@@ -15,6 +15,7 @@
         display: flex;
         align-items: center;
         justify-content: center;
+        flex-direction: column;
       }
       #loading {
@@ -82,6 +83,12 @@
         font-size: 16px;
       }
+      code.progress-details {
+        margin-top: 20px;
+        font-size: 13px;
+        color: #999999;
+      }
       @keyframes fade-in-out {
         0% {
           opacity: 0.4;
@@ -141,6 +148,7 @@
       }
     </style>
   </head>
   <body>
     <div id="loading">
       <h3>Bundling...</h3>
@@ -148,8 +156,11 @@
       <p class="summary"></p>
       <p class="detail"></p>
     </div>
+    <code class="progress-details"></code>
     <script>
       const loading = document.getElementById('loading');
+      const progressDetails = document.querySelector('.progress-details');
       const summary = loading.querySelector('.summary');
       const detail = loading.querySelector('.detail');
@@ -167,6 +178,17 @@
       function renderStatus(data) {
         const hasMFSU = Boolean(data.mfsuBundleStatus);
+        const hasProgressDetails = Boolean(
+          data.bundleStatus.progresses[0].details,
+        );
+        if (hasProgressDetails) {
+          const details = data.bundleStatus.progresses[0].details;
+          if (details.length) {
+              progressDetails.innerHTML = details.join('<br />');
+          }
+        }
         const srcPercent = Math.floor(
           (data.bundleStatus.done
             ? 1

package/dist/commands/build.js CHANGED Viewed

@@ -69,9 +69,6 @@ umi build --clean
       await generate({
         isFirstTime: true
       });
-      await api.applyPlugins({
-        key: "onBeforeCompiler"
-      });
       const {
         babelPreset,
         beforeBabelPlugins,
@@ -125,6 +122,10 @@ umi build --clean
         },
         clean: true
       };
+      await api.applyPlugins({
+        key: "onBeforeCompiler",
+        args: { compiler: api.config.vite ? "vite" : "webpack", opts }
+      });
       let stats;
       if (api.config.vite) {
         stats = await bundlerVite.build(opts);
@@ -149,8 +150,14 @@ umi build --clean
         const markupArgs = await (0, import_getMarkupArgs.getMarkupArgs)({ api });
         const finalMarkUpArgs = {
           ...markupArgs,
-          styles: markupArgs.styles.concat(api.config.vite ? [] : assetsMap["umi.css"] || []),
-          scripts: (api.config.vite ? [] : assetsMap["umi.js"] || []).concat(markupArgs.scripts),
+          styles: markupArgs.styles.concat(api.config.vite ? [] : [
+            ...(assetsMap["framework.css"] || []).map((src) => ({ src })),
+            ...(assetsMap["umi.css"] || []).map((src) => ({ src }))
+          ]),
+          scripts: (api.config.vite ? [] : [
+            ...(assetsMap["framework.js"] || []).map((src) => ({ src })),
+            ...(assetsMap["umi.js"] || []).map((src) => ({ src }))
+          ]).concat(markupArgs.scripts),
           esmScript: !!opts.config.esm || vite,
           path: "/"
         };

package/dist/commands/dev/createRouteMiddleware.js CHANGED Viewed

@@ -53,8 +53,8 @@ function createRouteMiddleware(opts) {
       });
       const requestHandler = await (0, import_server.createRequestHandler)({
         ...markupArgs,
-        styles: markupArgs.styles.concat(assetsMap["umi.css"] || []),
-        scripts: (assetsMap["umi.js"] || []).concat(markupArgs.scripts),
+        styles: markupArgs.styles.concat((assetsMap["umi.css"] || []).map((src) => ({ src }))),
+        scripts: (assetsMap["umi.js"] || []).map((src) => ({ src })).concat(markupArgs.scripts),
         esmScript: false,
         historyType: ((_a = opts.api.config.history) == null ? void 0 : _a.type) || "browser"
       });

package/dist/commands/dev/depBuildWorker/depBuildWorker.js CHANGED Viewed

@@ -96,7 +96,7 @@ async function start() {
     depEsBuildConfig,
     externals
   });
-  import_utils.logger.info("[MFSU][eager] worker init, takes", Date.now() - start2);
+  import_utils.logger.info(`[MFSU][eager] worker init, takes ${Date.now() - start2}ms`);
   scheduleBuild();
 }
 start().catch((e) => {

package/dist/commands/dev/depBuildWorker/depBuilder.js CHANGED Viewed

@@ -36,6 +36,7 @@ var import_utils = require("@umijs/utils");
 var import_fs = require("fs");
 var import_path = require("path");
 var import_worker_threads = require("worker_threads");
+var MF_ENTRY = "mf_index.js";
 var DepBuilderInWorker = class {
   constructor(opts) {
     this.completeFns = [];
@@ -131,13 +132,13 @@ var DepBuilderInWorker = class {
       const content = await dep.buildExposeContent();
       (0, import_fs.writeFileSync)((0, import_path.join)(tmpBase, dep.filePath), content, "utf-8");
     }
-    (0, import_fs.writeFileSync)((0, import_path.join)(tmpBase, "index.js"), '"\u{1F61B}"', "utf-8");
+    (0, import_fs.writeFileSync)((0, import_path.join)(tmpBase, MF_ENTRY), '"\u{1F61B}"', "utf-8");
   }
   getWebpackConfig(opts) {
     var _a, _b;
     const mfName = this.opts.mfName;
     const depConfig = import_utils.lodash.cloneDeep(this.opts.depConfig);
-    depConfig.entry = (0, import_path.join)(this.opts.tmpBase, "index.js");
+    depConfig.entry = (0, import_path.join)(this.opts.tmpBase, MF_ENTRY);
     depConfig.output.path = this.opts.tmpBase;
     depConfig.output.publicPath = "auto";
     depConfig.devtool = false;

package/dist/commands/dev/dev.js CHANGED Viewed

@@ -30,7 +30,6 @@ var import_fs = require("fs");
 var import_path = require("path");
 var import_worker_threads = require("worker_threads");
 var import_constants = require("../../constants");
-var import_AutoUpdateSourceCodeCache = require("../../libs/folderCache/AutoUpdateSourceCodeCache");
 var import_lazyImportFromCurrentPkg = require("../../utils/lazyImportFromCurrentPkg");
 var import_createRouteMiddleware = require("./createRouteMiddleware");
 var import_faviconMiddleware = require("./faviconMiddleware");
@@ -38,6 +37,7 @@ var import_getBabelOpts = require("./getBabelOpts");
 var import_ViteHtmlPlugin = __toESM(require("./plugins/ViteHtmlPlugin"));
 var import_printMemoryUsage = require("./printMemoryUsage");
 var import_watch = require("./watch");
+var import_LazySourceCodeCache = require("../../libs/folderCache/LazySourceCodeCache");
 var bundlerWebpack = (0, import_lazyImportFromCurrentPkg.lazyImportFromCurrentPkg)("@umijs/bundler-webpack");
 var bundlerVite = (0, import_lazyImportFromCurrentPkg.lazyImportFromCurrentPkg)("@umijs/bundler-vite");
 var MFSU_EAGER_DEFAULT_INCLUDE = [
@@ -178,9 +178,6 @@ PORT=8888 umi dev
           }
         });
       });
-      await api.applyPlugins({
-        key: "onBeforeCompiler"
-      });
       const beforeMiddlewares = await api.applyPlugins({
         key: "addBeforeMiddlewares",
         initialValue: []
@@ -223,9 +220,9 @@ PORT=8888 umi dev
       let startBuildWorker = () => {
       };
       if (((_b = api.config.mfsu) == null ? void 0 : _b.strategy) === "eager") {
-        srcCodeCache = new import_AutoUpdateSourceCodeCache.AutoUpdateSrcCodeCache({
+        srcCodeCache = new import_LazySourceCodeCache.LazySourceCodeCache({
           cwd: api.paths.absSrcPath,
-          cachePath: (0, import_path.join)(api.paths.absNodeModulesPath, ".cache", "mfsu", "v4")
+          cachePath: (0, import_path.join)(api.paths.absNodeModulesPath, ".cache", "mfsu", "mfsu_v4")
         });
         await srcCodeCache.init();
         (0, import_watch.addUnWatch)(() => {
@@ -301,8 +298,20 @@ PORT=8888 umi dev
           ...MFSU_EAGER_DEFAULT_INCLUDE,
           ...((_e = api.config.mfsu) == null ? void 0 : _e.include) || []
         ]),
-        startBuildWorker
+        startBuildWorker,
+        onBeforeMiddleware(app) {
+          api.applyPlugins({
+            key: "onBeforeMiddleware",
+            args: {
+              app
+            }
+          });
+        }
       };
+      await api.applyPlugins({
+        key: "onBeforeCompiler",
+        args: { compiler: enableVite ? "vite" : "webpack", opts }
+      });
       if (enableVite) {
         await bundlerVite.dev(opts);
       } else {

package/dist/commands/dev/getAssetsMap.js CHANGED Viewed

@@ -26,6 +26,10 @@ var UMI_ASSETS_REG = {
   js: /^umi(\..+)?\.js$/,
   css: /^umi(\..+)?\.css$/
 };
+var FRAMEWORK_ASSETS_REG = {
+  js: /^framework(\..+)?\.js$/,
+  css: /^framework(\..+)?\.css$/
+};
 var HOT_UPDATE = ".hot-update.";
 function getAssetsMap(opts) {
   const { stats, publicPath } = opts;
@@ -34,12 +38,20 @@ function getAssetsMap(opts) {
   let json = stats.toJson();
   const entrypoints = json.entrypoints || json.children[0].entrypoints;
   for (const asset of entrypoints["umi"].assets) {
-    if (!asset.name.includes(HOT_UPDATE) && UMI_ASSETS_REG.js.test(asset.name)) {
-      ret["umi.js"] = [`${displayPublicPath}${asset.name}`];
+    if (!asset.name.includes(HOT_UPDATE)) {
+      if (UMI_ASSETS_REG.js.test(asset.name)) {
+        ret["umi.js"] = [`${displayPublicPath}${asset.name}`];
+      }
+      if (FRAMEWORK_ASSETS_REG.js.test(asset.name)) {
+        ret["framework.js"] = [`${displayPublicPath}${asset.name}`];
+      }
     }
     if (UMI_ASSETS_REG.css.test(asset.name)) {
       ret["umi.css"] = [`${displayPublicPath}${asset.name}`];
     }
+    if (FRAMEWORK_ASSETS_REG.css.test(asset.name)) {
+      ret["framework.css"] = [`${displayPublicPath}${asset.name}`];
+    }
   }
   return ret;
 }

package/dist/features/404/404.js CHANGED Viewed

@@ -27,6 +27,7 @@ function patchRoutes(routes) {
   Object.keys(routes).forEach((key) => {
     if (routes[key].path === "404") {
       routes[key].path = "*";
+      routes[key].absPath = "/*";
     }
   });
   return routes;

package/dist/features/apiRoute/request.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import type { IncomingMessage } from 'http';
 import type { IRoute } from '../../types';
 declare class UmiApiRequest {

package/dist/features/codeSplitting/codeSplitting.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import { IApi } from '../../types';
+declare const _default: (api: IApi) => void;
+export default _default;

package/dist/features/codeSplitting/codeSplitting.js ADDED Viewed

@@ -0,0 +1,137 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+// src/features/codeSplitting/codeSplitting.ts
+var codeSplitting_exports = {};
+__export(codeSplitting_exports, {
+  default: () => codeSplitting_default
+});
+module.exports = __toCommonJS(codeSplitting_exports);
+var import_crypto = __toESM(require("crypto"));
+var codeSplitting_default = (api) => {
+  api.describe({
+    key: "codeSplitting",
+    config: {
+      schema(Joi) {
+        return Joi.object({
+          jsStrategy: Joi.string().allow("bigVendors", "depPerChunk", "granularChunks"),
+          jsStrategyOptions: Joi.object(),
+          cssStrategy: Joi.string().allow("mergeAll"),
+          cssStrategyOptions: Joi.object()
+        });
+      }
+    },
+    enableBy: api.EnableBy.config
+  });
+  api.chainWebpack((memo) => {
+    if (api.env !== "production")
+      return;
+    const { jsStrategy, jsStrategyOptions, cssStrategy } = api.config.codeSplitting;
+    if (jsStrategy === "bigVendors") {
+      memo.optimization.splitChunks({
+        cacheGroups: {
+          vendors: {
+            test: /[\\/]node_modules[\\/]/,
+            priority: 10,
+            name: "vendors",
+            chunks: "async",
+            ...jsStrategyOptions
+          }
+        }
+      });
+    }
+    if (jsStrategy === "depPerChunk") {
+      memo.optimization.splitChunks({
+        cacheGroups: {
+          vendors: {
+            test: /[\\/]node_modules[\\/]/,
+            priority: 10,
+            chunks: "async",
+            name(module2) {
+              const path = module2.context.replace(/.pnpm[\\/]/, "");
+              const packageName = path.match(/[\\/]node_modules[\\/](.*?)([\\/]|$)/)[1];
+              return `npm.${packageName.replace(/@/g, "_at_").replace(/\+/g, "_")}`;
+            }
+          }
+        }
+      });
+    }
+    if (jsStrategy === "granularChunks") {
+      const FRAMEWORK_BUNDLES = [
+        "react-dom",
+        "react",
+        "history",
+        "react-router",
+        "react-router-dom",
+        "scheduler"
+      ];
+      memo.optimization.splitChunks({
+        cacheGroups: {
+          default: false,
+          defaultVendors: false,
+          framework: {
+            name: "framework",
+            chunks: "all",
+            test: new RegExp(`[\\\\/]node_modules[\\\\/](${FRAMEWORK_BUNDLES.join(`|`)})[\\\\/]`),
+            priority: 40,
+            enforce: true
+          },
+          lib: {
+            test(module2) {
+              return module2.size() > 16e4 && /node_modules[/\\]/.test(module2.identifier());
+            },
+            name(module2) {
+              const rawRequest = module2.rawRequest && module2.rawRequest.replace(/^@(\w+)[/\\]/, "$1-");
+              if (rawRequest)
+                return `${rawRequest}-lib`;
+              const identifier = module2.identifier();
+              const trimmedIdentifier = /(?:^|[/\\])node_modules[/\\](.*)/.exec(identifier);
+              const processedIdentifier = trimmedIdentifier && trimmedIdentifier[1].replace(/^@(\w+)[/\\]/, "$1-");
+              return `${processedIdentifier || identifier}-lib`;
+            },
+            priority: 30,
+            minChunks: 1,
+            reuseExistingChunk: true,
+            chunks: "async"
+          },
+          shared: {
+            name(_module, chunks) {
+              const cryptoName = import_crypto.default.createHash("sha1").update(chunks.reduce((acc, chunk) => {
+                return acc + chunk.name;
+              }, "")).digest("base64").replace(/\//g, "");
+              return `shared-${cryptoName}`;
+            },
+            chunks: "async",
+            priority: 10,
+            minChunks: 2,
+            reuseExistingChunk: true
+          }
+        }
+      });
+    }
+    if (cssStrategy) {
+      throw new Error(`codeSplitting.cssStrategy is not supported yet`);
+    }
+    return memo;
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/features/crossorigin/crossorigin.js CHANGED Viewed

@@ -28,7 +28,7 @@ var crossorigin_default = (api) => {
     config: {
       schema(Joi) {
         return Joi.alternatives(Joi.boolean(), Joi.object({
-          include: Joi.array().items(Joi.object().instance(RegExp))
+          includes: Joi.array().items(Joi.object().instance(RegExp))
         }));
       }
     },

package/dist/features/devTool/devTool.js CHANGED Viewed

@@ -58,13 +58,15 @@ var devTool_default = (api) => {
             });
           }
           if (shortPath === "status") {
-            const isMFSUDone = api.config.mfsu ? (_a = api.appData.mfsuBundleStatus) == null ? void 0 : _a.done : true;
-            const isBundleDone = (_b = api.appData.bundleStatus) == null ? void 0 : _b.done;
+            const isBundleDone = (_a = api.appData.bundleStatus) == null ? void 0 : _a.done;
+            if (enableVite && isBundleDone) {
+              return res.end();
+            }
+            const isMFSUDone = api.config.mfsu ? (_b = api.appData.mfsuBundleStatus) == null ? void 0 : _b.done : true;
             if (isMFSUDone && isBundleDone) {
               return res.end();
-            } else {
-              return res.status(400).end();
             }
+            return res.status(400).end();
           }
           return next();
         }

package/dist/features/exportStatic/exportStatic.js CHANGED Viewed

@@ -29,15 +29,18 @@ var import_path = require("path");
 var import_server = require("@umijs/server");
 var import_utils = require("@umijs/utils");
 var import_assert = __toESM(require("assert"));
+var import_utils2 = require("../ssr/utils");
+var markupRender;
 var IS_WIN = process.platform === "win32";
 function getExportHtmlData(routes) {
   const map = /* @__PURE__ */ new Map();
   Object.values(routes).forEach((route) => {
-    if (!route.isLayout && (!IS_WIN || !route.path.includes("/:")) && !route.path.includes("*")) {
-      const file = (0, import_path.join)(".", route.absPath, "index.html");
+    const is404 = route.absPath === "/*";
+    if (!route.isLayout && (!IS_WIN || !route.path.includes("/:")) && (!route.path.includes("*") || is404)) {
+      const file = is404 ? "404.html" : (0, import_path.join)(".", route.absPath, "index.html");
       map.set(file, {
         route: {
-          path: route.absPath,
+          path: is404 ? "/404" : route.absPath,
           redirect: route.redirect
         },
         file
@@ -46,10 +49,33 @@ function getExportHtmlData(routes) {
   });
   return Array.from(map.values());
 }
+async function getPreRenderedHTML(api, htmlTpl, path) {
+  var _a;
+  markupRender ?? (markupRender = require((0, import_utils2.absServerBuildPath)(api))._markupGenerator);
+  try {
+    const markup = await markupRender(path);
+    const [mainTpl, extraTpl] = markup.split("</html>");
+    const bodyContent = (_a = mainTpl.match(/<body[^>]*>([^]+?)<\/body>/)) == null ? void 0 : _a[1];
+    htmlTpl = htmlTpl.replace(new RegExp(`<div id="${api.config.mountElementId}"[^>]*>.*?</div>`), bodyContent).replace(/$/, `${extraTpl}`);
+    import_utils.logger.info(`Pre-render for ${path}`);
+  } catch (err) {
+    import_utils.logger.error(`Pre-render ${path} error: ${err}`);
+  }
+  return htmlTpl;
+}
 var exportStatic_default = (api) => {
+  async function getRoutesFromUserExtraPaths(routePaths) {
+    const paths = typeof routePaths === "function" ? await routePaths() : routePaths;
+    return paths.reduce((acc, p) => ({
+      ...acc,
+      [p]: { id: p, absPath: p, path: p.slice(1), file: "" }
+    }), {});
+  }
   api.describe({
     config: {
-      schema: (Joi) => Joi.object()
+      schema: (Joi) => Joi.object({
+        extraRoutePaths: Joi.alternatives(Joi.function(), Joi.array().items(Joi.string()))
+      })
     },
     enableBy: api.EnableBy.config
   });
@@ -57,10 +83,14 @@ var exportStatic_default = (api) => {
     (0, import_assert.default)(!api.config.mpa, "`exportStatic` is not supported in `mpa` mode.");
   });
   api.modifyExportHTMLFiles(async (_defaultFiles, opts) => {
-    const { publicPath } = api.config;
-    const htmlData = getExportHtmlData(api.appData.routes);
+    const {
+      publicPath,
+      exportStatic: { extraRoutePaths = [] }
+    } = api.config;
+    const extraHtmlData = getExportHtmlData(await getRoutesFromUserExtraPaths(extraRoutePaths));
+    const htmlData = getExportHtmlData(api.appData.routes).concat(extraHtmlData);
     const htmlFiles = [];
-    for (const { file } of htmlData) {
+    for (const { file, route } of htmlData) {
       let { markupArgs } = opts;
       if (publicPath.startsWith(".")) {
         (0, import_assert.default)(api.config.runtimePublicPath, "`runtimePublicPath` should be enable when `publicPath` is relative!");
@@ -97,7 +127,11 @@ var exportStatic_default = (api) => {
           markupArgs = Object.assign({}, markupArgs, picked);
         }
       }
-      htmlFiles.push({ path: file, content: await (0, import_server.getMarkup)(markupArgs) });
+      const htmlContent = await (0, import_server.getMarkup)(markupArgs);
+      htmlFiles.push({
+        path: file,
+        content: api.config.ssr ? await getPreRenderedHTML(api, htmlContent, route.path) : htmlContent
+      });
     }
     return htmlFiles;
   });

package/dist/features/monorepo/redirect.js CHANGED Viewed

@@ -45,7 +45,9 @@ var redirect_default = (api) => {
     enableBy: api.EnableBy.config
   });
   api.modifyConfig(async (memo) => {
-    const rootPkg = await (0, import_pkg_up.pkgUp)({ cwd: (0, import_path.dirname)(api.cwd) });
+    const rootPkg = await (0, import_pkg_up.pkgUp)({
+      cwd: (0, import_path.dirname)(process.env.APP_ROOT ? process.cwd() : api.cwd)
+    });
     if (!rootPkg)
       return memo;
     const root = (0, import_path.dirname)(rootPkg);

package/dist/features/overrides/overrides.js CHANGED Viewed

@@ -34,23 +34,21 @@ var overrides_default = (api) => {
   api.modifyConfig((memo) => {
     if (getOverridesCSS(api.paths.absSrcPath)) {
       memo.extraPostCSSPlugins ?? (memo.extraPostCSSPlugins = []);
-      memo.extraPostCSSPlugins.push([
-        require("postcss-prefix-selector")({
-          prefix: "body",
-          transform(_p, selector, prefixedSelector, filePath) {
-            const isOverridesFile = (0, import_utils.winPath)(api.appData.overridesCSS[0]) === (0, import_utils.winPath)(filePath);
-            if (isOverridesFile) {
-              if (selector === "html") {
-                return `html:first-child`;
-              } else if (/^body([\s+~>[:]|$)/.test(selector)) {
-                return `* + ${selector}`;
-              }
-              return prefixedSelector;
+      memo.extraPostCSSPlugins.push(require("postcss-prefix-selector")({
+        prefix: "body",
+        transform(_p, selector, prefixedSelector, filePath) {
+          const isOverridesFile = (0, import_utils.winPath)(api.appData.overridesCSS[0]) === (0, import_utils.winPath)(filePath);
+          if (isOverridesFile) {
+            if (selector === "html") {
+              return `html:first-child`;
+            } else if (/^body([\s+~>[:]|$)/.test(selector)) {
+              return `* + ${selector}`;
             }
-            return selector;
+            return prefixedSelector;
           }
-        })
-      ]);
+          return selector;
+        }
+      }));
     }
     return memo;
   });

package/dist/features/polyfill/polyfill.js CHANGED Viewed

@@ -28,6 +28,7 @@ module.exports = __toCommonJS(polyfill_exports);
 var import_core = require("@umijs/bundler-utils/compiled/babel/core");
 var import_utils = require("@umijs/utils");
 var import_path = require("path");
+var import_constants = require("@umijs/bundler-webpack/dist/constants");
 var polyfill_default = (api) => {
   api.describe({
     key: "polyfill",
@@ -74,6 +75,7 @@ export {};
   });
   api.addPolyfillImports(() => [{ source: `./core/polyfill` }]);
   api.modifyConfig((memo) => {
+    memo.targets || (memo.targets = import_constants.DEFAULT_BROWSER_TARGETS);
     memo.alias["regenerator-runtime"] = (0, import_path.dirname)(require.resolve("regenerator-runtime/package"));
     return memo;
   });

package/dist/features/ssr/ssr.js CHANGED Viewed

@@ -27,6 +27,7 @@ __export(ssr_exports, {
 module.exports = __toCommonJS(ssr_exports);
 var import_types = require("@umijs/core/dist/types");
 var import_utils = require("@umijs/utils");
+var import_assert = __toESM(require("assert"));
 var import_fs = require("fs");
 var import_path = require("path");
 var import_utils2 = require("./utils");
@@ -37,7 +38,8 @@ var ssr_default = (api) => {
       schema(Joi) {
         return Joi.object({
           serverBuildPath: Joi.string(),
-          platform: Joi.string()
+          platform: Joi.string(),
+          builder: Joi.string().allow("esbuild", "webpack")
         });
       }
     },
@@ -52,10 +54,11 @@ var ssr_default = (api) => {
   api.onStart(() => {
     import_utils.logger.warn(`SSR feature is in beta, may be unstable`);
   });
-  api.addBeforeMiddlewares(() => [
+  api.addMiddlewares(() => [
     async (req, res, next) => {
       const modulePath = (0, import_utils2.absServerBuildPath)(api);
       if ((0, import_fs.existsSync)(modulePath)) {
+        delete require.cache[modulePath];
         (await require(modulePath)).default(req, res, next);
       } else {
         res.end("umi.server.js is compiling ...");
@@ -72,12 +75,19 @@ export { React };
 `
     });
   });
-  api.onBeforeCompiler(async () => {
-    const { build } = (0, import_utils.importLazy)(require.resolve("./builder/builder"));
-    await build({
-      api,
-      watch: api.env === "development"
-    });
+  api.onBeforeCompiler(async ({ opts }) => {
+    const { builder = "esbuild" } = api.config.ssr;
+    if (builder === "esbuild") {
+      const { build } = (0, import_utils.importLazy)(require.resolve("./builder/builder"));
+      await build({
+        api,
+        watch: api.env === "development"
+      });
+    } else if (builder === "webpack") {
+      (0, import_assert.default)(!api.config.vite, `The \`vite\` config is now allowed when \`ssr.builder\` is webpack!`);
+      const { build } = (0, import_utils.importLazy)(require.resolve("./webpack/webpack"));
+      await build(api, opts);
+    }
   });
   api.onBuildComplete(async ({ err }) => {
     if (err)

package/dist/features/ssr/webpack/webpack.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ import { IApi } from '../../../types';
2	+ export declare const build: (api: IApi, opts: any) => Promise<void>;