@modern-js/main-doc 0.0.0-next-1683619026219 → 0.0.0-next-1683620196025

package/CHANGELOG.md

@@ -1,22 +1,10 @@
 # @modern-js/main-doc
 
-## 0.0.0-next-1683619026219
+## 0.0.0-next-1683620196025
 
 ### Patch Changes
 
-- 21c87bf37e: feat: bump codesmith packages version
-
-  feat: 升级 codesmith 包版本
-
-  - @modern-js/builder-doc@0.0.0-next-1683619026219
-
-## 2.18.0
-
-### Patch Changes
-
-- d0a9bf8: chore: improve entry docs, fix ssg docs
-  chore: 优化入口文档，修复 ssg 文档
-  - @modern-js/builder-doc@2.18.0
+- @modern-js/builder-doc@0.0.0-next-1683620196025
 
 ## 2.17.1
 

package/docs/en/apis/app/hooks/src/index_.mdx

@@ -4,7 +4,7 @@ sidebar_position: 4
 ---
 # index.[tj]s
 
-Entry identifier if App want use custom bootstrap. In most case, [`App.[tj]sx`](/apis/app/hooks/src/app) hook file can already meet our needs.
+Entry identifier if App want use custom entry. In most case, [`App.[tj]sx`](/apis/app/hooks/src/app) hook file can already meet our needs.
 
 When we need to add custom behavior before `bootstrap` or completely take over the webpack entry, we can place `index.[tj]s` in `src/` or entry directory. The following are discussed in two cases:
 

package/docs/en/apis/app/runtime/core/bootstrap.mdx

@@ -3,7 +3,7 @@ title: bootstrap
 ---
 # bootstrap
 
