@modern-js/runtime 2.4.1-alpha.1 → 2.5.0

package/dist/{js/node → cjs}/state/runtime/plugin.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -90,7 +73,9 @@ const state = (config) => ({
           return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react2.Provider, {
             store: context.store,
             config: storeConfig,
-            children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, __spreadValues({}, props))
+            children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+              ...props
+            })
           });
         };
         return next({
@@ -108,9 +93,10 @@ const state = (config) => ({
       pickContext({ context, pickedContext }, next) {
         return next({
           context,
-          pickedContext: __spreadProps(__spreadValues({}, pickedContext), {
+          pickedContext: {
+            ...pickedContext,
             store: context.store
-          })
+          }
         });
       }
     };

package/dist/{js/treeshaking → esm}/document/cli/index.js

@@ -390,4 +390,4 @@ var cli_default = function() {
         }()
     };
 };
-export { cli_default as default };
+export { cli_default as default, getDocumenByEntryName };

package/dist/{js/treeshaking → esm}/ssr/cli/index.js

@@ -118,9 +118,9 @@ var cli_default = function() {
                         },
                         tools: {
                             webpackChain: function(chain, param) {
-                                var name = param.name, isServer = param.isServer, isServiceWorker = param.isServiceWorker, CHAIN_ID = param.CHAIN_ID;
+                                var isServer = param.isServer, isServiceWorker = param.isServiceWorker, CHAIN_ID = param.CHAIN_ID;
                                 var userConfig = api.useResolvedConfigContext();
-                                if (isUseSSRBundle(userConfig) && name !== "server" && hasStringSSREntry(userConfig)) {
+                                if (isUseSSRBundle(userConfig) && !isServer && !isServiceWorker && hasStringSSREntry(userConfig)) {
                                     var LoadableWebpackPlugin = require("@loadable/webpack-plugin");
                                     chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableWebpackPlugin, [
                                         {

package/dist/{js/treeshaking → esm}/ssr/serverRender/renderToStream/renderToPipe.worker.js

@@ -213,31 +213,45 @@ function renderToPipe(rootElement, context, options) {
                         reader = readableOriginal.getReader();
                         injectableStream = new ReadableStream({
                             start: function start(controller) {
-                                return _asyncToGenerator(function() {
-                                    var value;
-                                    return __generator(this, function(_state) {
-                                        switch(_state.label){
-                                            case 0:
-                                                return [
-                                                    4,
-                                                    reader.read()
-                                                ];
-                                            case 1:
-                                                value = _state.sent().value;
-                                                if (isShellStream) {
-                                                    controller.enqueue(encodeForWebStream(shellBefore));
-                                                    controller.enqueue(value);
-                                                    controller.enqueue(encodeForWebStream(shellAfter));
-                                                    isShellStream = false;
-                                                } else {
-                                                    controller.enqueue(value);
-                                                }
-                                                return [
-                                                    2
-                                                ];
-                                        }
+                                function push() {
+                                    return _push.apply(this, arguments);
+                                }
+                                function _push() {
+                                    _push = _asyncToGenerator(function() {
+                                        var _ref, done, value;
+                                        return __generator(this, function(_state) {
+                                            switch(_state.label){
+                                                case 0:
+                                                    return [
+                                                        4,
+                                                        reader.read()
+                                                    ];
+                                                case 1:
+                                                    _ref = _state.sent(), done = _ref.done, value = _ref.value;
+                                                    if (done) {
+                                                        controller.close();
+                                                        return [
+                                                            2
+                                                        ];
+                                                    }
+                                                    if (isShellStream) {
+                                                        controller.enqueue(encodeForWebStream(shellBefore));
+                                                        controller.enqueue(value);
+                                                        controller.enqueue(encodeForWebStream(shellAfter));
+                                                        isShellStream = false;
+                                                    } else {
+                                                        controller.enqueue(value);
+                                                    }
+                                                    push();
+                                                    return [
+                                                        2
+                                                    ];
+                                            }
+                                        });
                                     });
-                                })();
+                                    return _push.apply(this, arguments);
+                                }
+                                push();
                             }
                         });
                         return [

package/dist/{js/modern → esm-node}/cli/index.js

@@ -1,23 +1,3 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 import path from "path";
 import { PLUGIN_SCHEMAS, cleanRequireCache, isReact18 } from "@modern-js/utils";
 import PluginState from "../state/cli";
@@ -55,14 +35,12 @@ var cli_default = () => ({
       validateSchema() {
         return PLUGIN_SCHEMAS["@modern-js/runtime"];
       },
-      beforeRestart() {
-        return __async(this, null, function* () {
-          cleanRequireCache([
-            require.resolve("../state/cli"),
-            require.resolve("../router/cli"),
-            require.resolve("../ssr/cli")
-          ]);
-        });
+      async beforeRestart() {
+        cleanRequireCache([
+          require.resolve("../state/cli"),
+          require.resolve("../router/cli"),
+          require.resolve("../ssr/cli")
+        ]);
       }
     };
   }

package/dist/{js/modern → esm-node}/core/compatible.js

@@ -1,51 +1,3 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 import { jsx } from "react/jsx-runtime";
 import React, { useContext, useMemo } from "react";
 import hoistNonReactStatics from "hoist-non-react-statics";
@@ -74,12 +26,12 @@ const createApp = ({ plugins }) => {
     const WrapperComponent = (props) => {
       const element = React.createElement(
         App || React.Fragment,
-        __spreadValues({}, props),
+        { ...props },
         props.children
       );
       const context = useContext(RuntimeReactContext);
       return runner.provide(
-        { element, props: __spreadValues({}, props), context },
+        { element, props: { ...props }, context },
         {
           onLast: ({ element: element2 }) => element2
         }
@@ -92,8 +44,7 @@ const createApp = ({ plugins }) => {
       { App: WrapperComponent },
       {
         onLast: ({ App: App2 }) => {
-          const WrapComponent = (_a) => {
-            var _b = _a, { context } = _b, props = __objRest(_b, ["context"]);
+          const WrapComponent = ({ context, ...props }) => {
             let contextValue = context;
             if (!(contextValue == null ? void 0 : contextValue.runner)) {
               contextValue = getInitialContext(runner);
@@ -101,15 +52,17 @@ const createApp = ({ plugins }) => {
                 { context: contextValue },
                 {
                   onLast: ({ context: context1 }) => {
-                    var _a2;
-                    return (_a2 = App2 == null ? void 0 : App2.init) == null ? void 0 : _a2.call(App2, context1);
+                    var _a;
+                    return (_a = App2 == null ? void 0 : App2.init) == null ? void 0 : _a.call(App2, context1);
                   }
                 }
               );
             }
             return /* @__PURE__ */ jsx(RuntimeReactContext.Provider, {
               value: contextValue,
-              children: /* @__PURE__ */ jsx(App2, __spreadValues({}, props))
+              children: /* @__PURE__ */ jsx(App2, {
+                ...props
+              })
             });
           };
           return hoistNonReactStatics(WrapComponent, App2);
@@ -120,7 +73,7 @@ const createApp = ({ plugins }) => {
     return HOCApp;
   };
 };
-const bootstrap = (BootApp, id, root, ReactDOM) => __async(void 0, null, function* () {
+const bootstrap = async (BootApp, id, root, ReactDOM) => {
   var _a, _b;
   let App = BootApp;
   let runner = runnerMap.get(App);
@@ -159,13 +112,14 @@ const bootstrap = (BootApp, id, root, ReactDOM) => __async(void 0, null, functio
         },
         {}
       );
-      Object.assign(context, __spreadValues({
+      Object.assign(context, {
         loaderManager: createLoaderManager(initialLoadersState, {
           skipStatic: true
-        })
-      }, ssrData ? { ssrContext: ssrData == null ? void 0 : ssrData.context } : {}));
+        }),
+        ...ssrData ? { ssrContext: ssrData == null ? void 0 : ssrData.context } : {}
+      });
       context.initialData = (_b = ssrData == null ? void 0 : ssrData.data) == null ? void 0 : _b.initialData;
-      const initialData = yield runInit(context);
+      const initialData = await runInit(context);
       if (initialData) {
         context.initialData = initialData;
       }
@@ -256,7 +210,7 @@ const bootstrap = (BootApp, id, root, ReactDOM) => __async(void 0, null, functio
       }
       return false;
     };
-    const initialData = yield runInit(context);
+    const initialData = await runInit(context);
     if (!isRedirectResponse(initialData)) {
       context.initialData = initialData;
       return runner.server({
@@ -265,7 +219,7 @@ const bootstrap = (BootApp, id, root, ReactDOM) => __async(void 0, null, functio
       });
     }
   }
-});
+};
 const useRuntimeContext = () => {
   const context = useContext(RuntimeReactContext);
   const memoizedContext = useMemo(

package/dist/{js/modern → esm-node}/core/loader/loaderManager.js

@@ -1,23 +1,3 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 import invariant from "invariant";
 const createGetId = () => {
   const idCache = /* @__PURE__ */ new Map();
@@ -50,7 +30,7 @@ const createLoader = (id, initialData = {
   let { data, error } = initialData;
   let hasLoaded = false;
   const handlers = /* @__PURE__ */ new Set();
-  const load = () => __async(void 0, null, function* () {
+  const load = async () => {
     if (skip) {
       return promise;
     }
@@ -73,7 +53,7 @@ const createLoader = (id, initialData = {
       notify();
     });
     return promise;
-  });
+  };
   const getResult = () => ({
     loading: !hasLoaded && status === 1 /* loading */,
     reloading: hasLoaded && status === 1 /* loading */,
@@ -135,7 +115,7 @@ const createLoaderManager = (initialDataMap, managerOptions = {}) => {
     }
     return false;
   };
-  const awaitPendingLoaders = () => __async(void 0, null, function* () {
+  const awaitPendingLoaders = async () => {
     const pendingLoaders = [];
     for (const [id, loader] of loadersMap) {
       const { promise } = loader;
@@ -143,7 +123,7 @@ const createLoaderManager = (initialDataMap, managerOptions = {}) => {
         pendingLoaders.push([id, loader]);
       }
     }
-    yield Promise.all(pendingLoaders.map((item) => item[1].promise));
+    await Promise.all(pendingLoaders.map((item) => item[1].promise));
     return pendingLoaders.reduce(
       (res, [id, loader]) => {
         res[id] = loader.result;
@@ -151,7 +131,7 @@ const createLoaderManager = (initialDataMap, managerOptions = {}) => {
       },
       {}
     );
-  });
+  };
   return {
     hasPendingLoaders,
     awaitPendingLoaders,