npm - @umijs/preset-umi - Versions diffs - 4.0.27 → 4.0.29 - Mend

@umijs/preset-umi 4.0.27 → 4.0.29

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 (27) hide show

package/assets/bundle-status.html +22 -0
package/dist/commands/build.js +12 -5
package/dist/commands/dev/dev.js +13 -4
package/dist/commands/dev/getAssetsMap.js +14 -2
package/dist/features/404/404.js +1 -0
package/dist/features/apiRoute/request.d.ts +0 -1
package/dist/features/codeSplitting/codeSplitting.d.ts +3 -0
package/dist/features/codeSplitting/codeSplitting.js +137 -0
package/dist/features/devTool/devTool.js +6 -4
package/dist/features/exportStatic/exportStatic.js +40 -7
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 +90 -0
package/dist/features/tmpFiles/configTypes.js +11 -8
package/dist/features/tmpFiles/routes.js +6 -0
package/dist/index.js +2 -0
package/dist/libs/folderCache/AutoUpdateSourceCodeCache.js +2 -2
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 +14 -5

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"] || [],
+            ...assetsMap["umi.css"] || []
+          ]),
+          scripts: (api.config.vite ? [] : [
+            ...assetsMap["framework.js"] || [],
+            ...assetsMap["umi.js"] || []
+          ]).concat(markupArgs.scripts),
           esmScript: !!opts.config.esm || vite,
           path: "/"
         };

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

@@ -178,9 +178,6 @@ PORT=8888 umi dev
           }
         });
       });
