@umijs/preset-umi 4.0.84 → 4.0.86

package/dist/features/configPlugins/configPlugins.js

@@ -129,5 +129,3 @@ var configPlugins_default = (api) => {
     return memo;
   });
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/features/exportStatic/exportStatic.js

@@ -220,5 +220,3 @@ export function modifyClientRenderOpts(memo: any) {
     return [`@@/core/exportStaticRuntimePlugin.ts`];
   });
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/features/ssr/ssr.js

@@ -144,8 +144,9 @@ export function useServerInsertedHTML(callback: () => React.ReactNode): void {
       (0, import_fs.writeFileSync)(
         (0, import_path.join)(api.cwd, "api/umi.server.js"),
         `
+const manifest = require('../server/build-manifest.json');
 export default function handler(request, response) {
-  require('../server/umi.server.js').default(request, response);
+    require(manifest.assets["umi.js"]).default(request, response);
 }
       `.trimStart(),
         "utf-8"
@@ -187,5 +188,3 @@ export default function handler(request, response) {
     return config;
   });
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/features/ssr/utils.js

@@ -23,6 +23,7 @@ __export(utils_exports, {
   esbuildUmiPlugin: () => esbuildUmiPlugin
 });
 module.exports = __toCommonJS(utils_exports);
+var import_fs = require("fs");
 var import_path = require("path");
 function esbuildUmiPlugin(api) {
   return {
@@ -41,10 +42,16 @@ function absServerBuildPath(api) {
   if (api.env === "development") {
     return (0, import_path.join)(api.paths.absTmpPath, "server/umi.server.js");
   }
-  return (0, import_path.join)(
-    api.paths.cwd,
-    api.userConfig.ssr.serverBuildPath || "server/umi.server.js"
-  );
+  const manifestPath = (0, import_path.join)(api.paths.cwd, "server", "build-manifest.json");
+  if (api.userConfig.ssr.serverBuildPath || !(0, import_fs.existsSync)(manifestPath)) {
+    return (0, import_path.join)(
+      api.paths.cwd,
+      api.userConfig.ssr.serverBuildPath || "server/umi.server.js"
+    );
+  }
+  delete require.cache[manifestPath];
+  const manifest = require(manifestPath);
+  return (0, import_path.join)(api.paths.cwd, "server", (0, import_path.basename)(manifest.assets["umi.js"]));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -36,11 +36,13 @@ var bundlerWebpack = __toESM(require("@umijs/bundler-webpack"));
 var import_utils = require("@umijs/utils");
 var import_path = require("path");
 var import_utils2 = require("../utils");
+var import_types = require("@umijs/bundler-webpack/dist/types");
 var build2 = async (api, opts) => {
   import_utils.logger.wait("[SSR] Compiling...");
-  const now = new Date().getTime();
+  const now = (/* @__PURE__ */ new Date()).getTime();
   const bundlerOpts = import_utils.lodash.cloneDeep(opts);
   const oChainWebpack = bundlerOpts.chainWebpack;
+  const useHash = api.config.hash && api.env === import_types.Env.production;
   delete bundlerOpts.config.deadCode;
   bundlerOpts.extraBabelPlugins.push([
     require.resolve("babel-plugin-dynamic-import-node"),
@@ -57,13 +59,15 @@ var build2 = async (api, opts) => {
     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.output.path((0, import_path.dirname)(absOutputFile)).filename(useHash ? "umi.[contenthash:8].server.js" : "umi.server.js").chunkFilename(
+      useHash ? "umi.[contenthash:8].server.js" : "umi.server.js"
+    ).libraryTarget("commonjs2");
     memo.plugins.delete("progress-plugin");
     memo.optimization.minimize(false);
     return memo;
   };
   await bundlerWebpack.build(bundlerOpts);
-  const diff = new Date().getTime() - now;
+  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:

package/dist/features/tmpFiles/routes.js

@@ -251,7 +251,7 @@ function componentToChunkName(component, cwd = "/") {
       import_utils.lodash.escapeRegExp(lastSlash(getProjectRootCwd(cwd)))})`
     ),
     ""
-  ).replace(/^.(\/|\\)/, "").replace(/(\/|\\)/g, "__").replace(/@/g, "_").replace(/\.jsx?$/, "").replace(/\.tsx?$/, "").replace(/\.vue?$/, "").replace(/^src__/, "").replace(/\.\.__/g, "").replace(/[\[\]]/g, "").replace(/^node_modules__/, "nm__").replace(/^.umi-production__/, "t__").replace(/^\./, "").replace(/^pages__/, "p__") : "";
+  ).replace(/.+(node_modules(\/|\\))/, "$1").replace(/(\/|\\)_@?([^@]+@){2}/, "$1").replace(/^.(\/|\\)/, "").replace(/(\/|\\)/g, "__").replace(/@/g, "_").replace(/\.jsx?$/, "").replace(/\.tsx?$/, "").replace(/\.vue?$/, "").replace(/^src__/, "").replace(/\.\.__/g, "").replace(/[\[\]]/g, "").replace(/^node_modules__/, "nm__").replace(/^.umi-production__/, "t__").replace(/^\./, "").replace(/^pages__/, "p__") : "";
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.84",
+  "version": "4.0.86",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -37,21 +37,21 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/ast": "4.0.84",
-    "@umijs/bundler-utils": "4.0.84",
-    "@umijs/babel-preset-umi": "4.0.84",
-    "@umijs/bundler-esbuild": "4.0.84",
-    "@umijs/bundler-webpack": "4.0.84",
-    "@umijs/bundler-vite": "4.0.84",
-    "@umijs/core": "4.0.84",
-    "@umijs/mfsu": "4.0.84",
-    "@umijs/renderer-react": "4.0.84",
-    "@umijs/plugin-run": "4.0.84",
-    "@umijs/server": "4.0.84",
+    "@umijs/ast": "4.0.86",
+    "@umijs/babel-preset-umi": "4.0.86",
+    "@umijs/bundler-utils": "4.0.86",
+    "@umijs/bundler-vite": "4.0.86",
+    "@umijs/bundler-esbuild": "4.0.86",
+    "@umijs/bundler-webpack": "4.0.86",
+    "@umijs/core": "4.0.86",
     "@umijs/did-you-know": "1.0.3",
-    "@umijs/zod2ts": "4.0.84",
-    "@umijs/utils": "4.0.84",
-    "@umijs/ui": "3.0.1"
+    "@umijs/mfsu": "4.0.86",
+    "@umijs/plugin-run": "4.0.86",
+    "@umijs/renderer-react": "4.0.86",
+    "@umijs/server": "4.0.86",
+    "@umijs/zod2ts": "4.0.86",
+    "@umijs/ui": "3.0.1",
+    "@umijs/utils": "4.0.86"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",

package/templates/server.tpl

@@ -26,8 +26,9 @@ export function getValidKeys() {
   return [{{#validKeys}}'{{{ . }}}',{{/validKeys}}];
 }
 
-export function getManifest() {
-  return JSON.parse(require('fs').readFileSync('{{{ assetsPath }}}', '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) {
@@ -36,18 +37,16 @@ export function createHistory(opts) {
 
 // TODO: remove global variable
 global.g_getAssets = (fileName) => {
-  let m = typeof manifest === 'function' ? manifest() : manifest;
+  let m = getManifest();
   return m.assets[fileName];
 };
-
-const manifest = {{{ env }}} === 'development' ? getManifest : getManifest();
 const createOpts = {
   routesWithServerLoader,
   PluginManager,
   getPlugins,
   getValidKeys,
   getRoutes,
-  manifest,
+  manifest: getManifest,
   getClientRootComponent,
   helmetContext,
   createHistory,