@umijs/preset-umi 4.0.67 → 4.0.69

package/dist/features/configPlugins/schema.js

@@ -39,6 +39,7 @@ function getSchemas() {
   return {
     analyze: ({ zod }) => zod.object({}),
     base: ({ zod }) => zod.string(),
+    conventionLayout: ({ zod }) => zod.boolean(),
     conventionRoutes: ({ zod }) => zod.object({
       base: zod.string().optional(),
       exclude: zod.array(zod.any()).optional()

package/dist/features/tmpFiles/routes.js

@@ -55,7 +55,7 @@ async function getApiRoutes(opts) {
   return routes;
 }
 async function getRoutes(opts) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   let routes = null;
   if (opts.api.config.routes) {
     routes = (0, import_core.getConfigRoutes)({
@@ -131,7 +131,7 @@ async function getRoutes(opts) {
       }
     }
   }
-  const absLayoutPath = (0, import_utils.tryPaths)([
+  const absLayoutPath = ((_d = opts.api.config) == null ? void 0 : _d.conventionLayout) === false ? false : (0, import_utils.tryPaths)([
     (0, import_path.join)(opts.api.paths.absSrcPath, "layouts/index.tsx"),
     (0, import_path.join)(opts.api.paths.absSrcPath, "layouts/index.vue"),
     (0, import_path.join)(opts.api.paths.absSrcPath, "layouts/index.jsx"),

package/dist/features/tmpFiles/tmpFiles.js

@@ -68,65 +68,64 @@ var tmpFiles_default = (api) => {
         initialValue: (0, import_path.join)(rendererPath, "dist/server.js")
       })
     );
+    const frameworkName = api.service.frameworkName;
     const srcPrefix = api.appData.hasSrcDir ? "src/" : "";
-    const umiTempDir = `${srcPrefix}.umi`;
+    const umiTempDir = `${srcPrefix}.${frameworkName}`;
     const baseUrl = api.appData.hasSrcDir ? "../../" : "../";
     const isTs5 = (_a = api.appData.typescript.tsVersion) == null ? void 0 : _a.startsWith("5");
     const isTslibInstalled = !!api.appData.typescript.tslibVersion;
+    let umiTsConfig = {
+      compilerOptions: {
+        target: "esnext",
+        module: "esnext",
+        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,
+        baseUrl,
+        strict: true,
+        resolveJsonModule: true,
+        allowSyntheticDefaultImports: true,
+        // Supported by vue only
+        ...api.appData.framework === "vue" ? {
+          // TODO Actually, it should be vite mode, but here it is written as vue only
+          // Required in Vite https://vitejs.dev/guide/features.html#typescript
+          isolatedModules: true
+        } : {},
+        paths: {
+          "@/*": [`${srcPrefix}*`],
+          "@@/*": [`${umiTempDir}/*`],
+          [`${api.appData.umi.importSource}`]: [umiDir],
+          [`${api.appData.umi.importSource}/typings`]: [
+            `${umiTempDir}/typings`
+          ],
+          ...api.config.vite ? {
+            "@fs/*": ["*"]
+          } : {}
+        }
+      },
+      include: [
+        `${baseUrl}.${frameworkName}rc.ts`,
+        `${baseUrl}**/*.d.ts`,
+        `${baseUrl}**/*.ts`,
+        `${baseUrl}**/*.tsx`,
+        api.appData.framework === "vue" && `${baseUrl}**/*.vue`
+      ].filter(Boolean)
+    };
+    umiTsConfig = await api.applyPlugins({
+      key: "modifyTSConfig",
+      type: api.ApplyPluginsType.modify,
+      initialValue: umiTsConfig
+    });
     api.writeTmpFile({
       noPluginDir: true,
       path: "tsconfig.json",
-      // x 1、basic config
-      // x 2、alias
-      // 3、language service platform
-      // 4、typing
-      content: JSON.stringify(
-        {
-          compilerOptions: {
-            target: "esnext",
-            module: "esnext",
-            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,
-            baseUrl,
-            strict: true,
-            resolveJsonModule: true,
-            allowSyntheticDefaultImports: true,
-            // Supported by vue only
-            ...api.appData.framework === "vue" ? {
-              // TODO Actually, it should be vite mode, but here it is written as vue only
-              // Required in Vite https://vitejs.dev/guide/features.html#typescript
-              isolatedModules: true
-            } : {},
-            paths: {
-              "@/*": [`${srcPrefix}*`],
-              "@@/*": [`${umiTempDir}/*`],
-              [`${api.appData.umi.importSource}`]: [umiDir],
-              [`${api.appData.umi.importSource}/typings`]: [
-                `${umiTempDir}/typings`
-              ],
-              ...api.config.vite ? {
-                "@fs/*": ["*"]
-              } : {}
-            }
-          },
-          include: [
-            `${baseUrl}.umirc.ts`,
-            `${baseUrl}**/*.d.ts`,
-            `${baseUrl}**/*.ts`,
-            `${baseUrl}**/*.tsx`,
-            api.appData.framework === "vue" && `${baseUrl}**/*.vue`
-          ].filter(Boolean)
-        },
-        null,
-        2
-      )
+      content: JSON.stringify(umiTsConfig, null, 2)
     });
     api.writeTmpFile({
       noPluginDir: true,

package/dist/registerMethods.js

@@ -86,7 +86,8 @@ var registerMethods_default = (api) => {
     "modifyRendererPath",
     "modifyServerRendererPath",
     "modifyRoutes",
-    "modifyBabelPresetOpts"
+    "modifyBabelPresetOpts",
+    "modifyTSConfig"
   ].forEach((name) => {
     api.registerMethod({ name });
   });

package/dist/types.d.ts

@@ -137,6 +137,7 @@ export declare type IApi = PluginAPI & IServicePluginAPI & {
     modifyRendererPath: IModify<string, {}>;
     modifyRoutes: IModify<Record<string, IRoute>, {}>;
     modifyServerRendererPath: IModify<string, {}>;
+    modifyTSConfig: IModify<Record<string, any>, {}>;
     modifyViteConfig: IModify<ViteInlineConfig, {
         env: Env;
     }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.67",
+  "version": "4.0.69",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -37,20 +37,20 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/ast": "4.0.67",
-    "@umijs/babel-preset-umi": "4.0.67",
-    "@umijs/bundler-utils": "4.0.67",
-    "@umijs/bundler-webpack": "4.0.67",
-    "@umijs/bundler-vite": "4.0.67",
-    "@umijs/core": "4.0.67",
-    "@umijs/mfsu": "4.0.67",
-    "@umijs/renderer-react": "4.0.67",
-    "@umijs/plugin-run": "4.0.67",
-    "@umijs/server": "4.0.67",
-    "@umijs/utils": "4.0.67",
-    "@umijs/zod2ts": "4.0.67",
-    "@umijs/did-you-know": "1.0.3",
-    "@umijs/ui": "3.0.0-alpha.0"
+    "@umijs/ast": "4.0.69",
+    "@umijs/babel-preset-umi": "4.0.69",
+    "@umijs/bundler-vite": "4.0.69",
+    "@umijs/bundler-utils": "4.0.69",
+    "@umijs/bundler-webpack": "4.0.69",
+    "@umijs/core": "4.0.69",
+    "@umijs/mfsu": "4.0.69",
+    "@umijs/renderer-react": "4.0.69",
+    "@umijs/plugin-run": "4.0.69",
+    "@umijs/server": "4.0.69",
+    "@umijs/zod2ts": "4.0.69",
+    "@umijs/utils": "4.0.69",
+    "@umijs/ui": "3.0.1",
+    "@umijs/did-you-know": "1.0.3"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",