@modern-js/prod-server 2.0.0-beta.3 → 2.0.0-beta.6

package/dist/js/node/libs/loadConfig.js

@@ -1,53 +1,91 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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 });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var loadConfig_exports = {};
+__export(loadConfig_exports, {
+  getServerConfigPath: () => getServerConfigPath,
+  loadConfig: () => loadConfig,
+  requireConfig: () => requireConfig
 });
-exports.requireConfig = exports.loadConfig = exports.getServerConfigPath = void 0;
-var path = _interopRequireWildcard(require("path"));
-var _utils = require("@modern-js/utils");
-var _mergeDeep = _interopRequireDefault(require("merge-deep"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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; }
-const getServerConfigPath = (distDirectory, serverConfigFile = _utils.DEFAULT_SERVER_CONFIG) => {
+module.exports = __toCommonJS(loadConfig_exports);
+var path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_merge_deep = __toESM(require("merge-deep"));
+const getServerConfigPath = (distDirectory, serverConfigFile = import_utils.DEFAULT_SERVER_CONFIG) => {
   const serverConfigPath = path.join(distDirectory, serverConfigFile);
   return `${serverConfigPath}.js`;
 };
-exports.getServerConfigPath = getServerConfigPath;
-const requireConfig = serverConfigPath => {
-  if (_utils.fs.pathExistsSync(serverConfigPath)) {
-    return (0, _utils.compatRequire)(serverConfigPath);
+const requireConfig = (serverConfigPath) => {
+  if (import_utils.fs.pathExistsSync(serverConfigPath)) {
+    return (0, import_utils.compatRequire)(serverConfigPath);
   }
   return {};
 };
-
-/**
- * 对配置进行合并，开发环境下，cliConfig 与 serverConfig 进行深合并
- * 生产环境下，resolvedConfig 与 serverConfig 进行深合并
- * resolvedConfigPath: 构建序列化后的 modern.config.js 文件路径
- */
-exports.requireConfig = requireConfig;
 const loadConfig = ({
   cliConfig,
   serverConfig,
   resolvedConfigPath
 }) => {
   let config = null;
-  if (process.env.NODE_ENV === 'production') {
+  if (process.env.NODE_ENV === "production") {
     const resolvedConfig = requireConfig(resolvedConfigPath);
-    // cli config has a higher priority,because it's an argument passed in.
-    config = (0, _mergeDeep.default)(_objectSpread(_objectSpread({}, resolvedConfig), {}, {
-      plugins: [] // filter cli plugins
-    }), serverConfig, cliConfig);
+    config = (0, import_merge_deep.default)(
+      __spreadProps(__spreadValues({}, resolvedConfig), {
+        plugins: []
+      }),
+      serverConfig,
+      cliConfig
+    );
   } else {
-    config = (0, _mergeDeep.default)(_objectSpread(_objectSpread({}, cliConfig), {}, {
-      plugins: []
-    }), serverConfig);
+    config = (0, import_merge_deep.default)(
+      __spreadProps(__spreadValues({}, cliConfig), {
+        plugins: []
+      }),
+      serverConfig
+    );
   }
   return config;
 };
-exports.loadConfig = loadConfig;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getServerConfigPath,
+  loadConfig,
+  requireConfig
+});

package/dist/js/node/libs/metrics.js

@@ -1,18 +1,34 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var metrics_exports = {};
+__export(metrics_exports, {
+  metrics: () => metrics
 });
-exports.metrics = void 0;
+module.exports = __toCommonJS(metrics_exports);
 const metrics = {
   gauges() {
-    // no impl
   },
   emitCounter() {
-    // no impl
   },
   emitTimer() {
-    // no impl
   }
 };
-exports.metrics = metrics;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  metrics
+});

package/dist/js/node/libs/proxy.js

@@ -1,69 +1,114 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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 });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+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());
+  });
+};
+var proxy_exports = {};
+__export(proxy_exports, {
+  createProxyHandler: () => createProxyHandler,
+  formatProxyOptions: () => formatProxyOptions
 });
