@umijs/preset-umi 4.0.35 → 4.0.37

package/dist/commands/dev/dev.js

@@ -264,7 +264,7 @@ PORT=8888 umi dev
         beforeMiddlewares: [].concat([
           ...beforeMiddlewares
         ]),
-        afterMiddlewares: enableVite ? [] : middlewares.concat([
+        afterMiddlewares: enableVite ? [middlewares.concat(import_faviconMiddleware.faviconMiddleware)] : middlewares.concat([
           ...api.config.mpa ? [] : [(0, import_createRouteMiddleware.createRouteMiddleware)({ api })],
           import_faviconMiddleware.faviconMiddleware
         ]),
@@ -327,18 +327,24 @@ PORT=8888 umi dev
     memo.ip = import_utils.address.ip();
     return memo;
   });
+  const restartServer = () => {
+    var _a;
+    import_utils.logger.info(`Restart dev server with port ${api.appData.port}...`);
+    (0, import_watch.unwatch)();
+    (_a = process.send) == null ? void 0 : _a.call(process, {
+      type: "RESTART",
+      payload: {
+        port: api.appData.port
+      }
+    });
+  };
+  process.on("UMI_RESTART_SERVER", () => {
+    restartServer();
+  });
   api.registerMethod({
     name: "restartServer",
     fn() {
-      var _a;
-      import_utils.logger.info(`Restart dev server with port ${api.appData.port}...`);
-      (0, import_watch.unwatch)();
-      (_a = process.send) == null ? void 0 : _a.call(process, {
-        type: "RESTART",
-        payload: {
-          port: api.appData.port
-        }
-      });
+      restartServer();
     }
   });
   api.modifyViteConfig((viteConfig) => {

package/dist/commands/generators/component.d.ts

@@ -1,5 +1,5 @@
-import { generateFile } from '@umijs/utils';
 import { IApi } from '../../types';
+import { type IArgsComponent } from './utils';
 declare const _default: (api: IApi) => void;
 export default _default;
 export declare class ComponentGenerator {
@@ -7,7 +7,7 @@ export declare class ComponentGenerator {
         componentName: string;
         srcPath: string;
         appRoot: string;
-        generateFile: typeof generateFile;
+        args: IArgsComponent;
     };
     private readonly name;
     private readonly dir;
@@ -15,7 +15,7 @@ export declare class ComponentGenerator {
         componentName: string;
         srcPath: string;
         appRoot: string;
-        generateFile: typeof generateFile;
+        args: IArgsComponent;
     });
     run(): Promise<void>;
 }

package/dist/commands/generators/component.js

@@ -38,9 +38,13 @@ var component_default = (api) => {
     description: "Generate component boilerplate code",
     type: import_core.GeneratorType.generate,
     fn: async (options) => {
+      const { args } = options;
+      if (args.eject) {
+        await (0, import_utils2.tryEject)(import_utils2.ETempDir.Component, api.paths.cwd);
+        return;
+      }
       const h = new import_utils2.GeneratorHelper(api);
-      options.generateFile;
-      let componentNames = options.args._.slice(1);
+      let componentNames = args._.slice(1);
       if (componentNames.length === 0) {
         let name = "";
         name = await h.ensureVariableWithQuestion(name, {
@@ -56,8 +60,8 @@ var component_default = (api) => {
         await new ComponentGenerator({
           srcPath: api.paths.absSrcPath,
           appRoot: api.paths.cwd,
-          generateFile: import_utils.generateFile,
-          componentName: cn
+          componentName: cn,
+          args
         }).run();
       }
     }
@@ -71,27 +75,41 @@ var ComponentGenerator = class {
     this.dir = dir;
   }
   async run() {
-    const { generateFile: generateFile2, appRoot } = this.opts;
+    const { appRoot, args } = this.opts;
     const capitalizeName = import_utils.lodash.upperFirst(this.name);
     const base = (0, import_path.join)(this.opts.srcPath, "components", this.dir, capitalizeName);
+    const { _, eject: _eject, fallback, ...restArgs } = args;
     const indexFile = (0, import_path.join)(base, "index.ts");
     const compFile = (0, import_path.join)(base, `${capitalizeName}.tsx`);
-    await generateFile2({
-      target: indexFile,
-      path: INDEX_TPL,
-      baseDir: appRoot,
-      data: { compName: capitalizeName }
-    });
-    await generateFile2({
-      target: compFile,
-      path: COMP_TPL,
+    await (0, import_utils2.processGenerateFiles)({
+      filesMap: [
+        {
+          from: (0, import_path.join)(appRoot, USER_TEMPLATE_COMP_DIR, "index"),
+          fromFallback: INDEX_TPL,
+          to: indexFile,
+          exts: [".ts.tpl", ".ts", "tsx.tpl", "tsx"]
+        },
+        {
+          from: (0, import_path.join)(appRoot, USER_TEMPLATE_COMP_DIR, "component"),
+          fromFallback: COMP_TPL,
+          to: compFile,
+          exts: [".tsx.tpl", ".tsx"]
+        }
+      ],
       baseDir: appRoot,
-      data: { compName: capitalizeName }
+      presetArgs: {
+        fallback
+      },
+      templateVars: {
+        compName: capitalizeName,
+        ...restArgs
+      }
     });
   }
 };
 var INDEX_TPL = (0, import_path.join)(import_constants.TEMPLATES_DIR, "generate/component/index.ts.tpl");
 var COMP_TPL = (0, import_path.join)(import_constants.TEMPLATES_DIR, "generate/component/component.tsx.tpl");
+var USER_TEMPLATE_COMP_DIR = "templates/component";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ComponentGenerator

package/dist/commands/generators/jest.js

@@ -63,7 +63,7 @@ var jest_default = (api) => {
         "@types/testing-library__jest-dom": "^5.14.5"
       } : basicDeps;
       h.addDevDeps(packageToInstall);
-      h.addScript("test", "jest");
+      h.addScript("test", "TS_NODE_TRANSPILE_ONLY=yes jest --passWithNoTests");
       const setupImports = res.willUseTLR ? [
         `import '@testing-library/jest-dom';`,
         `import '${api.appData.umi.importSource}/test-setup'`
@@ -92,20 +92,26 @@ var jest_default = (api) => {
 import { Config, configUmiAlias, createConfig } from '${importSource}/test';
 
 export default async () => {
-  return (await configUmiAlias({
-    ...createConfig({
-      target: 'browser',
-      jsTransformer: 'esbuild',
-      // config opts for esbuild , it will pass to esbuild directly
-      jsTransformerOpts: { jsx: 'automatic' },
-    }),
-    ${res.willUseTLR ? `setupFilesAfterEnv: ['<rootDir>/jest-setup.ts'],` : ""}
-    collectCoverageFrom: [
-${collectCoverageFrom.map((v) => `      '${v}'`).join(",\n")}
-    ],
-    // if you require some es-module npm package, please uncomment below line and insert your package name
-    // transformIgnorePatterns: ['node_modules/(?!.*(lodash-es|your-es-pkg-name)/)']
-  })) as Config.InitialOptions;
+  try{
+    return (await configUmiAlias({
+      ...createConfig({
+        target: 'browser',
+        jsTransformer: 'esbuild',
+        // config opts for esbuild , it will pass to esbuild directly
+        jsTransformerOpts: { jsx: 'automatic' },
+      }),
+    
+      ${res.willUseTLR ? `setupFilesAfterEnv: ['<rootDir>/jest-setup.ts'],` : ""}
+      collectCoverageFrom: [
+  ${collectCoverageFrom.map((v) => `      '${v}'`).join(",\n")}
+      ],
+      // if you require some es-module npm package, please uncomment below line and insert your package name
+      // transformIgnorePatterns: ['node_modules/(?!.*(lodash-es|your-es-pkg-name)/)']
+    })) as Config.InitialOptions;
+  }catch(e){
+    console.log(e);
+    throw e;
+  }
 };
 `.trimLeft());
       import_utils.logger.info("Write jest.config.ts");

package/dist/commands/generators/page.d.ts

@@ -1,11 +1,11 @@
-import { generateFile, prompts } from '@umijs/utils';
+import { prompts } from '@umijs/utils';
 import { IApi } from '../../types';
+import { type IArgsPage } from './utils';
 declare const _default: (api: IApi) => void;
 export default _default;
 export declare class PageGenerator {
     readonly options: {
-        args: any;
-        generateFile: typeof generateFile;
+        args: IArgsPage;
         absPagesPath: string;
         appCwd: string;
     };
@@ -16,8 +16,7 @@ export declare class PageGenerator {
     private prompts;
     private paths;
     constructor(options: {
-        args: any;
-        generateFile: typeof generateFile;
+        args: IArgsPage;
         absPagesPath: string;
         appCwd: string;
     });

package/dist/commands/generators/page.js

@@ -38,18 +38,22 @@ var page_default = (api) => {
     description: "Create a umi page by page name",
     type: import_core.GeneratorType.generate,
     fn: async (options) => {
+      const { args } = options;
+      if (args.eject) {
+        await (0, import_utils2.tryEject)(import_utils2.ETempDir.Page, api.paths.cwd);
+        return;
+      }
       return new PageGenerator({
-        generateFile: options.generateFile,
-        args: options.args,
+        args,
         absPagesPath: api.paths.absPagesPath,
         appCwd: api.paths.cwd
       }).run();
     }
   });
 };
-var INDEX_TPL_PATH = (0, import_path.join)(import_constants.TEMPLATES_DIR, "generate/page/index.tsx.tpl");
-var LEES_TPL_PATH = (0, import_path.join)(import_constants.TEMPLATES_DIR, "generate/page/index.less.tpl");
+var PAGE_TEMPLATE_DIR = (0, import_path.join)(import_constants.TEMPLATES_DIR, "generate/page/");
 var DEFAULT_PAGE_NAME = "unTitledPage";
+var USER_TEMPLATE_PAGE_DIR = "templates/page";
 var PageGenerator = class {
   constructor(options) {
     this.options = options;
@@ -59,7 +63,7 @@ var PageGenerator = class {
     this.needEnsureDirMode = false;
     this.prompts = import_utils2.promptsExitWhenCancel;
     this.paths = [];
-    this.isDirMode = options.args.dir;
+    this.isDirMode = !!options.args.dir;
     const [_, ...inputPaths] = options.args._;
     if (inputPaths.length > 0) {
       this.paths = inputPaths;
@@ -144,36 +148,56 @@ var PageGenerator = class {
     return `${base}.{tsx,less}`;
   }
   async fileModeRun() {
-    const { generateFile: generateFile2, absPagesPath } = this.options;
-    const data = {
-      color: (0, import_utils.randomColor)(),
-      name: this.name,
-      cssExt: ".less"
-    };
-    await generateFile2({
-      path: INDEX_TPL_PATH,
-      target: (0, import_path.join)(absPagesPath, this.dir, `${this.name}.tsx`),
-      baseDir: this.options.appCwd,
-      data
-    });
-    await generateFile2({
-      path: LEES_TPL_PATH,
-      target: (0, import_path.join)(absPagesPath, this.dir, `${this.name}.less`),
+    const { absPagesPath, args, appCwd } = this.options;
+    const { _, dir: _dir, eject: _eject, fallback, ...restVars } = args;
+    await (0, import_utils2.processGenerateFiles)({
+      filesMap: [
+        {
+          from: (0, import_path.join)(appCwd, USER_TEMPLATE_PAGE_DIR, "index"),
+          fromFallback: (0, import_path.join)(PAGE_TEMPLATE_DIR, "index.tsx.tpl"),
+          to: (0, import_path.join)(absPagesPath, this.dir, `${this.name}.tsx`),
+          exts: [".tsx.tpl", ".tsx"]
+        },
+        {
+          from: (0, import_path.join)(appCwd, USER_TEMPLATE_PAGE_DIR, "index"),
+          fromFallback: (0, import_path.join)(PAGE_TEMPLATE_DIR, "index.less.tpl"),
+          to: (0, import_path.join)(absPagesPath, this.dir, `${this.name}.less`),
+          exts: [".less.tpl", ".less"]
+        }
+      ],
       baseDir: this.options.appCwd,
-      data
+      presetArgs: {
+        fallback
+      },
+      templateVars: {
+        color: (0, import_utils.randomColor)(),
+        name: this.name,
+        cssExt: ".less",
+        ...restVars
+      }
     });
   }
   async dirModeRun() {
-    const { generateFile: generateFile2, absPagesPath } = this.options;
-    await generateFile2({
-      path: (0, import_path.join)(__dirname, "../../../templates/generate/page"),
-      target: (0, import_path.join)(absPagesPath, this.dir, this.name),
-      data: {
+    const { absPagesPath, args, appCwd } = this.options;
+    const { _, dir: _dir, eject: _eject, fallback, ...restVars } = args;
+    await (0, import_utils2.processGenerateFiles)({
+      filesMap: [
+        {
+          from: (0, import_path.join)(appCwd, USER_TEMPLATE_PAGE_DIR),
+          fromFallback: PAGE_TEMPLATE_DIR,
+          to: (0, import_path.join)(absPagesPath, this.dir, this.name)
+        }
+      ],
+      baseDir: appCwd,
+      presetArgs: {
+        fallback
+      },
+      templateVars: {
         color: (0, import_utils.randomColor)(),
         name: "index",
-        cssExt: ".less"
-      },
-      baseDir: this.options.appCwd
+        cssExt: ".less",
+        ...restVars
+      }
     });
   }
 };

package/dist/commands/generators/utils.d.ts

@@ -1,5 +1,15 @@
 import { prompts } from '@umijs/utils';
 import { IApi } from '../../types';
+export interface IArgsBase {
+    fallback?: boolean;
+    eject?: boolean;
+    _: string[];
+}
+export interface IArgsPage extends IArgsBase {
+    dir?: boolean;
+}
+export interface IArgsComponent extends IArgsBase {
+}
 export declare function checkStatus({ pkg }: {
     pkg: any;
 }): {
@@ -26,3 +36,23 @@ export declare class GeneratorHelper {
 export declare function getUmiJsPlugin(): any;
 export declare function promptsExitWhenCancel<T extends string = string>(questions: prompts.PromptObject<T> | Array<prompts.PromptObject<T>>, options?: Pick<prompts.Options, 'onSubmit'>): Promise<prompts.Answers<T>>;
 export declare function trim(s?: string): string;
+interface IFile {
+    from: string;
+    fromFallback: string;
+    to: string;
+    exts?: string[];
+}
+export declare enum ETempDir {
+    Page = "page",
+    Component = "component"
+}
+export declare function processGenerateFiles({ filesMap, baseDir, presetArgs, templateVars, }: {
+    filesMap: IFile[];
+    baseDir: string;
+    presetArgs?: {
+        fallback?: boolean;
+    };
+    templateVars: Record<string, any>;
+}): Promise<void>;
+export declare function tryEject(dir: ETempDir, baseDir: string): Promise<void>;
+export {};

package/dist/commands/generators/utils.js

@@ -19,11 +19,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/commands/generators/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  ETempDir: () => ETempDir,
   GeneratorHelper: () => GeneratorHelper,
   checkStatus: () => checkStatus,
   getUmiJsPlugin: () => getUmiJsPlugin,
+  processGenerateFiles: () => processGenerateFiles,
   promptsExitWhenCancel: () => promptsExitWhenCancel,
-  trim: () => trim
+  trim: () => trim,
+  tryEject: () => tryEject
 });
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@umijs/utils");
@@ -159,11 +162,86 @@ function promptsExitWhenCancel(questions, options) {
 function trim(s) {
   return (s == null ? void 0 : s.trim()) || "";
 }
+var ETempDir = /* @__PURE__ */ ((ETempDir2) => {
+  ETempDir2["Page"] = "page";
+  ETempDir2["Component"] = "component";
+  return ETempDir2;
+})(ETempDir || {});
+async function processGenerateFiles({
+  filesMap,
+  baseDir,
+  presetArgs = {},
+  templateVars
+}) {
+  const { fallback } = presetArgs;
+  const choosePath = ({ from, fromFallback, exts = [] }) => {
+    if (fallback) {
+      return fromFallback;
+    }
+    if ((0, import_fs.existsSync)(from)) {
+      if ((0, import_fs.statSync)(from).isDirectory() && (0, import_fs.readdirSync)(from).filter((name) => name !== ".DS_Store").length === 0) {
+        return fromFallback;
+      }
+      return from;
+    }
+    for (const ext of exts) {
+      const fullPath = from + ext;
+      if ((0, import_fs.existsSync)(fullPath) && (0, import_fs.statSync)(fullPath).isFile()) {
+        return fullPath;
+      }
+    }
+    return fromFallback;
+  };
+  const names = [];
+  for (const file of filesMap) {
+    const { to, fromFallback } = file;
+    const fromPath = choosePath(file);
+    const toPath = (0, import_fs.statSync)(fromPath).isDirectory() ? to : (0, import_path.join)((0, import_path.dirname)(to), (0, import_path.parse)(to).name + (0, import_path.extname)(fromPath.replace(/\.tpl$/, "")));
+    await (0, import_utils.generateFile)({
+      path: fromPath,
+      target: toPath,
+      data: templateVars,
+      baseDir
+    });
+    if (fromPath !== fromFallback) {
+      names.push((0, import_path.basename)(to));
+    }
+  }
+  if (names.length > 0) {
+    import_utils.logger.info(`${names.join(", ")} is generated by yourself template.`);
+  }
+}
+async function tryEject(dir, baseDir) {
+  const generateBaseDir = (0, import_path.join)(__dirname, "../../../templates/generate", dir);
+  const targetDir = (0, import_path.join)(baseDir, "templates", dir);
+  const willCopyFiles = (0, import_fs.readdirSync)(generateBaseDir);
+  if ((0, import_fs.existsSync)(targetDir) && (0, import_fs.statSync)(targetDir).isDirectory()) {
+    const userExistFiles = (0, import_fs.readdirSync)(targetDir);
+    const conflictFiles = willCopyFiles.filter((filename) => userExistFiles.includes(filename));
+    if (conflictFiles.length > 0) {
+      const response = await (0, import_utils.prompts)({
+        type: "confirm",
+        name: "value",
+        message: `Will overwrites ${conflictFiles.join(", ")} in /templates/${dir}, do you want continue ?`,
+        initial: false
+      });
+      if (!response.value) {
+        return;
+      }
+    }
+  }
+  import_utils.fsExtra.ensureDirSync(targetDir);
+  import_utils.fsExtra.copySync(generateBaseDir, targetDir);
+  import_utils.logger.info(`Ejected ${dir} template successfully. More info see: "https://umijs.org/docs/guides/generator#\u5BF9${dir === "page" /* Page */ ? "\u9875\u9762" : "\u7EC4\u4EF6"}\u6A21\u677F\u5185\u5BB9\u8FDB\u884C\u81EA\u5B9A\u4E49`);
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  ETempDir,
   GeneratorHelper,
   checkStatus,
   getUmiJsPlugin,
+  processGenerateFiles,
   promptsExitWhenCancel,
-  trim
+  trim,
+  tryEject
 });

package/dist/features/apiRoute/request.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import type { IncomingMessage } from 'http';
 import type { IRoute } from '../../types';
 declare class UmiApiRequest {

package/dist/features/webpack/webpack.js

@@ -64,7 +64,9 @@ var webpack_default = (api) => {
   }
   api.modifyWebpackConfig((config) => {
     var _a;
-    (_a = config.plugins) == null ? void 0 : _a.push(new HtmlWebpackPlugin());
+    if (!api.config.mpa) {
+      (_a = config.plugins) == null ? void 0 : _a.push(new HtmlWebpackPlugin());
+    }
     return config;
   });
   api.addHTMLStyles(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.35",
+  "version": "4.0.37",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -25,19 +25,19 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/ast": "4.0.35",
-    "@umijs/babel-preset-umi": "4.0.35",
-    "@umijs/bundler-utils": "4.0.35",
-    "@umijs/bundler-vite": "4.0.35",
-    "@umijs/bundler-webpack": "4.0.35",
-    "@umijs/core": "4.0.35",
+    "@umijs/ast": "4.0.37",
+    "@umijs/babel-preset-umi": "4.0.37",
+    "@umijs/bundler-utils": "4.0.37",
+    "@umijs/bundler-vite": "4.0.37",
+    "@umijs/bundler-webpack": "4.0.37",
+    "@umijs/core": "4.0.37",
     "@umijs/did-you-know": "^1.0.0",
     "@umijs/history": "5.3.1",
-    "@umijs/mfsu": "4.0.35",
-    "@umijs/plugin-run": "4.0.35",
-    "@umijs/renderer-react": "4.0.35",
-    "@umijs/server": "4.0.35",
-    "@umijs/utils": "4.0.35",
+    "@umijs/mfsu": "4.0.37",
+    "@umijs/plugin-run": "4.0.37",
+    "@umijs/renderer-react": "4.0.37",
+    "@umijs/server": "4.0.37",
+    "@umijs/utils": "4.0.37",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "click-to-react-component": "^1.0.8",
     "core-js": "3.22.4",

package/templates/plugin.tpl

@@ -25,14 +25,28 @@ export function getValidKeys() {
 }
 
 let pluginManager = null;
+
+// 确保 webpack 模式 import.meta.hot 代码被 tree shaking 掉
+const isDev = process.env.NODE_ENV === 'development';
+
 export function createPluginManager() {
   pluginManager = PluginManager.create({
     plugins: getPlugins(),
     validKeys: getValidKeys(),
   });
+
+  // fix https://github.com/umijs/umi/issues/10047
+  // https://vitejs.dev/guide/api-hmr.html#hot-data 通过 hot data 持久化 pluginManager 解决 vite 热更时 getPluginManager 获取到 null 的情况
+  if (isDev && import.meta.hot) {
+    import.meta.hot.data.pluginManager = pluginManager
+  }
   return pluginManager;
 }
 
 export function getPluginManager() {
+  // vite 热更模式优先从 hot data 中获取 pluginManager
+  if (isDev && import.meta.hot) {
+    return import.meta.hot.data.pluginManager || pluginManager
+  }
   return pluginManager;
 }

package/templates/umi.tpl

@@ -34,9 +34,10 @@ async function render() {
   });
 
   const basename = contextOpts.basename || '{{{ basename }}}';
+  const historyType = contextOpts.historyType || '{{{ historyType }}}';
 
   const history = createHistory({
-    type: contextOpts.historyType || '{{{ historyType }}}',
+    type: historyType,
     basename,
     ...contextOpts.historyOpts,
   });
@@ -62,6 +63,7 @@ async function render() {
         publicPath,
         runtimePublicPath,
         history,
+        historyType,
         basename,
         callback: contextOpts.callback,
       };