npm - @modern-js/prod-server - Versions diffs - 2.0.0-beta.0 → 2.0.0-beta.2 - Mend

@modern-js/prod-server 2.0.0-beta.0 → 2.0.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (113) hide show

package/CHANGELOG.md +110 -0
package/dist/js/modern/constants.js +0 -2
package/dist/js/modern/index.js +0 -1
package/dist/js/modern/libs/context/context.js +10 -56
package/dist/js/modern/libs/hook-api/index.js +0 -31
package/dist/js/modern/libs/hook-api/route.js +0 -8
package/dist/js/modern/libs/hook-api/template.js +0 -16
package/dist/js/modern/libs/loadConfig.js +3 -10
package/dist/js/modern/libs/metrics.js +6 -6
package/dist/js/modern/libs/proxy.js +7 -12
package/dist/js/modern/libs/render/cache/__tests__/cache.fun.test.js +0 -1
package/dist/js/modern/libs/render/cache/__tests__/cache.test.js +0 -9
package/dist/js/modern/libs/render/cache/index.js +8 -16
package/dist/js/modern/libs/render/cache/page-caches/lru.js +0 -10
package/dist/js/modern/libs/render/cache/spr.js +12 -62
package/dist/js/modern/libs/render/cache/util.js +0 -6
package/dist/js/modern/libs/render/index.js +6 -11
package/dist/js/modern/libs/render/measure.js +1 -11
package/dist/js/modern/libs/render/modern/index.js +2 -13
package/dist/js/modern/libs/render/reader.js +13 -24
package/dist/js/modern/libs/render/ssr.js +5 -6
package/dist/js/modern/libs/render/static.js +6 -9
package/dist/js/modern/libs/render/type.js +0 -1
package/dist/js/modern/libs/route/index.js +8 -19
package/dist/js/modern/libs/route/matcher.js +21 -29
package/dist/js/modern/libs/route/route.js +0 -13
package/dist/js/modern/libs/serve-file.js +5 -6
package/dist/js/modern/server/index.js +25 -52
package/dist/js/modern/server/modern-server-split.js +0 -11
package/dist/js/modern/server/modern-server.js +87 -167
package/dist/js/modern/utils.js +12 -27
package/dist/js/modern/worker-server.js +34 -0
package/dist/js/node/constants.js +0 -2
package/dist/js/node/index.js +0 -10
package/dist/js/node/libs/context/context.js +10 -65
package/dist/js/node/libs/context/index.js +0 -3
package/dist/js/node/libs/hook-api/index.js +0 -42
package/dist/js/node/libs/hook-api/route.js +0 -10
package/dist/js/node/libs/hook-api/template.js +0 -22
package/dist/js/node/libs/loadConfig.js +3 -22
package/dist/js/node/libs/metrics.js +6 -6
package/dist/js/node/libs/proxy.js +7 -17
package/dist/js/node/libs/render/cache/__tests__/cache.fun.test.js +0 -5
package/dist/js/node/libs/render/cache/__tests__/cache.test.js +0 -12
package/dist/js/node/libs/render/cache/index.js +8 -22
package/dist/js/node/libs/render/cache/page-caches/index.js +0 -2
package/dist/js/node/libs/render/cache/page-caches/lru.js +0 -14
package/dist/js/node/libs/render/cache/spr.js +12 -71
package/dist/js/node/libs/render/cache/util.js +0 -18
package/dist/js/node/libs/render/index.js +6 -26
package/dist/js/node/libs/render/measure.js +0 -17
package/dist/js/node/libs/render/modern/index.js +2 -20
package/dist/js/node/libs/render/reader.js +12 -39
package/dist/js/node/libs/render/ssr.js +4 -16
package/dist/js/node/libs/render/static.js +6 -18
package/dist/js/node/libs/render/type.js +0 -1
package/dist/js/node/libs/route/index.js +8 -22
package/dist/js/node/libs/route/matcher.js +18 -34
package/dist/js/node/libs/route/route.js +0 -15
package/dist/js/node/libs/serve-file.js +5 -13
package/dist/js/node/server/index.js +25 -72
package/dist/js/node/server/modern-server-split.js +0 -13
package/dist/js/node/server/modern-server.js +87 -196
package/dist/js/node/utils.js +13 -52
package/dist/js/node/worker-server.js +41 -0
package/dist/js/treeshaking/constants.js +28 -0
package/dist/js/treeshaking/index.js +13 -0
package/dist/js/treeshaking/libs/context/context.js +243 -0
package/dist/js/treeshaking/libs/context/index.js +5 -0
package/dist/js/treeshaking/libs/hook-api/index.js +157 -0
package/dist/js/treeshaking/libs/hook-api/route.js +33 -0
package/dist/js/treeshaking/libs/hook-api/template.js +91 -0
package/dist/js/treeshaking/libs/loadConfig.js +39 -0
package/dist/js/treeshaking/libs/metrics.js +12 -0
package/dist/js/treeshaking/libs/proxy.js +80 -0
package/dist/js/treeshaking/libs/render/cache/__tests__/cache.fun.test.js +124 -0
package/dist/js/treeshaking/libs/render/cache/__tests__/cache.test.js +464 -0
package/dist/js/treeshaking/libs/render/cache/__tests__/cacheable.js +53 -0
package/dist/js/treeshaking/libs/render/cache/__tests__/error-configuration.js +35 -0
package/dist/js/treeshaking/libs/render/cache/__tests__/matched-cache.js +121 -0
package/dist/js/treeshaking/libs/render/cache/index.js +184 -0
package/dist/js/treeshaking/libs/render/cache/page-caches/index.js +30 -0
package/dist/js/treeshaking/libs/render/cache/page-caches/lru.js +46 -0
package/dist/js/treeshaking/libs/render/cache/spr.js +362 -0
package/dist/js/treeshaking/libs/render/cache/type.js +1 -0
package/dist/js/treeshaking/libs/render/cache/util.js +101 -0
package/dist/js/treeshaking/libs/render/index.js +100 -0
package/dist/js/treeshaking/libs/render/measure.js +61 -0
package/dist/js/treeshaking/libs/render/modern/browser-list.js +7 -0
package/dist/js/treeshaking/libs/render/modern/index.js +39 -0
package/dist/js/treeshaking/libs/render/reader.js +191 -0
package/dist/js/treeshaking/libs/render/ssr.js +98 -0
package/dist/js/treeshaking/libs/render/static.js +84 -0
package/dist/js/treeshaking/libs/render/type.js +6 -0
package/dist/js/treeshaking/libs/route/index.js +94 -0
package/dist/js/treeshaking/libs/route/matcher.js +113 -0
package/dist/js/treeshaking/libs/route/route.js +26 -0
package/dist/js/treeshaking/libs/serve-file.js +75 -0
package/dist/js/treeshaking/server/index.js +339 -0
package/dist/js/treeshaking/server/modern-server-split.js +152 -0
package/dist/js/treeshaking/server/modern-server.js +946 -0
package/dist/js/treeshaking/type.js +1 -0
package/dist/js/treeshaking/utils.js +90 -0
package/dist/js/treeshaking/worker-server.js +56 -0
package/dist/types/index.d.ts +0 -2
package/dist/types/libs/context/context.d.ts +0 -3
package/dist/types/libs/loadConfig.d.ts +0 -1
package/dist/types/libs/render/cache/index.d.ts +0 -2
package/dist/types/libs/render/cache/spr.d.ts +0 -2
package/dist/types/server/index.d.ts +0 -3
package/dist/types/utils.d.ts +2 -3
package/dist/types/worker-server.d.ts +16 -0
package/package.json +31 -15

