@modern-js/runtime 2.15.1-alpha.2 → 2.16.1-alpha.0

package/dist/cjs/core/compatible.js

@@ -1,159 +1,192 @@
-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) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _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 compatible_exports = {};
-__export(compatible_exports, {
-  bootstrap: () => bootstrap,
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
   createApp: () => createApp,
+  bootstrap: () => bootstrap,
   useRuntimeContext: () => useRuntimeContext
 });
-module.exports = __toCommonJS(compatible_exports);
-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_plugin = require("./plugin");
-var import_loaderManager = require("./loader/loaderManager");
+const _jsxruntime = require("react/jsx-runtime");
+const _react = /* @__PURE__ */ _interop_require_wildcard(require("react"));
+const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
+const _constants = require("@modern-js/utils/universal/constants");
+const _runtimeContext = require("../runtimeContext");
+const _plugin = require("./plugin");
+const _loaderManager = require("./loader/loaderManager");
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+function _getRequireWildcardCache(nodeInterop) {
+  if (typeof WeakMap !== "function")
+    return null;
+  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
+  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
+  return (_getRequireWildcardCache = function(nodeInterop2) {
+    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
+  })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+  if (!nodeInterop && obj && obj.__esModule) {
+    return obj;
+  }
+  if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+    return {
+      default: obj
+    };
+  }
+  var cache = _getRequireWildcardCache(nodeInterop);
+  if (cache && cache.has(obj)) {
+    return cache.get(obj);
+  }
+  var newObj = {};
+  var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+  for (var key in obj) {
+    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+      var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+      if (desc && (desc.get || desc.set)) {
+        Object.defineProperty(newObj, key, desc);
+      } else {
+        newObj[key] = obj[key];
+      }
+    }
+  }
+  newObj.default = obj;
+  if (cache) {
+    cache.set(obj, newObj);
+  }
+  return newObj;
+}
 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)({}),
+  loaderManager: (0, _loaderManager.createLoaderManager)({}),
   runner,
   isBrowser: true,
-  routeManifest: typeof window !== "undefined" && window[import_constants.ROUTE_MANIFEST]
+  routeManifest: typeof window !== "undefined" && window[_constants.ROUTE_MANIFEST]
 });
