@modern-js/runtime 2.53.0 → 2.54.1

package/dist/cjs/{runtimeContext.js → cli/constants.js}

@@ -16,17 +16,13 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var runtimeContext_exports = {};
-__export(runtimeContext_exports, {
-  RuntimeReactContext: () => RuntimeReactContext,
-  ServerRouterContext: () => ServerRouterContext
+var constants_exports = {};
+__export(constants_exports, {
+  APP_FILE_NAME: () => APP_FILE_NAME
 });
-module.exports = __toCommonJS(runtimeContext_exports);
-var import_react = require("react");
-const RuntimeReactContext = (0, import_react.createContext)({});
-const ServerRouterContext = (0, import_react.createContext)({});
+module.exports = __toCommonJS(constants_exports);
+const APP_FILE_NAME = "App";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  RuntimeReactContext,
-  ServerRouterContext
+  APP_FILE_NAME
 });

package/dist/cjs/cli/entry.js

@@ -0,0 +1,42 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var entry_exports = {};
+__export(entry_exports, {
+  isRuntimeEntry: () => isRuntimeEntry
+});
+module.exports = __toCommonJS(entry_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_constants = require("./constants");
+const hasApp = (dir) => (0, import_utils.findExists)(import_utils.JS_EXTENSIONS.map((ext) => import_path.default.resolve(dir, `${import_constants.APP_FILE_NAME}${ext}`)));
+const isRuntimeEntry = (dir) => hasApp(dir);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isRuntimeEntry
+});

package/dist/cjs/cli/index.js

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var cli_exports = {};
 __export(cli_exports, {
   default: () => cli_default,
+  isRuntimeEntry: () => import_entry2.isRuntimeEntry,
   runtimePlugin: () => runtimePlugin
 });
 module.exports = __toCommonJS(cli_exports);
@@ -37,6 +38,8 @@ var import_cli = require("../state/cli");
 var import_cli2 = require("../ssr/cli");
 var import_cli3 = require("../router/cli");
 var import_cli4 = require("../document/cli");