package/dist/js/treeshaking/libs/hook-api/template.js ADDED Viewed

@@ -0,0 +1,91 @@
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import { Transform } from 'stream';
+var RegList = {
+  before: {
+    head: '<head>',
+    body: '<body>'
+  },
+  after: {
+    head: '</head>',
+    body: '</body>'
+  }
+};
+export var TemplateAPI = /*#__PURE__*/function () {
+  function TemplateAPI(content) {
+    _classCallCheck(this, TemplateAPI);
+    _defineProperty(this, "content", void 0);
+    this.content = content;
+  }
+  _createClass(TemplateAPI, [{
+    key: "get",
+    value: function get() {
+      return this.content;
+    }
+  }, {
+    key: "set",
+    value: function set(content) {
+      this.content = content;
+    }
+  }, {
+    key: "prependHead",
+    value: function prependHead(fragment) {
+      var head = RegList.before.head;
+      return this.replace(head, "".concat(head).concat(fragment));
+    }
+  }, {
+    key: "appendHead",
+    value: function appendHead(fragment) {
+      var head = RegList.after.head;
+      return this.replace(head, "".concat(fragment).concat(head));
+    }
+  }, {
+    key: "prependBody",
+    value: function prependBody(fragment) {
+      var body = RegList.before.body;
+      return this.replace(body, "".concat(body).concat(fragment));
+    }
+  }, {
+    key: "appendBody",
+    value: function appendBody(fragment) {
+      var body = RegList.after.body;
+      return this.replace(body, "".concat(fragment).concat(body));
+    }
+  }, {
+    key: "replace",
+    value: function replace(reg, text) {
+      this.content = this.content.replace(reg, text);
+    }
+  }]);
+  return TemplateAPI;
+}();
+export var templateInjectableStream = function templateInjectableStream(_ref) {
+  var prependHead = _ref.prependHead,
+    appendHead = _ref.appendHead,
+    prependBody = _ref.prependBody,
+    appendBody = _ref.appendBody;
+  return new Transform({
+    write: function write(chunk, _, callback) {
+      var chunk_str = chunk.toString();
+      if (prependHead) {
+        var head = RegList.before.head;
+        chunk_str = chunk_str.replace(head, "".concat(head).concat(prependHead));
+      }
+      if (appendHead) {
+        var _head = RegList.after.head;
+        chunk_str = chunk_str.replace(_head, "".concat(appendHead).concat(_head));
+      }
+      if (prependBody) {
+        var body = RegList.before.body;
+        chunk_str = chunk_str.replace(body, "".concat(body).concat(prependBody));
+      }
+      if (appendBody) {
+        var _body = RegList.after.body;
+        chunk_str = chunk_str.replace(_body, "".concat(appendBody).concat(_body));
+      }
+      this.push(chunk_str);
+      callback();
+    }
+  });
+};

