@modern-js/server-core 2.69.1 → 2.69.3
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.
- package/dist/cjs/adapters/node/plugins/resource.js +2 -1
- package/dist/cjs/plugins/monitors.js +5 -3
- package/dist/esm/adapters/node/plugins/resource.js +5 -2
- package/dist/esm/plugins/monitors.js +9 -7
- package/dist/esm-node/adapters/node/plugins/resource.js +2 -1
- package/dist/esm-node/plugins/monitors.js +5 -3
- package/package.json +7 -7
|
@@ -44,7 +44,8 @@ var import_fileReader = require("@modern-js/runtime-utils/fileReader");
|
|
|
44
44
|
var import_utils = require("@modern-js/utils");
|
|
45
45
|
var import_utils2 = require("../../../utils");
|
|
46
46
|
async function getHtmlTemplates(pwd, routes) {
|
|
47
|
-
const
|
|
47
|
+
const htmlRoutes = routes.filter((route) => route.entryName);
|
|
48
|
+
const htmls = await Promise.all(htmlRoutes.map(async (route) => {
|
|
48
49
|
let html;
|
|
49
50
|
try {
|
|
50
51
|
var _this;
|
|
@@ -58,24 +58,26 @@ function createMonitors() {
|
|
|
58
58
|
trace(message, ...args) {
|
|
59
59
|
log("trace", message, args);
|
|
60
60
|
},
|
|
61
|
-
timing(name, dur, desc, ...args) {
|
|
61
|
+
timing(name, dur, desc, tags, ...args) {
|
|
62
62
|
const event = {
|
|
63
63
|
type: "timing",
|
|
64
64
|
payload: {
|
|
65
65
|
name,
|
|
66
66
|
dur,
|
|
67
67
|
desc,
|
|
68
|
+
tags,
|
|
68
69
|
args
|
|
69
70
|
}
|
|
70
71
|
};
|
|
71
72
|
coreMonitors.forEach((monitor) => monitor(event));
|
|
72
73
|
},
|
|
73
|
-
counter(name, ...args) {
|
|
74
|
+
counter(name, tags, ...args) {
|
|
74
75
|
const event = {
|
|
75
76
|
type: "counter",
|
|
76
77
|
payload: {
|
|
77
78
|
name,
|
|
78
|
-
args
|
|
79
|
+
args,
|
|
80
|
+
tags
|
|
79
81
|
}
|
|
80
82
|
};
|
|
81
83
|
coreMonitors.forEach((monitor) => monitor(event));
|
|
@@ -10,13 +10,16 @@ function getHtmlTemplates(pwd, routes) {
|
|
|
10
10
|
}
|
|
11
11
|
function _getHtmlTemplates() {
|
|
12
12
|
_getHtmlTemplates = _async_to_generator(function(pwd, routes) {
|
|
13
|
-
var htmls, templates;
|
|
13
|
+
var htmlRoutes, htmls, templates;
|
|
14
14
|
return _ts_generator(this, function(_state) {
|
|
15
15
|
switch (_state.label) {
|
|
16
16
|
case 0:
|
|
17
|
+
htmlRoutes = routes.filter(function(route) {
|
|
18
|
+
return route.entryName;
|
|
19
|
+
});
|
|
17
20
|
return [
|
|
18
21
|
4,
|
|
19
|
-
Promise.all(
|
|
22
|
+
Promise.all(htmlRoutes.map(function() {
|
|
20
23
|
var _ref = _async_to_generator(function(route) {
|
|
21
24
|
var html, _this, htmlPath, e;
|
|
22
25
|
return _ts_generator(this, function(_state2) {
|
|
@@ -52,9 +52,9 @@ function createMonitors() {
|
|
|
52
52
|
}
|
|
53
53
|
log("trace", message, args);
|
|
54
54
|
},
|
|
55
|
-
timing: function timing(name, dur, desc) {
|
|
56
|
-
for (var _len = arguments.length, args = new Array(_len >
|
|
57
|
-
args[_key -
|
|
55
|
+
timing: function timing(name, dur, desc, tags) {
|
|
56
|
+
for (var _len = arguments.length, args = new Array(_len > 4 ? _len - 4 : 0), _key = 4; _key < _len; _key++) {
|
|
57
|
+
args[_key - 4] = arguments[_key];
|
|
58
58
|
}
|
|
59
59
|
var event = {
|
|
60
60
|
type: "timing",
|
|
@@ -62,6 +62,7 @@ function createMonitors() {
|
|
|
62
62
|
name,
|
|
63
63
|
dur,
|
|
64
64
|
desc,
|
|
65
|
+
tags,
|
|
65
66
|
args
|
|
66
67
|
}
|
|
67
68
|
};
|
|
@@ -69,15 +70,16 @@ function createMonitors() {
|
|
|
69
70
|
return monitor(event);
|
|
70
71
|
});
|
|
71
72
|
},
|
|
72
|
-
counter: function counter(name) {
|
|
73
|
-
for (var _len = arguments.length, args = new Array(_len >
|
|
74
|
-
args[_key -
|
|
73
|
+
counter: function counter(name, tags) {
|
|
74
|
+
for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
|
|
75
|
+
args[_key - 2] = arguments[_key];
|
|
75
76
|
}
|
|
76
77
|
var event = {
|
|
77
78
|
type: "counter",
|
|
78
79
|
payload: {
|
|
79
80
|
name,
|
|
80
|
-
args
|
|
81
|
+
args,
|
|
82
|
+
tags
|
|
81
83
|
}
|
|
82
84
|
};
|
|
83
85
|
coreMonitors.forEach(function(monitor) {
|
|
@@ -3,7 +3,8 @@ import { fileReader } from "@modern-js/runtime-utils/fileReader";
|
|
|
3
3
|
import { fs, LOADABLE_STATS_FILE, MAIN_ENTRY_NAME, NESTED_ROUTE_SPEC_FILE, ROUTE_MANIFEST_FILE, SERVER_BUNDLE_DIRECTORY, compatibleRequire, isProd } from "@modern-js/utils";
|
|
4
4
|
import { uniqueKeyByRoute } from "../../../utils";
|
|
5
5
|
async function getHtmlTemplates(pwd, routes) {
|
|
6
|
-
const
|
|
6
|
+
const htmlRoutes = routes.filter((route) => route.entryName);
|
|
7
|
+
const htmls = await Promise.all(htmlRoutes.map(async (route) => {
|
|
7
8
|
let html;
|
|
8
9
|
try {
|
|
9
10
|
var _this;
|
|
@@ -32,24 +32,26 @@ function createMonitors() {
|
|
|
32
32
|
trace(message, ...args) {
|
|
33
33
|
log("trace", message, args);
|
|
34
34
|
},
|
|
35
|
-
timing(name, dur, desc, ...args) {
|
|
35
|
+
timing(name, dur, desc, tags, ...args) {
|
|
36
36
|
const event = {
|
|
37
37
|
type: "timing",
|
|
38
38
|
payload: {
|
|
39
39
|
name,
|
|
40
40
|
dur,
|
|
41
41
|
desc,
|
|
42
|
+
tags,
|
|
42
43
|
args
|
|
43
44
|
}
|
|
44
45
|
};
|
|
45
46
|
coreMonitors.forEach((monitor) => monitor(event));
|
|
46
47
|
},
|
|
47
|
-
counter(name, ...args) {
|
|
48
|
+
counter(name, tags, ...args) {
|
|
48
49
|
const event = {
|
|
49
50
|
type: "counter",
|
|
50
51
|
payload: {
|
|
51
52
|
name,
|
|
52
|
-
args
|
|
53
|
+
args,
|
|
54
|
+
tags
|
|
53
55
|
}
|
|
54
56
|
};
|
|
55
57
|
coreMonitors.forEach((monitor) => monitor(event));
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"modern",
|
|
16
16
|
"modern.js"
|
|
17
17
|
],
|
|
18
|
-
"version": "2.69.
|
|
18
|
+
"version": "2.69.3",
|
|
19
19
|
"jsnext:source": "./src/index.ts",
|
|
20
20
|
"types": "./dist/types/index.d.ts",
|
|
21
21
|
"main": "./dist/cjs/index.js",
|
|
@@ -62,10 +62,10 @@
|
|
|
62
62
|
"flatted": "^3.3.3",
|
|
63
63
|
"hono": "^3.12.2",
|
|
64
64
|
"ts-deepmerge": "7.0.2",
|
|
65
|
-
"@modern-js/plugin": "2.69.
|
|
66
|
-
"@modern-js/
|
|
67
|
-
"@modern-js/
|
|
68
|
-
"@modern-js/utils": "2.69.
|
|
65
|
+
"@modern-js/plugin": "2.69.3",
|
|
66
|
+
"@modern-js/runtime-utils": "2.69.3",
|
|
67
|
+
"@modern-js/plugin-v2": "2.69.3",
|
|
68
|
+
"@modern-js/utils": "2.69.3"
|
|
69
69
|
},
|
|
70
70
|
"devDependencies": {
|
|
71
71
|
"@types/cloneable-readable": "^2.0.3",
|
|
@@ -76,9 +76,9 @@
|
|
|
76
76
|
"jest": "^29",
|
|
77
77
|
"ts-jest": "^29.1.0",
|
|
78
78
|
"typescript": "^5",
|
|
79
|
+
"@modern-js/types": "2.69.3",
|
|
79
80
|
"@scripts/build": "2.66.0",
|
|
80
|
-
"@scripts/jest-config": "2.66.0"
|
|
81
|
-
"@modern-js/types": "2.69.1"
|
|
81
|
+
"@scripts/jest-config": "2.66.0"
|
|
82
82
|
},
|
|
83
83
|
"sideEffects": false,
|
|
84
84
|
"publishConfig": {
|