@modern-js/runtime 2.4.1-beta.0 → 2.5.0

package/dist/{js/node → cjs}/ssr/utils.js

@@ -1,21 +1,7 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -45,11 +31,12 @@ const formatServer = (request) => {
     "user-agent": userAgent = "",
     referer
   } = request.headers || {};
-  return __spreadValues({
+  return {
     cookie,
     userAgent,
-    referer
-  }, request);
+    referer,
+    ...request
+  };
 };
 const getQuery = () => window.location.search.substring(1).split("&").reduce((res, item) => {
   const [key, value] = item.split("=");

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}/router/runtime/plugin.node.js

@@ -227,9 +227,10 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import { jsx } from "react/jsx-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
 import { useContext } from "react";
-import { createStaticHandler } from "@remix-run/router";
+import serialize from "serialize-javascript";
+import { createStaticHandler, isRouteErrorResponse } from "@remix-run/router";
 import { createStaticRouter, StaticRouterProvider } from "react-router-dom/server";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { createRoutesFromElements } from "react-router-dom";
@@ -297,6 +298,45 @@ function createFetchHeaders(requestHeaders) {
     }
     return headers;
 }
+function serializeErrors(errors) {
+    if (!errors) {
+        return null;
+    }
+    var entries = Object.entries(errors);
+    var serialized = {};
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = entries[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var _step_value = _slicedToArray(_step.value, 2), key = _step_value[0], val = _step_value[1];
+            if (isRouteErrorResponse(val)) {
+                serialized[key] = _objectSpreadProps(_objectSpread({}, val), {
+                    __type: "RouteErrorResponse"
+                });
+            } else if (_instanceof(val, Error)) {
+                serialized[key] = {
+                    message: val.message,
+                    __type: "Error"
+                };
+            } else {
+                serialized[key] = val;
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return serialized;
+}
 var routerPlugin = function(param) {
     var _param_basename = param.basename, basename = _param_basename === void 0 ? "" : _param_basename, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
     return {
@@ -363,12 +403,29 @@ var routerPlugin = function(param) {
                     var getRouteApp = function() {
                         return function(props) {
                             var _useContext = useContext(RuntimeReactContext), router = _useContext.router, routerContext = _useContext.routerContext;
-                            return /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
-                                children: /* @__PURE__ */ jsx(StaticRouterProvider, {
-                                    router: router,
-                                    context: routerContext,
-                                    nonce: "the-nonce"
-                                })
+                            var data = {
+                                loaderData: routerContext.loaderData,
+                                actionData: routerContext.actionData,
+                                errors: serializeErrors(routerContext.errors)
+                            };
+                            var hydrateScript = "window.__staticRouterHydrationData = ".concat(serialize(data, {
+                                isJSON: true
+                            }), ";");
+                            return /* @__PURE__ */ jsxs(App, _objectSpreadProps(_objectSpread({}, props), {
+                                children: [
+                                    /* @__PURE__ */ jsx(StaticRouterProvider, {
+                                        router: router,
+                                        context: routerContext,
+                                        hydrate: false
+                                    }),
+                                    /* @__PURE__ */ jsx("script", {
+                                        suppressHydrationWarning: true,
+                                        id: "the-nonce",
+                                        dangerouslySetInnerHTML: {
+                                            __html: hydrateScript
+                                        }
+                                    })
+                                ]
                             }));
                         };
                     };

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")
+        ]);
       }
     };
   }