@modern-js/runtime 2.25.1 → 2.26.0

package/CHANGELOG.md

@@ -1,5 +1,44 @@
 # @modern-js/runtime
 
+## 2.26.0
+
+### Minor Changes
+
+- 22acfda: feat: support unstable_getBlockNavState
+  feat: 支持 unstable_getBlockNavState
+
+### Patch Changes
+
+- 64a51c4: fix(plugin-runtime): we should not repeatly registe the script, if template has it.
+  fix(plugin-runtime): 如果模版中已经有了,我们不应该重复添加 script 链接
+- 1586774: feat: add support for origin properties in document
+  feat: 为 document 增加原始属性透传
+- 73c592d: fix: should define remixRouter property when the property does not exist
+  fix: 应该仅当属性不存在时，定义 remixRouter
+- 5c2dbb3: refactor: use import syntax for reduck plugin types
+  refactor: 使用 import 语法加载 reduck 插件的类型文件
+  - @modern-js/plugin@2.26.0
+  - @modern-js/types@2.26.0
+  - @modern-js/utils@2.26.0
+
+## 2.25.2
+
+### Patch Changes
+
+- 272646c: feat(builder): bump webpack v5.88, support top level await
+
+  feat(builder): 升级 webpack v5.88, 支持 top level await
+
+- e8a90f3: fix(ssr-plugin): worker streaming ssr douable enqueue the value so that ssr error
+  fix(ssr-plugin): worker streaming ssr 重复 enqueue chunk 值导致 ssr 错误
+- Updated dependencies [63d8247]
+- Updated dependencies [6651684]
+- Updated dependencies [272646c]
+- Updated dependencies [358ed24]
+  - @modern-js/utils@2.25.2
+  - @modern-js/plugin@2.25.2
+  - @modern-js/types@2.25.2
+
 ## 2.25.1
 
 ### Patch Changes

package/dist/cjs/document/Body.js

