@umijs/preset-umi 4.0.69 → 4.0.70

package/dist/commands/dev/depBuildWorker/dev-config.js

@@ -73,7 +73,7 @@ var dev_config_default = (api) => {
         }
       });
       const opts = {
-        config: api.config,
+        config: { ...api.config, forkTSChecker: false },
         pkg: api.pkg,
         cwd: api.cwd,
         rootDir: process.cwd(),

package/dist/commands/lint.js

@@ -37,6 +37,7 @@ var lint_default = (api) => {
   api.registerCommand({
     name: "lint",
     description: "lint source code using eslint and stylelint",
+    configResolveMode: "loose",
     details: `
 umi lint
 

package/dist/features/apiRoute/dev-server/esbuild.js

@@ -32,6 +32,7 @@ __export(esbuild_exports, {
   default: () => esbuild_default
 });
 module.exports = __toCommonJS(esbuild_exports);
+var import_watchRebuild = require("@umijs/bundler-esbuild/dist/plugins/watchRebuild");
 var import_esbuild = __toESM(require("@umijs/bundler-utils/compiled/esbuild"));
 var import_utils = require("@umijs/utils");
 var import_path = require("path");
@@ -41,7 +42,7 @@ async function esbuild_default(api, apiRoutes) {
   const apiRoutePaths = apiRoutes.map(
     (r) => (0, import_path.join)(api.paths.absTmpPath, "api", r.file)
   );
-  await import_esbuild.default.build({
+  const ctx = await import_esbuild.default.context({
     format: "cjs",
     platform: "node",
     bundle: true,
@@ -50,18 +51,21 @@ async function esbuild_default(api, apiRoutes) {
       (0, import_path.resolve)(api.paths.absTmpPath, "api/_middlewares.ts")
     ],
     outdir: (0, import_path.resolve)(api.paths.cwd, import_constants.OUTPUT_PATH),
-    plugins: [(0, import_utils2.esbuildIgnorePathPrefixPlugin)()],
-    watch: {
-      onRebuild(error) {
-        if (error)
-          import_utils.logger.error("Compile api routes failed: ", error);
-        Object.keys(require.cache).forEach((modulePath) => {
-          if (modulePath.startsWith((0, import_path.join)(api.paths.cwd, import_constants.OUTPUT_PATH)))
-            delete require.cache[modulePath];
-        });
-      }
-    }
+    plugins: [
+      (0, import_utils2.esbuildIgnorePathPrefixPlugin)(),
+      (0, import_watchRebuild.esbuildWatchRebuildPlugin)({
+        onRebuild(error) {
+          if (error)
+            import_utils.logger.error("Compile api routes failed: ", error);
+          Object.keys(require.cache).forEach((modulePath) => {
+            if (modulePath.startsWith((0, import_path.join)(api.paths.cwd, import_constants.OUTPUT_PATH)))
+              delete require.cache[modulePath];
+          });
+        }
+      })
+    ]
   });
+  await ctx.watch();
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/features/hmrGuardian/babelPlugin.d.ts

@@ -0,0 +1,7 @@
+export declare function defaultRenameVisitor(): {
+    visitor: {
+        ExportDefaultDeclaration: {
+            enter(path: any, state: any): void;
+        };
+    };
+};

package/dist/features/hmrGuardian/babelPlugin.js

@@ -0,0 +1,83 @@
+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/hmrGuardian/babelPlugin.ts
+var babelPlugin_exports = {};
+__export(babelPlugin_exports, {
+  defaultRenameVisitor: () => defaultRenameVisitor
+});
+module.exports = __toCommonJS(babelPlugin_exports);
+var t = __toESM(require("@umijs/bundler-utils/compiled/babel/types"));
+var import_utils = require("@umijs/utils");
+var import_path = require("path");
+function defaultRenameVisitor() {
+  return {
+    visitor: {
+      // @ts-ignore
+      ExportDefaultDeclaration: {
+        enter(path, state) {
+          const def = path.node.declaration;
+          const { cwd, filename } = state.file.opts;
+          const relativePath = (0, import_path.relative)(cwd, filename);
+          if (/^\.(tsx|jsx)$/.test((0, import_path.extname)(relativePath)) && // hidden relativePath
+          !/(^|\/)\.[^\/.]/g.test(relativePath) && !relativePath.includes("node_modules")) {
+            let componentName = path2Component(relativePath);
+            if (!componentName) {
+              return;
+            }
+            const identifiers = Object.keys(path.scope.bindings || {});
+            let idx = 0;
+            while (identifiers.includes(componentName)) {
+              componentName = `${componentName}${idx}`;
+              idx += 1;
+            }
+            const named = t.identifier(componentName);
+            if (t.isArrowFunctionExpression(def)) {
+              const varDec = t.variableDeclaration("const", [
+                t.variableDeclarator(named, def)
+              ]);
+              const [varDeclPath] = path.insertBefore(varDec);
+              path.scope.registerDeclaration(varDeclPath);
+              path.replaceWith(t.exportDefaultDeclaration(named));
+            } else if (t.isFunctionDeclaration(def) && !def.id) {
+              def.id = named;
+            }
+          }
+        }
+      }
+    }
+  };
+}
+function path2Component(filePath) {
+  const { ext } = (0, import_path.parse)(filePath);
+  return filePath.replace(ext, "").split(import_path.sep).map((item) => import_utils.lodash.upperFirst(item.replace(/\W/g, ""))).join("");
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  defaultRenameVisitor
+});

package/dist/features/hmrGuardian/hmrGuardian.d.ts

@@ -0,0 +1,2 @@
+import { IApi } from '../../types';
+export default function (api: IApi): void;

package/dist/features/hmrGuardian/hmrGuardian.js

@@ -0,0 +1,58 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/features/hmrGuardian/hmrGuardian.ts
+var hmrGuardian_exports = {};
+__export(hmrGuardian_exports, {
+  default: () => hmrGuardian_default
+});
+module.exports = __toCommonJS(hmrGuardian_exports);
+var import_babelPlugin = require("./babelPlugin");
+function hmrGuardian_default(api) {
+  api.describe({
+    key: "hmrGuardian",
+    config: {
+      schema: ({ zod }) => zod.boolean()
+    },
+    enableBy: ({ env }) => {
+      if (env === "production" || process.env.HMR === "none" || process.env.IS_UMI_BUILD_WORKER) {
+        return false;
+      }
+      return api.config.hmrGuardian;
+    }
+  });
+  api.onCheckConfig(({ userConfig }) => {
+    var _a;
+    (_a = userConfig.headScripts) == null ? void 0 : _a.some((script) => {
+      const url = typeof script === "string" ? script : script.src;
+      if (url == null ? void 0 : url.includes("react.production")) {
+        api.logger.warn(
+          "Using react/react-dom production scripts, HMR will not work."
+        );
+        api.logger.warn(
+          "Use ternary expression to use development scripts in dev environment"
+        );
+      }
+    });
+  });
+  api.addBeforeBabelPlugins(() => {
+    return [(0, import_babelPlugin.defaultRenameVisitor)()];
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/features/prepare/build.d.ts

@@ -1,4 +1,4 @@
-import esbuild from '@umijs/bundler-utils/compiled/esbuild';
+import esbuild, { BuildContext, BuildResult } from '@umijs/bundler-utils/compiled/esbuild';
 export declare function build(opts: {
     entryPoints: string[];
     watch?: {
@@ -12,6 +12,4 @@ export declare function build(opts: {
     };
     plugins?: esbuild.Plugin[];
     write?: boolean;
-}): Promise<esbuild.BuildResult & {
-    metafile: esbuild.Metafile;
-}>;
+}): Promise<[BuildResult, BuildContext | undefined]>;

package/dist/features/prepare/build.js

@@ -32,6 +32,7 @@ __export(build_exports, {
   build: () => build
 });
 module.exports = __toCommonJS(build_exports);
+var import_watchRebuild = require("@umijs/bundler-esbuild/dist/plugins/watchRebuild");
 var import_esbuild = __toESM(require("@umijs/bundler-utils/compiled/esbuild"));
 var import_utils = require("@umijs/utils");
 var import_path = __toESM(require("path"));
@@ -41,7 +42,7 @@ async function build(opts) {
   var _a;
   const outdir = import_path.default.join(import_path.default.dirname(opts.entryPoints[0]), "out");
   const alias = ((_a = opts.config) == null ? void 0 : _a.alias) || {};
-  return await import_esbuild.default.build({
+  const buildOptions = {
     // 需要指定 absWorkingDir 兼容 APP_ROOT 的情况
     absWorkingDir: opts.config.cwd,
     format: "esm",
@@ -55,17 +56,6 @@ async function build(opts) {
       ".ts": "ts",
       ".tsx": "tsx"
     },
-    watch: !!opts.watch && {
-      onRebuild(err, result) {
-        if (err) {
-          import_utils.logger.error(`[icons] build failed: ${err}`);
-        } else {
-          if (opts.watch) {
-            opts.watch.onRebuildSuccess({ result });
-          }
-        }
-      }
-    },
     // do I need this?
     // incremental: true,
     bundle: true,
@@ -83,9 +73,29 @@ async function build(opts) {
       // if we resolve externals first, we will get { external: true }
       (0, import_esbuildExternalPlugin.esbuildExternalPlugin)({ alias }),
       (0, import_esbuildAliasPlugin.esbuildAliasPlugin)({ alias }),
+      (0, import_watchRebuild.esbuildWatchRebuildPlugin)({
+        onRebuild(err, result) {
+          if (err) {
+            import_utils.logger.error(`[icons] build failed: ${err}`);
+          } else {
+            if (opts.watch) {
+              opts.watch.onRebuildSuccess({ result });
+            }
+          }
+        }
+      }),
       ...opts.plugins || []
     ]
-  });
+  };
+  if (opts.watch) {
+    const ctx = await import_esbuild.default.context(buildOptions);
+    const result = await ctx.rebuild();
+    await ctx.watch();
+    return [result, ctx];
+  } else {
+    const result = await import_esbuild.default.build(buildOptions);
+    return [result, void 0];
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/features/prepare/prepare.js

@@ -102,7 +102,7 @@ var prepare_default = (api) => {
           entryPoints.push(import_path.default.join(api.paths.absTmpPath, tmpFilePath));
         });
       }
-      const buildResult = await build({
+      const [buildResult, ctx] = await build({
         entryPoints,
         watch: watch && {
           async onRebuildSuccess({ result }) {
@@ -126,8 +126,7 @@ var prepare_default = (api) => {
       });
       if (watch) {
         (0, import_watch.addUnWatch)(() => {
-          var _a2;
-          (_a2 = buildResult.stop) == null ? void 0 : _a2.call(buildResult);
+          ctx == null ? void 0 : ctx.dispose();
         });
       }
       const fileImports = await parseProjectImportSpecifiers(buildResult);

package/dist/features/ssr/builder/builder.js

@@ -33,6 +33,7 @@ __export(builder_exports, {
   loader: () => loader
 });
 module.exports = __toCommonJS(builder_exports);
+var import_watchRebuild = require("@umijs/bundler-esbuild/dist/plugins/watchRebuild");
 var import_esbuild = __toESM(require("@umijs/bundler-utils/compiled/esbuild"));
 var import_utils = require("@umijs/utils");
 var import_path = require("path");
@@ -55,7 +56,7 @@ async function build(opts) {
     }
   }
   const alias = import_utils.aliasUtils.parseCircleAlias({ alias: api.config.alias });
-  await import_esbuild.default.build({
+  const buildOptions = {
     alias,
     format: "cjs",
     platform: "node",
@@ -63,15 +64,6 @@ async function build(opts) {
     bundle: true,
     logLevel: "silent",
     inject: [(0, import_path.resolve)(api.paths.absTmpPath, "ssr/react-shim.js")],
-    watch: watch ? {
-      onRebuild(err) {
-        import_utils.logger.event("[SSR] Rebuilt");
-        delete require.cache[(0, import_utils2.absServerBuildPath)(api)];
-        if (err) {
-          import_utils.logger.error(err);
-        }
-      }
-    } : false,
     loader,
     entryPoints: [(0, import_path.resolve)(api.paths.absTmpPath, "umi.server.ts")],
     plugins: [
@@ -79,11 +71,27 @@ async function build(opts) {
       (0, import_less_loader.lessLoader)({ cwd: api.cwd }),
       (0, import_css_loader.cssLoader)({ cwd: api.cwd }),
       (0, import_svg_loader.default)({ cwd: api.cwd }),
-      (0, import_assets_loader.assetsLoader)({ cwd: api.cwd })
+      (0, import_assets_loader.assetsLoader)({ cwd: api.cwd }),
+      (0, import_watchRebuild.esbuildWatchRebuildPlugin)({
+        onRebuild(err) {
+          import_utils.logger.event("[SSR] Rebuilt");
+          delete require.cache[(0, import_utils2.absServerBuildPath)(api)];
+          if (err) {
+            import_utils.logger.error(err);
+          }
+        }
+      })
     ],
     outfile: (0, import_utils2.absServerBuildPath)(api),
     external: getExternal()
-  });
+  };
+  if (watch) {
+    const ctx = await import_esbuild.default.context(buildOptions);
+    await ctx.rebuild();
+    await ctx.watch();
+  } else {
+    await import_esbuild.default.build(buildOptions);
+  }
   const diff = new Date().getTime() - now;
   import_utils.logger.info(`[SSR] Compiled in ${diff}ms`);
 }

package/dist/features/ssr/builder/less-loader.js

@@ -48,7 +48,7 @@ var lessLoader = (opts) => {
         const filePath = (0, import_path.join)(args.resolveDir, args.path);
         return {
           path: filePath,
-          watchFiles: !!build.initialOptions.watch ? [filePath, ...getLessImports(filePath)] : void 0
+          watchFiles: [filePath, ...getLessImports(filePath)]
         };
       });
       build.onLoad({ filter: /\.less$/, namespace: "file" }, async (args) => {

package/dist/features/tmpFiles/tmpFiles.js

@@ -370,11 +370,7 @@ export default function EmptyRoute() {
         /"routeProps":"(routeProps\[.*?)"/g,
         "...$1"
       );
-      if (process.env.NODE_ENV === "test") {
-        headerImports.push(`import routeProps from './routeProps';`);
-      } else {
-        headerImports.push(`import routeProps from './routeProps.js';`);
-      }
+      headerImports.push(`import routeProps from './routeProps';`);
       headerImports.push(`
 if (process.env.NODE_ENV === 'development') {
   Object.entries(routeProps).forEach(([key, value]) => {

package/dist/index.js

@@ -83,6 +83,7 @@ var src_default = () => {
       require.resolve("./features/webpack/webpack"),
       require.resolve("./features/swc/swc"),
       require.resolve("./features/ui/ui"),
+      require.resolve("./features/hmrGuardian/hmrGuardian"),
       // commands
       require.resolve("./commands/build"),
       require.resolve("./commands/config/config"),

package/dist/utils/routeExportExtractor.d.ts

@@ -1,4 +1,4 @@
-import type { IApi } from 'umi';
+import type { IApi } from '../types';
 interface IRouteExportExtractor {
     api: IApi;
     entryFile: string;

package/dist/utils/routeExportExtractor.js

@@ -43,13 +43,13 @@ function setupRouteExportExtractor(opts) {
       entryFile
     });
   });
-  api.onBeforeCompiler(
-    async () => await setupExportExtractBuilder({
+  api.onBeforeCompiler(async () => {
+    await setupExportExtractBuilder({
       api,
       entryFile,
       outFile
-    })
-  );
+    });
+  });
 }
 function generateRouteExportTmpFile(opts) {
   const { api, entryFile, propertyName } = opts;
@@ -80,12 +80,11 @@ ${defines.join("\n")}
 }
 async function setupExportExtractBuilder(opts) {
   const { api, entryFile, outFile } = opts;
-  await import_esbuild.default.build({
+  const buildOptions = {
     format: "esm",
     platform: "browser",
     target: "esnext",
     loader,
-    watch: api.env === "development" && {},
     bundle: true,
     logLevel: "error",
     entryPoints: [(0, import_path.join)(api.paths.absTmpPath, entryFile)],
@@ -111,7 +110,14 @@ async function setupExportExtractBuilder(opts) {
         }
       }
     ]
-  });
+  };
+  if (api.env === "development") {
+    const ctx = await import_esbuild.default.context(buildOptions);
+    await ctx.rebuild();
+    await ctx.watch();
+  } else {
+    await import_esbuild.default.build(buildOptions);
+  }
 }
 var loader = {
   ".aac": "file",

package/package.json

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