@modern-js/runtime 2.48.1 → 2.48.2

package/dist/cjs/ssr/index.js

@@ -64,8 +64,8 @@ const ssr = (config) => ({
           _hydration: true
         };
         const { ssrContext } = hydrateContext;
-        const { pathname: initialPathname } = ssrContext.request;
         const currentPathname = (0, import_url.normalizePathname)(window.location.pathname);
+        const initialPathname = (0, import_url.normalizePathname)(ssrContext.request.pathname);
         if (initialPathname !== currentPathname) {
           const errorMsg = `The initial URL ${initialPathname} and the URL ${currentPathname} to be hydrated do not match, reload.`;
           console.error(errorMsg);

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

@@ -55,9 +55,9 @@ const checkIsInline = (chunk, enableInline) => {
   }
 };
 function getHeadTemplate(beforeEntryTemplate, context, pluginConfig) {
+  const helmetData = import_react_helmet.default.renderStatic();
   const callbacks = [
     (headTemplate2) => {
-      const helmetData = import_react_helmet.default.renderStatic();
       return helmetData ? (0, import_helmet.default)(headTemplate2, helmetData) : headTemplate2;
     },
     // @TODO: prefetch scripts of lazy component

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

@@ -33,7 +33,6 @@ __export(entry_exports, {
 module.exports = __toCommonJS(entry_exports);
 var import_react = __toESM(require("react"));
 var import_node = require("@modern-js/runtime-utils/node");
-var import_react_helmet = __toESM(require("react-helmet"));
 var import_time = require("@modern-js/runtime-utils/time");
 var import_utils = require("../../../router/runtime/utils");
 var import_helmet = __toESM(require("../helmet"));
@@ -102,7 +101,7 @@ class Entry {
       (0, import_buildHtml.createReplaceHtml)(this.result.html || ""),
       ...this.htmlModifiers
     ]);
-    const helmetData = import_react_helmet.default.renderStatic();
+    const helmetData = this.result.helmet;
     return helmetData ? (0, import_helmet.default)(html, helmetData) : html;
   }
   async prefetch(context) {
@@ -125,7 +124,7 @@ class Entry {
           ssr: true
         })
       });
-      html = await (0, import_render.createRender)(App).addCollector((0, import_styledComponent.createStyledCollector)(this.result)).addCollector((0, import_loadable.createLoadableCollector)({
+      html = await (0, import_render.createRender)(App, this.result).addCollector((0, import_styledComponent.createStyledCollector)(this.result)).addCollector((0, import_loadable.createLoadableCollector)({
         stats: ssrContext.loadableStats,
         result: this.result,
         entryName: this.entryName,

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

@@ -32,6 +32,7 @@ __export(render_exports, {
 });
 module.exports = __toCommonJS(render_exports);
 var import_server = __toESM(require("react-dom/server"));
+var import_react_helmet = __toESM(require("react-helmet"));
 class Render {
   addCollector(collector) {
     this.collectors.push(collector);
@@ -40,16 +41,19 @@ class Render {
   async finish() {
     const App = this.collectors.reduce((pre, collector) => collector.collect(pre), this.App);
     const html = import_server.default.renderToString(App);
+    const helmetData = import_react_helmet.default.renderStatic();
+    this.renderResult.helmet = helmetData;
     await Promise.all(this.collectors.map((component) => component.effect()));
     return html;
   }
-  constructor(App) {
+  constructor(App, result) {
     this.collectors = [];
     this.App = App;
+    this.renderResult = result;
   }
 }
-function createRender(App) {
-  return new Render(App);
+function createRender(App, result) {
+  return new Render(App, result);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/esm/ssr/index.js

@@ -25,7 +25,7 @@ var ssr = function(config) {
       return {
         client: function() {
           var _ref = _async_to_generator(function(param) {
-            var App, context, ModernRender, ModernHydrate, _window__SSR_DATA, _window, hydrateContext, ssrContext, _ssrContext_request, initialPathname, currentPathname, errorMsg, callback, renderLevel;
+            var App, context, ModernRender, ModernHydrate, _window__SSR_DATA, _window, hydrateContext, ssrContext, currentPathname, initialPathname, errorMsg, callback, renderLevel;
             function stringSSRHydrate() {
               if (renderLevel === RenderLevel.CLIENT_RENDER || renderLevel === RenderLevel.SERVER_PREFETCH) {
                 ModernRender(/* @__PURE__ */ _jsx(App, {
@@ -89,8 +89,8 @@ var ssr = function(config) {
                 _hydration: true
               });
               ssrContext = hydrateContext.ssrContext;
-              _ssrContext_request = ssrContext.request, initialPathname = _ssrContext_request.pathname;
               currentPathname = normalizePathname(window.location.pathname);
+              initialPathname = normalizePathname(ssrContext.request.pathname);
               if (initialPathname !== currentPathname) {
                 errorMsg = "The initial URL ".concat(initialPathname, " and the URL ").concat(currentPathname, " to be hydrated do not match, reload.");
                 console.error(errorMsg);

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

@@ -51,9 +51,9 @@ var checkIsInline = function(chunk, enableInline) {
   }
 };
 function getHeadTemplate(beforeEntryTemplate, context, pluginConfig) {
+  var helmetData = ReactHelmet.renderStatic();
   var callbacks = [
     function(headTemplate2) {
-      var helmetData = ReactHelmet.renderStatic();
       return helmetData ? helmetReplace(headTemplate2, helmetData) : headTemplate2;
     },
     // @TODO: prefetch scripts of lazy component

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

@@ -5,7 +5,6 @@ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import React from "react";
 import { serializeJson } from "@modern-js/runtime-utils/node";
-import ReactHelmet from "react-helmet";
 import { time } from "@modern-js/runtime-utils/time";
 import { serializeErrors } from "../../../router/runtime/utils";
 import helmetReplace from "../helmet";
@@ -129,7 +128,7 @@ var Entry = /* @__PURE__ */ function() {
               createReplaceSSRDataScript(ssrDataScripts),
               createReplaceHtml(_this.result.html || "")
             ].concat(_to_consumable_array(_this.htmlModifiers)));
-            helmetData = ReactHelmet.renderStatic();
+            helmetData = _this.result.helmet;
             return [
               2,
               helmetData ? helmetReplace(html, helmetData) : html
@@ -203,7 +202,7 @@ var Entry = /* @__PURE__ */ function() {
             });
             return [
               4,
-              createRender(App).addCollector(createStyledCollector(_this.result)).addCollector(createLoadableCollector({
+              createRender(App, _this.result).addCollector(createStyledCollector(_this.result)).addCollector(createLoadableCollector({
                 stats: ssrContext.loadableStats,
                 result: _this.result,
                 entryName: _this.entryName,

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

@@ -2,12 +2,14 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import ReactDomServer from "react-dom/server";
+import ReactHelmet from "react-helmet";
 var Render = /* @__PURE__ */ function() {
   "use strict";
-  function Render2(App) {
+  function Render2(App, result) {
     _class_call_check(this, Render2);
     this.collectors = [];
     this.App = App;
+    this.renderResult = result;
   }
   var _proto = Render2.prototype;
   _proto.addCollector = function addCollector(collector) {
@@ -17,7 +19,7 @@ var Render = /* @__PURE__ */ function() {
   _proto.finish = function finish() {
     var _this = this;
     return _async_to_generator(function() {
-      var App, html;
+      var App, html, helmetData;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -25,6 +27,8 @@ var Render = /* @__PURE__ */ function() {
               return collector.collect(pre);
             }, _this.App);
             html = ReactDomServer.renderToString(App);
+            helmetData = ReactHelmet.renderStatic();
+            _this.renderResult.helmet = helmetData;
             return [
               4,
               Promise.all(_this.collectors.map(function(component) {
@@ -43,8 +47,8 @@ var Render = /* @__PURE__ */ function() {
   };
   return Render2;
 }();
-function createRender(App) {
-  return new Render(App);
+function createRender(App, result) {
+  return new Render(App, result);
 }
 export {
   createRender

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

@@ -28,8 +28,8 @@ const ssr = (config) => ({
           _hydration: true
         };
         const { ssrContext } = hydrateContext;
-        const { pathname: initialPathname } = ssrContext.request;
         const currentPathname = normalizePathname(window.location.pathname);
+        const initialPathname = normalizePathname(ssrContext.request.pathname);
         if (initialPathname !== currentPathname) {
           const errorMsg = `The initial URL ${initialPathname} and the URL ${currentPathname} to be hydrated do not match, reload.`;
           console.error(errorMsg);

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

@@ -22,9 +22,9 @@ const checkIsInline = (chunk, enableInline) => {
   }
 };
 function getHeadTemplate(beforeEntryTemplate, context, pluginConfig) {
+  const helmetData = ReactHelmet.renderStatic();
   const callbacks = [
     (headTemplate2) => {
-      const helmetData = ReactHelmet.renderStatic();
       return helmetData ? helmetReplace(headTemplate2, helmetData) : headTemplate2;
     },
     // @TODO: prefetch scripts of lazy component

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

@@ -1,6 +1,5 @@
 import React from "react";
 import { serializeJson } from "@modern-js/runtime-utils/node";
-import ReactHelmet from "react-helmet";
 import { time } from "@modern-js/runtime-utils/time";
 import { serializeErrors } from "../../../router/runtime/utils";
 import helmetReplace from "../helmet";
@@ -69,7 +68,7 @@ class Entry {
       createReplaceHtml(this.result.html || ""),
       ...this.htmlModifiers
     ]);
-    const helmetData = ReactHelmet.renderStatic();
+    const helmetData = this.result.helmet;
     return helmetData ? helmetReplace(html, helmetData) : html;
   }
   async prefetch(context) {
@@ -92,7 +91,7 @@ class Entry {
           ssr: true
         })
       });
-      html = await createRender(App).addCollector(createStyledCollector(this.result)).addCollector(createLoadableCollector({
+      html = await createRender(App, this.result).addCollector(createStyledCollector(this.result)).addCollector(createLoadableCollector({
         stats: ssrContext.loadableStats,
         result: this.result,
         entryName: this.entryName,

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

@@ -1,4 +1,5 @@
 import ReactDomServer from "react-dom/server";
+import ReactHelmet from "react-helmet";
 class Render {
   addCollector(collector) {
     this.collectors.push(collector);
@@ -7,16 +8,19 @@ class Render {
   async finish() {
     const App = this.collectors.reduce((pre, collector) => collector.collect(pre), this.App);
     const html = ReactDomServer.renderToString(App);
+    const helmetData = ReactHelmet.renderStatic();
+    this.renderResult.helmet = helmetData;
     await Promise.all(this.collectors.map((component) => component.effect()));
     return html;
   }
-  constructor(App) {
+  constructor(App, result) {
     this.collectors = [];
     this.App = App;
+    this.renderResult = result;
   }
 }
-function createRender(App) {
-  return new Render(App);
+function createRender(App, result) {
+  return new Render(App, result);
 }
 export {
   createRender

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

@@ -1,14 +1,16 @@
 import type { ReactElement } from 'react';
+import { RenderResult } from '../types';
 export interface Collector {
     collect: (comopnent: ReactElement) => ReactElement;
     effect: () => void | Promise<void>;
 }
 declare class Render {
     private App;
+    private renderResult;
     private collectors;
-    constructor(App: ReactElement);
+    constructor(App: ReactElement, result: RenderResult);
     addCollector(collector: Collector): this;
     finish(): Promise<string>;
 }
-export declare function createRender(App: ReactElement): Render;
+export declare function createRender(App: ReactElement, result: RenderResult): Render;
 export {};

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

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import { ServerUserConfig } from '@modern-js/app-tools';
 import type { BaseSSRServerContext } from '@modern-js/types';
+import type { HelmetData } from 'react-helmet';
 import type { RuntimeContext } from '../../core';
 import type { BuildHtmlCb } from './renderToString/buildHtml';
 import type { SSRTracker } from './tracker';
@@ -12,6 +13,7 @@ export declare enum RenderLevel {
 export type RenderResult = {
     renderLevel: RenderLevel;
     html?: string;
+    helmet?: HelmetData;
     chunksMap: {
         js: string;
         css: string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.48.1",
+  "version": "2.48.2",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -171,10 +171,10 @@
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.3",
-    "@modern-js/plugin": "2.48.1",
-    "@modern-js/utils": "2.48.1",
-    "@modern-js/runtime-utils": "2.48.1",
-    "@modern-js/types": "2.48.1"
+    "@modern-js/utils": "2.48.2",
+    "@modern-js/plugin": "2.48.2",
+    "@modern-js/types": "2.48.2",
+    "@modern-js/runtime-utils": "2.48.2"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -195,11 +195,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.89.0",
-    "@modern-js/core": "2.48.1",
-    "@modern-js/server-core": "2.48.1",
-    "@modern-js/app-tools": "2.48.1",
-    "@scripts/build": "2.48.1",
-    "@scripts/jest-config": "2.48.1"
+    "@modern-js/app-tools": "2.48.2",
+    "@modern-js/core": "2.48.2",
+    "@modern-js/server-core": "2.48.2",
+    "@scripts/jest-config": "2.48.2",
+    "@scripts/build": "2.48.2"
   },
   "sideEffects": false,
   "publishConfig": {