@modern-js/runtime 2.56.3-alpha.0 → 2.57.1-alpha.0

package/dist/cjs/state/runtime/plugin.js

@@ -27,6 +27,7 @@ var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
 var import_store = require("@modern-js-reduck/store");
 var import_react2 = require("@modern-js-reduck/react");
+var import_merge = require("@modern-js/runtime-utils/merge");
 var import_plugins = require("../plugins");
 var import_core = require("../../core");
 var import_common = require("../../common");
@@ -55,12 +56,12 @@ const getStoreConfig = (config) => {
   storeConfig.plugins = plugins;
   return storeConfig;
 };
-const statePlugin = (config) => ({
+const statePlugin = (userConfig = {}) => ({
   name: "@modern-js/plugin-state",
-  setup: () => {
-    const storeConfig = getStoreConfig(config);
+  setup: (api) => {
+    let storeConfig;
     return {
-      hoc({ App, config: config2 }, next) {
+      wrapRoot(App) {
         const getStateApp = (props) => {
           const context = (0, import_react.useContext)(import_core.RuntimeReactContext);
           return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react2.Provider, {
@@ -71,29 +72,17 @@ const statePlugin = (config) => ({
             })
           });
         };
-        return next({
-          App: getStateApp,
-          config: config2
-        });
+        return getStateApp;
       },
-      init({ context }, next) {
+      beforeRender(context) {
+        const pluginConfig = api.useRuntimeConfigContext();
+        const config = (0, import_merge.merge)(pluginConfig.state || {}, userConfig);
+        storeConfig = getStoreConfig(config);
         if ((0, import_common.isBrowser)()) {
           var _window__SSR_DATA_data, _window__SSR_DATA, _window;
           storeConfig.initialState = storeConfig.initialState || ((_window = window) === null || _window === void 0 ? void 0 : (_window__SSR_DATA = _window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_data = _window__SSR_DATA.data) === null || _window__SSR_DATA_data === void 0 ? void 0 : _window__SSR_DATA_data.storeState) || {};
         }
         context.store = (0, import_store.createStore)(storeConfig);
-        return next({
-          context
-        });
-      },
-      pickContext({ context, pickedContext }, next) {
-        return next({
-          context,
-          pickedContext: {
-            ...pickedContext,
-            store: context.store
-          }
-        });
       }
     };
   }

package/dist/esm/core/browser/hydrate.js

@@ -70,7 +70,9 @@ function hydrateRoot(App, context, ModernRender, ModernHydrate) {
           });
         } else {
           loadableReady(function() {
-            ModernHydrate(App, callback).then(function(root) {
+            ModernHydrate(/* @__PURE__ */ React.cloneElement(App, {
+              _internal_context: hydrateContext
+            }), callback).then(function(root) {
               resolve(root);
             });
           });

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

@@ -35,7 +35,7 @@ function render(App, id) {
 }
 function _render() {
   _render = _async_to_generator(function(App, id) {
-    var runner, context, runInit, ModernRender, ModernHydrate, _ssrData_data, _ssrData_data1, ssrData, loadersData, initialLoadersState, initialData, rootElement;
+    var runner, context, runBeforeRender, ModernRender, ModernHydrate, _ssrData_data, _ssrData_data1, ssrData, loadersData, initialLoadersState, initialData, rootElement;
     function _ModernRender() {
       _ModernRender = _async_to_generator(function(App2) {
         var renderFunc;
@@ -69,17 +69,30 @@ function _render() {
         case 0:
           runner = getGlobalRunner();
           context = getInitialContext(runner);
-          runInit = function(_context) {
-            return runner.init({
-              context: _context
-            }, {
-              onLast: function(param) {
-                var context1 = param.context;
-                var init = getGlobalAppInit();
-                return init === null || init === void 0 ? void 0 : init(context1);
-              }
+          runBeforeRender = function() {
+            var _ref = _async_to_generator(function(context2) {
+              var init;
+              return _ts_generator(this, function(_state2) {
+                switch (_state2.label) {
+                  case 0:
+                    return [
+                      4,
+                      runner.beforeRender(context2)
+                    ];
+                  case 1:
+                    _state2.sent();
+                    init = getGlobalAppInit();
+                    return [
+                      2,
+                      init === null || init === void 0 ? void 0 : init(context2)
+                    ];
+                }
+              });
             });
-          };
+            return function runBeforeRender2(context2) {
+              return _ref.apply(this, arguments);
+            };
+          }();
           if (!isClientArgs(id))
             return [
               3,
@@ -104,14 +117,16 @@ function _render() {
           Object.assign(context, _object_spread({
             loaderManager: createLoaderManager(initialLoadersState, {
               skipStatic: true
-            })
+            }),
+            // garfish plugin params
+            _internalRouterBaseName: App.props.basename
           }, ssrData ? {
             ssrContext: ssrData === null || ssrData === void 0 ? void 0 : ssrData.context
           } : {}));
           context.initialData = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
           return [
             4,
-            runInit(context)
+            runBeforeRender(context)
           ];
         case 1:
           initialData = _state.sent();

package/dist/esm/core/compatible.js

@@ -1,6 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -35,61 +36,60 @@ var createApp = function(param) {
         return /* @__PURE__ */ React.isValidElement(child) ? /* @__PURE__ */ React.cloneElement(child, _object_spread({}, child.props, props)) : child;
       }));
     };
-    var HOCApp = runner.hoc({
-      App: WrapperComponent,
-      config: globalProps || {}
-    }, {
-      onLast: function(param2) {
-        var App2 = param2.App;
-        var WrapComponent = function(_param) {
-          var _internal_context = _param._internal_context, props = _object_without_properties(_param, [
-            "_internal_context"
-          ]);
-          var contextValue = _internal_context;
-          if (!(contextValue === null || contextValue === void 0 ? void 0 : contextValue.runner)) {
-            contextValue = getInitialContext(runner);
-            runner.init({
-              context: contextValue
-            }, {
-              onLast: function(param3) {
-                var context1 = param3.context;
-                var _getGlobalAppInit;
-                return (_getGlobalAppInit = getGlobalAppInit()) === null || _getGlobalAppInit === void 0 ? void 0 : _getGlobalAppInit(context1);
-              }
-            });
-          }
-          var mergedProps = _object_spread({}, props, globalProps);
-          return /* @__PURE__ */ _jsx(RuntimeReactContext.Provider, {
-            value: contextValue,
-            children: /* @__PURE__ */ _jsx(App2, _object_spread({}, mergedProps))
-          });
-        };
-        return WrapComponent;
+    var WrapperApp = runner.wrapRoot(WrapperComponent);
+    var WrapComponent = function(_param) {
+      var _internal_context = _param._internal_context, props = _object_without_properties(_param, [
+        "_internal_context"
+      ]);
+      var contextValue = _internal_context;
+      if (!(contextValue === null || contextValue === void 0 ? void 0 : contextValue.runner)) {
+        var _getGlobalAppInit;
+        contextValue = getInitialContext(runner);
+        runner === null || runner === void 0 ? void 0 : runner.beforeRender(contextValue);
+        (_getGlobalAppInit = getGlobalAppInit()) === null || _getGlobalAppInit === void 0 ? void 0 : _getGlobalAppInit(contextValue);
       }
-    });
-    return HOCApp;
+      var mergedProps = _object_spread({}, props, globalProps);
+      return /* @__PURE__ */ _jsx(RuntimeReactContext.Provider, {
+        value: contextValue,
+        children: /* @__PURE__ */ _jsx(WrapperApp, _object_spread({}, mergedProps))
+      });
+    };
+    return WrapComponent;
   };
 };
 var bootstrap = function() {
   var _ref = _async_to_generator(function(BootApp, id, root, ReactDOM) {
-    var App, runner, context, runInit, isBrowser, _ssrData_data, _ssrData_data1, ssrData, loadersData, initialLoadersState, initialData, rootElement, ModernRender, ModernHydrate;
+    var App, runner, context, runBeforeRender, isBrowser, _ssrData_data, _ssrData_data1, ssrData, loadersData, initialLoadersState, initialData, rootElement, ModernRender, ModernHydrate;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           App = BootApp;
           runner = getGlobalRunner();
           context = getInitialContext(runner);
-          runInit = function(_context) {
-            return runner.init({
-              context: _context
-            }, {
-              onLast: function(param) {
-                var context1 = param.context;
-                var init = getGlobalAppInit();
-                return init === null || init === void 0 ? void 0 : init(context1);
-              }
+          runBeforeRender = function() {
+            var _ref2 = _async_to_generator(function(context2) {
+              var init;
+              return _ts_generator(this, function(_state2) {
+                switch (_state2.label) {
+                  case 0:
+                    return [
+                      4,
+                      runner.beforeRender(context2)
+                    ];
+                  case 1:
+                    _state2.sent();
+                    init = getGlobalAppInit();
+                    return [
+                      2,
+                      init === null || init === void 0 ? void 0 : init(context2)
+                    ];
+                }
+              });
             });
-          };
+            return function runBeforeRender2(context2) {
+              return _ref2.apply(this, arguments);
+            };
+          }();
           if (!id) {
             return [
               2,
@@ -129,7 +129,7 @@ var bootstrap = function() {
           context.initialData = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
           return [
             4,
-            runInit(context)
+            runBeforeRender(context)
           ];
         case 1:
           initialData = _state.sent();
@@ -210,21 +210,12 @@ var bootstrap = function() {
 var useRuntimeContext = function() {
   var _context_ssrContext, _context_ssrContext1;
   var context = useContext(RuntimeReactContext);
-  var pickedContext = {
-    initialData: context.initialData,
+  var pickedContext = _object_spread_props(_object_spread({}, context), {
     request: (_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.request,
     response: (_context_ssrContext1 = context.ssrContext) === null || _context_ssrContext1 === void 0 ? void 0 : _context_ssrContext1.response
-  };
+  });
   var memoizedContext = useMemo(function() {
-    return context.runner.pickContext({
-      context,
-      pickedContext
-    }, {
-      onLast: function(param) {
-        var pickedContext2 = param.pickedContext;
-        return pickedContext2;
-      }
-    });
+    return context.runner.pickContext(pickedContext);
   }, [
     context
   ]);

package/dist/esm/core/plugin/base.js

@@ -1,17 +1,28 @@
-import { createManager, createPipeline, createAsyncPipeline } from "@modern-js/plugin";
-var hoc = createPipeline();
-var init = createAsyncPipeline();
-var pickContext = createPipeline();
+import { createManager, createWaterfall, createAsyncInterruptWorkflow, createSyncParallelWorkflow, createContext } from "@modern-js/plugin";
+var RuntimeConfigContext = createContext({});
+var useRuntimeConfigContext = function() {
+  return RuntimeConfigContext.use().value;
+};
+var wrapRoot = createWaterfall();
+var beforeRender = createAsyncInterruptWorkflow();
+var pickContext = createWaterfall();
+var modifyRuntimeConfig = createSyncParallelWorkflow();
 var runtimeHooks = {
-  hoc,
-  init,
-  pickContext
+  beforeRender,
+  wrapRoot,
+  pickContext,
+  modifyRuntimeConfig
+};
+var runtimePluginAPI = {
+  useRuntimeConfigContext
 };
 var createRuntime = function() {
-  return createManager(runtimeHooks);
+  return createManager(runtimeHooks, runtimePluginAPI);
 };
 var runtime = createRuntime();
 export {
+  RuntimeConfigContext,
   createRuntime,
-  runtime
+  runtime,
+  useRuntimeConfigContext
 };

package/dist/esm/core/plugin/index.js

@@ -1,14 +1,22 @@
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import { merge } from "../utils/merge";
-import { runtime } from "./base";
-import { setGlobalRunner } from "./runner";
+import { merge } from "@modern-js/runtime-utils/merge";
+import { runtime, RuntimeConfigContext } from "./base";
+import { getGlobalRunner, setGlobalRunner } from "./runner";
 export * from "./base";
+function setupConfigContext() {
+  var runner = getGlobalRunner();
+  var configs = runner.modifyRuntimeConfig();
+  RuntimeConfigContext.set(merge.apply(void 0, [
+    {}
+  ].concat(_to_consumable_array(configs))));
+}
 function registerPlugin(internalPlugins, runtimeConfig, customRuntime) {
   var _instance;
   var _ref = runtimeConfig || {}, _ref_plugins = _ref.plugins, plugins = _ref_plugins === void 0 ? [] : _ref_plugins;
   (_instance = customRuntime || runtime).usePlugin.apply(_instance, _to_consumable_array(internalPlugins).concat(_to_consumable_array(plugins)));
   var runner = (customRuntime || runtime).init();
   setGlobalRunner(runner);
+  setupConfigContext();
   return runner;
 }
 function mergeConfig(config) {
@@ -16,6 +24,7 @@ function mergeConfig(config) {
     otherConfig[_key - 1] = arguments[_key];
   }
   return merge.apply(void 0, [
+    {},
     config
   ].concat(_to_consumable_array(otherConfig)));
 }

package/dist/esm/core/react/index.js

@@ -3,28 +3,20 @@ import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_
 import { jsx as _jsx } from "react/jsx-runtime";
 import { RuntimeReactContext, getGlobalApp } from "../context";
 import { getGlobalRunner } from "../plugin/runner";
-function createRoot(UserApp, config) {
+function createRoot(UserApp) {
   var App = UserApp || getGlobalApp();
   var runner = getGlobalRunner();
-  var HOCApp = runner.hoc({
-    App,
-    config: config || {}
-  }, {
-    onLast: function(param) {
-      var App2 = param.App;
-      var WrapComponent = function(_param) {
-        var _internal_context = _param._internal_context, props = _object_without_properties(_param, [
-          "_internal_context"
-        ]);
-        return /* @__PURE__ */ _jsx(RuntimeReactContext.Provider, {
-          value: _internal_context,
-          children: /* @__PURE__ */ _jsx(App2, _object_spread({}, props))
-        });
-      };
-      return WrapComponent;
-    }
-  });
-  return HOCApp;
+  var WrapperApp = runner.wrapRoot(App);
+  var WrapComponent = function(_param) {
+    var _internal_context = _param._internal_context, props = _object_without_properties(_param, [
+      "_internal_context"
+    ]);
+    return /* @__PURE__ */ _jsx(RuntimeReactContext.Provider, {
+      value: _internal_context,
+      children: /* @__PURE__ */ _jsx(WrapperApp, _object_spread({}, props))
+    });
+  };
+  return WrapComponent;
 }
 export {
   createRoot

package/dist/esm/core/server/requestHandler.js

@@ -13,7 +13,7 @@ import { createLoaderManager } from "../loader/loaderManager";
 import { getSSRConfigByEntry, getSSRMode } from "./utils";
 import { CHUNK_CSS_PLACEHOLDER } from "./constants";
 function createSSRContext(request, options) {
-  var config = options.config, loaderContext = options.loaderContext, onError = options.onError, onTiming = options.onTiming, locals = options.locals, resource = options.resource, params = options.params, responseProxy = options.responseProxy, staticGenerate = options.staticGenerate, logger = options.logger, metrics = options.metrics, reporter = options.reporter;
+  var config = options.config, loaderContext = options.loaderContext, onError = options.onError, onTiming = options.onTiming, locals = options.locals, resource = options.resource, params = options.params, responseProxy = options.responseProxy, logger = options.logger, metrics = options.metrics, reporter = options.reporter;
   var nonce = config.nonce;
   var entryName = resource.entryName, route = resource.route;
   var cookie = request.headers.get("cookie");
@@ -22,7 +22,7 @@ function createSSRContext(request, options) {
   var query = parseQuery(request);
   var headersData = parseHeaders(request);
   var url = new URL(request.url);
-  var ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries, staticGenerate);
+  var ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
   var ssrMode = getSSRMode(ssrConfig);
   var loaderFailureMode = typeof ssrConfig === "object" ? ssrConfig.loaderFailureMode : void 0;
   return {
@@ -42,6 +42,7 @@ function createSSRContext(request, options) {
       params,
       headers: headersData,
       host: url.host,
+      url: request.url,
       raw: request
     },
     response: {
@@ -66,7 +67,7 @@ var createRequestHandler = function() {
     return _ts_generator(this, function(_state) {
       requestHandler = function() {
         var _ref2 = _async_to_generator(function(request, options) {
-          var Root, runner, routeManifest, context, runInit, responseProxy, ssrContext, getRedirectResponse, initialData, redirectResponse, htmlTemplate, response;
+          var Root, runner, routeManifest, context, runBeforeRender, responseProxy, ssrContext, getRedirectResponse, initialData, redirectResponse, htmlTemplate, response;
           return _ts_generator(this, function(_state2) {
             switch (_state2.label) {
               case 0:
@@ -74,17 +75,36 @@ var createRequestHandler = function() {
                 runner = getGlobalRunner();
                 routeManifest = options.resource.routeManifest;
                 context = getInitialContext(runner, false, routeManifest);
-                runInit = function(_context) {
-                  return runner.init({
-                    context: _context
-                  }, {
-                    onLast: function(param) {
-                      var context1 = param.context;
-                      var init = getGlobalAppInit();
-                      return init === null || init === void 0 ? void 0 : init(context1);
-                    }
+                runBeforeRender = function() {
+                  var _ref3 = _async_to_generator(function(context2) {
+                    var result, init;
+                    return _ts_generator(this, function(_state3) {
+                      switch (_state3.label) {
+                        case 0:
+                          return [
+                            4,
+                            runner.beforeRender(context2)
+                          ];
+                        case 1:
+                          result = _state3.sent();
+                          if (typeof Response !== "undefined" && _instanceof(result, Response)) {
+                            return [
+                              2,
+                              result
+                            ];
+                          }
+                          init = getGlobalAppInit();
+                          return [
+                            2,
+                            init === null || init === void 0 ? void 0 : init(context2)
+                          ];
+                      }
+                    });
                   });
-                };
+                  return function runBeforeRender2(context2) {
+                    return _ref3.apply(this, arguments);
+                  };
+                }();
                 responseProxy = {
                   headers: {},
                   code: -1
@@ -120,7 +140,7 @@ var createRequestHandler = function() {
                 };
                 return [
                   4,
-                  runInit(context)
+                  runBeforeRender(context)
                 ];
               case 1:
                 initialData = _state2.sent();

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

@@ -39,16 +39,16 @@ function createRenderStreaming(createReadableStreamFromElement) {
         return [
           2,
           run(headersData, /* @__PURE__ */ _async_to_generator(function() {
-            var end, runtimeContext, config, resource, staticGenerate, onError, onTiming, htmlTemplate, entryName, ssrConfig, rootElement, stream;
+            var end, runtimeContext, config, resource, onError, onTiming, htmlTemplate, entryName, ssrConfig, rootElement, stream;
             return _ts_generator(this, function(_state2) {
               switch (_state2.label) {
                 case 0:
                   end = time();
-                  runtimeContext = options.runtimeContext, config = options.config, resource = options.resource, staticGenerate = options.staticGenerate;
+                  runtimeContext = options.runtimeContext, config = options.config, resource = options.resource;
                   onError = createOnError(options.onError);
                   onTiming = createOnTiming(options.onTiming);
                   htmlTemplate = resource.htmlTemplate, entryName = resource.entryName;
-                  ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries, staticGenerate);
+                  ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
                   rootElement = React.cloneElement(serverRoot, {
                     _internal_context: Object.assign(runtimeContext, {
                       ssr: true

package/dist/esm/core/server/string/index.js

@@ -25,18 +25,18 @@ var renderString = function() {
       return [
         2,
         run(headersData, /* @__PURE__ */ _async_to_generator(function() {
-          var _runtimeContext_ssrContext, resource, runtimeContext, config, onError, onTiming, staticGenerate, tracer, routerContext, htmlTemplate, entryName, loadableStats, routeManifest, ssrConfig, chunkSet, prefetchData, e, collectors, rootElement, html;
+          var _runtimeContext_ssrContext, resource, runtimeContext, config, onError, onTiming, tracer, routerContext, htmlTemplate, entryName, loadableStats, routeManifest, ssrConfig, chunkSet, prefetchData, e, collectors, rootElement, html;
           return _ts_generator(this, function(_state2) {
             switch (_state2.label) {
               case 0:
-                resource = options.resource, runtimeContext = options.runtimeContext, config = options.config, onError = options.onError, onTiming = options.onTiming, staticGenerate = options.staticGenerate;
+                resource = options.resource, runtimeContext = options.runtimeContext, config = options.config, onError = options.onError, onTiming = options.onTiming;
                 tracer = {
                   onError: createOnError(onError),
                   onTiming: createOnTiming(onTiming)
                 };
                 routerContext = runtimeContext.routerContext;
                 htmlTemplate = resource.htmlTemplate, entryName = resource.entryName, loadableStats = resource.loadableStats, routeManifest = resource.routeManifest;
-                ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries, staticGenerate);
+                ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
                 chunkSet = {
                   renderLevel: RenderLevel.CLIENT_RENDER,
                   ssrScripts: "",
@@ -66,6 +66,7 @@ var renderString = function() {
               case 3:
                 e = _state2.sent();
                 chunkSet.renderLevel = RenderLevel.CLIENT_RENDER;
+                tracer.onError(SSRErrors.PRERENDER, e);
                 return [
                   3,
                   4

package/dist/esm/core/server/utils.js

@@ -58,14 +58,11 @@ function serializeErrors(errors) {
   }
   return serialized;
 }
-function getSSRConfigByEntry(entryName, ssr, ssrByEntries, staticGenerate) {
-  if (staticGenerate) {
-    return true;
-  }
+function getSSRConfigByEntry(entryName, ssr, ssrByEntries) {
   if (ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[entryName]) {
     return ssrByEntries[entryName];
   }
-  return ssr;
+  return ssr || true;
 }
 function getSSRMode(ssrConfig) {
   if (typeof ssrConfig === "boolean") {