@umijs/preset-umi 4.2.4 → 4.2.6-alpha.0

package/dist/commands/build.js

@@ -48,7 +48,7 @@ COMPRESS=none umi build
 umi build --clean
 `,
     fn: async function() {
-      var _a;
+      var _a, _b;
       import_utils.logger.info(import_utils.chalk.cyan.bold(`Umi v${api.appData.umi.version}`));
       import_utils.rimraf.sync(api.paths.absTmpPath);
       await api.applyPlugins({
@@ -105,15 +105,16 @@ umi build --clean
           umi: (0, import_path.join)(api.paths.absTmpPath, "umi.ts")
         }
       });
-      const shouldUseAutomaticRuntime = ((_a = api.appData.react) == null ? void 0 : _a.version) && // why not 16.14.0 ?
-      // it will break the config of externals, when externals
-      // does not handle the react/runtime
-      import_utils.semver.gte(api.appData.react.version, "17.0.0");
+      const shouldUseAutomaticRuntime = ((_a = api.appData.react) == null ? void 0 : _a.version) && import_utils.semver.gte(api.appData.react.version, "16.14.0");
       const opts = {
         react: {
           runtime: shouldUseAutomaticRuntime ? "automatic" : "classic"
         },
-        config: api.config,
+        config: {
+          outputPath: api.userConfig.outputPath || "dist",
+          ...api.config,
+          hooks: ((_b = api.config.mako) == null ? void 0 : _b.hooks) || {}
+        },
         cwd: api.cwd,
         entry,
         ...api.config.vite ? { modifyViteConfig } : { babelPreset, chainWebpack, modifyWebpackConfig },
@@ -138,7 +139,7 @@ umi build --clean
       let stats;
       if (api.config.vite) {
         stats = await bundlerVite.build(opts);
-      } else if (process.env.OKAM) {
+      } else if (api.config.mako) {
         require("@umijs/bundler-webpack/dist/requireHook");
         const { build } = require(process.env.OKAM);
         stats = await build(opts);
@@ -164,13 +165,13 @@ umi build --clean
           publicPath: api.config.publicPath
         });
         const { vite } = api.args;
-        const markupArgs = await (0, import_getMarkupArgs.getMarkupArgs)({ api });
+        const args = await (0, import_getMarkupArgs.getMarkupArgs)({ api });
         const finalMarkUpArgs = {
-          ...markupArgs,
-          styles: markupArgs.styles.concat(
+          ...args,
+          styles: args.styles.concat(
             api.config.vite ? [] : [...(assetsMap["umi.css"] || []).map((src) => ({ src }))]
           ),
-          scripts: (api.config.vite ? [] : [...(assetsMap["umi.js"] || []).map((src) => ({ src }))]).concat(markupArgs.scripts),
+          scripts: (api.config.vite ? [] : [...(assetsMap["umi.js"] || []).map((src) => ({ src }))]).concat(args.scripts),
           esmScript: !!opts.config.esm || vite,
           path: "/"
         };

package/dist/commands/dev/createRouteMiddleware.js

@@ -33,8 +33,8 @@ function createRouteMiddleware(opts) {
       webpackStats = stats;
       onStats == null ? void 0 : onStats(stats);
     });
-    async function getStats() {
-      if (!compiler && process.env.OKAM) {
+    async function getStats(api) {
+      if (!compiler && api.config.mako) {
         return {
           compilation: { assets: { "umi.js": "umi.js", "umi.css": "umi.css" } },
           hasErrors: () => false
@@ -52,7 +52,7 @@ function createRouteMiddleware(opts) {
       var _a;
       const markupArgs = await (0, import_getMarkupArgs.getMarkupArgs)(opts);
       let assetsMap = {};
-      const stats = await getStats();
+      const stats = await getStats(opts.api);
       assetsMap = (0, import_getAssetsMap.getAssetsMap)({
         stats,
         publicPath: opts.api.config.publicPath

package/dist/commands/dev/dev.js

@@ -70,7 +70,7 @@ umi dev
 PORT=8888 umi dev
 `,
     async fn() {
-      var _a, _b, _c, _d, _e, _f;
+      var _a, _b, _c, _d, _e, _f, _g;
       import_utils.logger.info(import_utils.chalk.cyan.bold(`Umi v${api.appData.umi.version}`));
       const enableVite = !!api.config.vite;
       import_utils.rimraf.sync(api.paths.absTmpPath);
@@ -309,12 +309,16 @@ PORT=8888 umi dev
           umi: (0, import_path.join)(api.paths.absTmpPath, "umi.ts")
         }
       });
-      const shouldUseAutomaticRuntime = ((_c = api.appData.react) == null ? void 0 : _c.version) && import_utils.semver.gte(api.appData.react.version, "17.0.0");
+      const shouldUseAutomaticRuntime = ((_c = api.appData.react) == null ? void 0 : _c.version) && import_utils.semver.gte(api.appData.react.version, "16.14.0");
       const opts = {
         react: {
           runtime: shouldUseAutomaticRuntime ? "automatic" : "classic"
         },
-        config: api.config,
+        config: {
+          outputPath: api.userConfig.outputPath || "dist",
+          ...api.config,
+          hooks: ((_d = api.config.mako) == null ? void 0 : _d.hooks) || {}
+        },
         pkg: api.pkg,
         cwd: api.cwd,
         rootDir: process.cwd(),
@@ -354,8 +358,8 @@ PORT=8888 umi dev
             ...opts2
           };
         },
