@modern-js/runtime 2.63.7 → 2.64.0

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

@@ -35,7 +35,6 @@ var import_cookie = __toESM(require("cookie"));
 var import_context = require("../context");
 var import_runtime = require("../context/runtime");
 var import_loaderManager = require("../loader/loaderManager");
-var import_runner = require("../plugin/runner");
 var import_wrapper = require("../react/wrapper");
 var import_hydrate = require("./hydrate");
 const IS_REACT18 = process.env.IS_REACT18 === "true";
@@ -81,10 +80,13 @@ function isClientArgs(id) {
   return typeof id === "undefined" || typeof id === "string" || typeof HTMLElement !== "undefined" && id instanceof HTMLElement;
 }
 async function render(App, id) {
-  const runner = (0, import_runner.getGlobalRunner)();
-  const context = (0, import_runtime.getInitialContext)(runner);
+  const context = (0, import_runtime.getInitialContext)();
   const runBeforeRender = async (context2) => {
-    await runner.beforeRender(context2);
+    const internalRuntimeContext = (0, import_context.getGlobalInternalRuntimeContext)();
+    const api = internalRuntimeContext.pluginAPI;
+    api.updateRuntimeContext(context2);
+    const hooks = internalRuntimeContext.hooks;
+    await hooks.onBeforeRender.call(context2);
     const init = (0, import_context.getGlobalAppInit)();
     return init === null || init === void 0 ? void 0 : init(context2);
   };

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

@@ -0,0 +1,80 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var hooks_exports = {};
+__export(hooks_exports, {
+  getHookRunners: () => getHookRunners,
+  handleSetupResult: () => handleSetupResult,
+  transformHookRunner: () => transformHookRunner
+});
+module.exports = __toCommonJS(hooks_exports);
+function transformHookRunner(hookRunnerName) {
+  switch (hookRunnerName) {
+    case "beforeRender":
+      return "onBeforeRender";
+    default:
+      return hookRunnerName;
+  }
+}
+function handleSetupResult(setupResult, api) {
+  if (!setupResult) {
+    return;
+  }
+  Object.keys(setupResult).forEach((key) => {
+    const fn = setupResult[key];
+    if (typeof fn === "function") {
+      const newAPI = transformHookRunner(key);
+      if (api[newAPI]) {
+        if (key === "beforeRender") {
+          api[newAPI](async (...params) => {
+            await fn(...params);
+          });
+        } else {
+          api[newAPI]((...params) => {
+            const res = fn(...params);
+            return res;
+          });
+        }
+      }
+    }
+  });
+}
+function getHookRunners(runtimeContext) {
+  const { _internalContext } = runtimeContext;
+  const { hooks } = _internalContext;
+  return {
+    beforeRender: async (context) => {
+      return hooks.onBeforeRender.call(context);
+    },
+    wrapRoot: (App) => {
+      return hooks.wrapRoot.call(App);
+    },
+    pickContext: (context) => {
+      return hooks.pickContext.call(context);
+    },
+    modifyRuntimeConfig: (config) => {
+      return hooks.modifyRuntimeConfig.call(config);
+    }
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getHookRunners,
+  handleSetupResult,
+  transformHookRunner
+});

package/dist/cjs/core/{plugin/runner.js → compat/index.js}

@@ -16,27 +16,27 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var runner_exports = {};
-__export(runner_exports, {
-  getGlobalRunner: () => getGlobalRunner,
-  setGlobalRunner: () => setGlobalRunner
+var compat_exports = {};
+__export(compat_exports, {
+  compatPlugin: () => compatPlugin
 });
-module.exports = __toCommonJS(runner_exports);
-var import_base = require("./base");
-let globalRunner;
-function setGlobalRunner(runner) {
-  globalRunner = runner;
-}
-function getGlobalRunner() {
-  if (globalRunner) {
-    return globalRunner;
+module.exports = __toCommonJS(compat_exports);
+var import_hooks = require("./hooks");
+const compatPlugin = () => ({
+  name: "@modern-js/runtime-plugin-compat",
+  _registryApi: (getRuntimeContext) => {
+    return {
+      useRuntimeConfigContext: () => {
+        const { _internalContext } = getRuntimeContext();
+        return _internalContext.config;
+      },
+      useHookRunners: () => {
+        return (0, import_hooks.getHookRunners)(getRuntimeContext());
+      }
+    };
   }
-  const runner = import_base.runtime.init();
-  setGlobalRunner(runner);
-  return runner;
-}
+});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getGlobalRunner,
-  setGlobalRunner
+  compatPlugin
 });

package/dist/cjs/core/compatible.js

@@ -41,22 +41,21 @@ var import_context = require("./context");
 var import_runtime = require("./context/runtime");
 var import_loaderManager = require("./loader/loaderManager");
 var import_plugin = require("./plugin");
-var import_runner = require("./plugin/runner");
 var import_wrapper = require("./react/wrapper");
 const IS_REACT18 = process.env.IS_REACT18 === "true";
 function isClientArgs(id) {
   return typeof id === "string" || typeof HTMLElement !== "undefined" && id instanceof HTMLElement;
 }
-const getInitialContext = (runner) => ({
+const getInitialContext = () => ({
   loaderManager: (0, import_loaderManager.createLoaderManager)({}),
-  runner,
   isBrowser: true,
   routeManifest: typeof window !== "undefined" && window[import_constants.ROUTE_MANIFEST]
 });
-const createApp = ({ plugins, runtime, props: globalProps }) => {
-  const runner = (0, import_plugin.registerPlugin)(plugins, {
+const createApp = ({ plugins, props: globalProps }) => {
+  const context = (0, import_plugin.registerPlugin)(plugins, {
     plugins: []
-  }, runtime);
+  });
+  const hooks = context.hooks;
   return (App) => {
     const WrapperComponent = (props) => {
       return /* @__PURE__ */ import_react.default.createElement(App || import_react.default.Fragment, App ? {
@@ -66,7 +65,7 @@ const createApp = ({ plugins, runtime, props: globalProps }) => {
         ...props
       }) : child));
     };
-    const WrapperApp = runner.wrapRoot(WrapperComponent);
+    const WrapperApp = hooks.wrapRoot.call(WrapperComponent);
     const WrapComponent = (props) => {
       const mergedProps = {
         ...props,
@@ -81,10 +80,13 @@ const createApp = ({ plugins, runtime, props: globalProps }) => {
 };
 const bootstrap = async (BootApp, id, root, ReactDOM) => {
   const App = BootApp;
-  const runner = (0, import_runner.getGlobalRunner)();
-  const context = getInitialContext(runner);
+  const internalRuntimeContext = (0, import_context.getGlobalInternalRuntimeContext)();
+  const api = internalRuntimeContext.pluginAPI;
+  const hooks = internalRuntimeContext.hooks;
+  const context = getInitialContext();
+  api.updateRuntimeContext(context);
   const runBeforeRender = async (context2) => {
-    await runner.beforeRender(context2);
+    await hooks.onBeforeRender.call(context2);
     const init = (0, import_context.getGlobalAppInit)();
     return init === null || init === void 0 ? void 0 : init(context2);
   };
@@ -187,7 +189,9 @@ const useRuntimeContext = () => {
     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
   };
-  const memoizedContext = (0, import_react.useMemo)(() => context.runner.pickContext(pickedContext), [
+  const internalRuntimeContext = (0, import_context.getGlobalInternalRuntimeContext)();
+  const hooks = internalRuntimeContext.hooks;
+  const memoizedContext = (0, import_react.useMemo)(() => hooks.pickContext.call(pickedContext), [
     context
   ]);
   return memoizedContext;

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

@@ -22,10 +22,12 @@ __export(context_exports, {
   getGlobalApp: () => getGlobalApp,
   getGlobalAppConfig: () => getGlobalAppConfig,
   getGlobalAppInit: () => getGlobalAppInit,
+  getGlobalInternalRuntimeContext: () => getGlobalInternalRuntimeContext,
   getGlobalLayoutApp: () => getGlobalLayoutApp,
   getGlobalRoutes: () => getGlobalRoutes,
   getInitialContext: () => import_runtime.getInitialContext,
-  setGlobalContext: () => setGlobalContext
+  setGlobalContext: () => setGlobalContext,
+  setGlobalInternalRuntimeContext: () => setGlobalInternalRuntimeContext
 });
 module.exports = __toCommonJS(context_exports);
 var import_runtime = require("./runtime");
@@ -37,6 +39,12 @@ function setGlobalContext(context) {
   globalContext.appConfig = typeof context.appConfig === "function" ? context.appConfig() : context.appConfig;
   globalContext.layoutApp = context.layoutApp;
 }
+function setGlobalInternalRuntimeContext(context) {
+  globalContext.internalRuntimeContext = context;
+}
+function getGlobalInternalRuntimeContext() {
+  return globalContext.internalRuntimeContext;
+}
 function getGlobalApp() {
   return globalContext.App;
 }
@@ -60,8 +68,10 @@ function getGlobalLayoutApp() {
   getGlobalApp,
   getGlobalAppConfig,
   getGlobalAppInit,
+  getGlobalInternalRuntimeContext,
   getGlobalLayoutApp,
   getGlobalRoutes,
   getInitialContext,
-  setGlobalContext
+  setGlobalContext,
+  setGlobalInternalRuntimeContext
 });

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

@@ -28,9 +28,8 @@ var import_react = require("react");
 var import_loaderManager = require("../loader/loaderManager");
 const RuntimeReactContext = (0, import_react.createContext)({});
 const ServerRouterContext = (0, import_react.createContext)({});
-const getInitialContext = (runner, isBrowser = true, routeManifest) => ({
+const getInitialContext = (isBrowser = true, routeManifest) => ({
   loaderManager: (0, import_loaderManager.createLoaderManager)({}),
-  runner,
   isBrowser,
   routeManifest: routeManifest || typeof window !== "undefined" && window[import_constants.ROUTE_MANIFEST]
 });

package/dist/cjs/core/index.js

@@ -23,11 +23,9 @@ __export(core_exports, {
   ServerRouterContext: () => import_runtime.ServerRouterContext,
   defineConfig: () => import_config.defineConfig,
   defineRuntimeConfig: () => import_config.defineRuntimeConfig,
-  getConfig: () => import_config.getConfig,
-  runtime: () => import_plugin.runtime
+  getConfig: () => import_config.getConfig
 });
 module.exports = __toCommonJS(core_exports);
-var import_plugin = require("./plugin");
 var import_config = require("./config");
 __reExport(core_exports, require("./compatible"), module.exports);
 var import_runtime = require("./context/runtime");
@@ -40,7 +38,6 @@ __reExport(core_exports, require("@modern-js/plugin"), module.exports);
   defineConfig,
   defineRuntimeConfig,
   getConfig,
-  runtime,
   ...require("./compatible"),
   ...require("./loader"),
   ...require("@modern-js/plugin")

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

@@ -3,10 +3,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -17,35 +13,4 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var base_exports = {};
-__export(base_exports, {
-  RuntimeConfigContext: () => RuntimeConfigContext,
-  createRuntime: () => createRuntime,
-  runtime: () => runtime,
-  useRuntimeConfigContext: () => useRuntimeConfigContext
-});
 module.exports = __toCommonJS(base_exports);
-var import_plugin = require("@modern-js/plugin");
-const RuntimeConfigContext = (0, import_plugin.createContext)({});
-const useRuntimeConfigContext = () => RuntimeConfigContext.use().value;
-const wrapRoot = (0, import_plugin.createWaterfall)();
-const beforeRender = (0, import_plugin.createAsyncInterruptWorkflow)();
-const pickContext = (0, import_plugin.createWaterfall)();
-const modifyRuntimeConfig = (0, import_plugin.createSyncParallelWorkflow)();
-const runtimeHooks = {
-  beforeRender,
-  wrapRoot,
-  pickContext,
-  modifyRuntimeConfig
-};
-const runtimePluginAPI = {
-  useRuntimeConfigContext
-};
-const createRuntime = () => (0, import_plugin.createManager)(runtimeHooks, runtimePluginAPI);
-const runtime = createRuntime();
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  RuntimeConfigContext,
-  createRuntime,
-  runtime,
-  useRuntimeConfigContext
-});

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

@@ -15,7 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var plugin_exports = {};
 __export(plugin_exports, {
@@ -23,22 +22,24 @@ __export(plugin_exports, {
   registerPlugin: () => registerPlugin
 });
 module.exports = __toCommonJS(plugin_exports);
+var import_runtime = require("@modern-js/plugin-v2/runtime");
 var import_merge = require("@modern-js/runtime-utils/merge");
-var import_base = require("./base");
-var import_runner = require("./runner");
-__reExport(plugin_exports, require("./base"), module.exports);
-function setupConfigContext() {
-  const runner = (0, import_runner.getGlobalRunner)();
-  const configs = runner.modifyRuntimeConfig();
-  import_base.RuntimeConfigContext.set((0, import_merge.merge)({}, ...configs));
-}
-function registerPlugin(internalPlugins, runtimeConfig, customRuntime) {
+var import_compat = require("../compat");
+var import_hooks = require("../compat/hooks");
+var import_context = require("../context");
+function registerPlugin(internalPlugins, runtimeConfig) {
   const { plugins = [] } = runtimeConfig || {};
-  (customRuntime || import_base.runtime).usePlugin(...internalPlugins, ...plugins);
-  const runner = (customRuntime || import_base.runtime).init();
-  (0, import_runner.setGlobalRunner)(runner);
-  setupConfigContext();
-  return runner;
+  const { runtimeContext } = import_runtime.runtime.run({
+    plugins: [
+      (0, import_compat.compatPlugin)(),
+      ...internalPlugins,
+      ...plugins
+    ],
+    config: runtimeConfig || {},
+    handleSetupResult: import_hooks.handleSetupResult
+  });
+  (0, import_context.setGlobalInternalRuntimeContext)(runtimeContext);
+  return runtimeContext;
 }
 function mergeConfig(config, ...otherConfig) {
   return (0, import_merge.merge)({}, config, ...otherConfig);
@@ -46,6 +47,5 @@ function mergeConfig(config, ...otherConfig) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   mergeConfig,
-  registerPlugin,
-  ...require("./base")
+  registerPlugin
 });

package/dist/cjs/core/plugin/types.js

@@ -0,0 +1,16 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

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

@@ -25,15 +25,15 @@ var import_parsed = require("@modern-js/runtime-utils/parsed");
 var import_common = require("../../common");
 var import_constants = require("../constants");
 var import_context = require("../context");
-var import_runner = require("../plugin/runner");
 function createRoot(UserApp) {
   const App = UserApp || (0, import_context.getGlobalApp)();
   if ((0, import_common.isBrowser)()) {
     window._SSR_DATA = window._SSR_DATA || (0, import_parsed.parsedJSONFromElement)(import_constants.SSR_DATA_JSON_ID);
     window._ROUTER_DATA = window._ROUTER_DATA || (0, import_parsed.parsedJSONFromElement)(import_constants.ROUTER_DATA_JSON_ID);
   }
-  const runner = (0, import_runner.getGlobalRunner)();
-  const WrapperApp = runner.wrapRoot(App);
+  const internalRuntimeContext = (0, import_context.getGlobalInternalRuntimeContext)();
+  const hooks = internalRuntimeContext.hooks;
+  const WrapperApp = hooks.wrapRoot.call(App);
   return WrapperApp;
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -25,7 +25,6 @@ var import_request = require("@modern-js/runtime-utils/universal/request");
 var import_context = require("../context");
 var import_runtime = require("../context/runtime");
 var import_loaderManager = require("../loader/loaderManager");
-var import_runner = require("../plugin/runner");
 var import_react = require("../react");
 var import_constants = require("./constants");
 var import_utils = require("./utils");
@@ -89,11 +88,12 @@ const createRequestHandler = async (handleRequest) => {
   const requestHandler = async (request, options) => {
     var _context_routerContext, _context_routerContext1;
     const Root = (0, import_react.createRoot)();
-    const runner = (0, import_runner.getGlobalRunner)();
+    const internalRuntimeContext = (0, import_context.getGlobalInternalRuntimeContext)();
+    const hooks = internalRuntimeContext.hooks;
     const { routeManifest } = options.resource;
-    const context = (0, import_runtime.getInitialContext)(runner, false, routeManifest);
+    const context = (0, import_runtime.getInitialContext)(false, routeManifest);
     const runBeforeRender = async (context2) => {
-      const result = await runner.beforeRender(context2);
+      const result = await hooks.onBeforeRender.call(context2);
       if (typeof Response !== "undefined" && result instanceof Response) {
         return result;
       }

package/dist/cjs/router/runtime/hooks.js

@@ -18,15 +18,15 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var hooks_exports = {};
 __export(hooks_exports, {
-  beforeCreateRoutes: () => beforeCreateRoutes,
-  modifyRoutes: () => modifyRoutes
+  modifyRoutes: () => modifyRoutes,
+  onBeforeCreateRoutes: () => onBeforeCreateRoutes
 });
 module.exports = __toCommonJS(hooks_exports);
-var import_plugin = require("@modern-js/plugin");
-const modifyRoutes = (0, import_plugin.createWaterfall)();
-const beforeCreateRoutes = (0, import_plugin.createAsyncInterruptWorkflow)();
+var import_plugin_v2 = require("@modern-js/plugin-v2");
+const modifyRoutes = (0, import_plugin_v2.createSyncHook)();
+const onBeforeCreateRoutes = (0, import_plugin_v2.createSyncHook)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  beforeCreateRoutes,
-  modifyRoutes
+  modifyRoutes,
+  onBeforeCreateRoutes
 });