@modern-js/runtime 2.48.0 → 2.48.2

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

@@ -1,7 +1,5 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 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";
@@ -70,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) {
@@ -93,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,
@@ -126,15 +124,6 @@ class Entry {
     return ssrDataScripts;
   }
   constructor(options) {
-    _define_property(this, "entryName", void 0);
-    _define_property(this, "result", void 0);
-    _define_property(this, "tracker", void 0);
-    _define_property(this, "template", void 0);
-    _define_property(this, "App", void 0);
-    _define_property(this, "pluginConfig", void 0);
-    _define_property(this, "htmlModifiers", void 0);
-    _define_property(this, "nonce", void 0);
-    _define_property(this, "routeManifest", void 0);
     const { ctx, config } = options;
     const { entryName, template, nonce } = ctx;
     this.template = template;

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

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { ChunkExtractor } from "@loadable/server";
 import { attributesToString, checkIsNode } from "../utils";
 const extname = (uri) => {
@@ -127,8 +126,6 @@ class LoadableCollector {
     };
   }
   constructor(options) {
-    _define_property(this, "options", void 0);
-    _define_property(this, "extractor", void 0);
     this.options = options;
   }
 }

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

@@ -1,5 +1,5 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import ReactDomServer from "react-dom/server";
+import ReactHelmet from "react-helmet";
 class Render {
   addCollector(collector) {
     this.collectors.push(collector);
@@ -8,17 +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) {
-    _define_property(this, "App", void 0);
-    _define_property(this, "collectors", []);
+  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/esm-node/ssr/serverRender/renderToString/styledComponent.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { ServerStyleSheet } from "styled-components";
 class StyledCollector {
   collect(comopnent) {
@@ -9,8 +8,7 @@ class StyledCollector {
     this.result.chunksMap.css += css;
   }
   constructor(result) {
-    _define_property(this, "sheet", new ServerStyleSheet());
-    _define_property(this, "result", void 0);
+    this.sheet = new ServerStyleSheet();
     this.result = result;
   }
 }

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.0",
+  "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/types": "2.48.0",
-    "@modern-js/plugin": "2.48.0",
-    "@modern-js/utils": "2.48.0",
-    "@modern-js/runtime-utils": "2.48.0"
+    "@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/app-tools": "2.48.0",
-    "@modern-js/core": "2.48.0",
-    "@modern-js/server-core": "2.48.0",
-    "@scripts/build": "2.48.0",
-    "@scripts/jest-config": "2.48.0"
+    "@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": {