package/dist/js/treeshaking/libs/loadConfig.js ADDED Viewed

@@ -0,0 +1,39 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import * as path from 'path';
+import { compatRequire, fs, DEFAULT_SERVER_CONFIG } from '@modern-js/utils';
+import mergeDeep from 'merge-deep';
+export var getServerConfigPath = function getServerConfigPath(distDirectory) {
+  var serverConfigFile = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : DEFAULT_SERVER_CONFIG;
+  var serverConfigPath = path.join(distDirectory, serverConfigFile);
+  return "".concat(serverConfigPath, ".js");
+};
+export var requireConfig = function requireConfig(serverConfigPath) {
+  if (fs.pathExistsSync(serverConfigPath)) {
+    return compatRequire(serverConfigPath);
+  }
+  return {};
+};
+/**
+ * 对配置进行合并，开发环境下，cliConfig 与 serverConfig 进行深合并
+ * 生产环境下，resolvedConfig 与 serverConfig 进行深合并
+ * resolvedConfigPath: 构建序列化后的 modern.config.js 文件路径
+ */
+export var loadConfig = function loadConfig(_ref) {
+  var cliConfig = _ref.cliConfig,
+    serverConfig = _ref.serverConfig,
+    resolvedConfigPath = _ref.resolvedConfigPath;
+  var config = null;
+  if (process.env.NODE_ENV === 'production') {
+    var resolvedConfig = requireConfig(resolvedConfigPath);
+    // cli config has a higher priority,because it's an argument passed in.
+    config = mergeDeep(_objectSpread(_objectSpread({}, resolvedConfig), {}, {
+      plugins: [] // filter cli plugins
+    }), serverConfig, cliConfig);
+  } else {
+    config = mergeDeep(_objectSpread(_objectSpread({}, cliConfig), {}, {
+      plugins: []
+    }), serverConfig);
+  }
+  return config;
+};

package/dist/js/treeshaking/libs/metrics.js ADDED Viewed

@@ -0,0 +1,12 @@
+var metrics = {
+  gauges: function gauges() {
+    // no impl
+  },
+  emitCounter: function emitCounter() {
+    // no impl
+  },
+  emitTimer: function emitTimer() {
+    // no impl
+  }
+};
+export { metrics };

package/dist/js/treeshaking/libs/proxy.js ADDED Viewed

@@ -0,0 +1,80 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { createProxyMiddleware } from 'http-proxy-middleware';
+import { debug } from "../utils";
+export function formatProxyOptions(proxyOptions) {
+  var formattedProxy = [];
+  if (!Array.isArray(proxyOptions)) {
+    if ('target' in proxyOptions) {
+      formattedProxy.push(proxyOptions);
+    } else {
+      Array.prototype.push.apply(formattedProxy, Object.keys(proxyOptions).reduce(function (total, source) {
+        var option = proxyOptions[source];
+        total.push(_objectSpread({
+          context: source,
+          changeOrigin: true,
+          logLevel: 'warn'
+        }, typeof option === 'string' ? {
+          target: option
+        } : option));
+        return total;
+      }, []));
+    }
+  } else {
+    formattedProxy.push.apply(formattedProxy, _toConsumableArray(proxyOptions));
+  }
+  return formattedProxy;
+}
+export var createProxyHandler = function createProxyHandler(proxyOptions) {
+  debug('createProxyHandler', proxyOptions);
+  if (!proxyOptions) {
+    return null;
+  }
+  // If it is not an array, it may be an object that uses the context attribute
+  // or an object in the form of { source: ProxyDetail }
+  var formattedProxy = formatProxyOptions(proxyOptions);
+  var middlewares = formattedProxy.map(function (option) {
+    var middleware = createProxyMiddleware(option.context, option);
+    // eslint-disable-next-line consistent-return
+    return /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(ctx, next) {
+        var req, res, bypassUrl;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                req = ctx.req, res = ctx.res;
+                bypassUrl = typeof option.bypass === 'function' ? option.bypass(req, res, option) : null; // only false, no true
+                if (!(typeof bypassUrl === 'boolean')) {
+                  _context.next = 7;
+                  break;
+                }
+                ctx.status = 404;
+                return _context.abrupt("return", next());
+              case 7:
+                if (!(typeof bypassUrl === 'string')) {
+                  _context.next = 10;
+                  break;
+                }
+                ctx.url = bypassUrl;
+                return _context.abrupt("return", next());
+              case 10:
+                middleware(req, res, next);
+              case 11:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+      return function (_x, _x2) {
+        return _ref.apply(this, arguments);
+      };
+    }();
+  });
+  return middlewares;
+};

