@umijs/preset-umi 4.2.6-alpha.6 → 4.2.6

package/dist/commands/build.js

@@ -48,7 +48,7 @@ COMPRESS=none umi build
 umi build --clean
 `,
     fn: async function() {
-      var _a, _b;
+      var _a;
       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({
@@ -113,11 +113,7 @@ umi build --clean
         react: {
           runtime: shouldUseAutomaticRuntime ? "automatic" : "classic"
         },
-        config: {
-          outputPath: api.userConfig.outputPath || "dist",
-          ...api.config,
-          hooks: ((_b = api.config.mako) == null ? void 0 : _b.hooks) || {}
-        },
+        config: api.config,
         cwd: api.cwd,
         entry,
         ...api.config.vite ? { modifyViteConfig } : { babelPreset, chainWebpack, modifyWebpackConfig },
@@ -142,7 +138,7 @@ umi build --clean
       let stats;
       if (api.config.vite) {
         stats = await bundlerVite.build(opts);
-      } else if (api.config.mako) {
+      } else if (process.env.OKAM) {
         require("@umijs/bundler-webpack/dist/requireHook");
         const { build } = require(process.env.OKAM);
         stats = await build(opts);
@@ -168,13 +164,13 @@ umi build --clean
           publicPath: api.config.publicPath
         });
         const { vite } = api.args;
-        const args = await (0, import_getMarkupArgs.getMarkupArgs)({ api });
+        const markupArgs = await (0, import_getMarkupArgs.getMarkupArgs)({ api });
         const finalMarkUpArgs = {
-          ...args,
-          styles: args.styles.concat(
+          ...markupArgs,
+          styles: markupArgs.styles.concat(
             api.config.vite ? [] : [...(assetsMap["umi.css"] || []).map((src) => ({ src }))]
           ),
-          scripts: (api.config.vite ? [] : [...(assetsMap["umi.js"] || []).map((src) => ({ src }))]).concat(args.scripts),
+          scripts: (api.config.vite ? [] : [...(assetsMap["umi.js"] || []).map((src) => ({ src }))]).concat(markupArgs.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(api) {
-      if (!compiler && api.config.mako) {
+    async function getStats() {
+      if (!compiler && process.env.OKAM) {
         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(opts.api);
+      const stats = await getStats();
       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, _g;
+      var _a, _b, _c, _d, _e, _f;
       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);
@@ -314,11 +314,7 @@ PORT=8888 umi dev
         react: {
           runtime: shouldUseAutomaticRuntime ? "automatic" : "classic"
         },
-        config: {
-          outputPath: api.userConfig.outputPath || "dist",
-          ...api.config,
-          hooks: ((_d = api.config.mako) == null ? void 0 : _d.hooks) || {}
-        },
+        config: api.config,
         pkg: api.pkg,
         cwd: api.cwd,
         rootDir: process.cwd(),
@@ -358,8 +354,8 @@ PORT=8888 umi dev
             ...opts2
           };
         },
-        mfsuWithESBuild: (_e = api.config.mfsu) == null ? void 0 : _e.esbuild,
-        mfsuStrategy: (_f = api.config.mfsu) == null ? void 0 : _f.strategy,
+        mfsuWithESBuild: (_d = api.config.mfsu) == null ? void 0 : _d.esbuild,
+        mfsuStrategy: (_e = api.config.mfsu) == null ? void 0 : _e.strategy,
         cache: {
           buildDependencies: [
             api.pkgPath,
@@ -369,7 +365,7 @@ PORT=8888 umi dev
         srcCodeCache,
         mfsuInclude: import_utils.lodash.union([
           ...MFSU_EAGER_DEFAULT_INCLUDE,
-          ...((_g = api.config.mfsu) == null ? void 0 : _g.include) || []
+          ...((_f = api.config.mfsu) == null ? void 0 : _f.include) || []
         ]),
         startBuildWorker,
         onBeforeMiddleware(app) {
@@ -387,7 +383,7 @@ PORT=8888 umi dev
       });
       if (enableVite) {
         await bundlerVite.dev(opts);
-      } else if (api.config.mako) {
+      } else if (process.env.OKAM) {
         require("@umijs/bundler-webpack/dist/requireHook");
         const { dev } = require(process.env.OKAM);
         await dev(opts);

package/dist/features/appData/umiInfo.js

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

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 (api.config.mako)
+    if (process.env.OKAM)
       return [];
     const $ = await api.applyPlugins({
       key: "modifyDevToolLoadingHTML",

package/dist/features/esbuildHelperChecker/esbuildHelperChecker.js

@@ -111,7 +111,7 @@ var esbuildHelperChecker_default = (api) => {
   api.onBuildComplete(async ({ err }) => {
     if (api.config.vite)
       return;
-    if (api.config.mako)
+    if (process.env.OKAM)
       return;
     if (err)
       return;

package/dist/features/exportStatic/exportStatic.js

@@ -64,14 +64,23 @@ 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 html = await markupRender(path);
+    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}`);
     import_utils.logger.info(`Pre-render for ${path}`);
