@modern-js/runtime 2.30.0 → 2.31.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @modern-js/runtime
 
+## 2.31.0
+
+### Patch Changes
+
+- 4a87c07: feat: memo creating router
+  feat: 缓存 router 创建
+- 2361ce8: feat: support partials html in Document
+  feat: 支持 partials html 在 Document 中也生效
+- cd39c6f: fix: use [\s\S]_ to replace ._ for \n\r char regex
+  fix: 使用 [\s\X]_ 替换 ._ 匹配 \n\r 字符
+- Updated dependencies [1882366]
+  - @modern-js/utils@2.31.0
+  - @modern-js/plugin@2.31.0
+  - @modern-js/types@2.31.0
+
 ## 2.30.0
 
 ### Minor Changes

package/dist/cjs/document/Body.js

@@ -22,6 +22,7 @@ function Body(props) {
     children: [
       hasSetRoot ? null : /* @__PURE__ */ (0, _jsxruntime.jsx)(_Root.DefaultRoot, {}),
       children,
+      `${_constants.BODY_PARTICALS_SEPARATOR}`,
       `${_constants.DOCUMENT_CHUNKSMAP_PLACEHOLDER}`,
       `${_constants.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER}`
     ]

package/dist/cjs/document/Head.js

@@ -30,9 +30,11 @@ function Head(props) {
   return /* @__PURE__ */ (0, _jsxruntime.jsxs)("head", {
     ...rest,
     children: [
+      `${_constants.TOP_PARTICALS_SEPARATOR}`,
       `${_constants.DOCUMENT_META_PLACEHOLDER}`,
       !hasSetLinks && /* @__PURE__ */ (0, _jsxruntime.jsx)(_Links.Links, {}),
       !hasSetScripts && /* @__PURE__ */ (0, _jsxruntime.jsx)(_Scripts.Scripts, {}),
+      `${_constants.HEAD_PARTICALS_SEPARATOR}`,
       children
     ]
   });

package/dist/cjs/document/cli/index.js

@@ -68,7 +68,7 @@ const documentPlugin = () => ({
         return null;
       }
       return async ({ htmlWebpackPlugin }) => {
-        var _tsConfig;
+        var _tsConfig, _partialsByEntrypoint;
         const config = api.useResolvedConfigContext();
         const documentParams = getDocParams({
           config,
@@ -133,10 +133,17 @@ const documentPlugin = () => ({
         }, _react.default.createElement(Document, null));
         let html = _server.default.renderToStaticMarkup(HTMLElement);
         debug("entry %s's document jsx rendered html: %o", entryName, html);
+        const { partialsByEntrypoint } = api.useAppContext();
         const scripts = [
           htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "script").join(""),
           htmlWebpackPlugin.tags.bodyTags.toString()
         ].join("");
+        if ((_partialsByEntrypoint = partialsByEntrypoint) === null || _partialsByEntrypoint === void 0 ? void 0 : _partialsByEntrypoint[entryName]) {
+          const partialsTop = partialsByEntrypoint[entryName].top.join("\n");
+          const partialsHead = partialsByEntrypoint[entryName].head.join("\n");
+          const partialsBody = partialsByEntrypoint[entryName].body.join("\n");
+          html = html.replace(_constants.TOP_PARTICALS_SEPARATOR, partialsTop).replace(_constants.HEAD_PARTICALS_SEPARATOR, partialsHead).replace(_constants.BODY_PARTICALS_SEPARATOR, partialsBody);
+        }
         const links = [
           htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "link").join("")
         ].join("");

package/dist/cjs/document/constants.js

@@ -19,6 +19,15 @@ _export(exports, {
   HTML_SEPARATOR: function() {
     return HTML_SEPARATOR;
   },
+  HEAD_PARTICALS_SEPARATOR: function() {
+    return HEAD_PARTICALS_SEPARATOR;
+  },
+  BODY_PARTICALS_SEPARATOR: function() {
+    return BODY_PARTICALS_SEPARATOR;
+  },
+  TOP_PARTICALS_SEPARATOR: function() {
+    return TOP_PARTICALS_SEPARATOR;
+  },
   HTML_SSRDATASCRIPT_SEPARATOR: function() {
     return HTML_SSRDATASCRIPT_SEPARATOR;
   },
@@ -71,6 +80,9 @@ const DOC_EXT = [
 ];
 const DOCUMENT_META_PLACEHOLDER = encodeURIComponent("<%= meta %>");
 const HTML_SEPARATOR = "<!--<?- html ?>-->";
+const HEAD_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.head ?>-->");
+const BODY_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.body ?>-->");
+const TOP_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.top ?>-->");
 const HTML_SSRDATASCRIPT_SEPARATOR = "<!--<?- SSRDataScript ?>-->";
 const DOCUMENT_SSR_PLACEHOLDER = encodeURIComponent(HTML_SEPARATOR);
 const DOCUMENT_CHUNKSMAP_PLACEHOLDER = encodeURIComponent(_constants.HTML_CHUNKSMAP_SEPARATOR);

package/dist/cjs/router/runtime/plugin.js

@@ -80,51 +80,63 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
             });
           }
           const getRouteApp = () => {
-            return (props) => {
-              var _window__SERVER_DATA, _hydrationData;
-              beforeCreateRouter = false;
-              routes = createRoutes ? createRoutes() : (0, _router.createRoutesFromElements)((0, _utils.renderRoutes)({
-                routesConfig: finalRouteConfig,
-                props
-              }));
-              const runner = api.useHookRunners();
-              routes = runner.modifyRoutes(routes);
+            const useCreateRouter = (props) => {
+              var _window__SERVER_DATA;
               const baseUrl = ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
               const _basename = baseUrl === "/" ? (0, _utils.urlJoin)(baseUrl, basename) : baseUrl;
               let hydrationData = window._ROUTER_DATA;
-              if ((_hydrationData = hydrationData) === null || _hydrationData === void 0 ? void 0 : _hydrationData.errors) {
-                hydrationData = {
-                  ...hydrationData,
-                  errors: (0, _utils.deserializeErrors)(hydrationData.errors)
-                };
-              }
-              const router = supportHtml5History ? (0, _router.createBrowserRouter)(routes, {
-                basename: _basename,
-                hydrationData
-              }) : (0, _router.createHashRouter)(routes, {
-                basename: _basename,
-                hydrationData
-              });
               const runtimeContext = (0, _react.useContext)(_core.RuntimeReactContext);
-              if (!runtimeContext.remixRouter) {
+              const { unstable_getBlockNavState: getBlockNavState } = runtimeContext;
+              return (0, _react.useMemo)(() => {
+                var _hydrationData;
+                if ((_hydrationData = hydrationData) === null || _hydrationData === void 0 ? void 0 : _hydrationData.errors) {
+                  hydrationData = {
+                    ...hydrationData,
+                    errors: (0, _utils.deserializeErrors)(hydrationData.errors)
+                  };
+                }
+                routes = createRoutes ? createRoutes() : (0, _router.createRoutesFromElements)((0, _utils.renderRoutes)({
+                  routesConfig: finalRouteConfig,
+                  props
+                }));
+                const runner = api.useHookRunners();
+                routes = runner.modifyRoutes(routes);
+                const router = supportHtml5History ? (0, _router.createBrowserRouter)(routes, {
+                  basename: _basename,
+                  hydrationData
+                }) : (0, _router.createHashRouter)(routes, {
+                  basename: _basename,
+                  hydrationData
+                });
+                const originSubscribe = router.subscribe;
+                router.subscribe = (listener) => {
+                  const wrapedListener = (...args) => {
+                    const blockRoute = getBlockNavState ? getBlockNavState() : false;
+                    if (blockRoute) {
+                      return;
+                    }
+                    return listener(...args);
+                  };
+                  return originSubscribe(wrapedListener);
+                };
                 Object.defineProperty(runtimeContext, "remixRouter", {
                   get() {
                     return router;
-                  }
+                  },
+                  configurable: true
                 });
-              }
-              const originSubscribe = router.subscribe;
-              router.subscribe = (listener) => {
-                const wrapedListener = (...args) => {
-                  const getBlockNavState = runtimeContext.unstable_getBlockNavState;
-                  const blockRoute = getBlockNavState ? getBlockNavState() : false;
-                  if (blockRoute) {
-                    return;
-                  }
-                  return listener(...args);
-                };
-                return originSubscribe(wrapedListener);
-              };
+                return router;
+              }, [
+                finalRouteConfig,
+                props,
+                _basename,
+                hydrationData,
+                getBlockNavState
+              ]);
+            };
+            return (props) => {
+              beforeCreateRouter = false;
+              const router = useCreateRouter(props);
               return /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
                 ...props,
                 children: /* @__PURE__ */ (0, _jsxruntime.jsx)(_router.RouterProvider, {

package/dist/esm/document/Body.js

@@ -3,7 +3,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useContext } from "react";
-import { DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER } from "./constants";
+import { BODY_PARTICALS_SEPARATOR, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER } from "./constants";
 import { DocumentStructureContext } from "./DocumentStructureContext";
 import { DefaultRoot } from "./Root";
 export function Body(props) {
@@ -15,6 +15,7 @@ export function Body(props) {
     children: [
       hasSetRoot ? null : /* @__PURE__ */ _jsx(DefaultRoot, {}),
       children,
+      "".concat(BODY_PARTICALS_SEPARATOR),
       "".concat(DOCUMENT_CHUNKSMAP_PLACEHOLDER),
       "".concat(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER)
     ]

package/dist/esm/document/Head.js

@@ -6,7 +6,7 @@ import { useContext } from "react";
 import { DocumentStructureContext } from "./DocumentStructureContext";
 import { Scripts } from "./Scripts";
 import { Links } from "./Links";
-import { DOCUMENT_META_PLACEHOLDER } from "./constants";
+import { DOCUMENT_META_PLACEHOLDER, HEAD_PARTICALS_SEPARATOR, TOP_PARTICALS_SEPARATOR } from "./constants";
 export function Head(props) {
   var _useContext = useContext(DocumentStructureContext), hasSetScripts = _useContext.hasSetScripts, hasSetLinks = _useContext.hasSetLinks;
   var children = props.children, rest = _object_without_properties(props, [
@@ -14,9 +14,11 @@ export function Head(props) {
   ]);
   return /* @__PURE__ */ _jsxs("head", _object_spread_props(_object_spread({}, rest), {
     children: [
+      "".concat(TOP_PARTICALS_SEPARATOR),
       "".concat(DOCUMENT_META_PLACEHOLDER),
       !hasSetLinks && /* @__PURE__ */ _jsx(Links, {}),
       !hasSetScripts && /* @__PURE__ */ _jsx(Scripts, {}),
+      "".concat(HEAD_PARTICALS_SEPARATOR),
       children
     ]
   }));

package/dist/esm/document/cli/index.js

@@ -8,7 +8,7 @@ import ReactDomServer from "react-dom/server";
 import { build } from "esbuild";
 import { createDebugger, findExists, fs } from "@modern-js/utils";
 import { DocumentContext } from "../DocumentContext";
-import { DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_LINKS_PLACEHOLDER, DOCUMENT_FILE_NAME, DOCUMENT_META_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP, DOC_EXT, DOCUMENT_SSR_PLACEHOLDER, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SCRIPT_PLACEHOLDER_END, HTML_SEPARATOR, DOCUMENT_COMMENT_PLACEHOLDER_START, DOCUMENT_COMMENT_PLACEHOLDER_END, DOCUMENT_STYLE_PLACEHOLDER_START, DOCUMENT_STYLE_PLACEHOLDER_END } from "../constants";
+import { DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_LINKS_PLACEHOLDER, DOCUMENT_FILE_NAME, DOCUMENT_META_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP, DOC_EXT, DOCUMENT_SSR_PLACEHOLDER, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SCRIPT_PLACEHOLDER_END, HTML_SEPARATOR, DOCUMENT_COMMENT_PLACEHOLDER_START, DOCUMENT_COMMENT_PLACEHOLDER_END, DOCUMENT_STYLE_PLACEHOLDER_START, DOCUMENT_STYLE_PLACEHOLDER_END, TOP_PARTICALS_SEPARATOR, HEAD_PARTICALS_SEPARATOR, BODY_PARTICALS_SEPARATOR } from "../constants";
 var debug = createDebugger("html_genarate");
 export var getDocumenByEntryName = function getDocumenByEntryName2(entrypoints, entryName, fallbackDir) {
   var _entrypoints_find;
@@ -57,7 +57,7 @@ export var documentPlugin = function() {
             }
             return function() {
               var _ref2 = _async_to_generator(function(param) {
-                var htmlWebpackPlugin, _tsConfig, config, documentParams, tempTsConfigFile, userTsConfigFilePath, tsConfig, err, htmlOutputFile, Document, HTMLElement, html, scripts, links, metas, nonce, nonceAttr, finalHtml;
+                var htmlWebpackPlugin, _tsConfig, _partialsByEntrypoint, config, documentParams, tempTsConfigFile, userTsConfigFilePath, tsConfig, err, htmlOutputFile, Document, HTMLElement, html, partialsByEntrypoint, scripts, partialsTop, partialsHead, partialsBody, links, metas, nonce, nonceAttr, finalHtml;
                 return _ts_generator(this, function(_state2) {
                   switch (_state2.label) {
                     case 0:
@@ -156,12 +156,19 @@ export var documentPlugin = function() {
                       }, React.createElement(Document, null));
                       html = ReactDomServer.renderToStaticMarkup(HTMLElement);
                       debug("entry %s's document jsx rendered html: %o", entryName, html);
+                      partialsByEntrypoint = api.useAppContext().partialsByEntrypoint;
                       scripts = [
                         htmlWebpackPlugin.tags.headTags.filter(function(item) {
                           return item.tagName === "script";
                         }).join(""),
                         htmlWebpackPlugin.tags.bodyTags.toString()
                       ].join("");
+                      if ((_partialsByEntrypoint = partialsByEntrypoint) === null || _partialsByEntrypoint === void 0 ? void 0 : _partialsByEntrypoint[entryName]) {
+                        partialsTop = partialsByEntrypoint[entryName].top.join("\n");
+                        partialsHead = partialsByEntrypoint[entryName].head.join("\n");
+                        partialsBody = partialsByEntrypoint[entryName].body.join("\n");
+                        html = html.replace(TOP_PARTICALS_SEPARATOR, partialsTop).replace(HEAD_PARTICALS_SEPARATOR, partialsHead).replace(BODY_PARTICALS_SEPARATOR, partialsBody);
+                      }
                       links = [
                         htmlWebpackPlugin.tags.headTags.filter(function(item) {
                           return item.tagName === "link";

package/dist/esm/document/constants.js

@@ -8,6 +8,9 @@ export var DOC_EXT = [
 ];
 export var DOCUMENT_META_PLACEHOLDER = encodeURIComponent("<%= meta %>");
 export var HTML_SEPARATOR = "<!--<?- html ?>-->";
+export var HEAD_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.head ?>-->");
+export var BODY_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.body ?>-->");
+export var TOP_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.top ?>-->");
 export var HTML_SSRDATASCRIPT_SEPARATOR = "<!--<?- SSRDataScript ?>-->";
 export var DOCUMENT_SSR_PLACEHOLDER = encodeURIComponent(HTML_SEPARATOR);
 export var DOCUMENT_CHUNKSMAP_PLACEHOLDER = encodeURIComponent(HTML_CHUNKSMAP_SEPARATOR);

package/dist/esm/router/runtime/plugin.js

@@ -2,7 +2,7 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useContext } from "react";
+import { useContext, useMemo } from "react";
 import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "@modern-js/utils/runtime/router";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
@@ -63,53 +63,65 @@ export var routerPlugin = function(param) {
             });
           }
           var getRouteApp = function() {
-            return function(props) {
-              var _window__SERVER_DATA, _hydrationData;
-              beforeCreateRouter = false;
-              routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
-                routesConfig: finalRouteConfig,
-                props: props
-              }));
-              var runner = api.useHookRunners();
-              routes = runner.modifyRoutes(routes);
+            var useCreateRouter = function(props) {
+              var _window__SERVER_DATA;
               var baseUrl = ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
               var _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
               var hydrationData = window._ROUTER_DATA;
-              if ((_hydrationData = hydrationData) === null || _hydrationData === void 0 ? void 0 : _hydrationData.errors) {
-                hydrationData = _object_spread_props(_object_spread({}, hydrationData), {
-                  errors: deserializeErrors(hydrationData.errors)
-                });
-              }
-              var router = supportHtml5History ? createBrowserRouter(routes, {
-                basename: _basename,
-                hydrationData: hydrationData
-              }) : createHashRouter(routes, {
-                basename: _basename,
-                hydrationData: hydrationData
-              });
               var runtimeContext = useContext(RuntimeReactContext);
-              if (!runtimeContext.remixRouter) {
+              var getBlockNavState = runtimeContext.unstable_getBlockNavState;
+              return useMemo(function() {
+                var _hydrationData;
+                if ((_hydrationData = hydrationData) === null || _hydrationData === void 0 ? void 0 : _hydrationData.errors) {
+                  hydrationData = _object_spread_props(_object_spread({}, hydrationData), {
+                    errors: deserializeErrors(hydrationData.errors)
+                  });
+                }
+                routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
+                  routesConfig: finalRouteConfig,
+                  props: props
+                }));
+                var runner = api.useHookRunners();
+                routes = runner.modifyRoutes(routes);
+                var router = supportHtml5History ? createBrowserRouter(routes, {
+                  basename: _basename,
+                  hydrationData: hydrationData
+                }) : createHashRouter(routes, {
+                  basename: _basename,
+                  hydrationData: hydrationData
+                });
+                var originSubscribe = router.subscribe;
+                router.subscribe = function(listener) {
+                  var wrapedListener = function() {
+                    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+                      args[_key] = arguments[_key];
+                    }
+                    var blockRoute = getBlockNavState ? getBlockNavState() : false;
+                    if (blockRoute) {
+                      return;
+                    }
+                    return listener.apply(void 0, _to_consumable_array(args));
+                  };
+                  return originSubscribe(wrapedListener);
+                };
                 Object.defineProperty(runtimeContext, "remixRouter", {
                   get: function get() {
                     return router;
-                  }
+                  },
+                  configurable: true
                 });
-              }
-              var originSubscribe = router.subscribe;
-              router.subscribe = function(listener) {
-                var wrapedListener = function() {
-                  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-                    args[_key] = arguments[_key];
-                  }
-                  var getBlockNavState = runtimeContext.unstable_getBlockNavState;
-                  var blockRoute = getBlockNavState ? getBlockNavState() : false;
-                  if (blockRoute) {
-                    return;
-                  }
-                  return listener.apply(void 0, _to_consumable_array(args));
-                };
-                return originSubscribe(wrapedListener);
-              };
+                return router;
+              }, [
+                finalRouteConfig,
+                props,
+                _basename,
+                hydrationData,
+                getBlockNavState
+              ]);
+            };
+            return function(props) {
+              beforeCreateRouter = false;
+              var router = useCreateRouter(props);
               return /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
                 children: /* @__PURE__ */ _jsx(RouterProvider, {
                   router: router

package/dist/esm-node/document/Body.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useContext } from "react";
-import { DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER } from "./constants";
+import { BODY_PARTICALS_SEPARATOR, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER } from "./constants";
 import { DocumentStructureContext } from "./DocumentStructureContext";
 import { DefaultRoot } from "./Root";
 export function Body(props) {
@@ -11,6 +11,7 @@ export function Body(props) {
     children: [
       hasSetRoot ? null : /* @__PURE__ */ _jsx(DefaultRoot, {}),
       children,
+      `${BODY_PARTICALS_SEPARATOR}`,
       `${DOCUMENT_CHUNKSMAP_PLACEHOLDER}`,
       `${DOCUMENT_SSRDATASCRIPT_PLACEHOLDER}`
     ]

package/dist/esm-node/document/Head.js

@@ -3,16 +3,18 @@ import { useContext } from "react";
 import { DocumentStructureContext } from "./DocumentStructureContext";
 import { Scripts } from "./Scripts";
 import { Links } from "./Links";
-import { DOCUMENT_META_PLACEHOLDER } from "./constants";
+import { DOCUMENT_META_PLACEHOLDER, HEAD_PARTICALS_SEPARATOR, TOP_PARTICALS_SEPARATOR } from "./constants";
 export function Head(props) {
   const { hasSetScripts, hasSetLinks } = useContext(DocumentStructureContext);
   const { children, ...rest } = props;
   return /* @__PURE__ */ _jsxs("head", {
     ...rest,
     children: [
+      `${TOP_PARTICALS_SEPARATOR}`,
       `${DOCUMENT_META_PLACEHOLDER}`,
       !hasSetLinks && /* @__PURE__ */ _jsx(Links, {}),
       !hasSetScripts && /* @__PURE__ */ _jsx(Scripts, {}),
+      `${HEAD_PARTICALS_SEPARATOR}`,
       children
     ]
   });

package/dist/esm-node/document/cli/index.js

@@ -4,7 +4,7 @@ import ReactDomServer from "react-dom/server";
 import { build } from "esbuild";
 import { createDebugger, findExists, fs } from "@modern-js/utils";
 import { DocumentContext } from "../DocumentContext";
-import { DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_LINKS_PLACEHOLDER, DOCUMENT_FILE_NAME, DOCUMENT_META_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP, DOC_EXT, DOCUMENT_SSR_PLACEHOLDER, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SCRIPT_PLACEHOLDER_END, HTML_SEPARATOR, DOCUMENT_COMMENT_PLACEHOLDER_START, DOCUMENT_COMMENT_PLACEHOLDER_END, DOCUMENT_STYLE_PLACEHOLDER_START, DOCUMENT_STYLE_PLACEHOLDER_END } from "../constants";
+import { DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_LINKS_PLACEHOLDER, DOCUMENT_FILE_NAME, DOCUMENT_META_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP, DOC_EXT, DOCUMENT_SSR_PLACEHOLDER, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SCRIPT_PLACEHOLDER_END, HTML_SEPARATOR, DOCUMENT_COMMENT_PLACEHOLDER_START, DOCUMENT_COMMENT_PLACEHOLDER_END, DOCUMENT_STYLE_PLACEHOLDER_START, DOCUMENT_STYLE_PLACEHOLDER_END, TOP_PARTICALS_SEPARATOR, HEAD_PARTICALS_SEPARATOR, BODY_PARTICALS_SEPARATOR } from "../constants";
 const debug = createDebugger("html_genarate");
 export const getDocumenByEntryName = function(entrypoints, entryName, fallbackDir) {
   var _entrypoints_find;
@@ -45,7 +45,7 @@ export const documentPlugin = () => ({
         return null;
       }
       return async ({ htmlWebpackPlugin }) => {
-        var _tsConfig;
+        var _tsConfig, _partialsByEntrypoint;
         const config = api.useResolvedConfigContext();
         const documentParams = getDocParams({
           config,
@@ -110,10 +110,17 @@ export const documentPlugin = () => ({
         }, React.createElement(Document, null));
         let html = ReactDomServer.renderToStaticMarkup(HTMLElement);
         debug("entry %s's document jsx rendered html: %o", entryName, html);
+        const { partialsByEntrypoint } = api.useAppContext();
         const scripts = [
           htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "script").join(""),
           htmlWebpackPlugin.tags.bodyTags.toString()
         ].join("");
+        if ((_partialsByEntrypoint = partialsByEntrypoint) === null || _partialsByEntrypoint === void 0 ? void 0 : _partialsByEntrypoint[entryName]) {
+          const partialsTop = partialsByEntrypoint[entryName].top.join("\n");
+          const partialsHead = partialsByEntrypoint[entryName].head.join("\n");
+          const partialsBody = partialsByEntrypoint[entryName].body.join("\n");
+          html = html.replace(TOP_PARTICALS_SEPARATOR, partialsTop).replace(HEAD_PARTICALS_SEPARATOR, partialsHead).replace(BODY_PARTICALS_SEPARATOR, partialsBody);
+        }
         const links = [
           htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "link").join("")
         ].join("");

package/dist/esm-node/document/constants.js

@@ -7,6 +7,9 @@ export const DOC_EXT = [
 ];
 export const DOCUMENT_META_PLACEHOLDER = encodeURIComponent("<%= meta %>");
 export const HTML_SEPARATOR = "<!--<?- html ?>-->";
+export const HEAD_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.head ?>-->");
+export const BODY_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.body ?>-->");
+export const TOP_PARTICALS_SEPARATOR = encodeURIComponent("<!--<?- partials.top ?>-->");
 export const HTML_SSRDATASCRIPT_SEPARATOR = "<!--<?- SSRDataScript ?>-->";
 export const DOCUMENT_SSR_PLACEHOLDER = encodeURIComponent(HTML_SEPARATOR);
 export const DOCUMENT_CHUNKSMAP_PLACEHOLDER = encodeURIComponent(HTML_CHUNKSMAP_SEPARATOR);

package/dist/esm-node/router/runtime/plugin.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useContext } from "react";
+import { useContext, useMemo } from "react";
 import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "@modern-js/utils/runtime/router";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
@@ -53,51 +53,63 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
             });
           }
           const getRouteApp = () => {
-            return (props) => {
-              var _window__SERVER_DATA, _hydrationData;
-              beforeCreateRouter = false;
-              routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
-                routesConfig: finalRouteConfig,
-                props
-              }));
-              const runner = api.useHookRunners();
-              routes = runner.modifyRoutes(routes);
+            const useCreateRouter = (props) => {
+              var _window__SERVER_DATA;
               const baseUrl = ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
               const _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
               let hydrationData = window._ROUTER_DATA;
-              if ((_hydrationData = hydrationData) === null || _hydrationData === void 0 ? void 0 : _hydrationData.errors) {
-                hydrationData = {
-                  ...hydrationData,
-                  errors: deserializeErrors(hydrationData.errors)
-                };
-              }
-              const router = supportHtml5History ? createBrowserRouter(routes, {
-                basename: _basename,
-                hydrationData
-              }) : createHashRouter(routes, {
-                basename: _basename,
-                hydrationData
-              });
               const runtimeContext = useContext(RuntimeReactContext);
-              if (!runtimeContext.remixRouter) {
+              const { unstable_getBlockNavState: getBlockNavState } = runtimeContext;
+              return useMemo(() => {
+                var _hydrationData;
+                if ((_hydrationData = hydrationData) === null || _hydrationData === void 0 ? void 0 : _hydrationData.errors) {
+                  hydrationData = {
+                    ...hydrationData,
+                    errors: deserializeErrors(hydrationData.errors)
+                  };
+                }
+                routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
+                  routesConfig: finalRouteConfig,
+                  props
+                }));
+                const runner = api.useHookRunners();
+                routes = runner.modifyRoutes(routes);
+                const router = supportHtml5History ? createBrowserRouter(routes, {
+                  basename: _basename,
+                  hydrationData
+                }) : createHashRouter(routes, {
+                  basename: _basename,
+                  hydrationData
+                });
+                const originSubscribe = router.subscribe;
+                router.subscribe = (listener) => {
+                  const wrapedListener = (...args) => {
+                    const blockRoute = getBlockNavState ? getBlockNavState() : false;
+                    if (blockRoute) {
+                      return;
+                    }
+                    return listener(...args);
+                  };
+                  return originSubscribe(wrapedListener);
+                };
                 Object.defineProperty(runtimeContext, "remixRouter", {
                   get() {
                     return router;
-                  }
+                  },
+                  configurable: true
                 });
-              }
-              const originSubscribe = router.subscribe;
-              router.subscribe = (listener) => {
-                const wrapedListener = (...args) => {
-                  const getBlockNavState = runtimeContext.unstable_getBlockNavState;
-                  const blockRoute = getBlockNavState ? getBlockNavState() : false;
-                  if (blockRoute) {
-                    return;
-                  }
-                  return listener(...args);
-                };
-                return originSubscribe(wrapedListener);
-              };
+                return router;
+              }, [
+                finalRouteConfig,
+                props,
+                _basename,
+                hydrationData,
+                getBlockNavState
+              ]);
+            };
+            return (props) => {
+              beforeCreateRouter = false;
+              const router = useCreateRouter(props);
               return /* @__PURE__ */ _jsx(App, {
                 ...props,
                 children: /* @__PURE__ */ _jsx(RouterProvider, {

package/dist/types/document/constants.d.ts

@@ -1,6 +1,9 @@
 export declare const DOC_EXT: string[];
 export declare const DOCUMENT_META_PLACEHOLDER: string;
 export declare const HTML_SEPARATOR = "<!--<?- html ?>-->";
+export declare const HEAD_PARTICALS_SEPARATOR: string;
+export declare const BODY_PARTICALS_SEPARATOR: string;
+export declare const TOP_PARTICALS_SEPARATOR: string;
 export declare const HTML_SSRDATASCRIPT_SEPARATOR = "<!--<?- SSRDataScript ?>-->";
 export declare const DOCUMENT_SSR_PLACEHOLDER: string;
 export declare const DOCUMENT_CHUNKSMAP_PLACEHOLDER: string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.30.0",
+  "version": "2.31.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -173,9 +173,9 @@
     "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/plugin": "2.30.0",
-    "@modern-js/utils": "2.30.0",
-    "@modern-js/types": "2.30.0"
+    "@modern-js/plugin": "2.31.0",
+    "@modern-js/types": "2.31.0",
+    "@modern-js/utils": "2.31.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -196,11 +196,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@modern-js/app-tools": "2.30.0",
-    "@modern-js/server-core": "2.30.0",
-    "@modern-js/core": "2.30.0",
-    "@scripts/jest-config": "2.30.0",
-    "@scripts/build": "2.30.0"
+    "@modern-js/app-tools": "2.31.0",
+    "@modern-js/core": "2.31.0",
+    "@modern-js/server-core": "2.31.0",
+    "@scripts/jest-config": "2.31.0",
+    "@scripts/build": "2.31.0"
   },
   "sideEffects": false,
   "publishConfig": {