@modern-js/runtime 1.5.0 → 1.16.1

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # @modern-js/runtime
 
+## 1.16.1
+
+### Patch Changes
+
+- fix: runtime type
+
+  fix: 修复 runtime 类型定义
+
+## 1.16.0
+
+### Minor Changes
+
+- 1100dd58c: chore: support react 18
+
+  chore: 支持 React 18
+
+### Patch Changes
+
+- a480d6ad0: fix: remove helmet regexp's global tag
+  fix: 删除 helmet 中正则匹配的全局标记
+- Updated dependencies [641592f52]
+- Updated dependencies [3904b30a5]
+- Updated dependencies [1100dd58c]
+- Updated dependencies [e04e6e76a]
+- Updated dependencies [81c66e4a4]
+- Updated dependencies [2c305b6f5]
+  - @modern-js/utils@1.16.0
+  - @modern-js/webpack@1.16.0
+  - @modern-js/plugin@1.16.0
+
+## 1.15.0
+
+### Patch Changes
+
+- 335c97c: fix: fix runtime context format bug
+  fix: 修复 runtimeContext 数据格式化时的问题
+- a04a11b: fix: 修复 SSR 物理降级时，获取不到请求上下文的问题
+  fix: should get ssrContext anyway if entry is ssr enable
+- Updated dependencies [8658a78]
+- Updated dependencies [0df4970]
+- Updated dependencies [05d4a4f]
+- Updated dependencies [ad05af9]
+- Updated dependencies [5d53d1c]
+- Updated dependencies [37cd159]
+  - @modern-js/utils@1.15.0
+  - @modern-js/webpack@1.15.0
+  - @modern-js/plugin@1.15.0
+
 ## 1.5.0
 
 ### Minor Changes

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

@@ -1,5 +1,5 @@
 import path from 'path';
-import { PLUGIN_SCHEMAS, createRuntimeExportsUtils, cleanRequireCache } from '@modern-js/utils';
+import { PLUGIN_SCHEMAS, createRuntimeExportsUtils, cleanRequireCache, isReact18 } from '@modern-js/utils';
 import PluginState from "../state/cli";
 import PluginSSR from "../ssr/cli";
 import PluginRouter from "../router/cli";
