@umijs/preset-umi 4.1.3 → 4.1.5

package/dist/commands/dev/getMarkupArgs.js

@@ -73,7 +73,9 @@ async function getMarkupArgs(opts) {
     async modifyHTML(memo, args) {
       let $ = import_cheerio.default.load(memo, {
         // @ts-ignore
-        decodeEntities: false
+        decodeEntities: false,
+        // reduce memory overhead, to avoid oom in antd site with `exportStatic: {}`
+        _useHtmlParser2: true
       });
       $ = await opts.api.applyPlugins({
         key: "modifyHTML",

package/dist/commands/generators/jest.js

@@ -55,7 +55,7 @@ var jest_default = (api) => {
         jest: jestMajorVersion,
         "@types/jest": jestMajorVersion,
         // we use `jest.config.ts` so jest needs ts and ts-node
-        typescript: "^4",
+        typescript: "^5",
         "ts-node": "^10",
         "cross-env": "^7"
       };

package/dist/commands/generators/precommit.js

@@ -40,12 +40,12 @@ var precommit_default = (api) => {
       const h = new import_utils2.GeneratorHelper(api);
       const cliName = api.appData.umi.cliName;
       h.addDevDeps({
-        husky: "^8",
+        husky: "^9",
         prettier: "^2",
-        typescript: "^4",
+        typescript: "^5",
         "lint-staged": "^13"
       });
-      h.addScript("prepare", "husky install");
+      h.addScript("prepare", "husky");
       if (!(0, import_fs.existsSync)((0, import_path.join)(api.cwd, ".lintstagedrc")) && !api.pkg["lint-staged"]) {
         (0, import_fs.writeFileSync)(
           (0, import_path.join)(api.cwd, ".lintstagedrc"),
@@ -79,9 +79,6 @@ var precommit_default = (api) => {
         (0, import_fs.writeFileSync)(
           (0, import_path.join)(api.cwd, ".husky/commit-msg"),
           `
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-  
 npx --no-install ${cliName} verify-commit $1
 `.trimStart()
         );
@@ -94,9 +91,6 @@ npx --no-install ${cliName} verify-commit $1
         (0, import_fs.writeFileSync)(
           (0, import_path.join)(api.cwd, ".husky/pre-commit"),
           `
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-  
 npx --no-install lint-staged --quiet
 `.trimStart()
         );

package/dist/commands/generators/tsconfig.js

@@ -51,7 +51,7 @@ var tsconfig_default = (api) => {
       }
       const reactMajorVersion = parseInt(reactVersion.split(".")[0], 10) || 18;
       h.addDevDeps({
-        typescript: "^4",
+        typescript: "^5",
         "@types/react": `^${reactMajorVersion}`,
         "@types/react-dom": `^${reactMajorVersion}`
       });

package/dist/features/esbuildHelperChecker/esbuildHelperChecker.js

@@ -56,11 +56,15 @@ async function checkDir(opts) {
   }
   const conflicts = Object.keys(varMap).filter((v) => varMap[v].length > 1).map((v) => `${v} (${varMap[v].join(", ")})`);
   if (conflicts.length) {
-    throw new Error(
-      `Found conflicts in esbuild helpers: ${conflicts.join(
-        ", "
-      )}, please set esbuildMinifyIIFE: true in your config file.`
+    import_utils.logger.fatal(
+      import_utils.chalk.yellow(
+        `Found conflicts in esbuild helpers: ${conflicts.join(", ")}`
+      )
     );
+    import_utils.logger.info(
+      `please set ${import_utils.chalk.blue("esbuildMinifyIIFE: true")} in your config file`
+    );
+    throw new Error(`Found conflicts in esbuild helpers.`);
   }
   import_utils.logger.info(`[esbuildHelperChecker] No conflicts found.`);
 }
@@ -98,6 +102,8 @@ var esbuildHelperChecker_default = (api) => {
     }
   });
   api.onBuildComplete(async ({ err }) => {
+    if (api.config.vite)
+      return;
     if (process.env.OKAM)
       return;
     if (err)

package/dist/features/exportStatic/exportStatic.js

@@ -124,13 +124,16 @@ var exportStatic_default = (api) => {
     const { publicPath } = api.config;
     const htmlData = api.appData.exportHtmlData;
     const htmlFiles = [];
+    const { markupArgs: defaultMarkupArgs } = opts;
+    let asyncMarkupArgs;
     for (const { file, route, prerender } of htmlData) {
-      let { markupArgs } = opts;
+      let markupArgs = defaultMarkupArgs;
       if (api.config.ssr && prerender) {
-        markupArgs.scripts.forEach((script) => {
-          if (script.src) {
-            script.async = true;
-          }
+        markupArgs = asyncMarkupArgs ?? (asyncMarkupArgs = {
+          ...markupArgs,
+          scripts: markupArgs.scripts.map(
+            (script) => script.src ? { ...script, async: true } : script
+          )
         });
       }
       if (publicPath.startsWith(".")) {

package/dist/features/routePreloadOnLoad/routePreloadOnLoad.js

@@ -143,10 +143,20 @@ async function getRoutePathFilesMap(routes, fileChunksMap, opts) {
 var routePreloadOnLoad_default = (api) => {
   let routeChunkFilesMap;
   api.describe({
-    enableBy: () => Boolean(api.pkg.name)
+    enableBy: () => {
+      var _a;
+      return (
+        // enable when package name available
+        // because preload script use package name as attribute prefix value
+        Boolean(api.pkg.name) && // vite mode is not supported currently
+        !api.config.vite && // mpa mode is unnecessary
+        !api.config.mpa && // only esm router needs this feature
+        ((_a = api.config.routeLoader) == null ? void 0 : _a.moduleType) === "esm"
+      );
+    }
   });
   api.addHTMLHeadScripts(() => {
-    if (api.name === "build") {
+    if (api.name === "build" && routeChunkFilesMap) {
       return api.config.tern ? (
         // map mode
         [
@@ -200,15 +210,17 @@ var routePreloadOnLoad_default = (api) => {
         routeFileChunksMap,
         { resolver, absPagesPath: api.paths.absPagesPath }
       );
-      routeChunkFilesMap = {
-        p: api.pkg.name,
-        b: api.appData.bundler,
-        f: Object.entries(routeChunkFiles).sort((a, b) => a[1].index - b[1].index).map(([k, { id }]) => [k, id]),
-        // sort similar to react-router@6
-        r: (0, import_utils.lodash)(routeFilesMap).toPairs().sort(
-          ([a], [b]) => computeRouteScore(a) - computeRouteScore(b)
-        ).fromPairs().value()
-      };
+      if (!import_utils.lodash.isEmpty(routeChunkFiles) && !import_utils.lodash.isEmpty(routeFilesMap)) {
+        routeChunkFilesMap = {
+          p: api.pkg.name,
+          b: api.appData.bundler,
+          f: Object.entries(routeChunkFiles).sort((a, b) => a[1].index - b[1].index).map(([k, { id }]) => [k, id]),
+          // sort similar to react-router@6
+          r: (0, import_utils.lodash)(routeFilesMap).toPairs().sort(
+            ([a], [b]) => computeRouteScore(a) - computeRouteScore(b)
+          ).fromPairs().value()
+        };
+      }
     }
   });
 };

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

@@ -51,9 +51,9 @@ var build2 = async (api, opts) => {
   ]);
   delete bundlerOpts.onBuildComplete;
   bundlerOpts.watch = api.env === "development";
-  bundlerOpts.chainWebpack = async (memo) => {
+  bundlerOpts.chainWebpack = async (memo, opts2) => {
     const absOutputFile = (0, import_utils2.absServerBuildPath)(api);
-    await oChainWebpack(memo);
+    await oChainWebpack(memo, { ...opts2, ssr: true });
     memo.entryPoints.clear();
     memo.entry("umi").add((0, import_path.resolve)(api.paths.absTmpPath, "umi.server.ts"));
     memo.target("node");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.1.3",
+  "version": "4.1.5",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -39,21 +39,21 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/ast": "4.1.3",
-    "@umijs/babel-preset-umi": "4.1.3",
-    "@umijs/bundler-esbuild": "4.1.3",
-    "@umijs/bundler-utils": "4.1.3",
-    "@umijs/bundler-vite": "4.1.3",
-    "@umijs/bundler-webpack": "4.1.3",
-    "@umijs/core": "4.1.3",
-    "@umijs/mfsu": "4.1.3",
-    "@umijs/plugin-run": "4.1.3",
-    "@umijs/did-you-know": "1.0.3",
-    "@umijs/server": "4.1.3",
-    "@umijs/renderer-react": "4.1.3",
+    "@umijs/ast": "4.1.5",
+    "@umijs/bundler-utils": "4.1.5",
+    "@umijs/bundler-vite": "4.1.5",
+    "@umijs/core": "4.1.5",
+    "@umijs/bundler-esbuild": "4.1.5",
+    "@umijs/mfsu": "4.1.5",
+    "@umijs/plugin-run": "4.1.5",
+    "@umijs/server": "4.1.5",
+    "@umijs/babel-preset-umi": "4.1.5",
+    "@umijs/bundler-webpack": "4.1.5",
+    "@umijs/zod2ts": "4.1.5",
+    "@umijs/renderer-react": "4.1.5",
+    "@umijs/utils": "4.1.5",
     "@umijs/ui": "3.0.1",
-    "@umijs/utils": "4.1.3",
-    "@umijs/zod2ts": "4.1.3"
+    "@umijs/did-you-know": "1.0.3"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",
@@ -67,7 +67,7 @@
     "multer": "1.4.4",
     "os-locale": "^6.0.2",
     "sirv": "2.0.2",
-    "vite": "4.3.1"
+    "vite": "4.5.2"
   },
   "publishConfig": {
     "access": "public"