@modern-js/prod-server 2.35.1 → 2.36.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.
- package/dist/cjs/constants.js +33 -27
- package/dist/cjs/index.js +41 -33
- package/dist/cjs/libs/context/context.js +71 -45
- package/dist/cjs/libs/context/index.js +27 -17
- package/dist/cjs/libs/hook-api/base.js +49 -30
- package/dist/cjs/libs/hook-api/index.js +36 -28
- package/dist/cjs/libs/hook-api/index.worker.js +39 -31
- package/dist/cjs/libs/hook-api/route.js +28 -11
- package/dist/cjs/libs/hook-api/template.js +27 -17
- package/dist/cjs/libs/hook-api/templateForStream.js +31 -14
- package/dist/cjs/libs/loadConfig.js +46 -29
- package/dist/cjs/libs/metrics.js +24 -7
- package/dist/cjs/libs/preload/flushServerHeader.js +28 -11
- package/dist/cjs/libs/preload/index.js +22 -5
- package/dist/cjs/libs/preload/parseLinks.js +49 -24
- package/dist/cjs/libs/preload/shouldFlushServerHeader.js +25 -15
- package/dist/cjs/libs/preload/transformLinks2String.js +26 -9
- package/dist/cjs/libs/proxy.js +29 -19
- package/dist/cjs/libs/render/cache/__tests__/cache.fun.test.js +40 -22
- package/dist/cjs/libs/render/cache/__tests__/cache.test.js +26 -29
- package/dist/cjs/libs/render/cache/__tests__/cacheable.js +24 -7
- package/dist/cjs/libs/render/cache/__tests__/error-configuration.js +24 -7
- package/dist/cjs/libs/render/cache/__tests__/matched-cache.js +24 -7
- package/dist/cjs/libs/render/cache/index.js +29 -16
- package/dist/cjs/libs/render/cache/page-caches/index.js +26 -9
- package/dist/cjs/libs/render/cache/page-caches/lru.js +39 -13
- package/dist/cjs/libs/render/cache/spr.js +61 -42
- package/dist/cjs/libs/render/cache/type.js +15 -3
- package/dist/cjs/libs/render/cache/util.js +49 -36
- package/dist/cjs/libs/render/index.js +54 -29
- package/dist/cjs/libs/render/measure.js +27 -17
- package/dist/cjs/libs/render/reader.js +49 -33
- package/dist/cjs/libs/render/ssr.js +52 -26
- package/dist/cjs/libs/render/static.js +44 -18
- package/dist/cjs/libs/render/type.js +24 -7
- package/dist/cjs/libs/render/utils.js +29 -19
- package/dist/cjs/libs/reporter.js +24 -7
- package/dist/cjs/libs/route/index.js +30 -20
- package/dist/cjs/libs/route/matcher.js +35 -18
- package/dist/cjs/libs/route/route.js +34 -17
- package/dist/cjs/libs/serveFile.js +40 -21
- package/dist/cjs/libs/serverTiming.js +27 -10
- package/dist/cjs/renderHtml.js +17 -20
- package/dist/cjs/server/index.js +71 -45
- package/dist/cjs/server/modernServer.js +120 -95
- package/dist/cjs/server/modernServerSplit.js +29 -12
- package/dist/cjs/type.js +15 -3
- package/dist/cjs/utils.js +41 -38
- package/dist/cjs/workerServer.js +44 -34
- package/dist/esm/constants.js +14 -6
- package/dist/esm/index.js +11 -5
- package/dist/esm/libs/context/context.js +4 -1
- package/dist/esm/libs/context/index.js +5 -2
- package/dist/esm/libs/hook-api/base.js +6 -2
- package/dist/esm/libs/hook-api/index.js +11 -5
- package/dist/esm/libs/hook-api/index.worker.js +16 -10
- package/dist/esm/libs/hook-api/route.js +4 -1
- package/dist/esm/libs/hook-api/template.js +6 -2
- package/dist/esm/libs/hook-api/templateForStream.js +4 -1
- package/dist/esm/libs/loadConfig.js +8 -3
- package/dist/esm/libs/metrics.js +3 -1
- package/dist/esm/libs/preload/flushServerHeader.js +6 -3
- package/dist/esm/libs/preload/parseLinks.js +6 -3
- package/dist/esm/libs/preload/shouldFlushServerHeader.js +6 -2
- package/dist/esm/libs/preload/transformLinks2String.js +4 -1
- package/dist/esm/libs/proxy.js +9 -5
- package/dist/esm/libs/render/cache/__tests__/cacheable.js +4 -1
- package/dist/esm/libs/render/cache/__tests__/error-configuration.js +4 -1
- package/dist/esm/libs/render/cache/__tests__/matched-cache.js +4 -1
- package/dist/esm/libs/render/cache/index.js +4 -1
- package/dist/esm/libs/render/cache/page-caches/index.js +5 -2
- package/dist/esm/libs/render/cache/page-caches/lru.js +4 -1
- package/dist/esm/libs/render/cache/spr.js +11 -7
- package/dist/esm/libs/render/cache/type.js +0 -1
- package/dist/esm/libs/render/cache/util.js +18 -8
- package/dist/esm/libs/render/index.js +12 -9
- package/dist/esm/libs/render/measure.js +15 -11
- package/dist/esm/libs/render/reader.js +15 -8
- package/dist/esm/libs/render/ssr.js +11 -8
- package/dist/esm/libs/render/static.js +5 -2
- package/dist/esm/libs/render/type.js +4 -1
- package/dist/esm/libs/render/utils.js +6 -2
- package/dist/esm/libs/reporter.js +4 -1
- package/dist/esm/libs/route/index.js +5 -2
- package/dist/esm/libs/route/matcher.js +4 -1
- package/dist/esm/libs/route/route.js +4 -1
- package/dist/esm/libs/serveFile.js +6 -2
- package/dist/esm/libs/serverTiming.js +4 -1
- package/dist/esm/renderHtml.js +133 -124
- package/dist/esm/server/index.js +9 -6
- package/dist/esm/server/modernServer.js +13 -10
- package/dist/esm/server/modernServerSplit.js +4 -1
- package/dist/esm/type.js +0 -1
- package/dist/esm/utils.js +23 -12
- package/dist/esm/workerServer.js +21 -17
- package/dist/esm-node/constants.js +14 -6
- package/dist/esm-node/index.js +11 -5
- package/dist/esm-node/libs/context/context.js +4 -1
- package/dist/esm-node/libs/context/index.js +5 -2
- package/dist/esm-node/libs/hook-api/base.js +6 -2
- package/dist/esm-node/libs/hook-api/index.js +10 -4
- package/dist/esm-node/libs/hook-api/index.worker.js +10 -4
- package/dist/esm-node/libs/hook-api/route.js +4 -1
- package/dist/esm-node/libs/hook-api/template.js +6 -2
- package/dist/esm-node/libs/hook-api/templateForStream.js +4 -1
- package/dist/esm-node/libs/loadConfig.js +8 -3
- package/dist/esm-node/libs/metrics.js +3 -1
- package/dist/esm-node/libs/preload/flushServerHeader.js +4 -1
- package/dist/esm-node/libs/preload/parseLinks.js +4 -1
- package/dist/esm-node/libs/preload/shouldFlushServerHeader.js +6 -2
- package/dist/esm-node/libs/preload/transformLinks2String.js +4 -1
- package/dist/esm-node/libs/proxy.js +6 -2
- package/dist/esm-node/libs/render/cache/__tests__/cacheable.js +4 -1
- package/dist/esm-node/libs/render/cache/__tests__/error-configuration.js +4 -1
- package/dist/esm-node/libs/render/cache/__tests__/matched-cache.js +4 -1
- package/dist/esm-node/libs/render/cache/index.js +4 -1
- package/dist/esm-node/libs/render/cache/page-caches/index.js +4 -1
- package/dist/esm-node/libs/render/cache/page-caches/lru.js +4 -1
- package/dist/esm-node/libs/render/cache/spr.js +6 -2
- package/dist/esm-node/libs/render/cache/type.js +0 -1
- package/dist/esm-node/libs/render/cache/util.js +18 -8
- package/dist/esm-node/libs/render/index.js +4 -1
- package/dist/esm-node/libs/render/measure.js +6 -2
- package/dist/esm-node/libs/render/reader.js +12 -5
- package/dist/esm-node/libs/render/ssr.js +4 -1
- package/dist/esm-node/libs/render/static.js +4 -1
- package/dist/esm-node/libs/render/type.js +4 -1
- package/dist/esm-node/libs/render/utils.js +6 -2
- package/dist/esm-node/libs/reporter.js +4 -1
- package/dist/esm-node/libs/route/index.js +5 -2
- package/dist/esm-node/libs/route/matcher.js +4 -1
- package/dist/esm-node/libs/route/route.js +4 -1
- package/dist/esm-node/libs/serveFile.js +6 -2
- package/dist/esm-node/libs/serverTiming.js +4 -1
- package/dist/esm-node/renderHtml.js +72 -63
- package/dist/esm-node/server/index.js +6 -3
- package/dist/esm-node/server/modernServer.js +4 -1
- package/dist/esm-node/server/modernServerSplit.js +4 -1
- package/dist/esm-node/type.js +0 -1
- package/dist/esm-node/utils.js +20 -9
- package/dist/esm-node/workerServer.js +8 -4
- package/dist/types/libs/context/context.d.ts +1 -1
- package/dist/types/utils.d.ts +1 -1
- package/package.json +9 -9
|
@@ -1,32 +1,33 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
6
7
|
for (var name in all)
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
return base;
|
|
15
|
-
},
|
|
16
|
-
createAfterMatchContext: function() {
|
|
17
|
-
return createAfterMatchContext;
|
|
18
|
-
},
|
|
19
|
-
createAfterRenderContext: function() {
|
|
20
|
-
return createAfterRenderContext;
|
|
21
|
-
},
|
|
22
|
-
createMiddlewareContext: function() {
|
|
23
|
-
return createMiddlewareContext;
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
24
15
|
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var index_worker_exports = {};
|
|
20
|
+
__export(index_worker_exports, {
|
|
21
|
+
base: () => base,
|
|
22
|
+
createAfterMatchContext: () => createAfterMatchContext,
|
|
23
|
+
createAfterRenderContext: () => createAfterRenderContext,
|
|
24
|
+
createMiddlewareContext: () => createMiddlewareContext
|
|
25
25
|
});
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
26
|
+
module.exports = __toCommonJS(index_worker_exports);
|
|
27
|
+
var import_define_property = require("@swc/helpers/_/_define_property");
|
|
28
|
+
var import_base = require("./base");
|
|
29
|
+
var import_route = require("./route");
|
|
30
|
+
var import_template = require("./template");
|
|
30
31
|
class ServerResponse {
|
|
31
32
|
set statusCode(code) {
|
|
32
33
|
this.res.status = code;
|
|
@@ -49,8 +50,8 @@ class ServerResponse {
|
|
|
49
50
|
this.res.isSent = true;
|
|
50
51
|
}
|
|
51
52
|
constructor(res) {
|
|
52
|
-
|
|
53
|
-
|
|
53
|
+
(0, import_define_property._)(this, "locals", void 0);
|
|
54
|
+
(0, import_define_property._)(this, "res", void 0);
|
|
54
55
|
this.res = res;
|
|
55
56
|
this.locals = res.locals;
|
|
56
57
|
}
|
|
@@ -64,9 +65,9 @@ const base = (context) => {
|
|
|
64
65
|
headers[key] = value;
|
|
65
66
|
});
|
|
66
67
|
return {
|
|
67
|
-
response: new
|
|
68
|
+
response: new import_base.BaseResponse(serverResponse),
|
|
68
69
|
reporter,
|
|
69
|
-
request: new
|
|
70
|
+
request: new import_base.BaseRequest({
|
|
70
71
|
url: req.url,
|
|
71
72
|
host,
|
|
72
73
|
path: pathname,
|
|
@@ -82,14 +83,14 @@ const createAfterMatchContext = (context, entryName) => {
|
|
|
82
83
|
const baseContext = base(context);
|
|
83
84
|
return {
|
|
84
85
|
...baseContext,
|
|
85
|
-
router: new
|
|
86
|
+
router: new import_route.RouteAPI(entryName)
|
|
86
87
|
};
|
|
87
88
|
};
|
|
88
89
|
const createAfterRenderContext = (context, content) => {
|
|
89
90
|
const baseContext = base(context);
|
|
90
91
|
return {
|
|
91
92
|
...baseContext,
|
|
92
|
-
template: new
|
|
93
|
+
template: new import_template.TemplateAPI(content)
|
|
93
94
|
};
|
|
94
95
|
};
|
|
95
96
|
const createMiddlewareContext = (context) => {
|
|
@@ -108,3 +109,10 @@ const createMiddlewareContext = (context) => {
|
|
|
108
109
|
}
|
|
109
110
|
};
|
|
110
111
|
};
|
|
112
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
113
|
+
0 && (module.exports = {
|
|
114
|
+
base,
|
|
115
|
+
createAfterMatchContext,
|
|
116
|
+
createAfterRenderContext,
|
|
117
|
+
createMiddlewareContext
|
|
118
|
+
});
|
|
@@ -1,14 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
9
15
|
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var route_exports = {};
|
|
20
|
+
__export(route_exports, {
|
|
21
|
+
RouteAPI: () => RouteAPI
|
|
10
22
|
});
|
|
11
|
-
|
|
23
|
+
module.exports = __toCommonJS(route_exports);
|
|
24
|
+
var import_define_property = require("@swc/helpers/_/_define_property");
|
|
12
25
|
class RouteAPI {
|
|
13
26
|
redirect(url, status = 302) {
|
|
14
27
|
this.url = url;
|
|
@@ -21,11 +34,15 @@ class RouteAPI {
|
|
|
21
34
|
this.rewrite(entryName);
|
|
22
35
|
}
|
|
23
36
|
constructor(entryName) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
37
|
+
(0, import_define_property._)(this, "current", void 0);
|
|
38
|
+
(0, import_define_property._)(this, "status", void 0);
|
|
39
|
+
(0, import_define_property._)(this, "url", void 0);
|
|
27
40
|
this.current = entryName;
|
|
28
41
|
this.status = 200;
|
|
29
42
|
this.url = "";
|
|
30
43
|
}
|
|
31
44
|
}
|
|
45
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
46
|
+
0 && (module.exports = {
|
|
47
|
+
RouteAPI
|
|
48
|
+
});
|
|
@@ -1,23 +1,28 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
6
7
|
for (var name in all)
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
return RegList;
|
|
15
|
-
},
|
|
16
|
-
TemplateAPI: function() {
|
|
17
|
-
return TemplateAPI;
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
18
15
|
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var template_exports = {};
|
|
20
|
+
__export(template_exports, {
|
|
21
|
+
RegList: () => RegList,
|
|
22
|
+
TemplateAPI: () => TemplateAPI
|
|
19
23
|
});
|
|
20
|
-
|
|
24
|
+
module.exports = __toCommonJS(template_exports);
|
|
25
|
+
var import_define_property = require("@swc/helpers/_/_define_property");
|
|
21
26
|
const RegList = {
|
|
22
27
|
before: {
|
|
23
28
|
head: "<head>",
|
|
@@ -55,7 +60,12 @@ class TemplateAPI {
|
|
|
55
60
|
this.content = this.content.replace(reg, text);
|
|
56
61
|
}
|
|
57
62
|
constructor(content) {
|
|
58
|
-
|
|
63
|
+
(0, import_define_property._)(this, "content", void 0);
|
|
59
64
|
this.content = content;
|
|
60
65
|
}
|
|
61
66
|
}
|
|
67
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
68
|
+
0 && (module.exports = {
|
|
69
|
+
RegList,
|
|
70
|
+
TemplateAPI
|
|
71
|
+
});
|
|
@@ -1,35 +1,52 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
9
15
|
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var templateForStream_exports = {};
|
|
20
|
+
__export(templateForStream_exports, {
|
|
21
|
+
templateInjectableStream: () => templateInjectableStream
|
|
10
22
|
});
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
23
|
+
module.exports = __toCommonJS(templateForStream_exports);
|
|
24
|
+
var import_stream = require("stream");
|
|
25
|
+
var import_template = require("./template");
|
|
26
|
+
const templateInjectableStream = ({ prependHead, appendHead, prependBody, appendBody }) => new import_stream.Transform({
|
|
14
27
|
write(chunk, _, callback) {
|
|
15
28
|
let chunk_str = chunk.toString();
|
|
16
29
|
if (prependHead) {
|
|
17
|
-
const { head } =
|
|
30
|
+
const { head } = import_template.RegList.before;
|
|
18
31
|
chunk_str = chunk_str.replace(head, `${head}${prependHead}`);
|
|
19
32
|
}
|
|
20
33
|
if (appendHead) {
|
|
21
|
-
const { head } =
|
|
34
|
+
const { head } = import_template.RegList.after;
|
|
22
35
|
chunk_str = chunk_str.replace(head, `${appendHead}${head}`);
|
|
23
36
|
}
|
|
24
37
|
if (prependBody) {
|
|
25
|
-
const { body } =
|
|
38
|
+
const { body } = import_template.RegList.before;
|
|
26
39
|
chunk_str = chunk_str.replace(body, `${body}${prependBody}`);
|
|
27
40
|
}
|
|
28
41
|
if (appendBody) {
|
|
29
|
-
const { body } =
|
|
42
|
+
const { body } = import_template.RegList.after;
|
|
30
43
|
chunk_str = chunk_str.replace(body, `${appendBody}${body}`);
|
|
31
44
|
}
|
|
32
45
|
this.push(chunk_str);
|
|
33
46
|
callback();
|
|
34
47
|
}
|
|
35
48
|
});
|
|
49
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
50
|
+
0 && (module.exports = {
|
|
51
|
+
templateInjectableStream
|
|
52
|
+
});
|
|
@@ -1,37 +1,48 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
var __create = Object.create;
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
7
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __export = (target, all) => {
|
|
6
9
|
for (var name in all)
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
return getServerConfigPath;
|
|
15
|
-
},
|
|
16
|
-
requireConfig: function() {
|
|
17
|
-
return requireConfig;
|
|
18
|
-
},
|
|
19
|
-
loadConfig: function() {
|
|
20
|
-
return loadConfig;
|
|
10
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
11
|
+
};
|
|
12
|
+
var __copyProps = (to, from, except, desc) => {
|
|
13
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
14
|
+
for (let key of __getOwnPropNames(from))
|
|
15
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
16
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
21
17
|
}
|
|
18
|
+
return to;
|
|
19
|
+
};
|
|
20
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
22
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
23
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
24
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
25
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
26
|
+
mod
|
|
27
|
+
));
|
|
28
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
29
|
+
var loadConfig_exports = {};
|
|
30
|
+
__export(loadConfig_exports, {
|
|
31
|
+
getServerConfigPath: () => getServerConfigPath,
|
|
32
|
+
loadConfig: () => loadConfig,
|
|
33
|
+
requireConfig: () => requireConfig
|
|
22
34
|
});
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
const
|
|
28
|
-
const
|
|
29
|
-
const serverConfigPath = _path.join(distDirectory, serverConfigFile);
|
|
35
|
+
module.exports = __toCommonJS(loadConfig_exports);
|
|
36
|
+
var path = __toESM(require("path"));
|
|
37
|
+
var import_utils = require("@modern-js/utils");
|
|
38
|
+
var import_merge_deep = __toESM(require("merge-deep"));
|
|
39
|
+
const getServerConfigPath = (distDirectory, serverConfigFile = import_utils.DEFAULT_SERVER_CONFIG) => {
|
|
40
|
+
const serverConfigPath = path.join(distDirectory, serverConfigFile);
|
|
30
41
|
return `${serverConfigPath}.js`;
|
|
31
42
|
};
|
|
32
43
|
const requireConfig = (serverConfigPath) => {
|
|
33
|
-
if (
|
|
34
|
-
return (0,
|
|
44
|
+
if (import_utils.fs.pathExistsSync(serverConfigPath)) {
|
|
45
|
+
return (0, import_utils.compatRequire)(serverConfigPath);
|
|
35
46
|
}
|
|
36
47
|
return {};
|
|
37
48
|
};
|
|
@@ -39,15 +50,21 @@ const loadConfig = ({ cliConfig, serverConfig, resolvedConfigPath }) => {
|
|
|
39
50
|
let config = null;
|
|
40
51
|
if (process.env.NODE_ENV === "production") {
|
|
41
52
|
const resolvedConfig = requireConfig(resolvedConfigPath);
|
|
42
|
-
config = (0,
|
|
53
|
+
config = (0, import_merge_deep.default)({
|
|
43
54
|
...resolvedConfig,
|
|
44
55
|
plugins: []
|
|
45
56
|
}, serverConfig, cliConfig);
|
|
46
57
|
} else {
|
|
47
|
-
config = (0,
|
|
58
|
+
config = (0, import_merge_deep.default)({
|
|
48
59
|
...cliConfig,
|
|
49
60
|
plugins: []
|
|
50
61
|
}, serverConfig);
|
|
51
62
|
}
|
|
52
63
|
return config;
|
|
53
64
|
};
|
|
65
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
66
|
+
0 && (module.exports = {
|
|
67
|
+
getServerConfigPath,
|
|
68
|
+
loadConfig,
|
|
69
|
+
requireConfig
|
|
70
|
+
});
|
package/dist/cjs/libs/metrics.js
CHANGED
|
@@ -1,13 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
9
15
|
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var metrics_exports = {};
|
|
20
|
+
__export(metrics_exports, {
|
|
21
|
+
metrics: () => metrics
|
|
10
22
|
});
|
|
23
|
+
module.exports = __toCommonJS(metrics_exports);
|
|
11
24
|
const metrics = {
|
|
12
25
|
gauges() {
|
|
13
26
|
},
|
|
@@ -16,3 +29,7 @@ const metrics = {
|
|
|
16
29
|
emitTimer() {
|
|
17
30
|
}
|
|
18
31
|
};
|
|
32
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
33
|
+
0 && (module.exports = {
|
|
34
|
+
metrics
|
|
35
|
+
});
|
|
@@ -1,27 +1,40 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
9
15
|
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var flushServerHeader_exports = {};
|
|
20
|
+
__export(flushServerHeader_exports, {
|
|
21
|
+
flushServerHeader: () => flushServerHeader
|
|
10
22
|
});
|
|
11
|
-
|
|
12
|
-
|
|
23
|
+
module.exports = __toCommonJS(flushServerHeader_exports);
|
|
24
|
+
var import_parseLinks = require("./parseLinks");
|
|
25
|
+
var import_transformLinks2String = require("./transformLinks2String");
|
|
13
26
|
async function flushServerHeader({ serverConf, ctx, distDir, template, headers }) {
|
|
14
27
|
const { ssr: ssrConf } = serverConf || {};
|
|
15
28
|
if (typeof ssrConf !== "object") {
|
|
16
29
|
return;
|
|
17
30
|
}
|
|
18
31
|
const { res } = ctx;
|
|
19
|
-
const links = await (0,
|
|
32
|
+
const links = await (0, import_parseLinks.parseLinks)({
|
|
20
33
|
template,
|
|
21
34
|
distDir,
|
|
22
35
|
pathname: ctx.path
|
|
23
36
|
});
|
|
24
|
-
const link = (0,
|
|
37
|
+
const link = (0, import_transformLinks2String.transformLinks2String)(links, ssrConf.preload);
|
|
25
38
|
res.set("link", link);
|
|
26
39
|
for (const key in headers || {}) {
|
|
27
40
|
const value = headers === null || headers === void 0 ? void 0 : headers[key];
|
|
@@ -30,3 +43,7 @@ async function flushServerHeader({ serverConf, ctx, distDir, template, headers }
|
|
|
30
43
|
res.flushHeaders();
|
|
31
44
|
res.modernFlushedHeaders = true;
|
|
32
45
|
}
|
|
46
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
47
|
+
0 && (module.exports = {
|
|
48
|
+
flushServerHeader
|
|
49
|
+
});
|
|
@@ -1,7 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty
|
|
3
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __copyProps = (to, from, except, desc) => {
|
|
7
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
8
|
+
for (let key of __getOwnPropNames(from))
|
|
9
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
10
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
11
|
+
}
|
|
12
|
+
return to;
|
|
13
|
+
};
|
|
14
|
+
var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
|
|
15
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
16
|
+
var preload_exports = {};
|
|
17
|
+
module.exports = __toCommonJS(preload_exports);
|
|
18
|
+
__reExport(preload_exports, require("./parseLinks"), module.exports);
|
|
19
|
+
__reExport(preload_exports, require("./flushServerHeader"), module.exports);
|
|
20
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
21
|
+
0 && (module.exports = {
|
|
22
|
+
...require("./parseLinks"),
|
|
23
|
+
...require("./flushServerHeader")
|
|
4
24
|
});
|
|
5
|
-
const _export_star = require("@swc/helpers/_/_export_star");
|
|
6
|
-
_export_star._(require("./parseLinks"), exports);
|
|
7
|
-
_export_star._(require("./flushServerHeader"), exports);
|
|
@@ -1,26 +1,47 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
2
|
+
var __create = Object.create;
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
7
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __export = (target, all) => {
|
|
9
|
+
for (var name in all)
|
|
10
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
11
|
+
};
|
|
12
|
+
var __copyProps = (to, from, except, desc) => {
|
|
13
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
14
|
+
for (let key of __getOwnPropNames(from))
|
|
15
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
16
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
9
17
|
}
|
|
18
|
+
return to;
|
|
19
|
+
};
|
|
20
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
22
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
23
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
24
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
25
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
26
|
+
mod
|
|
27
|
+
));
|
|
28
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
29
|
+
var parseLinks_exports = {};
|
|
30
|
+
__export(parseLinks_exports, {
|
|
31
|
+
parseLinks: () => parseLinks
|
|
10
32
|
});
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
const _node = require("@modern-js/runtime-utils/node");
|
|
33
|
+
module.exports = __toCommonJS(parseLinks_exports);
|
|
34
|
+
var import_path = __toESM(require("path"));
|
|
35
|
+
var import_utils = require("@modern-js/utils");
|
|
36
|
+
var import_node_html_parser = require("node-html-parser");
|
|
37
|
+
var import_remix_router = require("@modern-js/runtime-utils/remix-router");
|
|
38
|
+
var import_node = require("@modern-js/runtime-utils/node");
|
|
18
39
|
async function parseLinks({ pathname, distDir, template }) {
|
|
19
40
|
const links = await parseLinksFromRoutes(pathname, distDir);
|
|
20
41
|
return links.concat(parseLinksFromHtml(template));
|
|
21
42
|
}
|
|
22
43
|
function parseLinksFromHtml(html) {
|
|
23
|
-
const root = (0,
|
|
44
|
+
const root = (0, import_node_html_parser.parse)(html);
|
|
24
45
|
const scripts = root.querySelectorAll("script").filter((elem) => Boolean(elem.getAttribute("src")));
|
|
25
46
|
const css = root.querySelectorAll("link").filter((elem) => {
|
|
26
47
|
const href = elem.getAttribute("href");
|
|
@@ -50,18 +71,18 @@ function parseLinksFromHtml(html) {
|
|
|
50
71
|
}
|
|
51
72
|
async function parseLinksFromRoutes(pathname, distDir) {
|
|
52
73
|
const noopLinks = [];
|
|
53
|
-
const nestedRoutesSpec =
|
|
54
|
-
const routesJsonPath =
|
|
55
|
-
const routeManifestPath =
|
|
56
|
-
if (!
|
|
74
|
+
const nestedRoutesSpec = import_path.default.join(distDir, import_utils.NESTED_ROUTE_SPEC_FILE);
|
|
75
|
+
const routesJsonPath = import_path.default.join(distDir, import_utils.ROUTE_SPEC_FILE);
|
|
76
|
+
const routeManifestPath = import_path.default.join(distDir, import_utils.ROUTE_MANIFEST_FILE);
|
|
77
|
+
if (!import_utils.fs.existsSync(nestedRoutesSpec) || !import_utils.fs.existsSync(routesJsonPath) || !import_utils.fs.existsSync(routeManifestPath)) {
|
|
57
78
|
return noopLinks;
|
|
58
79
|
}
|
|
59
|
-
const routesJson = await Promise.resolve(
|
|
80
|
+
const routesJson = await Promise.resolve().then(() => __toESM(require(routesJsonPath)));
|
|
60
81
|
const serverRoutes = routesJson.routes;
|
|
61
|
-
const entry = (0,
|
|
82
|
+
const entry = (0, import_node.matchEntry)(pathname, serverRoutes);
|
|
62
83
|
if (entry) {
|
|
63
84
|
var _routeAssets_entryName, _assets_filter, _assets_filter1;
|
|
64
|
-
const routes = await Promise.resolve(
|
|
85
|
+
const routes = await Promise.resolve().then(() => __toESM(require(nestedRoutesSpec)));
|
|
65
86
|
const { entryName } = entry;
|
|
66
87
|
if (!entryName) {
|
|
67
88
|
return noopLinks;
|
|
@@ -70,9 +91,9 @@ async function parseLinksFromRoutes(pathname, distDir) {
|
|
|
70
91
|
if (!entryRoutes) {
|
|
71
92
|
return noopLinks;
|
|
72
93
|
}
|
|
73
|
-
const routesManifest = await Promise.resolve(
|
|
94
|
+
const routesManifest = await Promise.resolve().then(() => __toESM(require(routeManifestPath)));
|
|
74
95
|
const { routeAssets } = routesManifest;
|
|
75
|
-
const matches = (0,
|
|
96
|
+
const matches = (0, import_remix_router.matchRoutes)(entryRoutes, pathname, entry.urlPath);
|
|
76
97
|
const entryAssets = (_routeAssets_entryName = routeAssets[entryName]) === null || _routeAssets_entryName === void 0 ? void 0 : _routeAssets_entryName.assets;
|
|
77
98
|
const assets = matches === null || matches === void 0 ? void 0 : matches.reduce((acc, match) => {
|
|
78
99
|
const routeId = match.route.id;
|
|
@@ -97,3 +118,7 @@ async function parseLinksFromRoutes(pathname, distDir) {
|
|
|
97
118
|
}
|
|
98
119
|
return noopLinks;
|
|
99
120
|
}
|
|
121
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
122
|
+
0 && (module.exports = {
|
|
123
|
+
parseLinks
|
|
124
|
+
});
|