@modern-js/runtime 2.15.1-alpha.2 → 2.16.0

package/dist/esm-node/core/compatible.js

@@ -1,10 +1,8 @@
-import { jsx } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import React, { useContext, useMemo } from "react";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { ROUTE_MANIFEST } from "@modern-js/utils/universal/constants";
-import {
-  RuntimeReactContext
-} from "../runtimeContext";
+import { RuntimeReactContext } from "../runtimeContext";
 import { runtime } from "./plugin";
 import { createLoaderManager } from "./loader/loaderManager";
 const IS_REACT18 = process.env.IS_REACT18 === "true";
@@ -18,110 +16,116 @@ const getInitialContext = (runner) => ({
   isBrowser: true,
   routeManifest: typeof window !== "undefined" && window[ROUTE_MANIFEST]
 });
-const createApp = ({
-  plugins,
-  props: globalProps
-}) => {
+export const createApp = ({ plugins, props: globalProps }) => {
   const appRuntime = runtime.clone();
   appRuntime.usePlugin(...plugins);
   return (App) => {
     const runner = appRuntime.init();
     const WrapperComponent = (props) => {
-      var _a;
-      const element = React.createElement(
-        App || React.Fragment,
-        App ? { ...props } : null,
-        App ? props.children : React.cloneElement(props.children, {
-          ...(_a = props.children) == null ? void 0 : _a.props,
-          ...props
-        })
-      );
+      var _props_children;
+      const element = /* @__PURE__ */ React.createElement(App || React.Fragment, App ? {
+        ...props
+      } : null, App ? props.children : /* @__PURE__ */ React.cloneElement(props.children, {
+        ...(_props_children = props.children) === null || _props_children === void 0 ? void 0 : _props_children.props,
+        ...props
+      }));
       const context = useContext(RuntimeReactContext);
-      return runner.provide(
-        { element, props: { ...props }, context },
-        {
-          onLast: ({ element: element2 }) => element2
-        }
-      );
+      return runner.provide({
+        element,
+        props: {
+          ...props
+        },
+        context
+      }, {
+        onLast: ({ element: element2 }) => element2
+      });
     };
     if (App) {
       hoistNonReactStatics(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__ */ jsx(RuntimeReactContext.Provider, { value: contextValue, children: /* @__PURE__ */ 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 hoistNonReactStatics(WrapComponent, App2);
-        }
+          return /* @__PURE__ */ _jsx(RuntimeReactContext.Provider, {
+            value: contextValue,
+            children: /* @__PURE__ */ _jsx(App2, {
+              ...mergedProps
+            })
+          });
+        };
+        return hoistNonReactStatics(WrapComponent, App2);
       }
-    );
+    });
     runnerMap.set(HOCApp, runner);
     return HOCApp;
   };
 };