@@ -16,8 +16,9 @@ const _DocumentStructureContext = require("./DocumentStructureContext");
 const _Root = require("./Root");
 function Body(props) {
   const { hasSetRoot } = (0, _react.useContext)(_DocumentStructureContext.DocumentStructureContext);
-  const { children } = props;
+  const { children, ...rest } = props;
   return /* @__PURE__ */ (0, _jsxruntime.jsxs)("body", {
+    ...rest,
     children: [
       hasSetRoot ? null : /* @__PURE__ */ (0, _jsxruntime.jsx)(_Root.DefaultRoot, {}),
       children,

package/dist/cjs/document/Head.js

@@ -26,8 +26,9 @@ const _Links = require("./Links");
 const _constants = require("./constants");
 function Head(props) {
   const { hasSetScripts, hasSetLinks } = (0, _react.useContext)(_DocumentStructureContext.DocumentStructureContext);
-  const { children } = props;
+  const { children, ...rest } = props;
   return /* @__PURE__ */ (0, _jsxruntime.jsxs)("head", {
+    ...rest,
     children: [
       `${_constants.DOCUMENT_META_PLACEHOLDER}`,
       !hasSetLinks && /* @__PURE__ */ (0, _jsxruntime.jsx)(_Links.Links, {}),

package/dist/cjs/document/Root.js

@@ -20,18 +20,24 @@ _export(exports, {
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _jsxruntime = require("react/jsx-runtime");
 const _react = /* @__PURE__ */ _interop_require_wildcard._(require("react"));
+const _lodash = require("@modern-js/utils/lodash");
 const _DocumentContext = require("./DocumentContext");
 const _constants = require("./constants");
 function Root(props) {
-  const { rootId, children } = props;
+  const { rootId, children, ...rest } = props;
+  const legalProperties = (0, _lodash.omit)(rest, "id");
   const { templateParams: { mountId = "root" } } = (0, _react.useContext)(_DocumentContext.DocumentContext);
-  return /* @__PURE__ */ (0, _jsxruntime.jsxs)("div", {
-    id: `${rootId || mountId}`,
-    children: [
-      `${_constants.DOCUMENT_SSR_PLACEHOLDER}`,
-      children
-    ]
-  });
+  return (
+    // in case for properities order not keep
+    /* @__PURE__ */ (0, _jsxruntime.jsxs)("div", {
+      id: `${rootId || mountId}`,
+      ...legalProperties,
+      children: [
+        `${_constants.DOCUMENT_SSR_PLACEHOLDER}`,
+        children
+      ]
+    })
+  );
 }
 function DefaultRoot(props) {
   const { templateParams: { mountId = "root" } } = (0, _react.useContext)(_DocumentContext.DocumentContext);

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

@@ -105,7 +105,25 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
                 hydrationData
               });
               const runtimeContext = (0, _react.useContext)(_core.RuntimeReactContext);
-              runtimeContext.remixRouter = router;
+              if (!runtimeContext.remixRouter) {
+                Object.defineProperty(runtimeContext, "remixRouter", {
+                  get() {
+                    return router;
+                  }
+                });
+              }
+              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 /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
                 ...props,
                 children: /* @__PURE__ */ (0, _jsxruntime.jsx)(_router.RouterProvider, {

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

@@ -114,7 +114,7 @@ const ssrPlugin = () => {
               throw new Error(`router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'`);
             }
             if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {
-              throw new Error(`You should switch to file-system based router to support streaming SSR.`);
+              throw new Error("You should switch to file-system based router to support streaming SSR.");
             }
           }
           const useSSG = (0, _utils.isSSGEntry)(userConfig, entryName, entrypoints);

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

@@ -33,8 +33,8 @@ function renderToPipe(rootElement, context, options) {
         nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
         onError(error) {
           var _options_onError;
-          ssrContext.logger.error("An error occurs during streaming SSR", error);
-          ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
+          ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.logger.error("An error occurs during streaming SSR", error);
+          ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
           options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, error);
         }
       });
@@ -56,7 +56,6 @@ function renderToPipe(rootElement, context, options) {
                 shellChunkStatus = ShellChunkStatus.FINIESH;
                 controller.enqueue(encodeForWebStream(`${shellBefore}${concatedChunk}${shellAfter}`));
               }
-              controller.enqueue(encodeForWebStream(concatedChunk));
             } else {
               controller.enqueue(value);
             }
@@ -67,7 +66,7 @@ function renderToPipe(rootElement, context, options) {
       });
       return injectableStream;
     } catch (err) {
-      ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
+      ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
       const { shellAfter: shellAfter2, shellBefore: shellBefore2 } = (0, _template.getTemplates)(context, _types.RenderLevel.CLIENT_RENDER);
       const fallbackHtml = `${shellBefore2}${shellAfter2}`;
       return fallbackHtml;

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

@@ -112,7 +112,8 @@ class Entry {
         result: this.result,
         entryName: this.entryName,
         config: this.pluginConfig,
-        nonce: this.nonce
+        nonce: this.nonce,
+        template: this.template
       };
       html = (0, _reduce.reduce)(App, renderContext, [
         _styledComponent.toHtml,
@@ -151,6 +152,7 @@ class Entry {
     _define_property._(this, "result", void 0);
     _define_property._(this, "metrics", void 0);
     _define_property._(this, "logger", void 0);
+    _define_property._(this, "template", void 0);
     _define_property._(this, "App", void 0);
     _define_property._(this, "fragments", void 0);
     _define_property._(this, "pluginConfig", void 0);
@@ -159,6 +161,7 @@ class Entry {
     const { ctx, config } = options;
     const { entryName, template, request: { host }, nonce } = ctx;
     this.fragments = (0, _template.toFragments)(template, entryName);
+    this.template = template;
     this.entryName = entryName;
     this.host = host;
     this.App = options.App;

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

@@ -47,9 +47,12 @@ const toHtml = (jsx, renderer, next) => {
       default:
     }
     if (fileType === "js") {
-      attributes.nonce = nonce;
-      const attrsStr = (0, _utils.attributesToString)(attributes);
-      chunksMap[fileType] += `<script${attrsStr} src="${v.url}"></script>`;
+      const jsChunkReg = new RegExp(`<script .*src="${v.url}".*>`);
+      if (!jsChunkReg.test(renderer.template)) {
+        attributes.nonce = nonce;
+        const attrsStr = (0, _utils.attributesToString)(attributes);
+        chunksMap[fileType] += `<script${attrsStr} src="${v.url}"></script>`;
+      }
     } else if (fileType === "css") {
       const attrsStr = (0, _utils.attributesToString)(attributes);
       chunksMap[fileType] += `<link${attrsStr} href="${v.url}" rel="stylesheet" />`;

package/dist/esm/document/Body.js

@@ -1,3 +1,6 @@
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+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";
@@ -5,13 +8,15 @@ import { DocumentStructureContext } from "./DocumentStructureContext";
 import { DefaultRoot } from "./Root";
 export function Body(props) {
   var hasSetRoot = useContext(DocumentStructureContext).hasSetRoot;
-  var children = props.children;
-  return /* @__PURE__ */ _jsxs("body", {
+  var children = props.children, rest = _object_without_properties(props, [
+    "children"
+  ]);
+  return /* @__PURE__ */ _jsxs("body", _object_spread_props(_object_spread({}, rest), {
     children: [
       hasSetRoot ? null : /* @__PURE__ */ _jsx(DefaultRoot, {}),
       children,
       "".concat(DOCUMENT_CHUNKSMAP_PLACEHOLDER),
       "".concat(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER)
     ]
-  });
+  }));
 }

package/dist/esm/document/Head.js

@@ -1,3 +1,6 @@
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+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 { DocumentStructureContext } from "./DocumentStructureContext";
@@ -6,15 +9,17 @@ import { Links } from "./Links";
 import { DOCUMENT_META_PLACEHOLDER } from "./constants";
 export function Head(props) {
   var _useContext = useContext(DocumentStructureContext), hasSetScripts = _useContext.hasSetScripts, hasSetLinks = _useContext.hasSetLinks;
-  var children = props.children;
-  return /* @__PURE__ */ _jsxs("head", {
+  var children = props.children, rest = _object_without_properties(props, [
+    "children"
+  ]);
+  return /* @__PURE__ */ _jsxs("head", _object_spread_props(_object_spread({}, rest), {
     children: [
       "".concat(DOCUMENT_META_PLACEHOLDER),
       !hasSetLinks && /* @__PURE__ */ _jsx(Links, {}),
       !hasSetScripts && /* @__PURE__ */ _jsx(Scripts, {}),
       children
     ]
-  });
+  }));
 }
 export function DefaultHead() {
   return /* @__PURE__ */ _jsx("head", {

package/dist/esm/document/Root.js

@@ -1,17 +1,29 @@
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
+import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { useContext } from "react";
+import { omit } from "@modern-js/utils/lodash";
 import { DocumentContext } from "./DocumentContext";
 import { DOCUMENT_SSR_PLACEHOLDER } from "./constants";
 export function Root(props) {
-  var rootId = props.rootId, children = props.children;
+  var rootId = props.rootId, children = props.children, rest = _object_without_properties(props, [
+    "rootId",
+    "children"
+  ]);
+  var legalProperties = omit(rest, "id");
   var _useContext = useContext(DocumentContext), _useContext_templateParams = _useContext.templateParams, _useContext_templateParams_mountId = _useContext_templateParams.mountId, mountId = _useContext_templateParams_mountId === void 0 ? "root" : _useContext_templateParams_mountId;
-  return /* @__PURE__ */ _jsxs("div", {
-    id: "".concat(rootId || mountId),
-    children: [
-      "".concat(DOCUMENT_SSR_PLACEHOLDER),
-      children
-    ]
-  });
+  return (
+    // in case for properities order not keep
+    /* @__PURE__ */ _jsxs("div", _object_spread_props(_object_spread({
+      id: "".concat(rootId || mountId)
+    }, legalProperties), {
+      children: [
+        "".concat(DOCUMENT_SSR_PLACEHOLDER),
+        children
+      ]
+    }))
+  );
 }
 export function DefaultRoot(props) {
   var _useContext = useContext(DocumentContext), _useContext_templateParams = _useContext.templateParams, _useContext_templateParams_mountId = _useContext_templateParams.mountId, mountId = _useContext_templateParams_mountId === void 0 ? "root" : _useContext_templateParams_mountId;

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

@@ -1,5 +1,6 @@
 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 { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "@modern-js/utils/runtime/router";
@@ -86,7 +87,28 @@ export var routerPlugin = function(param) {
                 hydrationData: hydrationData
               });
               var runtimeContext = useContext(RuntimeReactContext);
-              runtimeContext.remixRouter = router;
+              if (!runtimeContext.remixRouter) {
+                Object.defineProperty(runtimeContext, "remixRouter", {
+                  get: function get() {
+                    return router;
+                  }
+                });
+              }
+              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 /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
                 children: /* @__PURE__ */ _jsx(RouterProvider, {
                   router: router

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

@@ -39,8 +39,8 @@ function renderToPipe(rootElement, context, 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);
-                  ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
+                  ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.logger.error("An error occurs during streaming SSR", error);
+                  ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
                   options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, error);
                 }
               }))
@@ -80,7 +80,6 @@ function renderToPipe(rootElement, context, options) {
                               shellChunkStatus = ShellChunkStatus.FINIESH;
                               controller.enqueue(encodeForWebStream("".concat(shellBefore).concat(concatedChunk).concat(shellAfter)));
                             }
-                            controller.enqueue(encodeForWebStream(concatedChunk));
                           } else {
                             controller.enqueue(value);
                           }
@@ -102,7 +101,7 @@ function renderToPipe(rootElement, context, options) {
             ];
           case 3:
             err = _state.sent();
-            ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
+            ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
             _getTemplates1 = getTemplates(context, RenderLevel.CLIENT_RENDER), shellAfter1 = _getTemplates1.shellAfter, shellBefore1 = _getTemplates1.shellBefore;
             fallbackHtml = "".concat(shellBefore1).concat(shellAfter1);
             return [

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

@@ -45,6 +45,7 @@ var Entry = /* @__PURE__ */ function() {
     _define_property(this, "result", void 0);
     _define_property(this, "metrics", void 0);
     _define_property(this, "logger", void 0);
+    _define_property(this, "template", void 0);
     _define_property(this, "App", void 0);
     _define_property(this, "fragments", void 0);
     _define_property(this, "pluginConfig", void 0);
@@ -53,6 +54,7 @@ var Entry = /* @__PURE__ */ function() {
     var ctx = options.ctx, config = options.config;
     var entryName = ctx.entryName, template = ctx.template, host = ctx.request.host, nonce = ctx.nonce;
     this.fragments = toFragments(template, entryName);
+    this.template = template;
     this.entryName = entryName;
     this.host = host;
     this.App = options.App;
@@ -218,7 +220,8 @@ var Entry = /* @__PURE__ */ function() {
             result: this.result,
             entryName: this.entryName,
             config: this.pluginConfig,
-            nonce: this.nonce
+            nonce: this.nonce,
+            template: this.template
           };
           html = reduce(App, renderContext, [
             styledComponentRenderer.toHtml,

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

@@ -40,9 +40,12 @@ export var toHtml = function(jsx, renderer, next) {
         default:
       }
       if (fileType === "js") {
-        attributes.nonce = nonce;
-        var attrsStr = attributesToString(attributes);
-        chunksMap[fileType] += "<script".concat(attrsStr, ' src="').concat(v.url, '"></script>');
+        var jsChunkReg = new RegExp('<script .*src="'.concat(v.url, '".*>'));
+        if (!jsChunkReg.test(renderer.template)) {
+          attributes.nonce = nonce;
+          var attrsStr = attributesToString(attributes);
+          chunksMap[fileType] += "<script".concat(attrsStr, ' src="').concat(v.url, '"></script>');
+        }
       } else if (fileType === "css") {
         var attrsStr1 = attributesToString(attributes);
         chunksMap[fileType] += "<link".concat(attrsStr1, ' href="').concat(v.url, '" rel="stylesheet" />');

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

@@ -5,8 +5,9 @@ import { DocumentStructureContext } from "./DocumentStructureContext";
 import { DefaultRoot } from "./Root";
 export function Body(props) {
   const { hasSetRoot } = useContext(DocumentStructureContext);
-  const { children } = props;
+  const { children, ...rest } = props;
   return /* @__PURE__ */ _jsxs("body", {
+    ...rest,
     children: [
       hasSetRoot ? null : /* @__PURE__ */ _jsx(DefaultRoot, {}),
       children,

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

@@ -6,8 +6,9 @@ import { Links } from "./Links";
 import { DOCUMENT_META_PLACEHOLDER } from "./constants";
 export function Head(props) {
   const { hasSetScripts, hasSetLinks } = useContext(DocumentStructureContext);
-  const { children } = props;
+  const { children, ...rest } = props;
   return /* @__PURE__ */ _jsxs("head", {
+    ...rest,
     children: [
       `${DOCUMENT_META_PLACEHOLDER}`,
       !hasSetLinks && /* @__PURE__ */ _jsx(Links, {}),

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

@@ -1,17 +1,23 @@
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { useContext } from "react";
+import { omit } from "@modern-js/utils/lodash";
 import { DocumentContext } from "./DocumentContext";
 import { DOCUMENT_SSR_PLACEHOLDER } from "./constants";
 export function Root(props) {
-  const { rootId, children } = props;
+  const { rootId, children, ...rest } = props;
+  const legalProperties = omit(rest, "id");
   const { templateParams: { mountId = "root" } } = useContext(DocumentContext);
-  return /* @__PURE__ */ _jsxs("div", {
-    id: `${rootId || mountId}`,
-    children: [
-      `${DOCUMENT_SSR_PLACEHOLDER}`,
-      children
-    ]
-  });
+  return (
+    // in case for properities order not keep
+    /* @__PURE__ */ _jsxs("div", {
+      id: `${rootId || mountId}`,
+      ...legalProperties,
+      children: [
+        `${DOCUMENT_SSR_PLACEHOLDER}`,
+        children
+      ]
+    })
+  );
 }
 export function DefaultRoot(props) {
   const { templateParams: { mountId = "root" } } = useContext(DocumentContext);

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

@@ -78,7 +78,25 @@ export const routerPlugin = ({ serverBase = [], supportHtml5History = true, base
                 hydrationData
               });
               const runtimeContext = useContext(RuntimeReactContext);
-              runtimeContext.remixRouter = router;
+              if (!runtimeContext.remixRouter) {
+                Object.defineProperty(runtimeContext, "remixRouter", {
+                  get() {
+                    return router;
+                  }
+                });
+              }
+              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 /* @__PURE__ */ _jsx(App, {
                 ...props,
                 children: /* @__PURE__ */ _jsx(RouterProvider, {

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

@@ -94,7 +94,7 @@ export const ssrPlugin = () => {
               throw new Error(`router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'`);
             }
             if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {
-              throw new Error(`You should switch to file-system based router to support streaming SSR.`);
+              throw new Error("You should switch to file-system based router to support streaming SSR.");
             }
           }
           const useSSG = isSSGEntry(userConfig, entryName, entrypoints);

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

@@ -23,8 +23,8 @@ function renderToPipe(rootElement, context, options) {
         nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
         onError(error) {
           var _options_onError;
-          ssrContext.logger.error("An error occurs during streaming SSR", error);
-          ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
+          ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.logger.error("An error occurs during streaming SSR", error);
+          ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.metrics.emitCounter("app.render.streaming.error", 1);
           options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, error);
         }
       });
@@ -46,7 +46,6 @@ function renderToPipe(rootElement, context, options) {
                 shellChunkStatus = ShellChunkStatus.FINIESH;
                 controller.enqueue(encodeForWebStream(`${shellBefore}${concatedChunk}${shellAfter}`));
               }
-              controller.enqueue(encodeForWebStream(concatedChunk));
             } else {
               controller.enqueue(value);
             }
@@ -57,7 +56,7 @@ function renderToPipe(rootElement, context, options) {
       });
       return injectableStream;
     } catch (err) {
-      ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
+      ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.metrics.emitCounter("app.render.streaming.shell.error", 1);
       const { shellAfter: shellAfter2, shellBefore: shellBefore2 } = getTemplates(context, RenderLevel.CLIENT_RENDER);
       const fallbackHtml = `${shellBefore2}${shellAfter2}`;
       return fallbackHtml;

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

@@ -100,7 +100,8 @@ class Entry {
         result: this.result,
         entryName: this.entryName,
         config: this.pluginConfig,
-        nonce: this.nonce
+        nonce: this.nonce,
+        template: this.template
       };
       html = reduce(App, renderContext, [
         styledComponentRenderer.toHtml,
@@ -139,6 +140,7 @@ class Entry {
     _define_property(this, "result", void 0);
     _define_property(this, "metrics", void 0);
     _define_property(this, "logger", void 0);
+    _define_property(this, "template", void 0);
     _define_property(this, "App", void 0);
     _define_property(this, "fragments", void 0);
     _define_property(this, "pluginConfig", void 0);
@@ -147,6 +149,7 @@ class Entry {
     const { ctx, config } = options;
     const { entryName, template, request: { host }, nonce } = ctx;
     this.fragments = toFragments(template, entryName);
+    this.template = template;
     this.entryName = entryName;
     this.host = host;
     this.App = options.App;

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

@@ -37,9 +37,12 @@ export const toHtml = (jsx, renderer, next) => {
       default:
     }
     if (fileType === "js") {
-      attributes.nonce = nonce;
-      const attrsStr = attributesToString(attributes);
-      chunksMap[fileType] += `<script${attrsStr} src="${v.url}"></script>`;
+      const jsChunkReg = new RegExp(`<script .*src="${v.url}".*>`);
+      if (!jsChunkReg.test(renderer.template)) {
+        attributes.nonce = nonce;
+        const attrsStr = attributesToString(attributes);
+        chunksMap[fileType] += `<script${attrsStr} src="${v.url}"></script>`;
+      }
     } else if (fileType === "css") {
       const attrsStr = attributesToString(attributes);
       chunksMap[fileType] += `<link${attrsStr} href="${v.url}" rel="stylesheet" />`;

package/dist/types/runtimeContext.d.ts

@@ -13,6 +13,14 @@ export interface BaseRuntimeContext {
   store?: Store;
   routeManifest: RouteManifest;
   routerContext?: StaticHandlerContext;
+  /**
+   * private method
+   */
+  remixRouter?: Router;
+  /**
+   * private
+   */
+  unstable_getBlockNavState?: () => boolean;
 }
 export interface RuntimeContext extends BaseRuntimeContext {
   [key: string]: any;

package/dist/types/ssr/serverRender/renderToString/entry.d.ts

@@ -10,6 +10,7 @@ export default class Entry {
   result: RenderResult;
   metrics: SSRServerContext['metrics'];
   logger: SSRServerContext['logger'];
+  private readonly template;
   private readonly App;
   private readonly fragments;
   private readonly pluginConfig;

package/dist/types/ssr/serverRender/renderToString/type.d.ts

@@ -19,6 +19,7 @@ export interface RenderEntry {
   result: RenderResult;
   stats: Record<string, any>;
   config: SSRPluginConfig;
+  template: string;
   nonce?: string;
 }
 export type RenderHandler = (jsx: React.ReactElement, renderer: RenderEntry, next: (jsx: React.ReactElement) => string) => string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.25.1",
+  "version": "2.26.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -145,9 +145,9 @@
     "@babel/core": "^7.21.8",
     "@babel/types": "^7.21.5",
     "cookie": "0.5.0",
-    "@loadable/babel-plugin": "^5.13.2",
-    "@loadable/component": "^5.15.0",
-    "@loadable/server": "^5.15.1",
+    "@loadable/babel-plugin": "5.15.3",
+    "@loadable/component": "5.15.3",
+    "@loadable/server": "5.15.3",
     "@loadable/webpack-plugin": "5.15.2",
     "@modern-js-reduck/plugin-auto-actions": "^1.1.10",
     "@modern-js-reduck/plugin-devtools": "^1.1.10",
@@ -169,9 +169,9 @@
     "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/plugin": "2.25.1",
-    "@modern-js/types": "2.25.1",
-    "@modern-js/utils": "2.25.1"
+    "@modern-js/plugin": "2.26.0",
+    "@modern-js/types": "2.26.0",
+    "@modern-js/utils": "2.26.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -191,12 +191,12 @@
     "react-dom": "^18",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "webpack": "^5.82.1",
-    "@modern-js/app-tools": "2.25.1",
-    "@modern-js/core": "2.25.1",
-    "@modern-js/server-core": "2.25.1",
-    "@scripts/jest-config": "2.25.1",
-    "@scripts/build": "2.25.1"
+    "webpack": "^5.88.1",
+    "@modern-js/app-tools": "2.26.0",
+    "@modern-js/core": "2.26.0",
+    "@modern-js/server-core": "2.26.0",
+    "@scripts/build": "2.26.0",
+    "@scripts/jest-config": "2.26.0"
   },
   "sideEffects": false,
   "modernConfig": {},

package/types/model.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="@modern-js-reduck/plugin-auto-actions" />
-/// <reference types="@modern-js-reduck/plugin-devtools" />
-/// <reference types="@modern-js-reduck/plugin-effects" />
-/// <reference types="@modern-js-reduck/plugin-immutable" />
+import '@modern-js-reduck/plugin-auto-actions';
+import '@modern-js-reduck/plugin-devtools';
+import '@modern-js-reduck/plugin-effects';
+import '@modern-js-reduck/plugin-immutable';
 
 export { default } from '../dist/types/state';
 export * from '../dist/types/state';