@modern-js/prod-server 2.44.0 → 2.45.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.
@@ -22,8 +22,6 @@ __export(metrics_exports, {
22
22
  });
23
23
  module.exports = __toCommonJS(metrics_exports);
24
24
  const metrics = {
25
- gauges() {
26
- },
27
25
  emitCounter() {
28
26
  },
29
27
  emitTimer() {
@@ -27,14 +27,14 @@ const createMetrics = (context, metrics) => {
27
27
  const { entryName: entry, request } = context;
28
28
  const { pathname = "" } = request || {};
29
29
  const emitTimer = (name, cost, tags = {}) => {
30
- metrics.emitTimer(name, cost, {
30
+ metrics.emitTimer(name, cost, void 0, {
31
31
  ...tags,
32
32
  pathname,
33
33
  entry
34
34
  });
35
35
  };
36
36
  const emitCounter = (name, counter, tags = {}) => {
37
- metrics.emitCounter(name, counter, {
37
+ metrics.emitCounter(name, counter, void 0, {
38
38
  ...tags,
39
39
  pathname,
40
40
  entry
@@ -40,9 +40,6 @@ const createLogger = () => ({
40
40
  },
41
41
  debug(message, ...args) {
42
42
  console.debug(message, ...args);
43
- },
44
- log(message, ...args) {
45
- console.log(message, ...args);
46
43
  }
47
44
  });
48
45
  const calcFallback = (metaName) => `x-${metaName.split(/[-_]/)[0]}-ssr-fallback`;
@@ -1,6 +1,4 @@
1
1
  var metrics = {
2
- gauges: function gauges() {
3
- },
4
2
  emitCounter: function emitCounter() {
5
3
  },
6
4
  emitTimer: function emitTimer() {
@@ -8,14 +8,14 @@ var createMetrics = function(context, metrics) {
8
8
  var _ref = request || {}, _ref_pathname = _ref.pathname, pathname = _ref_pathname === void 0 ? "" : _ref_pathname;
9
9
  var emitTimer = function(name, cost) {
10
10
  var tags = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
11
- metrics.emitTimer(name, cost, _object_spread_props(_object_spread({}, tags), {
11
+ metrics.emitTimer(name, cost, void 0, _object_spread_props(_object_spread({}, tags), {
12
12
  pathname,
13
13
  entry
14
14
  }));
15
15
  };
16
16
  var emitCounter = function(name, counter) {
17
17
  var tags = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
18
- metrics.emitCounter(name, counter, _object_spread_props(_object_spread({}, tags), {
18
+ metrics.emitCounter(name, counter, void 0, _object_spread_props(_object_spread({}, tags), {
19
19
  pathname,
20
20
  entry
21
21
  }));
@@ -47,15 +47,6 @@ var createLogger = function() {
47
47
  (_console = console).debug.apply(_console, [
48
48
  message
49
49
  ].concat(_to_consumable_array(args)));
50
- },
51
- log: function log(message) {
52
- for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
53
- args[_key - 1] = arguments[_key];
54
- }
55
- var _console;
56
- (_console = console).log.apply(_console, [
57
- message
58
- ].concat(_to_consumable_array(args)));
59
50
  }
60
51
  };
61
52
  };
@@ -1,6 +1,4 @@
1
1
  const metrics = {
2
- gauges() {
3
- },
4
2
  emitCounter() {
5
3
  },
6
4
  emitTimer() {
@@ -3,14 +3,14 @@ const createMetrics = (context, metrics) => {
3
3
  const { entryName: entry, request } = context;
4
4
  const { pathname = "" } = request || {};
5
5
  const emitTimer = (name, cost, tags = {}) => {
6
- metrics.emitTimer(name, cost, {
6
+ metrics.emitTimer(name, cost, void 0, {
7
7
  ...tags,
8
8
  pathname,
9
9
  entry
10
10
  });
11
11
  };
12
12
  const emitCounter = (name, counter, tags = {}) => {
13
- metrics.emitCounter(name, counter, {
13
+ metrics.emitCounter(name, counter, void 0, {
14
14
  ...tags,
15
15
  pathname,
16
16
  entry
@@ -16,9 +16,6 @@ const createLogger = () => ({
16
16
  },
17
17
  debug(message, ...args) {
18
18
  console.debug(message, ...args);
19
- },
20
- log(message, ...args) {
21
- console.log(message, ...args);
22
19
  }
23
20
  });
24
21
  const calcFallback = (metaName) => `x-${metaName.split(/[-_]/)[0]}-ssr-fallback`;
@@ -5,8 +5,9 @@
5
5
  import { IncomingMessage, ServerResponse, Server } from 'http';
6
6
  import { Adapter, WebAdapter, APIServerStartInput, ServerOptions } from '@modern-js/server-core';
7
7
  import { type ModernServerContext, type ServerRoute } from '@modern-js/types';
8
+ import { Logger } from '@modern-js/utils/logger';
8
9
  import type { ContextOptions } from '../libs/context';
9
- import { ModernServerOptions, NextFunction, ServerHookRunner, Metrics, Logger, ModernServerInterface, BuildOptions, ModernServerHandler } from '../type';
10
+ import { ModernServerOptions, NextFunction, ServerHookRunner, Metrics, ModernServerInterface, BuildOptions, ModernServerHandler } from '../type';
10
11
  import { RouteMatchManager, ModernRouteInterface, ModernRoute } from '../libs/route';
11
12
  import { RenderHandler } from '../libs/render';
12
13
  import { mergeExtension } from '../utils';
@@ -7,6 +7,7 @@ import { Readable } from 'stream';
7
7
  import { serverManager, ServerOptions } from '@modern-js/server-core';
8
8
  import type { ServerPlugin } from '@modern-js/server-core';
9
9
  import type { Metrics, Logger, NextFunction, ModernServerContext, InternalPlugins, Reporter } from '@modern-js/types';
10
+ import { Logger as LocalLogger } from '@modern-js/utils/logger';
10
11
  import type { ModernRouteInterface } from './libs/route';
11
12
  declare module 'http' {
12
13
  interface IncomingMessage {
@@ -27,7 +28,7 @@ export type ModernServerOptions = {
27
28
  internalPlugins?: InternalPlugins;
28
29
  routes?: ModernRouteInterface[];
29
30
  staticGenerate?: boolean;
30
- logger?: Logger;
31
+ logger?: LocalLogger;
31
32
  metrics?: Metrics;
32
33
  apiOnly?: boolean;
33
34
  ssrOnly?: boolean;
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.44.0",
18
+ "version": "2.45.0",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./dist/types/index.d.ts",
21
21
  "main": "./dist/cjs/index.js",
@@ -73,10 +73,10 @@
73
73
  "node-html-parser": "^6.1.5",
74
74
  "path-to-regexp": "^6.2.0",
75
75
  "serve-static": "^1.14.1",
76
- "@modern-js/plugin": "2.44.0",
77
- "@modern-js/server-core": "2.44.0",
78
- "@modern-js/utils": "2.44.0",
79
- "@modern-js/runtime-utils": "2.44.0"
76
+ "@modern-js/plugin": "2.45.0",
77
+ "@modern-js/server-core": "2.45.0",
78
+ "@modern-js/runtime-utils": "2.45.0",
79
+ "@modern-js/utils": "2.45.0"
80
80
  },
81
81
  "devDependencies": {
82
82
  "@types/cookie": "0.5.1",
@@ -94,9 +94,9 @@
94
94
  "portfinder": "^1.0.28",
95
95
  "typescript": "^5",
96
96
  "ws": "^8.13.0",
97
- "@modern-js/types": "2.44.0",
98
- "@scripts/build": "2.44.0",
99
- "@scripts/jest-config": "2.44.0"
97
+ "@modern-js/types": "2.45.0",
98
+ "@scripts/build": "2.45.0",
99
+ "@scripts/jest-config": "2.45.0"
100
100
  },
101
101
  "sideEffects": false,
102
102
  "publishConfig": {