@umijs/preset-umi 4.6.63 → 4.6.65

package/dist/commands/build.js

@@ -26,6 +26,7 @@ var import_server = require("@umijs/server");
 var import_utils = require("@umijs/utils");
 var import_fs = require("fs");
 var import_path = require("path");
+var import_utils2 = require("../features/ssr/utils");
 var import_fileSizeReporter = require("../utils/fileSizeReporter");
 var import_lazyImportFromCurrentPkg = require("../utils/lazyImportFromCurrentPkg");
 var import_getAssetsMap = require("./dev/getAssetsMap");
@@ -155,6 +156,9 @@ umi build --clean
         }
       });
       const stats = await bundler.build(opts);
+      if (api.config.ssr && isUtoopack) {
+        (0, import_utils2.generateBuildManifestFromStats)(api, stats);
+      }
       if (!api.config.vite && !api.config.mako) {
         const absOutputPath = (0, import_path.resolve)(
           opts.cwd,

package/dist/features/ssr/utils.js

@@ -132,9 +132,14 @@ function isUmiCssFile(file) {
 function isUtoopackSingleCss(file) {
   return /\.single\.css(?:[?#].*)?$/.test(file);
 }
-function findClientCssFile(files) {
+function findClientCssFiles(files) {
   const cssFiles = files.filter(isCssFile);
-  return cssFiles.find(isUmiCssFile) || cssFiles.find((file) => !isUtoopackSingleCss(file)) || cssFiles[0];
+  return Array.from(
+    /* @__PURE__ */ new Set([
+      ...cssFiles.filter(isUmiCssFile),
+      ...cssFiles.filter((file) => !isUmiCssFile(file))
+    ])
+  ).filter((file) => !isUtoopackSingleCss(file));
 }
 function getSourceAssetMap(api, statsAssets, publicPath) {
   const outputAssets = statsAssets.filter((file) => assetExts.has((0, import_path.extname)(file))).map((file) => {
@@ -197,9 +202,11 @@ var generateBuildManifestFromStats = (api, stats) => {
   if (umiJs) {
     finalJsonObj.assets["umi.js"] = addPublicPath(publicPath, umiJs);
   }
-  const umiCss = findClientCssFile([...entryFiles, ...statsAssets]);
-  if (umiCss) {
-    finalJsonObj.assets["umi.css"] = addPublicPath(publicPath, umiCss);
+  const umiCssFiles = findClientCssFiles([...entryFiles, ...statsAssets]);
+  if (umiCssFiles.length) {
+    finalJsonObj.assets["umi.css"] = umiCssFiles.map(
+      (file) => addPublicPath(publicPath, file)
+    );
   }
   (0, import_fs.writeFileSync)(buildFilePath, JSON.stringify(finalJsonObj, null, 2), {
     flag: "w"

package/dist/features/utoopack/utoopack.js

@@ -120,15 +120,9 @@ var utoopack_default = (api) => {
     }
   });
   api.onDevCompileDone(({ stats }) => {
-    var _a, _b, _c;
-    const entryPointFiles = /* @__PURE__ */ new Set();
-    for (const chunk of ((_b = (_a = stats.entrypoints) == null ? void 0 : _a["umi"]) == null ? void 0 : _b.chunks) || []) {
-      const files = ((_c = ((stats == null ? void 0 : stats.chunks) || []).find((c) => (c == null ? void 0 : c.id) === chunk)) == null ? void 0 : _c.files) || [];
-      for (const file of files) {
-        entryPointFiles.add(file);
-      }
-    }
-    const entryAssets = (0, import_extractEntryAssets.extractEntryAssets)(Array.from(entryPointFiles));
+    const entryAssets = (0, import_extractEntryAssets.extractEntryAssets)(
+      (0, import_extractEntryAssets.extractEntryPointFilesFromStats)(stats)
+    );
     Object.entries(entryAssets).forEach(([ext, files]) => {
       if (!Array.isArray(assets[ext])) {
         assets[ext] = [];
@@ -137,15 +131,9 @@ var utoopack_default = (api) => {
     });
   });
   api.onBuildComplete(({ stats }) => {
-    var _a, _b, _c;
-    const entryPointFiles = /* @__PURE__ */ new Set();
-    for (const chunk of ((_b = (_a = stats.entrypoints) == null ? void 0 : _a["umi"]) == null ? void 0 : _b.chunks) || []) {
-      const files = ((_c = ((stats == null ? void 0 : stats.chunks) || []).find((c) => (c == null ? void 0 : c.id) === chunk)) == null ? void 0 : _c.files) || [];
-      for (const file of files) {
-        entryPointFiles.add(file);
-      }
-    }
-    const entryAssets = (0, import_extractEntryAssets.extractEntryAssets)(Array.from(entryPointFiles));
+    const entryAssets = (0, import_extractEntryAssets.extractEntryAssets)(
+      (0, import_extractEntryAssets.extractEntryPointFilesFromStats)(stats)
+    );
     Object.entries(entryAssets).forEach(([ext, files]) => {
       if (!Array.isArray(assets[ext])) {
         assets[ext] = [];

package/dist/utils/extractEntryAssets.d.ts

@@ -3,5 +3,6 @@ export declare type EntryAssets = {
     css: string[];
     [key: string]: string[];
 };
+export declare function extractEntryPointFilesFromStats(stats: any, entryName?: string): string[];
 export declare function extractEntryAssets(entryPointFiles: string[]): EntryAssets;
 export declare function extractUtooEntryAssets(entryPointFiles: string[]): EntryAssets;

package/dist/utils/extractEntryAssets.js

@@ -20,9 +20,37 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var extractEntryAssets_exports = {};
 __export(extractEntryAssets_exports, {
   extractEntryAssets: () => extractEntryAssets,
+  extractEntryPointFilesFromStats: () => extractEntryPointFilesFromStats,
   extractUtooEntryAssets: () => extractUtooEntryAssets
 });
 module.exports = __toCommonJS(extractEntryAssets_exports);
+function getAssetName(asset) {
+  return typeof asset === "string" ? asset : asset == null ? void 0 : asset.name;
+}
+function extractEntryPointFilesFromStats(stats, entryName = "umi") {
+  var _a;
+  const statsJson = (stats == null ? void 0 : stats.toJson) ? stats.toJson() : stats || {};
+  const entrypoint = (_a = statsJson.entrypoints) == null ? void 0 : _a[entryName];
+  const files = /* @__PURE__ */ new Set();
+  for (const asset of (entrypoint == null ? void 0 : entrypoint.assets) || []) {
+    const name = getAssetName(asset);
+    if (name) {
+      files.add(name);
+    }
+  }
+  for (const chunkId of (entrypoint == null ? void 0 : entrypoint.chunks) || []) {
+    const chunk = (statsJson.chunks || []).find((item) => {
+      var _a2, _b;
+      return (item == null ? void 0 : item.id) === chunkId || ((_b = (_a2 = item == null ? void 0 : item.names) == null ? void 0 : _a2.includes) == null ? void 0 : _b.call(_a2, chunkId));
+    });
+    for (const file of (chunk == null ? void 0 : chunk.files) || []) {
+      if (file) {
+        files.add(file);
+      }
+    }
+  }
+  return Array.from(files);
+}
 function extractEntryAssets(entryPointFiles) {
   const assets = {
     // Will contain all js and mjs files
@@ -82,5 +110,6 @@ function extractUtooEntryAssets(entryPointFiles) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   extractEntryAssets,
+  extractEntryPointFilesFromStats,
   extractUtooEntryAssets
 });

package/package.json

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