-Used to start and mount App, usually without manual calls. This API is only required when using [Custom Bootstrap](/guides/concept/entries#custom-bootstrap).
+Used to start and mount App, usually without manual calls. This API is only required when using [Custom App](/guides/concept/entries#自定义-app).
 
 ## Usage
 

package/docs/en/configure/app/output/ssg.mdx

@@ -163,9 +163,7 @@ You can set this to disable the default behavior of a client-side route:
 ```js
 export default defineConfig({
   output: {
-    ssg: {
-      preventDefault: ['/user'],
-    },
+    preventDefault: ['/user'],
   },
 });
 ```

package/docs/en/configure/app/source/enable-async-entry.mdx

@@ -33,7 +33,7 @@ Then execute the `dev` or `build` command, and you can see Modern.js automatical
 node_modules
   └─ .modern-js
      └─ main
-        ├─ bootstrap.jsx  #  real entry code
+        ├─ bootstrap.js  #  real entry code
         ├─ index.js      # asynchronous entry file
         └─ index.html
 ```
@@ -41,7 +41,7 @@ node_modules
 The `index.js` reads as follows:
 
 ```js
-import('./bootstrap.jsx');
+import('./bootstrap.js');
 ```
 
 At this point, you can consume any remote modules in the current page.

package/docs/en/configure/app/source/entries.mdx

@@ -13,7 +13,6 @@ type Entries = Record<
   | {
       entry: string;
       disableMount?: boolean;
-      customBootstrap?: string;
     }
 >;
 ```
@@ -82,7 +81,6 @@ When the value is `Object`, the following properties can be configured:
 
 - `entry`: `string`, entry file path.
 - `disableMount`: `boolean = false`, turn off the entry-scanning behavior of Modern.js.
-- `customBootstrap`: `string = ''`, [Custom Bootstrap](/guides/concept/entries#custom-bootstrap) file path。
 
 ```ts title="modern.config.ts"
 import { defineConfig } from '@modern-js/app-tools';

package/docs/en/configure/app/tools/tailwindcss.mdx

@@ -24,37 +24,9 @@ const tailwind = {
 };
 ```
 
-### Function Type
+When the value is of type `Object`, rhe configuration corresponding to [TailwindCSS](https://tailwindcss.com/docs/configuration) is merged with the default configuration through `Object.assign`.
 
-When `tools.tailwindcss`'s type is Function, the default tailwindcss config will be passed in as the first parameter, the config object can be modified directly, or a value can be returned as the final result.
-
-```ts title="modern.config.ts"
-export default {
-  tools: {
-    tailwindcss(config) {
-      config.content.push('./some-folder/**/*.{js,ts}');
-    },
-  },
-};
-```
-
-### Object Type
-
-When `tools.tailwindcss`'s type is `Object`, the config will be shallow merged with default config by `Object.assign`.
-
-```ts title="modern.config.ts"
-export default {
-  tools: {
-    tailwindcss: {
-      plugins: [
-        require('@tailwindcss/forms'),
-        require('@tailwindcss/aspect-ratio'),
-        require('@tailwindcss/typography'),
-      ],
-    },
-  },
-};
-```
+When the value is of type `Function`, the object returned by the function is merged with the default configuration by `Object.assign`.
 
 ### Limitations
 

package/docs/en/configure/app/usage.mdx

@@ -43,15 +43,6 @@ export default defineConfig({
 });
 ```
 
-When using Rspack as the bundler, due to some differences in configuration types between webpack and Rspack, you need to specify `<'rspack'>` generic type for `defineConfig`:
-
-```diff title=modern.config.ts
-- export default defineConfig({
-+ export default defineConfig<'rspack'>({
-   //...
-});
-```
-
 ### modern.config.js
 
 If you are developing a non-TypeScript project, you can use the configuration file in .js format:
@@ -251,29 +242,3 @@ const mergedConfig = {
   },
 };
 ```
-
-## Configuration Type
-
-Modern.js exports `AppUserConfig` type, which corresponds to the type of Modern.js configuration object:
-
-```ts title="modern.config.ts"
-import type { AppUserConfig } from '@modern-js/app-tools';
-
-const config: AppUserConfig = {
-  tools: {
-    webpack: {},
-  },
-};
-```
-
-When using Rspack as the bundler, due to some differences in configuration types between webpack and Rspack, you need to specify `<'rspack'>` generic type for `defineConfig`:
-
-```ts title="modern.config.ts"
-import type { AppUserConfig } from '@modern-js/app-tools';
-
-const config: AppUserConfig<'rspack'> = {
-  tools: {
-    rspack: {},
-  },
-};
-```

package/docs/en/guides/advanced-features/rspack-start.mdx

@@ -25,8 +25,10 @@ After the project is created, you can experience the project by running `pnpm ru
 :::tip
 When using Rspack as the bundler, the following Features are temporarily unavailable as some of the capabilities are still under development and we will provide support in the future.
 
+- Micro Frontend
 - Storybook Devtool
-- The usage of [useLoader](/guides/basic-features/data-fetch.html) in Client Side Rendering
+- Server Side Rendering + Conventional Routing
+- Static Site Generation + Conventional Routing
 
 :::
 

package/docs/en/guides/advanced-features/ssg.mdx

@@ -86,7 +86,7 @@ After executing `pnpm run serve` to start the project, visit the page in the Net
 
 ### Self-controlled Routing
 
-**Self-controlled routing** is a routing through component code, which requires the application to run to obtain accurate routing information. Therefore, the SSG function cannot be used out of the box. At this time, the user needs to inform the Modern.js framework in advance which routes need to enable the SSG.
+**Self-controlled routing** is a custom routing through component code, which requires the application to run to obtain accurate routing information. Therefore, the SSG function cannot be used out of the box. At this time, the user needs to inform the Modern.js framework in advance which routes need to enable the SSG.
 
 For example, there is the following code, which contains multiple routes. When setting `output.ssg` to `true`, only the entry route '/' will be rendered by default:
 

package/docs/en/guides/advanced-features/testing.mdx

@@ -4,7 +4,7 @@ title: Testing
 ---
 # Testing
 
-Modern.js integrates the testing capabilities of [Jest](https://jestjs.io/) by default.
+Modern.js inherits the testing capabilities of [Jest](https://jestjs.io/) by default.
 
 First need to execute `pnpm run new` enable [unit test/integration test] features:
 

package/docs/en/guides/basic-features/routes.mdx

@@ -388,11 +388,8 @@ export default () => {
 
 :::note
 Modern.js has a series of resource loading and rendering optimizations to the default convention-based routing, and provides out-of-the-box SSR capabilities, when using self-directed routing, need to be packaged by the developer, and it is recommended that developers use convention-based routing.
-:::
-
-use self-controller routing, if the developer turns off the [`runtime.router`](/configure/app/runtime/router) configuration and uses `react-router-dom` directly, then you need to wrap the `Provider` according to the React Router documentation.
 
-```tsx title="src/App.tsx"
+:::
 
 ## Other
 

package/docs/en/guides/concept/entries.mdx

@@ -98,49 +98,27 @@ Framework mode refers to the need to use the capabilities of the Modern.js frame
 
 #### Conventional Routing
 
-If there is a `routes/` directory in the entry, Modern.js will scan the files under `routes/` at startup, and automatically generate client-side routes (react-router) based on file conventions. For example:
+If there is a `routes/` directory in the entry, Modern.js will scan the files under `routes/` at startup, and automatically generate client-side routes (react-router) based on file conventions.
 
-```bash
-.
-├── src
-│   └── routes
-│       ├── layout.tsx
-│       └── page.tsx
-```
+For details, please refer to [routing](/guides/basic-features/routes).
 
-For details, please refer to [routing](/guides/basic-features/routes#conventional-routing).
-
-#### Self-controlled Routing
+#### Custom Routing
 
 If there is an `App.[jt]sx?` file in the entry, the developer can freely set the client route in this file, or not set the client route.
 
-```tsx
-import { BrowserRouter, Route, Routes } from '@modern-js/runtime/router';
-
-export default () => {
-  return (
-    <BrowserRouter>
-      <Routes>
-        <Route index element={<div>index</div>} />
-        <Route path="about" element={<div>about</div>} />
-      </Routes>
-    </BrowserRouter>
-  );
-};
-```
+For details, please refer to [routing](/guides/basic-features/routes).
 
-For details, please refer to [routing](/guides/basic-features/routes#self-controlled-routing).
+#### Custom App
 
-#### Custom Bootstrap
-
-If there is an `index.[jt]sx` file in the entry, and when the file defaults to exporting functions, Modern.js will pass the default bootstrap function as an imported parameter, and replace the default bootstrap with the exported function, so that developers can customize Mounting components to DOM nodes, or adding custom behavior before mounting. E.g:
+If there is an `index.[jt]sx` file in the entry, and when the file exports functions by default, Modern.js will still generate the code wrapped by createApp according to the runtime settings. In the rendering process, the component wrapped by createApp is passed as a parameter to the function exported by the index file, so that developers can customize the component to be mounted on the DOM node, or add custom behavior before mounting. For example:
 
 ```tsx
-export default (App: React.ComponentType, bootstrap: () => void) => {
+import ReactDOM from 'react-dom/client';
+import { bootstrap } from '@modern-js/runtime';
+
+export default (App: React.ComponentType) => {
   // do something before bootstrap...
-  initSomething().then(() => {
-    bootstrap();
-  })
+  bootstrap(App, 'root', undefined, ReactDOM);
 };
 ```
 
@@ -192,9 +170,9 @@ import App from './App';
 ReactDOM.render(<App />, document.getElementById('root'));
 ```
 
-Modern.js **not recommended** new project to use this method, this method loses some capabilities of the framework, such as the `runtime` configuration in the **`modern.config.js` file will no longer take effect**. But this method will be very useful when the project is migrated from other frameworks to Modern.js, such as CRA, or webpack that is manually built by yourself.
+Modern.js **not recommended** to use this method, this method loses some capabilities of the framework, such as the `runtime` configuration in the **`modern.config.js` file will no longer take effect**. But this method will be very useful when the project is migrated from other frameworks to Modern.js, such as CRA, or webpack that is manually built by yourself.
 
-## Specify Entry Using Configuration
+## Custom Entry
 
 Most existing projects are not built according to the directory convention of Modern.js. If you want to change to the directory structure agreed by Modern.js, there will be a certain migration cost.
 

package/docs/en/guides/topic-detail/framework-plugin/hook-list.mdx

@@ -611,7 +611,7 @@ export default (): CliPlugin => ({
 
 This adds a new Script tag to the HTML template.
 
-{/* ## Server
+<!-- ## Server
 
 :::note
 The Server plugin is currently not fully opened, and the API is not guaranteed to be stable. Use with caution.
@@ -691,7 +691,7 @@ export default (): ServerPlugin => ({
     };
   },
 });
-```*/}
+``` -->
 
 ## Runtime
 
@@ -762,7 +762,7 @@ export default (): Plugin => ({
 });
 ```
 
-{/* ### `provide`
+<!-- ### `provide`
 
 - Function: Modifies the Elements that need to be rendered.
 - Execution Stage: Rendering (SSR/CSR).
@@ -834,4 +834,4 @@ export default (): Plugin => ({
     };
   },
 });
-``` */}
+``` -->

package/docs/en/guides/topic-detail/generator/plugin/api/input/type.mdx

@@ -34,7 +34,7 @@ Each option supports two fields:
 
 - label: display name.
 
-### x-validator
+### x-validate
 
 schema verification rules. Formily's verification method is supported here, for details, please refer to [Formily Validate](https://formilyjs.org/zh-CN/guide/advanced/validate).
 

package/docs/zh/apis/app/hooks/src/index_.mdx

@@ -4,7 +4,7 @@ sidebar_position: 4
 ---
 # index.[tj]s
 
-应用项目入口标识。
+应用项目自定义路由入口标识。
 
 通常情况下 [`src/App.[tj]sx, src/[entry]/App.[tj]sx`](/apis/app/hooks/src/app) 钩子文件已经能满足我们的需求，当我们需要在 `bootstrap` 之前添加自定义行为或者完全接管 webpack 打包入口时，可以在 `src` 或者入口目录下放置 `index.[tj]s`。 下面有分两种情况进行讨论:
 

package/docs/zh/apis/app/runtime/core/bootstrap.mdx

@@ -3,7 +3,7 @@ title: bootstrap
 ---
 # bootstrap
 
-用于启动和挂载应用，通常情况下不做手动调用。只有在使用[自定义 Bootstrap](/guides/concept/entries#自定义-bootstrap) 时，才需要使用该 API。
+用于启动和挂载应用，通常情况下不做手动调用。只有在使用[自定义 App](/guides/concept/entries#自定义-app) 时，才需要使用该 API。
 
 ## 使用姿势
 

package/docs/zh/configure/app/output/ssg.mdx

@@ -163,9 +163,7 @@ export default defineConfig({
 ```js
 export default defineConfig({
   output: {
-    ssg: {
-      preventDefault: ['/user'],
-    },
+    preventDefault: ['/user'],
   },
 });
 ```

package/docs/zh/configure/app/source/enable-async-entry.mdx

@@ -36,7 +36,7 @@ export default defineConfig({
 node_modules
   └─ .modern-js
      └─ main
-        ├─ bootstrap.jsx  # 真正的入口代码
+        ├─ bootstrap.js  # 真正的入口代码
         ├─ index.js      # 异步入口文件（asynchronous boundary）
         └─ index.html
 ```
@@ -44,7 +44,7 @@ node_modules
 其中 `index.js` 的内容如下：
 
 ```js
-import('./bootstrap.jsx');
+import('./bootstrap.js');
 ```
 
 此时，就可以在当前页面中消费任意的远程模块了。

package/docs/zh/configure/app/source/entries.mdx

@@ -13,7 +13,6 @@ type Entries = Record<
   | {
       entry: string;
       disableMount?: boolean;
-      customBootstrap?: string;
     }
 >;
 ```
@@ -84,7 +83,6 @@ export default defineConfig({
 
 - `entry`：`string`，入口文件路径。
 - `disableMount`：`boolean = false`，关闭 Modern.js 自动生成入口代码的行为。
-- `customBootstrap`： `string = ''`，指定[自定义 Bootstrap](/guides/concept/entries#自定义-bootstrap) 的文件路径。
 
 ```ts title="modern.config.ts"
 import { defineConfig } from '@modern-js/app-tools';

package/docs/zh/configure/app/tools/tailwindcss.mdx

@@ -26,40 +26,12 @@ const tailwind = {
 
 对应 [TailwindCSS](https://tailwindcss.com/docs/configuration) 的配置。
 
-### Function 类型
+当值为 `Object` 类型时，与默认配置通过 `Object.assign` 合并。
 
-当 `tools.tailwindcss` 为 Function 类型时，默认配置会作为第一个参数传入，你可以直接修改配置对象，也可以返回一个值作为最终结果：
-
-```ts title="modern.config.ts"
-export default {
-  tools: {
-    tailwindcss(config) {
-      config.content.push('./some-folder/**/*.{js,ts}');
-    },
-  },
-};
-```
-
-### Object 类型
-
-当 `tools.tailwindcss` 的值为 `Object` 类型时，会与默认配置通过 `Object.assign` 浅合并。
-
-```ts title="modern.config.ts"
-export default {
-  tools: {
-    tailwindcss: {
-      plugins: [
-        require('@tailwindcss/forms'),
-        require('@tailwindcss/aspect-ratio'),
-        require('@tailwindcss/typography'),
-      ],
-    },
-  },
-};
-```
+当值为 `Function` 类型时，函数返回的对象与默认配置通过 `Object.assign` 合并。
 
 ### 限制
 
 注意，该配置中不允许使用 `theme` 配置项，否则会构建失败。在 Modern.js 中，请使用 [source.designSystem](/configure/app/source/design-system) 作为 `Tailwind CSS Theme` 配置。
 
-其他配置的使用方式和 Tailwind CSS 一致，请参考 [tailwindcss - Configuration](https://tailwindcss.com/docs/configuration)。
+其他的使用方式和 Tailwind CSS 一致: [快速传送门](https://tailwindcss.com/docs/configuration)。

package/docs/zh/configure/app/usage.mdx

@@ -43,15 +43,6 @@ export default defineConfig({
 });
 ```
 
-当你使用 Rspack 作为打包工具时，由于 webpack 和 Rspack 的配置类型存在一些差异，需要为 `defineConfig` 指定 `<'rspack'>` 泛型：
-
-```diff title=modern.config.ts
-- export default defineConfig({
-+ export default defineConfig<'rspack'>({
-  // ...
-});
-```
-
 ### modern.config.js
 
 如果你在开发一个非 TypeScript 项目，可以使用 .js 格式的配置文件：
@@ -251,29 +242,3 @@ const mergedConfig = {
   },
 };
 ```
-
-## 配置类型定义
-
-Modern.js 导出了 `AppUserConfig` 类型，对应 Modern.js 配置对象的类型：
-
-```ts title="modern.config.ts"
-import type { AppUserConfig } from '@modern-js/app-tools';
-
-const config: AppUserConfig = {
-  tools: {
-    webpack: {},
-  },
-};
-```
-
-当你使用 Rspack 作为打包工具时，由于 webpack 和 Rspack 的配置类型存在一些差异，需要为 `AppUserConfig` 指定 `<'rspack'>` 泛型：
-
-```ts title="modern.config.ts"
-import type { AppUserConfig } from '@modern-js/app-tools';
-
-const config: AppUserConfig<'rspack'> = {
-  tools: {
-    rspack: {},
-  },
-};
-```

package/docs/zh/guides/advanced-features/rspack-start.mdx

@@ -26,8 +26,10 @@ import InitRspackApp from '@site-docs/components/init-rspack-app';
 :::tip
 在使用 Rspack 作为打包工具时，由于部分能力尚在开发中，以下 features 暂时无法使用，我们将在未来提供支持：
 
+- 微前端（Micro Frontend）
 - Storybook 调试
-- 客户端渲染（CSR）使用 [useLoader](/guides/basic-features/data-fetch.html)
+- 同时使用服务端渲染（SSR）和约定式路由的场景
+- 同时使用静态站点生成（SSG）和约定式路由的场景
 
 :::
 

package/docs/zh/guides/advanced-features/ssg.mdx

@@ -86,7 +86,7 @@ export default defineConfig({
 
 ### 在自控式路由中使用
 
-**自控式路由**是通过组件代码定义路由，需要应用运行起来才能获取准确的路由信息。因此，无法开箱即用的使用 SSG 功能。此时需要用户提前告知 Modern.js 框架，哪些路由需要开启 SSG 功能。
+**自控式路由**是通过组件代码自定义路由，需要应用运行起来才能获取准确的路由信息。因此，无法开箱即用的使用 SSG 功能。此时需要用户提前告知 Modern.js 框架，哪些路由需要开启 SSG 功能。
 
 例如有以下代码，包含多条路由，设置 `output.ssg` 为 `true` 时，默认只会渲染入口路由即 `/`：
 

package/docs/zh/guides/advanced-features/testing.mdx

@@ -4,7 +4,7 @@ sidebar_position: 10
 
 # 测试
 
-Modern.js 默认集成了 [Jest](https://jestjs.io/) 的测试能力。
+Modern.js 默认继承了 [Jest](https://jestjs.io/) 的测试能力。
 
 我们首先需要执行 `pnpm run new` 启用「单元测试 / 集成测试」功能：
 

package/docs/zh/guides/basic-features/routes.mdx

@@ -488,9 +488,8 @@ export default () => {
 
 :::note
 Modern.js 默认对约定式路由做了一系列资源加载及渲染上的优化，并且提供了开箱即用的 SSR 能力，而这些能力，在使用自控路由时，都需要开发者自行封装，推荐开发者使用约定式路由。
-:::
 
-使用自控式路由时，如果开发者关闭了 [`runtime.router`](/configure/app/runtime/router) 配置，并直接使用 `react-router-dom`，那还需要根据 React Router 文档自行包裹 `Provider`。
+:::
 
 ## 其他路由方案
 
@@ -514,5 +513,19 @@ export default defineConfig({
 });
 ```
 
+### 常见问题
+
+1. 产物中的代码是 es2015+ 的，期望产物中是 es5 的代码
+
+react-router^6 的目前默认产物是 es2020 的，如果需要产物中是 es5 的代码，可以配置 `source.include`，让 react-router 相关包经过 bundler 编译 ：
+
+```
+source: {
+  source: {
+    include: [/@remix-run\/router/, /react-router-dom/, /react-router/],
+  }
+}
+```
+
 
 

package/docs/zh/guides/concept/entries.mdx

@@ -98,55 +98,36 @@ Modern.js 会将与 package.json 文件中 `name` 字段同名的入口作为主
 
 #### 约定式路由
 
-如果入口中存在 `routes/` 目录，Modern.js 会在启动时扫描 `routes/` 下的文件，基于文件约定，自动生成客户端路由（react-router）。例如：
+如果入口中存在 `routes/` 目录，Modern.js 会在启动时扫描 `routes/` 下的文件，基于文件约定，自动生成客户端路由（react-router）。
 
-```bash
-.
-├── src
-│   └── routes
-│       ├── layout.tsx
-│       └── page.tsx
-```
-
-上述目录中，`layout.tsx` 中导出的组件会作为最外层的组件，`page.tsx` 中导出的组件会作为 `/` 路由的组件。
-
-详细内容可以参考[路由](/guides/basic-features/routes#约定式路由)。
+详细内容可以参考[路由](/guides/basic-features/routes)。
 
-#### 自控式路由
+#### 自定义路由
 
-如果入口中存在 `App.[jt]sx?` 文件，开发者可以在这个文件中通过代码的方式，设置客户端路由，或者不设置客户端路由。
+如果入口中存在 `App.[jt]sx?` 文件，开发者可以在这个文件中自由的设置客户端路由，或者不设置客户端路由。
 
-```tsx
-import { BrowserRouter, Route, Routes } from '@modern-js/runtime/router';
-
-export default () => {
-  return (
-    <BrowserRouter>
-      <Routes>
-        <Route index element={<div>index</div>} />
-        <Route path="about" element={<div>about</div>} />
-      </Routes>
-    </BrowserRouter>
-  );
-};
-```
+详细内容可以参考[路由](/guides/basic-features/routes)。
 
-详细内容可以参考[路由](/guides/basic-features/routes#自控式路由)。
+#### 自定义 App
 
-#### 自定义 Bootstrap
-
-如果入口中存在 `index.[jt]sx` 文件，并且当文件默认导出函数时，Modern.js 会将默认的 bootstrap 函数作为入参传入，并用导出的函数替代默认的 bootstrap，这样开发者可以自定义将组件挂载到 DOM 节点上，或在挂载前添加自定义行为。例如：
+如果入口中存在 `index.[jt]sx` 文件，并且当文件默认导出函数时，Modern.js 还是会根据 runtime 的设置情况生成 createApp 包裹后的代码。在渲染过程中，将 createApp 包裹后的组件作为参数传递给 index 文件导出的函数，这样开发者可以自定义将组件挂载到 DOM 节点上，或在挂载前添加自定义行为。例如：
 
 ```tsx
-export default (App: React.ComponentType, bootstrap: () => void) => {
+import ReactDOM from 'react-dom/client';
+import { bootstrap } from '@modern-js/runtime';
+
+export default (App: React.ComponentType) => {
   // do something before bootstrap...
-  initSomething().then(() => {
-    bootstrap();
-  })
+  bootstrap(App, 'root', undefined, ReactDOM);
 };
 ```
 
-此时，Modern.js 生成的文件内容如下：
+:::warning
+由于 bootstrap 函数需要兼容 React17 和 React18 的用法，调用 bootstrap 函数时需要手动传入 ReactDOM 参数。
+
+:::
+
+Modern.js 生成的文件内容如下：
 
 ```js
 import React from 'react';
@@ -159,14 +140,13 @@ const IS_BROWSER = typeof window !== 'undefined' && window.name !== 'nodejs';
 const MOUNT_ID = 'root';
 
 let AppWrapper = null;
-let root = null;
 
 function render() {
   AppWrapper = createApp({
     // runtime 的插件参数...
   })(App);
   if (IS_BROWSER) {
-    customBootstrap(AppWrapper, () => bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM));
+    customBootstrap(AppWrapper);
   }
   return AppWrapper;
 }
@@ -190,9 +170,9 @@ import App from './App';
 ReactDOM.render(<App />, document.getElementById('root'));
 ```
 
-Modern.js **不推荐**新项目使用这种方式，这种方式丧失了框架的一些能力，如 **`modern.config.js` 文件中的 `runtime` 配置将不会再生效**。但是在项目从其他框架迁移到 Modern.js，例如 CRA，或是自己手动搭建的 webpack 时，这种方式会非常有用。
+Modern.js **不推荐**使用这种方式，这种方式丧失了框架的一些能力，如 **`modern.config.js` 文件中的 `runtime` 配置将不会再生效**。但是在项目从其他框架迁移到 Modern.js，例如 CRA，或是自己手动搭建的 webpack 时，这种方式会非常有用。
 
-## 使用配置指定入口
+## 自定义入口
 
 大部分存量项目并不是按照 Modern.js 的目录结构来搭建的。如果要改成 Modern.js 约定的目录结构，会存在一定的迁移成本。
 

package/docs/zh/guides/topic-detail/framework-plugin/hook-list.mdx

@@ -611,7 +611,7 @@ export default (): CliPlugin => ({
 
 这样就为 HTML 模版中新增了一个 Script 标签。
 
-{/* ## Server
+<!-- ## Server
 
 :::note
 目前 Server 插件还未完全开放，API 不保证稳定，使用需谨慎。
@@ -692,7 +692,7 @@ export default (): ServerPlugin => ({
     };
   },
 });
-```*/}
+``` -->
 
 ## Runtime
 
@@ -764,7 +764,7 @@ export default (): Plugin => ({
 });
 ```
 
-{/* ### `provide`
+<!-- ### `provide`
 
 - 功能：修改需要渲染的 Element
 - 执行阶段：渲染（SSR/CSR）
@@ -836,4 +836,4 @@ export default (): Plugin => ({
     };
   },
 });
-```*/}
+``` -->

package/docs/zh/guides/topic-detail/generator/plugin/api/input/type.mdx

@@ -34,7 +34,7 @@ schema 如果为选择类型，该字段用于定义选项内容。
 
 - label: 展示名称。
 
-### x-validator
+### x-validate
 
 schema 的验证规则。这里支持 Formily 的校验方式，具体可参考 [Formily 表单校验](https://formilyjs.org/zh-CN/guide/advanced/validate)。
 

package/package.json

@@ -15,13 +15,13 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-next-1683619026219",
+  "version": "0.0.0-next-1683620196025",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
   "peerDependencies": {
-    "@modern-js/builder-doc": "0.0.0-next-1683619026219"
+    "@modern-js/builder-doc": "0.0.0-next-1683620196025"
   },
   "devDependencies": {
     "classnames": "^2",
@@ -33,9 +33,9 @@
     "fs-extra": "^10",
     "@types/node": "^16",
     "@types/fs-extra": "^9",
-    "@modern-js/builder-doc": "0.0.0-next-1683619026219",
-    "@modern-js/doc-tools": "0.0.0-next-1683619026219",
-    "@modern-js/doc-plugin-auto-sidebar": "0.0.0-next-1683619026219"
+    "@modern-js/builder-doc": "0.0.0-next-1683620196025",
+    "@modern-js/doc-plugin-auto-sidebar": "0.0.0-next-1683620196025",
+    "@modern-js/doc-tools": "0.0.0-next-1683620196025"
   },
   "scripts": {
     "dev": "modern dev",