@modern-js/prod-server 2.35.1 → 2.37.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
package/dist/esm/renderHtml.js
CHANGED
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
2
|
+
var __commonJS = (cb, mod) => function __require() {
|
|
3
|
+
return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
|
|
4
|
+
};
|
|
1
5
|
import { _ as _assert_this_initialized } from "@swc/helpers/_/_assert_this_initialized";
|
|
2
6
|
import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
|
|
3
7
|
import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
|
|
@@ -11,131 +15,136 @@ import { Readable } from "stream";
|
|
|
11
15
|
import { Socket } from "net";
|
|
12
16
|
import { Server } from "./server";
|
|
13
17
|
import { isRedirect } from "./utils";
|
|
14
|
-
var
|
|
15
|
-
"
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
}(Readable);
|
|
36
|
-
var ServerResponseLike = /* @__PURE__ */ function(OutgoingMessage2) {
|
|
37
|
-
"use strict";
|
|
38
|
-
_inherits(ServerResponseLike2, OutgoingMessage2);
|
|
39
|
-
var _super = _create_super(ServerResponseLike2);
|
|
40
|
-
function ServerResponseLike2() {
|
|
41
|
-
_class_call_check(this, ServerResponseLike2);
|
|
42
|
-
var _this;
|
|
43
|
-
_this = _super.call(this);
|
|
44
|
-
_define_property(_assert_this_initialized(_this), "statusCode", void 0);
|
|
45
|
-
_define_property(_assert_this_initialized(_this), "data", void 0);
|
|
46
|
-
_this.statusCode = 200;
|
|
47
|
-
_this.data = [];
|
|
48
|
-
return _this;
|
|
49
|
-
}
|
|
50
|
-
_create_class(ServerResponseLike2, [
|
|
51
|
-
{
|
|
52
|
-
key: "end",
|
|
53
|
-
value: function end(chunk, _encoding, cb) {
|
|
54
|
-
this.data.push(chunk.toString());
|
|
55
|
-
cb && cb();
|
|
56
|
-
this.emit("finish");
|
|
57
|
-
return this;
|
|
18
|
+
var require_renderHtml = __commonJS({
|
|
19
|
+
"src/renderHtml.ts"(exports, module) {
|
|
20
|
+
var IncomingMessageLike = /* @__PURE__ */ function(Readable2) {
|
|
21
|
+
"use strict";
|
|
22
|
+
_inherits(IncomingMessageLike2, Readable2);
|
|
23
|
+
var _super = _create_super(IncomingMessageLike2);
|
|
24
|
+
function IncomingMessageLike2(param) {
|
|
25
|
+
var method = param.method, url = param.url, headers = param.headers;
|
|
26
|
+
_class_call_check(this, IncomingMessageLike2);
|
|
27
|
+
var _this;
|
|
28
|
+
_this = _super.call(this);
|
|
29
|
+
_define_property(_assert_this_initialized(_this), "headers", void 0);
|
|
30
|
+
_define_property(_assert_this_initialized(_this), "method", void 0);
|
|
31
|
+
_define_property(_assert_this_initialized(_this), "url", void 0);
|
|
32
|
+
_define_property(_assert_this_initialized(_this), "socket", void 0);
|
|
33
|
+
_this.socket = new Socket();
|
|
34
|
+
_this.headers = headers || {};
|
|
35
|
+
_this.headers.host = "localhost:8080";
|
|
36
|
+
_this.method = method || "get";
|
|
37
|
+
_this.url = url;
|
|
38
|
+
return _this;
|
|
58
39
|
}
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
value: function render(req, res, _url) {
|
|
75
|
-
var _this = this;
|
|
76
|
-
return _async_to_generator(function() {
|
|
77
|
-
var handler;
|
|
78
|
-
return _ts_generator(this, function(_state) {
|
|
79
|
-
handler = _this.getRequestHandler();
|
|
80
|
-
handler(req, res);
|
|
81
|
-
return [
|
|
82
|
-
2,
|
|
83
|
-
null
|
|
84
|
-
];
|
|
85
|
-
});
|
|
86
|
-
})();
|
|
40
|
+
return IncomingMessageLike2;
|
|
41
|
+
}(Readable);
|
|
42
|
+
var ServerResponseLike = /* @__PURE__ */ function(OutgoingMessage2) {
|
|
43
|
+
"use strict";
|
|
44
|
+
_inherits(ServerResponseLike2, OutgoingMessage2);
|
|
45
|
+
var _super = _create_super(ServerResponseLike2);
|
|
46
|
+
function ServerResponseLike2() {
|
|
47
|
+
_class_call_check(this, ServerResponseLike2);
|
|
48
|
+
var _this;
|
|
49
|
+
_this = _super.call(this);
|
|
50
|
+
_define_property(_assert_this_initialized(_this), "statusCode", void 0);
|
|
51
|
+
_define_property(_assert_this_initialized(_this), "data", void 0);
|
|
52
|
+
_this.statusCode = 200;
|
|
53
|
+
_this.data = [];
|
|
54
|
+
return _this;
|
|
87
55
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
_renderHtml = _async_to_generator(function(param) {
|
|
97
|
-
var url, method, headers, body, serverOptions, req, res, customServer;
|
|
98
|
-
return _ts_generator(this, function(_state) {
|
|
99
|
-
switch (_state.label) {
|
|
100
|
-
case 0:
|
|
101
|
-
url = param.url, method = param.method, headers = param.headers, body = param.body, serverOptions = param.serverOptions;
|
|
102
|
-
req = new IncomingMessageLike({
|
|
103
|
-
method: method,
|
|
104
|
-
url: url,
|
|
105
|
-
headers: headers
|
|
106
|
-
});
|
|
107
|
-
if (body) {
|
|
108
|
-
req.push(body);
|
|
109
|
-
req.push(null);
|
|
56
|
+
_create_class(ServerResponseLike2, [
|
|
57
|
+
{
|
|
58
|
+
key: "end",
|
|
59
|
+
value: function end(chunk, _encoding, cb) {
|
|
60
|
+
this.data.push(chunk.toString());
|
|
61
|
+
cb && cb();
|
|
62
|
+
this.emit("finish");
|
|
63
|
+
return this;
|
|
110
64
|
}
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
return [
|
|
123
|
-
2,
|
|
124
|
-
new Promise(function(resolve) {
|
|
125
|
-
res.addListener("finish", function() {
|
|
126
|
-
resolve({
|
|
127
|
-
headers: res.getHeaders(),
|
|
128
|
-
redirected: isRedirect(res.statusCode),
|
|
129
|
-
status: res.statusCode,
|
|
130
|
-
url: url,
|
|
131
|
-
body: res.data.join()
|
|
132
|
-
});
|
|
133
|
-
});
|
|
134
|
-
})
|
|
135
|
-
];
|
|
65
|
+
}
|
|
66
|
+
]);
|
|
67
|
+
return ServerResponseLike2;
|
|
68
|
+
}(OutgoingMessage);
|
|
69
|
+
var CustomServer = /* @__PURE__ */ function(Server2) {
|
|
70
|
+
"use strict";
|
|
71
|
+
_inherits(CustomServer2, Server2);
|
|
72
|
+
var _super = _create_super(CustomServer2);
|
|
73
|
+
function CustomServer2() {
|
|
74
|
+
_class_call_check(this, CustomServer2);
|
|
75
|
+
return _super.apply(this, arguments);
|
|
136
76
|
}
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
77
|
+
_create_class(CustomServer2, [
|
|
78
|
+
{
|
|
79
|
+
key: "render",
|
|
80
|
+
value: function render(req, res, _url) {
|
|
81
|
+
var _this = this;
|
|
82
|
+
return _async_to_generator(function() {
|
|
83
|
+
var handler;
|
|
84
|
+
return _ts_generator(this, function(_state) {
|
|
85
|
+
handler = _this.getRequestHandler();
|
|
86
|
+
handler(req, res);
|
|
87
|
+
return [
|
|
88
|
+
2,
|
|
89
|
+
null
|
|
90
|
+
];
|
|
91
|
+
});
|
|
92
|
+
})();
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
]);
|
|
96
|
+
return CustomServer2;
|
|
97
|
+
}(Server);
|
|
98
|
+
function renderHtml(_) {
|
|
99
|
+
return _renderHtml.apply(this, arguments);
|
|
100
|
+
}
|
|
101
|
+
function _renderHtml() {
|
|
102
|
+
_renderHtml = _async_to_generator(function(param) {
|
|
103
|
+
var url, method, headers, body, serverOptions, req, res, customServer;
|
|
104
|
+
return _ts_generator(this, function(_state) {
|
|
105
|
+
switch (_state.label) {
|
|
106
|
+
case 0:
|
|
107
|
+
url = param.url, method = param.method, headers = param.headers, body = param.body, serverOptions = param.serverOptions;
|
|
108
|
+
req = new IncomingMessageLike({
|
|
109
|
+
method,
|
|
110
|
+
url,
|
|
111
|
+
headers
|
|
112
|
+
});
|
|
113
|
+
if (body) {
|
|
114
|
+
req.push(body);
|
|
115
|
+
req.push(null);
|
|
116
|
+
}
|
|
117
|
+
res = new ServerResponseLike();
|
|
118
|
+
customServer = new CustomServer(serverOptions);
|
|
119
|
+
return [
|
|
120
|
+
4,
|
|
121
|
+
customServer.init({
|
|
122
|
+
disableHttpServer: true
|
|
123
|
+
})
|
|
124
|
+
];
|
|
125
|
+
case 1:
|
|
126
|
+
_state.sent();
|
|
127
|
+
customServer.render(req, res);
|
|
128
|
+
return [
|
|
129
|
+
2,
|
|
130
|
+
new Promise(function(resolve) {
|
|
131
|
+
res.addListener("finish", function() {
|
|
132
|
+
resolve({
|
|
133
|
+
headers: res.getHeaders(),
|
|
134
|
+
redirected: isRedirect(res.statusCode),
|
|
135
|
+
status: res.statusCode,
|
|
136
|
+
url,
|
|
137
|
+
body: res.data.join()
|
|
138
|
+
});
|
|
139
|
+
});
|
|
140
|
+
})
|
|
141
|
+
];
|
|
142
|
+
}
|
|
143
|
+
});
|
|
144
|
+
});
|
|
145
|
+
return _renderHtml.apply(this, arguments);
|
|
146
|
+
}
|
|
147
|
+
module.exports = renderHtml;
|
|
148
|
+
}
|
|
149
|
+
});
|
|
150
|
+
export default require_renderHtml();
|
package/dist/esm/server/index.js
CHANGED
|
@@ -7,13 +7,13 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
|
|
|
7
7
|
import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
|
|
8
8
|
import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
9
9
|
import path from "path";
|
|
10
|
-
import { fs,
|
|
10
|
+
import { fs, createLogger, SHARED_DIR, OUTPUT_CONFIG_FILE, dotenv, dotenvExpand, INTERNAL_SERVER_PLUGINS, ensureAbsolutePath } from "@modern-js/utils";
|
|
11
11
|
import { serverManager, AppContext, ConfigContext, loadPlugins } from "@modern-js/server-core";
|
|
12
12
|
import { metrics as defaultMetrics } from "../libs/metrics";
|
|
13
13
|
import { loadConfig, getServerConfigPath, requireConfig } from "../libs/loadConfig";
|
|
14
14
|
import { debug } from "../utils";
|
|
15
15
|
import { createProdServer } from "./modernServerSplit";
|
|
16
|
-
|
|
16
|
+
var Server = /* @__PURE__ */ function() {
|
|
17
17
|
"use strict";
|
|
18
18
|
function Server2(options) {
|
|
19
19
|
_class_call_check(this, Server2);
|
|
@@ -23,7 +23,7 @@ export var Server = /* @__PURE__ */ function() {
|
|
|
23
23
|
_define_property(this, "app", void 0);
|
|
24
24
|
_define_property(this, "runner", void 0);
|
|
25
25
|
_define_property(this, "serverConfig", void 0);
|
|
26
|
-
options.logger = options.logger ||
|
|
26
|
+
options.logger = options.logger || createLogger({
|
|
27
27
|
level: "warn"
|
|
28
28
|
});
|
|
29
29
|
options.metrics = options.metrics || defaultMetrics;
|
|
@@ -202,7 +202,7 @@ export var Server = /* @__PURE__ */ function() {
|
|
|
202
202
|
options.config = loadConfig({
|
|
203
203
|
cliConfig: config,
|
|
204
204
|
serverConfig: finalServerConfig,
|
|
205
|
-
resolvedConfigPath
|
|
205
|
+
resolvedConfigPath
|
|
206
206
|
});
|
|
207
207
|
return [
|
|
208
208
|
2
|
|
@@ -282,7 +282,7 @@ export var Server = /* @__PURE__ */ function() {
|
|
|
282
282
|
_options_internalPlugins = options.internalPlugins, internalPlugins = _options_internalPlugins === void 0 ? INTERNAL_SERVER_PLUGINS : _options_internalPlugins, pwd = options.pwd, _options_plugins = options.plugins, plugins = _options_plugins === void 0 ? [] : _options_plugins;
|
|
283
283
|
serverPlugins = _this.serverConfig.plugins || [];
|
|
284
284
|
loadedPlugins = loadPlugins(pwd, _to_consumable_array(serverPlugins).concat(_to_consumable_array(plugins)), {
|
|
285
|
-
internalPlugins
|
|
285
|
+
internalPlugins
|
|
286
286
|
});
|
|
287
287
|
debug("plugins", loadedPlugins);
|
|
288
288
|
loadedPlugins.forEach(function(p) {
|
|
@@ -334,7 +334,7 @@ export var Server = /* @__PURE__ */ function() {
|
|
|
334
334
|
};
|
|
335
335
|
});
|
|
336
336
|
return {
|
|
337
|
-
appDirectory
|
|
337
|
+
appDirectory,
|
|
338
338
|
apiDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory,
|
|
339
339
|
lambdaDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.lambdaDirectory,
|
|
340
340
|
sharedDirectory: (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || path.resolve(appDirectory, SHARED_DIR),
|
|
@@ -411,3 +411,6 @@ export var Server = /* @__PURE__ */ function() {
|
|
|
411
411
|
]);
|
|
412
412
|
return Server2;
|
|
413
413
|
}();
|
|
414
|
+
export {
|
|
415
|
+
Server
|
|
416
|
+
};
|
|
@@ -19,7 +19,7 @@ import { createContext } from "../libs/context";
|
|
|
19
19
|
import { AGGRED_DIR, ERROR_DIGEST, ERROR_PAGE_TEXT, RUN_MODE, ServerReportTimings } from "../constants";
|
|
20
20
|
import { createAfterMatchContext, createAfterRenderContext, createMiddlewareContext } from "../libs/hook-api";
|
|
21
21
|
var SERVER_DIR = "./server";
|
|
22
|
-
|
|
22
|
+
var ModernServer = /* @__PURE__ */ function() {
|
|
23
23
|
"use strict";
|
|
24
24
|
function ModernServer2(param) {
|
|
25
25
|
var pwd = param.pwd, config = param.config, routes = param.routes, staticGenerate = param.staticGenerate, logger = param.logger, metrics = param.metrics, runMode = param.runMode, proxyTarget = param.proxyTarget, appContext = param.appContext;
|
|
@@ -128,12 +128,12 @@ export var ModernServer = /* @__PURE__ */ function() {
|
|
|
128
128
|
var ssrConfig = (_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.ssr;
|
|
129
129
|
var forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
|
|
130
130
|
return createRenderHandler({
|
|
131
|
-
distDir
|
|
132
|
-
staticGenerate
|
|
133
|
-
forceCSR
|
|
131
|
+
distDir,
|
|
132
|
+
staticGenerate,
|
|
133
|
+
forceCSR,
|
|
134
134
|
conf: this.conf,
|
|
135
135
|
nonce: (_conf_security = conf.security) === null || _conf_security === void 0 ? void 0 : _conf_security.nonce,
|
|
136
|
-
metaName
|
|
136
|
+
metaName
|
|
137
137
|
});
|
|
138
138
|
}
|
|
139
139
|
},
|
|
@@ -245,8 +245,8 @@ export var ModernServer = /* @__PURE__ */ function() {
|
|
|
245
245
|
return [
|
|
246
246
|
4,
|
|
247
247
|
_this.prepareFrameHandler({
|
|
248
|
-
onlyWeb
|
|
249
|
-
onlyApi
|
|
248
|
+
onlyWeb,
|
|
249
|
+
onlyApi
|
|
250
250
|
})
|
|
251
251
|
];
|
|
252
252
|
case 1:
|
|
@@ -310,7 +310,7 @@ export var ModernServer = /* @__PURE__ */ function() {
|
|
|
310
310
|
4,
|
|
311
311
|
runner.prepareLoaderHandler({
|
|
312
312
|
serverRoutes: specs,
|
|
313
|
-
distDir
|
|
313
|
+
distDir
|
|
314
314
|
}, {
|
|
315
315
|
onLast: function() {
|
|
316
316
|
return null;
|
|
@@ -590,7 +590,7 @@ export var ModernServer = /* @__PURE__ */ function() {
|
|
|
590
590
|
4,
|
|
591
591
|
_this.routeRenderHandler({
|
|
592
592
|
ctx: context,
|
|
593
|
-
route
|
|
593
|
+
route,
|
|
594
594
|
runner: _this.runner
|
|
595
595
|
})
|
|
596
596
|
];
|
|
@@ -986,7 +986,7 @@ export var ModernServer = /* @__PURE__ */ function() {
|
|
|
986
986
|
return [
|
|
987
987
|
4,
|
|
988
988
|
_this.routeRenderHandler({
|
|
989
|
-
route
|
|
989
|
+
route,
|
|
990
990
|
ctx: context,
|
|
991
991
|
runner: _this.runner
|
|
992
992
|
})
|
|
@@ -1023,3 +1023,6 @@ export var ModernServer = /* @__PURE__ */ function() {
|
|
|
1023
1023
|
]);
|
|
1024
1024
|
return ModernServer2;
|
|
1025
1025
|
}();
|
|
1026
|
+
export {
|
|
1027
|
+
ModernServer
|
|
1028
|
+
};
|
|
@@ -122,7 +122,7 @@ var ModernWebServer = /* @__PURE__ */ function(ModernServer2) {
|
|
|
122
122
|
]);
|
|
123
123
|
return ModernWebServer2;
|
|
124
124
|
}(ModernServer);
|
|
125
|
-
|
|
125
|
+
var createProdServer = function(options) {
|
|
126
126
|
if (options.apiOnly) {
|
|
127
127
|
return new ModernAPIServer(options);
|
|
128
128
|
} else if (options.ssrOnly) {
|
|
@@ -133,3 +133,6 @@ export var createProdServer = function(options) {
|
|
|
133
133
|
return new ModernServer(options);
|
|
134
134
|
}
|
|
135
135
|
};
|
|
136
|
+
export {
|
|
137
|
+
createProdServer
|
|
138
|
+
};
|
package/dist/esm/type.js
CHANGED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
package/dist/esm/utils.js
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
|
|
2
2
|
import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
|
|
3
3
|
import { createDebugger } from "@modern-js/utils";
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
var debug = createDebugger("prod-server");
|
|
5
|
+
var mergeExtension = function(users) {
|
|
6
6
|
var output = [];
|
|
7
7
|
return {
|
|
8
8
|
middleware: output.concat(users)
|
|
9
9
|
};
|
|
10
10
|
};
|
|
11
|
-
|
|
11
|
+
var noop = function() {
|
|
12
12
|
};
|
|
13
|
-
|
|
13
|
+
var createErrorDocument = function(status, text) {
|
|
14
14
|
var title = "".concat(status, ": ").concat(text);
|
|
15
15
|
return '<!DOCTYPE html>\n <html lang="en">\n <head>\n <meta charset="utf-8">\n <meta name="viewport" content="width=device-width">\n <title>'.concat(title, '</title>\n <style>\n html,body {\n margin: 0;\n }\n\n .page-container {\n color: #000;\n background: #fff;\n height: 100vh;\n text-align: center;\n display: flex;\n flex-direction: column;\n align-items: center;\n justify-content: center;\n }\n </style>\n </head>\n <body>\n <div class="page-container">\n <h1>').concat(status, "</h1>\n <div>").concat(text, "</div>\n </body>\n </html>\n ");
|
|
16
16
|
};
|
|
17
|
-
|
|
17
|
+
var createMiddlewareCollecter = function() {
|
|
18
18
|
var webMiddlewares = [];
|
|
19
19
|
var apiMiddlewares = [];
|
|
20
20
|
var addWebMiddleware = function(input) {
|
|
@@ -30,12 +30,12 @@ export var createMiddlewareCollecter = function() {
|
|
|
30
30
|
};
|
|
31
31
|
};
|
|
32
32
|
return {
|
|
33
|
-
getMiddlewares
|
|
34
|
-
addWebMiddleware
|
|
35
|
-
addAPIMiddleware
|
|
33
|
+
getMiddlewares,
|
|
34
|
+
addWebMiddleware,
|
|
35
|
+
addAPIMiddleware
|
|
36
36
|
};
|
|
37
37
|
};
|
|
38
|
-
|
|
38
|
+
var getStaticReg = function() {
|
|
39
39
|
var output = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, html = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, prefix = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "/";
|
|
40
40
|
var tmp = output.distPath, _ref = tmp === void 0 ? {} : tmp, cssPath = _ref.css, jsPath = _ref.js, mediaPath = _ref.media;
|
|
41
41
|
var favicon = html.favicon, faviconByEntries = html.faviconByEntries;
|
|
@@ -59,7 +59,7 @@ export var getStaticReg = function() {
|
|
|
59
59
|
var staticPathRegExp = new RegExp("^".concat(regPrefix, "(").concat(_to_consumable_array(staticReg).concat(_to_consumable_array(iconReg)).join("|"), ")"));
|
|
60
60
|
return staticPathRegExp;
|
|
61
61
|
};
|
|
62
|
-
|
|
62
|
+
var prepareFavicons = function(favicon, faviconByEntries) {
|
|
63
63
|
var faviconNames = [];
|
|
64
64
|
if (favicon) {
|
|
65
65
|
faviconNames.push(favicon.substring(favicon.lastIndexOf("/") + 1));
|
|
@@ -74,7 +74,7 @@ export var prepareFavicons = function(favicon, faviconByEntries) {
|
|
|
74
74
|
}
|
|
75
75
|
return faviconNames;
|
|
76
76
|
};
|
|
77
|
-
|
|
77
|
+
var headersWithoutCookie = function(headers) {
|
|
78
78
|
if (typeof headers.cookie !== "undefined") {
|
|
79
79
|
var safeHeaders = _object_spread({}, headers);
|
|
80
80
|
delete safeHeaders.cookie;
|
|
@@ -82,7 +82,7 @@ export var headersWithoutCookie = function(headers) {
|
|
|
82
82
|
}
|
|
83
83
|
return headers;
|
|
84
84
|
};
|
|
85
|
-
|
|
85
|
+
var isRedirect = function(code) {
|
|
86
86
|
return [
|
|
87
87
|
301,
|
|
88
88
|
302,
|
|
@@ -90,3 +90,14 @@ export var isRedirect = function(code) {
|
|
|
90
90
|
308
|
|
91
91
|
].includes(code);
|
|
92
92
|
};
|
|
93
|
+
export {
|
|
94
|
+
createErrorDocument,
|
|
95
|
+
createMiddlewareCollecter,
|
|
96
|
+
debug,
|
|
97
|
+
getStaticReg,
|
|
98
|
+
headersWithoutCookie,
|
|
99
|
+
isRedirect,
|
|
100
|
+
mergeExtension,
|
|
101
|
+
noop,
|
|
102
|
+
prepareFavicons
|
|
103
|
+
};
|
package/dist/esm/workerServer.js
CHANGED
|
@@ -5,12 +5,12 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
|
|
|
5
5
|
import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
|
|
6
6
|
import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
7
7
|
import { createAsyncPipeline } from "@modern-js/plugin";
|
|
8
|
-
import {
|
|
8
|
+
import { createLogger } from "@modern-js/utils/logger";
|
|
9
9
|
import { createAfterMatchContext, createAfterRenderContext, createMiddlewareContext } from "./libs/hook-api/index.worker";
|
|
10
10
|
import { RouteMatchManager } from "./libs/route";
|
|
11
11
|
import { metrics as defaultMetrics } from "./libs/metrics";
|
|
12
12
|
import { defaultReporter } from "./libs/reporter";
|
|
13
|
-
|
|
13
|
+
var ReturnResponse = /* @__PURE__ */ function() {
|
|
14
14
|
"use strict";
|
|
15
15
|
function ReturnResponse2(body, status) {
|
|
16
16
|
var headers = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
|
|
@@ -86,7 +86,7 @@ var checkIsSent = function(context) {
|
|
|
86
86
|
return false;
|
|
87
87
|
};
|
|
88
88
|
var middlewarePipeline = createAsyncPipeline();
|
|
89
|
-
|
|
89
|
+
var createHandler = function(manifest) {
|
|
90
90
|
var routeMgr = new RouteMatchManager();
|
|
91
91
|
var pages = manifest.pages, routes = manifest.routes;
|
|
92
92
|
routeMgr.reset(routes);
|
|
@@ -104,11 +104,11 @@ export var createHandler = function(manifest) {
|
|
|
104
104
|
return {
|
|
105
105
|
url: url2.href,
|
|
106
106
|
baseUrl: baseUrl2,
|
|
107
|
-
pathname
|
|
108
|
-
host
|
|
109
|
-
headers
|
|
107
|
+
pathname,
|
|
108
|
+
host,
|
|
109
|
+
headers,
|
|
110
110
|
params: params2,
|
|
111
|
-
query
|
|
111
|
+
query
|
|
112
112
|
};
|
|
113
113
|
}
|
|
114
114
|
return _ts_generator(this, function(_state) {
|
|
@@ -125,7 +125,7 @@ export var createHandler = function(manifest) {
|
|
|
125
125
|
}
|
|
126
126
|
entryName = pageMatch.spec.urlPath;
|
|
127
127
|
page = pages[entryName];
|
|
128
|
-
logger =
|
|
128
|
+
logger = createLogger({
|
|
129
129
|
level: "warn"
|
|
130
130
|
});
|
|
131
131
|
metrics = defaultMetrics;
|
|
@@ -178,14 +178,14 @@ export var createHandler = function(manifest) {
|
|
|
178
178
|
serverRenderContext = {
|
|
179
179
|
request: createServerRequest(url, baseUrl, request, params),
|
|
180
180
|
response: responseLike,
|
|
181
|
-
loadableStats
|
|
182
|
-
routeManifest
|
|
181
|
+
loadableStats,
|
|
182
|
+
routeManifest,
|
|
183
183
|
redirection: {},
|
|
184
184
|
template: page.template,
|
|
185
185
|
entryName: page.entryName,
|
|
186
|
-
logger
|
|
186
|
+
logger,
|
|
187
187
|
reporter: defaultReporter,
|
|
188
|
-
metrics
|
|
188
|
+
metrics,
|
|
189
189
|
req: request,
|
|
190
190
|
res: responseLike,
|
|
191
191
|
serverTiming: {
|
|
@@ -254,11 +254,11 @@ function createWorkerHookContext(url, logger, metrics, reporter) {
|
|
|
254
254
|
new Request(url)
|
|
255
255
|
], res = _ref[0], req = _ref[1];
|
|
256
256
|
return {
|
|
257
|
-
res
|
|
258
|
-
req
|
|
259
|
-
logger
|
|
260
|
-
metrics
|
|
261
|
-
reporter
|
|
257
|
+
res,
|
|
258
|
+
req,
|
|
259
|
+
logger,
|
|
260
|
+
metrics,
|
|
261
|
+
reporter
|
|
262
262
|
};
|
|
263
263
|
}
|
|
264
264
|
function applyMiddlewares(ctx, middleware) {
|
|
@@ -282,3 +282,7 @@ function applyMiddlewares(ctx, middleware) {
|
|
|
282
282
|
});
|
|
283
283
|
}
|
|
284
284
|
}
|
|
285
|
+
export {
|
|
286
|
+
ReturnResponse,
|
|
287
|
+
createHandler
|
|
288
|
+
};
|
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
|
|
1
|
+
const AGGRED_DIR = {
|
|
2
2
|
mock: "config/mock",
|
|
3
3
|
server: "server",
|
|
4
4
|
api: "api",
|
|
5
5
|
shared: "shared",
|
|
6
6
|
lambda: "lambda"
|
|
7
7
|
};
|
|
8
|
-
|
|
8
|
+
var ApiServerMode;
|
|
9
9
|
(function(ApiServerMode2) {
|
|
10
10
|
ApiServerMode2["func"] = "function";
|
|
11
11
|
ApiServerMode2["frame"] = "framework";
|
|
12
12
|
})(ApiServerMode || (ApiServerMode = {}));
|
|
13
|
-
|
|
13
|
+
const ERROR_DIGEST = {
|
|
14
14
|
INIT: "Server init error",
|
|
15
15
|
ENOTF: "Page could not be found",
|
|
16
16
|
WARMUP: "SSR warmup failed",
|
|
@@ -18,18 +18,26 @@ export const ERROR_DIGEST = {
|
|
|
18
18
|
ERENDER: "SSR render failed",
|
|
19
19
|
EMICROINJ: "Get micro-frontend info failed"
|
|
20
20
|
};
|
|
21
|
-
|
|
21
|
+
const ERROR_PAGE_TEXT = {
|
|
22
22
|
404: "This page could not be found.",
|
|
23
23
|
500: "Internal Server Error."
|
|
24
24
|
};
|
|
25
|
-
|
|
25
|
+
const RUN_MODE = {
|
|
26
26
|
FULL: "full",
|
|
27
27
|
TYPE: "type"
|
|
28
28
|
};
|
|
29
|
-
|
|
29
|
+
var ServerReportTimings;
|
|
30
30
|
(function(ServerReportTimings2) {
|
|
31
31
|
ServerReportTimings2["SERVER_HANDLE_REQUEST"] = "server-handle-request";
|
|
32
32
|
ServerReportTimings2["SERVER_MIDDLEWARE"] = "server-middleware";
|
|
33
33
|
ServerReportTimings2["SERVER_HOOK_AFTER_RENDER"] = "server-hook-after-render";
|
|
34
34
|
ServerReportTimings2["SERVER_HOOK_AFTER_MATCH"] = "server-hook-after-match";
|
|
35
35
|
})(ServerReportTimings || (ServerReportTimings = {}));
|
|
36
|
+
export {
|
|
37
|
+
AGGRED_DIR,
|
|
38
|
+
ApiServerMode,
|
|
39
|
+
ERROR_DIGEST,
|
|
40
|
+
ERROR_PAGE_TEXT,
|
|
41
|
+
RUN_MODE,
|
|
42
|
+
ServerReportTimings
|
|
43
|
+
};
|
package/dist/esm-node/index.js
CHANGED
|
@@ -1,14 +1,20 @@
|
|
|
1
1
|
import { Server } from "./server";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
export { createProxyHandler } from "./libs/proxy";
|
|
2
|
+
import { ModernServer } from "./server/modernServer";
|
|
3
|
+
import { createProxyHandler } from "./libs/proxy";
|
|
5
4
|
export * from "./type";
|
|
6
5
|
export * from "./constants";
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
import { createRenderHandler } from "./libs/render";
|
|
7
|
+
var src_default = (options) => {
|
|
9
8
|
if (options == null) {
|
|
10
9
|
throw new Error("can not start mserver without options");
|
|
11
10
|
}
|
|
12
11
|
const server = new Server(options);
|
|
13
12
|
return server.init();
|
|
14
13
|
};
|
|
14
|
+
export {
|
|
15
|
+
ModernServer,
|
|
16
|
+
Server,
|
|
17
|
+
createProxyHandler,
|
|
18
|
+
createRenderHandler,
|
|
19
|
+
src_default as default
|
|
20
|
+
};
|