dumi 2.0.0-beta.1 → 2.0.0-beta.2

package/dist/client/theme-api/useNavData.js

@@ -37,11 +37,11 @@ export var useNavData = function useNavData() {
           groups = _ref2[1];
 
       var meta = Object.values(routes).reduce(function (ret, route) {
-        var _frontmatter$nav$orde;
+        var _route$meta, _frontmatter$nav$orde;
 
         // find routes which within the nav path
         if (route.path.startsWith(link.slice(1))) {
-          switch (_typeof(route.meta.frontmatter.nav)) {
+          switch (_typeof((_route$meta = route.meta) === null || _route$meta === void 0 ? void 0 : _route$meta.frontmatter.nav)) {
             case 'object':
               ret.title = route.meta.frontmatter.nav.title || ret.title;
               ret.order = (_frontmatter$nav$orde = route.meta.frontmatter.nav.order) !== null && _frontmatter$nav$orde !== void 0 ? _frontmatter$nav$orde : ret.order;

package/dist/client/theme-api/useSidebarData.d.ts

@@ -1,8 +1,9 @@
+import type { ISidebarGroup } from './types';
 /**
  * hook for get sidebar data for all nav
  */
-export declare const useFullSidebarData: () => any;
+export declare const useFullSidebarData: () => Record<string, ISidebarGroup[]>;
 /**
  * hook for get sidebar data for current nav
  */
-export declare const useSidebarData: () => any;
+export declare const useSidebarData: () => ISidebarGroup[];

package/dist/client/tsconfig.json

@@ -4,7 +4,7 @@
     "paths": {
       "@/*": ["src/*"],
       "@@/*": ["src/.umi/*"],
-      "dumi": ["src"],
+      "dumi": ["."],
       "dumi/theme": ["src/client/theme-api"],
       "dumi/theme/*": ["src/client/theme-default/*"]
     },

package/dist/features/locales.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,7 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/features/locales.ts
@@ -22,6 +25,8 @@ __export(locales_exports, {
   default: () => locales_default
 });
 module.exports = __toCommonJS(locales_exports);
+var import_path = __toESM(require("path"));
+var import_plugin_utils = require("umi/plugin-utils");
 var locales_default = (api) => {
   var _a;
   api.describe({
@@ -71,7 +76,7 @@ export const messages = ${JSON.stringify(api.service.themeData.locales, null, 2)
       content: `
 import { history } from 'dumi';
 import React, { useState, type ReactNode } from 'react';
-import { RawIntlProvider, createIntl, createIntlCache } from 'react-intl';
+import { RawIntlProvider, createIntl, createIntlCache } from '${(0, import_plugin_utils.winPath)(import_path.default.dirname(require.resolve("react-intl/package")))}';
 import { locales, messages } from './config';
 
 const cache = createIntlCache();

package/dist/features/routes.js

@@ -47,11 +47,12 @@ var routes_default = (api) => {
     ...((_b = (_a = api.userConfig.resolve) == null ? void 0 : _a.entityDirs) == null ? void 0 : _b.map(({ dir }) => dir)) || ["docs"],
     ...((_c = api.userConfig.resolve) == null ? void 0 : _c.docDirs) || []
   ].map((dir) => import_path.default.join(api.cwd, dir, "**/*.md"));
+  const pagesDir = import_path.default.join(api.cwd, ".dumi/pages");
   api.describe({ key: "dumi:routes" });
   api.addTmpGenerateWatcherPaths(() => extraWatchPaths);
   api.modifyConfig((memo) => {
     memo.conventionRoutes = {
-      base: import_path.default.join(__dirname, "dumi-disable-default-routes")
+      base: pagesDir
     };
     return memo;
   });
@@ -67,9 +68,12 @@ var routes_default = (api) => {
     return memo;
   });
   api.modifyRoutes((oRoutes) => {
+    const pages = {};
     const routes = Object.values(oRoutes).reduce((ret, route) => {
       if (route.isLayout) {
         ret[route.id] = route;
+      } else {
+        pages[route.id] = route;
       }
       return ret;
     }, {});
@@ -101,6 +105,11 @@ var routes_default = (api) => {
         isLayout: true
       };
     }
+    Object.entries(pages).forEach(([, route]) => {
+      route.parentId = docLayoutId;
+      route.file = import_path.default.resolve(pagesDir, route.file);
+      routes[route.id] = route;
+    });
     docDirs.forEach((dir) => {
       const base = import_path.default.join(api.cwd, dir);
       const dirRoutes = (0, import_core.getConventionRoutes)({
@@ -131,13 +140,15 @@ var routes_default = (api) => {
         localizeUmiRoute(routes[routeId], api.config.locales);
       });
     });
-    routes["404"] = {
-      id: "404",
-      path: "*",
-      absPath: "/*",
-      parentId: docLayoutId,
-      file: require.resolve("../client/pages/404")
-    };
+    if (Object.values(pages).every((route) => route.path !== "*")) {
+      routes["404"] = {
+        id: "404",
+        path: "*",
+        absPath: "/*",
+        parentId: docLayoutId,
+        file: require.resolve("../client/pages/404")
+      };
+    }
     routes["demo-render"] = {
       id: "demo-render",
       path: `${import_constants.SP_ROUTE_PREFIX}demos/:id`,

package/dist/index.d.ts

@@ -1,9 +1,5 @@
 import type { IDumiUserConfig } from "./types";
 declare let unistUtilVisit: typeof import('unist-util-visit');
 export * from 'umi';
-export * from './client/theme-api';
-export { IApi } from "./types";
-export type { Root as HastRoot } from 'hast';
-export type { Plugin as UnifiedPlugin, Transformer as UnifiedTransformer, } from 'unified';
 export { unistUtilVisit };
 export declare const defineConfig: (config: IDumiUserConfig) => IDumiUserConfig;

package/dist/index.js

@@ -28,7 +28,6 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("umi"), module.exports);
-__reExport(src_exports, require("./client/theme-api"), module.exports);
 var unistUtilVisit;
 (async () => {
   unistUtilVisit = await import("unist-util-visit");

package/index.d.ts

@@ -0,0 +1,11 @@
+export { Root as HastRoot } from 'hast';
+export * from 'umi';
+export {
+  Plugin as UnifiedPlugin,
+  Transformer as UnifiedTransformer,
+} from 'unified';
+export * from './dist';
+// override umi exported defineConfig
+export { defineConfig } from './dist';
+export * from './dist/client/theme-api';
+export { IApi } from './dist/types';

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "dumi",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "description": "Framework for developing UI components",
   "keywords": [],
   "license": "MIT",
   "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "types": "index.d.ts",
   "bin": "./bin/dumi.js",
   "files": [
     "bin",
     "dist",
     "compiled",
     "theme-default",
-    "theme.d.ts"
+    "theme.d.ts",
+    "index.d.ts"
   ],
   "scripts": {
     "build": "father build",

package/dist/assetParsers/atom.d.ts

@@ -1,25 +0,0 @@
-import { SchemaParser, SchemaResolver } from 'dumi-afx-deps/compiled/parser';
-import type { webpack } from 'umi';
-declare class AtomParserWatchWebpackPlugin {
-    resolveDir: string;
-    onWatchRun: (files: string[]) => void;
-    constructor(opts: {
-        resolveDir: string;
-        onWatchRun: typeof AtomParserWatchWebpackPlugin.prototype.onWatchRun;
-    });
-    apply(compiler: webpack.Compiler): void;
-}
-declare class AtomAssetsParser {
-    parser: SchemaParser;
-    resolver: Promise<SchemaResolver> | undefined;
-    resolveDir: string;
-    unresolvedFiles: string[];
-    constructor(opts: {
-        entryFile: string;
-        resolveDir: string;
-    });
-    parse(): Promise<SchemaResolver>;
-    patchUnresolvedFiles(files: string[]): void;
-    getWebpackWatchPlugin(): AtomParserWatchWebpackPlugin;
-}
-export default AtomAssetsParser;

package/dist/assetParsers/atom.js

@@ -1,74 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/assetParsers/atom.ts
-var atom_exports = {};
-__export(atom_exports, {
-  default: () => atom_default
-});
-module.exports = __toCommonJS(atom_exports);
-var import_parser = require("dumi-afx-deps/compiled/parser");
-var import_path = __toESM(require("path"));
-var import_plugin_utils = require("umi/plugin-utils");
-var AtomParserWatchWebpackPlugin = class {
-  constructor(opts) {
-    this.resolveDir = opts.resolveDir;
-    this.onWatchRun = opts.onWatchRun;
-  }
-  apply(compiler) {
-    compiler.hooks.watchRun.tap(this.constructor.name, (compilation) => {
-      const files = Array.from(compilation.watchFileSystem.watcher.fileWatchers.keys());
-      this.onWatchRun(files.map((file) => (0, import_plugin_utils.winPath)(import_path.default.relative(this.resolveDir, file))).filter((file) => /\.(j|t)sx?$/.test(file) && !file.startsWith("../") && !file.includes(".umi")));
-    });
-  }
-};
-var AtomAssetsParser = class {
-  constructor(opts) {
-    this.unresolvedFiles = [];
-    this.resolveDir = opts.resolveDir;
-    this.parser = new import_parser.SchemaParser({
-      entryPath: opts.entryFile,
-      basePath: opts.resolveDir,
-      unPkgHost: "https://unpkg.com"
-    });
-  }
-  async parse() {
-    if (!this.resolver || this.unresolvedFiles.length) {
-      this.resolver = (async () => {
-        await this.parser.patch(this.unresolvedFiles);
-        return new import_parser.SchemaResolver(await this.parser.parse());
-      })();
-    }
-    return this.resolver;
-  }
-  patchUnresolvedFiles(files) {
-    this.unresolvedFiles.push(...files);
-  }
-  getWebpackWatchPlugin() {
-    return new AtomParserWatchWebpackPlugin({
-      resolveDir: this.resolveDir,
-      onWatchRun: (files) => this.parser.patch(files)
-    });
-  }
-};
-var atom_default = AtomAssetsParser;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});