@modern-js/runtime 2.33.0 → 2.34.0

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

@@ -142,17 +142,19 @@ const ssrPlugin = () => ({
       },
       modifyEntryRuntimePlugins({ entrypoint, plugins, bundlerConfigs }) {
         if (ssrConfigMap.get(entrypoint.entryName)) {
-          var _bundlerConfigs_find_output, _bundlerConfigs_find, _bundlerConfigs;
+          var _bundlerConfigs_find_output, _bundlerConfigs_find, _bundlerConfigs, _config_server;
           const chunkLoadingGlobal = (_bundlerConfigs = bundlerConfigs) === null || _bundlerConfigs === void 0 ? void 0 : (_bundlerConfigs_find = _bundlerConfigs.find((config2) => config2.name === "client")) === null || _bundlerConfigs_find === void 0 ? void 0 : (_bundlerConfigs_find_output = _bundlerConfigs_find.output) === null || _bundlerConfigs_find_output === void 0 ? void 0 : _bundlerConfigs_find_output.chunkLoadingGlobal;
           const config = api.useResolvedConfigContext();
           const { crossorigin, scriptLoading } = config.html;
+          const disablePrerender = typeof ((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.ssr) === "object" ? Boolean(config.server.ssr.disablePrerender) : false;
           plugins.push({
             name: PLUGIN_IDENTIFIER,
             options: JSON.stringify({
               ...ssrConfigMap.get(entrypoint.entryName) || {},
               crossorigin,
               scriptLoading,
-              chunkLoadingGlobal
+              chunkLoadingGlobal,
+              disablePrerender
             })
           });
         }

package/dist/cjs/ssr/prefetch.js

@@ -12,24 +12,26 @@ const _jsxruntime = require("react/jsx-runtime");
 const _server = require("react-dom/server");
 const _runtimenode = require("@modern-js/utils/runtime-node");
 const _server1 = require("@loadable/server");
-const prefetch = async (App, context) => (0, _runtimenode.run)(context.ssrContext.request.headers, async () => {
+const prefetch = async (App, context, config) => (0, _runtimenode.run)(context.ssrContext.request.headers, async () => {
   var _context_store, _context;
   const { ssrContext } = context;
   const { loadableStats } = ssrContext;
-  if (loadableStats) {
-    const extractor = new _server1.ChunkExtractor({
-      stats: loadableStats,
-      entrypoints: [
-        ssrContext.entryName
-      ].filter(Boolean)
-    });
-    (0, _server.renderToStaticMarkup)(extractor.collectChunks(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
-      context
-    })));
-  } else {
-    (0, _server.renderToStaticMarkup)(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
-      context
-    }));
+  if (!config.disablePrerender) {
+    if (loadableStats) {
+      const extractor = new _server1.ChunkExtractor({
+        stats: loadableStats,
+        entrypoints: [
+          ssrContext.entryName
+        ].filter(Boolean)
+      });
+      (0, _server.renderToStaticMarkup)(extractor.collectChunks(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+        context
+      })));
+    } else {
+      (0, _server.renderToStaticMarkup)(/* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+        context
+      }));
+    }
   }
   if (!context.loaderManager.hasPendingLoaders()) {
     return {

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

@@ -85,7 +85,7 @@ class Entry {
     let prefetchData;
     const end = (0, _time.time)();
     try {
-      prefetchData = await (0, _prefetch.default)(this.App, context);
+      prefetchData = await (0, _prefetch.default)(this.App, context, this.pluginConfig);
       this.result.renderLevel = _types.RenderLevel.SERVER_PREFETCH;
       const prefetchCost = end();
       this.tracker.trackTiming(_tracker.SSRTimings.SSR_PREFETCH, prefetchCost);

package/dist/cjs/ssr/utils.js

@@ -54,7 +54,10 @@ const formatClient = (request) => {
     cookie: document.cookie || "",
     userAgent: ((_request_headers = request.headers) === null || _request_headers === void 0 ? void 0 : _request_headers["user-agent"]) || navigator.userAgent,
     referer: request.referer || document.referrer,
-    query: request.query || getQuery(),
+    query: {
+      ...getQuery(),
+      ...request.query
+    },
     url: location.href
   };
 };

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

@@ -148,18 +148,20 @@ export var ssrPlugin = function() {
         modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
           var entrypoint = param.entrypoint, plugins = param.plugins, bundlerConfigs = param.bundlerConfigs;
           if (ssrConfigMap.get(entrypoint.entryName)) {
-            var _bundlerConfigs_find_output, _bundlerConfigs_find, _bundlerConfigs;
+            var _bundlerConfigs_find_output, _bundlerConfigs_find, _bundlerConfigs, _config_server;
             var chunkLoadingGlobal = (_bundlerConfigs = bundlerConfigs) === null || _bundlerConfigs === void 0 ? void 0 : (_bundlerConfigs_find = _bundlerConfigs.find(function(config2) {
               return config2.name === "client";
             })) === null || _bundlerConfigs_find === void 0 ? void 0 : (_bundlerConfigs_find_output = _bundlerConfigs_find.output) === null || _bundlerConfigs_find_output === void 0 ? void 0 : _bundlerConfigs_find_output.chunkLoadingGlobal;
             var config = api.useResolvedConfigContext();
             var _config_html = config.html, crossorigin = _config_html.crossorigin, scriptLoading = _config_html.scriptLoading;
+            var disablePrerender = typeof ((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.ssr) === "object" ? Boolean(config.server.ssr.disablePrerender) : false;
             plugins.push({
               name: PLUGIN_IDENTIFIER,
               options: JSON.stringify(_object_spread_props(_object_spread({}, ssrConfigMap.get(entrypoint.entryName) || {}), {
                 crossorigin: crossorigin,
                 scriptLoading: scriptLoading,
-                chunkLoadingGlobal: chunkLoadingGlobal
+                chunkLoadingGlobal: chunkLoadingGlobal,
+                disablePrerender: disablePrerender
               }))
             });
           }

package/dist/esm/ssr/prefetch.js

@@ -5,7 +5,7 @@ import { renderToStaticMarkup } from "react-dom/server";
 import { run } from "@modern-js/utils/runtime-node";
 import { ChunkExtractor } from "@loadable/server";
 var prefetch = function() {
-  var _ref = _async_to_generator(function(App, context) {
+  var _ref = _async_to_generator(function(App, context, config) {
     return _ts_generator(this, function(_state) {
       return [
         2,
@@ -16,20 +16,22 @@ var prefetch = function() {
               case 0:
                 ssrContext = context.ssrContext;
                 loadableStats = ssrContext.loadableStats;
-                if (loadableStats) {
-                  extractor = new ChunkExtractor({
-                    stats: loadableStats,
-                    entrypoints: [
-                      ssrContext.entryName
-                    ].filter(Boolean)
-                  });
-                  renderToStaticMarkup(extractor.collectChunks(/* @__PURE__ */ _jsx(App, {
-                    context: context
-                  })));
-                } else {
-                  renderToStaticMarkup(/* @__PURE__ */ _jsx(App, {
-                    context: context
-                  }));
+                if (!config.disablePrerender) {
+                  if (loadableStats) {
+                    extractor = new ChunkExtractor({
+                      stats: loadableStats,
+                      entrypoints: [
+                        ssrContext.entryName
+                      ].filter(Boolean)
+                    });
+                    renderToStaticMarkup(extractor.collectChunks(/* @__PURE__ */ _jsx(App, {
+                      context: context
+                    })));
+                  } else {
+                    renderToStaticMarkup(/* @__PURE__ */ _jsx(App, {
+                      context: context
+                    }));
+                  }
                 }
                 if (!context.loaderManager.hasPendingLoaders()) {
                   return [
@@ -70,7 +72,7 @@ var prefetch = function() {
       ];
     });
   });
-  return function prefetch2(App, context) {
+  return function prefetch2(App, context, config) {
     return _ref.apply(this, arguments);
   };
 }();

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

@@ -154,7 +154,7 @@ var Entry = /* @__PURE__ */ function() {
                 ]);
                 return [
                   4,
-                  prefetch(_this.App, context)
+                  prefetch(_this.App, context, _this.pluginConfig)
                 ];
               case 2:
                 prefetchData = _state.sent();