-exports.createProxyHandler = void 0;
-exports.formatProxyOptions = formatProxyOptions;
-var _httpProxyMiddleware = require("http-proxy-middleware");
-var _utils = require("../utils");
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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; }
+module.exports = __toCommonJS(proxy_exports);
+var import_http_proxy_middleware = require("http-proxy-middleware");
+var import_utils = require("../utils");
 function formatProxyOptions(proxyOptions) {
   const formattedProxy = [];
   if (!Array.isArray(proxyOptions)) {
-    if ('target' in proxyOptions) {
+    if ("target" in proxyOptions) {
       formattedProxy.push(proxyOptions);
     } else {
-      Array.prototype.push.apply(formattedProxy, Object.keys(proxyOptions).reduce((total, source) => {
-        const option = proxyOptions[source];
-        total.push(_objectSpread({
-          context: source,
-          changeOrigin: true,
-          logLevel: 'warn'
-        }, typeof option === 'string' ? {
-          target: option
-        } : option));
-        return total;
-      }, []));
+      Array.prototype.push.apply(
+        formattedProxy,
+        Object.keys(proxyOptions).reduce(
+          (total, source) => {
+            const option = proxyOptions[source];
+            total.push(__spreadValues({
+              context: source,
+              changeOrigin: true,
+              logLevel: "warn"
+            }, typeof option === "string" ? { target: option } : option));
+            return total;
+          },
+          []
+        )
+      );
     }
   } else {
     formattedProxy.push(...proxyOptions);
   }
   return formattedProxy;
 }
-const createProxyHandler = proxyOptions => {
-  (0, _utils.debug)('createProxyHandler', proxyOptions);
+const createProxyHandler = (proxyOptions) => {
+  (0, import_utils.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 }
   const formattedProxy = formatProxyOptions(proxyOptions);
-  const middlewares = formattedProxy.map(option => {
-    const middleware = (0, _httpProxyMiddleware.createProxyMiddleware)(option.context, option);
-
-    // eslint-disable-next-line consistent-return
-    return async (ctx, next) => {
-      const {
-        req,
-        res
-      } = ctx;
-      const bypassUrl = typeof option.bypass === 'function' ? option.bypass(req, res, option) : null;
-
-      // only false, no true
-      if (typeof bypassUrl === 'boolean') {
+  const middlewares = formattedProxy.map((option) => {
+    const middleware = (0, import_http_proxy_middleware.createProxyMiddleware)(option.context, option);
+    return (ctx, next) => __async(void 0, null, function* () {
+      const { req, res } = ctx;
+      const bypassUrl = typeof option.bypass === "function" ? option.bypass(req, res, option) : null;
+      if (typeof bypassUrl === "boolean") {
         ctx.status = 404;
         return next();
-      } else if (typeof bypassUrl === 'string') {
+      } else if (typeof bypassUrl === "string") {
         ctx.url = bypassUrl;
         return next();
       }
       middleware(req, res, next);
-    };
+    });
   });
   return middlewares;
 };
-exports.createProxyHandler = createProxyHandler;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createProxyHandler,
+  formatProxyOptions
+});

package/dist/js/node/libs/render/cache/__tests__/cache.fun.test.js

@@ -1,72 +1,115 @@
-"use strict";
-
-var _url = _interopRequireDefault(require("url"));
-var _spr = require("../spr");
-var _util = require("../util");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-describe('test spr util functions', () => {
-  it('should return value correctly', () => {
-    expect((0, _util.connectFactor)('bar', 'foo')).toBe('bar-foo');
-    expect((0, _util.fname)(1)).toBe('f1');
-    expect((0, _util.namespaceHash)('modern', '!@#$%^&')).toBe('modern/!@#$%^&');
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+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());
+  });
+};
+var import_url = __toESM(require("url"));
+var import_spr = require("../spr");
+var import_util = require("../util");
+describe("test spr util functions", () => {
+  it("should return value correctly", () => {
+    expect((0, import_util.connectFactor)("bar", "foo")).toBe("bar-foo");
+    expect((0, import_util.fname)(1)).toBe("f1");
+    expect((0, import_util.namespaceHash)("modern", "!@#$%^&")).toBe("modern/!@#$%^&");
   });
-  it('should create or destroy instance correctly', () => {
-    const ins1 = (0, _spr.createCache)();
-    const ins2 = (0, _spr.createCache)();
+  it("should create or destroy instance correctly", () => {
+    const ins1 = (0, import_spr.createCache)();
+    const ins2 = (0, import_spr.createCache)();
     expect(ins1 === ins2).toBe(true);
-    (0, _spr.destroyCache)();
-    const ins3 = (0, _spr.createCache)();
+    (0, import_spr.destroyCache)();
+    const ins3 = (0, import_spr.createCache)();
     expect(ins1 === ins3).toBe(false);
     expect(ins2 === ins3).toBe(false);
   });
-  it('should return function correctly', () => {
-    const urlParams = (() => new _url.default.URLSearchParams())();
-    urlParams.set('name', 'modern');
-    const getParam = (0, _util.valueFactory)(urlParams);
-    expect(getParam('name')).toBe('modern');
-    const headers = {
-      age: '12345'
-    };
-    const getHeader = (0, _util.valueFactory)(headers);
-    expect(getHeader('age')).toBe('12345');
+  it("should return function correctly", () => {
+    const urlParams = (() => new import_url.default.URLSearchParams())();
+    urlParams.set("name", "modern");
+    const getParam = (0, import_util.valueFactory)(urlParams);
+    expect(getParam("name")).toBe("modern");
+    const headers = { age: "12345" };
+    const getHeader = (0, import_util.valueFactory)(headers);
+    expect(getHeader("age")).toBe("12345");
   });
-  it('should add target html content', () => {
-    const contentNoHead = '<div>123</div>';
-    const html = (0, _util.cacheAddition)(contentNoHead, Math.random().toString());
+  it("should add target html content", () => {
+    const contentNoHead = "<div>123</div>";
+    const html = (0, import_util.cacheAddition)(contentNoHead, Math.random().toString());
     expect(html).toBe(contentNoHead);
-    const contentWithHead = '<head></head><div>123</div>';
+    const contentWithHead = "<head></head><div>123</div>";
     const hash = Math.random().toString();
-    const htmlWithHead = (0, _util.cacheAddition)(contentWithHead, hash);
-    expect(htmlWithHead).toBe(`<head><meta name="x-moden-spr" content="${hash}"></head><div>123</div>`);
+    const htmlWithHead = (0, import_util.cacheAddition)(contentWithHead, hash);
+    expect(htmlWithHead).toBe(
+      `<head><meta name="x-moden-spr" content="${hash}"></head><div>123</div>`
+    );
   });
-  it('should only invoke func one time', async () => {
+  it("should only invoke func one time", () => __async(exports, null, function* () {
     let index = 0;
-    const fn = (0, _util.withCoalescedInvoke)(async () => new Promise(resolve => {
-      setTimeout(() => {
-        index += 1;
-        resolve(index);
-      }, 500);
-    }));
-    const key = 'test';
-    const [res1, res2] = await Promise.all([fn(key, []), fn(key, [])]);
+    const fn = (0, import_util.withCoalescedInvoke)(
+      () => __async(exports, null, function* () {
+        return new Promise((resolve) => {
+          setTimeout(() => {
+            index += 1;
+            resolve(index);
+          }, 500);
+        });
+      })
+    );
+    const key = "test";
+    const [res1, res2] = yield Promise.all([fn(key, []), fn(key, [])]);
     expect(res1.isOrigin && res2.isOrigin).toBe(false);
     expect(res1.isOrigin || res2.isOrigin).toBe(true);
     expect(res1.value).toBe(1);
     expect(res2.value).toBe(1);
-  });
-  it('should invoke sync or async', async () => {
-    const foo = '';
-    const async = await (0, _util.maybeSync)(() => new Promise(resolve => {
-      setTimeout(() => {
-        resolve(foo);
-      }, 100);
-    }))(false);
+  }));
+  it("should invoke sync or async", () => __async(exports, null, function* () {
+    const foo = "";
+    const async = yield (0, import_util.maybeSync)(
+      () => new Promise((resolve) => {
+        setTimeout(() => {
+          resolve(foo);
+        }, 100);
+      })
+    )(false);
     expect(async).toBeUndefined();
-    const sync = await (0, _util.maybeSync)(() => new Promise(resolve => {
-      setTimeout(() => {
-        resolve(foo);
-      }, 100);
-    }))(true);
+    const sync = yield (0, import_util.maybeSync)(
+      () => new Promise((resolve) => {
+        setTimeout(() => {
+          resolve(foo);
+        }, 100);
+      })
+    )(true);
     expect(sync).toBe(foo);
-  });
-});
+  }));
+});