@modern-js/runtime 3.0.0-alpha.1 → 3.0.0

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

@@ -1,19 +1,5 @@
 "use strict";
-var __webpack_modules__ = {
-    "./loadable-bundler-plugin.js" (module) {
-        module.exports = require("./loadable-bundler-plugin.js");
-    }
-};
-var __webpack_module_cache__ = {};
-function __webpack_require__(moduleId) {
-    var cachedModule = __webpack_module_cache__[moduleId];
-    if (void 0 !== cachedModule) return cachedModule.exports;
-    var module = __webpack_module_cache__[moduleId] = {
-        exports: {}
-    };
-    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-    return module.exports;
-}
+var __webpack_require__ = {};
 (()=>{
     __webpack_require__.n = (module)=>{
         var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
@@ -45,122 +31,121 @@ function __webpack_require__(moduleId) {
     };
 })();
 var __webpack_exports__ = {};
-(()=>{
-    __webpack_require__.r(__webpack_exports__);
-    __webpack_require__.d(__webpack_exports__, {
-        default: ()=>cli_ssr,
-        ssrPlugin: ()=>ssrPlugin
-    });
-    const external_path_namespaceObject = require("path");
-    var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
-    const utils_namespaceObject = require("@modern-js/utils");
-    const external_mode_js_namespaceObject = require("./mode.js");
-    const checkUseStringSSR = (config, appDirectory, entrypoints)=>{
-        if (entrypoints && entrypoints.length > 0) {
-            for (const entrypoint of entrypoints){
-                const ssrMode = (0, external_mode_js_namespaceObject.resolveSSRMode)({
-                    entry: entrypoint.entryName,
-                    config,
-                    appDirectory,
-                    nestedRoutesEntry: entrypoint.nestedRoutesEntry
-                });
-                if ('string' === ssrMode) return true;
-            }
-            return false;
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    default: ()=>cli_ssr,
+    ssrPlugin: ()=>ssrPlugin
+});
+const external_path_namespaceObject = require("path");
+var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
+const utils_namespaceObject = require("@modern-js/utils");
+const external_loadable_bundler_plugin_js_namespaceObject = require("./loadable-bundler-plugin.js");
+var external_loadable_bundler_plugin_js_default = /*#__PURE__*/ __webpack_require__.n(external_loadable_bundler_plugin_js_namespaceObject);
+const external_mode_js_namespaceObject = require("./mode.js");
+const checkUseStringSSR = (config, appDirectory, entrypoints)=>{
+    if (entrypoints && entrypoints.length > 0) {
+        for (const entrypoint of entrypoints){
+            const ssrMode = (0, external_mode_js_namespaceObject.resolveSSRMode)({
+                entry: entrypoint.entryName,
+                config,
+                appDirectory,
+                nestedRoutesEntry: entrypoint.nestedRoutesEntry
+            });
+            if ('string' === ssrMode) return true;
         }
-        return true;
-    };
-    const ssrBuilderPlugin = (modernAPI, outputModule)=>({
-            name: '@modern-js/builder-plugin-ssr',
-            setup (api) {
-                api.modifyEnvironmentConfig((config, { name, mergeEnvironmentConfig })=>{
-                    const isServerEnvironment = 'node' === config.output.target || 'workerSSR' === name;
-                    const userConfig = modernAPI.getNormalizedConfig();
-                    const ssrEnv = userConfig.deploy?.worker?.ssr || userConfig.server?.rsc ? 'edge' : 'node';
-                    const appContext = modernAPI.getAppContext();
-                    const { appDirectory, entrypoints } = appContext;
-                    const useLoadablePlugin = (0, utils_namespaceObject.isUseSSRBundle)(userConfig) && !isServerEnvironment && checkUseStringSSR(userConfig, appDirectory, entrypoints);
-                    return mergeEnvironmentConfig(config, {
-                        source: {
-                            define: {
-                                'process.env.MODERN_TARGET': isServerEnvironment ? JSON.stringify('node') : JSON.stringify('browser'),
-                                'process.env.MODERN_SSR_ENV': JSON.stringify(ssrEnv)
-                            }
-                        },
-                        output: {
-                            module: isServerEnvironment && outputModule
-                        },
-                        tools: {
-                            bundlerChain: useLoadablePlugin ? (chain)=>{
-                                const LoadableBundlerPlugin = __webpack_require__("./loadable-bundler-plugin.js");
-                                chain.plugin('loadable').use(LoadableBundlerPlugin, [
-                                    {
-                                        filename: utils_namespaceObject.LOADABLE_STATS_FILE
-                                    }
-                                ]);
-                            } : void 0
+        return false;
+    }
+    return true;
+};
+const ssrBuilderPlugin = (modernAPI, outputModule)=>({
+        name: '@modern-js/builder-plugin-ssr',
+        setup (api) {
+            api.modifyEnvironmentConfig((config, { name, mergeEnvironmentConfig })=>{
+                const isServerEnvironment = 'node' === config.output.target || 'workerSSR' === name;
+                const userConfig = modernAPI.getNormalizedConfig();
+                const ssrEnv = userConfig.deploy?.worker?.ssr || userConfig.server?.rsc ? 'edge' : 'node';
+                const appContext = modernAPI.getAppContext();
+                const { appDirectory, entrypoints } = appContext;
+                const useLoadablePlugin = (0, utils_namespaceObject.isUseSSRBundle)(userConfig) && !isServerEnvironment && checkUseStringSSR(userConfig, appDirectory, entrypoints);
+                return mergeEnvironmentConfig(config, {
+                    source: {
+                        define: {
+                            'process.env.MODERN_TARGET': isServerEnvironment ? JSON.stringify('node') : JSON.stringify('browser'),
+                            'process.env.MODERN_SSR_ENV': JSON.stringify(ssrEnv)
                         }
-                    });
+                    },
+                    output: {
+                        module: isServerEnvironment && outputModule
+                    },
+                    tools: {
+                        bundlerChain: useLoadablePlugin ? (chain)=>{
+                            chain.plugin('loadable').use(external_loadable_bundler_plugin_js_default(), [
+                                {
+                                    filename: utils_namespaceObject.LOADABLE_STATS_FILE
+                                }
+                            ]);
+                        } : void 0
+                    }
                 });
-            }
-        });
-    const ssrPlugin = ()=>({
-            name: '@modern-js/plugin-ssr',
-            required: [
-                '@modern-js/runtime'
-            ],
-            setup: (api)=>{
-                const appContext = api.getAppContext();
-                const exportLoadablePath = `@${appContext.metaName}/runtime/loadable`;
-                const runtimeUtilsPath = require.resolve('@modern-js/runtime-utils/node');
-                const aliasPath = runtimeUtilsPath.replace(`${external_path_default().sep}cjs${external_path_default().sep}`, `${external_path_default().sep}esm${external_path_default().sep}`).replace(/\.js$/, '.mjs');
-                api.config(()=>({
-                        builderPlugins: [
-                            ssrBuilderPlugin(api, 'module' === appContext.moduleType)
-                        ],
-                        resolve: {
-                            alias: {
-                                '@modern-js/runtime-utils/node$': aliasPath
-                            }
-                        },
-                        tools: {
-                            swc: {
-                                jsc: {
-                                    experimental: {
-                                        plugins: [
-                                            [
-                                                require.resolve('@swc/plugin-loadable-components'),
-                                                {
-                                                    signatures: [
-                                                        {
-                                                            name: 'default',
-                                                            from: '@loadable/component'
-                                                        },
-                                                        {
-                                                            name: 'lazy',
-                                                            from: '@loadable/component'
-                                                        },
-                                                        {
-                                                            name: 'default',
-                                                            from: exportLoadablePath
-                                                        },
-                                                        {
-                                                            name: 'lazy',
-                                                            from: exportLoadablePath
-                                                        }
-                                                    ]
-                                                }
-                                            ]
+            });
+        }
+    });
+const ssrPlugin = ()=>({
+        name: '@modern-js/plugin-ssr',
+        required: [
+            '@modern-js/runtime'
+        ],
+        setup: (api)=>{
+            const appContext = api.getAppContext();
+            const exportLoadablePath = `@${appContext.metaName}/runtime/loadable`;
+            const runtimeUtilsPath = require.resolve('@modern-js/runtime-utils/node');
+            const aliasPath = runtimeUtilsPath.replace(`${external_path_default().sep}cjs${external_path_default().sep}`, `${external_path_default().sep}esm${external_path_default().sep}`).replace(/\.js$/, '.mjs');
+            api.config(()=>({
+                    builderPlugins: [
+                        ssrBuilderPlugin(api, 'module' === appContext.moduleType)
+                    ],
+                    resolve: {
+                        alias: {
+                            '@modern-js/runtime-utils/node$': aliasPath
+                        }
+                    },
+                    tools: {
+                        swc: {
+                            jsc: {
+                                experimental: {
+                                    plugins: [
+                                        [
+                                            require.resolve('@swc/plugin-loadable-components'),
+                                            {
+                                                signatures: [
+                                                    {
+                                                        name: 'default',
+                                                        from: '@loadable/component'
+                                                    },
+                                                    {
+                                                        name: 'lazy',
+                                                        from: '@loadable/component'
+                                                    },
+                                                    {
+                                                        name: 'default',
+                                                        from: exportLoadablePath
+                                                    },
+                                                    {
+                                                        name: 'lazy',
+                                                        from: exportLoadablePath
+                                                    }
+                                                ]
+                                            }
                                         ]
-                                    }
+                                    ]
                                 }
                             }
                         }
-                    }));
-            }
-        });
-    const cli_ssr = ssrPlugin;
-})();
+                    }
+                }));
+        }
+    });
+const cli_ssr = ssrPlugin;
 exports["default"] = __webpack_exports__["default"];
 exports.ssrPlugin = __webpack_exports__.ssrPlugin;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/cjs/cli/ssr/loadable-bundler-plugin.js

@@ -1,8 +1,8 @@
 "use strict";
 var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.n = (module1)=>{
-        var getter = module1 && module1.__esModule ? ()=>module1['default'] : ()=>module1;
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
         __webpack_require__.d(getter, {
             a: getter
         });
@@ -20,7 +20,21 @@ var __webpack_require__ = {};
 (()=>{
     __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
 })();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
 var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    default: ()=>loadable_bundler_plugin
+});
 const external_path_namespaceObject = require("path");
 var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
 const utils_namespaceObject = require("@modern-js/utils");
@@ -96,8 +110,11 @@ class LoadablePlugin {
         this.compiler = null;
     }
 }
-module.exports = LoadablePlugin;
-for(var __rspack_i in __webpack_exports__)exports[__rspack_i] = __webpack_exports__[__rspack_i];
+const loadable_bundler_plugin = LoadablePlugin;
+exports["default"] = __webpack_exports__["default"];
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "default"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true
 });

package/dist/cjs/core/browser/index.js

@@ -97,7 +97,8 @@ async function render(App, id) {
         const ssrData = getSSRData();
         Object.assign(context, {
             _internalRouterBaseName: App.props.basename,
-            ssrContext: ssrData.context
+            ssrContext: ssrData.context,
+            initialData: ssrData.data?.initialData
         });
         await runBeforeRender(context);
         const rootElement = id && 'string' != typeof id ? id : document.getElementById(id || 'root');

package/dist/cjs/core/compat/requestContext.js

@@ -43,6 +43,7 @@ const requestContextPlugin = ()=>({
         setup (api) {
             api.onBeforeRender((context)=>{
                 const requestContext = makeRequestContext(context);
+                context.requestContext = requestContext;
                 context.context = requestContext;
             });
         }

package/dist/cjs/core/context/runtime.js

@@ -35,14 +35,18 @@ const external_react_namespaceObject = require("react");
 const InternalRuntimeContext = (0, external_react_namespaceObject.createContext)({});
 const RuntimeContext = (0, external_react_namespaceObject.createContext)({});
 const ReactRuntimeContext = RuntimeContext;
-const getInitialContext = (isBrowser = true, routeManifest)=>({
+const getInitialContext = (isBrowser = true, routeManifest)=>{
+    const requestContext = {
+        request: {},
+        response: {}
+    };
+    return {
         isBrowser,
         routeManifest: routeManifest || "u" > typeof window && window[constants_namespaceObject.ROUTE_MANIFEST],
-        context: {
-            request: {},
-            response: {}
-        }
-    });
+        requestContext,
+        context: requestContext
+    };
+};
 const useRuntimeContext = ()=>(0, external_react_namespaceObject.useContext)(RuntimeContext);
 exports.InternalRuntimeContext = __webpack_exports__.InternalRuntimeContext;
 exports.ReactRuntimeContext = __webpack_exports__.ReactRuntimeContext;

package/dist/cjs/core/server/stream/createReadableStream.js

@@ -1,14 +1,5 @@
 "use strict";
 var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.n = (module)=>{
-        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
-        __webpack_require__.d(getter, {
-            a: getter
-        });
-        return getter;
-    };
-})();
 (()=>{
     __webpack_require__.d = (exports1, definition)=>{
         for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
@@ -37,8 +28,6 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_stream_namespaceObject = require("stream");
 const node_namespaceObject = require("@modern-js/runtime-utils/node");
-const external_isbot_namespaceObject = require("isbot");
-var external_isbot_default = /*#__PURE__*/ __webpack_require__.n(external_isbot_namespaceObject);
 const external_common_js_namespaceObject = require("../../../common.js");
 const external_constants_js_namespaceObject = require("../../constants.js");
 const index_js_namespaceObject = require("../../context/index.js");
@@ -57,9 +46,7 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
     let shellChunkStatus = external_shared_js_namespaceObject.ShellChunkStatus.START;
     let renderLevel = external_constants_js_namespaceObject.RenderLevel.SERVER_RENDER;
     const forceStream2String = Boolean(process.env.MODERN_JS_STREAM_TO_STRING);
-    const isbot = external_isbot_default()(request.headers.get('user-agent'));
-    const isSsgRender = 'true' === request.headers.get('x-modern-ssg-render');
-    const onReady = isbot || isSsgRender || forceStream2String ? 'onAllReady' : 'onShellReady';
+    const { onReady } = (0, external_shared_js_namespaceObject.resolveStreamingMode)(request, forceStream2String);
     const internalRuntimeContext = (0, index_js_namespaceObject.getGlobalInternalRuntimeContext)();
     const hooks = internalRuntimeContext.hooks;
     const extenders = hooks.extendStreamSSR.call() || [];
@@ -115,7 +102,7 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
                         }
                     });
                     const passThrough = new external_stream_namespaceObject.PassThrough();
-                    const stream = (0, node_namespaceObject.createReadableStreamFromReadable)(body);
+                    const stream = external_stream_namespaceObject.Readable.toWeb(body);
                     resolve(stream);
                     let processedStream = passThrough;
                     extenders.forEach((extender)=>{

package/dist/cjs/core/server/stream/createReadableStream.worker.js

@@ -1,14 +1,5 @@
 "use strict";
 var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.n = (module)=>{
-        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
-        __webpack_require__.d(getter, {
-            a: getter
-        });
-        return getter;
-    };
-})();
 (()=>{
     __webpack_require__.d = (exports1, definition)=>{
         for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
@@ -37,8 +28,6 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const ssr_namespaceObject = require("@modern-js/render/ssr");
 const node_namespaceObject = require("@modern-js/runtime-utils/node");
-const external_isbot_namespaceObject = require("isbot");
-var external_isbot_default = /*#__PURE__*/ __webpack_require__.n(external_isbot_namespaceObject);
 const external_common_js_namespaceObject = require("../../../common.js");
 const external_constants_js_namespaceObject = require("../../constants.js");
 const external_deferredScript_js_namespaceObject = require("./deferredScript.js");
@@ -71,9 +60,9 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
         readableOriginal.allReady.then(()=>{
             options?.onAllReady?.();
         });
-        const isbot = external_isbot_default()(request.headers.get('user-agent'));
-        const isSsgRender = 'true' === request.headers.get('x-modern-ssg-render');
-        if (isbot || isSsgRender) await readableOriginal.allReady;
+        const forceStreamToString = Boolean("u" > typeof process && process.env?.MODERN_JS_STREAM_TO_STRING);
+        const { waitForAllReady } = (0, external_shared_js_namespaceObject.resolveStreamingMode)(request, forceStreamToString);
+        if (waitForAllReady) await readableOriginal.allReady;
         const reader = readableOriginal.getReader();
         const stream = new ReadableStream({
             start (controller) {

package/dist/cjs/core/server/stream/shared.js

@@ -1,5 +1,14 @@
 "use strict";
 var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
 (()=>{
     __webpack_require__.d = (exports1, definition)=>{
         for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
@@ -27,10 +36,13 @@ __webpack_require__.d(__webpack_exports__, {
     ShellChunkStatus: ()=>shared_ShellChunkStatus,
     createRenderStreaming: ()=>createRenderStreaming,
     encodeForWebStream: ()=>encodeForWebStream,
+    resolveStreamingMode: ()=>resolveStreamingMode,
     getReadableStreamFromString: ()=>getReadableStreamFromString
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const time_namespaceObject = require("@modern-js/runtime-utils/time");
+const external_isbot_namespaceObject = require("isbot");
+var external_isbot_default = /*#__PURE__*/ __webpack_require__.n(external_isbot_namespaceObject);
 const external_common_js_namespaceObject = require("../../../common.js");
 const wrapper_js_namespaceObject = require("../../react/wrapper.js");
 const external_tracer_js_namespaceObject = require("../tracer.js");
@@ -40,6 +52,38 @@ var shared_ShellChunkStatus = /*#__PURE__*/ function(ShellChunkStatus) {
     ShellChunkStatus[ShellChunkStatus["FINISH"] = 1] = "FINISH";
     return ShellChunkStatus;
 }({});
+const SHOULD_STREAM_ALL_HEADER = 'x-should-stream-all';
+function parseShouldStreamAllFlag(value) {
+    if (!value) return;
+    const normalized = value.trim().toLowerCase();
+    if ('false' === normalized) return false;
+    return true;
+}
+function resolveStreamingMode(request, forceStreamToString) {
+    const shouldStreamAll = parseShouldStreamAllFlag(request.headers.get(SHOULD_STREAM_ALL_HEADER));
+    const isSsgRender = 'true' === request.headers.get('x-modern-ssg-render');
+    const isBot = external_isbot_default()(request.headers.get('user-agent'));
+    if (shouldStreamAll) return {
+        onReady: 'onAllReady',
+        waitForAllReady: true
+    };
+    if (forceStreamToString) return {
+        onReady: 'onAllReady',
+        waitForAllReady: true
+    };
+    if (isBot) return {
+        onReady: 'onAllReady',
+        waitForAllReady: true
+    };
+    if (isSsgRender) return {
+        onReady: 'onAllReady',
+        waitForAllReady: true
+    };
+    return {
+        onReady: 'onShellReady',
+        waitForAllReady: false
+    };
+}
 let encoder;
 function encodeForWebStream(thing) {
     if (!encoder) encoder = new TextEncoder();
@@ -107,11 +151,13 @@ exports.ShellChunkStatus = __webpack_exports__.ShellChunkStatus;
 exports.createRenderStreaming = __webpack_exports__.createRenderStreaming;
 exports.encodeForWebStream = __webpack_exports__.encodeForWebStream;
 exports.getReadableStreamFromString = __webpack_exports__.getReadableStreamFromString;
+exports.resolveStreamingMode = __webpack_exports__.resolveStreamingMode;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "ShellChunkStatus",
     "createRenderStreaming",
     "encodeForWebStream",
-    "getReadableStreamFromString"
+    "getReadableStreamFromString",
+    "resolveStreamingMode"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true