@modern-js/runtime 2.49.3 → 2.50.0

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

@@ -80,6 +80,7 @@ const routerPlugin = ({ basename = "", originalBaseUrl = "", routesConfig, creat
     setup: (api) => {
       return {
         async init({ context }, next) {
+          var _context_ssrContext;
           if (!routesConfig && !createRoutes) {
             return next({
               context
@@ -89,7 +90,7 @@ const routerPlugin = ({ basename = "", originalBaseUrl = "", routesConfig, creat
           const baseUrl = originalBaseUrl || request.baseUrl;
           const _basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, basename) : baseUrl;
           const { reporter, serverTiming } = context.ssrContext;
-          const requestContext = (0, import_node.createRequestContext)();
+          const requestContext = (0, import_node.createRequestContext)((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.loaderContext);
           requestContext.set(import_node.reporterCtx, reporter);
           let routes = createRoutes ? createRoutes() : (0, import_router2.createRoutesFromElements)((0, import_utils.renderRoutes)({
             routesConfig,

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

@@ -65,30 +65,26 @@ const ssrPlugin = () => ({
     return {
       config() {
         const appContext = api.useAppContext();
-        const userConfig = api.useConfigContext();
         pluginsExportsUtils = (0, import_utils.createRuntimeExportsUtils)(appContext.internalDirectory, "plugins");
         const { bundlerType = "webpack" } = api.useAppContext();
         const babelHandler = (() => {
           if (bundlerType === "webpack") {
             return (config) => {
               var _config_plugins;
-              const userConfig2 = api.useResolvedConfigContext();
+              const userConfig = api.useResolvedConfigContext();
               (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(import_path.default.join(__dirname, "./babel-plugin-ssr-loader-id"));
-              if ((0, import_utils.isUseSSRBundle)(userConfig2) && checkUseStringSSR(userConfig2)) {
+              if ((0, import_utils.isUseSSRBundle)(userConfig) && checkUseStringSSR(userConfig)) {
                 var _config_plugins1;
                 (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
               }
             };
           } else if (bundlerType === "rspack") {
             return (config) => {
-              const userConfig2 = api.useResolvedConfigContext();
-              if ((0, import_utils.isUseSSRBundle)(userConfig2)) {
-                var _config_plugins;
+              const userConfig = api.useResolvedConfigContext();
+              if ((0, import_utils.isUseSSRBundle)(userConfig) && checkUseStringSSR(userConfig)) {
+                var _config_plugins, _config_plugins1;
                 (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(import_path.default.join(__dirname, "./babel-plugin-ssr-loader-id"));
-                if (checkUseStringSSR(userConfig2)) {
-                  var _config_plugins1;
-                  (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
-                }
+                (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
               }
             };
           }
@@ -106,8 +102,8 @@ const ssrPlugin = () => ({
           },
           tools: {
             bundlerChain(chain, { isServer, isServiceWorker }) {
-              const userConfig2 = api.useResolvedConfigContext();
-              if ((0, import_utils.isUseSSRBundle)(userConfig2) && !isServer && !isServiceWorker && checkUseStringSSR(userConfig2)) {
+              const userConfig = api.useResolvedConfigContext();
+              if ((0, import_utils.isUseSSRBundle)(userConfig) && !isServer && !isServiceWorker && checkUseStringSSR(userConfig)) {
                 const LoadableBundlerPlugin = require("./loadable-bundler-plugin.js");
                 chain.plugin("loadable").use(LoadableBundlerPlugin, [
                   {
@@ -116,7 +112,7 @@ const ssrPlugin = () => ({
                 ]);
               }
             },
-            babel: (0, import_utils.isUseSSRBundle)(userConfig) && checkUseStringSSR(userConfig) ? babelHandler : void 0
+            babel: babelHandler
           }
         };
       },

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

@@ -10,7 +10,7 @@ import { createStaticHandler } from "@modern-js/runtime-utils/remix-router";
 import { createStaticRouter, StaticRouterProvider } from "@modern-js/runtime-utils/node/router";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { createRoutesFromElements } from "@modern-js/runtime-utils/router";
-import { createRequestContext, reporterCtx } from "@modern-js/runtime-utils/node";
+import { reporterCtx, createRequestContext } from "@modern-js/runtime-utils/node";
 import { time } from "@modern-js/runtime-utils/time";
 import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { RuntimeReactContext } from "../../core";
@@ -88,7 +88,7 @@ var routerPlugin = function(param) {
         init: function init(param2, next) {
           var context = param2.context;
           return _async_to_generator(function() {
-            var _context_ssrContext, request, ssrMode, nonce, baseUrl, _basename, _context_ssrContext1, reporter, serverTiming, requestContext, routes, runner, query, remixRequest, end, routerContext, cost, router;
+            var _context_ssrContext, _context_ssrContext1, request, ssrMode, nonce, baseUrl, _basename, _context_ssrContext2, reporter, serverTiming, requestContext, routes, runner, query, remixRequest, end, routerContext, cost, router;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -100,11 +100,11 @@ var routerPlugin = function(param) {
                       })
                     ];
                   }
-                  _context_ssrContext = context.ssrContext, request = _context_ssrContext.request, ssrMode = _context_ssrContext.mode, nonce = _context_ssrContext.nonce;
+                  _context_ssrContext1 = context.ssrContext, request = _context_ssrContext1.request, ssrMode = _context_ssrContext1.mode, nonce = _context_ssrContext1.nonce;
                   baseUrl = originalBaseUrl || request.baseUrl;
                   _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
-                  _context_ssrContext1 = context.ssrContext, reporter = _context_ssrContext1.reporter, serverTiming = _context_ssrContext1.serverTiming;
-                  requestContext = createRequestContext();
+                  _context_ssrContext2 = context.ssrContext, reporter = _context_ssrContext2.reporter, serverTiming = _context_ssrContext2.serverTiming;
+                  requestContext = createRequestContext((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.loaderContext);
                   requestContext.set(reporterCtx, reporter);
                   routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
                     routesConfig,

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

@@ -53,30 +53,26 @@ var ssrPlugin = function() {
       return {
         config: function config() {
           var appContext = api.useAppContext();
-          var userConfig = api.useConfigContext();
           pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
           var _api_useAppContext = api.useAppContext(), _api_useAppContext_bundlerType = _api_useAppContext.bundlerType, bundlerType = _api_useAppContext_bundlerType === void 0 ? "webpack" : _api_useAppContext_bundlerType;
           var babelHandler = function() {
             if (bundlerType === "webpack") {
               return function(config2) {
                 var _config_plugins;
-                var userConfig2 = api.useResolvedConfigContext();
+                var userConfig = api.useResolvedConfigContext();
                 (_config_plugins = config2.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
-                if (isUseSSRBundle(userConfig2) && checkUseStringSSR(userConfig2)) {
+                if (isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig)) {
                   var _config_plugins1;
                   (_config_plugins1 = config2.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
                 }
               };
             } else if (bundlerType === "rspack") {
               return function(config2) {
-                var userConfig2 = api.useResolvedConfigContext();
-                if (isUseSSRBundle(userConfig2)) {
-                  var _config_plugins;
+                var userConfig = api.useResolvedConfigContext();
+                if (isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig)) {
+                  var _config_plugins, _config_plugins1;
                   (_config_plugins = config2.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
-                  if (checkUseStringSSR(userConfig2)) {
-                    var _config_plugins1;
-                    (_config_plugins1 = config2.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
-                  }
+                  (_config_plugins1 = config2.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
                 }
               };
             }
@@ -96,8 +92,8 @@ var ssrPlugin = function() {
             tools: {
               bundlerChain: function bundlerChain(chain, param) {
                 var isServer = param.isServer, isServiceWorker = param.isServiceWorker;
-                var userConfig2 = api.useResolvedConfigContext();
-                if (isUseSSRBundle(userConfig2) && !isServer && !isServiceWorker && checkUseStringSSR(userConfig2)) {
+                var userConfig = api.useResolvedConfigContext();
+                if (isUseSSRBundle(userConfig) && !isServer && !isServiceWorker && checkUseStringSSR(userConfig)) {
                   var LoadableBundlerPlugin = require("./loadable-bundler-plugin.js");
                   chain.plugin("loadable").use(LoadableBundlerPlugin, [
                     {
@@ -106,7 +102,7 @@ var ssrPlugin = function() {
                   ]);
                 }
               },
-              babel: isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig) ? babelHandler : void 0
+              babel: babelHandler
             }
           };
         },

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

@@ -4,7 +4,7 @@ import { createStaticHandler } from "@modern-js/runtime-utils/remix-router";
 import { createStaticRouter, StaticRouterProvider } from "@modern-js/runtime-utils/node/router";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { createRoutesFromElements } from "@modern-js/runtime-utils/router";
-import { createRequestContext, reporterCtx } from "@modern-js/runtime-utils/node";
+import { reporterCtx, createRequestContext } from "@modern-js/runtime-utils/node";
 import { time } from "@modern-js/runtime-utils/time";
 import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { RuntimeReactContext } from "../../core";
@@ -45,6 +45,7 @@ const routerPlugin = ({ basename = "", originalBaseUrl = "", routesConfig, creat
     setup: (api) => {
       return {
         async init({ context }, next) {
+          var _context_ssrContext;
           if (!routesConfig && !createRoutes) {
             return next({
               context
@@ -54,7 +55,7 @@ const routerPlugin = ({ basename = "", originalBaseUrl = "", routesConfig, creat
           const baseUrl = originalBaseUrl || request.baseUrl;
           const _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
           const { reporter, serverTiming } = context.ssrContext;
-          const requestContext = createRequestContext();
+          const requestContext = createRequestContext((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.loaderContext);
           requestContext.set(reporterCtx, reporter);
           let routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
             routesConfig,

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

@@ -31,30 +31,26 @@ const ssrPlugin = () => ({
     return {
       config() {
         const appContext = api.useAppContext();
-        const userConfig = api.useConfigContext();
         pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
         const { bundlerType = "webpack" } = api.useAppContext();
         const babelHandler = (() => {
           if (bundlerType === "webpack") {
             return (config) => {
               var _config_plugins;
-              const userConfig2 = api.useResolvedConfigContext();
+              const userConfig = api.useResolvedConfigContext();
               (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
-              if (isUseSSRBundle(userConfig2) && checkUseStringSSR(userConfig2)) {
+              if (isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig)) {
                 var _config_plugins1;
                 (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
               }
             };
           } else if (bundlerType === "rspack") {
             return (config) => {
-              const userConfig2 = api.useResolvedConfigContext();
-              if (isUseSSRBundle(userConfig2)) {
-                var _config_plugins;
+              const userConfig = api.useResolvedConfigContext();
+              if (isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig)) {
+                var _config_plugins, _config_plugins1;
                 (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
-                if (checkUseStringSSR(userConfig2)) {
-                  var _config_plugins1;
-                  (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
-                }
+                (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
               }
             };
           }
@@ -72,8 +68,8 @@ const ssrPlugin = () => ({
           },
           tools: {
             bundlerChain(chain, { isServer, isServiceWorker }) {
-              const userConfig2 = api.useResolvedConfigContext();
-              if (isUseSSRBundle(userConfig2) && !isServer && !isServiceWorker && checkUseStringSSR(userConfig2)) {
+              const userConfig = api.useResolvedConfigContext();
+              if (isUseSSRBundle(userConfig) && !isServer && !isServiceWorker && checkUseStringSSR(userConfig)) {
                 const LoadableBundlerPlugin = require("./loadable-bundler-plugin.js");
                 chain.plugin("loadable").use(LoadableBundlerPlugin, [
                   {
@@ -82,7 +78,7 @@ const ssrPlugin = () => ({
                 ]);
               }
             },
-            babel: isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig) ? babelHandler : void 0
+            babel: babelHandler
           }
         };
       },

package/dist/types/document/Body.d.ts

@@ -1,4 +1,2 @@
-/// <reference types="react" />
-export declare function Body(props: {
-    children?: any;
-}): JSX.Element;
+import React from 'react';
+export declare function Body(props: React.DOMAttributes<HTMLBodyElement>): JSX.Element;

package/dist/types/document/Root.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="react" />
+import React from 'react';
 export declare function Root(props: {
-    children?: any;
     rootId?: string;
-}): JSX.Element;
+} & React.DOMAttributes<HTMLDivElement>): JSX.Element;
 export declare function DefaultRoot(props: {
     children?: any;
 }): JSX.Element;

package/dist/types/document/Style.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
+import React from 'react';
 export declare function Style(props: {
     children?: string;
     content?: string;
-}): JSX.Element;
+} & React.DOMAttributes<HTMLStyleElement>): JSX.Element;

package/dist/types/exports/server.d.ts

@@ -1,5 +1,5 @@
 import { AfterMatchContext, AfterRenderContext, MiddlewareContext, NextFunction } from '@modern-js/types';
-export type { Container, CacheControl, CacheOptionProvider, CacheOption, } from '@modern-js/types';
+export type { Container, CacheControl, CacheOptionProvider, CacheOption, UnstableMiddlewareContext, UnstableMiddleware, UnstableNext, } from '@modern-js/types';
 export declare const hook: (attacher: ({ addMiddleware, afterMatch, afterRender, }: {
     addMiddleware: (mid: Middleware) => void;
     afterRender: (hook: AfterRenderHook) => void;

package/dist/types/router/runtime/types.d.ts

@@ -56,7 +56,7 @@ interface DataFunctionArgs<D = any> {
     params: Params;
     context?: D;
 }
-export type LoaderFunctionArgs = DataFunctionArgs<RequestContext>;
+export type LoaderFunctionArgs<P extends Record<string, unknown> = any> = DataFunctionArgs<RequestContext<P>>;
 declare type DataFunctionValue = Response | NonNullable<unknown> | null;
-export type LoaderFunction = (args: LoaderFunctionArgs) => Promise<DataFunctionValue> | DataFunctionValue;
+export type LoaderFunction = <P extends Record<string, unknown> = Record<string, unknown>>(args: LoaderFunctionArgs<P>) => Promise<DataFunctionValue> | DataFunctionValue;
 export {};

package/package.json

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