dumi 2.2.8 → 2.2.10

package/dist/features/derivative.js

@@ -65,7 +65,7 @@ function safeExcludeInMFSU(api, excludes) {
 var derivative_default = (api) => {
   api.describe({ key: "dumi:derivative" });
   api.onCheck(() => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     [
       "clientLoader",
       "deadCode",
@@ -115,45 +115,45 @@ var derivative_default = (api) => {
     try {
       const tsconfigPath = import_path.default.join(api.cwd, "tsconfig.json");
       const tsconfig = require(tsconfigPath);
-      const configFileName = (_b = api.service.configManager) == null ? void 0 : _b.mainConfigFile;
-      const expected = [];
-      if (configFileName && /[\\/]\.[^\\/]+\.ts$/.test(configFileName)) {
-        expected.push((0, import_plugin_utils.winPath)(import_path.default.relative(api.cwd, configFileName)));
-      }
-      [
-        (_c = api.appData.globalJS) == null ? void 0 : _c[0],
-        api.appData.globalLoading,
-        (_d = api.appData.appJS) == null ? void 0 : _d.path
-      ].forEach((file) => {
-        if (file && /([\\/])\.dumi\1.*\.tsx?$/.test(file)) {
-          expected.push((0, import_plugin_utils.winPath)(import_path.default.relative(api.cwd, file)));
-        }
-      });
-      if (import_fs.default.existsSync(import_path.default.join(api.cwd, import_constants.LOCAL_THEME_DIR))) {
-        expected.push(`${import_constants.LOCAL_THEME_DIR}/**/*`);
-      }
-      if ((_e = tsconfig.include) == null ? void 0 : _e.includes(".dumi/**/*")) {
-        tsconfig.include.splice(
-          tsconfig.include.indexOf(".dumi/**/*"),
-          1,
-          ...expected.filter((f) => !tsconfig.include.includes(f))
+      const dotDumiWildcard = `${import_constants.LOCAL_DUMI_DIR}/**/*`;
+      if ((_b = tsconfig.include) == null ? void 0 : _b.includes(dotDumiWildcard)) {
+        tsconfig.include = tsconfig.include.filter(
+          (i) => i !== dotDumiWildcard
         );
         import_fs.default.writeFileSync(
           tsconfigPath,
           JSON.stringify(tsconfig, null, 2),
           "utf-8"
         );
-        import_plugin_utils.logger.warn(
-          "tsconfig.json `include` option has been patched automatically, please check and commit it."
+        import_plugin_utils.logger.info(
+          `tsconfig.json \`include\` option has been patched automatically, please check and commit it.
+          ${import_plugin_utils.chalk.grey("see also: https://github.com/umijs/dumi/pull/1902")}`
         );
-      } else if (!expected.every((f) => {
-        var _a2;
-        return (_a2 = tsconfig.include) == null ? void 0 : _a2.includes(f);
-      })) {
+      }
+      const dotDumiPath = import_path.default.join(api.cwd, import_constants.LOCAL_DUMI_DIR);
+      const dotDumiTsconfigPath = import_path.default.join(dotDumiPath, "tsconfig.json");
+      const hasDotDumiTsFiles = import_fs.default.existsSync(dotDumiPath) && import_fs.default.readdirSync(dotDumiPath).some(
+        (f) => import_constants.LOCAL_PAGES_DIR.endsWith(`/${f}`) || import_constants.LOCAL_THEME_DIR.endsWith(`/${f}`) || /\.tsx?$/.test(f)
+      );
+      if (hasDotDumiTsFiles && !import_fs.default.existsSync(dotDumiTsconfigPath) && !((_c = tsconfig.include) == null ? void 0 : _c.some((i) => /(\.\/)?.dumi\//.test(i)))) {
+        import_fs.default.writeFileSync(
+          dotDumiTsconfigPath,
+          JSON.stringify(
+            { extends: "../tsconfig.json", include: ["**/*"] },
+            null,
+            2
+          ),
+          "utf-8"
+        );
+        import_plugin_utils.logger.info(
+          "In order to make type prompt works for theme files, .dumi/tsconfig.json has been created automatically, please check and commit it."
+        );
+      }
+      const configFileName = ((_d = api.service.configManager) == null ? void 0 : _d.mainConfigFile) && import_path.default.basename((_e = api.service.configManager) == null ? void 0 : _e.mainConfigFile);
+      if (configFileName && // only .dumirc.ts need to be included in the root tsconfig.json, because the dot files will be excluded by default
+      /^\..+\.ts$/.test(configFileName) && !((_f = tsconfig.include) == null ? void 0 : _f.includes(configFileName))) {
         import_plugin_utils.logger.warn(
-          `Please append ${expected.map((e) => `\`${e}\``).join(
-            ", "
-          )} into \`include\` option of tsconfig.json, to make sure the type prompt works for ${expected.length > 1 ? "them" : "it"}.`
+          `Please append \`${configFileName}\` into \`include\` option of tsconfig.json, to make sure the type prompt works for it.`
         );
       }
     } catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.2.8",
+  "version": "2.2.10",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",