-      await api.applyPlugins({
-        key: "onBeforeCompiler"
-      });
       const beforeMiddlewares = await api.applyPlugins({
         key: "addBeforeMiddlewares",
         initialValue: []
@@ -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,5 +1,4 @@
 /// <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/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,12 +29,14 @@ 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");
+    if (!route.isLayout && (!IS_WIN || !route.path.includes("/:")) && (!route.path.includes("*") || route.absPath === "/*")) {
+      const file = route.absPath === "/*" ? "404.html" : (0, import_path.join)(".", route.absPath, "index.html");
       map.set(file, {
         route: {
           path: route.absPath,
@@ -46,10 +48,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 +82,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 +126,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>;

package/dist/features/ssr/webpack/webpack.js ADDED Viewed

@@ -0,0 +1,67 @@
+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/ssr/webpack/webpack.ts
+var webpack_exports = {};
+__export(webpack_exports, {
+  build: () => build2
+});
+module.exports = __toCommonJS(webpack_exports);
+var import_utils = require("@umijs/utils");
+var bundlerWebpack = __toESM(require("@umijs/bundler-webpack"));
+var import_utils2 = require("../utils");
+var import_path = require("path");
+var build2 = async (api, opts) => {
+  import_utils.logger.wait("[SSR] Compiling...");
+  const now = new Date().getTime();
+  const bundlerOpts = import_utils.lodash.cloneDeep(opts);
+  const oChainWebpack = bundlerOpts.chainWebpack;
+  delete bundlerOpts.config.deadCode;
+  bundlerOpts.extraBabelPlugins.push([
+    require.resolve("babel-plugin-dynamic-import-node"),
+    {},
+    "umi-server-dynamic-import-node"
+  ]);
+  delete bundlerOpts.onBuildComplete;
+  bundlerOpts.chainWebpack = async (memo) => {
+    const absOutputFile = (0, import_utils2.absServerBuildPath)(api);
+    await oChainWebpack(memo);
+    memo.entryPoints.clear();
+    memo.entry("umi").add((0, import_path.resolve)(api.paths.absTmpPath, "umi.server.ts"));
+    memo.target("node");
+    memo.name("umi");
+    memo.devtool(false);
+    memo.output.path((0, import_path.dirname)(absOutputFile)).filename("umi.server.js").chunkFilename("[name].server.js").libraryTarget("commonjs2");
+    memo.plugins.delete("progress-plugin");
+    memo.optimization.minimize(false);
+    if (api.env === "development") {
+      memo.watch(true);
+    }
+    return memo;
+  };
+  await bundlerWebpack.build(bundlerOpts);
+  const diff = new Date().getTime() - now;
+  import_utils.logger.info(`[SSR] Compiled in ${diff}ms`);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  build
+});

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

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

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

@@ -0,0 +1,90 @@
+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/test/test.ts
+var test_exports = {};
+__export(test_exports, {
+  default: () => test_default
+});
+module.exports = __toCommonJS(test_exports);
+var import_utils = require("@umijs/utils");
+var import_fs = require("fs");
+var import_path = require("path");
+var import_constants = require("../../constants");
+var import_importsToStr = require("../tmpFiles/importsToStr");
+var test_default = (api) => {
+  api.describe({
+    key: "test",
+    config: {
+      schema(Joi) {
+        return Joi.object();
+      }
+    },
+    enableBy() {
+      if (process.env.NODE_ENV === "test") {
+        return true;
+      }
+      return false;
+    }
+  });
+  api.onGenerateFiles(async () => {
+    const rendererPath = (0, import_utils.winPath)(await api.applyPlugins({
+      key: "modifyRendererPath",
+      initialValue: (0, import_path.dirname)(require.resolve("@umijs/renderer-react/package.json"))
+    }));
+    api.writeTmpFile({
+      noPluginDir: true,
+      path: "testBrowser.tsx",
+      tplPath: (0, import_path.join)(import_constants.TEMPLATES_DIR, "TestBrowser.tpl"),
+      context: {
+        mountElementId: api.config.mountElementId,
+        rendererPath,
+        publicPath: api.config.publicPath,
+        runtimePublicPath: api.config.runtimePublicPath ? "true" : "false",
+        polyfillImports: (0, import_importsToStr.importsToStr)(await api.applyPlugins({
+          key: "addPolyfillImports",
+          initialValue: []
+        })).join("\n"),
+        importsAhead: (0, import_importsToStr.importsToStr)(await api.applyPlugins({
+          key: "addEntryImportsAhead",
+          initialValue: [
+            api.appData.globalCSS.length && {
+              source: api.appData.globalCSS[0]
+            },
+            api.appData.globalJS.length && {
+              source: api.appData.globalJS[0]
+            }
+          ].filter(Boolean)
+        })).join("\n"),
+        imports: (0, import_importsToStr.importsToStr)(await api.applyPlugins({
+          key: "addEntryImports",
+          initialValue: []
+        })).join("\n"),
+        basename: api.config.base,
+        historyType: api.config.history.type,
+        hydrate: !!api.config.ssr,
+        loadingComponent: (0, import_fs.existsSync)((0, import_path.join)(api.paths.absSrcPath, "loading.tsx")) || (0, import_fs.existsSync)((0, import_path.join)(api.paths.absSrcPath, "loading.jsx")) || (0, import_fs.existsSync)((0, import_path.join)(api.paths.absSrcPath, "loading.js"))
+      }
+    });
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/features/tmpFiles/configTypes.js CHANGED Viewed

@@ -27,24 +27,27 @@ __export(configTypes_exports, {
 module.exports = __toCommonJS(configTypes_exports);
 var import_joi = __toESM(require("@umijs/utils/compiled/@hapi/joi"));
 var import_joi2types = __toESM(require("../../../compiled/joi2types"));
+var FILTER_KEYS = ["chainWebpack"];
 var configTypes_default = (api) => {
   api.onGenerateFiles(async () => {
     const { service } = api;
-    const properties = Object.keys(service.configSchemas).map((key) => {
+    const properties = Object.keys(service.configSchemas).reduce((acc, key) => {
+      if (FILTER_KEYS.includes(key)) {
+        return acc;
+      }
       const schemaFn = service.configSchemas[key];
-      if (typeof schemaFn !== "function")
-        return;
+      if (typeof schemaFn !== "function") {
+        return acc;
+      }
       const schema = schemaFn(import_joi.default);
       if (!import_joi.default.isSchema(schema)) {
-        return;
+        return acc;
       }
       return {
+        ...acc,
         [key]: schema
       };
-    }).reduce((acc, curr) => ({
-      ...acc,
-      ...curr
-    }), {});
+    }, {});
     const interfaceName = "IConfigFromPlugins";
     const content = await (0, import_joi2types.default)(import_joi.default.object(properties), {
       interfaceName,

package/dist/features/tmpFiles/routes.js CHANGED Viewed

@@ -176,6 +176,9 @@ async function getRouteComponents(opts) {
     const useSuspense = opts.api.appData.framework === "react" ? true : false;
     const route = opts.routes[key];
     if (!route.file) {
+      if (process.env.NODE_ENV === "test") {
+        return `'${key}': require( './EmptyRoute').default,`;
+      }
       return useSuspense ? `'${key}': React.lazy(() => import( './EmptyRoute')),` : `'${key}': () => import( './EmptyRoute'),`;
     }
     if (route.hasClientLoader) {
@@ -188,6 +191,9 @@ async function getRouteComponents(opts) {
     }
     const path = (0, import_path.isAbsolute)(route.file) || route.file.startsWith("@/") ? route.file : `${opts.prefix}${route.file}`;
     const webpackChunkName = componentToChunkName(path, opts.api.cwd);
+    if (process.env.NODE_ENV === "test") {
+      return `'${key}': require('${(0, import_utils.winPath)(path)}').default,`;
+    }
     return useSuspense ? `'${key}': React.lazy(() => import(/* webpackChunkName: "${webpackChunkName}" */'${(0, import_utils.winPath)(path)}')),` : `'${key}': () => import(/* webpackChunkName: "${webpackChunkName}" */'${(0, import_utils.winPath)(path)}'),`;
   }).join("\n");
   return `{

package/dist/index.js CHANGED Viewed

@@ -34,6 +34,7 @@ var src_default = () => {
       require.resolve("./features/appData/appData"),
       require.resolve("./features/check/check"),
       require.resolve("./features/clientLoader/clientLoader"),
+      require.resolve("./features/codeSplitting/codeSplitting"),
       require.resolve("./features/configPlugins/configPlugins"),
       require.resolve("./features/crossorigin/crossorigin"),
       require.resolve("./features/depsOnDemand/depsOnDemand"),
@@ -56,6 +57,7 @@ var src_default = () => {
       require.resolve("./features/vite/vite"),
       require.resolve("./features/apiRoute/apiRoute"),
       require.resolve("./features/monorepo/redirect"),
+      require.resolve("./features/test/test"),
       require.resolve("./features/clickToComponent/clickToComponent"),
       require.resolve("./features/legacy/legacy"),
       require.resolve("./features/classPropertiesLoose/classPropertiesLoose"),

package/dist/libs/folderCache/AutoUpdateSourceCodeCache.js CHANGED Viewed

@@ -60,7 +60,7 @@ var AutoUpdateSrcCodeCache = class {
         await this.batchProcess(files);
         for (const f of files) {
           let newFile = (0, import_path.join)(this.cachePath, (0, import_path.relative)(this.srcPath, f));
-          newFile = newFile.replace((0, import_path.extname)(newFile), ".js");
+          newFile = newFile.replace(new RegExp(`${(0, import_path.extname)(newFile)}$`), ".js");
           loaded[f] = (0, import_fs.readFileSync)(newFile, "utf-8");
         }
         return loaded;
@@ -94,7 +94,7 @@ var AutoUpdateSrcCodeCache = class {
         outdir: this.cachePath,
         outbase: this.srcPath,
         loader: {
-          ".js": "jsx",
+          ".js": "tsx",
           ".jsx": "tsx"
         },
         logLevel: "error"

package/dist/registerMethods.js CHANGED Viewed

@@ -44,6 +44,7 @@ var registerMethods_default = (api) => {
     "onCheckPkgJSON",
     "onCheckCode",
     "onCheckConfig",
+    "onBeforeMiddleware",
     "addBeforeMiddlewares",
     "addLayouts",
     "addMiddlewares",

package/dist/types.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { ImportDeclaration } from '@umijs/bundler-utils/compiled/@babel/types';
-import type { RequestHandler, webpack } from '@umijs/bundler-webpack';
+import type { RequestHandler, webpack, Express } from '@umijs/bundler-webpack';
 import type WebpackChain from '@umijs/bundler-webpack/compiled/webpack-5-chain';
 import type { IConfig } from '@umijs/bundler-webpack/dist/types';
 import type { IAdd, IEvent, IModify, IRoute as ICoreRoute, IServicePluginAPI, PluginAPI } from '@umijs/core';
@@ -114,7 +114,13 @@ export declare type IApi = PluginAPI & IServicePluginAPI & {
         env: Env;
         webpack: typeof webpack;
     }>;
-    onBeforeCompiler: IEvent<{}>;
+    onBeforeCompiler: IEvent<{
+        compiler: 'vite' | 'webpack';
+        opts: any;
+    }>;
+    onBeforeMiddleware: IEvent<{
+        app: Express;
+    }>;
     onBuildComplete: IEvent<{
         err?: Error;
         isFirstCompile: boolean;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.27",
+  "version": "4.0.29",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -25,19 +25,20 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/ast": "4.0.27",
-    "@umijs/babel-preset-umi": "4.0.27",
-    "@umijs/bundler-utils": "4.0.27",
-    "@umijs/bundler-vite": "4.0.27",
-    "@umijs/bundler-webpack": "4.0.27",
-    "@umijs/core": "4.0.27",
+    "@umijs/ast": "4.0.29",
+    "@umijs/babel-preset-umi": "4.0.29",
+    "@umijs/bundler-utils": "4.0.29",
+    "@umijs/bundler-vite": "4.0.29",
+    "@umijs/bundler-webpack": "4.0.29",
+    "@umijs/core": "4.0.29",
     "@umijs/did-you-know": "^1.0.0",
     "@umijs/history": "5.3.1",
-    "@umijs/mfsu": "4.0.27",
-    "@umijs/plugin-run": "4.0.27",
-    "@umijs/renderer-react": "4.0.27",
-    "@umijs/server": "4.0.27",
-    "@umijs/utils": "4.0.27",
+    "@umijs/mfsu": "4.0.29",
+    "@umijs/plugin-run": "4.0.29",
+    "@umijs/renderer-react": "4.0.29",
+    "@umijs/server": "4.0.29",
+    "@umijs/utils": "4.0.29",
+    "babel-plugin-dynamic-import-node": "2.3.3",
     "click-to-react-component": "^1.0.8",
     "core-js": "3.22.4",
     "current-script-polyfill": "1.0.0",

package/templates/TestBrowser.tpl ADDED Viewed

@@ -0,0 +1,79 @@
+import React, { useEffect, useState } from 'react';
+import { ApplyPluginsType } from 'umi';
+import { renderClient, RenderClientOpts } from '{{{ rendererPath }}}';
+import { createHistory } from './core/history';
+import { createPluginManager } from './core/plugin';
+import { getRoutes } from './core/route';
+import type { Location } from 'history';
+{{{ polyfillImports }}}
+{{{ importsAhead }}}
+const publicPath = '/';
+const runtimePublicPath = false;
+type TestBrowserProps = {
+  location?: Location;
+  historyRef?: any;
+};
+export function TestBrowser(props: TestBrowserProps) {
+  const pluginManager = createPluginManager();
+  const [context, setContext] = useState<RenderClientOpts | undefined>(
+    undefined,
+  );
+  useEffect(() => {
+    const genContext = async () => {
+      const { routes, routeComponents } = await getRoutes(pluginManager);
+      // allow user to extend routes
+      await pluginManager.applyPlugins({
+        key: 'patchRoutes',
+        type: ApplyPluginsType.event,
+        args: {
+          routes,
+          routeComponents,
+        },
+      });
+      const contextOpts = pluginManager.applyPlugins({
+        key: 'modifyContextOpts',
+        type: ApplyPluginsType.modify,
+        initialValue: {},
+      });
+      const basename = contextOpts.basename || '/';
+      const history = createHistory({
+        type: 'memory',
+        basename,
+      });
+      return {
+        routes,
+        routeComponents,
+        pluginManager,
+        rootElement: contextOpts.rootElement || document.getElementById('root'),
+        publicPath,
+        runtimePublicPath,
+        history,
+        basename,
+        components: true
+      };
+    };
+    genContext().then((context) => {
+        setContext(context);
+        if (props.location) {
+          context?.history?.push(props.location);
+        }
+        if (props.historyRef) {
+          props.historyRef.current = context?.history;
+        }
+    });
+  }, []);
+ if (context === undefined) {
+    return <div id="loading" />;
+  }
+  const Children = renderClient(context);
+  return (
+    <React.Fragment>
+      <Children />
+    </React.Fragment>
+  );
+}

package/templates/server.tpl CHANGED Viewed

@@ -1,7 +1,9 @@
 import { getClientRootComponent } from '{{{ serverRendererPath }}}';
 import { getRoutes } from './core/route';
+import { createHistory as createClientHistory } from './core/history';
+import { getPlugins as getClientPlugins } from './core/plugin';
 import { PluginManager } from '{{{ umiPluginPath }}}';
-import createRequestHandler from '{{{ umiServerPath }}}';
+import createRequestHandler, { createMarkupGenerator } from '{{{ umiServerPath }}}';
 const routesWithServerLoader = {
 {{#routesWithServerLoader}}
@@ -9,9 +11,8 @@ const routesWithServerLoader = {
 {{/routesWithServerLoader}}
 };
-// TODO: support runtime plugins
 export function getPlugins() {
-  return [];
+  return getClientPlugins();
 }
 export function getValidKeys() {
@@ -22,6 +23,10 @@ export function getManifest() {
   return JSON.parse(require('fs').readFileSync('{{{ assetsPath }}}', 'utf-8'));
 }
+export function createHistory(opts) {
+  return createClientHistory(opts);
+}
 // TODO: remove global variable
 global.g_getAssets = (fileName) => {
   let m = typeof manifest === 'function' ? manifest() : manifest;
@@ -29,7 +34,7 @@ global.g_getAssets = (fileName) => {
 };
 const manifest = {{{ env }}} === 'development' ? getManifest : getManifest();
-const requestHandler = createRequestHandler({
+const createOpts = {
   routesWithServerLoader,
   PluginManager,
   getPlugins,
@@ -37,6 +42,10 @@ const requestHandler = createRequestHandler({
   getRoutes,
   manifest,
   getClientRootComponent,
-});
+  createHistory,
+};
+const requestHandler = createRequestHandler(createOpts);
+export const _markupGenerator = createMarkupGenerator(createOpts);
 export default requestHandler;