package/dist/esm/ssr/utils.js

@@ -33,7 +33,7 @@ export var formatClient = function(request) {
     cookie: document.cookie || "",
     userAgent: ((_request_headers = request.headers) === null || _request_headers === void 0 ? void 0 : _request_headers["user-agent"]) || navigator.userAgent,
     referer: request.referer || document.referrer,
-    query: request.query || getQuery(),
+    query: _object_spread({}, getQuery(), request.query),
     url: location.href
   };
 };

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

@@ -122,17 +122,19 @@ export const ssrPlugin = () => ({
       },
       modifyEntryRuntimePlugins({ entrypoint, plugins, bundlerConfigs }) {
         if (ssrConfigMap.get(entrypoint.entryName)) {
-          var _bundlerConfigs_find_output, _bundlerConfigs_find, _bundlerConfigs;
+          var _bundlerConfigs_find_output, _bundlerConfigs_find, _bundlerConfigs, _config_server;
           const chunkLoadingGlobal = (_bundlerConfigs = bundlerConfigs) === null || _bundlerConfigs === void 0 ? void 0 : (_bundlerConfigs_find = _bundlerConfigs.find((config2) => config2.name === "client")) === null || _bundlerConfigs_find === void 0 ? void 0 : (_bundlerConfigs_find_output = _bundlerConfigs_find.output) === null || _bundlerConfigs_find_output === void 0 ? void 0 : _bundlerConfigs_find_output.chunkLoadingGlobal;
           const config = api.useResolvedConfigContext();
           const { crossorigin, scriptLoading } = config.html;
+          const disablePrerender = typeof ((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.ssr) === "object" ? Boolean(config.server.ssr.disablePrerender) : false;
           plugins.push({
             name: PLUGIN_IDENTIFIER,
             options: JSON.stringify({
               ...ssrConfigMap.get(entrypoint.entryName) || {},
               crossorigin,
               scriptLoading,
-              chunkLoadingGlobal
+              chunkLoadingGlobal,
+              disablePrerender
             })
           });
         }

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

@@ -2,24 +2,26 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { renderToStaticMarkup } from "react-dom/server";
 import { run } from "@modern-js/utils/runtime-node";
 import { ChunkExtractor } from "@loadable/server";
-const prefetch = async (App, context) => run(context.ssrContext.request.headers, async () => {
+const prefetch = async (App, context, config) => run(context.ssrContext.request.headers, async () => {
   var _context_store, _context;
   const { ssrContext } = context;
   const { loadableStats } = ssrContext;
-  if (loadableStats) {
-    const extractor = new ChunkExtractor({
-      stats: loadableStats,
-      entrypoints: [
-        ssrContext.entryName
-      ].filter(Boolean)
-    });
-    renderToStaticMarkup(extractor.collectChunks(/* @__PURE__ */ _jsx(App, {
-      context
-    })));
-  } else {
-    renderToStaticMarkup(/* @__PURE__ */ _jsx(App, {
-      context
-    }));
+  if (!config.disablePrerender) {
+    if (loadableStats) {
+      const extractor = new ChunkExtractor({
+        stats: loadableStats,
+        entrypoints: [
+          ssrContext.entryName
+        ].filter(Boolean)
+      });
+      renderToStaticMarkup(extractor.collectChunks(/* @__PURE__ */ _jsx(App, {
+        context
+      })));
+    } else {
+      renderToStaticMarkup(/* @__PURE__ */ _jsx(App, {
+        context
+      }));
+    }
   }
   if (!context.loaderManager.hasPendingLoaders()) {
     return {

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

@@ -74,7 +74,7 @@ class Entry {
     let prefetchData;
     const end = time();
     try {
-      prefetchData = await prefetch(this.App, context);
+      prefetchData = await prefetch(this.App, context, this.pluginConfig);
       this.result.renderLevel = RenderLevel.SERVER_PREFETCH;
       const prefetchCost = end();
       this.tracker.trackTiming(SSRTimings.SSR_PREFETCH, prefetchCost);

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

@@ -28,7 +28,10 @@ export const formatClient = (request) => {
     cookie: document.cookie || "",
     userAgent: ((_request_headers = request.headers) === null || _request_headers === void 0 ? void 0 : _request_headers["user-agent"]) || navigator.userAgent,
     referer: request.referer || document.referrer,
-    query: request.query || getQuery(),
+    query: {
+      ...getQuery(),
+      ...request.query
+    },
     url: location.href
   };
 };

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

@@ -1,5 +1,6 @@
 import { RuntimeContext } from '../core';
-declare const prefetch: (App: React.ComponentType<any>, context: RuntimeContext) => Promise<{
+import { SSRPluginConfig } from './serverRender/types';
+declare const prefetch: (App: React.ComponentType<any>, context: RuntimeContext, config: SSRPluginConfig) => Promise<{
   initialData: Record<string, unknown> | undefined;
   i18nData: any;
   loadersData?: undefined;

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

@@ -8,6 +8,7 @@ export { RuntimeContext, RenderLevel };
 export type SSRPluginConfig = {
   crossorigin?: boolean | 'anonymous' | 'use-credentials';
   scriptLoading?: 'defer' | 'blocking' | 'module';
+  disablePrerender?: boolean;
   chunkLoadingGlobal?: string;
 } & Exclude<ServerUserConfig['ssr'], boolean>;
 export type ServerRenderOptions = {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.33.0",
+  "version": "2.34.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -146,8 +146,8 @@
     }
   },
   "dependencies": {
-    "@babel/core": "^7.21.8",
-    "@babel/types": "^7.21.5",
+    "@babel/core": "^7.22.15",
+    "@babel/types": "^7.22.15",
     "cookie": "0.5.0",
     "@loadable/babel-plugin": "5.15.3",
     "@loadable/component": "5.15.3",
@@ -173,9 +173,9 @@
     "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/plugin": "2.33.0",
-    "@modern-js/types": "2.33.0",
-    "@modern-js/utils": "2.33.0"
+    "@modern-js/plugin": "2.34.0",
+    "@modern-js/types": "2.34.0",
+    "@modern-js/utils": "2.34.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -196,11 +196,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@modern-js/app-tools": "2.33.0",
-    "@modern-js/core": "2.33.0",
-    "@scripts/build": "2.33.0",
-    "@scripts/jest-config": "2.33.0",
-    "@modern-js/server-core": "2.33.0"
+    "@modern-js/app-tools": "2.34.0",
+    "@modern-js/core": "2.34.0",
+    "@modern-js/server-core": "2.34.0",
+    "@scripts/build": "2.34.0",
+    "@scripts/jest-config": "2.34.0"
   },
   "sideEffects": false,
   "publishConfig": {