@modern-js/runtime 2.20.0 → 2.21.0

package/dist/cjs/ssr/serverRender/renderToString/entry.js

@@ -109,7 +109,8 @@ class Entry {
         host: this.host,
         result: this.result,
         entryName: this.entryName,
-        config: this.pluginConfig
+        config: this.pluginConfig,
+        nonce: this.nonce
       };
       html = (0, _reduce.reduce)(App, renderContext, [
         _styledComponent.toHtml,
@@ -129,11 +130,14 @@ class Entry {
   getSSRDataScript(templateData, routerData) {
     const useInlineScript = this.pluginConfig.inlineScript !== false;
     const ssrData = (0, _runtimenode.serializeJson)(templateData);
-    let ssrDataScripts = useInlineScript ? `<script>window._SSR_DATA = ${ssrData}</script>` : `<script type="application/json" id="${_utils1.SSR_DATA_JSON_ID}">${ssrData}</script>`;
+    const attrsStr = (0, _utils1.attributesToString)({
+      nonce: this.nonce
+    });
+    let ssrDataScripts = useInlineScript ? `<script${attrsStr}>window._SSR_DATA = ${ssrData}</script>` : `<script type="application/json" id="${_utils1.SSR_DATA_JSON_ID}">${ssrData}</script>`;
     if (routerData) {
       const serializedRouterData = (0, _runtimenode.serializeJson)(routerData);
       ssrDataScripts += useInlineScript ? `
-<script>window._ROUTER_DATA = ${serializedRouterData}</script>` : `
+<script${attrsStr}>window._ROUTER_DATA = ${serializedRouterData}</script>` : `
 <script type="application/json" id="${_utils1.ROUTER_DATA_JSON_ID}">${serializedRouterData}</script>`;
     }
     return {
@@ -149,8 +153,9 @@ class Entry {
     _define_property._(this, "fragments", void 0);
     _define_property._(this, "pluginConfig", void 0);
     _define_property._(this, "host", void 0);
+    _define_property._(this, "nonce", void 0);
     const { ctx, config } = options;
-    const { entryName, template, request: { host } } = ctx;
+    const { entryName, template, request: { host }, nonce } = ctx;
     this.fragments = (0, _template.toFragments)(template, entryName);
     this.entryName = entryName;
     this.host = host;
@@ -158,6 +163,7 @@ class Entry {
     this.pluginConfig = config;
     this.metrics = ctx.metrics;
     this.logger = ctx.logger;
+    this.nonce = nonce;
     this.result = {
       renderLevel: _types.RenderLevel.CLIENT_RENDER,
       html: "",

package/dist/cjs/ssr/serverRender/renderToString/loadable.js

@@ -16,7 +16,7 @@ const extname = (uri) => {
   return `.${uri === null || uri === void 0 ? void 0 : uri.split(".").pop()}` || "";
 };
 const toHtml = (jsx, renderer, next) => {
-  const { stats, result: { chunksMap }, host, config = {} } = renderer;
+  const { stats, result: { chunksMap }, host, config = {}, nonce } = renderer;
   if (!stats || chunksMap.js) {
     return next(jsx);
   }
@@ -32,12 +32,15 @@ const toHtml = (jsx, renderer, next) => {
   for (const v of chunks) {
     const fileType = extname(v.url).slice(1);
     if (fileType === "js") {
-      const props = [];
+      const attributes = {
+        nonce
+      };
       const { crossorigin } = config;
       if (crossorigin && (0, _utils.isCrossOrigin)(v.url, host)) {
-        props.push(`crossorigin="${crossorigin === true ? "anonymous" : crossorigin}"`);
+        attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
       }
-      chunksMap[fileType] += `<script src="${v.url}" ${props.join(" ")}></script>`;
+      const attrsStr = (0, _utils1.attributesToString)(attributes);
+      chunksMap[fileType] += `<script${attrsStr} src="${v.url}"></script>`;
     } else if (fileType === "css") {
       chunksMap[fileType] += `<link href="${v.url}" rel="stylesheet" />`;
     }

package/dist/cjs/ssr/serverRender/utils.js

@@ -13,7 +13,8 @@ _export(exports, {
   CSS_CHUNKS_PLACEHOLDER: () => CSS_CHUNKS_PLACEHOLDER,
   SSR_DATA_JSON_ID: () => SSR_DATA_JSON_ID,
   ROUTER_DATA_JSON_ID: () => ROUTER_DATA_JSON_ID,
-  getLoadableScripts: () => getLoadableScripts
+  getLoadableScripts: () => getLoadableScripts,
+  attributesToString: () => attributesToString
 });
 const CSS_CHUNKS_PLACEHOLDER = "<!--<?- chunksMap.css ?>-->";
 const SSR_DATA_JSON_ID = "__MODERN_SSR_DATA__";
@@ -26,3 +27,8 @@ function getLoadableScripts(extractor) {
   }
   return scripts.split("</script>").slice(0, 2).map((i) => `${i}</script>`).join("");
 }
+function attributesToString(attributes) {
+  return Object.entries(attributes).reduce((str, [key, value]) => {
+    return value === void 0 ? str : `${str} ${key}="${value}"`;
+  }, "");
+}

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

@@ -57,13 +57,14 @@ export default function() {
             }
             return function() {
               var _ref2 = _async_to_generator(function(param) {
-                var htmlWebpackPlugin, documentParams, tempTsConfigFile, userTsConfigFilePath, tsConfig, err, htmlOutputFile, Document, HTMLElement, html, scripts, links, metas, finalHtml;
+                var htmlWebpackPlugin, config, documentParams, tempTsConfigFile, userTsConfigFilePath, tsConfig, err, htmlOutputFile, Document, HTMLElement, html, scripts, links, metas, nonce, nonceAttr, finalHtml;
                 return _ts_generator(this, function(_state2) {
                   switch (_state2.label) {
                     case 0:
                       htmlWebpackPlugin = param.htmlWebpackPlugin;
+                      config = api.useResolvedConfigContext();
                       documentParams = getDocParams({
-                        config: api.useResolvedConfigContext(),
+                        config: config,
                         entryName: entryName,
                         templateParameters: templateParameters
                       });
@@ -173,8 +174,10 @@ export default function() {
                         }).join("")
                       ].join("");
                       if (html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_START) && html.includes(DOCUMENT_SCRIPT_PLACEHOLDER_END)) {
+                        nonce = config.security.nonce;
+                        nonceAttr = nonce ? "nonce=".concat(nonce) : "";
                         html = html.replace(new RegExp("".concat(DOCUMENT_SCRIPT_PLACEHOLDER_START, "(.*?)").concat(DOCUMENT_SCRIPT_PLACEHOLDER_END), "g"), function(_scriptStr, $1) {
-                          return "<script>".concat(decodeURIComponent($1), "</script>");
+                          return "<script ".concat(nonceAttr, ">").concat(decodeURIComponent($1), "</script>");
                         });
                       }
                       if (html.includes(DOCUMENT_COMMENT_PLACEHOLDER_START) && html.includes(DOCUMENT_COMMENT_PLACEHOLDER_END)) {

package/dist/esm/router/runtime/DeferredDataScripts.node.js

@@ -1,7 +1,7 @@
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Suspense, useEffect, useRef, useMemo, useContext } from "react";
-import { Await, UNSAFE_DataRouterContext as DataRouterContext, useAsyncError } from "react-router-dom";
+import { Await, UNSAFE_DataRouterContext as DataRouterContext, useAsyncError } from "@modern-js/utils/runtime/router";
 import { serializeJson } from "@modern-js/utils/runtime-node";
 import { JSX_SHELL_STREAM_END_MARK } from "../../common";
 import { serializeErrors } from "./utils";

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

@@ -5,7 +5,7 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import React, { useContext, useMemo } from "react";
-import { Link as RouterLink, matchRoutes, useResolvedPath, useHref, useMatches, NavLink as RouterNavLink } from "react-router-dom";
+import { Link as RouterLink, matchRoutes, useResolvedPath, useHref, useMatches, NavLink as RouterNavLink } from "@modern-js/utils/runtime/router";
 import { RuntimeReactContext } from "../../core";
 export function composeEventHandlers(theirHandler, ourHandler) {
   return function(event) {

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

@@ -1,4 +1,4 @@
-import { useRouteLoaderData as useRouteData } from "react-router-dom";
+import { useRouteLoaderData as useRouteData } from "@modern-js/utils/runtime/router";
 import { routerPlugin } from "./plugin";
 export default routerPlugin;
 export { modifyRoutes } from "./plugin";
@@ -61,6 +61,8 @@ export {
   resolvePath,
   createPath,
   unstable_useBlocker,
-  unstable_usePrompt
-} from "react-router-dom";
-export { defer, json, redirect } from "@modern-js/utils/runtime/router";
+  unstable_usePrompt,
+  defer,
+  json,
+  redirect
+} from "@modern-js/utils/runtime/router";

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

@@ -1,7 +1,7 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "react-router-dom";
+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";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";

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

@@ -6,10 +6,10 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext } from "react";
-import { createStaticHandler } from "@modern-js/utils/runtime/router";
-import { createStaticRouter, StaticRouterProvider } from "react-router-dom/server";
+import { createStaticHandler } from "@modern-js/utils/runtime/remix-router";
+import { createStaticRouter, StaticRouterProvider } from "@modern-js/utils/runtime-node/router";
 import hoistNonReactStatics from "hoist-non-react-statics";
-import { createRoutesFromElements } from "react-router-dom";
+import { createRoutesFromElements } from "@modern-js/utils/runtime/router";
 import { RuntimeReactContext } from "../../core";
 import { renderRoutes, urlJoin } from "./utils";
 import { installGlobals } from "./fetch";

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

@@ -1 +1 @@
-export * from "react-router-dom/server";
+export * from "@modern-js/utils/runtime-node/router";

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

@@ -4,8 +4,9 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Route } from "react-router-dom";
-import { ErrorResponse, isRouteErrorResponse, renderNestedRoute } from "@modern-js/utils/runtime/router";
+import { Route, isRouteErrorResponse } from "@modern-js/utils/runtime/router";
+import { ErrorResponse } from "@modern-js/utils/runtime/remix-router";
+import { renderNestedRoute } from "@modern-js/utils/runtime/nested-routes";
 import { DefaultNotFound } from "./DefaultNotFound";
 import DeferredDataScripts from "./DeferredDataScripts";
 export function getRouteComponents(routes, param) {

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

@@ -1,7 +1,7 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useLocation, useNavigate, useParams } from "react-router-dom";
+import { useLocation, useNavigate, useParams } from "@modern-js/utils/runtime/router";
 export var withRouter = function(Component) {
   return function(props) {
     var location = useLocation();

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

@@ -77,7 +77,7 @@ export default function() {
             source: {
               alias: {
                 // ensure that all packages use the same storage in @modern-js/utils/runtime-node
-                "@modern-js/utils/runtime-node": require.resolve("@modern-js/utils/runtime-node"),
+                "@modern-js/utils/runtime-node$": require.resolve("@modern-js/utils/runtime-node"),
                 "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
               },
               globalVars: function(values, param) {

package/dist/esm/ssr/serverRender/renderToStream/buildTemplate.after.js

@@ -1,5 +1,6 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { serializeJson } from "@modern-js/utils/runtime-node";
+import { attributesToString } from "../utils";
 import { buildTemplate } from "./buildTemplate.share";
 export function buildShellAfterTemplate(afterAppTemplate, options) {
   var injectSSRDataScript = function injectSSRDataScript2(template) {
@@ -7,7 +8,7 @@ export function buildShellAfterTemplate(afterAppTemplate, options) {
     return template.replace("<!--<?- SSRDataScript ?>-->", ssrDataScript);
     function buildSSRDataScript() {
       var _options_context = options.context, ssrContext = _options_context.ssrContext, initialData = _options_context.initialData, __i18nData__ = _options_context.__i18nData__, renderLevel = options.renderLevel;
-      var request = ssrContext.request, enableUnsafeCtx = ssrContext.enableUnsafeCtx;
+      var request = ssrContext.request, enableUnsafeCtx = ssrContext.enableUnsafeCtx, nonce = ssrContext.nonce;
       var unsafeContext = {
         headers: request.headers
       };
@@ -27,7 +28,10 @@ export function buildShellAfterTemplate(afterAppTemplate, options) {
         },
         renderLevel: renderLevel
       };
-      return "\n      <script>window._SSR_DATA = ".concat(serializeJson(SSRData), "</script>\n      ");
+      var attrsStr = attributesToString({
+        nonce: nonce
+      });
+      return "\n      <script".concat(attrsStr, ">window._SSR_DATA = ").concat(serializeJson(SSRData), "</script>\n      ");
     }
   };
   var callbacks = [

package/dist/esm/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -1,7 +1,7 @@
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import ReactHelmet from "react-helmet";
-import { matchRoutes } from "react-router-dom";
+import { matchRoutes } from "@modern-js/utils/runtime/router";
 import helmetReplace from "../helmet";
 import { CSS_CHUNKS_PLACEHOLDER } from "../utils";
 import { HEAD_REG_EXP, buildTemplate } from "./buildTemplate.share";

package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.js

@@ -7,13 +7,13 @@ import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common";
 import { getTemplates } from "./template";
 var ShellChunkStatus;
 (function(ShellChunkStatus2) {
-  ShellChunkStatus2[ShellChunkStatus2["IDLE"] = 0] = "IDLE";
-  ShellChunkStatus2[ShellChunkStatus2["START"] = 1] = "START";
-  ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 2] = "FINIESH";
+  ShellChunkStatus2[ShellChunkStatus2["START"] = 0] = "START";
+  ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 1] = "FINIESH";
 })(ShellChunkStatus || (ShellChunkStatus = {}));
 function renderToPipe(rootElement, context, options) {
-  var shellChunkStatus = ShellChunkStatus.IDLE;
+  var shellChunkStatus = ShellChunkStatus.START;
   var ssrContext = context.ssrContext;
+  var chunkVec = [];
   var forUserPipe = function(stream) {
     return new Promise(function(resolve) {
       var renderToPipeableStream;
@@ -22,6 +22,7 @@ function renderToPipe(rootElement, context, options) {
       } catch (e) {
       }
       var pipe = renderToPipeableStream(rootElement, _object_spread_props(_object_spread({}, options), {
+        nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
         onShellReady: function onShellReady() {
           var _options_onShellReady;
           var _getTemplates = getTemplates(context, RenderLevel.SERVER_RENDER), shellAfter = _getTemplates.shellAfter, shellBefore = _getTemplates.shellBefore;
@@ -30,16 +31,13 @@ function renderToPipe(rootElement, context, options) {
             transform: function transform(chunk, _encoding, callback) {
               try {
                 if (shellChunkStatus !== ShellChunkStatus.FINIESH) {
-                  var concatedChunk = chunk.toString();
-                  if (shellChunkStatus === ShellChunkStatus.IDLE) {
-                    concatedChunk = "".concat(shellBefore).concat(concatedChunk);
-                    shellChunkStatus = ShellChunkStatus.START;
-                  }
-                  if (shellChunkStatus === ShellChunkStatus.START && concatedChunk.endsWith(ESCAPED_SHELL_STREAM_END_MARK)) {
-                    concatedChunk = concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, shellAfter);
+                  chunkVec.push(chunk.toString());
+                  var concatedChunk = chunkVec.join("");
+                  if (concatedChunk.endsWith(ESCAPED_SHELL_STREAM_END_MARK)) {
+                    concatedChunk = concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, "");
                     shellChunkStatus = ShellChunkStatus.FINIESH;
+                    this.push("".concat(shellBefore).concat(concatedChunk).concat(shellAfter));
                   }
-                  this.push(concatedChunk);
                 } else {
                   this.push(chunk);
                 }

package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.worker.js

@@ -7,12 +7,12 @@ import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common";
 import { getTemplates } from "./template";
 var ShellChunkStatus;
 (function(ShellChunkStatus2) {
-  ShellChunkStatus2[ShellChunkStatus2["IDLE"] = 0] = "IDLE";
-  ShellChunkStatus2[ShellChunkStatus2["START"] = 1] = "START";
-  ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 2] = "FINIESH";
+  ShellChunkStatus2[ShellChunkStatus2["START"] = 0] = "START";
+  ShellChunkStatus2[ShellChunkStatus2["FINIESH"] = 1] = "FINIESH";
 })(ShellChunkStatus || (ShellChunkStatus = {}));
 function renderToPipe(rootElement, context, options) {
-  var shellChunkStatus = ShellChunkStatus.IDLE;
+  var shellChunkStatus = ShellChunkStatus.START;
+  var chunkVec = [];
   var ssrContext = context.ssrContext;
   var forUserPipe = function() {
     var _ref = _async_to_generator(function() {
@@ -36,6 +36,7 @@ function renderToPipe(rootElement, context, options) {
             return [
               4,
               renderToReadableStream(rootElement, _object_spread_props(_object_spread({}, options), {
+                nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
                 onError: function onError(error) {
                   var _options_onError;
                   ssrContext.logger.error("An error occurs during streaming SSR", error);
@@ -54,7 +55,7 @@ function renderToPipe(rootElement, context, options) {
                 }
                 function _push() {
                   _push = _async_to_generator(function() {
-                    var _ref2, done, value, concatedChunk;
+                    var _ref2, done, value, chunk, concatedChunk;
                     return _ts_generator(this, function(_state2) {
                       switch (_state2.label) {
                         case 0:
@@ -71,14 +72,13 @@ function renderToPipe(rootElement, context, options) {
                             ];
                           }
                           if (shellChunkStatus !== ShellChunkStatus.FINIESH) {
-                            concatedChunk = new TextDecoder().decode(value);
-                            if (shellChunkStatus === ShellChunkStatus.IDLE) {
-                              concatedChunk = "".concat(shellBefore).concat(concatedChunk);
-                              shellChunkStatus = ShellChunkStatus.START;
-                            }
-                            if (shellChunkStatus === ShellChunkStatus.START && concatedChunk.endsWith(ESCAPED_SHELL_STREAM_END_MARK)) {
-                              concatedChunk = concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, shellAfter);
+                            chunk = new TextDecoder().decode(value);
+                            chunkVec.push(chunk);
+                            concatedChunk = chunkVec.join("");
+                            if (concatedChunk.endsWith(ESCAPED_SHELL_STREAM_END_MARK)) {
+                              concatedChunk = concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, "");
                               shellChunkStatus = ShellChunkStatus.FINIESH;
+                              controller.enqueue(encodeForWebStream("".concat(shellBefore).concat(concatedChunk).concat(shellAfter)));
                             }
                             controller.enqueue(encodeForWebStream(concatedChunk));
                           } else {

package/dist/esm/ssr/serverRender/renderToString/entry.js

@@ -13,7 +13,7 @@ import helmetReplace from "../helmet";
 import { RenderLevel } from "../types";
 import { time } from "../time";
 import prefetch from "../../prefetch";
-import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "../utils";
+import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID, attributesToString } from "../utils";
 import { toFragments } from "./template";
 import { reduce } from "./reduce";
 import * as loadableRenderer from "./loadable";
@@ -49,8 +49,9 @@ var Entry = /* @__PURE__ */ function() {
     _define_property(this, "fragments", void 0);
     _define_property(this, "pluginConfig", void 0);
     _define_property(this, "host", void 0);
+    _define_property(this, "nonce", void 0);
     var ctx = options.ctx, config = options.config;
-    var entryName = ctx.entryName, template = ctx.template, host = ctx.request.host;
+    var entryName = ctx.entryName, template = ctx.template, host = ctx.request.host, nonce = ctx.nonce;
     this.fragments = toFragments(template, entryName);
     this.entryName = entryName;
     this.host = host;
@@ -58,6 +59,7 @@ var Entry = /* @__PURE__ */ function() {
     this.pluginConfig = config;
     this.metrics = ctx.metrics;
     this.logger = ctx.logger;
+    this.nonce = nonce;
     this.result = {
       renderLevel: RenderLevel.CLIENT_RENDER,
       html: "",
@@ -215,7 +217,8 @@ var Entry = /* @__PURE__ */ function() {
             host: this.host,
             result: this.result,
             entryName: this.entryName,
-            config: this.pluginConfig
+            config: this.pluginConfig,
+            nonce: this.nonce
           };
           html = reduce(App, renderContext, [
             styledComponentRenderer.toHtml,
@@ -240,10 +243,13 @@ var Entry = /* @__PURE__ */ function() {
       value: function getSSRDataScript(templateData, routerData) {
         var useInlineScript = this.pluginConfig.inlineScript !== false;
         var ssrData = serializeJson(templateData);
-        var ssrDataScripts = useInlineScript ? "<script>window._SSR_DATA = ".concat(ssrData, "</script>") : '<script type="application/json" id="'.concat(SSR_DATA_JSON_ID, '">').concat(ssrData, "</script>");
+        var attrsStr = attributesToString({
+          nonce: this.nonce
+        });
+        var ssrDataScripts = useInlineScript ? "<script".concat(attrsStr, ">window._SSR_DATA = ").concat(ssrData, "</script>") : '<script type="application/json" id="'.concat(SSR_DATA_JSON_ID, '">').concat(ssrData, "</script>");
         if (routerData) {
           var serializedRouterData = serializeJson(routerData);
-          ssrDataScripts += useInlineScript ? "\n<script>window._ROUTER_DATA = ".concat(serializedRouterData, "</script>") : '\n<script type="application/json" id="'.concat(ROUTER_DATA_JSON_ID, '">').concat(serializedRouterData, "</script>");
+          ssrDataScripts += useInlineScript ? "\n<script".concat(attrsStr, ">window._ROUTER_DATA = ").concat(serializedRouterData, "</script>") : '\n<script type="application/json" id="'.concat(ROUTER_DATA_JSON_ID, '">').concat(serializedRouterData, "</script>");
         }
         return {
           SSRDataScript: ssrDataScripts

package/dist/esm/ssr/serverRender/renderToString/loadable.js

@@ -1,6 +1,6 @@
 import { ChunkExtractor } from "@loadable/server";
 import { isCrossOrigin } from "../../utils";
-import { getLoadableScripts } from "../utils";
+import { attributesToString, getLoadableScripts } from "../utils";
 var extname = function(uri) {
   if (typeof uri !== "string" || !uri.includes(".")) {
     return "";
@@ -8,7 +8,7 @@ var extname = function(uri) {
   return ".".concat(uri === null || uri === void 0 ? void 0 : uri.split(".").pop()) || "";
 };
 export var toHtml = function(jsx, renderer, next) {
-  var stats = renderer.stats, chunksMap = renderer.result.chunksMap, host = renderer.host, _renderer_config = renderer.config, config = _renderer_config === void 0 ? {} : _renderer_config;
+  var stats = renderer.stats, chunksMap = renderer.result.chunksMap, host = renderer.host, _renderer_config = renderer.config, config = _renderer_config === void 0 ? {} : _renderer_config, nonce = renderer.nonce;
   if (!stats || chunksMap.js) {
     return next(jsx);
   }
@@ -27,12 +27,15 @@ export var toHtml = function(jsx, renderer, next) {
       var v = _step.value;
       var fileType = extname(v.url).slice(1);
       if (fileType === "js") {
-        var props = [];
+        var attributes = {
+          nonce: nonce
+        };
         var crossorigin = config.crossorigin;
         if (crossorigin && isCrossOrigin(v.url, host)) {
-          props.push('crossorigin="'.concat(crossorigin === true ? "anonymous" : crossorigin, '"'));
+          attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
         }
-        chunksMap[fileType] += '<script src="'.concat(v.url, '" ').concat(props.join(" "), "></script>");
+        var attrsStr = attributesToString(attributes);
+        chunksMap[fileType] += "<script".concat(attrsStr, ' src="').concat(v.url, '"></script>');
       } else if (fileType === "css") {
         chunksMap[fileType] += '<link href="'.concat(v.url, '" rel="stylesheet" />');
       }

package/dist/esm/ssr/serverRender/utils.js

@@ -1,3 +1,4 @@
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 export var CSS_CHUNKS_PLACEHOLDER = "<!--<?- chunksMap.css ?>-->";
 export var SSR_DATA_JSON_ID = "__MODERN_SSR_DATA__";
 export var ROUTER_DATA_JSON_ID = "__MODERN_ROUTER_DATA__";
@@ -13,3 +14,9 @@ export function getLoadableScripts(extractor) {
     return "".concat(i, "</script>");
   }).join("");
 }
+export function attributesToString(attributes) {
+  return Object.entries(attributes).reduce(function(str, param) {
+    var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
+    return value === void 0 ? str : "".concat(str, " ").concat(key, '="').concat(value, '"');
+  }, "");
+}

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

@@ -46,8 +46,9 @@ export default () => {
           return null;
         }
         return async ({ htmlWebpackPlugin }) => {
+          const config = api.useResolvedConfigContext();
           const documentParams = getDocParams({
-            config: api.useResolvedConfigContext(),
+            config,
             entryName,
             templateParameters
           });
@@ -121,7 +122,9 @@ export default () => {
             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.replace(new RegExp(`${DOCUMENT_SCRIPT_PLACEHOLDER_START}(.*?)${DOCUMENT_SCRIPT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `<script>${decodeURIComponent($1)}</script>`);
+            const { nonce } = config.security;
+            const nonceAttr = nonce ? `nonce=${nonce}` : "";
+            html = html.replace(new RegExp(`${DOCUMENT_SCRIPT_PLACEHOLDER_START}(.*?)${DOCUMENT_SCRIPT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `<script ${nonceAttr}>${decodeURIComponent($1)}</script>`);
           }
           if (html.includes(DOCUMENT_COMMENT_PLACEHOLDER_START) && html.includes(DOCUMENT_COMMENT_PLACEHOLDER_END)) {
             html = html.replace(new RegExp(`${DOCUMENT_COMMENT_PLACEHOLDER_START}(.*?)${DOCUMENT_COMMENT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `${decodeURIComponent($1)}`);

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Suspense, useEffect, useRef, useMemo, useContext } from "react";
-import { Await, UNSAFE_DataRouterContext as DataRouterContext, useAsyncError } from "react-router-dom";
+import { Await, UNSAFE_DataRouterContext as DataRouterContext, useAsyncError } from "@modern-js/utils/runtime/router";
 import { serializeJson } from "@modern-js/utils/runtime-node";
 import { JSX_SHELL_STREAM_END_MARK } from "../../common";
 import { serializeErrors } from "./utils";

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import React, { useContext, useMemo } from "react";
-import { Link as RouterLink, matchRoutes, useResolvedPath, useHref, useMatches, NavLink as RouterNavLink } from "react-router-dom";
+import { Link as RouterLink, matchRoutes, useResolvedPath, useHref, useMatches, NavLink as RouterNavLink } from "@modern-js/utils/runtime/router";
 import { RuntimeReactContext } from "../../core";
 export function composeEventHandlers(theirHandler, ourHandler) {
   return (event) => {

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

@@ -1,4 +1,4 @@
-import { useRouteLoaderData as useRouteData } from "react-router-dom";
+import { useRouteLoaderData as useRouteData } from "@modern-js/utils/runtime/router";
 import { routerPlugin } from "./plugin";
 export default routerPlugin;
 export { modifyRoutes } from "./plugin";
@@ -61,6 +61,8 @@ export {
   resolvePath,
   createPath,
   unstable_useBlocker,
-  unstable_usePrompt
-} from "react-router-dom";
-export { defer, json, redirect } from "@modern-js/utils/runtime/router";
+  unstable_usePrompt,
+  defer,
+  json,
+  redirect
+} from "@modern-js/utils/runtime/router";

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "react-router-dom";
+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";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";

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

@@ -1,9 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext } from "react";
-import { createStaticHandler } from "@modern-js/utils/runtime/router";
-import { createStaticRouter, StaticRouterProvider } from "react-router-dom/server";
+import { createStaticHandler } from "@modern-js/utils/runtime/remix-router";
+import { createStaticRouter, StaticRouterProvider } from "@modern-js/utils/runtime-node/router";
 import hoistNonReactStatics from "hoist-non-react-statics";
-import { createRoutesFromElements } from "react-router-dom";
+import { createRoutesFromElements } from "@modern-js/utils/runtime/router";
 import { RuntimeReactContext } from "../../core";
 import { renderRoutes, urlJoin } from "./utils";
 import { installGlobals } from "./fetch";

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

@@ -1 +1 @@
-export * from "react-router-dom/server";
+export * from "@modern-js/utils/runtime-node/router";

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

@@ -1,6 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Route } from "react-router-dom";
-import { ErrorResponse, isRouteErrorResponse, renderNestedRoute } from "@modern-js/utils/runtime/router";
+import { Route, isRouteErrorResponse } from "@modern-js/utils/runtime/router";
+import { ErrorResponse } from "@modern-js/utils/runtime/remix-router";
+import { renderNestedRoute } from "@modern-js/utils/runtime/nested-routes";
 import { DefaultNotFound } from "./DefaultNotFound";
 import DeferredDataScripts from "./DeferredDataScripts";
 export function getRouteComponents(routes, { globalApp, ssrMode, props }) {

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useLocation, useNavigate, useParams } from "react-router-dom";
+import { useLocation, useNavigate, useParams } from "@modern-js/utils/runtime/router";
 export const withRouter = (Component) => {
   return (props) => {
     const location = useLocation();

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

@@ -58,7 +58,7 @@ export default () => {
             source: {
               alias: {
                 // ensure that all packages use the same storage in @modern-js/utils/runtime-node
-                "@modern-js/utils/runtime-node": require.resolve("@modern-js/utils/runtime-node"),
+                "@modern-js/utils/runtime-node$": require.resolve("@modern-js/utils/runtime-node"),
                 "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
               },
               globalVars: (values, { target }) => {

package/dist/esm-node/ssr/serverRender/renderToStream/buildTemplate.after.js

@@ -1,4 +1,5 @@
 import { serializeJson } from "@modern-js/utils/runtime-node";
+import { attributesToString } from "../utils";
 import { buildTemplate } from "./buildTemplate.share";
 export function buildShellAfterTemplate(afterAppTemplate, options) {
   const callbacks = [
@@ -10,7 +11,7 @@ export function buildShellAfterTemplate(afterAppTemplate, options) {
     return template.replace("<!--<?- SSRDataScript ?>-->", ssrDataScript);
     function buildSSRDataScript() {
       const { context: { ssrContext, initialData, __i18nData__ }, renderLevel } = options;
-      const { request, enableUnsafeCtx } = ssrContext;
+      const { request, enableUnsafeCtx, nonce } = ssrContext;
       const unsafeContext = {
         headers: request.headers
       };
@@ -31,8 +32,11 @@ export function buildShellAfterTemplate(afterAppTemplate, options) {
         },
         renderLevel
       };
+      const attrsStr = attributesToString({
+        nonce
+      });
       return `
-      <script>window._SSR_DATA = ${serializeJson(SSRData)}</script>
+      <script${attrsStr}>window._SSR_DATA = ${serializeJson(SSRData)}</script>
       `;
     }
   }