@modern-js/runtime 2.0.0-beta.3 → 2.0.0-beta.5

package/dist/js/treeshaking/router/runtime/plugin.node.js

@@ -1,166 +1,389 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useContext } from 'react';
-import { unstable_createStaticHandler as createStaticHandler } from '@remix-run/router';
-import { unstable_createStaticRouter as createStaticRouter, unstable_StaticRouterProvider as StaticRouterProvider } from 'react-router-dom/server';
-import hoistNonReactStatics from 'hoist-non-react-statics';
-import { installGlobals } from '@remix-run/node';
-import { createRoutesFromElements } from 'react-router-dom';
+function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _arrayWithHoles(arr) {
+    if (Array.isArray(arr)) return arr;
+}
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+function _defineProperty(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
+function _iterableToArrayLimit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
+    }
+    return _arr;
+}
+function _nonIterableRest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _objectSpreadProps(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+function _slicedToArray(arr, i) {
+    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import { jsx } from "react/jsx-runtime";
+import { useContext } from "react";
+import { unstable_createStaticHandler as createStaticHandler } from "@remix-run/router";
+import { unstable_createStaticRouter as createStaticRouter, unstable_StaticRouterProvider as StaticRouterProvider } from "react-router-dom/server";
+import hoistNonReactStatics from "hoist-non-react-statics";
+import { installGlobals } from "@remix-run/node";
+import { createRoutesFromElements } from "react-router-dom";
 import { RuntimeReactContext } from "../../core";
 import { renderRoutes, urlJoin } from "./utils";
-
-// Polyfill Web Fetch API
-import { jsx as _jsx } from "react/jsx-runtime";
 installGlobals();
-
-// TODO: polish
 function createFetchRequest(req) {
-  // const origin = `${req.protocol}://${req.get('host')}`;
-  var origin = "".concat(req.protocol, "://").concat(req.host);
-  // Note: This had to take originalUrl into account for presumably vite's proxying
-  var url = new URL(req.originalUrl || req.url, origin);
-  var controller = new AbortController();
-
-  // req.on('close', () => {
-  //   controller.abort();
-  // });
-
-  var init = {
-    method: req.method,
-    headers: createFetchHeaders(req.headers),
-    signal: controller.signal
-  };
-
-  // if (req.method !== 'GET' && req.method !== 'HEAD') {
-  //   init.body = req.body;
-  // }
-
-  return new Request(url.href, init);
+    var origin = "".concat(req.protocol, "://").concat(req.host);
+    var url = new URL(req.originalUrl || req.url, origin);
+    var controller = new AbortController();
+    var init = {
+        method: req.method,
+        headers: createFetchHeaders(req.headers),
+        signal: controller.signal
+    };
+    return new Request(url.href, init);
 }
-export function createFetchHeaders(requestHeaders) {
-  var headers = new Headers();
-  for (var _i = 0, _Object$entries = Object.entries(requestHeaders); _i < _Object$entries.length; _i++) {
-    var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-      key = _Object$entries$_i[0],
-      values = _Object$entries$_i[1];
-    if (values) {
-      if (Array.isArray(values)) {
-        var _iterator = _createForOfIteratorHelper(values),
-          _step;
+function createFetchHeaders(requestHeaders) {
+    var headers = new Headers();
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = Object.entries(requestHeaders)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var _value = _slicedToArray(_step.value, 2), key = _value[0], values = _value[1];
+            if (values) {
+                if (Array.isArray(values)) {
+                    var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+                    try {
+                        for(var _iterator1 = values[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                            var value = _step1.value;
+                            headers.append(key, value);
+                        }
+                    } catch (err) {
+                        _didIteratorError1 = true;
+                        _iteratorError1 = err;
+                    } finally{
+                        try {
+                            if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                                _iterator1.return();
+                            }
+                        } finally{
+                            if (_didIteratorError1) {
+                                throw _iteratorError1;
+                            }
+                        }
+                    }
+                } else {
+                    headers.set(key, values);
+                }
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
         try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var value = _step.value;
-            headers.append(key, value);
-          }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
         }
-      } else {
-        headers.set(key, values);
-      }
     }
-  }
-  return headers;
+    return headers;
 }
-export var routerPlugin = function routerPlugin(_ref) {
-  var _ref$basename = _ref.basename,
-    basename = _ref$basename === void 0 ? '' : _ref$basename,
-    routesConfig = _ref.routesConfig,
-    createRoutes = _ref.createRoutes;
-  return {
-    name: '@modern-js/plugin-router',
-    setup: function setup() {
-      return {
-        init: function init(_ref2, next) {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-            var context, _ref3, request, baseUrl, _basename, routes, _createStaticHandler, query, remixRequest, routerContext, router;
-            return _regeneratorRuntime().wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                    context = _ref2.context;
-                    if (!(!routesConfig && !createRoutes)) {
-                      _context.next = 3;
-                      break;
+var routerPlugin = function(param) {
+    var _basename = param.basename, basename = _basename === void 0 ? "" : _basename, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
+    return {
+        name: "@modern-js/plugin-router",
+        setup: function() {
+            return {
+                init: function init(param, next) {
+                    var context = param.context;
+                    return _asyncToGenerator(function() {
+                        var request, baseUrl, _basename, routes, query, remixRequest, routerContext, router;
+                        return __generator(this, function(_state) {
+                            switch(_state.label){
+                                case 0:
+                                    if (!routesConfig && !createRoutes) {
+                                        return [
+                                            2,
+                                            next({
+                                                context: context
+                                            })
+                                        ];
+                                    }
+                                    request = context.ssrContext.request;
+                                    baseUrl = request.baseUrl;
+                                    _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
+                                    routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes(routesConfig));
+                                    query = createStaticHandler(routes, {
+                                        basename: _basename
+                                    }).query;
+                                    remixRequest = createFetchRequest(request);
+                                    return [
+                                        4,
+                                        query(remixRequest)
+                                    ];
+                                case 1:
+                                    routerContext = _state.sent();
+                                    if (_instanceof(routerContext, Response)) {
+                                        return [
+                                            2,
+                                            routerContext
+                                        ];
+                                    }
+                                    router = createStaticRouter(routes, routerContext);
+                                    context.router = router;
+                                    context.routerContext = routerContext;
+                                    context.routes = routes;
+                                    context.routeManifest = context.ssrContext.routeManifest;
+                                    return [
+                                        2,
+                                        next({
+                                            context: context
+                                        })
+                                    ];
+                            }
+                        });
+                    })();
+                },
+                hoc: function(param, next) {
+                    var App = param.App;
+                    if (!routesConfig) {
+                        return next({
+                            App: App
+                        });
                     }
-                    return _context.abrupt("return", next({
-                      context: context
-                    }));
-                  case 3:
-                    _ref3 = context.ssrContext, request = _ref3.request;
-                    baseUrl = request.baseUrl;
-                    _basename = baseUrl === '/' ? urlJoin(baseUrl, basename) : baseUrl;
-                    routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes(routesConfig));
-                    _createStaticHandler = createStaticHandler(routes, {
-                      basename: _basename
-                    }), query = _createStaticHandler.query;
-                    remixRequest = createFetchRequest(request);
-                    _context.next = 11;
-                    return query(remixRequest);
-                  case 11:
-                    routerContext = _context.sent;
-                    if (!(routerContext instanceof Response)) {
-                      _context.next = 14;
-                      break;
+                    var getRouteApp = function() {
+                        return function(props) {
+                            var ref = useContext(RuntimeReactContext), router = ref.router, routerContext = ref.routerContext;
+                            return /* @__PURE__ */ jsx(App, _objectSpreadProps(_objectSpread({}, props), {
+                                children: /* @__PURE__ */ jsx(StaticRouterProvider, {
+                                    router: router,
+                                    context: routerContext,
+                                    nonce: "the-nonce"
+                                })
+                            }));
+                        };
+                    };
+                    var RouteApp = getRouteApp();
+                    if (routesConfig === null || routesConfig === void 0 ? void 0 : routesConfig.globalApp) {
+                        return next({
+                            App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
+                        });
                     }
-                    return _context.abrupt("return", routerContext);
-                  case 14:
-                    router = createStaticRouter(routes, routerContext);
-                    context.router = router;
-                    context.routerContext = routerContext;
-                    context.routes = routes;
-                    // set routeManifest in context to be consistent with csr context
-                    context.routeManifest = context.ssrContext.routeManifest;
-                    return _context.abrupt("return", next({
-                      context: context
-                    }));
-                  case 20:
-                  case "end":
-                    return _context.stop();
+                    return next({
+                        App: RouteApp
+                    });
                 }
-              }
-            }, _callee);
-          }))();
-        },
-        hoc: function hoc(_ref4, next) {
-          var App = _ref4.App;
-          // can not get routes config, skip wrapping React Router.
-          // e.g. App.tsx as the entrypoint
-          if (!routesConfig) {
-            return next({
-              App: App
-            });
-          }
-          var getRouteApp = function getRouteApp() {
-            return function (props) {
-              var _useContext = useContext(RuntimeReactContext),
-                router = _useContext.router,
-                routerContext = _useContext.routerContext;
-              return /*#__PURE__*/_jsx(App, _objectSpread(_objectSpread({}, props), {}, {
-                children: /*#__PURE__*/_jsx(StaticRouterProvider, {
-                  router: router,
-                  context: routerContext,
-                  nonce: "the-nonce"
-                })
-              }));
             };
-          };
-          var RouteApp = getRouteApp();
-          if (routesConfig !== null && routesConfig !== void 0 && routesConfig.globalApp) {
-            return next({
-              App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
-            });
-          }
-          return next({
-            App: RouteApp
-          });
         }
-      };
-    }
-  };
-};
+    };
+};
+export { createFetchHeaders, routerPlugin };

package/dist/js/treeshaking/router/runtime/root/index.js

@@ -1,17 +1,19 @@
-import React, { useContext, useEffect } from 'react';
-import { useLocation } from 'react-router-dom';
+import { Fragment, jsx } from "react/jsx-runtime";
+import { useContext, useEffect } from "react";
+import { useLocation } from "react-router-dom";
 import { RuntimeReactContext } from "../../../core";
 import { handleLoad } from "./load";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsx as _jsx } from "react/jsx-runtime";
-export function RootLayout(props) {
-  var location = useLocation();
-  var context = useContext(RuntimeReactContext);
-  useEffect(function () {
-    var routes = props.routes;
-    handleLoad(routes, location, context.routeManifest);
-  }, [location]);
-  return /*#__PURE__*/_jsx(_Fragment, {
-    children: props.children
-  });
-}
+function RootLayout(props) {
+    var location = useLocation();
+    var context = useContext(RuntimeReactContext);
+    useEffect(function() {
+        var routes = props.routes;
+        handleLoad(routes, location, context.routeManifest);
+    }, [
+        location
+    ]);
+    return /* @__PURE__ */ jsx(Fragment, {
+        children: props.children
+    });
+}
+export { RootLayout };