@umijs/preset-umi 4.6.39 → 4.6.41

package/dist/features/tmpFiles/tmpFiles.js

@@ -55,7 +55,7 @@ var tmpFiles_default = (api) => {
   });
   const TSCONFIG_FILE_NAME = "tsconfig.json";
   api.onGenerateFiles(async (opts) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const rendererPath = (0, import_utils.winPath)(
       await api.applyPlugins({
         key: "modifyRendererPath",
@@ -74,7 +74,7 @@ var tmpFiles_default = (api) => {
     const srcPrefix = api.appData.hasSrcDir ? "src/" : "";
     const umiTempDir = `${srcPrefix}.${frameworkName}`;
     const baseUrl = api.appData.hasSrcDir ? "../../" : "../";
-    const isTs5 = (_a = api.appData.typescript.tsVersion) == null ? void 0 : _a.startsWith("5");
+    const isGreaterThan5 = api.appData.typescript.tsVersion && import_utils.semver.major(api.appData.typescript.tsVersion) >= 5;
     const isTslibInstalled = !!api.appData.typescript.tslibVersion;
     const tsconfigFilePath = (0, import_path.join)(api.paths.absTmpPath, TSCONFIG_FILE_NAME);
     const relativeUmiDirPath = (0, import_utils.winPath)(
@@ -87,13 +87,12 @@ var tmpFiles_default = (api) => {
         lib: ["dom", "dom.iterable", "esnext"],
         allowJs: true,
         skipLibCheck: true,
-        moduleResolution: isTs5 ? "bundler" : "node",
+        moduleResolution: isGreaterThan5 ? "bundler" : "node",
         importHelpers: isTslibInstalled,
         noEmit: true,
         jsx: api.appData.framework === "vue" ? "preserve" : "react-jsx",
         esModuleInterop: true,
         sourceMap: true,
-        baseUrl,
         strict: true,
         resolveJsonModule: true,
         allowSyntheticDefaultImports: true,
@@ -104,11 +103,11 @@ var tmpFiles_default = (api) => {
           isolatedModules: true
         } : {},
         paths: {
-          "@/*": [`${srcPrefix}*`],
-          "@@/*": [`${umiTempDir}/*`],
+          "@/*": [`${baseUrl}${srcPrefix}*`],
+          "@@/*": [`${baseUrl}${umiTempDir}/*`],
           [`${api.appData.umi.importSource}`]: [relativeUmiDirPath],
           [`${api.appData.umi.importSource}/typings`]: [
-            `${umiTempDir}/typings`
+            `${baseUrl}${umiTempDir}/typings`
           ],
           ...api.config.vite ? {
             "@fs/*": ["*"]
@@ -303,7 +302,7 @@ declare module '*.txt' {
       })
     ).join("\n");
     const ssrConfig = api.config.ssr;
-    const __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ((_b = api.config.ssr) == null ? void 0 : _b.__INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) ?? {
+    const __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ((_a = api.config.ssr) == null ? void 0 : _a.__INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) ?? {
       pureApp: false,
       pureHtml: false
     };
@@ -362,7 +361,7 @@ export default function EmptyRoute() {
     }
     const hasSrc = api.appData.hasSrcDir;
     const pages = (0, import_path.basename)(
-      ((_c = api.config.conventionRoutes) == null ? void 0 : _c.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);
@@ -420,7 +419,7 @@ if (process.env.NODE_ENV === 'development') {
     });
     const plugins = await api.applyPlugins({
       key: "addRuntimePlugin",
-      initialValue: [(_d = api.appData.appJS) == null ? void 0 : _d.path].filter(Boolean)
+      initialValue: [(_c = api.appData.appJS) == null ? void 0 : _c.path].filter(Boolean)
     });
     function checkDuplicatePluginKeys(arr) {
       const duplicates = [];

package/package.json

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