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

package/dist/js/treeshaking/ssr/index.node.js

@@ -1,72 +1,240 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+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 _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;
+}
+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 { formatServer } from "./utils";
 import render from "./serverRender";
-export var ssr = function ssr() {
-  var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return {
-    name: '@modern-js/plugin-ssr',
-    setup: function setup() {
-      return {
-        server: function () {
-          var _server = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-            var App, context, html;
-            return _regeneratorRuntime().wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                    App = _ref.App, context = _ref.context;
-                    _context.next = 3;
-                    return render({
-                      context: context,
-                      App: App,
-                      config: config
+var ssr = function() {
+    var config = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+    return {
+        name: "@modern-js/plugin-ssr",
+        setup: function() {
+            return {
+                server: function() {
+                    var _ref = _asyncToGenerator(function(param) {
+                        var App, context, html;
+                        return __generator(this, function(_state) {
+                            switch(_state.label){
+                                case 0:
+                                    App = param.App, context = param.context;
+                                    return [
+                                        4,
+                                        render({
+                                            context: context,
+                                            App: App,
+                                            config: config
+                                        })
+                                    ];
+                                case 1:
+                                    html = _state.sent();
+                                    return [
+                                        2,
+                                        html
+                                    ];
+                            }
+                        });
+                    });
+                    return function(_) {
+                        return _ref.apply(this, arguments);
+                    };
+                }(),
+                init: function init(param, next) {
+                    var context = param.context;
+                    var request = context.ssrContext.request;
+                    context.ssrContext.request = formatServer(request);
+                    return next({
+                        context: context
+                    });
+                },
+                pickContext: function(param, next) {
+                    var context = param.context, pickedContext = param.pickedContext;
+                    var ref = context === null || context === void 0 ? void 0 : context.ssrContext, request = ref.request, response = ref.response;
+                    var initialData = context.initialData;
+                    return next({
+                        context: context,
+                        pickedContext: _objectSpreadProps(_objectSpread({}, pickedContext), {
+                            initialData: initialData,
+                            request: request,
+                            response: response
+                        })
                     });
-                  case 3:
-                    html = _context.sent;
-                    return _context.abrupt("return", html);
-                  case 5:
-                  case "end":
-                    return _context.stop();
                 }
-              }
-            }, _callee);
-          }));
-          function server(_x) {
-            return _server.apply(this, arguments);
-          }
-          return server;
-        }(),
-        init: function init(_ref2, next) {
-          var context = _ref2.context;
-          var _ref3 = context.ssrContext,
-            request = _ref3.request;
-          context.ssrContext.request = formatServer(request);
-          return next({
-            context: context
-          });
-        },
-        pickContext: function pickContext(_ref4, next) {
-          var context = _ref4.context,
-            pickedContext = _ref4.pickedContext;
-          // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
-          var _ref5 = context === null || context === void 0 ? void 0 : context.ssrContext,
-            request = _ref5.request,
-            response = _ref5.response;
-          var initialData = context.initialData;
-          return next({
-            context: context,
-            pickedContext: _objectSpread(_objectSpread({}, pickedContext), {}, {
-              initialData: initialData,
-              request: request,
-              response: response
-            })
-          });
+            };
         }
-      };
-    }
-  };
+    };
 };
-export default ssr;
-export * from "./react";
+var index_node_default = ssr;
+export * from "./react";
+export { index_node_default as default, ssr };

package/dist/js/treeshaking/ssr/prefetch.js

@@ -1,82 +1,199 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import { renderToStaticMarkup } from 'react-dom/server';
-import { run } from '@modern-js/utils/ssr';
-import { ChunkExtractor } from '@loadable/server';
-import { jsx as _jsx } from "react/jsx-runtime";
-// todo: SSRContext
-var prefetch = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(App, context) {
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            return _context2.abrupt("return", run(context.ssrContext.request.headers, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-              var _context$store;
-              var ssrContext, _ref3, loadableStats, extractor, loadersData;
-              return _regeneratorRuntime().wrap(function _callee$(_context) {
-                while (1) {
-                  switch (_context.prev = _context.next) {
-                    case 0:
-                      ssrContext = context.ssrContext;
-                      _ref3 = ssrContext, loadableStats = _ref3.loadableStats;
-                      if (loadableStats) {
-                        extractor = new ChunkExtractor({
-                          stats: loadableStats,
-                          entrypoints: [ssrContext.entryName].filter(Boolean)
-                        });
-                        renderToStaticMarkup(extractor.collectChunks( /*#__PURE__*/_jsx(App, {
-                          context: context
-                        })));
-                      } else {
-                        renderToStaticMarkup( /*#__PURE__*/_jsx(App, {
-                          context: context
-                        }));
-                      }
-                      if (context.loaderManager.hasPendingLoaders()) {
-                        _context.next = 5;
+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);
+        });
+    };
+}
+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;
-                      }
-                      return _context.abrupt("return", {
-                        initialData: context.initialData,
-                        i18nData: context.__i18nData__
-                      });
-                    case 5:
-                      _context.next = 7;
-                      return context.loaderManager.awaitPendingLoaders();
-                    case 7:
-                      loadersData = _context.sent;
-                      Object.keys(loadersData).forEach(function (id) {
-                        var data = loadersData[id];
-                        if (data._error) {
-                          ssrContext.logger.error('App Prefetch Loader', data._error);
-                          ssrContext.metrics.emitCounter('app.prefetch.loader.error', 1);
-                          delete data._error;
-                        }
-                      });
-                      return _context.abrupt("return", {
-                        loadersData: loadersData,
-                        initialData: context.initialData,
-                        i18nData: context.__i18nData__,
-                        // todo: move to plugin state
-                        storeState: context === null || context === void 0 ? void 0 : (_context$store = context.store) === null || _context$store === void 0 ? void 0 : _context$store.getState()
-                      });
-                    case 10:
-                    case "end":
-                      return _context.stop();
-                  }
-                }
-              }, _callee);
-            }))));
-          case 1:
-          case "end":
-            return _context2.stop();
+                    }
+                    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;
         }
