@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,16 +1,38 @@
|
|
|
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 lru_exports = {};
|
|
30
|
+
__export(lru_exports, {
|
|
31
|
+
LRUCaches: () => LRUCaches
|
|
10
32
|
});
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
33
|
+
module.exports = __toCommonJS(lru_exports);
|
|
34
|
+
var import_define_property = require("@swc/helpers/_/_define_property");
|
|
35
|
+
var import_lru_cache = __toESM(require("lru-cache"));
|
|
14
36
|
class LRUCaches {
|
|
15
37
|
init() {
|
|
16
38
|
return Promise.resolve();
|
|
@@ -32,9 +54,13 @@ class LRUCaches {
|
|
|
32
54
|
this.caches.del(key);
|
|
33
55
|
}
|
|
34
56
|
constructor(options) {
|
|
35
|
-
|
|
36
|
-
|
|
57
|
+
(0, import_define_property._)(this, "caches", void 0);
|
|
58
|
+
(0, import_define_property._)(this, "max", void 0);
|
|
37
59
|
this.max = options.max;
|
|
38
|
-
this.caches = new
|
|
60
|
+
this.caches = new import_lru_cache.default(this.max);
|
|
39
61
|
}
|
|
40
62
|
}
|
|
63
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
64
|
+
0 && (module.exports = {
|
|
65
|
+
LRUCaches
|
|
66
|
+
});
|
|
@@ -1,29 +1,43 @@
|
|
|
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 createCache;
|
|
15
|
-
},
|
|
16
|
-
destroyCache: function() {
|
|
17
|
-
return destroyCache;
|
|
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 });
|
|
18
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 spr_exports = {};
|
|
30
|
+
__export(spr_exports, {
|
|
31
|
+
createCache: () => createCache,
|
|
32
|
+
destroyCache: () => destroyCache
|
|
19
33
|
});
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
34
|
+
module.exports = __toCommonJS(spr_exports);
|
|
35
|
+
var import_define_property = require("@swc/helpers/_/_define_property");
|
|
36
|
+
var import_crypto = __toESM(require("crypto"));
|
|
37
|
+
var import_lru_cache = __toESM(require("lru-cache"));
|
|
38
|
+
var import_utils = require("@modern-js/utils");
|
|
39
|
+
var import_util = require("./util");
|
|
40
|
+
var import_page_caches = require("./page-caches");
|
|
27
41
|
const MAX_CACHE_EACH_REQ = Number(process.env.ROUTE_CACHE_LIMIT) || 10;
|
|
28
42
|
const MAX_SIZE_EACH_CLUSTER = Number(process.env.CLUSTER_CACHE_LIMIT) || 100;
|
|
29
43
|
const BASE_LEVEL = 0;
|
|
@@ -32,7 +46,7 @@ const HEADER_LEVEL = 2;
|
|
|
32
46
|
const QUERY_HEADER_LEVEL = 3;
|
|
33
47
|
class CacheManager {
|
|
34
48
|
md5(content) {
|
|
35
|
-
const md5 =
|
|
49
|
+
const md5 = import_crypto.default.createHash("md5");
|
|
36
50
|
return md5.update(content).digest("hex");
|
|
37
51
|
}
|
|
38
52
|
generateRequestKey(context) {
|
|
@@ -53,7 +67,7 @@ class CacheManager {
|
|
|
53
67
|
}
|
|
54
68
|
factor(keys, obj, matches = {}) {
|
|
55
69
|
keys.sort();
|
|
56
|
-
const getValue = (0,
|
|
70
|
+
const getValue = (0, import_util.valueFactory)(obj);
|
|
57
71
|
const factorAry = keys.reduce((ary, key) => {
|
|
58
72
|
let value = getValue(key) || "";
|
|
59
73
|
const matcher = matches[key];
|
|
@@ -91,7 +105,7 @@ class CacheManager {
|
|
|
91
105
|
}
|
|
92
106
|
async best(context, cacheKey, data) {
|
|
93
107
|
const { level } = data;
|
|
94
|
-
const cacheHash = this.find[(0,
|
|
108
|
+
const cacheHash = this.find[(0, import_util.fname)(level)](context, cacheKey, data);
|
|
95
109
|
if (!cacheHash) {
|
|
96
110
|
return null;
|
|
97
111
|
}
|
|
@@ -122,7 +136,7 @@ class CacheManager {
|
|
|
122
136
|
const isGarbage = limitTime ? Date.now() - limitTime > 0 : false;
|
|
123
137
|
return {
|
|
124
138
|
content: html || "",
|
|
125
|
-
contentType:
|
|
139
|
+
contentType: import_utils.mime.contentType("html"),
|
|
126
140
|
isStale,
|
|
127
141
|
isGarbage,
|
|
128
142
|
hash: cacheHash
|
|
@@ -135,17 +149,17 @@ class CacheManager {
|
|
|
135
149
|
const cacheKey = this.generateRequestKey(context);
|
|
136
150
|
let data = this.cache.get(cacheKey);
|
|
137
151
|
if (!data) {
|
|
138
|
-
const caches = await (0,
|
|
152
|
+
const caches = await (0, import_page_caches.createPageCaches)(MAX_CACHE_EACH_REQ);
|
|
139
153
|
data = this.createCacheContent(cacheConfig, caches);
|
|
140
154
|
}
|
|
141
|
-
const cacheHash = this.find[(0,
|
|
155
|
+
const cacheHash = this.find[(0, import_util.fname)(cacheConfig.level)](context, cacheKey, data);
|
|
142
156
|
if (!cacheHash) {
|
|
143
157
|
return false;
|
|
144
158
|
}
|
|
145
159
|
const cacheSyncOrAsync = async () => {
|
|
146
160
|
const next = data;
|
|
147
161
|
const limit = cacheConfig.staleLimit;
|
|
148
|
-
const storeHTML = (0,
|
|
162
|
+
const storeHTML = (0, import_util.cacheAddition)(html, cacheHash);
|
|
149
163
|
const size = storeHTML.length;
|
|
150
164
|
await next.caches.set(cacheHash, {
|
|
151
165
|
expireTime: Date.now() + cacheConfig.interval * 1e3,
|
|
@@ -157,8 +171,8 @@ class CacheManager {
|
|
|
157
171
|
this.cache.set(cacheKey, next);
|
|
158
172
|
return true;
|
|
159
173
|
};
|
|
160
|
-
const doCache = (0,
|
|
161
|
-
return (0,
|
|
174
|
+
const doCache = (0, import_util.withCoalescedInvoke)(cacheSyncOrAsync).bind(null, (0, import_util.namespaceHash)("stream", cacheHash), []);
|
|
175
|
+
return (0, import_util.maybeSync)(doCache)(sync);
|
|
162
176
|
}
|
|
163
177
|
async del(context, cacheHash) {
|
|
164
178
|
const cacheKey = this.generateRequestKey(context);
|
|
@@ -166,42 +180,42 @@ class CacheManager {
|
|
|
166
180
|
data === null || data === void 0 ? void 0 : data.caches.del(cacheHash);
|
|
167
181
|
}
|
|
168
182
|
constructor(cacheOptions) {
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
183
|
+
(0, import_define_property._)(this, "cache", void 0);
|
|
184
|
+
(0, import_define_property._)(this, "cacheOptions", void 0);
|
|
185
|
+
(0, import_define_property._)(this, "find", (() => {
|
|
172
186
|
{
|
|
173
187
|
const _this = this;
|
|
174
188
|
return {
|
|
175
|
-
[(0,
|
|
189
|
+
[(0, import_util.fname)(BASE_LEVEL)](context, cacheKey) {
|
|
176
190
|
return _this.md5(cacheKey);
|
|
177
191
|
},
|
|
178
|
-
[(0,
|
|
192
|
+
[(0, import_util.fname)(QUERY_LEVEL)](context, cacheKey, data) {
|
|
179
193
|
const queryFactor = _this.queryFactor(context, data);
|
|
180
194
|
if (!queryFactor) {
|
|
181
195
|
return null;
|
|
182
196
|
}
|
|
183
|
-
return _this.md5((0,
|
|
197
|
+
return _this.md5((0, import_util.connectFactor)(cacheKey, queryFactor));
|
|
184
198
|
},
|
|
185
|
-
[(0,
|
|
199
|
+
[(0, import_util.fname)(HEADER_LEVEL)](context, cacheKey, data) {
|
|
186
200
|
const headerFactor = _this.headerFactor(context, data);
|
|
187
201
|
if (!headerFactor) {
|
|
188
202
|
return null;
|
|
189
203
|
}
|
|
190
|
-
return _this.md5((0,
|
|
204
|
+
return _this.md5((0, import_util.connectFactor)(cacheKey, headerFactor));
|
|
191
205
|
},
|
|
192
|
-
[(0,
|
|
206
|
+
[(0, import_util.fname)(QUERY_HEADER_LEVEL)](context, cacheKey, data) {
|
|
193
207
|
const queryFactor = _this.queryFactor(context, data);
|
|
194
208
|
const headerFactor = _this.headerFactor(context, data);
|
|
195
209
|
if (!queryFactor || !headerFactor) {
|
|
196
210
|
return null;
|
|
197
211
|
}
|
|
198
|
-
return _this.md5((0,
|
|
212
|
+
return _this.md5((0, import_util.connectFactor)(cacheKey, headerFactor, queryFactor));
|
|
199
213
|
}
|
|
200
214
|
};
|
|
201
215
|
}
|
|
202
216
|
})());
|
|
203
217
|
this.cacheOptions = cacheOptions;
|
|
204
|
-
this.cache = new
|
|
218
|
+
this.cache = new import_lru_cache.default({
|
|
205
219
|
max: Math.min(MAX_SIZE_EACH_CLUSTER, 600) * 1024 * 1024,
|
|
206
220
|
length(n) {
|
|
207
221
|
const len = n.caches.keys().reduce((total, cur) => {
|
|
@@ -226,3 +240,8 @@ function createCache() {
|
|
|
226
240
|
function destroyCache() {
|
|
227
241
|
manager = null;
|
|
228
242
|
}
|
|
243
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
244
|
+
0 && (module.exports = {
|
|
245
|
+
createCache,
|
|
246
|
+
destroyCache
|
|
247
|
+
});
|
|
@@ -1,4 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty
|
|
3
|
-
|
|
4
|
-
|
|
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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
15
|
+
var type_exports = {};
|
|
16
|
+
module.exports = __toCommonJS(type_exports);
|
|
@@ -1,42 +1,44 @@
|
|
|
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 namespaceHash;
|
|
15
|
-
},
|
|
16
|
-
fname: function() {
|
|
17
|
-
return fname;
|
|
18
|
-
},
|
|
19
|
-
connectFactor: function() {
|
|
20
|
-
return connectFactor;
|
|
21
|
-
},
|
|
22
|
-
valueFactory: function() {
|
|
23
|
-
return valueFactory;
|
|
24
|
-
},
|
|
25
|
-
getTime: function() {
|
|
26
|
-
return getTime;
|
|
27
|
-
},
|
|
28
|
-
cacheAddition: function() {
|
|
29
|
-
return cacheAddition;
|
|
30
|
-
},
|
|
31
|
-
withCoalescedInvoke: function() {
|
|
32
|
-
return withCoalescedInvoke;
|
|
33
|
-
},
|
|
34
|
-
maybeSync: function() {
|
|
35
|
-
return maybeSync;
|
|
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 });
|
|
36
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 util_exports = {};
|
|
30
|
+
__export(util_exports, {
|
|
31
|
+
cacheAddition: () => cacheAddition,
|
|
32
|
+
connectFactor: () => connectFactor,
|
|
33
|
+
fname: () => fname,
|
|
34
|
+
getTime: () => getTime,
|
|
35
|
+
maybeSync: () => maybeSync,
|
|
36
|
+
namespaceHash: () => namespaceHash,
|
|
37
|
+
valueFactory: () => valueFactory,
|
|
38
|
+
withCoalescedInvoke: () => withCoalescedInvoke
|
|
37
39
|
});
|
|
38
|
-
|
|
39
|
-
|
|
40
|
+
module.exports = __toCommonJS(util_exports);
|
|
41
|
+
var import_url = __toESM(require("url"));
|
|
40
42
|
function namespaceHash(namespace, hash) {
|
|
41
43
|
return `${namespace}/${hash}`;
|
|
42
44
|
}
|
|
@@ -47,7 +49,7 @@ function connectFactor(...args) {
|
|
|
47
49
|
return args.join("-");
|
|
48
50
|
}
|
|
49
51
|
function valueFactory(obj) {
|
|
50
|
-
if (obj instanceof
|
|
52
|
+
if (obj instanceof import_url.default.URLSearchParams) {
|
|
51
53
|
return function(key) {
|
|
52
54
|
return obj.get(key);
|
|
53
55
|
};
|
|
@@ -106,3 +108,14 @@ function maybeSync(fn) {
|
|
|
106
108
|
}
|
|
107
109
|
};
|
|
108
110
|
}
|
|
111
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
112
|
+
0 && (module.exports = {
|
|
113
|
+
cacheAddition,
|
|
114
|
+
connectFactor,
|
|
115
|
+
fname,
|
|
116
|
+
getTime,
|
|
117
|
+
maybeSync,
|
|
118
|
+
namespaceHash,
|
|
119
|
+
valueFactory,
|
|
120
|
+
withCoalescedInvoke
|
|
121
|
+
});
|
|
@@ -1,36 +1,57 @@
|
|
|
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 render_exports = {};
|
|
30
|
+
__export(render_exports, {
|
|
31
|
+
createRenderHandler: () => createRenderHandler
|
|
10
32
|
});
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
const
|
|
21
|
-
const calcFallback = (metaName) => `x-${(0, _utils.cutNameByHyphen)(metaName)}-ssr-fallback`;
|
|
33
|
+
module.exports = __toCommonJS(render_exports);
|
|
34
|
+
var import_path = __toESM(require("path"));
|
|
35
|
+
var import_utils = require("@modern-js/utils");
|
|
36
|
+
var import_constants = require("../../constants");
|
|
37
|
+
var import_shouldFlushServerHeader = require("../preload/shouldFlushServerHeader");
|
|
38
|
+
var import_static = require("./static");
|
|
39
|
+
var import_reader = require("./reader");
|
|
40
|
+
var ssr = __toESM(require("./ssr"));
|
|
41
|
+
var import_utils2 = require("./utils");
|
|
42
|
+
const calcFallback = (metaName) => `x-${(0, import_utils.cutNameByHyphen)(metaName)}-ssr-fallback`;
|
|
22
43
|
const createRenderHandler = ({ distDir, staticGenerate, conf, forceCSR, nonce, ssrRender, metaName = "modern-js" }) => async function render({ ctx, route, runner }) {
|
|
23
44
|
if (ctx.resHasHandled()) {
|
|
24
45
|
return null;
|
|
25
46
|
}
|
|
26
47
|
const { entryPath, urlPath } = route;
|
|
27
|
-
const entry =
|
|
48
|
+
const entry = import_path.default.join(distDir, entryPath);
|
|
28
49
|
if (!route.isSPA) {
|
|
29
|
-
const result = await (0,
|
|
50
|
+
const result = await (0, import_static.handleDirectory)(ctx, entry, urlPath);
|
|
30
51
|
return result;
|
|
31
52
|
}
|
|
32
53
|
const templatePath = entry;
|
|
33
|
-
const content = await (0,
|
|
54
|
+
const content = await (0, import_reader.readFile)(templatePath);
|
|
34
55
|
if (!content) {
|
|
35
56
|
return null;
|
|
36
57
|
}
|
|
@@ -38,16 +59,16 @@ const createRenderHandler = ({ distDir, staticGenerate, conf, forceCSR, nonce, s
|
|
|
38
59
|
if (route.isSSR && !useCSR) {
|
|
39
60
|
try {
|
|
40
61
|
const userAgent = ctx.getReqHeader("User-Agent");
|
|
41
|
-
const disablePreload = Boolean(ctx.headers[`x-${(0,
|
|
42
|
-
if ((0,
|
|
43
|
-
const { flushServerHeader } = await Promise.resolve().then(() =>
|
|
62
|
+
const disablePreload = Boolean(ctx.headers[`x-${(0, import_utils.cutNameByHyphen)(metaName)}-disable-preload`]);
|
|
63
|
+
if ((0, import_shouldFlushServerHeader.shouldFlushServerHeader)(conf.server, userAgent, disablePreload)) {
|
|
64
|
+
const { flushServerHeader } = await Promise.resolve().then(() => __toESM(require("../preload")));
|
|
44
65
|
flushServerHeader({
|
|
45
66
|
serverConf: conf.server,
|
|
46
67
|
ctx,
|
|
47
68
|
distDir,
|
|
48
69
|
template: content.toString(),
|
|
49
70
|
headers: {
|
|
50
|
-
"Content-Type":
|
|
71
|
+
"Content-Type": import_utils.mime.contentType(import_path.default.extname(templatePath))
|
|
51
72
|
}
|
|
52
73
|
});
|
|
53
74
|
}
|
|
@@ -60,7 +81,7 @@ const createRenderHandler = ({ distDir, staticGenerate, conf, forceCSR, nonce, s
|
|
|
60
81
|
staticGenerate,
|
|
61
82
|
nonce
|
|
62
83
|
};
|
|
63
|
-
const result = await (ssrRender ? ssrRender(ctx, ssrRenderOptions, runner) :
|
|
84
|
+
const result = await (ssrRender ? ssrRender(ctx, ssrRenderOptions, runner) : ssr.render(ctx, {
|
|
64
85
|
distDir,
|
|
65
86
|
entryName: route.entryName,
|
|
66
87
|
urlPath: route.urlPath,
|
|
@@ -71,12 +92,16 @@ const createRenderHandler = ({ distDir, staticGenerate, conf, forceCSR, nonce, s
|
|
|
71
92
|
}, runner));
|
|
72
93
|
return result;
|
|
73
94
|
} catch (err) {
|
|
74
|
-
ctx.error(
|
|
95
|
+
ctx.error(import_constants.ERROR_DIGEST.ERENDER, err.stack || err.message);
|
|
75
96
|
ctx.res.set(calcFallback(metaName), "1");
|
|
76
97
|
}
|
|
77
98
|
}
|
|
78
99
|
return {
|
|
79
|
-
content: route.entryName ? (0,
|
|
80
|
-
contentType:
|
|
100
|
+
content: route.entryName ? (0, import_utils2.injectServerData)(content.toString(), ctx) : content,
|
|
101
|
+
contentType: import_utils.mime.contentType(import_path.default.extname(templatePath))
|
|
81
102
|
};
|
|
82
103
|
};
|
|
104
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
105
|
+
0 && (module.exports = {
|
|
106
|
+
createRenderHandler
|
|
107
|
+
});
|
|
@@ -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 createMetrics;
|
|
15
|
-
},
|
|
16
|
-
createLogger: function() {
|
|
17
|
-
return createLogger;
|
|
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 measure_exports = {};
|
|
20
|
+
__export(measure_exports, {
|
|
21
|
+
createLogger: () => createLogger,
|
|
22
|
+
createMetrics: () => createMetrics
|
|
19
23
|
});
|
|
20
|
-
|
|
24
|
+
module.exports = __toCommonJS(measure_exports);
|
|
25
|
+
var import_utils = require("../../utils");
|
|
21
26
|
const createMetrics = (context, metrics) => {
|
|
22
27
|
const { entryName: entry, request } = context;
|
|
23
28
|
const { pathname = "" } = request || {};
|
|
@@ -54,7 +59,7 @@ const createLogger = (serverContext, logger) => {
|
|
|
54
59
|
e = message;
|
|
55
60
|
message = "";
|
|
56
61
|
}
|
|
57
|
-
logger.error(`SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, pathname, (0,
|
|
62
|
+
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));
|
|
58
63
|
};
|
|
59
64
|
return {
|
|
60
65
|
error,
|
|
@@ -62,3 +67,8 @@ const createLogger = (serverContext, logger) => {
|
|
|
62
67
|
debug
|
|
63
68
|
};
|
|
64
69
|
};
|
|
70
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
71
|
+
0 && (module.exports = {
|
|
72
|
+
createLogger,
|
|
73
|
+
createMetrics
|
|
74
|
+
});
|