@@ -11,8 +11,9 @@ export default (() => ({
     let runtimeExportsUtils = {};
     return {
       config() {
-        const dir = api.useAppContext().internalDirectory;
+        const dir = api.useAppContext().internalDirectory || '';
         runtimeExportsUtils = createRuntimeExportsUtils(dir, 'index');
+        process.env.IS_REACT18 = isReact18(path.join(dir, '../../')).toString();
         return {
           runtime: {},
           runtimeByEntries: {},
@@ -26,7 +27,8 @@ export default (() => ({
                * So need to add alias
                */
               'styled-components': require.resolve('styled-components')
-            }
+            },
+            envVars: ['IS_REACT18']
           }
         };
       },

package/dist/js/modern/core/compatible.js

@@ -11,12 +11,13 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 React, { useContext, useMemo } from 'react';
-import ReactDOM from 'react-dom';
+import defaultReactDOM from 'react-dom';
 import hoistNonReactStatics from 'hoist-non-react-statics';
+import { RuntimeReactContext } from "../runtime-context";
 import { runtime } from "./plugin";
-import { RuntimeReactContext } from "./runtime-context";
 import { createLoaderManager } from "./loader/loaderManager";
 import { jsx as _jsx } from "react/jsx-runtime";
+const IS_REACT18 = process.env.IS_REACT18 === 'true';
 
 function isClientArgs(id) {
   return typeof id === 'string' || typeof HTMLElement !== 'undefined' && id instanceof HTMLElement;
@@ -105,7 +106,11 @@ export const bootstrap = async (BootApp,
  * When csr, id is root id.
  * When ssr, id is serverContext
  */
-id) => {
+id,
+/**
+ * root.render need use root to run function
+ */
+root, render = defaultReactDOM.render, hydrate = defaultReactDOM.hydrate) => {
   let App = BootApp;
   let runner = runnerMap.get(App); // ensure Component used is created by `createApp`
 
@@ -169,18 +174,36 @@ id) => {
         context.initialData = initialData;
       }
 
+      const rootElement = typeof id !== 'string' ? id : document.getElementById(id || 'root'); // https://reactjs.org/blog/2022/03/08/react-18-upgrade-guide.html
+
+      const ModernRender = App => {
+        if (IS_REACT18) {
+          root.render(App);
+        } else {
+          render(App, rootElement);
+        }
+      };
+
+      const ModernHydrate = (App, callback) => {
+        if (IS_REACT18) {
+          hydrate(rootElement, App);
+        } else {
+          hydrate(App, rootElement, callback);
+        }
+      };
+
       return runner.client({
         App,
         context,
-        rootElement: typeof id !== 'string' ? id : document.getElementById(id || 'root')
+        ModernRender,
+        ModernHydrate
       }, {
         onLast: ({
-          App,
-          rootElement
+          App
         }) => {
-          ReactDOM.render( /*#__PURE__*/React.createElement(App, {
+          ModernRender( /*#__PURE__*/React.createElement(App, {
             context
-          }), rootElement);
+          }));
         }
       });
     } else {

package/dist/js/modern/core/index.js

@@ -2,6 +2,6 @@ export { createPlugin, createRuntime, runtime, registerInit, registerPrefetch }
 export { defineConfig, getConfig } from "./app-config";
 // compatible
 export * from "./compatible";
-export { RuntimeReactContext } from "./runtime-context";
+export { RuntimeReactContext } from "../runtime-context";
 export * from "./loader";
 export * from '@modern-js/plugin';

package/dist/js/modern/core/loader/useLoader.js

@@ -6,7 +6,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { useContext, useRef, useMemo, useState, useCallback, useEffect } from 'react';
 import invariant from 'invariant';
-import { RuntimeReactContext } from "../runtime-context";
+import { RuntimeReactContext } from "../../runtime-context";
 import { LoaderStatus } from "./loaderManager";
 
 const useLoader = (loaderFn, options = {

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

@@ -4,11 +4,13 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 ReactDOM from 'react-dom';
 import { loadableReady } from '@loadable/component';
+import hoistNonReactStatics from 'hoist-non-react-statics';
 import { RenderLevel } from "./serverRender/type";
+import { WithCallback } from "./react/withCallback";
 import { formatClient, mockResponse } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
+const IS_REACT18 = process.env.IS_REACT18 === 'true';
 
 const ssr = () => ({
   name: '@modern-js/plugin-ssr',
@@ -18,37 +20,52 @@ const ssr = () => ({
       client: async ({
         App,
         context,
-        rootElement
+        ModernRender,
+        ModernHydrate
       }) => {
         var _window, _window$_SSR_DATA;
 
         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;
 
         if (renderLevel === RenderLevel.CLIENT_RENDER) {
-          var _prefetch, _ref;
-
-          await (App === null || App === void 0 ? void 0 : (_prefetch = (_ref = App).prefetch) === null || _prefetch === void 0 ? void 0 : _prefetch.call(_ref, context));
-          ReactDOM.render( /*#__PURE__*/_jsx(App, {
+          // prefetch block render while csr
+          //   await (App as any)?.prefetch?.(context);
+          ModernRender( /*#__PURE__*/_jsx(App, {
             context: context
-          }), rootElement);
+          }));
         } else if (renderLevel === RenderLevel.SERVER_RENDER) {
           loadableReady(() => {
             const hydrateContext = _objectSpread(_objectSpread({}, context), {}, {
               _hydration: true
             });
 
-            ReactDOM.hydrate( /*#__PURE__*/_jsx(App, {
-              context: hydrateContext
-            }), rootElement, () => {
+            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
+
+
+            if (IS_REACT18) {
+              let SSRApp = () => /*#__PURE__*/_jsx(WithCallback, {
+                callback: callback,
+                children: /*#__PURE__*/_jsx(App, {
+                  context: hydrateContext
+                })
+              });
+
+              SSRApp = hoistNonReactStatics(SSRApp, App);
+              ModernHydrate( /*#__PURE__*/_jsx(SSRApp, {}));
+            } else {
+              ModernHydrate( /*#__PURE__*/_jsx(App, {
+                context: hydrateContext
+              }), callback);
+            }
           });
         } else {
           // unknown renderlevel or renderlevel is server prefetch.
-          ReactDOM.render( /*#__PURE__*/_jsx(App, {
+          ModernHydrate( /*#__PURE__*/_jsx(App, {
             context: context
-          }), rootElement);
+          }));
         }
       },
 
@@ -60,6 +77,10 @@ const ssr = () => ({
         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,
+            request: formatClient({})
+          });
           return next({
             context
           });

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

@@ -28,7 +28,9 @@ const plugin = () => ({
         }
 
         if (!isBrowser()) {
-          const html = await require("./serverRender").render(context, (context === null || context === void 0 ? void 0 : context.ssrContext.distDir) || path.join(process.cwd(), 'dist'), App);
+          var _context$ssrContext;
+
+          const html = await require("./serverRender").render(context, (context === null || context === void 0 ? void 0 : (_context$ssrContext = context.ssrContext) === null || _context$ssrContext === void 0 ? void 0 : _context$ssrContext.distDir) || path.join(process.cwd(), 'dist'), App);
           return html;
         }
 
@@ -51,6 +53,7 @@ const plugin = () => ({
         context,
         pickedContext
       }, next) => {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
         const {
           request,
           response

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

@@ -0,0 +1,17 @@
+// See https://github.com/reactwg/react-18/discussions/5#discussioncomment-2276079
+import { useRef, useLayoutEffect } from 'react';
+export const WithCallback = ({
+  callback,
+  children
+}) => {
+  const once = useRef(false);
+  useLayoutEffect(() => {
+    if (once.current) {
+      return;
+    }
+
+    once.current = true;
+    callback();
+  }, [callback]);
+  return children;
+};

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

@@ -2,8 +2,8 @@
 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>/g;
-const TEST_TITLE_CONTENT = /(?<=<title[^>]*>)([\s\S\n\r]*?)([.|\S])([\s\S\n\r]*?)(?=<\/title>)/g; // 通过 react-helmet 修改模板
+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 修改模板
 
 export default function helmet(content, helmetData) {
   let result = content;

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

@@ -1,5 +1,4 @@
 import { run } from '@modern-js/utils/ssr';
-import { RuntimeContext } from "../../core";
 import { PreRender } from "../react/prerender";
 import SSREntry from "./entry";
 import { time } from "./measure";

package/dist/js/modern/ssr/utils.js

@@ -19,19 +19,25 @@ export const formatServer = request => {
 
 const getQuery = () => window.location.search.substring(1).split('&').reduce((res, item) => {
   const [key, value] = item.split('=');
-  res[key] = value;
+
+  if (key) {
+    res[key] = value;
+  }
+
   return res;
 }, {});
 
 export const formatClient = request => {
+  var _request$headers, _request$headers2;
+
   return {
     params: request.params || {},
     host: request.host || location.host,
     pathname: request.pathname || location.pathname,
     headers: request.headers || {},
     cookieMap: request.cookieMap || {},
-    cookie: request.headers.cookie || document.cookie,
-    userAgent: request.headers['user-agent'] || navigator.userAgent,
+    cookie: ((_request$headers = request.headers) === null || _request$headers === void 0 ? void 0 : _request$headers.cookie) || document.cookie,
+    userAgent: ((_request$headers2 = request.headers) === null || _request$headers2 === void 0 ? void 0 : _request$headers2['user-agent']) || navigator.userAgent,
     referer: request.referer || document.referrer,
     query: request.query || getQuery(),
     url: location.href

package/dist/js/node/cli/index.js

@@ -25,8 +25,9 @@ var _default = () => ({
     let runtimeExportsUtils = {};
     return {
       config() {
-        const dir = api.useAppContext().internalDirectory;
+        const dir = api.useAppContext().internalDirectory || '';
         runtimeExportsUtils = (0, _utils.createRuntimeExportsUtils)(dir, 'index');
+        process.env.IS_REACT18 = (0, _utils.isReact18)(_path.default.join(dir, '../../')).toString();
         return {
           runtime: {},
           runtimeByEntries: {},
@@ -40,7 +41,8 @@ var _default = () => ({
                * So need to add alias
                */
               'styled-components': require.resolve('styled-components')
-            }
+            },
+            envVars: ['IS_REACT18']
           }
         };
       },

package/dist/js/node/core/compatible.js

@@ -11,9 +11,9 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
 
 var _hoistNonReactStatics = _interopRequireDefault(require("hoist-non-react-statics"));
 
-var _plugin = require("./plugin");
+var _runtimeContext = require("../runtime-context");
 
-var _runtimeContext = require("./runtime-context");
+var _plugin = require("./plugin");
 
 var _loaderManager = require("./loader/loaderManager");
 
@@ -37,6 +37,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
+const IS_REACT18 = process.env.IS_REACT18 === 'true';
+
 function isClientArgs(id) {
   return typeof id === 'string' || typeof HTMLElement !== 'undefined' && id instanceof HTMLElement;
 }
@@ -129,7 +131,11 @@ const bootstrap = async (BootApp,
  * When csr, id is root id.
  * When ssr, id is serverContext
  */
-id) => {
+id,
+/**
+ * root.render need use root to run function
+ */
+root, render = _reactDom.default.render, hydrate = _reactDom.default.hydrate) => {
   let App = BootApp;
   let runner = runnerMap.get(App); // ensure Component used is created by `createApp`
 
@@ -193,18 +199,36 @@ id) => {
         context.initialData = initialData;
       }
 
+      const rootElement = typeof id !== 'string' ? id : document.getElementById(id || 'root'); // https://reactjs.org/blog/2022/03/08/react-18-upgrade-guide.html
+
+      const ModernRender = App => {
+        if (IS_REACT18) {
+          root.render(App);
+        } else {
+          render(App, rootElement);
+        }
+      };
+
+      const ModernHydrate = (App, callback) => {
+        if (IS_REACT18) {
+          hydrate(rootElement, App);
+        } else {
+          hydrate(App, rootElement, callback);
+        }
+      };
+
       return runner.client({
         App,
         context,
-        rootElement: typeof id !== 'string' ? id : document.getElementById(id || 'root')
+        ModernRender,
+        ModernHydrate
       }, {
         onLast: ({
-          App,
-          rootElement
+          App
         }) => {
-          _reactDom.default.render( /*#__PURE__*/_react.default.createElement(App, {
+          ModernRender( /*#__PURE__*/_react.default.createElement(App, {
             context
-          }), rootElement);
+          }));
         }
       });
     } else {

package/dist/js/node/core/index.js

@@ -80,7 +80,7 @@ Object.keys(_compatible).forEach(function (key) {
   });
 });
 
-var _runtimeContext = require("./runtime-context");
+var _runtimeContext = require("../runtime-context");
 
 var _loader = require("./loader");
 

package/dist/js/node/core/loader/useLoader.js

@@ -9,7 +9,7 @@ var _react = require("react");
 
 var _invariant = _interopRequireDefault(require("invariant"));
 
-var _runtimeContext = require("../runtime-context");
+var _runtimeContext = require("../../runtime-context");
 
 var _loaderManager = require("./loaderManager");
 

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

@@ -6,12 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 var _exportNames = {};
 exports.default = void 0;
 
-var _reactDom = _interopRequireDefault(require("react-dom"));
-
 var _component = require("@loadable/component");
 
+var _hoistNonReactStatics = _interopRequireDefault(require("hoist-non-react-statics"));
+
 var _type = require("./serverRender/type");
 
+var _withCallback = require("./react/withCallback");
+
 var _utils = require("./utils");
 
 var _jsxRuntime = require("react/jsx-runtime");
@@ -38,6 +40,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
+const IS_REACT18 = process.env.IS_REACT18 === 'true';
+
 const ssr = () => ({
   name: '@modern-js/plugin-ssr',
   setup: () => {
@@ -46,38 +50,52 @@ const ssr = () => ({
       client: async ({
         App,
         context,
-        rootElement
+        ModernRender,
+        ModernHydrate
       }) => {
         var _window, _window$_SSR_DATA;
 
         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;
 
         if (renderLevel === _type.RenderLevel.CLIENT_RENDER) {
-          var _prefetch, _ref;
-
-          await (App === null || App === void 0 ? void 0 : (_prefetch = (_ref = App).prefetch) === null || _prefetch === void 0 ? void 0 : _prefetch.call(_ref, context));
-
-          _reactDom.default.render( /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {
+          // prefetch block render while csr
+          //   await (App as any)?.prefetch?.(context);
+          ModernRender( /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {
             context: context
-          }), rootElement);
+          }));
         } else if (renderLevel === _type.RenderLevel.SERVER_RENDER) {
           (0, _component.loadableReady)(() => {
             const hydrateContext = _objectSpread(_objectSpread({}, context), {}, {
               _hydration: true
             });
 
-            _reactDom.default.hydrate( /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {
-              context: hydrateContext
-            }), rootElement, () => {
+            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
+
+
+            if (IS_REACT18) {
+              let SSRApp = () => /*#__PURE__*/(0, _jsxRuntime.jsx)(_withCallback.WithCallback, {
+                callback: callback,
+                children: /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {
+                  context: hydrateContext
+                })
+              });
+
+              SSRApp = (0, _hoistNonReactStatics.default)(SSRApp, App);
+              ModernHydrate( /*#__PURE__*/(0, _jsxRuntime.jsx)(SSRApp, {}));
+            } else {
+              ModernHydrate( /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {
+                context: hydrateContext
+              }), callback);
+            }
           });
         } else {
           // unknown renderlevel or renderlevel is server prefetch.
-          _reactDom.default.render( /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {
+          ModernHydrate( /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {
             context: context
-          }), rootElement);
+          }));
         }
       },
 
@@ -89,6 +107,10 @@ const ssr = () => ({
         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,
+            request: (0, _utils.formatClient)({})
+          });
           return next({
             context
           });

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

@@ -54,7 +54,9 @@ const plugin = () => ({
         }
 
         if (!(0, _common.isBrowser)()) {
-          const html = await require("./serverRender").render(context, (context === null || context === void 0 ? void 0 : context.ssrContext.distDir) || _path.default.join(process.cwd(), 'dist'), App);
+          var _context$ssrContext;
+
+          const html = await require("./serverRender").render(context, (context === null || context === void 0 ? void 0 : (_context$ssrContext = context.ssrContext) === null || _context$ssrContext === void 0 ? void 0 : _context$ssrContext.distDir) || _path.default.join(process.cwd(), 'dist'), App);
           return html;
         }
 
@@ -77,6 +79,7 @@ const plugin = () => ({
         context,
         pickedContext
       }, next) => {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
         const {
           request,
           response

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

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.WithCallback = void 0;
+
+var _react = require("react");
+
+// See https://github.com/reactwg/react-18/discussions/5#discussioncomment-2276079
+const WithCallback = ({
+  callback,
+  children
+}) => {
+  const once = (0, _react.useRef)(false);
+  (0, _react.useLayoutEffect)(() => {
+    if (once.current) {
+      return;
+    }
+
+    once.current = true;
+    callback();
+  }, [callback]);
+  return children;
+};
+
+exports.WithCallback = WithCallback;

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

@@ -8,8 +8,8 @@ exports.default = helmet;
 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>/g;
-const TEST_TITLE_CONTENT = /(?<=<title[^>]*>)([\s\S\n\r]*?)([.|\S])([\s\S\n\r]*?)(?=<\/title>)/g; // 通过 react-helmet 修改模板
+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 修改模板
 
 function helmet(content, helmetData) {
   let result = content;

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

@@ -7,8 +7,6 @@ exports.render = void 0;
 
 var _ssr = require("@modern-js/utils/ssr");
 
-var _core = require("../../core");
-
 var _prerender = require("../react/prerender");
 
 var _entry = _interopRequireDefault(require("./entry"));