@umijs/preset-umi 4.0.60 → 4.0.62

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.60",
+  "version": "4.0.62",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -36,19 +36,19 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/ast": "4.0.60",
-    "@umijs/babel-preset-umi": "4.0.60",
-    "@umijs/bundler-utils": "4.0.60",
-    "@umijs/bundler-webpack": "4.0.60",
-    "@umijs/bundler-vite": "4.0.60",
-    "@umijs/core": "4.0.60",
-    "@umijs/mfsu": "4.0.60",
-    "@umijs/plugin-run": "4.0.60",
-    "@umijs/did-you-know": "1.0.3",
-    "@umijs/renderer-react": "4.0.60",
-    "@umijs/server": "4.0.60",
-    "@umijs/utils": "4.0.60",
-    "@umijs/zod2ts": "4.0.60"
+    "@umijs/bundler-utils": "4.0.62",
+    "@umijs/ast": "4.0.62",
+    "@umijs/core": "4.0.62",
+    "@umijs/babel-preset-umi": "4.0.62",
+    "@umijs/bundler-webpack": "4.0.62",
+    "@umijs/renderer-react": "4.0.62",
+    "@umijs/bundler-vite": "4.0.62",
+    "@umijs/server": "4.0.62",
+    "@umijs/utils": "4.0.62",
+    "@umijs/plugin-run": "4.0.62",
+    "@umijs/mfsu": "4.0.62",
+    "@umijs/zod2ts": "4.0.62",
+    "@umijs/did-you-know": "1.0.3"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",
@@ -62,7 +62,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"