@modern-js/runtime 1.21.5 → 2.0.0-beta.1

package/dist/js/modern/ssr/cli/index.js

@@ -1,5 +1,22 @@
 import { getEntryOptions, SERVER_RENDER_FUNCTION_NAME, LOADABLE_STATS_FILE, isUseSSRBundle, createRuntimeExportsUtils, isSingleEntry } from '@modern-js/utils';
 const PLUGIN_IDENTIFIER = 'ssr';
+const hasStringSSREntry = userConfig => {
+  const isStreaming = ssr => ssr && typeof ssr === 'object' && ssr.mode === 'stream';
+  const {
+    server
+  } = userConfig;
+  if (server !== null && server !== void 0 && server.ssr && !isStreaming(server.ssr)) {
+    return true;
+  }
+  if (server !== null && server !== void 0 && server.ssrByEntries && typeof server.ssrByEntries === 'object') {
+    for (const name of Object.keys(server.ssrByEntries)) {
+      if (!isStreaming(server.ssrByEntries[name])) {
+        return true;
+      }
+    }
+  }
+  return false;
+};
 export default (() => ({
   name: '@modern-js/plugin-ssr',
   required: ['@modern-js/runtime'],
@@ -22,11 +39,9 @@ export default (() => ({
               CHAIN_ID
             }) => {
               const userConfig = api.useResolvedConfigContext();
-
-              if (isUseSSRBundle(userConfig) && name !== 'server') {
+              if (isUseSSRBundle(userConfig) && name !== 'server' && hasStringSSREntry(userConfig)) {
                 // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
-                const LoadableWebpackPlugin = require('@modern-js/webpack/@loadable/webpack-plugin');
-
+                const LoadableWebpackPlugin = require('@loadable/webpack-plugin');
                 chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableWebpackPlugin, [{
                   filename: LOADABLE_STATS_FILE
                 }]);
@@ -34,34 +49,43 @@ export default (() => ({
             },
             babel: config => {
               const userConfig = api.useResolvedConfigContext();
-
-              if (isUseSSRBundle(userConfig)) {
+              if (isUseSSRBundle(userConfig) && hasStringSSREntry(userConfig)) {
                 config.plugins.push(require.resolve('@loadable/babel-plugin'));
               }
             }
           }
         };
       },
-
       modifyEntryImports({
         entrypoint,
         imports
       }) {
         const {
-          entryName
+          entryName,
+          fileSystemRoutes
         } = entrypoint;
         const userConfig = api.useResolvedConfigContext();
         const {
           packageName,
           entrypoints
         } = api.useAppContext();
-        pluginsExportsUtils.addExport(`export { default as ssr } from '@modern-js/runtime/ssr'`); // if use ssg then set ssr config to true
+        pluginsExportsUtils.addExport(`export { default as ssr } from '@modern-js/runtime/ssr'`);
 
+        // if use ssg then set ssr config to true
         const ssrConfig = getEntryOptions(entryName, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
+        if (typeof ssrConfig === 'object' && ssrConfig.mode === 'stream') {
+          var _runtimeConfig$router;
+          const runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
+          if (runtimeConfig !== null && runtimeConfig !== void 0 && (_runtimeConfig$router = runtimeConfig.router) !== null && _runtimeConfig$router !== void 0 && _runtimeConfig$router.legacy) {
+            throw new Error(`Legacy router plugin doesn't support streaming SSR, check your config 'runtime.router'`);
+          }
+          if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {
+            throw new Error(`You should switch to file-system based router to support streaming SSR.`);
+          }
+        }
         const ssgConfig = userConfig.output.ssg;
         const useSSG = isSingleEntry(entrypoints) ? Boolean(ssgConfig) : ssgConfig === true || typeof (ssgConfig === null || ssgConfig === void 0 ? void 0 : ssgConfig[0]) === 'function' || Boolean(ssgConfig === null || ssgConfig === void 0 ? void 0 : ssgConfig[entryName]);
         ssrConfigMap.set(entryName, ssrConfig || useSSG);
-
         if (ssrConfig || useSSG) {
           imports.push({
             value: '@modern-js/runtime/plugins',
@@ -70,13 +94,11 @@ export default (() => ({
             }]
           });
         }
-
         return {
           entrypoint,
           imports
         };
       },
-
       modifyEntryRuntimePlugins({
         entrypoint,
         plugins
@@ -84,16 +106,14 @@ export default (() => ({
         if (ssrConfigMap.get(entrypoint.entryName)) {
           plugins.push({
             name: PLUGIN_IDENTIFIER,
-            options: ssrConfigMap.get(entrypoint.entryName)
+            options: JSON.stringify(ssrConfigMap.get(entrypoint.entryName))
           });
         }
-
         return {
           entrypoint,
           plugins
         };
       },
-
       modifyEntryExport({
         entrypoint,
         exportStatement
@@ -106,13 +126,11 @@ export default (() => ({
             }`, exportStatement].join('\n')
           };
         }
-
         return {
           entrypoint,
           exportStatement
         };
       }
-
     };
   }
 }));

package/dist/js/modern/ssr/index.js

@@ -1,17 +1,13 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import { loadableReady } from '@loadable/component';
 import hoistNonReactStatics from 'hoist-non-react-statics';
-import { RenderLevel } from "./serverRender/type";
+import { RenderLevel } from "./serverRender/types";
 import { WithCallback } from "./react/withCallback";
-import { formatClient, mockResponse } from "./utils";
+import { formatClient, mockResponse, isReact18 } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
-const IS_REACT18 = process.env.IS_REACT18 === 'true';
-export const ssr = _ => ({
+export const ssr = config => ({
   name: '@modern-js/plugin-ssr',
   setup: () => {
     const mockResp = mockResponse();
@@ -23,58 +19,80 @@ export const ssr = _ => ({
         ModernHydrate
       }) => {
         var _window, _window$_SSR_DATA;
+        const hydrateContext = _objectSpread(_objectSpread({}, context), {}, {
+          _hydration: true
+        });
+        const callback = () => {
+          // won't cause component re-render because context's reference identity doesn't change
+          delete hydrateContext._hydration;
+        };
 
         // if render level not exist, use client render
-        const renderLevel = ((_window = window) === null || _window === void 0 ? void 0 : (_window$_SSR_DATA = _window._SSR_DATA) === null || _window$_SSR_DATA === void 0 ? void 0 : _window$_SSR_DATA.renderLevel) || RenderLevel.CLIENT_RENDER; // client render and server prefetch use same logic
-
-        if (renderLevel === RenderLevel.CLIENT_RENDER || renderLevel === RenderLevel.SERVER_PREFETCH) {
-          ModernRender( /*#__PURE__*/_jsx(App, {
-            context: context
-          }));
-        } else if (renderLevel === RenderLevel.SERVER_RENDER) {
-          loadableReady(() => {
-            const hydrateContext = _objectSpread(_objectSpread({}, context), {}, {
-              _hydration: true
-            });
-
-            const callback = () => {
-              // won't cause component re-render because context's reference identity doesn't change
-              delete hydrateContext._hydration;
-            }; // callback: https://github.com/reactwg/react-18/discussions/5
+        const renderLevel = ((_window = window) === null || _window === void 0 ? void 0 : (_window$_SSR_DATA = _window._SSR_DATA) === null || _window$_SSR_DATA === void 0 ? void 0 : _window$_SSR_DATA.renderLevel) || RenderLevel.CLIENT_RENDER;
 
-
-            if (IS_REACT18) {
-              let SSRApp = () => /*#__PURE__*/_jsx(WithCallback, {
-                callback: callback,
-                children: /*#__PURE__*/_jsx(App, {
-                  context: hydrateContext
-                })
+        // react streamSSR hydrate
+        if (isReact18() && config.mode === 'stream') {
+          return streamSSRHydrate();
+        }
+        // react stringSSR hydrate
+        return stringSSRHydrate();
+        function stringSSRHydrate() {
+          // client render and server prefetch use same logic
+          if (renderLevel === RenderLevel.CLIENT_RENDER || renderLevel === RenderLevel.SERVER_PREFETCH) {
+            ModernRender( /*#__PURE__*/_jsx(App, {
+              context: context
+            }));
+          } else if (renderLevel === RenderLevel.SERVER_RENDER) {
+            if (isReact18()) {
+              loadableReady(() => {
+                // callback: https://github.com/reactwg/react-18/discussions/5
+                let SSRApp = () => /*#__PURE__*/_jsx(WithCallback, {
+                  callback: callback,
+                  children: /*#__PURE__*/_jsx(App, {
+                    context: hydrateContext
+                  })
+                });
+                SSRApp = hoistNonReactStatics(SSRApp, App);
+                ModernHydrate( /*#__PURE__*/_jsx(SSRApp, {}));
               });
-
-              SSRApp = hoistNonReactStatics(SSRApp, App);
-              ModernHydrate( /*#__PURE__*/_jsx(SSRApp, {}));
             } else {
-              ModernHydrate( /*#__PURE__*/_jsx(App, {
-                context: hydrateContext
-              }), callback);
+              loadableReady(() => {
+                ModernHydrate( /*#__PURE__*/_jsx(App, {
+                  context: hydrateContext
+                }), callback);
+              });
             }
-          });
-        } else {
-          // unknown renderlevel or renderlevel is server prefetch.
-          console.warn(`unknow render level: ${renderLevel}, execute render()`);
-          ModernRender( /*#__PURE__*/_jsx(App, {
-            context: context
-          }));
+          } else {
+            // unknown renderlevel or renderlevel is server prefetch.
+            console.warn(`unknow render level: ${renderLevel}, execute render()`);
+            ModernRender( /*#__PURE__*/_jsx(App, {
+              context: context
+            }));
+          }
+        }
+        function streamSSRHydrate() {
+          if (renderLevel === RenderLevel.SERVER_RENDER) {
+            // callback: https://github.com/reactwg/react-18/discussions/5
+            let SSRApp = () => /*#__PURE__*/_jsx(WithCallback, {
+              callback: callback,
+              children: /*#__PURE__*/_jsx(App, {
+                context: hydrateContext
+              })
+            });
+            SSRApp = hoistNonReactStatics(SSRApp, App);
+            ModernHydrate( /*#__PURE__*/_jsx(SSRApp, {}));
+          } else {
+            ModernRender( /*#__PURE__*/_jsx(App, {
+              context: context
+            }));
+          }
         }
       },
-
       init({
         context
       }, next) {
         var _window2, _window2$_SSR_DATA, _window2$_SSR_DATA$co;
-
         const request = (_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$_SSR_DATA = _window2._SSR_DATA) === null || _window2$_SSR_DATA === void 0 ? void 0 : (_window2$_SSR_DATA$co = _window2$_SSR_DATA.context) === null || _window2$_SSR_DATA$co === void 0 ? void 0 : _window2$_SSR_DATA$co.request;
-
         if (!request) {
           context.ssrContext = _objectSpread(_objectSpread({}, context.ssrContext), {}, {
             response: mockResp,
@@ -84,25 +102,21 @@ export const ssr = _ => ({
             context
           });
         }
-
         context.ssrContext.response = mockResp;
         context.ssrContext.request = formatClient(request);
         return next({
           context
         });
       },
-
       pickContext: ({
         context,
         pickedContext
       }, next) => {
         var _window3, _window3$_SSR_DATA, _window3$_SSR_DATA$co;
-
         const request = (_window3 = window) === null || _window3 === void 0 ? void 0 : (_window3$_SSR_DATA = _window3._SSR_DATA) === null || _window3$_SSR_DATA === void 0 ? void 0 : (_window3$_SSR_DATA$co = _window3$_SSR_DATA.context) === null || _window3$_SSR_DATA$co === void 0 ? void 0 : _window3$_SSR_DATA$co.request;
         const {
           initialData
         } = context;
-
         if (!request) {
           return next({
             context,
@@ -111,7 +125,6 @@ export const ssr = _ => ({
             })
           });
         }
-
         return next({
           context,
           pickedContext: _objectSpread(_objectSpread({}, pickedContext), {}, {

package/dist/js/modern/ssr/index.node.js

@@ -1,14 +1,8 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { registerPrefetch } from "../core";
-import { render } from "./serverRender";
-import prefetch from "./prefetch";
 import { formatServer } from "./utils";
-const registeredApps = new WeakSet();
+import render from "./serverRender";
 export const ssr = (config = {}) => ({
   name: '@modern-js/plugin-ssr',
   setup: () => {
@@ -17,15 +11,13 @@ export const ssr = (config = {}) => ({
         App,
         context
       }) => {
-        if (!registeredApps.has(App)) {
-          registerPrefetch(App, _context => prefetch(App, _context));
-          registeredApps.add(App);
-        }
-
-        const html = await render(context, config, App);
+        const html = await render({
+          context: context,
+          App: App,
+          config
+        });
         return html;
       },
-
       init({
         context
       }, next) {
@@ -37,7 +29,6 @@ export const ssr = (config = {}) => ({
           context
         });
       },
-
       pickContext: ({
         context,
         pickedContext

package/dist/js/modern/ssr/prefetch.js

@@ -2,18 +2,15 @@ import { renderToStaticMarkup } from 'react-dom/server';
 import { run } from '@modern-js/utils/ssr';
 import { ChunkExtractor } from '@loadable/server';
 import { jsx as _jsx } from "react/jsx-runtime";
-
 // todo: SSRContext
 const prefetch = async (App, context) => run(context.ssrContext.request.headers, async () => {
   var _context$store;
-
   const {
     ssrContext
   } = context;
   const {
     loadableStats
   } = ssrContext;
-
   if (loadableStats) {
     const extractor = new ChunkExtractor({
       stats: loadableStats,
@@ -27,18 +24,15 @@ const prefetch = async (App, context) => run(context.ssrContext.request.headers,
       context: context
     }));
   }
-
   if (!context.loaderManager.hasPendingLoaders()) {
     return {
       initialData: context.initialData,
       i18nData: context.__i18nData__
     };
   }
-
   const loadersData = await context.loaderManager.awaitPendingLoaders();
   Object.keys(loadersData).forEach(id => {
     const data = loadersData[id];
-
     if (data._error) {
       ssrContext.logger.error('App Prefetch Loader', data._error);
       ssrContext.metrics.emitCounter('app.prefetch.loader.error', 1);
@@ -53,5 +47,4 @@ const prefetch = async (App, context) => run(context.ssrContext.request.headers,
     storeState: context === null || context === void 0 ? void 0 : (_context$store = context.store) === null || _context$store === void 0 ? void 0 : _context$store.getState()
   };
 });
-
 export default prefetch;

package/dist/js/modern/ssr/react/prerender/index.js

@@ -1,9 +1,6 @@
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import withSideEffect from 'react-side-effect';
 import React, { createElement } from 'react';
 import { getOutermostProperty, aggKeysFromPropsList, exist, aggMatchesFromPropsList } from "./util";
@@ -16,10 +13,9 @@ const PROP_NAMES = {
   FALLBACK: 'fallback',
   MATCHES: 'matches'
 };
-
-const handleClientStateChange = () => {// not used
+const handleClientStateChange = () => {
+  // not used
 };
-
 const mapStateOnServer = reduceProps => {
   const defaultProps = {
     interval: 10,
@@ -34,17 +30,14 @@ const mapStateOnServer = reduceProps => {
     const propKey = key;
     const reduceProp = reduceProps[propKey];
     let nextProps = props;
-
     if (exist(reduceProp)) {
       nextProps = _objectSpread(_objectSpread({}, props), {}, {
         [propKey]: reduceProp
       });
     }
-
     return nextProps;
   }, defaultProps);
 };
-
 const reducePropsToState = propsList => {
   const reduceProps = {
     interval: getOutermostProperty(propsList, PROP_NAMES.INTERVAL),
@@ -57,48 +50,34 @@ const reducePropsToState = propsList => {
   };
   return reduceProps;
 };
-
 function factory(Component) {
   class Spr extends React.Component {
     static set canUseDOM(canUseDOM) {
       Component.canUseDOM = canUseDOM;
     }
-
     static get canUseDOM() {
       return Component.canUseDOM;
     }
-
     verify() {
       return true;
     }
-
     render() {
       const newProps = _objectSpread({}, this.props);
-
       const validate = this.verify();
-
       if (!validate) {
         throw new Error('invalid props, check usage');
       }
-
       return /*#__PURE__*/createElement(Component, _objectSpread({}, newProps));
     }
-
   }
-
   _defineProperty(Spr, "peek", Component.peek);
-
   _defineProperty(Spr, "rewind", Component.rewind);
-
   _defineProperty(Spr, "config", () => {
     const mappedState = Component.rewind();
     return mappedState;
   });
-
   return Spr;
 }
-
 const NullComponent = () => null;
-
 const SprSideEffects = withSideEffect(reducePropsToState, handleClientStateChange, mapStateOnServer)(NullComponent);
 export const PreRender = factory(SprSideEffects);

package/dist/js/modern/ssr/react/prerender/util.js

@@ -2,12 +2,10 @@ const REQUEST_META = ['header', 'query'];
 export const getInnermostProperty = function getInnermostProperty(propsList, propName) {
   for (let i = propsList.length - 1; i >= 0; i--) {
     const props = propsList[i];
-
     if (props.hasOwnProperty(propName)) {
       return props[propName];
     }
   }
-
   return null;
 };
 export const getOutermostProperty = function getOutermostProperty(propsList, propName) {
@@ -16,7 +14,6 @@ export const getOutermostProperty = function getOutermostProperty(propsList, pro
       return props[propName];
     }
   }
-
   return null;
 };
 export const aggKeysFromPropsList = function aggKeysFromPropsList(propsList, propName) {
@@ -28,7 +25,6 @@ export const aggKeysFromPropsList = function aggKeysFromPropsList(propsList, pro
   const res = propsList.filter(props => usefulObject(props[propName])).reduce((result, next) => {
     REQUEST_META.forEach(key => {
       const prop = next[propName];
-
       if (prop !== null && prop !== void 0 && prop.hasOwnProperty(key) && usefulArray(prop[key])) {
         result[key] = unique(result[key].concat(prop[key]));
       }
@@ -37,13 +33,10 @@ export const aggKeysFromPropsList = function aggKeysFromPropsList(propsList, pro
   }, initResult);
   return REQUEST_META.reduce((result, next) => {
     var _result$key;
-
     const key = next;
-
     if (result[key] && ((_result$key = result[key]) === null || _result$key === void 0 ? void 0 : _result$key.length) === 0) {
       delete result[key];
     }
-
     return result;
   }, res);
 };
@@ -55,8 +48,8 @@ export const aggMatchesFromPropsList = function aggMatchesFromPropsList(propsLis
   }, {});
   const res = propsList.filter(props => usefulObject(props[propName])).reduce((result, next) => {
     REQUEST_META.forEach(key => {
-      const prop = next[propName]; // 这边目前是浅拷贝，越后渲染优先级越高
-
+      const prop = next[propName];
+      // 这边目前是浅拷贝，越后渲染优先级越高
       if (prop !== null && prop !== void 0 && prop.hasOwnProperty(key) && usefulObject(prop[key])) {
         result[key] = Object.assign(result[key], prop[key]);
       }
@@ -65,35 +58,27 @@ export const aggMatchesFromPropsList = function aggMatchesFromPropsList(propsLis
   }, initResult);
   return REQUEST_META.reduce((result, next) => {
     const key = next;
-
     if (result[key] && Object.keys(result[key]).length === 0) {
       delete result[key];
     }
-
     return result;
   }, res);
 };
-
 function unique(arr) {
   return Array.from(new Set(arr));
 }
-
 function usefulObject(target) {
   if (!exist(target)) {
     return false;
   }
-
   return target.constructor === Object && Object.keys(target).length > 0;
 }
-
 function usefulArray(target) {
   if (!exist(target)) {
     return false;
   }
-
   return Array.isArray(target) && target.length > 0;
 }
-
 export function exist(target) {
   return target != null;
 }

package/dist/js/modern/ssr/react/withCallback/index.js

@@ -9,7 +9,6 @@ export const WithCallback = ({
     if (once.current) {
       return;
     }
-
     once.current = true;
     callback();
   }, [callback]);

package/dist/js/modern/ssr/serverRender/helmet.js

@@ -1,46 +1,38 @@
 // 用于 react-helmet 正则替换
+import { EOL } from 'os';
 const RE_HTML_ATTR = /<html[^>]*>/;
 const RE_BODY_ATTR = /<body[^>]*>/;
 const RE_LAST_IN_HEAD = /<\/head>/;
 const RE_TITLE = /<title[^>]*>([\s\S\n\r]*?)<\/title>/;
-const TEST_TITLE_CONTENT = /(?<=<title[^>]*>)([\s\S\n\r]*?)([.|\S])([\s\S\n\r]*?)(?=<\/title>)/; // 通过 react-helmet 修改模板
+const TEST_TITLE_CONTENT = /(?<=<title[^>]*>)([\s\S\n\r]*?)([.|\S])([\s\S\n\r]*?)(?=<\/title>)/;
 
+// 通过 react-helmet 修改模板
 export default function helmet(content, helmetData) {
   let result = content;
   const bodyAttributes = helmetData.bodyAttributes.toString();
-
   if (bodyAttributes) {
     result = result.replace(RE_BODY_ATTR, `<body ${bodyAttributes}>`);
   }
-
   const htmlAttributes = helmetData.htmlAttributes.toString();
-
   if (htmlAttributes) {
     result = result.replace(RE_HTML_ATTR, `<html ${htmlAttributes}>`);
   }
-
   const base = helmetData.base.toString();
   const link = helmetData.link.toString();
   const meta = helmetData.meta.toString();
   const noscript = helmetData.noscript.toString();
   const script = helmetData.script.toString();
   const style = helmetData.style.toString();
-  const title = helmetData.title.toString(); // 如果模板中存在 title，且 helmetData title 有内容则做替换
-
-  const existTitle = RE_TITLE.test(content);
+  const title = helmetData.title.toString();
 
-  if (TEST_TITLE_CONTENT.test(title.trim()) && existTitle) {
+  // 如果模板中存在 title，且 helmetData title 有内容则做替换
+  const existTitleTag = RE_TITLE.test(content);
+  const shouldReplaceTitle = existTitleTag && TEST_TITLE_CONTENT.test(title.trim());
+  if (shouldReplaceTitle) {
     result = result.replace(RE_TITLE, title);
   }
-
-  return result.replace(RE_LAST_IN_HEAD, `
-    ${base}
-    ${link}
-    ${meta}
-    ${noscript}
-    ${script}
-    ${style}
-    ${existTitle ? '' : title}
-    </head>
-  `);
+  const helmetStr = [base, link, meta, noscript, script, style, !existTitleTag ? title : ''].reduce((pre, cur) => {
+    return pre + (cur.length > 0 ? `  ${cur}${EOL}` : '');
+  }, '');
+  return result.replace(RE_LAST_IN_HEAD, `${helmetStr}</head>`);
 }