npm - @modern-js/prod-server - Versions diffs - 1.22.1 → 2.0.0-alpha.0 - Mend

@modern-js/prod-server 1.22.1 → 2.0.0-alpha.0

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 (132) hide show

package/CHANGELOG.md +271 -17
package/dist/js/modern/constants.js +32 -27
package/dist/js/modern/index.js +11 -7
package/dist/js/modern/libs/context/context.js +54 -132
package/dist/js/modern/libs/context/index.js +5 -2
package/dist/js/modern/libs/hook-api/index.js +134 -0
package/dist/js/modern/libs/hook-api/route.js +13 -37
package/dist/js/modern/libs/hook-api/template.js +41 -32
package/dist/js/modern/libs/loadConfig.js +46 -32
package/dist/js/modern/libs/metrics.js +6 -7
package/dist/js/modern/libs/proxy.js +70 -44
package/dist/js/modern/libs/render/cache/__tests__/cache.fun.test.js +112 -68
package/dist/js/modern/libs/render/cache/__tests__/cache.test.js +246 -225
package/dist/js/modern/libs/render/cache/__tests__/cacheable.js +43 -49
package/dist/js/modern/libs/render/cache/__tests__/error-configuration.js +36 -34
package/dist/js/modern/libs/render/cache/__tests__/matched-cache.js +83 -113
package/dist/js/modern/libs/render/cache/index.js +93 -50
package/dist/js/modern/libs/render/cache/page-caches/index.js +31 -8
package/dist/js/modern/libs/render/cache/page-caches/lru.js +6 -16
package/dist/js/modern/libs/render/cache/spr.js +133 -167
package/dist/js/modern/libs/render/cache/type.js +0 -1
package/dist/js/modern/libs/render/cache/util.js +71 -45
package/dist/js/modern/libs/render/index.js +76 -61
package/dist/js/modern/libs/render/measure.js +42 -34
package/dist/js/modern/libs/render/reader.js +68 -76
package/dist/js/modern/libs/render/ssr.js +63 -33
package/dist/js/modern/libs/render/static.js +51 -37
package/dist/js/modern/libs/render/type.js +9 -7
package/dist/js/modern/libs/route/index.js +12 -30
package/dist/js/modern/libs/route/matcher.js +28 -50
package/dist/js/modern/libs/route/route.js +9 -31
package/dist/js/modern/libs/serve-file.js +40 -20
package/dist/js/modern/server/index.js +152 -168
package/dist/js/modern/server/modern-server-split.js +44 -60
package/dist/js/modern/server/modern-server.js +416 -526
package/dist/js/modern/type.js +0 -1
package/dist/js/modern/utils.js +62 -58
package/dist/js/modern/worker-server.js +54 -0
package/dist/js/node/constants.js +53 -32
package/dist/js/node/index.js +37 -67
package/dist/js/node/libs/context/context.js +84 -150
package/dist/js/node/libs/context/index.js +28 -16
package/dist/js/node/libs/hook-api/index.js +164 -0
package/dist/js/node/libs/hook-api/route.js +35 -45
package/dist/js/node/libs/hook-api/template.js +64 -40
package/dist/js/node/libs/loadConfig.js +74 -55
package/dist/js/node/libs/metrics.js +28 -12
package/dist/js/node/libs/proxy.js +90 -55
package/dist/js/node/libs/render/cache/__tests__/cache.fun.test.js +99 -61
package/dist/js/node/libs/render/cache/__tests__/cache.test.js +147 -140
package/dist/js/node/libs/render/cache/__tests__/cacheable.js +65 -55
package/dist/js/node/libs/render/cache/__tests__/error-configuration.js +58 -40
package/dist/js/node/libs/render/cache/__tests__/matched-cache.js +105 -119
package/dist/js/node/libs/render/cache/index.js +115 -65
package/dist/js/node/libs/render/cache/page-caches/index.js +54 -16
package/dist/js/node/libs/render/cache/page-caches/lru.js +33 -26
package/dist/js/node/libs/render/cache/spr.js +161 -188
package/dist/js/node/libs/render/cache/type.js +15 -5
package/dist/js/node/libs/render/cache/util.js +99 -63
package/dist/js/node/libs/render/index.js +106 -87
package/dist/js/node/libs/render/measure.js +61 -44
package/dist/js/node/libs/render/reader.js +98 -100
package/dist/js/node/libs/render/ssr.js +92 -58
package/dist/js/node/libs/render/static.js +80 -53
package/dist/js/node/libs/render/type.js +31 -13
package/dist/js/node/libs/route/index.js +35 -44
package/dist/js/node/libs/route/matcher.js +48 -65
package/dist/js/node/libs/route/route.js +29 -37
package/dist/js/node/libs/serve-file.js +74 -37
package/dist/js/node/server/index.js +170 -203
package/dist/js/node/server/modern-server-split.js +70 -73
package/dist/js/node/server/modern-server.js +432 -577
package/dist/js/node/type.js +15 -3
package/dist/js/node/utils.js +87 -93
package/dist/js/node/worker-server.js +77 -0
package/dist/js/treeshaking/constants.js +29 -0
package/dist/js/treeshaking/index.js +13 -0
package/dist/js/treeshaking/libs/context/context.js +274 -0
package/dist/js/treeshaking/libs/context/index.js +5 -0
package/dist/js/treeshaking/libs/hook-api/index.js +281 -0
package/dist/js/treeshaking/libs/hook-api/route.js +68 -0
package/dist/js/treeshaking/libs/hook-api/template.js +127 -0
package/dist/js/treeshaking/libs/loadConfig.js +82 -0
package/dist/js/treeshaking/libs/metrics.js +6 -0
package/dist/js/treeshaking/libs/proxy.js +244 -0
package/dist/js/treeshaking/libs/render/cache/__tests__/cache.fun.test.js +291 -0
package/dist/js/treeshaking/libs/render/cache/__tests__/cache.test.js +781 -0
package/dist/js/treeshaking/libs/render/cache/__tests__/cacheable.js +67 -0
package/dist/js/treeshaking/libs/render/cache/__tests__/error-configuration.js +45 -0
package/dist/js/treeshaking/libs/render/cache/__tests__/matched-cache.js +147 -0
package/dist/js/treeshaking/libs/render/cache/index.js +346 -0
package/dist/js/treeshaking/libs/render/cache/page-caches/index.js +154 -0
package/dist/js/treeshaking/libs/render/cache/page-caches/lru.js +84 -0
package/dist/js/treeshaking/libs/render/cache/spr.js +492 -0
package/dist/js/treeshaking/libs/render/cache/type.js +1 -0
package/dist/js/treeshaking/libs/render/cache/util.js +280 -0
package/dist/js/treeshaking/libs/render/index.js +233 -0
package/dist/js/treeshaking/libs/render/measure.js +146 -0
package/dist/js/treeshaking/libs/render/reader.js +339 -0
package/dist/js/treeshaking/libs/render/ssr.js +223 -0
package/dist/js/treeshaking/libs/render/static.js +216 -0
package/dist/js/treeshaking/libs/render/type.js +7 -0
package/dist/js/treeshaking/libs/route/index.js +130 -0
package/dist/js/treeshaking/libs/route/matcher.js +138 -0
package/dist/js/treeshaking/libs/route/route.js +40 -0
package/dist/js/treeshaking/libs/serve-file.js +184 -0
package/dist/js/treeshaking/server/index.js +505 -0
package/dist/js/treeshaking/server/modern-server-split.js +360 -0
package/dist/js/treeshaking/server/modern-server.js +1083 -0
package/dist/js/treeshaking/type.js +1 -0
package/dist/js/treeshaking/utils.js +147 -0
package/dist/js/treeshaking/worker-server.js +177 -0
package/dist/types/libs/context/context.d.ts +1 -1
package/dist/types/libs/hook-api/index.d.ts +5 -0
package/dist/types/libs/hook-api/route.d.ts +9 -14
package/dist/types/libs/hook-api/template.d.ts +19 -9
package/dist/types/libs/render/cache/index.d.ts +4 -2
package/dist/types/libs/render/type.d.ts +3 -1
package/dist/types/libs/route/route.d.ts +0 -1
package/dist/types/libs/serve-file.d.ts +2 -1
package/dist/types/server/index.d.ts +2 -0
package/dist/types/server/modern-server.d.ts +11 -11
package/dist/types/type.d.ts +8 -10
package/dist/types/utils.d.ts +3 -4
package/dist/types/worker-server.d.ts +15 -0
package/package.json +31 -45
package/dist/js/modern/libs/render/modern/browser-list.js +0 -7
package/dist/js/modern/libs/render/modern/index.js +0 -48
package/dist/js/node/libs/render/modern/browser-list.js +0 -14
package/dist/js/node/libs/render/modern/index.js +0 -64
package/dist/types/libs/render/modern/browser-list.d.ts +0 -1
package/dist/types/libs/render/modern/index.d.ts +0 -3

