@umijs/preset-umi 4.0.57 → 4.0.58

package/dist/commands/deadcode.js

@@ -24,20 +24,45 @@ __export(deadcode_exports, {
 module.exports = __toCommonJS(deadcode_exports);
 var import_utils = require("@umijs/utils");
 var import_path = require("path");
-var outputUnusedFiles = (unusedFiles, fileName) => {
+var { getFileCreateInfo, getFileLastModifyInfo, isGitRepo } = import_utils.git;
+var response = (res) => res.status === "fulfilled";
+var outputUnusedFiles = async (unusedFiles, fileName, option) => {
   if (!(unusedFiles == null ? void 0 : unusedFiles.length)) {
     return;
   }
-  const content = unusedFiles.map((file, index) => `
-${index + 1}. ${file}`);
-  const str = `
-    Warning: There are ${unusedFiles.length} unused files:
-    ${content.join("")}
-    
-Please be careful if you want to remove them (¬º-°)¬.
-
-  `;
-  import_utils.fsExtra.writeFileSync(fileName, str, "utf8");
+  const { gitInfo, cwd } = option;
+  if (gitInfo) {
+    const isInGit = await isGitRepo();
+    if (!isInGit) {
+      throw new Error(`当前目录 ${cwd} 不是 git 仓库，请确认！`);
+    }
+    const records = {};
+    await Promise.allSettled(
+      unusedFiles.map(async ({ filePath }) => {
+        return Promise.allSettled([
+          getFileCreateInfo(filePath),
+          getFileLastModifyInfo(filePath)
+        ]).then((infos) => {
+          const [createInfo, modifyInfo] = infos;
+          records[filePath] = {
+            ...response(createInfo) ? createInfo.value : void 0,
+            ...response(modifyInfo) ? modifyInfo.value : void 0
+          };
+        });
+      })
+    );
+    import_utils.fsExtra.writeFileSync(fileName, JSON.stringify(records), "utf8");
+  } else {
+    import_utils.fsExtra.writeFileSync(
+      fileName,
+      `[
+        ${unusedFiles.reduce((res, { filePath }, index) => {
+        return `${res}"${filePath}" ${index !== unusedFiles.length - 1 ? "," : ""}`;
+      }, "")}
+      ]`,
+      "utf8"
+    );
+  }
 };
 var deadcode_default = (api) => {
   api.registerCommand({
@@ -81,6 +106,8 @@ var deadcode_default = (api) => {
       import_utils.logger.info("begin check deadCode");
       const cwd = api.cwd;
       const tsconfig = await import_utils.tsconfigPaths.loadConfig(cwd);
+      const args = api.args;
+      const { out, gitInfo } = args;
       const exclude = [/node_modules/, /\.d\.ts$/, /\.umi/];
       const isExclude = (path) => {
         return exclude.some((reg) => reg.test(path));
@@ -162,18 +189,34 @@ var deadcode_default = (api) => {
       const unusedFiles = (0, import_utils.readDirFiles)({
         dir: api.paths.absSrcPath,
         exclude
-      }).filter(({ filePath: filePath2 }) => !dependenceMap[filePath2]).map((file) => {
-        const relativePath = (0, import_path.relative)(cwd, file.filePath);
-        return relativePath;
-      });
+      }).filter(({ filePath }) => !dependenceMap[filePath]);
       if (!unusedFiles.length) {
-        return import_utils.logger.info(`good job, no unusedFiles`);
+        console.log(`🎉 ${import_utils.chalk.green("Good job, no unusedFiles.")}`);
+        return;
+      }
+      import_utils.logger.warn(`🚨 ${import_utils.chalk.red("Unused Files found:")}`);
+      unusedFiles.forEach((fileItem) => {
+        import_utils.logger.warn(
+          ` · ${import_utils.chalk.yellow(fileItem.filePath, import_utils.chalk.gray(" -> "))}`
+        );
+      });
+      if (out) {
+        const recordJson = `DeadCodeList-${Date.now()}.json`;
+        const recordJsonPath = (0, import_utils.winPath)(
+          (0, import_path.join)(cwd, typeof out === "string" ? out : recordJson)
+        );
+        if (gitInfo)
+          import_utils.logger.wait("generating file...");
+        await outputUnusedFiles(unusedFiles, recordJsonPath, {
+          gitInfo,
+          cwd
+        });
+        import_utils.logger.warn(
+          `👀 ${unusedFiles.length} unused files, write content to file ${import_utils.chalk.cyan(recordJsonPath)}`
+        );
+      } else {
+        import_utils.logger.warn(`${unusedFiles.length} unused files`);
       }
-      const filePath = (0, import_utils.winPath)((0, import_path.join)(cwd, `DeadCodeList-${Date.now()}.txt`));
-      import_utils.logger.info(
-        `${unusedFiles.length} unusedFiles, write content to file ${filePath}`
-      );
-      outputUnusedFiles(unusedFiles, filePath);
       import_utils.logger.info(
         `check dead code end, please be careful if you want to remove them (¬º-°)¬`
       );

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

@@ -8,11 +8,13 @@ export declare class PageGenerator {
         args: IArgsPage;
         absPagesPath: string;
         appCwd: string;
-        useStyledComponents: boolean;
+        importSource?: string;
+        useStyledComponents?: boolean;
     };
     private isDirMode;
     private dir;
     private name;
+    private importSource;
     private needEnsureDirMode;
     private prompts;
     private paths;
@@ -20,7 +22,8 @@ export declare class PageGenerator {
         args: IArgsPage;
         absPagesPath: string;
         appCwd: string;
-        useStyledComponents: boolean;
+        importSource?: string;
+        useStyledComponents?: boolean;
     });
     run(): Promise<void>;
     runInteractiveMode(): Promise<void>;

package/dist/commands/generators/page.js

@@ -47,6 +47,7 @@ var page_default = (api) => {
         args,
         absPagesPath: api.paths.absPagesPath,
         appCwd: api.paths.cwd,
+        importSource: api.appData.umi.importSource,
         useStyledComponents: !!api.userConfig.styledComponents
       }).run();
     }
@@ -61,10 +62,12 @@ var PageGenerator = class {
     this.isDirMode = false;
     this.dir = "";
     this.name = "";
+    this.importSource = "";
     this.needEnsureDirMode = false;
     this.prompts = import_utils2.promptsExitWhenCancel;
     this.paths = [];
     this.isDirMode = !!options.args.dir;
+    this.importSource = options.importSource || "umi";
     const [_, ...inputPaths] = options.args._;
     if (inputPaths.length > 0) {
       this.paths = inputPaths;
@@ -180,6 +183,7 @@ var PageGenerator = class {
         color: (0, import_utils.randomColor)(),
         name: this.name,
         cssExt: ".less",
+        importSource: this.importSource,
         ...restVars
       }
     });
@@ -200,6 +204,7 @@ var PageGenerator = class {
         fallback
       },
       templateVars: {
+        importSource: this.importSource,
         color: (0, import_utils.randomColor)(),
         name: "index",
         cssExt: ".less",

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

@@ -36,7 +36,7 @@ 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 {
+export interface IFile {
     from: string;
     fromFallback: string;
     to: string;
@@ -55,4 +55,3 @@ export declare function processGenerateFiles({ filesMap, baseDir, presetArgs, te
     templateVars: Record<string, any>;
 }): Promise<void>;
 export declare function tryEject(dir: ETempDir, baseDir: string): Promise<void>;
-export {};

package/dist/features/exportStatic/exportStatic.js

@@ -114,16 +114,8 @@ var exportStatic_default = (api) => {
     (0, import_assert.default)(!api.config.mpa, "`exportStatic` is not supported in `mpa` mode.");
   });
   api.modifyExportHTMLFiles(async (_defaultFiles, opts) => {
-    const {
-      publicPath,
-      exportStatic: { extraRoutePaths = [] }
-    } = api.config;
-    const extraHtmlData = getExportHtmlData(
-      await getRoutesFromUserExtraPaths(extraRoutePaths)
-    );
-    const htmlData = getExportHtmlData(api.appData.routes).concat(
-      extraHtmlData
-    );
+    const { publicPath } = api.config;
+    const htmlData = api.appData.exportHtmlData;
     const htmlFiles = [];
     for (const { file, route, prerender } of htmlData) {
       let { markupArgs } = opts;
@@ -177,6 +169,42 @@ var exportStatic_default = (api) => {
     }
     return htmlFiles;
   });
+  api.onGenerateFiles(async () => {
+    const {
+      exportStatic: { extraRoutePaths = [] }
+    } = api.config;
+    const extraHtmlData = getExportHtmlData(
+      await getRoutesFromUserExtraPaths(extraRoutePaths)
+    );
+    const htmlData = getExportHtmlData(api.appData.routes).concat(
+      extraHtmlData
+    );
+    api.appData.exportHtmlData = htmlData;
+    api.writeTmpFile({
+      path: "core/exportStaticRuntimePlugin.ts",
+      content: import_utils.Mustache.render(
+        `
+export function modifyClientRenderOpts(memo: any) {
+  const { history, hydrate } = memo;
+
+  return {
+    ...memo,
+    hydrate: hydrate && !{{{ ignorePaths }}}.includes(history.location.pathname),
+  };
+}
+      `.trim(),
+        {
+          ignorePaths: JSON.stringify(
+            htmlData.filter(({ prerender }) => prerender === false).map(({ route }) => route.path)
+          )
+        }
+      ),
+      noPluginDir: true
+    });
+  });
+  api.addRuntimePlugin(() => {
+    return [`@@/core/exportStaticRuntimePlugin.ts`];
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/types.d.ts

@@ -2,6 +2,7 @@ import type { ImportDeclaration } from '@umijs/bundler-utils/compiled/@babel/typ
 import type { BuildResult as ESBuildBuildResult, Plugin as ESBuildPlugin } from '@umijs/bundler-utils/compiled/esbuild';
 import type { Express, RequestHandler, webpack } from '@umijs/bundler-webpack';
 import type WebpackChain from '@umijs/bundler-webpack/compiled/webpack-5-chain';
+import { createWebSocketServer } from '@umijs/bundler-webpack/dist/server/ws';
 import type { IConfig } from '@umijs/bundler-webpack/dist/types';
 import type { IAdd, IEvent, IModify, IRoute as ICoreRoute, IServicePluginAPI, PluginAPI } from '@umijs/core';
 import { Env } from '@umijs/core';
@@ -176,6 +177,7 @@ export declare type IApi = PluginAPI & IServicePluginAPI & {
         isFirstCompile: boolean;
         stats: webpack.Stats;
         time: number;
+        ws?: ReturnType<typeof createWebSocketServer>;
     }>;
     onGenerateFiles: IEvent<IOnGenerateFiles>;
     onPatchRoute: IEvent<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.57",
+  "version": "4.0.58",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -18,28 +18,10 @@
     "compiled",
     "devToolAppDist"
   ],
-  "scripts": {
-    "build": "umi-scripts father build",
-    "build:deps": "umi-scripts bundleDeps",
-    "dev": "umi-scripts father dev",
-    "test": "umi-scripts jest-turbo"
-  },
   "dependencies": {
     "@iconify/utils": "2.1.1",
     "@svgr/core": "6.5.1",
-    "@umijs/ast": "4.0.57",
-    "@umijs/babel-preset-umi": "4.0.57",
-    "@umijs/bundler-utils": "4.0.57",
-    "@umijs/bundler-vite": "4.0.57",
-    "@umijs/bundler-webpack": "4.0.57",
-    "@umijs/core": "4.0.57",
-    "@umijs/did-you-know": "^1.0.0",
     "@umijs/history": "5.3.1",
-    "@umijs/mfsu": "4.0.57",
-    "@umijs/plugin-run": "4.0.57",
-    "@umijs/renderer-react": "4.0.57",
-    "@umijs/server": "4.0.57",
-    "@umijs/utils": "4.0.57",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "click-to-react-component": "^1.0.8",
     "core-js": "3.28.0",
@@ -53,7 +35,19 @@
     "react-dom": "18.1.0",
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
-    "regenerator-runtime": "0.13.11"
+    "regenerator-runtime": "0.13.11",
+    "@umijs/ast": "4.0.58",
+    "@umijs/babel-preset-umi": "4.0.58",
+    "@umijs/bundler-vite": "4.0.58",
+    "@umijs/bundler-webpack": "4.0.58",
+    "@umijs/core": "4.0.58",
+    "@umijs/renderer-react": "4.0.58",
+    "@umijs/server": "4.0.58",
+    "@umijs/utils": "4.0.58",
+    "@umijs/plugin-run": "4.0.58",
+    "@umijs/bundler-utils": "4.0.58",
+    "@umijs/mfsu": "4.0.58",
+    "@umijs/did-you-know": "1.0.3"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",
@@ -95,5 +89,11 @@
       "joi2types",
       "sirv"
     ]
+  },
+  "scripts": {
+    "build": "umi-scripts father build",
+    "build:deps": "umi-scripts bundleDeps",
+    "dev": "umi-scripts father dev",
+    "test": "umi-scripts jest-turbo"
   }
-}
+}

package/templates/generate/page/index.styled-components.tsx.tpl

@@ -1,5 +1,5 @@
 import React from 'react';
-import { styled } from 'umi';
+import { styled } from '{{{importSource}}}';
 
 const Wrapper = styled.div`
   h1 { background: rgb(121, 184, 242); }