-const createApp = ({
-  plugins,
-  props: globalProps
-}) => {
-  const appRuntime = import_plugin.runtime.clone();
+const createApp = ({ plugins, props: globalProps }) => {
+  const appRuntime = _plugin.runtime.clone();
   appRuntime.usePlugin(...plugins);
   return (App) => {
     const runner = appRuntime.init();
     const WrapperComponent = (props) => {
-      var _a;
-      const element = import_react.default.createElement(
-        App || import_react.default.Fragment,
-        App ? { ...props } : null,
-        App ? props.children : import_react.default.cloneElement(props.children, {
-          ...(_a = props.children) == null ? void 0 : _a.props,
+      var _props_children;
+      const element = /* @__PURE__ */ _react.default.createElement(App || _react.default.Fragment, App ? {
+        ...props
+      } : null, App ? props.children : /* @__PURE__ */ _react.default.cloneElement(props.children, {
+        ...(_props_children = props.children) === null || _props_children === void 0 ? void 0 : _props_children.props,
+        ...props
+      }));
+      const context = (0, _react.useContext)(_runtimeContext.RuntimeReactContext);
+      return runner.provide({
+        element,
+        props: {
           ...props
-        })
-      );
-      const context = (0, import_react.useContext)(import_runtimeContext.RuntimeReactContext);
-      return runner.provide(
-        { element, props: { ...props }, context },
-        {
-          onLast: ({ element: element2 }) => element2
-        }
-      );
+        },
+        context
+      }, {
+        onLast: ({ element: element2 }) => element2
+      });
     };
     if (App) {
-      (0, import_hoist_non_react_statics.default)(WrapperComponent, App);
+      (0, _hoistnonreactstatics.default)(WrapperComponent, App);
     }
-    const HOCApp = runner.hoc(
-      { App: WrapperComponent },
-      {
-        onLast: ({ App: App2 }) => {
-          const WrapComponent = ({ context, ...props }) => {
-            let contextValue = context;
-            if (!(contextValue == null ? void 0 : contextValue.runner)) {
-              contextValue = getInitialContext(runner);
-              runner.init(
-                { context: contextValue },
-                {
-                  onLast: ({ context: context1 }) => {
-                    var _a;
-                    return (_a = App2 == null ? void 0 : App2.init) == null ? void 0 : _a.call(App2, context1);
-                  }
-                }
-              );
-            }
-            const mergedProps = { ...props, ...globalProps };
-            return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_runtimeContext.RuntimeReactContext.Provider, { value: contextValue, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App2, { ...mergedProps }) });
+    const HOCApp = runner.hoc({
+      App: WrapperComponent
+    }, {
+      onLast: ({ App: App2 }) => {
+        const WrapComponent = ({ context, ...props }) => {
+          let contextValue = context;
+          if (!(contextValue === null || contextValue === void 0 ? void 0 : contextValue.runner)) {
+            contextValue = getInitialContext(runner);
+            runner.init({
+              context: contextValue
+            }, {
+              onLast: ({ context: context1 }) => {
+                var _App_init;
+                return App2 === null || App2 === void 0 ? void 0 : (_App_init = App2.init) === null || _App_init === void 0 ? void 0 : _App_init.call(App2, context1);
+              }
+            });
+          }
+          const mergedProps = {
+            ...props,
+            ...globalProps
           };
-          return (0, import_hoist_non_react_statics.default)(WrapComponent, App2);
-        }
+          return /* @__PURE__ */ (0, _jsxruntime.jsx)(_runtimeContext.RuntimeReactContext.Provider, {
+            value: contextValue,
+            children: /* @__PURE__ */ (0, _jsxruntime.jsx)(App2, {
+              ...mergedProps
+            })
+          });
+        };
+        return (0, _hoistnonreactstatics.default)(WrapComponent, App2);
       }
-    );
+    });
     runnerMap.set(HOCApp, runner);
     return HOCApp;
   };
 };
 const bootstrap = async (BootApp, id, root, ReactDOM) => {
-  var _a, _b;
   let App = BootApp;
   let runner = runnerMap.get(App);
   if (!runner) {
-    App = createApp({ plugins: [] })(App);
+    App = createApp({
+      plugins: []
+    })(App);
     runner = runnerMap.get(App);
   }
   const context = getInitialContext(runner);
-  const runInit = (_context) => runner.init(
-    { context: _context },
-    {
+  const runInit = (_context) => {
+    return runner.init({
+      context: _context
+    }, {
       onLast: ({ context: context1 }) => {
-        var _a2;
-        return (_a2 = App == null ? void 0 : App.init) == null ? void 0 : _a2.call(App, context1);
+        var _App_init;
+        return App === null || App === void 0 ? void 0 : (_App_init = App.init) === null || _App_init === void 0 ? void 0 : _App_init.call(App, context1);
       }
-    }
-  );
+    });
+  };
   if (!id) {
-    return import_react.default.createElement(App, {
+    return /* @__PURE__ */ _react.default.createElement(App, {
       context
     });
   }
   const isBrowser = typeof window !== "undefined" && window.name !== "nodejs";
   if (isBrowser) {
     if (isClientArgs(id)) {
+      var _ssrData_data, _ssrData_data1;
       const ssrData = window._SSR_DATA;
-      const loadersData = ((_a = ssrData == null ? void 0 : ssrData.data) == null ? void 0 : _a.loadersData) || {};
-      const initialLoadersState = Object.keys(loadersData).reduce(
-        (res, key) => {
-          const loaderData = loadersData[key];
-          if (loaderData.loading !== false) {
-            return res;
-          }
-          res[key] = loaderData;
+      const loadersData = (ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
+      const initialLoadersState = Object.keys(loadersData).reduce((res, key) => {
+        const loaderData = loadersData[key];
+        if (loaderData.loading !== false) {
           return res;
-        },
-        {}
-      );
+        }
+        res[key] = loaderData;
+        return res;
+      }, {});
       Object.assign(context, {
-        loaderManager: (0, import_loaderManager.createLoaderManager)(initialLoadersState, {
+        loaderManager: (0, _loaderManager.createLoaderManager)(initialLoadersState, {
           skipStatic: true
         }),
-        ...ssrData ? { ssrContext: ssrData == null ? void 0 : ssrData.context } : {}
+        ...ssrData ? {
+          ssrContext: ssrData === null || ssrData === void 0 ? void 0 : ssrData.context
+        } : {}
       });
-      context.initialData = (_b = ssrData == null ? void 0 : ssrData.data) == null ? void 0 : _b.initialData;
+      context.initialData = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
       const initialData = await runInit(context);
       if (initialData) {
         context.initialData = initialData;
@@ -169,15 +202,11 @@ const bootstrap = async (BootApp, id, root, ReactDOM) => {
           } else if (ReactDOM.createRoot) {
             ReactDOM.createRoot(rootElement).render(App2);
           } else {
-            throw Error(
-              "The `bootstrap` `ReactDOM` parameter needs to provide the `createRoot` method"
-            );
+            throw Error("The `bootstrap` `ReactDOM` parameter needs to provide the `createRoot` method");
           }
         } else {
           if (!ReactDOM.render) {
-            throw Error(
-              "The `bootstrap` `ReactDOM` parameter needs to provide the `render` method"
-            );
+            throw Error("The `bootstrap` `ReactDOM` parameter needs to provide the `render` method");
           }
           ReactDOM.render(App2, rootElement);
         }
@@ -185,50 +214,40 @@ const bootstrap = async (BootApp, id, root, ReactDOM) => {
       const ModernHydrate = (App2, callback) => {
         if (IS_REACT18) {
           if (!ReactDOM.hydrateRoot) {
-            throw Error(
-              "The `bootstrap` `ReactDOM` parameter needs to provide the `hydrateRoot` method"
-            );
+            throw Error("The `bootstrap` `ReactDOM` parameter needs to provide the `hydrateRoot` method");
           }
           ReactDOM.hydrateRoot(rootElement, App2);
         } else {
           if (!ReactDOM.hydrate) {
-            throw Error(
-              "The `bootstrap` `ReactDOM` parameter needs to provide the `hydrate` method"
-            );
+            throw Error("The `bootstrap` `ReactDOM` parameter needs to provide the `hydrate` method");
           }
           ReactDOM.hydrate(App2, rootElement, callback);
         }
       };
-      return runner.client(
-        {
-          App,
-          context,
-          ModernRender,
-          ModernHydrate
-        },
-        {
-          onLast: ({ App: App2 }) => {
-            ModernRender(import_react.default.createElement(App2, { context }));
-          }
+      return runner.client({
+        App,
+        context,
+        ModernRender,
+        ModernHydrate
+      }, {
+        onLast: ({ App: App2 }) => {
+          ModernRender(/* @__PURE__ */ _react.default.createElement(App2, {
+            context
+          }));
         }
-      );
+      });
     } else {
-      throw Error(
-        "`bootstrap` needs id in browser environment, it needs to be string or element"
-      );
+      throw Error("`bootstrap` needs id in browser environment, it needs to be string or element");
     }
   } else {
     Object.assign(context, {
       ssrContext: id,
       isBrowser: false,
-      loaderManager: (0, import_loaderManager.createLoaderManager)(
-        {},
-        {
-          skipNonStatic: id.staticGenerate,
-          // if not static generate, only non-static loader can exec on prod env
-          skipStatic: process.env.NODE_ENV === "production" && !id.staticGenerate
-        }
-      )
+      loaderManager: (0, _loaderManager.createLoaderManager)({}, {
+        skipNonStatic: id.staticGenerate,
+        // if not static generate, only non-static loader can exec on prod env
+        skipStatic: process.env.NODE_ENV === "production" && !id.staticGenerate
+      })
     });
     const isRedirectResponse = (result) => {
       if (typeof Response !== "undefined" && // fix: ssg workflow doesn't inject Web Response
@@ -258,21 +277,14 @@ const bootstrap = async (BootApp, id, root, ReactDOM) => {
   }
 };
 const useRuntimeContext = () => {
-  const context = (0, import_react.useContext)(import_runtimeContext.RuntimeReactContext);
-  const memoizedContext = (0, import_react.useMemo)(
-    () => context.runner.pickContext(
-      { context, pickedContext: {} },
-      {
-        onLast: ({ pickedContext }) => pickedContext
-      }
-    ),
-    [context]
-  );
+  const context = (0, _react.useContext)(_runtimeContext.RuntimeReactContext);
+  const memoizedContext = (0, _react.useMemo)(() => context.runner.pickContext({
+    context,
+    pickedContext: {}
+  }, {
+    onLast: ({ pickedContext }) => pickedContext
+  }), [
+    context
+  ]);
   return memoizedContext;
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  bootstrap,
-  createApp,
-  useRuntimeContext
-});

package/dist/cjs/core/index.js

@@ -1,47 +1,40 @@
-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 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,
-  runtime: () => import_plugin.runtime
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(core_exports);
-var import_plugin = require("./plugin");
-var import_appConfig = require("./appConfig");
-__reExport(core_exports, require("./compatible"), module.exports);
-var import_runtimeContext = require("../runtimeContext");
-__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,
-  getConfig,
-  registerInit,
-  runtime
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  createPlugin: () => _plugin.createPlugin,
+  createRuntime: () => _plugin.createRuntime,
+  runtime: () => _plugin.runtime,
+  registerInit: () => _plugin.registerInit,
+  defineConfig: () => _appConfig.defineConfig,
+  getConfig: () => _appConfig.getConfig,
+  RuntimeReactContext: () => _runtimeContext.RuntimeReactContext,
+  ServerRouterContext: () => _runtimeContext.ServerRouterContext
 });
+const _plugin = require("./plugin");
+const _appConfig = require("./appConfig");
+_export_star(require("./compatible"), exports);
+const _runtimeContext = require("../runtimeContext");
+_export_star(require("./loader"), exports);
+_export_star(require("@modern-js/plugin"), exports);
+function _export_star(from, to) {
+  Object.keys(from).forEach(function(k) {
+    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
+      Object.defineProperty(to, k, {
+        enumerable: true,
+        get: function() {
+          return from[k];
+        }
+      });
+    }
+  });
+  return from;
+}

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

@@ -1,37 +1,14 @@
-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 loader_exports = {};
-__export(loader_exports, {
-  useLoader: () => import_useLoader.default
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(loader_exports);
-var import_useLoader = __toESM(require("./useLoader"));
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  useLoader
+Object.defineProperty(exports, "useLoader", {
+  enumerable: true,
+  get: () => _useLoader.default
 });
+const _useLoader = /* @__PURE__ */ _interop_require_default(require("./useLoader"));
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}