package/dist/js/treeshaking/libs/render/cache/__tests__/cache.fun.test.js ADDED Viewed

@@ -0,0 +1,124 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import url from 'url';
+import { createCache, destroyCache } from "../spr";
+import { cacheAddition, connectFactor, fname, maybeSync, namespaceHash, valueFactory, withCoalescedInvoke } from "../util";
+describe('test spr util functions', function () {
+  it('should return value correctly', function () {
+    expect(connectFactor('bar', 'foo')).toBe('bar-foo');
+    expect(fname(1)).toBe('f1');
+    expect(namespaceHash('modern', '!@#$%^&')).toBe('modern/!@#$%^&');
+  });
+  it('should create or destroy instance correctly', function () {
+    var ins1 = createCache();
+    var ins2 = createCache();
+    expect(ins1 === ins2).toBe(true);
+    destroyCache();
+    var ins3 = createCache();
+    expect(ins1 === ins3).toBe(false);
+    expect(ins2 === ins3).toBe(false);
+  });
+  it('should return function correctly', function () {
+    var urlParams = function () {
+      return new url.URLSearchParams();
+    }();
+    urlParams.set('name', 'modern');
+    var getParam = valueFactory(urlParams);
+    expect(getParam('name')).toBe('modern');
+    var headers = {
+      age: '12345'
+    };
+    var getHeader = valueFactory(headers);
+    expect(getHeader('age')).toBe('12345');
+  });
+  it('should add target html content', function () {
+    var contentNoHead = '<div>123</div>';
+    var html = cacheAddition(contentNoHead, Math.random().toString());
+    expect(html).toBe(contentNoHead);
+    var contentWithHead = '<head></head><div>123</div>';
+    var hash = Math.random().toString();
+    var htmlWithHead = cacheAddition(contentWithHead, hash);
+    expect(htmlWithHead).toBe("<head><meta name=\"x-moden-spr\" content=\"".concat(hash, "\"></head><div>123</div>"));
+  });
+  it('should only invoke func one time', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var index, fn, key, _yield$Promise$all, _yield$Promise$all2, res1, res2;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            index = 0;
+            fn = withCoalescedInvoke( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+              return _regeneratorRuntime().wrap(function _callee$(_context) {
+                while (1) {
+                  switch (_context.prev = _context.next) {
+                    case 0:
+                      return _context.abrupt("return", new Promise(function (resolve) {
+                        setTimeout(function () {
+                          index += 1;
+                          resolve(index);
+                        }, 500);
+                      }));
+                    case 1:
+                    case "end":
+                      return _context.stop();
+                  }
+                }
+              }, _callee);
+            })));
+            key = 'test';
+            _context2.next = 5;
+            return Promise.all([fn(key, []), fn(key, [])]);
+          case 5:
+            _yield$Promise$all = _context2.sent;
+            _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
+            res1 = _yield$Promise$all2[0];
+            res2 = _yield$Promise$all2[1];
+            expect(res1.isOrigin && res2.isOrigin).toBe(false);
+            expect(res1.isOrigin || res2.isOrigin).toBe(true);
+            expect(res1.value).toBe(1);
+            expect(res2.value).toBe(1);
+          case 13:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  })));
+  it('should invoke sync or async', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var foo, async, sync;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            foo = '';
+            _context3.next = 3;
+            return maybeSync(function () {
+              return new Promise(function (resolve) {
+                setTimeout(function () {
+                  resolve(foo);
+                }, 100);
+              });
+            })(false);
+          case 3:
+            async = _context3.sent;
+            expect(async).toBeUndefined();
+            _context3.next = 7;
+            return maybeSync(function () {
+              return new Promise(function (resolve) {
+                setTimeout(function () {
+                  resolve(foo);
+                }, 100);
+              });
+            })(true);
+          case 7:
+            sync = _context3.sent;
+            expect(sync).toBe(foo);
+          case 9:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  })));
+});