@umijs/preset-umi 4.6.50 → 4.6.52

package/dist/features/icons/icons.js

@@ -65,6 +65,8 @@ var icons_default = (api) => {
   });
   const EMPTY_ICONS_FILE = `export const __no_icons = true;`;
   const icons = /* @__PURE__ */ new Set();
+  let noIconsLogged = false;
+  let lastGenerateIconsLog = null;
   api.addPrepareBuildPlugins(() => {
     return [
       iconPlugin.esbuildIconPlugin({
@@ -77,10 +79,18 @@ var icons_default = (api) => {
     const extraIcons = api.config.icons.include || [];
     const allIcons = /* @__PURE__ */ new Set([...icons, ...extraIcons]);
     if (!allIcons.size) {
-      import_utils.logger.info(`[icons] no icons was found`);
+      if (!noIconsLogged) {
+        import_utils.logger.info(`[icons] no icons was found`);
+        noIconsLogged = true;
+      }
       return;
     }
-    import_utils.logger.info(`[icons] generate icons ${Array.from(icons).join(", ")}`);
+    const iconNames = Array.from(allIcons);
+    const generateIconsLog = iconNames.join(", ");
+    if (generateIconsLog !== lastGenerateIconsLog) {
+      import_utils.logger.info(`[icons] generate icons ${generateIconsLog}`);
+      lastGenerateIconsLog = generateIconsLog;
+    }
     const code = [];
     const { generateIconName, generateSvgr } = svgr;
     for (const iconStr of allIcons) {

package/dist/features/ssr/ssr.js

@@ -49,6 +49,9 @@ var ssr_default = (api) => {
   const makoBuiler = (0, import_utils.importLazy)(
     require.resolve("./mako/mako")
   );
+  const utoopackBuilder = (0, import_utils.importLazy)(
+    require.resolve("./utoopack/utoopack")
+  );
   let serverBuildTarget;
   api.describe({
     key: "ssr",
@@ -58,7 +61,7 @@ var ssr_default = (api) => {
           serverBuildPath: zod.string(),
           serverBuildTarget: zod.enum(["express", "worker"]),
           platform: zod.string(),
-          builder: zod.enum(["esbuild", "webpack", "mako"]),
+          builder: zod.enum(["esbuild", "webpack", "mako", "utoopack"]),
           __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: zod.object({
             pureApp: zod.boolean(),
             pureHtml: zod.boolean()
@@ -107,6 +110,13 @@ var ssr_default = (api) => {
         memo.ssr.builder = "webpack";
       }
     }
+    if (memo.ssr.builder === "utoopack") {
+      (0, import_assert.default)(
+        memo.utoopack,
+        `The \`ssr.builder utoopack\` config is now allowed when \`utoopack\` is enable!`
+      );
+      memo.manifest ?? (memo.manifest = {});
+    }
     return memo;
   });
   api.addMiddlewares(() => [
@@ -190,16 +200,22 @@ export type {
       await webpackBuilder.build(api, opts);
     } else if (api.config.mako && builder === "mako") {
       await makoBuiler.build(api);
+    } else if (api.config.utoopack && builder === "utoopack") {
+      await utoopackBuilder.build(api, opts);
     }
   });
-  api.onDevCompileDone(() => {
+  api.onDevCompileDone(({ stats }) => {
     if (api.config.mako) {
       (0, import_utils2.generateBuildManifest)(api);
+    } else if (api.config.utoopack) {
+      (0, import_utils2.generateBuildManifestFromStats)(api, stats);
     }
   });
-  api.onBuildComplete(() => {
+  api.onBuildComplete(({ stats }) => {
     if (api.config.mako) {
       (0, import_utils2.generateBuildManifest)(api);
+    } else if (api.config.utoopack) {
+      (0, import_utils2.generateBuildManifestFromStats)(api, stats);
     }
   });
   api.onBuildComplete(async ({ err }) => {

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

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

package/dist/features/ssr/utils.js

@@ -21,7 +21,8 @@ var utils_exports = {};
 __export(utils_exports, {
   absServerBuildPath: () => absServerBuildPath,
   esbuildUmiPlugin: () => esbuildUmiPlugin,
-  generateBuildManifest: () => generateBuildManifest
+  generateBuildManifest: () => generateBuildManifest,
+  generateBuildManifestFromStats: () => generateBuildManifestFromStats
 });
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@umijs/utils");
@@ -72,9 +73,125 @@ var generateBuildManifest = (api) => {
     flag: "w"
   });
 };
+function addPublicPath(publicPath, file) {
+  if (/^(?:https?:)?\/\//.test(file) || file.startsWith("/")) {
+    return file;
+  }
+  if (publicPath === "auto") {
+    return `/${file}`;
+  }
+  return `${publicPath.replace(/\/?$/, "/")}${file}`;
+}
+var assetExts = /* @__PURE__ */ new Set([
+  ".png",
+  ".jpg",
+  ".jpeg",
+  ".gif",
+  ".webp",
+  ".avif",
+  ".ico",
+  ".woff",
+  ".woff2",
+  ".ttf",
+  ".eot",
+  ".mp3",
+  ".mp4"
+]);
+function getOriginalAssetName(file) {
+  const ext = (0, import_path.extname)(file);
+  return `${(0, import_path.basename)(file, ext).replace(/\.[a-f0-9]{8,}$/i, "")}${ext}`;
+}
+function walkSourceAssets(dir, cwd, ret = []) {
+  if (!(0, import_fs.existsSync)(dir)) return ret;
+  for (const entry of (0, import_fs.readdirSync)(dir, { withFileTypes: true })) {
+    const absPath = (0, import_path.join)(dir, entry.name);
+    if (entry.isDirectory()) {
+      if ([
+        "node_modules",
+        "dist",
+        "server",
+        ".umi",
+        ".umi-production",
+        ".turbopack"
+      ].includes(entry.name)) {
+        continue;
+      }
+      walkSourceAssets(absPath, cwd, ret);
+    } else if (assetExts.has((0, import_path.extname)(entry.name))) {
+      ret.push(absPath);
+    }
+  }
+  return ret;
+}
+function getSourceAssetMap(api, statsAssets, publicPath) {
+  const outputAssets = statsAssets.filter((file) => assetExts.has((0, import_path.extname)(file))).map((file) => {
+    const absPath = (0, import_path.join)(api.paths.absOutputPath, file);
+    if (!(0, import_fs.existsSync)(absPath)) return null;
+    return {
+      file,
+      name: getOriginalAssetName(file),
+      size: (0, import_fs.statSync)(absPath).size
+    };
+  }).filter(Boolean);
+  return walkSourceAssets(api.cwd, api.cwd).reduce((memo, absPath) => {
+    const stat = (0, import_fs.statSync)(absPath);
+    const matched = outputAssets.find((asset) => {
+      return asset.name === (0, import_path.basename)(absPath) && asset.size === stat.size;
+    });
+    if (matched) {
+      memo[(0, import_utils.winPath)((0, import_path.relative)(api.cwd, absPath))] = addPublicPath(
+        publicPath,
+        matched.file
+      );
+    }
+    return memo;
+  }, {});
+}
+var generateBuildManifestFromStats = (api, stats) => {
+  var _a;
+  const publicPath = api.userConfig.publicPath || "/";
+  const buildFilePath = (0, import_path.join)(api.paths.absOutputPath, "build-manifest.json");
+  const statsJson = (stats == null ? void 0 : stats.toJson) ? stats.toJson() : stats || {};
+  const entrypoint = (_a = statsJson.entrypoints) == null ? void 0 : _a.umi;
+  const entryFiles = /* @__PURE__ */ new Set();
+  for (const asset of (entrypoint == null ? void 0 : entrypoint.assets) || []) {
+    entryFiles.add(typeof asset === "string" ? asset : asset.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) || []) {
+      entryFiles.add(file);
+    }
+  }
+  const statsAssets = (statsJson.assets || []).map((asset) => typeof asset === "string" ? asset : asset.name).filter(Boolean);
+  const files = Array.from(/* @__PURE__ */ new Set([...entryFiles, ...statsAssets])).filter(
+    Boolean
+  );
+  const jsFiles = files.filter((file) => /\.m?js$/.test(file));
+  const umiJs = jsFiles.find((file) => /^umi(?:\.[a-f0-9]+)?\.js$/i.test((0, import_path.basename)(file))) || jsFiles[0];
+  const finalJsonObj = {
+    assets: {
+      ...files.reduce((memo, file) => {
+        memo[file] = addPublicPath(publicPath, file);
+        return memo;
+      }, {}),
+      ...getSourceAssetMap(api, statsAssets, publicPath)
+    }
+  };
+  if (umiJs) {
+    finalJsonObj.assets["umi.js"] = addPublicPath(publicPath, umiJs);
+  }
+  (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
+  generateBuildManifest,
+  generateBuildManifestFromStats
 });

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

@@ -0,0 +1,2 @@
+import { IApi } from '../../../types';
+export declare const build: (api: IApi, opts: any) => Promise<void>;

package/dist/features/ssr/utoopack/utoopack.js

@@ -0,0 +1,111 @@
+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/utoopack/utoopack.ts
+var utoopack_exports = {};
+__export(utoopack_exports, {
+  build: () => build
+});
+module.exports = __toCommonJS(utoopack_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");
+function addPublicPath(publicPath, file) {
+  if (/^(?:https?:)?\/\//.test(file) || file.startsWith("/")) {
+    return file;
+  }
+  if (publicPath === "auto") {
+    return `/${file}`;
+  }
+  return `${publicPath.replace(/\/?$/, "/")}${file}`;
+}
+function getServerBuildFile(stats) {
+  var _a;
+  const statsJson = (stats == null ? void 0 : stats.toJson) ? stats.toJson() : stats || {};
+  const entrypoint = (_a = statsJson.entrypoints) == null ? void 0 : _a["umi.server"];
+  const files = /* @__PURE__ */ new Set();
+  for (const asset of (entrypoint == null ? void 0 : entrypoint.assets) || []) {
+    files.add(typeof asset === "string" ? asset : asset.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) || []) {
+      files.add(file);
+    }
+  }
+  for (const asset of statsJson.assets || []) {
+    const name = typeof asset === "string" ? asset : asset.name;
+    if (/^umi\.server(?:\..*)?\.js$/.test((0, import_path.basename)(name))) {
+      files.add(name);
+    }
+  }
+  return Array.from(files).find((file) => /\.m?js$/.test(file));
+}
+var build = async (api, opts) => {
+  import_utils.logger.wait("[SSR] Compiling by utoopack...");
+  const now = (/* @__PURE__ */ new Date()).getTime();
+  const absOutputFile = (0, import_utils2.absServerBuildPath)(api);
+  require("@umijs/bundler-webpack/dist/requireHook");
+  const { buildSSR } = require(process.env.UTOOPACK);
+  const useHash = api.config.hash && api.env === import_types.Env.production;
+  const publicPath = api.userConfig.publicPath || "/";
+  const entry = import_path.default.resolve(api.paths.absTmpPath, "umi.server.ts");
+  const stats = await buildSSR({
+    ...opts,
+    cwd: api.cwd,
+    entry: {
+      "umi.server": entry
+    },
+    config: api.config,
+    serverBuildPath: absOutputFile,
+    useHash
+  });
+  const serverFile = getServerBuildFile(stats) || (0, import_path.basename)(absOutputFile);
+  const jsonFilePath = (0, import_path.join)((0, import_path.dirname)(absOutputFile), "build-manifest.json");
+  const assets = {
+    "umi.server.js": addPublicPath(publicPath, serverFile),
+    "umi.js": addPublicPath(publicPath, serverFile)
+  };
+  if (!(0, import_fs.existsSync)((0, import_path.dirname)(absOutputFile))) {
+    require("fs").mkdirSync((0, import_path.dirname)(absOutputFile), { recursive: true });
+  }
+  (0, import_fs.writeFileSync)(jsonFilePath, JSON.stringify({ assets }, null, 2), {
+    flag: "w"
+  });
+  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/utoopack/utoopack.js

@@ -36,8 +36,24 @@ module.exports = __toCommonJS(utoopack_exports);
 var import_utils = require("@umijs/utils");
 var import_path = require("path");
 var import_extractEntryAssets = require("../../utils/extractEntryAssets");
+function cleanVersionRange(version) {
+  return version == null ? void 0 : version.replace(/^[^\d]*/, "");
+}
 function getPackVersionFromBundler(bundlerEntry) {
-  var _a, _b;
+  var _a;
+  const resolvePaths = [(0, import_path.dirname)(bundlerEntry), bundlerEntry];
+  for (const resolvePath of resolvePaths) {
+    try {
+      const pkgPath = require.resolve("@utoo/pack/package.json", {
+        paths: [resolvePath]
+      });
+      const pkg = require(pkgPath);
+      if (pkg.version) {
+        return pkg.version;
+      }
+    } catch {
+    }
+  }
   const packageJsonCandidates = [
     (0, import_path.join)((0, import_path.dirname)(bundlerEntry), "../package.json"),
     (0, import_path.join)(bundlerEntry, "../package.json"),
@@ -46,7 +62,7 @@ function getPackVersionFromBundler(bundlerEntry) {
   for (const packageJsonPath of packageJsonCandidates) {
     try {
       const pkg = require(packageJsonPath);
-      return (_b = (_a = pkg.dependencies) == null ? void 0 : _a["@utoo/pack"]) == null ? void 0 : _b.replace(/^[^\d]*/, "");
+      return cleanVersionRange((_a = pkg.dependencies) == null ? void 0 : _a["@utoo/pack"]);
     } catch {
     }
   }

package/package.json

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