@modern-js/runtime 2.0.0-beta.5 → 2.0.0-beta.6

package/CHANGELOG.md

@@ -1,5 +1,138 @@
 # @modern-js/runtime
 
+## 2.0.0-beta.6
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- c9e800d39a: feat: support React18 streaming SSR
+  feat: 支持 React18 流式 SSR
+- df7ee2d: feat: runtime user config types extends
+  feat: runtime 用户配置类型扩展
+- 543be9558e: feat: compile server loader and support handle loader request
+  feat: 编译 server loader 并支持处理 loader 的请求
+
+### Patch Changes
+
+- 2344eb26ed: fix: bootstrap function params type define
+
+  fix: 修复 bootstrap 函数参数类型定义
+
+- a11fcf8b50: feat: fallback logic of streaming ssr
+  feat: streaming ssr 降级逻辑
+- a93159440e: feat: support modify routes for csr app
+  feat: 支持 modifyRoutes API
+- e7ce0636d1: fix: root layout css chunks should't be loaded
+  fix: 不应该加载 root layout 的 css chunks
+- b18fa8f3ed: feat: remove @loadable/component in streaming ssr
+  feat: 移除 streaming ssr 中的 @loadable/component 逻辑
+- 50d4675e5b: fix: add document cli export
+
+  fix: 增加 document cli 插件的导出
+
+- 6604f1b8b3: feat: support router basename
+  feat: router 插件支持设置 basename
+- fda836fe8a: feat: support `models`,`initialState` config for state plugin
+  feat: state 插件支持`model`,`initialState` 配置
+- d6bc321747: fix: the Document.tsx missed hmr
+
+  fix: Document.tsx 未能引发 hmr
+
+- 3e57f2bd58: feat: add document feature with plugin
+
+  feat: 增加 document 功能插件
+
+- 2e6031955e: fix: some optimizations for router and loader
+  fix: 一些 router 和 loader 的优化
+  q
+- c5798d284f: fix(runtime): apply babel-plugin-ssr-loader-id when SSR is not used
+
+  fix(runtime): 在未启动 SSR 时需要注册 babel-plugin-ssr-loader-id
+
+- fbf5eed5aa: fix: fix ssg failure due to lack of Web Response API
+  fix: 修复因为缺少 Web Response API 而导致 ssg 失败
+- a2509bfbdb: feat: bump esbuild from 0.14.38 to 0.15.7
+
+  feat: 将 esbuild 从 0.14.38 版本升级至 0.15.7 版本
+
+- a7c68832b3: fix: only register babel-plugin-ssr-loader-id when SSR is enabled
+
+  fix: 仅在开启 SSR 的场景下注册 babel-plugin-ssr-loader-id
+
+- 425e57092d: feat: export react-router-dom/server staticRouter
+  feat: 导出 react-router-dom/server 的 staticRouter 组件
+- e4357f1856: fix: change default document file and name
+
+  fix: 重置默认的 document 文件和文件名
+
+- 4369648ae2: fix: fix html template of streaming ssr
+  fix: 修复流式渲染的 html 模版
+- 92c0994468: chore: remove `registerPrefetch`
+  chore: 移除 `registerPrefetch`
+- 2cc2eb35ba: fix: fix state plugin config
+  fix: 修复 state 插件 config 参数
+- 6bda14ed71: feat: refactor router with react-router@6.4
+
+  feat: 使用 react-router@6.4 重构路由模块
+
+- 92004d1906: feat: support load chunks parallelly
+  feat: 支持并行加载 chunks
+- 40ed5874c6: feat: inject css chunk into html for streaming ssr
+  feat: streaming ssr 返回的 html 注入 css chunk
+- 60d5378632: fix: function extname should not return array
+  fix: 函数 extname 不应该返回一个数组
+- 8b8e1bb571: feat: support nested routes
+  feat: 支持嵌套路由
+- 3bbea92b2a: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- 21d7521: fix: the Body not use Root jsx
+
+  fix: 修复 Body 里的 Root 引用格式
+
+- 9144c21d27: fix: esbuild config use file
+
+  fix: 更改 esbuild 读取指定 ts 配置
+
+- 18aaf42249: fix: fix server loader redirects
+  fix: 修复 server loader 重定向错误
+- 34702d5d47: feat: support internal env vars: metaName_TARGET
+  feat: 支持内置环境变量 metaName_TARGET
+- fcace5b5b9: fix: remove overmuch `@modernjs/utils` dependency import in ssr runtime & SSR hydrate error
+  fix: 去除 ssr 运行时过多的 `@modernjs/utils` 依赖引入 & SSR hydrate 错误
+- Updated dependencies [7879e8f711]
+- Updated dependencies [6aca875011]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [7b7d12cf8f]
+- Updated dependencies [7efeed4]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [40ed5874c6]
+- Updated dependencies [87c1ff86b9]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [102d32e4ba]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb843]
+- Updated dependencies [f179749375]
+- Updated dependencies [ea7cf06257]
+- Updated dependencies [bbe4c4ab64]
+- Updated dependencies [e4558a0bc4]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/types@2.0.0-beta.6
+  - @modern-js/utils@2.0.0-beta.6
+  - @modern-js/plugin@2.0.0-beta.6
+
 ## 2.0.0-beta.4
 
 ### Major Changes