-      }
-    }, _callee2);
-  }));
-  return function prefetch(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import { jsx } from "react/jsx-runtime";
+import { renderToStaticMarkup } from "react-dom/server";
+import { run } from "@modern-js/utils/ssr";
+import { ChunkExtractor } from "@loadable/server";
+var prefetch = function() {
+    var _ref = _asyncToGenerator(function(App, context) {
+        return __generator(this, function(_state) {
+            return [
+                2,
+                run(context.ssrContext.request.headers, /*#__PURE__*/ _asyncToGenerator(function() {
+                    var ref, ssrContext, loadableStats, extractor, loadersData;
+                    return __generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                ssrContext = context.ssrContext;
+                                loadableStats = ssrContext.loadableStats;
+                                if (loadableStats) {
+                                    extractor = new ChunkExtractor({
+                                        stats: loadableStats,
+                                        entrypoints: [
+                                            ssrContext.entryName
+                                        ].filter(Boolean)
+                                    });
+                                    renderToStaticMarkup(extractor.collectChunks(/* @__PURE__ */ jsx(App, {
+                                        context: context
+                                    })));
+                                } else {
+                                    renderToStaticMarkup(/* @__PURE__ */ jsx(App, {
+                                        context: context
+                                    }));
+                                }
+                                if (!context.loaderManager.hasPendingLoaders()) {
+                                    return [
+                                        2,
+                                        {
+                                            initialData: context.initialData,
+                                            i18nData: context.__i18nData__
+                                        }
+                                    ];
+                                }
+                                return [
+                                    4,
+                                    context.loaderManager.awaitPendingLoaders()
+                                ];
+                            case 1:
+                                loadersData = _state.sent();
+                                Object.keys(loadersData).forEach(function(id) {
+                                    var data = loadersData[id];
+                                    if (data._error) {
+                                        ssrContext.logger.error("App Prefetch Loader", data._error);
+                                        ssrContext.metrics.emitCounter("app.prefetch.loader.error", 1);
+                                        delete data._error;
+                                    }
+                                });
+                                return [
+                                    2,
+                                    {
+                                        loadersData: loadersData,
+                                        initialData: context.initialData,
+                                        i18nData: context.__i18nData__,
+                                        storeState: context === null || context === void 0 ? void 0 : (ref = context.store) === null || ref === void 0 ? void 0 : ref.getState()
+                                    }
+                                ];
+                        }
+                    });
+                }))
+            ];
+        });
+    });
+    return function prefetch(App, context) {
+        return _ref.apply(this, arguments);
+    };
 }();
-export default prefetch;
+var prefetch_default = prefetch;
+export { prefetch_default as default };

package/dist/js/treeshaking/ssr/react/index.js

@@ -1,2 +1,3 @@
-export { PreRender } from "./prerender";
-export { NoSSR } from "./nossr";
+import { PreRender } from "./prerender";
+import { NoSSR } from "./nossr";
+export { NoSSR, PreRender };

package/dist/js/treeshaking/ssr/react/nossr/index.js

@@ -1,15 +1,58 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useEffect, useState } from 'react';
+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 _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 _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);
+}
+import React, { useEffect, useState } from "react";
 var csr = false;
-export var NoSSR = function NoSSR(props) {
-  var _useState = useState(csr),
-    _useState2 = _slicedToArray(_useState, 2),
-    isMounted = _useState2[0],
-    setMounted = _useState2[1];
-  useEffect(function () {
-    csr = true;
-    setMounted(true);
-  });
-  var children = props.children;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, isMounted ? children : null);
-};
+var NoSSR = function(props) {
+    var ref = _slicedToArray(useState(csr), 2), isMounted = ref[0], setMounted = ref[1];
+    useEffect(function() {
+        csr = true;
+        setMounted(true);
+    });
+    var children = props.children;
+    return React.createElement(React.Fragment, null, isMounted ? children : null);
+};
+export { NoSSR };