+var import_entry = require("./entry");
+var import_entry2 = require("./entry");
 const runtimePlugin = () => ({
   name: "@modern-js/runtime",
   post: [
@@ -55,6 +58,12 @@ const runtimePlugin = () => ({
   ],
   setup: (api) => {
     return {
+      checkEntryPoint({ path, entry }) {
+        return {
+          path,
+          entry: entry || (0, import_entry.isRuntimeEntry)(path)
+        };
+      },
       config() {
         const appDir = api.useAppContext().appDirectory;
         process.env.IS_REACT18 = (0, import_utils.isReact18)(appDir).toString();
@@ -97,5 +106,6 @@ const runtimePlugin = () => ({
 var cli_default = runtimePlugin;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  isRuntimeEntry,
   runtimePlugin
 });

package/dist/cjs/core/compatible.js

@@ -37,48 +37,39 @@ var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = __toESM(require("react"));
 var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
 var import_constants = require("@modern-js/utils/universal/constants");
-var import_runtimeContext = require("../runtimeContext");
+var import_runtime = require("./context/runtime");
 var import_plugin = require("./plugin");
 var import_loaderManager = require("./loader/loaderManager");
+var import_runner = require("./plugin/runner");
 const IS_REACT18 = process.env.IS_REACT18 === "true";
 function isClientArgs(id) {
   return typeof id === "string" || typeof HTMLElement !== "undefined" && id instanceof HTMLElement;
 }
-const runnerMap = /* @__PURE__ */ new WeakMap();
 const getInitialContext = (runner) => ({
   loaderManager: (0, import_loaderManager.createLoaderManager)({}),
   runner,
   isBrowser: true,
   routeManifest: typeof window !== "undefined" && window[import_constants.ROUTE_MANIFEST]
 });
-const createApp = ({ plugins, props: globalProps }) => {
-  const appRuntime = import_plugin.runtime.clone();
-  appRuntime.usePlugin(...plugins);
+const createApp = ({ plugins, runtime, props: globalProps }) => {
+  const runner = (0, import_plugin.registerPlugin)(plugins, {
+    plugins: []
+  }, runtime);
   return (App) => {
-    const runner = appRuntime.init();
     const WrapperComponent = (props) => {
-      const element = /* @__PURE__ */ import_react.default.createElement(App || import_react.default.Fragment, App ? {
+      return /* @__PURE__ */ import_react.default.createElement(App || import_react.default.Fragment, App ? {
         ...props
       } : null, App ? props.children : import_react.default.Children.map(props.children, (child) => /* @__PURE__ */ import_react.default.isValidElement(child) ? /* @__PURE__ */ import_react.default.cloneElement(child, {
         ...child.props,
         ...props
       }) : child));
-      const context = (0, import_react.useContext)(import_runtimeContext.RuntimeReactContext);
-      return runner.provide({
-        element,
-        props: {
-          ...props
-        },
-        context
-      }, {
-        onLast: ({ element: element2 }) => element2
-      });
     };
     if (App) {
       (0, import_hoist_non_react_statics.default)(WrapperComponent, App);
     }
     const HOCApp = runner.hoc({
-      App: WrapperComponent
+      App: WrapperComponent,
+      config: globalProps || {}
     }, {
       onLast: ({ App: App2 }) => {
         const WrapComponent = ({ context, ...props }) => {
@@ -98,7 +89,7 @@ const createApp = ({ plugins, props: globalProps }) => {
             ...props,
             ...globalProps
           };
-          return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_runtimeContext.RuntimeReactContext.Provider, {
+          return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_runtime.RuntimeReactContext.Provider, {
             value: contextValue,
             children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App2, {
               ...mergedProps
@@ -108,19 +99,12 @@ const createApp = ({ plugins, props: globalProps }) => {
         return (0, import_hoist_non_react_statics.default)(WrapComponent, App2);
       }
     });
-    runnerMap.set(HOCApp, runner);
     return HOCApp;
   };
 };
 const bootstrap = async (BootApp, id, root, ReactDOM) => {
-  let App = BootApp;
-  let runner = runnerMap.get(App);
-  if (!runner) {
-    App = createApp({
-      plugins: []
-    })(App);
-    runner = runnerMap.get(App);
-  }
+  const App = BootApp;
+  const runner = (0, import_runner.getGlobalRunner)();
   const context = getInitialContext(runner);
   const runInit = (_context) => runner.init({
     context: _context
@@ -254,7 +238,7 @@ const bootstrap = async (BootApp, id, root, ReactDOM) => {
   }
 };
 const useRuntimeContext = () => {
-  const context = (0, import_react.useContext)(import_runtimeContext.RuntimeReactContext);
+  const context = (0, import_react.useContext)(import_runtime.RuntimeReactContext);
   const memoizedContext = (0, import_react.useMemo)(() => context.runner.pickContext({
     context,
     pickedContext: {}

package/dist/cjs/core/{appConfig.js → config.js}

@@ -16,15 +16,15 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var appConfig_exports = {};
-__export(appConfig_exports, {
+var config_exports = {};
+__export(config_exports, {
   defineConfig: () => defineConfig,
+  defineRuntimeConfig: () => defineRuntimeConfig,
   getConfig: () => getConfig
 });
-module.exports = __toCommonJS(appConfig_exports);
+module.exports = __toCommonJS(config_exports);
 const APP_CONFIG_SYMBOL = "config";
 const getConfig = (Component) => (
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-expect-error
   Component[APP_CONFIG_SYMBOL]
 );
@@ -32,8 +32,10 @@ const defineConfig = (Component, config) => {
   Component[APP_CONFIG_SYMBOL] = config;
   return Component;
 };
+const defineRuntimeConfig = (config) => config;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   defineConfig,
+  defineRuntimeConfig,
   getConfig
 });

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

@@ -0,0 +1,28 @@
+"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 context_exports = {};
+__export(context_exports, {
+  RuntimeReactContext: () => import_runtime.RuntimeReactContext
+});
+module.exports = __toCommonJS(context_exports);
+var import_runtime = require("./runtime");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RuntimeReactContext
+});

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

@@ -0,0 +1,42 @@
+"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 runtime_exports = {};
+__export(runtime_exports, {
+  RuntimeReactContext: () => RuntimeReactContext,
+  ServerRouterContext: () => ServerRouterContext,
+  getInitialContext: () => getInitialContext
+});
+module.exports = __toCommonJS(runtime_exports);
+var import_react = require("react");
+var import_constants = require("@modern-js/utils/universal/constants");
+var import_loaderManager = require("../loader/loaderManager");
+const RuntimeReactContext = (0, import_react.createContext)({});
+const ServerRouterContext = (0, import_react.createContext)({});
+const getInitialContext = (runner) => ({
+  loaderManager: (0, import_loaderManager.createLoaderManager)({}),
+  runner,
+  isBrowser: true,
+  routeManifest: typeof window !== "undefined" && window[import_constants.ROUTE_MANIFEST]
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RuntimeReactContext,
+  ServerRouterContext,
+  getInitialContext
+});

package/dist/cjs/core/index.js

@@ -19,31 +19,27 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var core_exports = {};
 __export(core_exports, {
-  RuntimeReactContext: () => import_runtimeContext.RuntimeReactContext,
-  ServerRouterContext: () => import_runtimeContext.ServerRouterContext,
-  createPlugin: () => import_plugin.createPlugin,
-  createRuntime: () => import_plugin.createRuntime,
-  defineConfig: () => import_appConfig.defineConfig,
-  getConfig: () => import_appConfig.getConfig,
-  registerInit: () => import_plugin.registerInit,
+  RuntimeReactContext: () => import_runtime.RuntimeReactContext,
+  ServerRouterContext: () => import_runtime.ServerRouterContext,
+  defineConfig: () => import_config.defineConfig,
+  defineRuntimeConfig: () => import_config.defineRuntimeConfig,
+  getConfig: () => import_config.getConfig,
   runtime: () => import_plugin.runtime
 });
 module.exports = __toCommonJS(core_exports);
 var import_plugin = require("./plugin");
-var import_appConfig = require("./appConfig");
+var import_config = require("./config");
 __reExport(core_exports, require("./compatible"), module.exports);
-var import_runtimeContext = require("../runtimeContext");
+var import_runtime = require("./context/runtime");
 __reExport(core_exports, require("./loader"), module.exports);
 __reExport(core_exports, require("@modern-js/plugin"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   RuntimeReactContext,
   ServerRouterContext,
-  createPlugin,
-  createRuntime,
   defineConfig,
+  defineRuntimeConfig,
   getConfig,
-  registerInit,
   runtime,
   ...require("./compatible"),
   ...require("./loader"),

package/dist/cjs/core/loader/useLoader.js

@@ -33,12 +33,12 @@ __export(useLoader_exports, {
 module.exports = __toCommonJS(useLoader_exports);
 var import_react = require("react");
 var import_invariant = __toESM(require("invariant"));
-var import_runtimeContext = require("../../runtimeContext");
+var import_runtime = require("../context/runtime");
 var import_loaderManager = require("./loaderManager");
 const useLoader = (loaderFn, options = {
   params: void 0
 }) => {
-  const context = (0, import_react.useContext)(import_runtimeContext.RuntimeReactContext);
+  const context = (0, import_react.useContext)(import_runtime.RuntimeReactContext);
   const isSSRRender = Boolean(context.ssr);
   const { loaderManager } = context;
   const loaderRef = (0, import_react.useRef)();

package/dist/cjs/core/{plugin.js → plugin/base.js}

@@ -16,49 +16,29 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var plugin_exports = {};
-__export(plugin_exports, {
-  createPlugin: () => createPlugin,
+var base_exports = {};
+__export(base_exports, {
   createRuntime: () => createRuntime,
-  registerInit: () => registerInit,
   runtime: () => runtime
 });
-module.exports = __toCommonJS(plugin_exports);
+module.exports = __toCommonJS(base_exports);
 var import_plugin = require("@modern-js/plugin");
-var import_loaderManager = require("./loader/loaderManager");
-const hoc = (0, import_plugin.createPipeline)();
-const provide = (0, import_plugin.createPipeline)();
 const client = (0, import_plugin.createAsyncPipeline)();
 const server = (0, import_plugin.createAsyncPipeline)();
+const hoc = (0, import_plugin.createPipeline)();
 const init = (0, import_plugin.createAsyncPipeline)();
 const pickContext = (0, import_plugin.createPipeline)();
 const runtimeHooks = {
   hoc,
-  provide,
+  init,
   client,
   server,
-  init,
   pickContext
 };
 const createRuntime = () => (0, import_plugin.createManager)(runtimeHooks);
-const registerInit = (App, _init) => {
-  const originalInit = App.init;
-  App.init = async (context) => {
-    if (!context.loaderManager) {
-      context.loaderManager = (0, import_loaderManager.createLoaderManager)({});
-    }
-    await Promise.all([
-      originalInit === null || originalInit === void 0 ? void 0 : originalInit(context),
-      _init === null || _init === void 0 ? void 0 : _init(context)
-    ]);
-  };
-};
 const runtime = createRuntime();
-const { createPlugin } = runtime;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createPlugin,
   createRuntime,
-  registerInit,
   runtime
 });

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

@@ -0,0 +1,39 @@
+"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 __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, {
+  registerPlugin: () => registerPlugin
+});
+module.exports = __toCommonJS(plugin_exports);
+var import_base = require("./base");
+var import_runner = require("./runner");
+__reExport(plugin_exports, require("./base"), module.exports);
+function registerPlugin(internalPlugins, runtimeConfig, customRuntime) {
+  const { plugins = [] } = runtimeConfig || {};
+  (customRuntime || import_base.runtime).usePlugin(...internalPlugins, ...plugins);
+  const runner = (customRuntime || import_base.runtime).init();
+  (0, import_runner.setGlobalRunner)(runner);
+  return runner;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  registerPlugin,
+  ...require("./base")
+});

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

@@ -0,0 +1,42 @@
+"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 runner_exports = {};
+__export(runner_exports, {
+  getGlobalRunner: () => getGlobalRunner,
+  setGlobalRunner: () => setGlobalRunner
+});
+module.exports = __toCommonJS(runner_exports);
+var import_base = require("./base");
+let globalRunner;
+function setGlobalRunner(runner) {
+  globalRunner = runner;
+}
+function getGlobalRunner() {
+  if (globalRunner) {
+    return globalRunner;
+  }
+  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
+});

package/dist/cjs/index.js

@@ -21,10 +21,9 @@ __export(src_exports, {
   RuntimeReactContext: () => import_core.RuntimeReactContext,
   bootstrap: () => import_core.bootstrap,
   createApp: () => import_core.createApp,
-  createPlugin: () => import_core.createPlugin,
   defineConfig: () => import_core.defineConfig,
+  defineRuntimeConfig: () => import_core.defineRuntimeConfig,
   isBrowser: () => import_common.isBrowser,
-  registerInit: () => import_core.registerInit,
   useLoader: () => import_core.useLoader,
   useRuntimeContext: () => import_core.useRuntimeContext
 });
@@ -36,10 +35,9 @@ var import_core = require("./core");
   RuntimeReactContext,
   bootstrap,
   createApp,
-  createPlugin,
   defineConfig,
+  defineRuntimeConfig,
   isBrowser,
-  registerInit,
   useLoader,
   useRuntimeContext
 });