@umijs/preset-umi 4.0.61 → 4.0.63

package/dist/features/appData/appData.js

@@ -100,6 +100,18 @@ var appData_default = (api) => {
       memo.git = git;
     }
     memo.framework = "react";
+    const tsPkg = tryLoadDepPkg({
+      name: "typescript",
+      from: api.cwd
+    });
+    const tslibPkg = tryLoadDepPkg({
+      name: "tslib",
+      from: api.cwd
+    });
+    memo.typescript = {
+      tsVersion: tsPkg == null ? void 0 : tsPkg.version,
+      tslibVersion: tslibPkg == null ? void 0 : tslibPkg.version
+    };
     return memo;
   });
   api.register({
@@ -194,5 +206,14 @@ function findGitDir(dir) {
   }
   return null;
 }
+function tryLoadDepPkg(opts) {
+  const { name, from } = opts;
+  try {
+    return require(require.resolve(`${name}/package.json`, {
+      paths: [from]
+    }));
+  } catch {
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/features/clickToComponent/clickToComponent.js

@@ -46,7 +46,7 @@ var clickToComponent_default = (api) => {
         });
       }
     },
-    enableBy: api.EnableBy.config
+    enableBy: api.env === "development" ? api.EnableBy.config : () => false
   });
   const pkgPath = (0, import_path.dirname)(require.resolve("click-to-react-component"));
   api.modifyConfig((memo) => {

package/dist/features/mpa/mpa.js

@@ -136,11 +136,21 @@ async function collectEntryWithTimeCount(root, opts) {
   );
   return entries;
 }
+function filterEntry(dir) {
+  if (!process.env.MPA_FILTER) {
+    return true;
+  }
+  const entries = process.env.MPA_FILTER.split(",");
+  return entries.includes(dir);
+}
 async function collectEntry(root, opts) {
   return await (0, import_fs.readdirSync)(root).reduce(
     async (memoP, dir) => {
       var _a;
       const memo = await memoP;
+      if (!filterEntry(dir)) {
+        return memo;
+      }
       const absDir = (0, import_path.join)(root, dir);
       if ((0, import_fs.existsSync)(absDir) && (0, import_fs.statSync)(absDir).isDirectory()) {
         const indexFile = getIndexFile(absDir);

package/dist/features/prepare/prepare.js

@@ -35,16 +35,45 @@ module.exports = __toCommonJS(prepare_exports);
 var import_utils = require("@umijs/utils");
 var import_path = __toESM(require("path"));
 var import_watch = require("../../commands/dev/watch");
+var parser = (0, import_utils.importLazy)(
+  require.resolve("@umijs/es-module-parser")
+);
 var prepare_default = (api) => {
-  function updateAppdata(_buildResult) {
-    const buildResult = import_utils.lodash.cloneDeep(_buildResult);
+  function updateAppdata(prepareData) {
+    var _a;
+    const buildResult = import_utils.lodash.cloneDeep(prepareData.buildResult);
     (buildResult.outputFiles || []).forEach((file) => {
       file == null ? true : delete file.contents;
     });
+    const nextFileImports = prepareData.fileImports ?? ((_a = api.appData.prepare) == null ? void 0 : _a.fileImports);
     api.appData.prepare = {
-      buildResult
+      buildResult,
+      fileImports: nextFileImports
     };
   }
+  async function parseProjectImportSpecifiers(br) {
+    const files = Object.keys(br.metafile.inputs) || [];
+    if (files.length === 0) {
+      return {};
+    }
+    try {
+      const start = Date.now();
+      const fileImports = await parser.parseFiles(
+        files.map((f) => import_path.default.join(api.paths.cwd, f))
+      );
+      api.telemetry.record({
+        name: "parse",
+        payload: { duration: Date.now() - start }
+      });
+      return fileImports;
+    } catch (e) {
+      api.telemetry.record({
+        name: "parse:error",
+        payload: {}
+      });
+      return void 0;
+    }
+  }
   api.register({
     key: "onGenerateFiles",
     async fn({ isFirstTime }) {
@@ -67,13 +96,15 @@ var prepare_default = (api) => {
       const buildResult = await build({
         entryPoints: [entryFile],
         watch: watch && {
-          onRebuildSuccess({ result }) {
-            updateAppdata(result);
-            api.applyPlugins({
+          async onRebuildSuccess({ result }) {
+            const fileImports2 = await parseProjectImportSpecifiers(result);
+            updateAppdata({ buildResult: result, fileImports: fileImports2 });
+            await api.applyPlugins({
               key: "onPrepareBuildSuccess",
               args: {
                 isWatch: true,
-                result
+                result,
+                fileImports: fileImports2
               }
             });
           }
@@ -90,11 +121,13 @@ var prepare_default = (api) => {
           (_a = buildResult.stop) == null ? void 0 : _a.call(buildResult);
         });
       }
-      updateAppdata(buildResult);
+      const fileImports = await parseProjectImportSpecifiers(buildResult);
+      updateAppdata({ buildResult, fileImports });
       await api.applyPlugins({
         key: "onPrepareBuildSuccess",
         args: {
-          result: buildResult
+          result: buildResult,
+          fileImports
         }
       });
     },

package/dist/features/tmpFiles/tmpFiles.js

@@ -53,7 +53,7 @@ var tmpFiles_default = (api) => {
     }
   });
   api.onGenerateFiles(async (opts) => {
-    var _a, _b;
+    var _a, _b, _c;
     const rendererPath = (0, import_utils.winPath)(
       await api.applyPlugins({
         key: "modifyRendererPath",
@@ -71,6 +71,8 @@ var tmpFiles_default = (api) => {
     const srcPrefix = api.appData.hasSrcDir ? "src/" : "";
     const umiTempDir = `${srcPrefix}.umi`;
     const baseUrl = api.appData.hasSrcDir ? "../../" : "../";
+    const isTs5 = (_a = api.appData.typescript.tsVersion) == null ? void 0 : _a.startsWith("5");
+    const isTslibInstalled = !!api.appData.typescript.tslibVersion;
     api.writeTmpFile({
       noPluginDir: true,
       path: "tsconfig.json",
@@ -83,8 +85,12 @@ var tmpFiles_default = (api) => {
           compilerOptions: {
             target: "esnext",
             module: "esnext",
-            moduleResolution: "node",
-            importHelpers: true,
+            lib: ["dom", "dom.iterable", "esnext"],
+            allowJs: true,
+            skipLibCheck: true,
+            moduleResolution: isTs5 ? "bundler" : "node",
+            importHelpers: isTslibInstalled,
+            noEmit: true,
             jsx: api.appData.framework === "vue" ? "preserve" : "react-jsx",
             esModuleInterop: true,
             sourceMap: true,
@@ -344,7 +350,7 @@ export default function EmptyRoute() {
     }
     const hasSrc = api.appData.hasSrcDir;
     const pages = (0, import_path.basename)(
-      ((_a = api.config.conventionRoutes) == null ? void 0 : _a.base) || api.paths.absPagesPath
+      ((_b = api.config.conventionRoutes) == null ? void 0 : _b.base) || api.paths.absPagesPath
     );
     const prefix = hasSrc ? `../../../src/${pages}/` : `../../${pages}/`;
     const clonedRoutes = import_utils.lodash.cloneDeep(routes);
@@ -362,7 +368,7 @@ export default function EmptyRoute() {
       routesString = routesString.replace(/"(clientLoaders\[.*?)"/g, "$1");
       headerImports.push(`import clientLoaders from './loaders.js';`);
     }
-    if (!api.userConfig.routes) {
+    if (!api.userConfig.routes && api.isPluginEnable("routeProps")) {
       routesString = routesString.replace(
         /"routeProps":"(routeProps\[.*?)"/g,
         "...$1"
@@ -406,7 +412,7 @@ if (process.env.NODE_ENV === 'development') {
     });
     const plugins = await api.applyPlugins({
       key: "addRuntimePlugin",
-      initialValue: [(_b = api.appData.appJS) == null ? void 0 : _b.path].filter(Boolean)
+      initialValue: [(_c = api.appData.appJS) == null ? void 0 : _c.path].filter(Boolean)
     });
     const validKeys = await api.applyPlugins({
       key: "addRuntimePluginKey",

package/dist/types.d.ts

@@ -6,6 +6,7 @@ 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';
+import type { Declaration } from '@umijs/es-module-parser';
 import type { getMarkup } from '@umijs/server';
 import type { CheerioAPI } from '@umijs/utils/compiled/cheerio';
 import type { InlineConfig as ViteInlineConfig } from 'vite';
@@ -188,6 +189,7 @@ export declare type IApi = PluginAPI & IServicePluginAPI & {
         origin: Record<string, any>;
     }>;
     onPrepareBuildSuccess: IEvent<{
+        fileImports?: Record<string, Declaration[]>;
         isWatch: boolean;
         result: ESBuildBuildResult;
     }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.61",
+  "version": "4.0.63",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -21,6 +21,7 @@
   "dependencies": {
     "@iconify/utils": "2.1.1",
     "@svgr/core": "6.5.1",
+    "@umijs/es-module-parser": "0.0.6",
     "@umijs/history": "5.3.1",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "click-to-react-component": "^1.0.8",
@@ -36,19 +37,19 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/babel-preset-umi": "4.0.61",
-    "@umijs/bundler-webpack": "4.0.61",
-    "@umijs/core": "4.0.61",
-    "@umijs/bundler-vite": "4.0.61",
-    "@umijs/mfsu": "4.0.61",
-    "@umijs/plugin-run": "4.0.61",
+    "@umijs/ast": "4.0.63",
+    "@umijs/babel-preset-umi": "4.0.63",
+    "@umijs/bundler-utils": "4.0.63",
+    "@umijs/bundler-vite": "4.0.63",
+    "@umijs/bundler-webpack": "4.0.63",
+    "@umijs/core": "4.0.63",
     "@umijs/did-you-know": "1.0.3",
-    "@umijs/ast": "4.0.61",
-    "@umijs/bundler-utils": "4.0.61",
-    "@umijs/renderer-react": "4.0.61",
-    "@umijs/server": "4.0.61",
-    "@umijs/utils": "4.0.61",
-    "@umijs/zod2ts": "4.0.61"
+    "@umijs/mfsu": "4.0.63",
+    "@umijs/plugin-run": "4.0.63",
+    "@umijs/renderer-react": "4.0.63",
+    "@umijs/server": "4.0.63",
+    "@umijs/utils": "4.0.63",
+    "@umijs/zod2ts": "4.0.63"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",
@@ -62,7 +63,7 @@
     "multer": "1.4.4",
     "os-locale": "^6.0.2",
     "sirv": "2.0.2",
-    "vite": "4.1.4"
+    "vite": "4.2.0"
   },
   "publishConfig": {
     "access": "public"