-    return html;
   } catch (err) {
     import_utils.logger.error(`Pre-render ${path} error: ${err}`);
     if (!ignorePreRenderError) {
@@ -116,8 +125,17 @@ 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

@@ -39,12 +39,7 @@ var mako_default = (api) => {
     key: "mako",
     config: {
       schema({ zod }) {
-        return zod.object({
-          hooks: zod.object({
-            load: zod.function(),
-            generateEnd: zod.function()
-          })
-        }).partial();
+        return zod.object({});
       }
     },
     enableBy: api.EnableBy.config
@@ -66,13 +61,7 @@ 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/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(api.config.mako)
+    enableBy: () => Boolean(process.env.OKAM)
   });
   api.onCheck(() => {
     (0, import_utils.checkVersion)(16, `Node 16 is required when using mako.`);

package/dist/features/routePreloadOnLoad/routePreloadOnLoad.js

@@ -100,18 +100,11 @@ async function getRouteChunkFilesMap(chunks, opts) {
   };
 }
 async function getRoutePathFilesMap(routes, fileChunksMap, opts) {
-  var _a;
   const { resolver, absPagesPath } = opts;
   const routeFilesMap = {};
   for (const route of Object.values(routes)) {
     if (!route.file)
       continue;
-    if (!((_a = route.absPath) == null ? void 0 : _a.startsWith("/"))) {
-      import_utils.logger.error(
-        `[routePreloadOnLoad]: route absPath error, cannot preload for ${route.absPath}`
-      );
-      continue;
-    }
     let current = route;
     const files = [];
     do {
@@ -135,8 +128,8 @@ async function getRoutePathFilesMap(routes, fileChunksMap, opts) {
     const indexes = Array.from(
       // use set to avoid duplicated indexes
       files.reduce((indexSet, file) => {
-        var _a2;
-        (_a2 = fileChunksMap[file]) == null ? void 0 : _a2.indexes.forEach((i) => indexSet.add(i));
+        var _a;
+        (_a = fileChunksMap[file]) == null ? void 0 : _a.indexes.forEach((i) => indexSet.add(i));
         return indexSet;
       }, /* @__PURE__ */ new Set())
     );
@@ -150,7 +143,7 @@ async function getRoutePathFilesMap(routes, fileChunksMap, opts) {
 }
 var routePreloadOnLoad_default = (api) => {
   let routeChunkFilesMap;
-  let preloadJSFileExt = ".js";
+  let hashedPart = ".js";
   api.describe({
     enableBy: () => {
       var _a;
@@ -181,7 +174,7 @@ var routePreloadOnLoad_default = (api) => {
           // script mode
           [
             {
-              src: `${displayPublicPath}${import_utils2.PRELOAD_ROUTE_HELPER}${preloadJSFileExt}`
+              src: `${displayPublicPath}${import_utils2.PRELOAD_ROUTE_HELPER}${hashedPart}`
             }
           ]
         );
@@ -235,16 +228,12 @@ var routePreloadOnLoad_default = (api) => {
           api.config.runtimePublicPath ? "window.publicPath||" : ""}"${api.config.publicPath}"`
         );
         if (api.config.hash) {
-          preloadJSFileExt = `.${(0, import_crypto.createHash)("md5").update(content).digest("hex").substring(0, 8)}.js`;
+          hashedPart = `.${(0, import_crypto.createHash)("md5").update(content).digest("hex").substring(0, 8)}.js`;
         }
         (0, import_fs.writeFileSync)(
-          (0, import_path.join)(
-            api.paths.absOutputPath,
-            `${import_utils2.PRELOAD_ROUTE_HELPER}${preloadJSFileExt}`
-          ),
-          content,
-          "utf-8"
-        );
+          (0, import_path.join)(api.paths.absOutputPath, `${import_utils2.PRELOAD_ROUTE_HELPER}${hashedPart}`),
+          content
+        ), "utf-8";
       }
     }
   });

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

@@ -9,7 +9,7 @@ export interface IPreloadRouteFile {
     attrs: ([string, string] | [string])[];
 }
 export declare const PRELOAD_ROUTE_MAP_SCP_TYPE = "umi-route-chunk-files-map";
-export declare const PRELOAD_ROUTE_HELPER = "preload_helper";
+export declare const PRELOAD_ROUTE_HELPER = "_umi_route_preload_helper";
 export declare function getPreloadRouteFiles(path: string, map: IRouteChunkFilesMap, opts: {
     publicPath: string;
 }): IPreloadRouteFile[] | undefined;

package/dist/features/routePreloadOnLoad/utils.js

@@ -25,7 +25,7 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var PRELOAD_ROUTE_MAP_SCP_TYPE = "umi-route-chunk-files-map";
-var PRELOAD_ROUTE_HELPER = "preload_helper";
+var PRELOAD_ROUTE_HELPER = "_umi_route_preload_helper";
 function getPreloadRouteFiles(path, map, opts) {
   var _a;
   const matched = (

package/dist/features/ssr/ssr.js

@@ -45,23 +45,14 @@ 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", "mako"]),
-          __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: zod.object({
-            pureApp: zod.boolean(),
-            pureHtml: zod.boolean()
-          })
+          builder: zod.enum(["esbuild", "webpack"])
         }).deepPartial();
       }
     },
@@ -78,25 +69,6 @@ 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);
@@ -161,7 +133,7 @@ export type {
     });
   });
   api.onBeforeCompiler(async ({ opts }) => {
-    const { builder = "webpack" } = api.config.ssr;
+    const { builder = "esbuild" } = api.config.ssr;
     if (builder === "esbuild") {
       await esbuildBuilder.build({
         api,
@@ -173,18 +145,6 @@ 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,4 +5,3 @@ 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,11 +20,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   absServerBuildPath: () => absServerBuildPath,
-  esbuildUmiPlugin: () => esbuildUmiPlugin,
-  generateBuildManifest: () => generateBuildManifest
+  esbuildUmiPlugin: () => esbuildUmiPlugin
 });
 module.exports = __toCommonJS(utils_exports);
-var import_utils = require("@umijs/utils");
 var import_fs = require("fs");
 var import_path = require("path");
 function esbuildUmiPlugin(api) {
@@ -55,19 +53,8 @@ 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,
-  generateBuildManifest
+  esbuildUmiPlugin
 });

package/dist/features/tmpFiles/tmpFiles.js

@@ -36,7 +36,6 @@ 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");
@@ -54,7 +53,7 @@ var tmpFiles_default = (api) => {
     }
   });
   api.onGenerateFiles(async (opts) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const rendererPath = (0, import_utils.winPath)(
       await api.applyPlugins({
         key: "modifyRendererPath",
@@ -270,37 +269,6 @@ 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");
-    const __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ((_b = api.config.ssr) == null ? void 0 : _b.__INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) ?? {
-      pureApp: false,
-      pureHtml: false
-    };
     api.writeTmpFile({
       noPluginDir: true,
       path: "umi.ts",
@@ -310,21 +278,41 @@ declare module '*.txt' {
         rendererPath,
         publicPath: api.config.publicPath,
         runtimePublicPath: api.config.runtimePublicPath ? "true" : "false",
-        entryCode,
-        entryCodeAhead,
+        entryCode: (await api.applyPlugins({
+          key: "addEntryCode",
+          initialValue: []
+        })).join("\n"),
+        entryCodeAhead: (await api.applyPlugins({
+          key: "addEntryCodeAhead",
+          initialValue: []
+        })).join("\n"),
         polyfillImports: (0, import_importsToStr.importsToStr)(
           await api.applyPlugins({
             key: "addPolyfillImports",
             initialValue: []
           })
         ).join("\n"),
-        importsAhead,
-        imports,
+        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,
-        __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: JSON.stringify(
-          __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED
-        ),
         hydrate: !!api.config.ssr,
         reactRouter5Compat: !!api.config.reactRouter5Compat,
         loadingComponent: api.appData.globalLoading
@@ -355,7 +343,7 @@ export default function EmptyRoute() {
     }
     const hasSrc = api.appData.hasSrcDir;
     const pages = (0, import_path.basename)(
-      ((_c = api.config.conventionRoutes) == null ? void 0 : _c.base) || api.paths.absPagesPath
+      ((_b = api.config.conventionRoutes) == null ? void 0 : _b.base) || api.paths.absPagesPath
     );
     const prefix = hasSrc ? `../../../src/${pages}/` : `../../${pages}/`;
     const clonedRoutes = import_utils.lodash.cloneDeep(routes);
@@ -413,7 +401,7 @@ if (process.env.NODE_ENV === 'development') {
     });
     const plugins = await api.applyPlugins({
       key: "addRuntimePlugin",
-      initialValue: [(_d = api.appData.appJS) == null ? void 0 : _d.path].filter(Boolean)
+      initialValue: [(_c = api.appData.appJS) == null ? void 0 : _c.path].filter(Boolean)
     });
     function checkDuplicatePluginKeys(arr) {
       const duplicates = [];
@@ -472,7 +460,6 @@ 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 mountElementId = api.config.mountElementId;
       const routesWithServerLoader = Object.keys(routes).reduce((memo, id) => {
         if (routes[id].hasServerLoader) {
           memo.push({
@@ -482,7 +469,6 @@ 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",
@@ -492,12 +478,7 @@ 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,
@@ -505,20 +486,7 @@ 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),
-          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
+          env: JSON.stringify(api.env)
         }
       });
     }
@@ -585,9 +553,7 @@ if (process.env.NODE_ENV === 'development') {
           exportMembers
         })).join(", ")} } from '${rendererPath}';`
       );
-      exports.push(
-        `export type { History, ClientLoader } from '${rendererPath}'`
-      );
+      exports.push(`export type { History } 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/types.d.ts

@@ -117,7 +117,6 @@ 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.6-alpha.6",
+  "version": "4.2.6",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -21,7 +21,7 @@
   "dependencies": {
     "@iconify/utils": "2.1.1",
     "@svgr/core": "6.5.1",
-    "@umijs/bundler-mako": "0.4.17",
+    "@umijs/bundler-mako": "0.5.1-canary.20240529.2",
     "@umijs/es-module-parser": "0.0.7",
     "@umijs/history": "5.3.1",
     "babel-plugin-dynamic-import-node": "2.3.3",
@@ -41,21 +41,21 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/ast": "4.2.6-alpha.6",
-    "@umijs/bundler-utils": "4.2.6-alpha.6",
-    "@umijs/bundler-esbuild": "4.2.6-alpha.6",
-    "@umijs/babel-preset-umi": "4.2.6-alpha.6",
-    "@umijs/bundler-vite": "4.2.6-alpha.6",
-    "@umijs/did-you-know": "1.0.3",
-    "@umijs/bundler-webpack": "4.2.6-alpha.6",
-    "@umijs/core": "4.2.6-alpha.6",
-    "@umijs/server": "4.2.6-alpha.6",
-    "@umijs/mfsu": "4.2.6-alpha.6",
-    "@umijs/plugin-run": "4.2.6-alpha.6",
-    "@umijs/renderer-react": "4.2.6-alpha.6",
+    "@umijs/ast": "4.2.6",
+    "@umijs/bundler-vite": "4.2.6",
+    "@umijs/mfsu": "4.2.6",
+    "@umijs/bundler-utils": "4.2.6",
+    "@umijs/bundler-webpack": "4.2.6",
+    "@umijs/babel-preset-umi": "4.2.6",
+    "@umijs/core": "4.2.6",
+    "@umijs/utils": "4.2.6",
+    "@umijs/server": "4.2.6",
+    "@umijs/plugin-run": "4.2.6",
+    "@umijs/zod2ts": "4.2.6",
     "@umijs/ui": "3.0.1",
-    "@umijs/utils": "4.2.6-alpha.6",
-    "@umijs/zod2ts": "4.2.6-alpha.6"
+    "@umijs/did-you-know": "1.0.3",
+    "@umijs/renderer-react": "4.2.6",
+    "@umijs/bundler-esbuild": "4.2.6"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",

package/templates/server.tpl

@@ -1,14 +1,11 @@
-{{{ 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 { createPluginManager } from './core/plugin';
-import createRequestHandler, { createMarkupGenerator, createUmiHandler, createUmiServerLoader, createAppRootElement } from '{{{ umiServerPath }}}';
-import fs from 'fs';
-import path from 'path';
-{{{ imports }}}
-{{{ entryCodeAhead }}}
+import { PluginManager } from '{{{ umiPluginPath }}}';
+import createRequestHandler, { createMarkupGenerator, createUmiHandler, createUmiServerLoader } from '{{{ umiServerPath }}}';
+
 let helmetContext;
 
 try {
@@ -21,19 +18,17 @@ const routesWithServerLoader = {
 {{/routesWithServerLoader}}
 };
 
-export function getManifest(sourceDir) {
-  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 }}}'
-  }
+export function getPlugins() {
+  return getClientPlugins();
+}
+
+export function getValidKeys() {
+  return [{{#validKeys}}'{{{ . }}}',{{/validKeys}}];
+}
 
-  return JSON.parse(fs.readFileSync(manifestPath), 'utf-8');
+export function getManifest(sourceDir) {
+  return JSON.parse(require('fs').readFileSync(
+  sourceDir ? require('path').join(sourceDir,'build-manifest.json') : '{{{ assetsPath }}}', 'utf-8'));
 }
 
 export function createHistory(opts) {
@@ -47,34 +42,20 @@ global.g_getAssets = (fileName) => {
 };
 const createOpts = {
   routesWithServerLoader,
-  pluginManager: createPluginManager(),
+  PluginManager,
+  getPlugins,
+  getValidKeys,
   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,7 +56,6 @@ async function render() {
         routes,
         routeComponents,
         pluginManager,
-        mountElementId: '{{{mountElementId}}}',
         rootElement: contextOpts.rootElement || document.getElementById('{{{ mountElementId }}}'),
 {{#loadingComponent}}
         loadingComponent: Loading,
@@ -66,7 +65,6 @@ async function render() {
         history,
         historyType,
         basename,
-        __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {{{__INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED}}},
         callback: contextOpts.callback,
       };
       const modifiedContext = pluginManager.applyPlugins({

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

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

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

@@ -1,90 +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/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
-});