-        mfsuWithESBuild: (_d = api.config.mfsu) == null ? void 0 : _d.esbuild,
-        mfsuStrategy: (_e = api.config.mfsu) == null ? void 0 : _e.strategy,
+        mfsuWithESBuild: (_e = api.config.mfsu) == null ? void 0 : _e.esbuild,
+        mfsuStrategy: (_f = api.config.mfsu) == null ? void 0 : _f.strategy,
         cache: {
           buildDependencies: [
             api.pkgPath,
@@ -365,7 +369,7 @@ PORT=8888 umi dev
         srcCodeCache,
         mfsuInclude: import_utils.lodash.union([
           ...MFSU_EAGER_DEFAULT_INCLUDE,
-          ...((_f = api.config.mfsu) == null ? void 0 : _f.include) || []
+          ...((_g = api.config.mfsu) == null ? void 0 : _g.include) || []
         ]),
         startBuildWorker,
         onBeforeMiddleware(app) {
@@ -383,7 +387,7 @@ PORT=8888 umi dev
       });
       if (enableVite) {
         await bundlerVite.dev(opts);
-      } else if (process.env.OKAM) {
+      } else if (api.config.mako) {
         require("@umijs/bundler-webpack/dist/requireHook");
         const { dev } = require(process.env.OKAM);
         await dev(opts);

package/dist/commands/dev/getBabelOpts.js

@@ -34,7 +34,10 @@ __export(getBabelOpts_exports, {
 module.exports = __toCommonJS(getBabelOpts_exports);
 var import_utils = require("@umijs/utils");
 async function getBabelOpts(opts) {
-  const shouldUseAutomaticRuntime = import_utils.semver.gte(opts.api.appData.react.version, "17.0.0");
+  const shouldUseAutomaticRuntime = import_utils.semver.gte(
+    opts.api.appData.react.version,
+    "16.14.0"
+  );
   const babelPresetOpts = await opts.api.applyPlugins({
     key: "modifyBabelPresetOpts",
     initialValue: {

package/dist/features/appData/umiInfo.js

@@ -25,9 +25,11 @@ module.exports = __toCommonJS(umiInfo_exports);
 var umiInfo_default = (api) => {
   api.addEntryCode(() => [
     `
-window.g_umi = {
-  version: '${api.appData.umi.version}',
-};
-  `
+    if (typeof window !== 'undefined') {
+      window.g_umi = {
+        version: '${api.appData.umi.version}',
+      };
+    }
+    `
   ]);
 };

package/dist/features/configPlugins/configPlugins.js

@@ -55,11 +55,8 @@ var configPlugins_default = (api) => {
     cwd: api.cwd,
     dep: "react-dom"
   }) || (0, import_path.dirname)(require.resolve("react-dom/package.json"));
-  const isLT18 = (() => {
-    const reactDOMVersion = require((0, import_path.join)(reactDOMPath, "package.json")).version;
-    const majorVersion = parseInt(reactDOMVersion.split(".")[0], 10);
-    return majorVersion < 18;
-  })();
+  const reactDOMVersion = require((0, import_path.join)(reactDOMPath, "package.json")).version;
+  const isLT18 = !reactDOMVersion.startsWith("18.");
   const configDefaults = {
     alias: {
       umi: "@@/exports",

package/dist/features/devTool/devTool.js

@@ -29,7 +29,7 @@ var devToolAppDist = (0, import_path.join)(__dirname, "../../../devToolAppDist")
 var assetsDir = (0, import_path.join)(__dirname, "../../../assets");
 var devTool_default = (api) => {
   api.addBeforeMiddlewares(async () => {
-    if (process.env.OKAM)
+    if (api.config.mako)
       return [];
     const $ = await api.applyPlugins({
       key: "modifyDevToolLoadingHTML",

package/dist/features/esbuildHelperChecker/esbuildHelperChecker.d.ts

@@ -1,7 +1,6 @@
 import { IApi } from '../../types';
 export declare function getGlobalVars(opts: {
     content: string;
-    fileName: string;
 }): Promise<string[]>;
 declare const _default: (api: IApi) => void;
 export default _default;

package/dist/features/esbuildHelperChecker/esbuildHelperChecker.js

@@ -47,8 +47,7 @@ async function checkDir(opts) {
   const varMap = {};
   for (const jsFile of jsFiles) {
     const vars = await getGlobalVars({
-      content: import_fs.default.readFileSync(import_path.default.join(opts.dir, jsFile), "utf-8"),
-      fileName: jsFile
+      content: import_fs.default.readFileSync(import_path.default.join(opts.dir, jsFile), "utf-8")
     });
     for (const v of vars) {
       varMap[v] = varMap[v] || [];
@@ -70,29 +69,23 @@ async function checkDir(opts) {
   import_utils.logger.info(`[esbuildHelperChecker] No conflicts found.`);
 }
 async function getGlobalVars(opts) {
+  const ast = parser.parse(opts.content, {
+    sourceType: "module",
+    sourceFilename: "foo.js",
+    plugins: []
+  });
   const vars = [];
-  try {
-    const ast = parser.parse(opts.content, {
-      sourceType: "module",
-      sourceFilename: "foo.js",
-      plugins: []
-    });
-    ast.program.body.forEach((node) => {
-      if (t.isVariableDeclaration(node)) {
-        node.declarations.forEach((declaration) => {
-          if (t.isVariableDeclarator(declaration)) {
-            if (t.isIdentifier(declaration.id)) {
-              vars.push(declaration.id.name);
-            }
+  ast.program.body.forEach((node) => {
+    if (t.isVariableDeclaration(node)) {
+      node.declarations.forEach((declaration) => {
+        if (t.isVariableDeclarator(declaration)) {
+          if (t.isIdentifier(declaration.id)) {
+            vars.push(declaration.id.name);
           }
-        });
-      }
-    });
-  } catch (error) {
-    import_utils.logger.error(
-      `[esbuildHelperChecker] Failed to parse ${opts.fileName}, ${error.message}`
-    );
-  }
+        }
+      });
+    }
+  });
   return vars;
 }
 var esbuildHelperChecker_default = (api) => {
@@ -111,7 +104,7 @@ var esbuildHelperChecker_default = (api) => {
   api.onBuildComplete(async ({ err }) => {
     if (api.config.vite)
       return;
-    if (process.env.OKAM)
+    if (api.config.mako)
       return;
     if (err)
       return;

package/dist/features/exportStatic/exportStatic.js

@@ -64,23 +64,14 @@ function getExportHtmlData(routes) {
   return Array.from(map.values());
 }
 async function getPreRenderedHTML(api, htmlTpl, path) {
-  var _a, _b;
   const {
     exportStatic: { ignorePreRenderError = false }
   } = api.config;
   markupRender ?? (markupRender = require((0, import_utils2.absServerBuildPath)(api))._markupGenerator);
   try {
-    const markup = await markupRender(path);
-    const [mainTpl, extraTpl = ""] = markup.split("</html>");
-    const helmetContent = (_a = mainTpl.match(
-      /<head>[^]*?(<[^>]+data-rh[^]+)<\/head>/
-    )) == null ? void 0 : _a[1];
-    const bodyContent = (_b = mainTpl.match(/<body[^>]*>([^]+?)<\/body>/)) == null ? void 0 : _b[1];
-    htmlTpl = htmlTpl.replace("</head>", `${helmetContent || ""}</head>`).replace(
-      new RegExp(`<div id="${api.config.mountElementId}"[^>]*>.*?</div>`),
-      bodyContent
-    ).replace(/$/, `${extraTpl}`);
+    const html = await markupRender(path);
     import_utils.logger.info(`Pre-render for ${path}`);
+    return html;
   } catch (err) {
     import_utils.logger.error(`Pre-render ${path} error: ${err}`);
     if (!ignorePreRenderError) {
@@ -125,17 +116,8 @@ var exportStatic_default = (api) => {
     const htmlData = api.appData.exportHtmlData;
     const htmlFiles = [];
     const { markupArgs: defaultMarkupArgs } = opts;
-    let asyncMarkupArgs;
     for (const { file, route, prerender } of htmlData) {
       let markupArgs = defaultMarkupArgs;
-      if (api.config.ssr && prerender) {
-        markupArgs = asyncMarkupArgs ?? (asyncMarkupArgs = {
-          ...markupArgs,
-          scripts: markupArgs.scripts.map(
-            (script) => script.src ? { ...script, async: true } : script
-          )
-        });
-      }
       if (publicPath.startsWith(".")) {
         (0, import_assert.default)(
           api.config.runtimePublicPath,

package/dist/features/mako/mako.js

@@ -32,14 +32,19 @@ __export(mako_exports, {
   default: () => mako_default
 });
 module.exports = __toCommonJS(mako_exports);
-var import_path = __toESM(require("path"));
 var import_utils = require("@umijs/utils");
+var import_path = __toESM(require("path"));
 var mako_default = (api) => {
   api.describe({
     key: "mako",
     config: {
       schema({ zod }) {
-        return zod.object({});
+        return zod.object({
+          hooks: zod.object({
+            load: zod.function(),
+            generateEnd: zod.function()
+          })
+        }).partial();
       }
     },
     enableBy: api.EnableBy.config
@@ -61,7 +66,13 @@ var mako_default = (api) => {
       api.logger.info(`Using mako@${pkg.version}`);
       const isBigfish = process.env.BIGFISH_INFO;
       if (!isBigfish) {
-        api.logger.warn(import_utils.chalk.yellow(import_utils.chalk.bold(`Mako is an extremely fast, production-grade web bundler based on Rust. And it's still under active development and is not yet ready for production use. If you encounter any issues, please checkout https://makojs.dev/ to join the community and report the issue.`)));
+        api.logger.warn(
+          import_utils.chalk.yellow(
+            import_utils.chalk.bold(
+              `Mako is an extremely fast, production-grade web bundler based on Rust. And it's still under active development and is not yet ready for production use. If you encounter any issues, please checkout https://makojs.dev/ to join the community and report the issue.`
+            )
+          )
+        );
       }
     } catch (e) {
       console.error(e);

package/dist/features/mpa/mpa.js

@@ -72,14 +72,14 @@ var mpa_default = (api) => {
         api.userConfig.mountElementId
       );
     }
-    const isGTEReact18 = api.appData.react.version.split(".")[0] >= 18;
+    const isReact18 = api.appData.react.version.startsWith("18.");
     api.appData.mpa.entry.forEach((entry) => {
       const layout = entry.layout || api.config.mpa.layout;
       const layoutImport = layout ? `import Layout from '${layout}';` : "";
       const layoutJSX = layout ? `<Layout><App /></Layout>` : `<App />`;
       const rootElement = `document.getElementById('${entry.mountElementId}')`;
-      const renderer = isGTEReact18 ? `ReactDOM.createRoot(${rootElement}).render(${layoutJSX});` : `ReactDOM.render(${layoutJSX}, ${rootElement});`;
-      const reactDOMSource = isGTEReact18 ? "react-dom/client" : "react-dom";
+      const renderer = isReact18 ? `ReactDOM.createRoot(${rootElement}).render(${layoutJSX});` : `ReactDOM.render(${layoutJSX}, ${rootElement});`;
+      const reactDOMSource = isReact18 ? "react-dom/client" : "react-dom";
       api.writeTmpFile({
         path: entry.tmpFilePath,
         noPluginDir: true,

package/dist/features/okam/okam.js

@@ -25,7 +25,7 @@ module.exports = __toCommonJS(okam_exports);
 var import_utils = require("@umijs/utils");
 var okam_default = (api) => {
   api.describe({
-    enableBy: () => Boolean(process.env.OKAM)
+    enableBy: () => Boolean(api.config.mako)
   });
   api.onCheck(() => {
     (0, import_utils.checkVersion)(16, `Node 16 is required when using mako.`);

package/dist/features/prepare/prepare.js

@@ -41,11 +41,10 @@ var parser = (0, import_utils.importLazy)(
 var prepare_default = (api) => {
   function updateAppdata(prepareData) {
     var _a;
-    const buildResult = {
-      ...prepareData.buildResult,
-      // we don't need output file in prepare stage
-      outputFiles: void 0
-    };
+    const buildResult = import_utils.lodash.cloneDeep(prepareData.buildResult);
+    (buildResult.outputFiles || []).forEach((file) => {
+      file == null ? true : delete file.contents;
+    });
     const nextFileImports = prepareData.fileImports ?? ((_a = api.appData.prepare) == null ? void 0 : _a.fileImports);
     api.appData.prepare = {
       buildResult,

package/dist/features/ssr/mako/mako.d.ts

@@ -0,0 +1 @@
+export declare const build: (api: IApi) => Promise<void>;

package/dist/features/ssr/mako/mako.js

@@ -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(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  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/mako/mako.ts
+var mako_exports = {};
+__export(mako_exports, {
+  build: () => build
+});
+module.exports = __toCommonJS(mako_exports);
+var import_types = require("@umijs/bundler-webpack/dist/types");
+var import_utils = require("@umijs/utils");
+var import_fs = require("fs");
+var import_path = __toESM(require("path"));
+var import_utils2 = require("../utils");
+var build = async (api) => {
+  import_utils.logger.wait("[SSR] Compiling by mako...");
+  const now = (/* @__PURE__ */ new Date()).getTime();
+  const absOutputFile = (0, import_utils2.absServerBuildPath)(api);
+  require("@umijs/bundler-webpack/dist/requireHook");
+  const { build: build2 } = require(process.env.OKAM);
+  const useHash = api.config.hash && api.env === import_types.Env.production;
+  const entry = import_path.default.resolve(api.paths.absTmpPath, "umi.server.ts");
+  const options = {
+    cwd: api.cwd,
+    entry: {
+      "umi.server": entry
+    },
+    config: {
+      ...api.config,
+      JSMinifier: "none",
+      hash: useHash,
+      outputPath: import_path.default.dirname(absOutputFile),
+      manifest: {
+        fileName: "build-manifest.json"
+      },
+      devtool: false,
+      cjs: true,
+      dynamicImportToRequire: true
+    },
+    chainWebpack: async (memo) => {
+      memo.target("node");
+      return memo;
+    },
+    onBuildComplete: () => {
+      const finalJsonObj = {};
+      const jsonFilePath = (0, import_path.join)((0, import_path.dirname)(absOutputFile), "build-manifest.json");
+      const json = (0, import_fs.existsSync)(jsonFilePath) ? import_utils.fsExtra.readJSONSync(jsonFilePath) : {};
+      finalJsonObj.assets = {
+        ...json,
+        "umi.js": json["umi.server.js"],
+        "umi.css": json["umi.server.css"]
+      };
+      (0, import_fs.writeFileSync)(jsonFilePath, JSON.stringify(finalJsonObj, null, 2), {
+        flag: "w"
+      });
+    }
+  };
+  await build2(options);
+  const diff = (/* @__PURE__ */ 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/ssr/ssr.js

@@ -45,14 +45,23 @@ var ssr_default = (api) => {
   const webpackBuilder = (0, import_utils.importLazy)(
     require.resolve("./webpack/webpack")
   );
+  const makoBuiler = (0, import_utils.importLazy)(
+    require.resolve("./mako/mako")
+  );
+  let serverBuildTarget;
   api.describe({
     key: "ssr",
     config: {
       schema({ zod }) {
         return zod.object({
           serverBuildPath: zod.string(),
+          serverBuildTarget: zod.enum(["express", "worker"]),
           platform: zod.string(),
-          builder: zod.enum(["esbuild", "webpack"])
+          builder: zod.enum(["esbuild", "webpack", "mako"]),
+          __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: zod.object({
+            pureApp: zod.boolean(),
+            pureHtml: zod.boolean()
+          })
         }).deepPartial();
       }
     },
@@ -69,6 +78,25 @@ var ssr_default = (api) => {
   api.onStart(() => {
     import_utils.logger.warn(`SSR feature is in beta, may be unstable`);
   });
+  api.modifyDefaultConfig((memo) => {
+    if (serverBuildTarget === "worker") {
+      const oReactDom = memo.alias["react-dom"];
+      delete memo.alias["react-dom"];
+      memo.alias["react-dom/server$"] = (0, import_utils.winPath)(
+        (0, import_path.join)(
+          api.service.configDefaults.alias["react-dom"],
+          "server.browser.js"
+        )
+      );
+      memo.alias["react-dom"] = oReactDom;
+    }
+    return memo;
+  });
+  api.modifyConfig((memo) => {
+    memo.define ?? (memo.define = {});
+    serverBuildTarget = memo.define["process.env.SSR_BUILD_TARGET"] = memo.ssr.serverBuildTarget || "express";
+    return memo;
+  });
   api.addMiddlewares(() => [
     async (req, res, next) => {
       const modulePath = (0, import_utils2.absServerBuildPath)(api);
@@ -133,7 +161,7 @@ export type {
     });
   });
   api.onBeforeCompiler(async ({ opts }) => {
-    const { builder = "esbuild" } = api.config.ssr;
+    const { builder = "webpack" } = api.config.ssr;
     if (builder === "esbuild") {
       await esbuildBuilder.build({
         api,
@@ -145,6 +173,18 @@ export type {
         `The \`vite\` config is now allowed when \`ssr.builder\` is webpack!`
       );
       await webpackBuilder.build(api, opts);
+    } else if (api.config.mako && builder === "mako") {
+      await makoBuiler.build(api);
+    }
+  });
+  api.onDevCompileDone(() => {
+    if (api.config.mako) {
+      (0, import_utils2.generateBuildManifest)(api);
+    }
+  });
+  api.onBuildComplete(() => {
+    if (api.config.mako) {
+      (0, import_utils2.generateBuildManifest)(api);
     }
   });
   api.onBuildComplete(async ({ err }) => {

package/dist/features/ssr/utils.d.ts

@@ -5,3 +5,4 @@ export declare function esbuildUmiPlugin(api: IApi): {
     setup(build: any): void;
 };
 export declare function absServerBuildPath(api: IApi): string;
+export declare const generateBuildManifest: (api: IApi) => void;

package/dist/features/ssr/utils.js

@@ -20,9 +20,11 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   absServerBuildPath: () => absServerBuildPath,
-  esbuildUmiPlugin: () => esbuildUmiPlugin
+  esbuildUmiPlugin: () => esbuildUmiPlugin,
+  generateBuildManifest: () => generateBuildManifest
 });
 module.exports = __toCommonJS(utils_exports);
+var import_utils = require("@umijs/utils");
 var import_fs = require("fs");
 var import_path = require("path");
 function esbuildUmiPlugin(api) {
@@ -53,8 +55,19 @@ function absServerBuildPath(api) {
   const manifest = require(manifestPath);
   return (0, import_path.join)(api.paths.cwd, "server", (0, import_path.basename)(manifest.assets["umi.js"]));
 }
+var generateBuildManifest = (api) => {
+  const finalJsonObj = {};
+  const assetFilePath = (0, import_path.join)(api.paths.absOutputPath, "asset-manifest.json");
+  const buildFilePath = (0, import_path.join)(api.paths.absOutputPath, "build-manifest.json");
+  const json = (0, import_fs.existsSync)(assetFilePath) ? import_utils.fsExtra.readJSONSync(assetFilePath) : {};
+  finalJsonObj.assets = json;
+  (0, import_fs.writeFileSync)(buildFilePath, JSON.stringify(finalJsonObj, null, 2), {
+    flag: "w"
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   absServerBuildPath,
-  esbuildUmiPlugin
+  esbuildUmiPlugin,
+  generateBuildManifest
 });

package/dist/features/tmpFiles/routes.js

@@ -181,20 +181,16 @@ async function getRoutes(opts) {
   });
   return routes;
 }
-var IMPORT_EMPTY_ROUTE_CJS = `() => Promise.resolve(require('./EmptyRoute'))`;
-var IMPORT_EMPTY_ROUTE_ESM = `() => import('./EmptyRoute')`;
 async function getRouteComponents(opts) {
   const imports = Object.keys(opts.routes).map((key) => {
     var _a;
     const useSuspense = opts.api.appData.framework === "react" ? true : false;
     const route = opts.routes[key];
-    const useCjsModule = ((_a = opts.api.config.routeLoader) == null ? void 0 : _a.moduleType) === "cjs";
     if (!route.file) {
       if (process.env.NODE_ENV === "test") {
-        return `'${key}': require('./EmptyRoute').default,`;
+        return `'${key}': require( './EmptyRoute').default,`;
       }
-      const importEmptyRoute = useCjsModule ? IMPORT_EMPTY_ROUTE_CJS : IMPORT_EMPTY_ROUTE_ESM;
-      return useSuspense ? `'${key}': React.lazy(${importEmptyRoute}),` : `'${key}': ${importEmptyRoute},`;
+      return useSuspense ? `'${key}': React.lazy(() => import( './EmptyRoute')),` : `'${key}': () => import( './EmptyRoute'),`;
     }
     if (route.hasClientLoader) {
       route.file = (0, import_path.join)(
@@ -217,7 +213,7 @@ async function getRouteComponents(opts) {
     if (process.env.NODE_ENV === "test") {
       return `'${key}': require('${(0, import_utils.winPath)(path)}').default,`;
     }
-    if (useCjsModule) {
+    if (((_a = opts.api.config.routeLoader) == null ? void 0 : _a.moduleType) === "cjs") {
       return useSuspense ? `'${key}': React.lazy(() => Promise.resolve(require('${(0, import_utils.winPath)(
         path
       )}'))),` : `'${key}': () => Promise.resolve(require('${(0, import_utils.winPath)(path)}')),`;

package/dist/features/tmpFiles/tmpFiles.js

@@ -36,6 +36,7 @@ var import_utils = require("@umijs/utils");
 var import_fs = require("fs");
 var import_path = require("path");
 var import_umi = require("umi");
+var import_getMarkupArgs = require("../../commands/dev/getMarkupArgs");
 var import_constants = require("../../constants");
 var import_getModuleExports = require("./getModuleExports");
 var import_importsToStr = require("./importsToStr");
@@ -53,7 +54,7 @@ var tmpFiles_default = (api) => {
     }
   });
   api.onGenerateFiles(async (opts) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const rendererPath = (0, import_utils.winPath)(
       await api.applyPlugins({
         key: "modifyRendererPath",
@@ -111,7 +112,6 @@ var tmpFiles_default = (api) => {
       },
       include: [
         `${baseUrl}.${frameworkName}rc.ts`,
-        `${baseUrl}.${frameworkName}rc.*.ts`,
         `${baseUrl}**/*.d.ts`,
         `${baseUrl}**/*.ts`,
         `${baseUrl}**/*.tsx`,
@@ -269,6 +269,33 @@ declare module '*.txt' {
 }
 `.trimEnd()
     });
+    const entryCode = (await api.applyPlugins({
+      key: "addEntryCode",
+      initialValue: []
+    })).join("\n");
+    const entryCodeAhead = (await api.applyPlugins({
+      key: "addEntryCodeAhead",
+      initialValue: []
+    })).join("\n");
+    const 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");
+    const imports = (0, import_importsToStr.importsToStr)(
+      await api.applyPlugins({
+        key: "addEntryImports",
+        initialValue: []
+      })
+    ).join("\n");
     api.writeTmpFile({
       noPluginDir: true,
       path: "umi.ts",
@@ -278,39 +305,16 @@ declare module '*.txt' {
         rendererPath,
         publicPath: api.config.publicPath,
         runtimePublicPath: api.config.runtimePublicPath ? "true" : "false",
-        entryCode: (await api.applyPlugins({
-          key: "addEntryCode",
-          initialValue: []
-        })).join("\n"),
-        entryCodeAhead: (await api.applyPlugins({
-          key: "addEntryCodeAhead",
-          initialValue: []
-        })).join("\n"),
+        entryCode,
+        entryCodeAhead,
         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"),
+        importsAhead,
+        imports,
         basename: api.config.base,
         historyType: api.config.history.type,
         hydrate: !!api.config.ssr,
@@ -422,9 +426,6 @@ if (process.env.NODE_ENV === 'development') {
     const validKeys = await api.applyPlugins({
       key: "addRuntimePluginKey",
       initialValue: [
-        // why add default?
-        // ref: https://github.com/umijs/mako/issues/1026
-        ...process.env.OKAM ? ["default"] : [],
         "patchRoutes",
         "patchClientRoutes",
         "modifyContextOpts",
@@ -460,6 +461,11 @@ if (process.env.NODE_ENV === 'development') {
     if (api.config.ssr) {
       const umiPluginPath = (0, import_utils.winPath)((0, import_path.join)(umiDir, "client/client/plugin.js"));
       const umiServerPath = (0, import_utils.winPath)(require.resolve("@umijs/server/dist/ssr"));
+      const __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ((_d = api.config.ssr) == null ? void 0 : _d.__INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) ?? {
+        pureApp: false,
+        pureHtml: false
+      };
+      const mountElementId = api.config.mountElementId;
       const routesWithServerLoader = Object.keys(routes).reduce((memo, id) => {
         if (routes[id].hasServerLoader) {
           memo.push({
@@ -469,6 +475,7 @@ if (process.env.NODE_ENV === 'development') {
         }
         return memo;
       }, []);
+      const { headScripts, scripts, styles, title, favicons, links, metas } = await (0, import_getMarkupArgs.getMarkupArgs)({ api });
       api.writeTmpFile({
         noPluginDir: true,
         path: "umi.server.ts",
@@ -478,7 +485,12 @@ if (process.env.NODE_ENV === 'development') {
             /"component": "await import\((.*)\)"/g,
             '"component": await import("$1")'
           ),
+          version: api.appData.umi.version,
+          entryCode,
+          entryCodeAhead,
           routesWithServerLoader,
+          importsAhead,
+          imports,
           umiPluginPath,
           serverRendererPath,
           umiServerPath,
@@ -486,7 +498,20 @@ if (process.env.NODE_ENV === 'development') {
           assetsPath: (0, import_utils.winPath)(
             (0, import_path.join)(api.paths.absOutputPath, "build-manifest.json")
           ),
-          env: JSON.stringify(api.env)
+          env: JSON.stringify(api.env),
+          htmlPageOpts: JSON.stringify({
+            headScripts,
+            styles,
+            title,
+            favicons,
+            links,
+            metas,
+            scripts: scripts || []
+          }),
+          __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: JSON.stringify(
+            __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED
+          ),
+          mountElementId
         }
       });
     }
@@ -553,7 +578,9 @@ if (process.env.NODE_ENV === 'development') {
           exportMembers
         })).join(", ")} } from '${rendererPath}';`
       );
-      exports.push(`export type { History } from '${rendererPath}'`);
+      exports.push(
+        `export type { History, ClientLoader } from '${rendererPath}'`
+      );
       exports.push("// umi/client/client/plugin");
       const umiPluginPath = (0, import_utils.winPath)((0, import_path.join)(umiDir, "client/client/plugin.js"));
       exports.push(

package/dist/index.js

@@ -88,7 +88,6 @@ var src_default = () => {
       require.resolve("./features/mako/mako"),
       require.resolve("./features/hmrGuardian/hmrGuardian"),
       require.resolve("./features/routePreloadOnLoad/routePreloadOnLoad"),
-      require.resolve("./features/forget/forget"),
       // commands
       require.resolve("./commands/build"),
       require.resolve("./commands/config/config"),

package/dist/types.d.ts

@@ -117,6 +117,7 @@ export declare type IApi = PluginAPI & IServicePluginAPI & {
         (fn: {
             (memo: WebpackChain, args: {
                 env: Env;
+                ssr?: boolean;
                 webpack: typeof webpack;
             }): void;
         }): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.2.4",
+  "version": "4.2.6-alpha.0",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -21,11 +21,10 @@
   "dependencies": {
     "@iconify/utils": "2.1.1",
     "@svgr/core": "6.5.1",
-    "@umijs/bundler-mako": "0.4.17",
+    "@umijs/bundler-mako": "0.4.18-canary.20240520.1",
     "@umijs/es-module-parser": "0.0.7",
     "@umijs/history": "5.3.1",
     "babel-plugin-dynamic-import-node": "2.3.3",
-    "babel-plugin-react-compiler": "0.0.0-experimental-c23de8d-20240515",
     "click-to-react-component": "^1.0.8",
     "core-js": "3.34.0",
     "current-script-polyfill": "1.0.0",
@@ -41,21 +40,21 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/bundler-esbuild": "4.2.4",
-    "@umijs/bundler-vite": "4.2.4",
-    "@umijs/bundler-utils": "4.2.4",
-    "@umijs/babel-preset-umi": "4.2.4",
-    "@umijs/bundler-webpack": "4.2.4",
-    "@umijs/core": "4.2.4",
-    "@umijs/plugin-run": "4.2.4",
-    "@umijs/renderer-react": "4.2.4",
-    "@umijs/server": "4.2.4",
-    "@umijs/mfsu": "4.2.4",
-    "@umijs/utils": "4.2.4",
-    "@umijs/zod2ts": "4.2.4",
-    "@umijs/ast": "4.2.4",
-    "@umijs/ui": "3.0.1",
-    "@umijs/did-you-know": "1.0.3"
+    "@umijs/babel-preset-umi": "4.2.6-alpha.0",
+    "@umijs/bundler-esbuild": "4.2.6-alpha.0",
+    "@umijs/bundler-utils": "4.2.6-alpha.0",
+    "@umijs/ast": "4.2.6-alpha.0",
+    "@umijs/bundler-vite": "4.2.6-alpha.0",
+    "@umijs/did-you-know": "1.0.3",
+    "@umijs/renderer-react": "4.2.6-alpha.0",
+    "@umijs/bundler-webpack": "4.2.6-alpha.0",
+    "@umijs/server": "4.2.6-alpha.0",
+    "@umijs/utils": "4.2.6-alpha.0",
+    "@umijs/plugin-run": "4.2.6-alpha.0",
+    "@umijs/zod2ts": "4.2.6-alpha.0",
+    "@umijs/mfsu": "4.2.6-alpha.0",
+    "@umijs/core": "4.2.6-alpha.0",
+    "@umijs/ui": "3.0.1"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",

package/templates/history.tpl

@@ -41,12 +41,6 @@ export function createHistory(opts: any) {
   return h;
 }
 
-export function setHistory(h: UmiHistory) {
-  if (h) {
-    history = h;
-  }
-}
-
 // Patch `to` to support basename
 // Refs:
 // https://github.com/remix-run/history/blob/3e9dab4/packages/history/index.ts#L484

package/templates/server.tpl

@@ -1,11 +1,14 @@
+{{{ importsAhead }}}
 import { getClientRootComponent } from '{{{ serverRendererPath }}}';
 import { getRoutes } from './core/route';
 import { createHistory as createClientHistory } from './core/history';
-import { getPlugins as getClientPlugins } from './core/plugin';
 import { ServerInsertedHTMLContext } from './core/serverInsertedHTMLContext';
-import { PluginManager } from '{{{ umiPluginPath }}}';
-import createRequestHandler, { createMarkupGenerator, createUmiHandler, createUmiServerLoader } from '{{{ umiServerPath }}}';
-
+import { createPluginManager } from './core/plugin';
+import createRequestHandler, { createMarkupGenerator, createUmiHandler, createUmiServerLoader, createAppRootElement } from '{{{ umiServerPath }}}';
+import fs from 'fs';
+import path from 'path';
+{{{ imports }}}
+{{{ entryCodeAhead }}}
 let helmetContext;
 
 try {
@@ -18,17 +21,19 @@ const routesWithServerLoader = {
 {{/routesWithServerLoader}}
 };
 
-export function getPlugins() {
-  return getClientPlugins();
-}
-
-export function getValidKeys() {
-  return [{{#validKeys}}'{{{ . }}}',{{/validKeys}}];
-}
-
 export function getManifest(sourceDir) {
-  return JSON.parse(require('fs').readFileSync(
-  sourceDir ? require('path').join(sourceDir,'build-manifest.json') : '{{{ assetsPath }}}', 'utf-8'));
+  let manifestPath;
+  if (process.env.SSR_MANIFEST) {
+    return JSON.parse(process.env.SSR_MANIFEST)
+  } 
+  if (sourceDir) {
+    manifestPath = path.join(sourceDir,'build-manifest.json')
+  }
+  else {
+    manifestPath = '{{{ assetsPath }}}'
+  }
+
+  return JSON.parse(fs.readFileSync(manifestPath), 'utf-8');
 }
 
 export function createHistory(opts) {
@@ -42,20 +47,34 @@ global.g_getAssets = (fileName) => {
 };
 const createOpts = {
   routesWithServerLoader,
-  PluginManager,
-  getPlugins,
-  getValidKeys,
+  pluginManager: createPluginManager(),
   getRoutes,
   manifest: getManifest,
   getClientRootComponent,
   helmetContext,
   createHistory,
   ServerInsertedHTMLContext,
+  htmlPageOpts: {{{htmlPageOpts}}},
+ __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {{{__INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED}}},
+  mountElementId: '{{{mountElementId}}}'
+
 };
 const requestHandler = createRequestHandler(createOpts);
+/**
+ * @deprecated  Please use `requestHandler` instead.
+ */
 export const renderRoot = createUmiHandler(createOpts);
+/**
+ * @deprecated  Please use `requestHandler` instead.
+ */
 export const serverLoader = createUmiServerLoader(createOpts);
 
 export const _markupGenerator = createMarkupGenerator(createOpts);
 
+export const getAppRootElement = createAppRootElement.bind(null, createOpts)();
+
 export default requestHandler;
+
+export const g_umi = '{{{version}}}'
+
+{{{ entryCode }}}

package/templates/umi.tpl

@@ -56,6 +56,7 @@ async function render() {
         routes,
         routeComponents,
         pluginManager,
+        mountElementId: '{{{mountElementId}}}',
         rootElement: contextOpts.rootElement || document.getElementById('{{{ mountElementId }}}'),
 {{#loadingComponent}}
         loadingComponent: Loading,

package/dist/features/forget/forget.d.ts

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

package/dist/features/forget/forget.js

@@ -1,77 +0,0 @@
-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(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/features/forget/forget.ts
-var forget_exports = {};
-__export(forget_exports, {
-  default: () => forget_default
-});
-module.exports = __toCommonJS(forget_exports);
-var forget_default = (api) => {
-  api.describe({
-    key: "forget",
-    config: {
-      schema({ zod }) {
-        return zod.object({
-          ReactCompilerConfig: zod.object({}).optional()
-        });
-      }
-    },
-    enableBy: api.EnableBy.config
-  });
-  api.onCheckConfig(() => {
-    if (api.config.mfsu) {
-      throw new Error(
-        `forget is not compatible with mfsu, please disable mfsu first.`
-      );
-    }
-    if (api.config.mako) {
-      throw new Error(
-        `forget is not compatible with mako, please disable mako first.`
-      );
-    }
-  });
-  api.onCheck(() => {
-    let reactMajorVersion = api.appData.react.version.split(".")[0];
-    if (reactMajorVersion < 19) {
-      throw new Error(
-        `forget is only compatible with React 19 and above, please upgrade your React version.`
-      );
-    }
-  });
-  api.modifyConfig((memo) => {
-    let ReactCompilerConfig = api.userConfig.forget.ReactCompilerConfig || {};
-    return {
-      ...memo,
-      extraBabelPlugins: [
-        ...memo.extraBabelPlugins || [],
-        [require.resolve("babel-plugin-react-compiler"), ReactCompilerConfig]
-      ]
-    };
-  });
-};