-const bootstrap = async (BootApp, id, root, ReactDOM) => {
-  var _a, _b;
+export const bootstrap = async (BootApp, id, root, ReactDOM) => {
   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 React.createElement(App, {
+    return /* @__PURE__ */ React.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: 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;
@@ -137,15 +141,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);
         }
@@ -153,50 +153,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(React.createElement(App2, { context }));
-          }
+      return runner.client({
+        App,
+        context,
+        ModernRender,
+        ModernHydrate
+      }, {
+        onLast: ({ App: App2 }) => {
+          ModernRender(/* @__PURE__ */ React.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: 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: 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
@@ -225,21 +215,15 @@ const bootstrap = async (BootApp, id, root, ReactDOM) => {
     }
   }
 };
-const useRuntimeContext = () => {
+export const useRuntimeContext = () => {
   const context = useContext(RuntimeReactContext);
-  const memoizedContext = useMemo(
-    () => context.runner.pickContext(
-      { context, pickedContext: {} },
-      {
-        onLast: ({ pickedContext }) => pickedContext
-      }
-    ),
-    [context]
-  );
+  const memoizedContext = useMemo(() => context.runner.pickContext({
+    context,
+    pickedContext: {}
+  }, {
+    onLast: ({ pickedContext }) => pickedContext
+  }), [
+    context
+  ]);
   return memoizedContext;
 };
-export {
-  bootstrap,
-  createApp,
-  useRuntimeContext
-};

package/dist/esm-node/core/index.js

@@ -1,16 +1,6 @@
-import { createPlugin, createRuntime, runtime, registerInit } from "./plugin";
-import { defineConfig, getConfig } from "./appConfig";
+export { createPlugin, createRuntime, runtime, registerInit } from "./plugin";
+export { defineConfig, getConfig } from "./appConfig";
 export * from "./compatible";
-import { RuntimeReactContext, ServerRouterContext } from "../runtimeContext";
+export { RuntimeReactContext, ServerRouterContext } from "../runtimeContext";
 export * from "./loader";
 export * from "@modern-js/plugin";
-export {
-  RuntimeReactContext,
-  ServerRouterContext,
-  createPlugin,
-  createRuntime,
-  defineConfig,
-  getConfig,
-  registerInit,
-  runtime
-};

package/dist/esm-node/core/loader/index.js

@@ -1,4 +1 @@
-import { default as default2 } from "./useLoader";
-export {
-  default2 as useLoader
-};
+export { default as useLoader } from "./useLoader";

package/dist/esm-node/core/loader/loaderManager.js

@@ -12,13 +12,13 @@ const createGetId = () => {
     return id;
   };
 };
-var LoaderStatus = /* @__PURE__ */ ((LoaderStatus2) => {
+export var LoaderStatus;
+(function(LoaderStatus2) {
   LoaderStatus2[LoaderStatus2["idle"] = 0] = "idle";
   LoaderStatus2[LoaderStatus2["loading"] = 1] = "loading";
   LoaderStatus2[LoaderStatus2["fulfilled"] = 2] = "fulfilled";
   LoaderStatus2[LoaderStatus2["rejected"] = 3] = "rejected";
-  return LoaderStatus2;
-})(LoaderStatus || {});
+})(LoaderStatus || (LoaderStatus = {}));
 const createLoader = (id, initialData = {
   loading: false,
   reloading: false,
@@ -26,7 +26,7 @@ const createLoader = (id, initialData = {
   error: void 0
 }, loaderFn, skip = false) => {
   let promise;
-  let status = 0 /* idle */;
+  let status = LoaderStatus.idle;
   let { data, error } = initialData;
   let hasLoaded = false;
   const handlers = /* @__PURE__ */ new Set();
@@ -34,19 +34,19 @@ const createLoader = (id, initialData = {
     if (skip) {
       return promise;
     }
-    if (status === 1 /* loading */) {
+    if (status === LoaderStatus.loading) {
       return promise;
     }
-    status = 1 /* loading */;
+    status = LoaderStatus.loading;
     notify();
     promise = loaderFn().then((value) => {
       data = value;
       error = null;
-      status = 2 /* fulfilled */;
+      status = LoaderStatus.fulfilled;
     }).catch((e) => {
       error = e;
       data = null;
-      status = 3 /* rejected */;
+      status = LoaderStatus.rejected;
     }).finally(() => {
       promise = null;
       hasLoaded = true;
@@ -55,15 +55,17 @@ const createLoader = (id, initialData = {
     return promise;
   };
   const getResult = () => ({
-    loading: !hasLoaded && status === 1 /* loading */,
-    reloading: hasLoaded && status === 1 /* loading */,
+    loading: !hasLoaded && status === LoaderStatus.loading,
+    reloading: hasLoaded && status === LoaderStatus.loading,
     data,
     error: error instanceof Error ? `${error.message}` : error,
     // redundant fields for ssr log
     _error: error
   });
   const notify = () => {
-    [...handlers].forEach((handler) => {
+    [
+      ...handlers
+    ].forEach((handler) => {
       handler(status, getResult());
     });
   };
@@ -84,7 +86,7 @@ const createLoader = (id, initialData = {
     load
   };
 };
-const createLoaderManager = (initialDataMap, managerOptions = {}) => {
+export const createLoaderManager = (initialDataMap, managerOptions = {}) => {
   const { skipStatic = false, skipNonStatic = false } = managerOptions;
   const loadersMap = /* @__PURE__ */ new Map();
   const getId = createGetId();
@@ -98,7 +100,9 @@ const createLoaderManager = (initialDataMap, managerOptions = {}) => {
       const skipExec = ignoreNonStatic || ignoreStatic;
       loader = createLoader(
         id,
-        typeof initialDataMap[id] !== "undefined" ? initialDataMap[id] : { data: loaderOptions.initialData },
+        typeof initialDataMap[id] !== "undefined" ? initialDataMap[id] : {
+          data: loaderOptions.initialData
+        },
         loaderFn,
         // Todo whether static loader is exec when CSR
         skipExec
@@ -122,17 +126,17 @@ const createLoaderManager = (initialDataMap, managerOptions = {}) => {
     for (const [id, loader] of loadersMap) {
       const { promise } = loader;
       if (promise instanceof Promise) {
-        pendingLoaders.push([id, loader]);
+        pendingLoaders.push([
+          id,
+          loader
+        ]);
       }
     }
     await Promise.all(pendingLoaders.map((item) => item[1].promise));
-    return pendingLoaders.reduce(
-      (res, [id, loader]) => {
-        res[id] = loader.result;
-        return res;
-      },
-      {}
-    );
+    return pendingLoaders.reduce((res, [id, loader]) => {
+      res[id] = loader.result;
+      return res;
+    }, {});
   };
   return {
     hasPendingLoaders,
@@ -141,7 +145,3 @@ const createLoaderManager = (initialDataMap, managerOptions = {}) => {
     get
   };
 };
-export {
-  LoaderStatus,
-  createLoaderManager
-};

package/dist/esm-node/core/loader/useLoader.js

@@ -1,15 +1,10 @@
-import {
-  useContext,
-  useRef,
-  useMemo,
-  useState,
-  useCallback,
-  useEffect
-} from "react";
+import { useContext, useRef, useMemo, useState, useCallback, useEffect } from "react";
 import invariant from "invariant";
 import { RuntimeReactContext } from "../../runtimeContext";
 import { LoaderStatus } from "./loaderManager";
-const useLoader = (loaderFn, options = { params: void 0 }) => {
+const useLoader = (loaderFn, options = {
+  params: void 0
+}) => {
   const context = useContext(RuntimeReactContext);
   const isSSRRender = Boolean(context.ssr);
   const { loaderManager } = context;
@@ -18,80 +13,71 @@ const useLoader = (loaderFn, options = { params: void 0 }) => {
   if (isSSRRender && Object.prototype.hasOwnProperty.call(options, "_cache")) {
     delete options._cache;
   }
-  const load = useCallback(
-    (params) => {
-      var _a, _b, _c, _d, _e, _f;
-      if (typeof params === "undefined") {
-        return (_a = loaderRef.current) == null ? void 0 : _a.load();
-      }
-      const id = loaderManager.add(
-        () => {
-          try {
-            const res2 = loaderFn(context, params);
-            if (res2 instanceof Promise) {
-              return res2;
-            }
-            return Promise.resolve(res2);
-          } catch (e) {
-            return Promise.reject(e);
-          }
-        },
-        {
-          ...options,
-          params
+  const load = useCallback((params) => {
+    var _unlistenLoaderChangeRef_current, _window__SSR_DATA_data_loadersData_id, _window__SSR_DATA, _window__SSR_DATA_data, _loaderRef_current;
+    if (typeof params === "undefined") {
+      var _loaderRef_current1;
+      return (_loaderRef_current1 = loaderRef.current) === null || _loaderRef_current1 === void 0 ? void 0 : _loaderRef_current1.load();
+    }
+    const id = loaderManager.add(() => {
+      try {
+        const res2 = loaderFn(context, params);
+        if (res2 instanceof Promise) {
+          return res2;
         }
-      );
-      loaderRef.current = loaderManager.get(id);
-      (_b = unlistenLoaderChangeRef.current) == null ? void 0 : _b.call(unlistenLoaderChangeRef);
-      if (isSSRRender) {
-        return void 0;
+        return Promise.resolve(res2);
+      } catch (e) {
+        return Promise.reject(e);
       }
-      if (options.skip) {
-        return void 0;
+    }, {
+      ...options,
+      params
+    });
+    loaderRef.current = loaderManager.get(id);
+    (_unlistenLoaderChangeRef_current = unlistenLoaderChangeRef.current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(unlistenLoaderChangeRef);
+    if (isSSRRender) {
+      return void 0;
+    }
+    if (options.skip) {
+      return void 0;
+    }
+    if (context._hydration && ((_window__SSR_DATA_data_loadersData_id = 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.loadersData[id]) === null || _window__SSR_DATA_data_loadersData_id === void 0 ? void 0 : _window__SSR_DATA_data_loadersData_id.error) === null) {
+      return void 0;
+    }
+    const res = loaderRef.current.load();
+    unlistenLoaderChangeRef.current = (_loaderRef_current = loaderRef.current) === null || _loaderRef_current === void 0 ? void 0 : _loaderRef_current.onChange((_status, _result) => {
+      setResult(_result);
+      if (_status === LoaderStatus.fulfilled) {
+        var _options_onSuccess;
+        options === null || options === void 0 ? void 0 : (_options_onSuccess = options.onSuccess) === null || _options_onSuccess === void 0 ? void 0 : _options_onSuccess.call(options, _result.data);
       }
-      if (context._hydration && ((_e = (_d = (_c = window == null ? void 0 : window._SSR_DATA) == null ? void 0 : _c.data) == null ? void 0 : _d.loadersData[id]) == null ? void 0 : _e.error) === null) {
-        return void 0;
+      if (_status === LoaderStatus.rejected) {
+        var _options_onError;
+        options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, _result.error);
       }
-      const res = loaderRef.current.load();
-      unlistenLoaderChangeRef.current = (_f = loaderRef.current) == null ? void 0 : _f.onChange(
-        (_status, _result) => {
-          var _a2, _b2;
-          setResult(_result);
-          if (_status === LoaderStatus.fulfilled) {
-            (_a2 = options == null ? void 0 : options.onSuccess) == null ? void 0 : _a2.call(options, _result.data);
-          }
-          if (_status === LoaderStatus.rejected) {
-            (_b2 = options == null ? void 0 : options.onError) == null ? void 0 : _b2.call(options, _result.error);
-          }
-        }
-      );
-      return res;
-    },
-    [options.skip]
-  );
-  useEffect(
-    () => () => {
-      var _a;
-      (_a = unlistenLoaderChangeRef.current) == null ? void 0 : _a.call(unlistenLoaderChangeRef);
-    },
-    []
-  );
+    });
+    return res;
+  }, [
+    options.skip
+  ]);
+  useEffect(() => {
+    return () => {
+      var _unlistenLoaderChangeRef_current;
+      (_unlistenLoaderChangeRef_current = unlistenLoaderChangeRef.current) === null || _unlistenLoaderChangeRef_current === void 0 ? void 0 : _unlistenLoaderChangeRef_current.call(unlistenLoaderChangeRef);
+    };
+  }, []);
   useMemo(() => {
-    var _a;
-    const p = (_a = options.params) != null ? _a : loaderFn.id;
-    invariant(
-      typeof p !== "undefined" && p !== null,
-      "Params is required in useLoader"
-    );
+    var _options_params;
+    const p = (_options_params = options.params) !== null && _options_params !== void 0 ? _options_params : loaderFn.id;
+    invariant(typeof p !== "undefined" && p !== null, "Params is required in useLoader");
     load(p);
-  }, [options.params]);
+  }, [
+    options.params
+  ]);
   const [result, setResult] = useState(loaderRef.current.result);
   return {
     ...result,
     reload: load
   };
 };
-var useLoader_default = useLoader;
-export {
-  useLoader_default as default
-};
+export default useLoader;

package/dist/esm-node/core/plugin.js

@@ -1,8 +1,4 @@
-import {
-  createManager,
-  createPipeline,
-  createAsyncPipeline
-} from "@modern-js/plugin";
+import { createManager, createPipeline, createAsyncPipeline } from "@modern-js/plugin";
 import { createLoaderManager } from "./loader/loaderManager";
 const hoc = createPipeline();
 const provide = createPipeline();
@@ -18,21 +14,19 @@ const runtimeHooks = {
   init,
   pickContext
 };
-const createRuntime = () => createManager(runtimeHooks);
+export const createRuntime = () => createManager(runtimeHooks);
 const registerInit = (App, _init) => {
   const originalInit = App.init;
   App.init = async (context) => {
     if (!context.loaderManager) {
       context.loaderManager = createLoaderManager({});
     }
-    await Promise.all([originalInit == null ? void 0 : originalInit(context), _init == null ? void 0 : _init(context)]);
+    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;
-export {
-  createPlugin,
-  createRuntime,
-  registerInit,
-  runtime
-};
+export const runtime = createRuntime();
+export const { createPlugin } = runtime;
+export { registerInit };

package/dist/esm-node/core/types.js

@@ -0,0 +1 @@
+export {};