package/dist/js/node/libs/render/cache/util.js CHANGED Viewed

@@ -1,97 +1,122 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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 __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 __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 util_exports = {};
+__export(util_exports, {
+  cacheAddition: () => cacheAddition,
+  connectFactor: () => connectFactor,
+  fname: () => fname,
+  getTime: () => getTime,
+  maybeSync: () => maybeSync,
+  namespaceHash: () => namespaceHash,
+  valueFactory: () => valueFactory,
+  withCoalescedInvoke: () => withCoalescedInvoke
 });
-exports.cacheAddition = cacheAddition;
-exports.connectFactor = connectFactor;
-exports.fname = fname;
-exports.getTime = getTime;
-exports.maybeSync = maybeSync;
-exports.namespaceHash = namespaceHash;
-exports.valueFactory = valueFactory;
-exports.withCoalescedInvoke = withCoalescedInvoke;
-var _url = _interopRequireDefault(require("url"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+module.exports = __toCommonJS(util_exports);
+var import_url = __toESM(require("url"));
 function namespaceHash(namespace, hash) {
   return `${namespace}/${hash}`;
 }
 function fname(lv) {
   return `f${lv}`;
 }
 function connectFactor(...args) {
-  return args.join('-');
+  return args.join("-");
 }
 function valueFactory(obj) {
-  if (obj instanceof _url.default.URLSearchParams) {
-    return function (key) {
+  if (obj instanceof import_url.default.URLSearchParams) {
+    return function(key) {
       return obj.get(key);
     };
   } else {
-    return function (key) {
+    return function(key) {
       const value = obj[key];
       if (Array.isArray(value)) {
-        return value.join(',');
+        return value.join(",");
       }
       return value;
     };
   }
 }
 function getTime([s, ns]) {
   return Math.floor(s * 1e3 + ns / 1e6);
 }
 const RE_START_IN_HEAD = /<head>/;
 function cacheAddition(html, hash) {
-  const additionHtml = html.replace(RE_START_IN_HEAD, `<head><meta name="x-moden-spr" content="${hash}">`);
+  const additionHtml = html.replace(
+    RE_START_IN_HEAD,
+    `<head><meta name="x-moden-spr" content="${hash}">`
+  );
   return additionHtml;
 }
-const globalInvokeCache = new Map();
+const globalInvokeCache = /* @__PURE__ */ new Map();
 function withCoalescedInvoke(func) {
-  return async function (key, args) {
-    const entry = globalInvokeCache.get(key);
-    if (entry) {
-      return entry.then(res => ({
-        isOrigin: false,
-        value: res.value
-      }));
-    }
-    function __wrapper() {
-      return func(...args);
-    }
-    const future = __wrapper().then(res => {
-      globalInvokeCache.delete(key);
-      return {
-        isOrigin: true,
-        value: res
-      };
-    }).catch(err => {
-      globalInvokeCache.delete(key);
-      throw err;
+  return function(key, args) {
+    return __async(this, null, function* () {
+      const entry = globalInvokeCache.get(key);
+      if (entry) {
+        return entry.then((res) => ({
+          isOrigin: false,
+          value: res.value
+        }));
+      }
+      function __wrapper() {
+        return func(...args);
+      }
+      const future = __wrapper().then((res) => {
+        globalInvokeCache.delete(key);
+        return { isOrigin: true, value: res };
+      }).catch((err) => {
+        globalInvokeCache.delete(key);
+        throw err;
+      });
+      globalInvokeCache.set(key, future);
+      return future;
     });
-    globalInvokeCache.set(key, future);
-    return future;
   };
 }
 function maybeSync(fn) {
-  return sync => {
+  return (sync) => {
     if (sync) {
       return fn();
     } else {
@@ -99,4 +124,15 @@ function maybeSync(fn) {
       return Promise.resolve();
     }
   };
-}
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  cacheAddition,
+  connectFactor,
+  fname,
+  getTime,
+  maybeSync,
+  namespaceHash,
+  valueFactory,
+  withCoalescedInvoke
+});

package/dist/js/node/libs/render/index.js CHANGED Viewed

@@ -1,94 +1,113 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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 __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 __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 render_exports = {};
+__export(render_exports, {
+  createRenderHandler: () => createRenderHandler
 });
-exports.createRenderHandler = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _utils = require("@modern-js/utils");
-var _constants = require("../../constants");
-var _static = require("./static");
-var _reader = require("./reader");
-var ssr = _interopRequireWildcard(require("./ssr"));
-var _modern = require("./modern");
-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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+module.exports = __toCommonJS(render_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_constants = require("../../constants");
+var import_static = require("./static");
+var import_reader = require("./reader");
+var ssr = __toESM(require("./ssr"));
 const createRenderHandler = ({
   distDir,
   staticGenerate
-}) => async function render({
-  ctx,
-  route,
-  runner
-}) {
-  if (ctx.resHasHandled()) {
-    return null;
-  }
-  const {
-    entryPath,
-    urlPath
-  } = route;
-  const entry = _path.default.join(distDir, entryPath);
-  if (!route.isSPA) {
-    const result = await (0, _static.handleDirectory)(ctx, entry, urlPath);
-    return result;
-  } // only spa can use es6-html
-  const modernEntry = (0, _modern.getModernEntry)(entry);
-  const useModern = // route.enableModernMode &&
-  (0, _modern.supportModern)(ctx) && _utils.fs.existsSync(modernEntry);
-  const templatePath = useModern ? modernEntry : entry;
-  if (!_utils.fs.existsSync(templatePath)) {
-    throw new Error(`Could not find template file: ${templatePath}`);
-  }
-  const content = await (0, _reader.readFile)(templatePath);
-  if (!content) {
-    return null;
-  } // handles ssr first
-  if (route.isSSR) {
-    try {
-      const result = await ssr.render(ctx, {
-        distDir,
-        entryName: route.entryName,
-        urlPath: route.urlPath,
-        bundle: route.bundle,
-        template: content.toString(),
-        staticGenerate
-      }, runner);
+}) => function render(_0) {
+  return __async(this, arguments, function* ({
+    ctx,
+    route,
+    runner
+  }) {
+    if (ctx.resHasHandled()) {
+      return null;
+    }
+    const { entryPath, urlPath } = route;
+    const entry = import_path.default.join(distDir, entryPath);
+    if (!route.isSPA) {
+      const result = yield (0, import_static.handleDirectory)(ctx, entry, urlPath);
       return result;
-    } catch (err) {
-      ctx.error(_constants.ERROR_DIGEST.ERENDER, err.stack || err.message);
-      ctx.res.setHeader('x-modern-ssr-fallback', '1');
     }
-  }
-  return {
-    content,
-    contentType: _utils.mime.contentType(_path.default.extname(templatePath))
-  };
+    const templatePath = entry;
+    if (!import_utils.fs.existsSync(templatePath)) {
+      throw new Error(`Could not find template file: ${templatePath}`);
+    }
+    const content = yield (0, import_reader.readFile)(templatePath);
+    if (!content) {
+      return null;
+    }
+    if (route.isSSR) {
+      try {
+        const result = yield ssr.render(
+          ctx,
+          {
+            distDir,
+            entryName: route.entryName,
+            urlPath: route.urlPath,
+            bundle: route.bundle,
+            template: content.toString(),
+            staticGenerate
+          },
+          runner
+        );
+        return result;
+      } catch (err) {
+        ctx.error(
+          import_constants.ERROR_DIGEST.ERENDER,
+          err.stack || err.message
+        );
+        ctx.res.setHeader("x-modern-ssr-fallback", "1");
+      }
+    }
+    return {
+      content,
+      contentType: import_utils.mime.contentType(import_path.default.extname(templatePath))
+    };
+  });
 };
-exports.createRenderHandler = createRenderHandler;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createRenderHandler
+});

package/dist/js/node/libs/render/measure.js CHANGED Viewed

@@ -1,73 +1,90 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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 __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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var measure_exports = {};
+__export(measure_exports, {
+  createLogger: () => createLogger,
+  createMetrics: () => createMetrics
 });
-exports.createMetrics = exports.createLogger = void 0;
-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(measure_exports);
+var import_utils = require("../../utils");
 const createMetrics = (context, metrics) => {
-  const {
-    entryName: entry,
-    request
-  } = context;
-  const {
-    pathname = ''
-  } = request || {};
+  const { entryName: entry, request } = context;
+  const { pathname = "" } = request || {};
   const emitTimer = (name, cost, tags = {}) => {
-    metrics.emitTimer(name, cost, _objectSpread(_objectSpread({}, tags), {}, {
+    metrics.emitTimer(name, cost, __spreadProps(__spreadValues({}, tags), {
       pathname,
       entry
     }));
   };
   const emitCounter = (name, counter, tags = {}) => {
-    metrics.emitCounter(name, counter, _objectSpread(_objectSpread({}, tags), {}, {
+    metrics.emitCounter(name, counter, __spreadProps(__spreadValues({}, tags), {
       pathname,
       entry
     }));
   };
-  return {
-    emitTimer,
-    emitCounter
-  };
+  return { emitTimer, emitCounter };
 };
-exports.createMetrics = createMetrics;
 const createLogger = (serverContext, logger) => {
   const request = serverContext.request || {};
-  const {
-    headers = {},
-    pathname = ''
-  } = request;
+  const { headers = {}, pathname = "" } = request;
   const debug = (message, ...args) => {
     logger.debug(`SSR Debug - ${message}, req.url = %s`, ...args, pathname);
   };
   const info = (message, ...args) => {
     logger.info(`SSR Info - ${message}, req.url = %s`, ...args, pathname);
   };
   const error = (message, e) => {
-    logger.error(`SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, pathname, (0, _utils.headersWithoutCookie)(headers));
+    if (!e) {
+      e = message;
+      message = "";
+    }
+    logger.error(
+      `SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`,
+      e instanceof Error ? e.stack || e.message : e,
+      pathname,
+      (0, import_utils.headersWithoutCookie)(headers)
+    );
   };
   return {
     error,
     info,
     debug
   };
 };
-exports.createLogger = createLogger;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createLogger,
+  createMetrics
+});