dumi 2.2.7 → 2.2.9

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;
+    var _a, _b, _c, _d, _e;
     [
       "clientLoader",
       "deadCode",
@@ -113,23 +113,47 @@ var derivative_default = (api) => {
       }
     }
     try {
-      const tsconfig = require(import_path.default.join(api.cwd, "tsconfig.json"));
-      const expected = [".dumi/**/*"];
-      if ((_c = (_b = api.service.configManager) == null ? void 0 : _b.mainConfigFile) == null ? void 0 : _c.endsWith(".ts")) {
-        expected.push(
-          (0, import_plugin_utils.winPath)(
-            import_path.default.relative(api.cwd, api.service.configManager.mainConfigFile)
-          )
-        );
+      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 (!expected.every((f) => {
+      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))
+        );
+        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."
+        );
+      } else if (!expected.every((f) => {
         var _a2;
         return (_a2 = tsconfig.include) == null ? void 0 : _a2.includes(f);
       })) {
         import_plugin_utils.logger.warn(
           `Please append ${expected.map((e) => `\`${e}\``).join(
-            " & "
-          )} into \`include\` option of \`tsconfig.json\`, to make sure the types exported by framework works.`
+            ", "
+          )} into \`include\` option of tsconfig.json, to make sure the type prompt works for ${expected.length > 1 ? "them" : "it"}.`
         );
       }
     } catch {

package/dist/features/locales.js

@@ -32,6 +32,7 @@ __export(locales_exports, {
   default: () => locales_default
 });
 module.exports = __toCommonJS(locales_exports);
+var import_constants = require("../constants");
 var import_path = __toESM(require("path"));
 var import_plugin_utils = require("umi/plugin-utils");
 var locales_default = (api) => {
@@ -125,15 +126,24 @@ const cache = createIntlCache();
 
 const LocalesContainer: FC<{ children: ReactNode }> = (props) => {
   const getIntl = useCallback(() => {
+    const base = "${api.config.base.replace(/\/$/, "")}"
     const matched = locales.slice().reverse().find((locale) => (
       'suffix' in locale
         // suffix mode
         ? history.location.pathname.replace(/([^/])\\/$/, '$1').endsWith(locale.suffix)
         // base mode
         : history.location.pathname.replace(/([^/])\\/$/, '$1')
-          .startsWith("${api.config.base.replace(/\/$/, "")}" + locale.base)
+          .startsWith(base + locale.base)
     ));
-    const locale = matched ? matched.id : locales[0].id;
+    let locale = matched ? matched.id : locales[0].id;
+    // using query on demos
+    if(history.location.pathname.startsWith(base + '/${import_constants.SP_ROUTE_PREFIX}demos')){
+        const params = new URLSearchParams(history.location.search);
+        // match the locale of the query
+        if (params.get('locale')){
+          locale = params.get('locale');
+        }
+    }
     const localeMessages = messages[locale] || {};
 
     // append internal message, for use intl as string template util

package/dist/loaders/markdown/transformer/rehypeRaw.js

@@ -35,7 +35,7 @@ module.exports = __toCommonJS(rehypeRaw_exports);
 var import_plugin_utils = require("umi/plugin-utils");
 var raw;
 var visit;
-var COMPONENT_NAME_REGEX = /<[A-Z][a-zA-Z\d]*/g;
+var COMPONENT_NAME_REGEX = /(<)([A-Z][a-zA-Z\d]*)([\s|>])/g;
 var COMPONENT_PROP_REGEX = /\s[a-z][a-z\d]*[A-Z]+[a-zA-Z\d]*(=|\s|>)/g;
 var COMPONENT_STUB_ATTR = "$tag-name";
 var PROP_STUB_ATTR = "-$u";
@@ -53,10 +53,13 @@ function rehypeRaw(opts) {
     visit(tree, (node) => {
       var _a;
       if (node.type === "raw" && COMPONENT_NAME_REGEX.test(node.value)) {
-        node.value = node.value.replace(COMPONENT_NAME_REGEX, (str) => {
-          const tagName = str.slice(1);
-          return `${str} ${COMPONENT_STUB_ATTR}="${tagName}"`;
-        });
+        node.value = node.value.replace(
+          COMPONENT_NAME_REGEX,
+          (str, bracket, tagName, next, i, full) => {
+            const isWithinQuotes = /="[^"]*$/.test(full.slice(0, i)) && /^[^"]*"/.test(full.slice(i)) || /='[^']*$/.test(full.slice(0, i)) && /^[^']*'/.test(full.slice(i));
+            return isWithinQuotes ? str : `${bracket}${tagName} ${COMPONENT_STUB_ATTR}="${tagName}"${next}`;
+          }
+        );
         node.value = node.value.replace(COMPONENT_PROP_REGEX, (str) => {
           return str.replace(
             /[A-Z]/g,
@@ -72,7 +75,7 @@ function rehypeRaw(opts) {
 File: ${opts.fileAbsPath}`);
       }
     });
-    const newTree = raw(tree, vFile);
+    const newTree = raw(tree, { file: vFile });
     visit(newTree, "element", (node) => {
       var _a, _b;
       if ((_a = node.properties) == null ? void 0 : _a[COMPONENT_STUB_ATTR]) {

package/package.json

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