@umijs/preset-umi 4.1.4 → 4.1.6

package/dist/commands/build.js

@@ -105,10 +105,10 @@ umi build --clean
           umi: (0, import_path.join)(api.paths.absTmpPath, "umi.ts")
         }
       });
-      const isGTEReact17 = ((_a = api.appData.react) == null ? void 0 : _a.version) && import_utils.semver.gte(api.appData.react.version, "17.0.0");
+      const shouldUseAutomaticRuntime = ((_a = api.appData.react) == null ? void 0 : _a.version) && import_utils.semver.gte(api.appData.react.version, "16.14.0");
       const opts = {
         react: {
-          runtime: isGTEReact17 ? "automatic" : "classic"
+          runtime: shouldUseAutomaticRuntime ? "automatic" : "classic"
         },
         config: api.config,
         cwd: api.cwd,

package/dist/commands/dev/dev.js

@@ -309,10 +309,10 @@ PORT=8888 umi dev
           umi: (0, import_path.join)(api.paths.absTmpPath, "umi.ts")
         }
       });
-      const isGTEReact17 = ((_c = api.appData.react) == null ? void 0 : _c.version) && import_utils.semver.gte(api.appData.react.version, "17.0.0");
+      const shouldUseAutomaticRuntime = ((_c = api.appData.react) == null ? void 0 : _c.version) && import_utils.semver.gte(api.appData.react.version, "16.14.0");
       const opts = {
         react: {
-          runtime: isGTEReact17 ? "automatic" : "classic"
+          runtime: shouldUseAutomaticRuntime ? "automatic" : "classic"
         },
         config: api.config,
         pkg: api.pkg,

package/dist/commands/dev/getBabelOpts.js

@@ -34,15 +34,15 @@ __export(getBabelOpts_exports, {
 module.exports = __toCommonJS(getBabelOpts_exports);
 var import_utils = require("@umijs/utils");
 async function getBabelOpts(opts) {
-  const isGTEReact17 = import_utils.semver.gte(opts.api.appData.react.version, "17.0.0");
+  const shouldUseAutomaticRuntime = import_utils.semver.gte(opts.api.appData.react.version, "16.14.0");
   const babelPresetOpts = await opts.api.applyPlugins({
     key: "modifyBabelPresetOpts",
     initialValue: {
       presetEnv: {},
       presetReact: {
-        runtime: isGTEReact17 ? "automatic" : "classic",
+        runtime: shouldUseAutomaticRuntime ? "automatic" : "classic",
         // importSource cannot be set when runtime is classic
-        ...isGTEReact17 ? {} : { importSource: void 0 }
+        ...shouldUseAutomaticRuntime ? {} : { importSource: void 0 }
       },
       presetTypeScript: {},
       pluginTransformRuntime: {},

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/devTool/devTool.js

@@ -41,7 +41,7 @@ var devTool_default = (api) => {
     const loadingHtml = $.html();
     return [
       (req, res, next) => {
-        var _a, _b;
+        var _a, _b, _c;
         const { path } = req;
         const enableVite = api.appData.vite;
         if (path.startsWith("/__umi/api/")) {
@@ -82,11 +82,13 @@ var devTool_default = (api) => {
             return res.sendFile((0, import_path.join)(devToolAppDist, "index.html"));
           }
         }
-        const isDone = api.appData.bundleStatus.done && (enableVite || api.config.mfsu === false || api.appData.mfsuBundleStatus.done);
-        if (!isDone) {
-          res.setHeader("Content-Type", "text/html");
-          res.send(loadingHtml);
-          return;
+        if (((_c = req.headers.accept) == null ? void 0 : _c.includes("text/html")) || req.headers.accept === "*/*") {
+          const isDone = api.appData.bundleStatus.done && (enableVite || api.config.mfsu === false || api.appData.mfsuBundleStatus.done);
+          if (!isDone) {
+            res.setHeader("Content-Type", "text/html");
+            res.send(loadingHtml);
+            return;
+          }
         }
         return next();
       }

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

@@ -155,39 +155,42 @@ var routePreloadOnLoad_default = (api) => {
       );
     }
   });
-  api.addHTMLHeadScripts(() => {
-    if (api.name === "build" && routeChunkFilesMap) {
-      return api.config.tern ? (
-        // map mode
-        [
-          {
-            type: import_utils2.PRELOAD_ROUTE_MAP_SCP_TYPE,
-            content: JSON.stringify(routeChunkFilesMap)
-          }
-        ]
-      ) : (
-        // script mode
-        [
-          {
-            content: (0, import_fs.readFileSync)(
-              (0, import_path.join)(
-                import_constants.TEMPLATES_DIR,
-                "routePreloadOnLoad/preloadRouteFilesScp.js"
-              ),
-              "utf-8"
-            ).replace(
-              '"{{routeChunkFilesMap}}"',
-              JSON.stringify(routeChunkFilesMap)
-            ).replace("{{basename}}", api.config.base).replace(
-              '"{{publicPath}}"',
-              `${// handle runtimePublicPath
-              api.config.runtimePublicPath ? "window.publicPath||" : ""}"${api.config.publicPath}"`
-            )
-          }
-        ]
-      );
-    }
-    return [];
+  api.addHTMLHeadScripts({
+    fn: () => {
+      if (api.name === "build" && routeChunkFilesMap) {
+        return api.config.tern ? (
+          // map mode
+          [
+            {
+              type: import_utils2.PRELOAD_ROUTE_MAP_SCP_TYPE,
+              content: JSON.stringify(routeChunkFilesMap)
+            }
+          ]
+        ) : (
+          // script mode
+          [
+            {
+              content: (0, import_fs.readFileSync)(
+                (0, import_path.join)(
+                  import_constants.TEMPLATES_DIR,
+                  "routePreloadOnLoad/preloadRouteFilesScp.js"
+                ),
+                "utf-8"
+              ).replace(
+                '"{{routeChunkFilesMap}}"',
+                JSON.stringify(routeChunkFilesMap)
+              ).replace("{{basename}}", api.config.base).replace(
+                '"{{publicPath}}"',
+                `${// handle runtimePublicPath
+                api.config.runtimePublicPath ? "window.publicPath||" : ""}"${api.config.publicPath}"`
+              )
+            }
+          ]
+        );
+      }
+      return [];
+    },
+    stage: Infinity
   });
   api.onBuildComplete(async ({ err, stats }) => {
     if (!err && !stats.hasErrors()) {

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.4",
+  "version": "4.1.6",
   "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/babel-preset-umi": "4.1.4",
-    "@umijs/ast": "4.1.4",
-    "@umijs/bundler-utils": "4.1.4",
-    "@umijs/bundler-vite": "4.1.4",
-    "@umijs/bundler-esbuild": "4.1.4",
-    "@umijs/core": "4.1.4",
-    "@umijs/bundler-webpack": "4.1.4",
+    "@umijs/bundler-utils": "4.1.6",
+    "@umijs/bundler-esbuild": "4.1.6",
+    "@umijs/babel-preset-umi": "4.1.6",
+    "@umijs/bundler-vite": "4.1.6",
+    "@umijs/ast": "4.1.6",
+    "@umijs/bundler-webpack": "4.1.6",
+    "@umijs/core": "4.1.6",
+    "@umijs/plugin-run": "4.1.6",
+    "@umijs/server": "4.1.6",
+    "@umijs/renderer-react": "4.1.6",
+    "@umijs/utils": "4.1.6",
+    "@umijs/mfsu": "4.1.6",
     "@umijs/did-you-know": "1.0.3",
-    "@umijs/mfsu": "4.1.4",
-    "@umijs/renderer-react": "4.1.4",
-    "@umijs/server": "4.1.4",
-    "@umijs/plugin-run": "4.1.4",
     "@umijs/ui": "3.0.1",
-    "@umijs/utils": "4.1.4",
-    "@umijs/zod2ts": "4.1.4"
+    "@umijs/zod2ts": "4.1.6"
   },
   "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"