Revert "feat: add ssr.prerender configuration for umi build prerender (…

…umijs#7269)" (umijs#7282) This reverts commit d1ac759.
Fidelgithub · Sep 8, 2021 · c15f5b6 · c15f5b6
1 parent d1ac759
commit c15f5b6
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 90 deletions.
diff --git a/docs/config/README.md b/docs/config/README.md
@@ -1118,7 +1118,6 @@ __webpack_public_path__ = window.resourceBaseUrl || window.publicPath;
     // devServerRender: true,
     // mode: 'string',
     // staticMarkup: false,
-    // prerender: true
   }
 }
 ```
@@ -1130,7 +1129,6 @@ __webpack_public_path__ = window.resourceBaseUrl || window.publicPath;
 - `devServerRender`：在 `umi dev` 开发模式下，执行渲染，用于 umi SSR 项目的快速开发、调试，服务端渲染效果所见即所得，同时我们考虑到可能会与服务端框架（如 [Egg.js](https://eggjs.org/)、[Express](https://expressjs.com/)、[Koa](https://koajs.com/)）结合做本地开发、调试，关闭后，在 `umi dev` 下不执行服务端渲染，但会生成 `umi.server.js`（Umi SSR 服务端渲染入口文件），渲染开发流程交由开发者处理。
 - `mode`：渲染模式，默认使用 `string` 字符串渲染，同时支持流式渲染 `mode: 'stream'`，减少 TTFB（浏览器开始收到服务器响应数据的时间） 时长。
 - `staticMarkup`：html 上的渲染属性（例如 React 渲染的 `data-reactroot`），常用于静态站点生成的场景上。
-- `prerender`: SSR umi build 时是否开启 SSR HTML 预渲染，默认为 true。
 
 注意：
 

diff --git a/docs/config/README.zh-CN.md b/docs/config/README.zh-CN.md
@@ -1117,7 +1117,6 @@ __webpack_public_path__ = window.resourceBaseUrl || window.publicPath;
     // devServerRender: true,
     // mode: 'string',
     // staticMarkup: false,
-    // prerender: true
   }
 }
 ```
@@ -1129,7 +1128,6 @@ __webpack_public_path__ = window.resourceBaseUrl || window.publicPath;
 - `devServerRender`：在 `umi dev` 开发模式下，执行渲染，用于 umi SSR 项目的快速开发、调试，服务端渲染效果所见即所得，同时我们考虑到可能会与服务端框架（如 [Egg.js](https://eggjs.org/)、[Express](https://expressjs.com/)、[Koa](https://koajs.com/)）结合做本地开发、调试，关闭后，在 `umi dev` 下不执行服务端渲染，但会生成 `umi.server.js`（Umi SSR 服务端渲染入口文件），渲染开发流程交由开发者处理。
 - `mode`：渲染模式，默认使用 `string` 字符串渲染，同时支持流式渲染 `mode: 'stream'`，减少 TTFB（浏览器开始收到服务器响应数据的时间） 时长。
 - `staticMarkup`：html 上的渲染属性（例如 React 渲染的 `data-reactroot`），常用于静态站点生成的场景上。
-- `prerender`: umi build 时是否开启 SSR HTML 预渲染，默认为 true。
 
 注意：
 

diff --git a/packages/preset-built-in/src/fixtures/ssr-prerender-no/.umirc.ts b/packages/preset-built-in/src/fixtures/ssr-prerender-no/.umirc.ts
diff --git a/packages/preset-built-in/src/fixtures/ssr-prerender-no/pages/index.tsx b/packages/preset-built-in/src/fixtures/ssr-prerender-no/pages/index.tsx
diff --git a/packages/preset-built-in/src/fixtures/ssr-prerender/.umirc.ts b/packages/preset-built-in/src/fixtures/ssr-prerender/.umirc.ts
diff --git a/packages/preset-built-in/src/fixtures/ssr-prerender/pages/index.tsx b/packages/preset-built-in/src/fixtures/ssr-prerender/pages/index.tsx
diff --git a/packages/preset-built-in/src/index.test.ts b/packages/preset-built-in/src/index.test.ts
@@ -433,37 +433,3 @@ test('exportStatic', async () => {
     expect(existsSync(join(cwd, 'dist', 'list', ':id.html'))).toBeTruthy();
   }
 });
-
-test('ssr prerender', async () => {
-  const cwd = join(fixtures, 'ssr-prerender');
-  const service = new Service({
-    cwd,
-    env: 'production',
-    presets: [require.resolve('../lib/index.js')],
-  });
-  await service.run({
-    name: 'build',
-    args: {},
-  });
-  expect(existsSync(join(cwd, 'dist', 'index.html'))).toBeTruthy();
-  const html = readFileSync(join(cwd, 'dist', 'index.html'), 'utf8');
-  expect(
-    html.includes('<div id="root"><div><h2>prerender</h2></div></div>'),
-  ).toBeTruthy();
-});
-
-test('ssr prerender false', async () => {
-  const cwd = join(fixtures, 'ssr-prerender-no');
-  const service = new Service({
-    cwd,
-    env: 'production',
-    presets: [require.resolve('../lib/index.js')],
-  });
-  await service.run({
-    name: 'build',
-    args: {},
-  });
-  expect(existsSync(join(cwd, 'dist', 'index.html'))).toBeTruthy();
-  const html = readFileSync(join(cwd, 'dist', 'index.html'), 'utf8');
-  expect(html.includes('<div id="root"></div>')).toBeTruthy();
-});
diff --git a/packages/preset-built-in/src/plugins/features/exportStatic.ts b/packages/preset-built-in/src/plugins/features/exportStatic.ts
@@ -96,8 +96,7 @@ export default (api: IApi) => {
     );
     const { ssr } = api.config;
     if (
-      ssr && 
-      ssr.prerender !== false &&
+      ssr &&
       api.env === 'production' &&
       existsSync(serverFilePath) &&
       !isDynamicRoute(route.path!)

diff --git a/packages/preset-built-in/src/plugins/features/ssr/ssr.ts b/packages/preset-built-in/src/plugins/features/ssr/ssr.ts
@@ -134,11 +134,6 @@ export default (api: IApi) => {
             staticMarkup: joi
               .boolean()
               .description('static markup in static site'),
-            prerender: joi
-              .boolean()
-              .description(
-                'whether to enable pre-rendering when umi build export static mode',
-              ),
           })
           .without('forceInitial', ['removeWindowInitialProps'])
           .error(

diff --git a/packages/types/index.d.ts b/packages/types/index.d.ts
@@ -307,7 +307,6 @@ export interface ISSR {
   devServerRender?: boolean;
   mode?: 'string' | 'stream';
   staticMarkup?: boolean;
-  prerender?: boolean;
 }
 
 export interface ICopy {