package/dist/js/modern/document/DocumentStructrueContext.js

@@ -3,7 +3,8 @@ const DocumentStructrueContext = React.createContext({
   hasSetHead: false,
   hasSetScripts: false,
   hasSetBody: false,
-  hasSetRoot: false
+  hasSetRoot: false,
+  hasSetLinks: false
 });
 export {
   DocumentStructrueContext

package/dist/js/modern/document/Head.js

@@ -2,13 +2,15 @@ import { jsx, jsxs } from "react/jsx-runtime";
 import { useContext } from "react";
 import { DocumentStructrueContext } from "./DocumentStructrueContext";
 import { Scripts } from "./Scripts";
+import { Links } from "./Links";
 import { DOCUMENT_META_PLACEHOLDER } from "./constants";
 function Head(props) {
-  const { hasSetScripts } = useContext(DocumentStructrueContext);
+  const { hasSetScripts, hasSetLinks } = useContext(DocumentStructrueContext);
   const { children } = props;
   return /* @__PURE__ */ jsxs("head", {
     children: [
       `${DOCUMENT_META_PLACEHOLDER}`,
+      !hasSetLinks && /* @__PURE__ */ jsx(Links, {}),
       !hasSetScripts && /* @__PURE__ */ jsx(Scripts, {}),
       children
     ]

package/dist/js/modern/document/Html.js

@@ -28,6 +28,7 @@ function Html(props) {
   const { children } = props;
   const hasSetHead = Boolean(findTargetChild("Head", children));
   const hasSetScripts = Boolean(findTargetElement("Scripts", children));
+  const hasSetLinks = Boolean(findTargetElement("Links", children));
   const hasSetBody = Boolean(findTargetChild("Body", children));
   const hasSetRoot = Boolean(findTargetElement("Root", children));
   const notMissMustChild = [
@@ -59,6 +60,7 @@ function Html(props) {
       value: {
         hasSetHead,
         hasSetScripts,
+        hasSetLinks,
         hasSetRoot,
         hasSetBody,
         docChild: children

package/dist/js/modern/document/Links.js

@@ -0,0 +1,10 @@
+import { Fragment, jsx } from "react/jsx-runtime";
+import { DOCUMENT_LINKS_PLACEHOLDER } from "./constants";
+function Links() {
+  return /* @__PURE__ */ jsx(Fragment, {
+    children: DOCUMENT_LINKS_PLACEHOLDER
+  });
+}
+export {
+  Links
+};

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

@@ -42,6 +42,7 @@ 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,
@@ -167,9 +168,14 @@ var cli_default = () => ({
           htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "script").join(""),
           htmlWebpackPlugin.tags.bodyTags.toString()
         ].join("");
+        const links = [
+          htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "link").join("")
+        ].join("");
         const metas = [
           templateParameters.meta,
-          htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName !== "script").join("")
+          htmlWebpackPlugin.tags.headTags.filter(
+            (item) => item.tagName !== "script" && item.tagName !== "link"
+          ).join("")
         ].join("");
         if (html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_START) && html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_END)) {
           html = html.replaceAll(
@@ -180,7 +186,7 @@ var cli_default = () => ({
             (_scriptStr, $1) => `<script>${decodeURIComponent($1)}<\/script>`
           );
         }
-        const finalHtml = `<!DOCTYPE html>${html}`.replace(DOCUMENT_META_PLACEHOLDER, metas).replace(DOCUMENT_SSR_PLACEHOLDER, HTML_SEPARATOR).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(
+        const finalHtml = `<!DOCTYPE html>${html}`.replace(DOCUMENT_META_PLACEHOLDER, metas).replace(DOCUMENT_SSR_PLACEHOLDER, HTML_SEPARATOR).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(DOCUMENT_LINKS_PLACEHOLDER, links).replace(
           DOCUMENT_CHUNKSMAP_PLACEHOLDER,
           PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER]
         ).replace(

package/dist/js/modern/document/constants.js

@@ -14,6 +14,9 @@ const DOCUMENT_FILE_NAME = "Document";
 const DOCUMENT_SCRIPTS_PLACEHOLDER = encodeURIComponent(
   "<!-- chunk scripts placeholder -->"
 );
+const DOCUMENT_LINKS_PLACEHOLDER = encodeURIComponent(
+  "<!-- chunk links placeholder -->"
+);
 const DOCUMENT_NO_SCRIPTE_PLACEHOLDER = encodeURIComponent("<!-- no-script -->");
 const DOCUMENT_SCRIPT_PLACEHOLDER_START = encodeURIComponent(
   "<!-- script-start -->"
@@ -30,6 +33,7 @@ const PLACEHOLDER_REPLACER_MAP = {
 export {
   DOCUMENT_CHUNKSMAP_PLACEHOLDER,
   DOCUMENT_FILE_NAME,
+  DOCUMENT_LINKS_PLACEHOLDER,
   DOCUMENT_META_PLACEHOLDER,
   DOCUMENT_NO_SCRIPTE_PLACEHOLDER,
   DOCUMENT_SCRIPTS_PLACEHOLDER,

package/dist/js/modern/document/index.js

@@ -4,6 +4,7 @@ export * from "./DocumentStructrueContext";
 export * from "./Head";
 export * from "./Body";
 export * from "./Root";
+export * from "./Links";
 export * from "./Scripts";
 export * from "./Script";
 export * from "./constants";

package/dist/js/modern/router/runtime/index.js

@@ -2,6 +2,7 @@ import { routerPlugin } from "./plugin";
 var runtime_default = routerPlugin;
 import { modifyRoutes } from "./plugin";
 export * from "react-router-dom";
+export * from "react-router-dom/server";
 export * from "./withRouter";
 export {
   runtime_default as default,

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

@@ -22,9 +22,7 @@ import {
   createBrowserRouter,
   createHashRouter,
   RouterProvider,
-  createRoutesFromElements,
-  useMatches,
-  useLocation
+  createRoutesFromElements
 } from "react-router-dom";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { renderRoutes, urlJoin } from "./utils";
@@ -56,13 +54,6 @@ const routerPlugin = ({
     name: "@modern-js/plugin-router",
     setup: () => {
       return {
-        init({ context }, next) {
-          context.router = {
-            useMatches,
-            useLocation
-          };
-          return next({ context });
-        },
         hoc: ({ App }, next) => {
           if (!finalRouteConfig && !createRoutes) {
             return next({ App });

package/dist/js/modern/router/runtime/plugin.node.js

@@ -39,10 +39,10 @@ var __async = (__this, __arguments, generator) => {
 };
 import { jsx } from "react/jsx-runtime";
 import { useContext } from "react";
-import { unstable_createStaticHandler as createStaticHandler } from "@remix-run/router";
+import { createStaticHandler } from "@remix-run/router";
 import {
-  unstable_createStaticRouter as createStaticRouter,
-  unstable_StaticRouterProvider as StaticRouterProvider
+  createStaticRouter,
+  StaticRouterProvider
 } from "react-router-dom/server";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { installGlobals } from "@remix-run/node";

package/dist/js/node/document/DocumentStructrueContext.js

@@ -31,7 +31,8 @@ const DocumentStructrueContext = import_react.default.createContext({
   hasSetHead: false,
   hasSetScripts: false,
   hasSetBody: false,
-  hasSetRoot: false
+  hasSetRoot: false,
+  hasSetLinks: false
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -25,13 +25,15 @@ var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
 var import_DocumentStructrueContext = require("./DocumentStructrueContext");
 var import_Scripts = require("./Scripts");
+var import_Links = require("./Links");
 var import_constants = require("./constants");
 function Head(props) {
-  const { hasSetScripts } = (0, import_react.useContext)(import_DocumentStructrueContext.DocumentStructrueContext);
+  const { hasSetScripts, hasSetLinks } = (0, import_react.useContext)(import_DocumentStructrueContext.DocumentStructrueContext);
   const { children } = props;
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("head", {
     children: [
       `${import_constants.DOCUMENT_META_PLACEHOLDER}`,
+      !hasSetLinks && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Links.Links, {}),
       !hasSetScripts && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Scripts.Scripts, {}),
       children
     ]

package/dist/js/node/document/Html.js

@@ -50,6 +50,7 @@ function Html(props) {
   const { children } = props;
   const hasSetHead = Boolean(findTargetChild("Head", children));
   const hasSetScripts = Boolean(findTargetElement("Scripts", children));
+  const hasSetLinks = Boolean(findTargetElement("Links", children));
   const hasSetBody = Boolean(findTargetChild("Body", children));
   const hasSetRoot = Boolean(findTargetElement("Root", children));
   const notMissMustChild = [
@@ -81,6 +82,7 @@ function Html(props) {
       value: {
         hasSetHead,
         hasSetScripts,
+        hasSetLinks,
         hasSetRoot,
         hasSetBody,
         docChild: children

package/dist/js/node/document/Links.js

@@ -0,0 +1,33 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var Links_exports = {};
+__export(Links_exports, {
+  Links: () => Links
+});
+module.exports = __toCommonJS(Links_exports);
+var import_jsx_runtime = require("react/jsx-runtime");
+var import_constants = require("./constants");
+function Links() {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
+    children: import_constants.DOCUMENT_LINKS_PLACEHOLDER
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Links
+});

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

@@ -181,9 +181,14 @@ var cli_default = () => ({
           htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "script").join(""),
           htmlWebpackPlugin.tags.bodyTags.toString()
         ].join("");
+        const links = [
+          htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "link").join("")
+        ].join("");
         const metas = [
           templateParameters.meta,
-          htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName !== "script").join("")
+          htmlWebpackPlugin.tags.headTags.filter(
+            (item) => item.tagName !== "script" && item.tagName !== "link"
+          ).join("")
         ].join("");
         if (html.includes(import_constants.DOCUMENT_SCRIPT_PLACEHOLDER_START) && html.includes(import_constants.DOCUMENT_SCRIPT_PLACEHOLDER_END)) {
           html = html.replaceAll(
@@ -194,7 +199,7 @@ var cli_default = () => ({
             (_scriptStr, $1) => `<script>${decodeURIComponent($1)}<\/script>`
           );
         }
-        const finalHtml = `<!DOCTYPE html>${html}`.replace(import_constants.DOCUMENT_META_PLACEHOLDER, metas).replace(import_constants.DOCUMENT_SSR_PLACEHOLDER, import_constants.HTML_SEPARATOR).replace(import_constants.DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(
+        const finalHtml = `<!DOCTYPE html>${html}`.replace(import_constants.DOCUMENT_META_PLACEHOLDER, metas).replace(import_constants.DOCUMENT_SSR_PLACEHOLDER, import_constants.HTML_SEPARATOR).replace(import_constants.DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(import_constants.DOCUMENT_LINKS_PLACEHOLDER, links).replace(
           import_constants.DOCUMENT_CHUNKSMAP_PLACEHOLDER,
           import_constants.PLACEHOLDER_REPLACER_MAP[import_constants.DOCUMENT_CHUNKSMAP_PLACEHOLDER]
         ).replace(

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

@@ -19,6 +19,7 @@ var constants_exports = {};
 __export(constants_exports, {
   DOCUMENT_CHUNKSMAP_PLACEHOLDER: () => DOCUMENT_CHUNKSMAP_PLACEHOLDER,
   DOCUMENT_FILE_NAME: () => DOCUMENT_FILE_NAME,
+  DOCUMENT_LINKS_PLACEHOLDER: () => DOCUMENT_LINKS_PLACEHOLDER,
   DOCUMENT_META_PLACEHOLDER: () => DOCUMENT_META_PLACEHOLDER,
   DOCUMENT_NO_SCRIPTE_PLACEHOLDER: () => DOCUMENT_NO_SCRIPTE_PLACEHOLDER,
   DOCUMENT_SCRIPTS_PLACEHOLDER: () => DOCUMENT_SCRIPTS_PLACEHOLDER,
@@ -49,6 +50,9 @@ const DOCUMENT_FILE_NAME = "Document";
 const DOCUMENT_SCRIPTS_PLACEHOLDER = encodeURIComponent(
   "<!-- chunk scripts placeholder -->"
 );
+const DOCUMENT_LINKS_PLACEHOLDER = encodeURIComponent(
+  "<!-- chunk links placeholder -->"
+);
 const DOCUMENT_NO_SCRIPTE_PLACEHOLDER = encodeURIComponent("<!-- no-script -->");
 const DOCUMENT_SCRIPT_PLACEHOLDER_START = encodeURIComponent(
   "<!-- script-start -->"
@@ -66,6 +70,7 @@ const PLACEHOLDER_REPLACER_MAP = {
 0 && (module.exports = {
   DOCUMENT_CHUNKSMAP_PLACEHOLDER,
   DOCUMENT_FILE_NAME,
+  DOCUMENT_LINKS_PLACEHOLDER,
   DOCUMENT_META_PLACEHOLDER,
   DOCUMENT_NO_SCRIPTE_PLACEHOLDER,
   DOCUMENT_SCRIPTS_PLACEHOLDER,

package/dist/js/node/document/index.js

@@ -20,6 +20,7 @@ __reExport(document_exports, require("./DocumentStructrueContext"), module.expor
 __reExport(document_exports, require("./Head"), module.exports);
 __reExport(document_exports, require("./Body"), module.exports);
 __reExport(document_exports, require("./Root"), module.exports);
+__reExport(document_exports, require("./Links"), module.exports);
 __reExport(document_exports, require("./Scripts"), module.exports);
 __reExport(document_exports, require("./Script"), module.exports);
 __reExport(document_exports, require("./constants"), module.exports);

package/dist/js/node/router/runtime/index.js

@@ -25,6 +25,7 @@ module.exports = __toCommonJS(runtime_exports);
 var import_plugin = require("./plugin");
 var import_plugin2 = require("./plugin");
 __reExport(runtime_exports, require("react-router-dom"), module.exports);
+__reExport(runtime_exports, require("react-router-dom/server"), module.exports);
 __reExport(runtime_exports, require("./withRouter"), module.exports);
 var runtime_default = import_plugin.routerPlugin;
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -78,13 +78,6 @@ const routerPlugin = ({
     name: "@modern-js/plugin-router",
     setup: () => {
       return {
-        init({ context }, next) {
-          context.router = {
-            useMatches: import_react_router_dom.useMatches,
-            useLocation: import_react_router_dom.useLocation
-          };
-          return next({ context });
-        },
         hoc: ({ App }, next) => {
           if (!finalRouteConfig && !createRoutes) {
             return next({ App });

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

@@ -118,7 +118,7 @@ const routerPlugin = ({
             const baseUrl = request.baseUrl;
             const _basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, basename) : baseUrl;
             const routes = createRoutes ? createRoutes() : (0, import_react_router_dom.createRoutesFromElements)((0, import_utils.renderRoutes)(routesConfig));
-            const { query } = (0, import_router.unstable_createStaticHandler)(routes, {
+            const { query } = (0, import_router.createStaticHandler)(routes, {
               basename: _basename
             });
             const remixRequest = createFetchRequest(request);
@@ -126,7 +126,7 @@ const routerPlugin = ({
             if (routerContext instanceof Response) {
               return routerContext;
             }
-            const router = (0, import_server.unstable_createStaticRouter)(routes, routerContext);
+            const router = (0, import_server.createStaticRouter)(routes, routerContext);
             context.router = router;
             context.routerContext = routerContext;
             context.routes = routes;
@@ -142,7 +142,7 @@ const routerPlugin = ({
             return (props) => {
               const { router, routerContext } = (0, import_react.useContext)(import_core.RuntimeReactContext);
               return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, __spreadProps(__spreadValues({}, props), {
-                children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_server.unstable_StaticRouterProvider, {
+                children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_server.StaticRouterProvider, {
                   router,
                   context: routerContext,
                   nonce: "the-nonce"

package/dist/js/treeshaking/document/DocumentStructrueContext.js

@@ -3,6 +3,7 @@ var DocumentStructrueContext = React.createContext({
     hasSetHead: false,
     hasSetScripts: false,
     hasSetBody: false,
-    hasSetRoot: false
+    hasSetRoot: false,
+    hasSetLinks: false
 });
 export { DocumentStructrueContext };

package/dist/js/treeshaking/document/Head.js

@@ -2,13 +2,15 @@ import { jsx, jsxs } from "react/jsx-runtime";
 import { useContext } from "react";
 import { DocumentStructrueContext } from "./DocumentStructrueContext";
 import { Scripts } from "./Scripts";
+import { Links } from "./Links";
 import { DOCUMENT_META_PLACEHOLDER } from "./constants";
 function Head(props) {
-    var hasSetScripts = useContext(DocumentStructrueContext).hasSetScripts;
+    var ref = useContext(DocumentStructrueContext), hasSetScripts = ref.hasSetScripts, hasSetLinks = ref.hasSetLinks;
     var children = props.children;
     return /* @__PURE__ */ jsxs("head", {
         children: [
             "".concat(DOCUMENT_META_PLACEHOLDER),
+            !hasSetLinks && /* @__PURE__ */ jsx(Links, {}),
             !hasSetScripts && /* @__PURE__ */ jsx(Scripts, {}),
             children
         ]

package/dist/js/treeshaking/document/Html.js

@@ -47,6 +47,7 @@ function Html(props) {
     var children = props.children;
     var hasSetHead = Boolean(findTargetChild("Head", children));
     var hasSetScripts = Boolean(findTargetElement("Scripts", children));
+    var hasSetLinks = Boolean(findTargetElement("Links", children));
     var hasSetBody = Boolean(findTargetChild("Body", children));
     var hasSetRoot = Boolean(findTargetElement("Root", children));
     var notMissMustChild = [
@@ -82,6 +83,7 @@ function Html(props) {
             value: {
                 hasSetHead: hasSetHead,
                 hasSetScripts: hasSetScripts,
+                hasSetLinks: hasSetLinks,
                 hasSetRoot: hasSetRoot,
                 hasSetBody: hasSetBody,
                 docChild: children

package/dist/js/treeshaking/document/Links.js

@@ -0,0 +1,8 @@
+import { Fragment, jsx } from "react/jsx-runtime";
+import { DOCUMENT_LINKS_PLACEHOLDER } from "./constants";
+function Links() {
+    return /* @__PURE__ */ jsx(Fragment, {
+        children: DOCUMENT_LINKS_PLACEHOLDER
+    });
+}
+export { Links };

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

@@ -181,7 +181,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_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 } 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 } from "../constants";
 var debug = createDebugger("html_genarate");
 var getDocumenByEntryName = function getDocumenByEntryName(entrypoints, entryName, fallbackDir) {
     var ref;
@@ -230,7 +230,7 @@ var cli_default = function() {
                         }
                         return function() {
                             var _ref = _asyncToGenerator(function(param) {
-                                var htmlWebpackPlugin, documentParams, tempTsConfigFile, userTsConfigFilePath, tsConfig, err, htmlOutputFile, Document, HTMLElement, html, scripts, metas, finalHtml;
+                                var htmlWebpackPlugin, documentParams, tempTsConfigFile, userTsConfigFilePath, tsConfig, err, htmlOutputFile, Document, HTMLElement, html, scripts, links, metas, finalHtml;
                                 return __generator(this, function(_state) {
                                     switch(_state.label){
                                         case 0:
@@ -333,10 +333,15 @@ var cli_default = function() {
                                                 }).join(""),
                                                 htmlWebpackPlugin.tags.bodyTags.toString()
                                             ].join("");
+                                            links = [
+                                                htmlWebpackPlugin.tags.headTags.filter(function(item) {
+                                                    return item.tagName === "link";
+                                                }).join("")
+                                            ].join("");
                                             metas = [
                                                 templateParameters.meta,
                                                 htmlWebpackPlugin.tags.headTags.filter(function(item) {
-                                                    return item.tagName !== "script";
+                                                    return item.tagName !== "script" && item.tagName !== "link";
                                                 }).join("")
                                             ].join("");
                                             if (html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_START) && html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_END)) {
@@ -344,7 +349,7 @@ var cli_default = function() {
                                                     return "<script>".concat(decodeURIComponent($1), "</script>");
                                                 });
                                             }
-                                            finalHtml = "<!DOCTYPE html>".concat(html).replace(DOCUMENT_META_PLACEHOLDER, metas).replace(DOCUMENT_SSR_PLACEHOLDER, HTML_SEPARATOR).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(DOCUMENT_CHUNKSMAP_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]);
+                                            finalHtml = "<!DOCTYPE html>".concat(html).replace(DOCUMENT_META_PLACEHOLDER, metas).replace(DOCUMENT_SSR_PLACEHOLDER, HTML_SEPARATOR).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(DOCUMENT_LINKS_PLACEHOLDER, links).replace(DOCUMENT_CHUNKSMAP_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]);
                                             return [
                                                 2,
                                                 finalHtml

package/dist/js/treeshaking/document/constants.js

@@ -26,9 +26,10 @@ var DOCUMENT_CHUNKSMAP_PLACEHOLDER = encodeURIComponent(HTML_CHUNKSMAP_SEPARATOR
 var DOCUMENT_SSRDATASCRIPT_PLACEHOLDER = encodeURIComponent(HTML_SSRDATASCRIPT_SEPARATOR);
 var DOCUMENT_FILE_NAME = "Document";
 var DOCUMENT_SCRIPTS_PLACEHOLDER = encodeURIComponent("<!-- chunk scripts placeholder -->");
+var DOCUMENT_LINKS_PLACEHOLDER = encodeURIComponent("<!-- chunk links placeholder -->");
 var DOCUMENT_NO_SCRIPTE_PLACEHOLDER = encodeURIComponent("<!-- no-script -->");
 var DOCUMENT_SCRIPT_PLACEHOLDER_START = encodeURIComponent("<!-- script-start -->");
 var DOCUMENT_SCRIPT_PLACEHOLDER_END = encodeURIComponent("<!-- script-end -->");
 var _obj;
 var PLACEHOLDER_REPLACER_MAP = (_obj = {}, _defineProperty(_obj, DOCUMENT_NO_SCRIPTE_PLACEHOLDER, "We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue."), _defineProperty(_obj, DOCUMENT_SSR_PLACEHOLDER, HTML_SEPARATOR), _defineProperty(_obj, DOCUMENT_CHUNKSMAP_PLACEHOLDER, HTML_CHUNKSMAP_SEPARATOR), _defineProperty(_obj, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, HTML_SSRDATASCRIPT_SEPARATOR), _obj);
-export { DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_FILE_NAME, DOCUMENT_META_PLACEHOLDER, DOCUMENT_NO_SCRIPTE_PLACEHOLDER, DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_SCRIPT_PLACEHOLDER_END, DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, DOCUMENT_SSR_PLACEHOLDER, DOC_EXT, HTML_CHUNKSMAP_SEPARATOR, HTML_SEPARATOR, HTML_SSRDATASCRIPT_SEPARATOR, PLACEHOLDER_REPLACER_MAP };
+export { DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_FILE_NAME, DOCUMENT_LINKS_PLACEHOLDER, DOCUMENT_META_PLACEHOLDER, DOCUMENT_NO_SCRIPTE_PLACEHOLDER, DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_SCRIPT_PLACEHOLDER_END, DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, DOCUMENT_SSR_PLACEHOLDER, DOC_EXT, HTML_CHUNKSMAP_SEPARATOR, HTML_SEPARATOR, HTML_SSRDATASCRIPT_SEPARATOR, PLACEHOLDER_REPLACER_MAP };

package/dist/js/treeshaking/document/index.js

@@ -4,6 +4,7 @@ export * from "./DocumentStructrueContext";
 export * from "./Head";
 export * from "./Body";
 export * from "./Root";
+export * from "./Links";
 export * from "./Scripts";
 export * from "./Script";
 export * from "./constants";

package/dist/js/treeshaking/router/runtime/index.js

@@ -2,5 +2,6 @@ import { routerPlugin } from "./plugin";
 var runtime_default = routerPlugin;
 import { modifyRoutes } from "./plugin";
 export * from "react-router-dom";
+export * from "react-router-dom/server";
 export * from "./withRouter";
 export { runtime_default as default, modifyRoutes };

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

@@ -51,7 +51,7 @@ function _objectSpreadProps(target, source) {
     return target;
 }
 import { jsx } from "react/jsx-runtime";
-import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "react-router-dom";
+import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements } from "react-router-dom";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { renderRoutes, urlJoin } from "./utils";
 var finalRouteConfig = {
@@ -79,16 +79,6 @@ var routerPlugin = function(param) {
         name: "@modern-js/plugin-router",
         setup: function() {
             return {
-                init: function init(param, next) {
-                    var context = param.context;
-                    context.router = {
-                        useMatches: useMatches,
-                        useLocation: useLocation
-                    };
-                    return next({
-                        context: context
-                    });
-                },
                 hoc: function(param, next) {
                     var App = param.App;
                     if (!finalRouteConfig && !createRoutes) {

package/dist/js/treeshaking/router/runtime/plugin.node.js

@@ -229,8 +229,8 @@ var __generator = this && this.__generator || function(thisArg, body) {
 };
 import { jsx } from "react/jsx-runtime";
 import { useContext } from "react";
-import { unstable_createStaticHandler as createStaticHandler } from "@remix-run/router";
-import { unstable_createStaticRouter as createStaticRouter, unstable_StaticRouterProvider as StaticRouterProvider } from "react-router-dom/server";
+import { createStaticHandler } from "@remix-run/router";
+import { createStaticRouter, StaticRouterProvider } from "react-router-dom/server";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { installGlobals } from "@remix-run/node";
 import { createRoutesFromElements } from "react-router-dom";

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

@@ -2,6 +2,7 @@ import React, { ReactNode } from 'react';
 declare type DocumentStructrueContextProps = {
   hasSetHead?: boolean;
   hasSetScripts?: boolean;
+  hasSetLinks?: boolean;
   hasSetBody?: boolean;
   hasSetRoot?: boolean;
   docChild?: ReactNode;

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

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare function Links(): JSX.Element;

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

@@ -8,6 +8,7 @@ export declare const DOCUMENT_CHUNKSMAP_PLACEHOLDER: string;
 export declare const DOCUMENT_SSRDATASCRIPT_PLACEHOLDER: string;
 export declare const DOCUMENT_FILE_NAME = "Document";
 export declare const DOCUMENT_SCRIPTS_PLACEHOLDER: string;
+export declare const DOCUMENT_LINKS_PLACEHOLDER: string;
 export declare const DOCUMENT_NO_SCRIPTE_PLACEHOLDER: string;
 export declare const DOCUMENT_SCRIPT_PLACEHOLDER_START: string;
 export declare const DOCUMENT_SCRIPT_PLACEHOLDER_END: string;

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

@@ -4,6 +4,7 @@ export * from './DocumentStructrueContext';
 export * from './Head';
 export * from './Body';
 export * from './Root';
+export * from './Links';
 export * from './Scripts';
 export * from './Script';
 export * from './constants';

package/dist/types/router/runtime/index.d.ts

@@ -4,4 +4,5 @@ export type { SingleRouteConfig, RouterConfig };
 export default routerPlugin;
 export { modifyRoutes } from './plugin';
 export * from 'react-router-dom';
+export * from 'react-router-dom/server';
 export * from './withRouter';

package/dist/types/router/runtime/plugin.d.ts

@@ -1,4 +1,4 @@
-import { Plugin } from '../../core';
+import type { Plugin } from '../../core';
 import type { RouterConfig, Routes } from './types';
 export declare let finalRouteConfig: RouterConfig['routesConfig'];
 export declare let beforeCreateRouter: boolean;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.6",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -128,21 +128,20 @@
   },
   "dependencies": {
     "@babel/core": "^7.18.0",
-    "@babel/types": "^7.18.0",
     "@babel/runtime": "^7.18.0",
+    "@babel/types": "^7.18.0",
     "@loadable/babel-plugin": "^5.13.2",
-    "@loadable/webpack-plugin": "5.15.2",
     "@loadable/component": "^5.15.0",
     "@loadable/server": "^5.15.1",
+    "@loadable/webpack-plugin": "5.15.2",
     "@modern-js-reduck/plugin-auto-actions": "^1.1.4",
     "@modern-js-reduck/plugin-devtools": "^1.1.4",
     "@modern-js-reduck/plugin-effects": "^1.1.4",
     "@modern-js-reduck/plugin-immutable": "^1.1.4",
     "@modern-js-reduck/react": "^1.1.4",
     "@modern-js-reduck/store": "^1.1.4",
-    "@modern-js/plugin": "2.0.0-beta.4",
-    "@modern-js/types": "2.0.0-beta.4",
-    "@modern-js/utils": "2.0.0-beta.4",
+    "@remix-run/node": "^1.9.0",
+    "@remix-run/router": "^1.2.0",
     "@types/loadable__component": "^5.13.4",
     "@types/react-helmet": "^6.1.2",
     "@types/redux-logger": "^3.0.9",
@@ -150,28 +149,24 @@
     "hoist-non-react-statics": "^3.3.2",
     "invariant": "^2.2.4",
     "react-helmet": "^6.1.0",
-    "@remix-run/node": "^1.7.0",
-    "@remix-run/router": "^1.0.4",
     "react-is": "^18",
-    "react-router-dom": "^6.4.4",
+    "react-router-dom": "^6.6.0",
     "react-side-effect": "^2.1.1",
     "redux-logger": "^3.0.6",
     "serialize-javascript": "^6.0.0",
-    "styled-components": "^5.3.1"
+    "styled-components": "^5.3.1",
+    "@modern-js/plugin": "2.0.0-beta.6",
+    "@modern-js/types": "2.0.0-beta.6",
+    "@modern-js/utils": "2.0.0-beta.6"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17"
   },
   "devDependencies": {
-    "@modern-js/core": "2.0.0-beta.4",
-    "@modern-js/server-core": "2.0.0-beta.4",
-    "@scripts/build": "2.0.0-beta.4",
-    "@modern-js/app-tools": "2.0.0-beta.4",
-    "@scripts/jest-config": "2.0.0-beta.4",
+    "@remix-run/web-fetch": "^4.1.3",
     "@testing-library/react": "^13.4.0",
     "@testing-library/react-hooks": "^8.0.1",
-    "@remix-run/web-fetch": "^4.1.3",
     "@types/invariant": "^2.2.30",
     "@types/jest": "^27",
     "@types/loadable__webpack-plugin": "^5.7.3",
@@ -182,7 +177,12 @@
     "react": "^18",
     "react-dom": "^18",
     "ts-jest": "^27.0.4",
-    "typescript": "^4"
+    "typescript": "^4",
+    "@modern-js/app-tools": "2.0.0-beta.6",
+    "@modern-js/core": "2.0.0-beta.6",
+    "@modern-js/server-core": "2.0.0-beta.6",
+    "@scripts/build": "2.0.0-beta.6",
+    "@scripts/jest-config": "2.0.0-beta.6"
   },
   "sideEffects": false,
   "modernConfig": {},