@modern-js/prod-server 2.15.0 → 2.16.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/CHANGELOG.md +14 -0
- package/dist/cjs/constants.js +15 -31
- package/dist/cjs/index.js +35 -37
- package/dist/cjs/libs/context/context.js +53 -66
- package/dist/cjs/libs/context/index.js +15 -28
- package/dist/cjs/libs/hook-api/index.js +59 -54
- package/dist/cjs/libs/hook-api/route.js +28 -30
- package/dist/cjs/libs/hook-api/template.js +30 -34
- package/dist/cjs/libs/loadConfig.js +74 -65
- package/dist/cjs/libs/logger.js +46 -37
- package/dist/cjs/libs/metrics.js +7 -25
- package/dist/cjs/libs/proxy.js +29 -46
- package/dist/cjs/libs/render/cache/__tests__/cache.fun.test.js +48 -64
- package/dist/cjs/libs/render/cache/__tests__/cache.test.js +53 -37
- package/dist/cjs/libs/render/cache/__tests__/cacheable.js +38 -34
- package/dist/cjs/libs/render/cache/__tests__/error-configuration.js +22 -30
- package/dist/cjs/libs/render/cache/__tests__/matched-cache.js +86 -46
- package/dist/cjs/libs/render/cache/index.js +17 -37
- package/dist/cjs/libs/render/cache/page-caches/index.js +12 -28
- package/dist/cjs/libs/render/cache/page-caches/lru.js +32 -40
- package/dist/cjs/libs/render/cache/spr.js +104 -111
- package/dist/cjs/libs/render/cache/type.js +4 -15
- package/dist/cjs/libs/render/cache/util.js +29 -53
- package/dist/cjs/libs/render/index.js +75 -73
- package/dist/cjs/libs/render/measure.js +19 -34
- package/dist/cjs/libs/render/reader.js +52 -61
- package/dist/cjs/libs/render/ssr.js +34 -66
- package/dist/cjs/libs/render/static.js +22 -45
- package/dist/cjs/libs/render/type.js +10 -28
- package/dist/cjs/libs/render/utils.js +17 -38
- package/dist/cjs/libs/route/index.js +32 -31
- package/dist/cjs/libs/route/matcher.js +38 -38
- package/dist/cjs/libs/route/route.js +29 -26
- package/dist/cjs/libs/serveFile.js +23 -41
- package/dist/cjs/server/index.js +101 -107
- package/dist/cjs/server/modernServer.js +191 -171
- package/dist/cjs/server/modernServerSplit.js +12 -30
- package/dist/cjs/type.js +4 -15
- package/dist/cjs/utils.js +50 -50
- package/dist/cjs/workerServer.js +26 -36
- package/dist/esm/constants.js +24 -25
- package/dist/esm/index.js +11 -10
- package/dist/esm/libs/context/context.js +271 -264
- package/dist/esm/libs/context/index.js +3 -3
- package/dist/esm/libs/hook-api/index.js +237 -223
- package/dist/esm/libs/hook-api/route.js +62 -60
- package/dist/esm/libs/hook-api/template.js +117 -115
- package/dist/esm/libs/loadConfig.js +68 -69
- package/dist/esm/libs/logger.js +188 -174
- package/dist/esm/libs/metrics.js +6 -3
- package/dist/esm/libs/proxy.js +236 -221
- package/dist/esm/libs/render/cache/__tests__/cache.fun.test.js +286 -267
- package/dist/esm/libs/render/cache/__tests__/cache.test.js +765 -745
- package/dist/esm/libs/render/cache/__tests__/cacheable.js +62 -63
- package/dist/esm/libs/render/cache/__tests__/error-configuration.js +42 -43
- package/dist/esm/libs/render/cache/__tests__/matched-cache.js +134 -135
- package/dist/esm/libs/render/cache/index.js +337 -326
- package/dist/esm/libs/render/cache/page-caches/index.js +147 -141
- package/dist/esm/libs/render/cache/page-caches/lru.js +78 -76
- package/dist/esm/libs/render/cache/spr.js +465 -456
- package/dist/esm/libs/render/cache/type.js +1 -1
- package/dist/esm/libs/render/cache/util.js +266 -246
- package/dist/esm/libs/render/index.js +226 -218
- package/dist/esm/libs/render/measure.js +136 -128
- package/dist/esm/libs/render/reader.js +315 -304
- package/dist/esm/libs/render/ssr.js +214 -209
- package/dist/esm/libs/render/static.js +208 -198
- package/dist/esm/libs/render/type.js +6 -7
- package/dist/esm/libs/render/utils.js +8 -9
- package/dist/esm/libs/route/index.js +134 -123
- package/dist/esm/libs/route/matcher.js +140 -130
- package/dist/esm/libs/route/route.js +36 -37
- package/dist/esm/libs/serveFile.js +177 -168
- package/dist/esm/server/index.js +578 -549
- package/dist/esm/server/modernServer.js +1137 -1074
- package/dist/esm/server/modernServerSplit.js +344 -328
- package/dist/esm/type.js +1 -1
- package/dist/esm/utils.js +133 -124
- package/dist/esm/workerServer.js +226 -220
- package/dist/esm-node/constants.js +7 -14
- package/dist/esm-node/index.js +4 -9
- package/dist/esm-node/libs/context/context.js +32 -25
- package/dist/esm-node/libs/context/index.js +2 -5
- package/dist/esm-node/libs/hook-api/index.js +40 -21
- package/dist/esm-node/libs/hook-api/route.js +21 -8
- package/dist/esm-node/libs/hook-api/template.js +19 -14
- package/dist/esm-node/libs/loadConfig.js +11 -28
- package/dist/esm-node/libs/logger.js +37 -17
- package/dist/esm-node/libs/metrics.js +1 -3
- package/dist/esm-node/libs/proxy.js +14 -22
- package/dist/esm-node/libs/render/cache/__tests__/cache.fun.test.js +25 -36
- package/dist/esm-node/libs/render/cache/__tests__/cache.test.js +23 -11
- package/dist/esm-node/libs/render/cache/__tests__/cacheable.js +32 -13
- package/dist/esm-node/libs/render/cache/__tests__/error-configuration.js +16 -9
- package/dist/esm-node/libs/render/cache/__tests__/matched-cache.js +80 -25
- package/dist/esm-node/libs/render/cache/index.js +3 -10
- package/dist/esm-node/libs/render/cache/page-caches/index.js +4 -5
- package/dist/esm-node/libs/render/cache/page-caches/lru.js +20 -8
- package/dist/esm-node/libs/render/cache/spr.js +79 -80
- package/dist/esm-node/libs/render/cache/type.js +1 -0
- package/dist/esm-node/libs/render/cache/util.js +13 -23
- package/dist/esm-node/libs/render/index.js +10 -28
- package/dist/esm-node/libs/render/measure.js +7 -13
- package/dist/esm-node/libs/render/reader.js +31 -26
- package/dist/esm-node/libs/render/ssr.js +5 -21
- package/dist/esm-node/libs/render/static.js +1 -4
- package/dist/esm-node/libs/render/type.js +3 -6
- package/dist/esm-node/libs/render/utils.js +6 -18
- package/dist/esm-node/libs/route/index.js +20 -9
- package/dist/esm-node/libs/route/matcher.js +28 -17
- package/dist/esm-node/libs/route/route.js +23 -5
- package/dist/esm-node/libs/serveFile.js +2 -6
- package/dist/esm-node/server/index.js +72 -75
- package/dist/esm-node/server/modernServer.js +102 -130
- package/dist/esm-node/server/modernServerSplit.js +1 -4
- package/dist/esm-node/type.js +1 -0
- package/dist/esm-node/utils.js +41 -32
- package/dist/esm-node/workerServer.js +9 -10
- package/dist/types/libs/context/context.d.ts +1 -1
- package/dist/types/server/modernServer.d.ts +1 -1
- package/dist/types/utils.d.ts +1 -1
- package/package.json +12 -8
package/dist/esm/server/index.js
CHANGED
|
@@ -1,222 +1,241 @@
|
|
|
1
|
-
function
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
function _array_like_to_array(arr, len) {
|
|
2
|
+
if (len == null || len > arr.length)
|
|
3
|
+
len = arr.length;
|
|
4
|
+
for (var i = 0, arr2 = new Array(len); i < len; i++)
|
|
5
|
+
arr2[i] = arr[i];
|
|
6
|
+
return arr2;
|
|
5
7
|
}
|
|
6
|
-
function
|
|
7
|
-
|
|
8
|
+
function _array_without_holes(arr) {
|
|
9
|
+
if (Array.isArray(arr))
|
|
10
|
+
return _array_like_to_array(arr);
|
|
8
11
|
}
|
|
9
12
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
13
|
+
try {
|
|
14
|
+
var info = gen[key](arg);
|
|
15
|
+
var value = info.value;
|
|
16
|
+
} catch (error) {
|
|
17
|
+
reject(error);
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
if (info.done) {
|
|
21
|
+
resolve(value);
|
|
22
|
+
} else {
|
|
23
|
+
Promise.resolve(value).then(_next, _throw);
|
|
24
|
+
}
|
|
22
25
|
}
|
|
23
|
-
function
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
26
|
+
function _async_to_generator(fn) {
|
|
27
|
+
return function() {
|
|
28
|
+
var self = this, args = arguments;
|
|
29
|
+
return new Promise(function(resolve, reject) {
|
|
30
|
+
var gen = fn.apply(self, args);
|
|
31
|
+
function _next(value) {
|
|
32
|
+
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
|
|
33
|
+
}
|
|
34
|
+
function _throw(err) {
|
|
35
|
+
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
|
|
36
|
+
}
|
|
37
|
+
_next(void 0);
|
|
38
|
+
});
|
|
39
|
+
};
|
|
37
40
|
}
|
|
38
|
-
function
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
41
|
+
function _class_call_check(instance, Constructor) {
|
|
42
|
+
if (!(instance instanceof Constructor)) {
|
|
43
|
+
throw new TypeError("Cannot call a class as a function");
|
|
44
|
+
}
|
|
42
45
|
}
|
|
43
46
|
function _defineProperties(target, props) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
47
|
+
for (var i = 0; i < props.length; i++) {
|
|
48
|
+
var descriptor = props[i];
|
|
49
|
+
descriptor.enumerable = descriptor.enumerable || false;
|
|
50
|
+
descriptor.configurable = true;
|
|
51
|
+
if ("value" in descriptor)
|
|
52
|
+
descriptor.writable = true;
|
|
53
|
+
Object.defineProperty(target, descriptor.key, descriptor);
|
|
54
|
+
}
|
|
51
55
|
}
|
|
52
|
-
function
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
+
function _create_class(Constructor, protoProps, staticProps) {
|
|
57
|
+
if (protoProps)
|
|
58
|
+
_defineProperties(Constructor.prototype, protoProps);
|
|
59
|
+
if (staticProps)
|
|
60
|
+
_defineProperties(Constructor, staticProps);
|
|
61
|
+
return Constructor;
|
|
56
62
|
}
|
|
57
|
-
function
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
63
|
+
function _define_property(obj, key, value) {
|
|
64
|
+
if (key in obj) {
|
|
65
|
+
Object.defineProperty(obj, key, {
|
|
66
|
+
value,
|
|
67
|
+
enumerable: true,
|
|
68
|
+
configurable: true,
|
|
69
|
+
writable: true
|
|
70
|
+
});
|
|
71
|
+
} else {
|
|
72
|
+
obj[key] = value;
|
|
73
|
+
}
|
|
74
|
+
return obj;
|
|
69
75
|
}
|
|
70
|
-
function
|
|
71
|
-
|
|
76
|
+
function _iterable_to_array(iter) {
|
|
77
|
+
if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null)
|
|
78
|
+
return Array.from(iter);
|
|
72
79
|
}
|
|
73
|
-
function
|
|
74
|
-
|
|
80
|
+
function _non_iterable_spread() {
|
|
81
|
+
throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
|
|
75
82
|
}
|
|
76
|
-
function
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
}
|
|
85
|
-
ownKeys.forEach(function(key) {
|
|
86
|
-
_defineProperty(target, key, source[key]);
|
|
87
|
-
});
|
|
83
|
+
function _object_spread(target) {
|
|
84
|
+
for (var i = 1; i < arguments.length; i++) {
|
|
85
|
+
var source = arguments[i] != null ? arguments[i] : {};
|
|
86
|
+
var ownKeys2 = Object.keys(source);
|
|
87
|
+
if (typeof Object.getOwnPropertySymbols === "function") {
|
|
88
|
+
ownKeys2 = ownKeys2.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
|
|
89
|
+
return Object.getOwnPropertyDescriptor(source, sym).enumerable;
|
|
90
|
+
}));
|
|
88
91
|
}
|
|
89
|
-
|
|
92
|
+
ownKeys2.forEach(function(key) {
|
|
93
|
+
_define_property(target, key, source[key]);
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
return target;
|
|
90
97
|
}
|
|
91
98
|
function ownKeys(object, enumerableOnly) {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
}
|
|
100
|
-
keys.push.apply(keys, symbols);
|
|
99
|
+
var keys = Object.keys(object);
|
|
100
|
+
if (Object.getOwnPropertySymbols) {
|
|
101
|
+
var symbols = Object.getOwnPropertySymbols(object);
|
|
102
|
+
if (enumerableOnly) {
|
|
103
|
+
symbols = symbols.filter(function(sym) {
|
|
104
|
+
return Object.getOwnPropertyDescriptor(object, sym).enumerable;
|
|
105
|
+
});
|
|
101
106
|
}
|
|
102
|
-
|
|
107
|
+
keys.push.apply(keys, symbols);
|
|
108
|
+
}
|
|
109
|
+
return keys;
|
|
103
110
|
}
|
|
104
|
-
function
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
111
|
+
function _object_spread_props(target, source) {
|
|
112
|
+
source = source != null ? source : {};
|
|
113
|
+
if (Object.getOwnPropertyDescriptors) {
|
|
114
|
+
Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
|
|
115
|
+
} else {
|
|
116
|
+
ownKeys(Object(source)).forEach(function(key) {
|
|
117
|
+
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
return target;
|
|
114
121
|
}
|
|
115
|
-
function
|
|
116
|
-
|
|
122
|
+
function _to_consumable_array(arr) {
|
|
123
|
+
return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
|
|
117
124
|
}
|
|
118
|
-
function
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
+
function _unsupported_iterable_to_array(o, minLen) {
|
|
126
|
+
if (!o)
|
|
127
|
+
return;
|
|
128
|
+
if (typeof o === "string")
|
|
129
|
+
return _array_like_to_array(o, minLen);
|
|
130
|
+
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
131
|
+
if (n === "Object" && o.constructor)
|
|
132
|
+
n = o.constructor.name;
|
|
133
|
+
if (n === "Map" || n === "Set")
|
|
134
|
+
return Array.from(n);
|
|
135
|
+
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))
|
|
136
|
+
return _array_like_to_array(o, minLen);
|
|
125
137
|
}
|
|
126
|
-
var __generator =
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
138
|
+
var __generator = function(thisArg, body) {
|
|
139
|
+
var f, y, t, g, _ = {
|
|
140
|
+
label: 0,
|
|
141
|
+
sent: function() {
|
|
142
|
+
if (t[0] & 1)
|
|
143
|
+
throw t[1];
|
|
144
|
+
return t[1];
|
|
145
|
+
},
|
|
146
|
+
trys: [],
|
|
147
|
+
ops: []
|
|
148
|
+
};
|
|
149
|
+
return g = {
|
|
150
|
+
next: verb(0),
|
|
151
|
+
"throw": verb(1),
|
|
152
|
+
"return": verb(2)
|
|
153
|
+
}, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
|
|
154
|
+
return this;
|
|
155
|
+
}), g;
|
|
156
|
+
function verb(n) {
|
|
157
|
+
return function(v) {
|
|
158
|
+
return step([
|
|
159
|
+
n,
|
|
160
|
+
v
|
|
161
|
+
]);
|
|
135
162
|
};
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
break;
|
|
164
|
-
case 4:
|
|
165
|
-
_.label++;
|
|
166
|
-
return {
|
|
167
|
-
value: op[1],
|
|
168
|
-
done: false
|
|
169
|
-
};
|
|
170
|
-
case 5:
|
|
171
|
-
_.label++;
|
|
172
|
-
y = op[1];
|
|
173
|
-
op = [
|
|
174
|
-
0
|
|
175
|
-
];
|
|
176
|
-
continue;
|
|
177
|
-
case 7:
|
|
178
|
-
op = _.ops.pop();
|
|
179
|
-
_.trys.pop();
|
|
180
|
-
continue;
|
|
181
|
-
default:
|
|
182
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
|
|
183
|
-
_ = 0;
|
|
184
|
-
continue;
|
|
185
|
-
}
|
|
186
|
-
if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
|
|
187
|
-
_.label = op[1];
|
|
188
|
-
break;
|
|
189
|
-
}
|
|
190
|
-
if (op[0] === 6 && _.label < t[1]) {
|
|
191
|
-
_.label = t[1];
|
|
192
|
-
t = op;
|
|
193
|
-
break;
|
|
194
|
-
}
|
|
195
|
-
if (t && _.label < t[2]) {
|
|
196
|
-
_.label = t[2];
|
|
197
|
-
_.ops.push(op);
|
|
198
|
-
break;
|
|
199
|
-
}
|
|
200
|
-
if (t[2]) _.ops.pop();
|
|
201
|
-
_.trys.pop();
|
|
202
|
-
continue;
|
|
203
|
-
}
|
|
204
|
-
op = body.call(thisArg, _);
|
|
205
|
-
} catch (e) {
|
|
163
|
+
}
|
|
164
|
+
function step(op) {
|
|
165
|
+
if (f)
|
|
166
|
+
throw new TypeError("Generator is already executing.");
|
|
167
|
+
while (_)
|
|
168
|
+
try {
|
|
169
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
|
|
170
|
+
return t;
|
|
171
|
+
if (y = 0, t)
|
|
172
|
+
op = [
|
|
173
|
+
op[0] & 2,
|
|
174
|
+
t.value
|
|
175
|
+
];
|
|
176
|
+
switch (op[0]) {
|
|
177
|
+
case 0:
|
|
178
|
+
case 1:
|
|
179
|
+
t = op;
|
|
180
|
+
break;
|
|
181
|
+
case 4:
|
|
182
|
+
_.label++;
|
|
183
|
+
return {
|
|
184
|
+
value: op[1],
|
|
185
|
+
done: false
|
|
186
|
+
};
|
|
187
|
+
case 5:
|
|
188
|
+
_.label++;
|
|
189
|
+
y = op[1];
|
|
206
190
|
op = [
|
|
207
|
-
|
|
208
|
-
e
|
|
191
|
+
0
|
|
209
192
|
];
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
193
|
+
continue;
|
|
194
|
+
case 7:
|
|
195
|
+
op = _.ops.pop();
|
|
196
|
+
_.trys.pop();
|
|
197
|
+
continue;
|
|
198
|
+
default:
|
|
199
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
|
|
200
|
+
_ = 0;
|
|
201
|
+
continue;
|
|
202
|
+
}
|
|
203
|
+
if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
|
|
204
|
+
_.label = op[1];
|
|
205
|
+
break;
|
|
206
|
+
}
|
|
207
|
+
if (op[0] === 6 && _.label < t[1]) {
|
|
208
|
+
_.label = t[1];
|
|
209
|
+
t = op;
|
|
210
|
+
break;
|
|
211
|
+
}
|
|
212
|
+
if (t && _.label < t[2]) {
|
|
213
|
+
_.label = t[2];
|
|
214
|
+
_.ops.push(op);
|
|
215
|
+
break;
|
|
216
|
+
}
|
|
217
|
+
if (t[2])
|
|
218
|
+
_.ops.pop();
|
|
219
|
+
_.trys.pop();
|
|
220
|
+
continue;
|
|
213
221
|
}
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
222
|
+
op = body.call(thisArg, _);
|
|
223
|
+
} catch (e) {
|
|
224
|
+
op = [
|
|
225
|
+
6,
|
|
226
|
+
e
|
|
227
|
+
];
|
|
228
|
+
y = 0;
|
|
229
|
+
} finally {
|
|
230
|
+
f = t = 0;
|
|
231
|
+
}
|
|
232
|
+
if (op[0] & 5)
|
|
233
|
+
throw op[1];
|
|
234
|
+
return {
|
|
235
|
+
value: op[0] ? op[1] : void 0,
|
|
236
|
+
done: true
|
|
237
|
+
};
|
|
238
|
+
}
|
|
220
239
|
};
|
|
221
240
|
import path from "path";
|
|
222
241
|
import { fs, Logger, SHARED_DIR, OUTPUT_CONFIG_FILE, dotenv, dotenvExpand, INTERNAL_SERVER_PLUGINS } from "@modern-js/utils";
|
|
@@ -225,361 +244,371 @@ import { metrics as defaultMetrics } from "../libs/metrics";
|
|
|
225
244
|
import { loadConfig, getServerConfigPath, requireConfig } from "../libs/loadConfig";
|
|
226
245
|
import { debug } from "../utils";
|
|
227
246
|
import { createProdServer } from "./modernServerSplit";
|
|
228
|
-
var Server =
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
}
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
{
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
case 1:
|
|
469
|
-
hooksRunner = _state.sent();
|
|
470
|
-
return [
|
|
471
|
-
2,
|
|
472
|
-
hooksRunner
|
|
473
|
-
];
|
|
474
|
-
}
|
|
475
|
-
});
|
|
476
|
-
})();
|
|
477
|
-
}
|
|
478
|
-
},
|
|
479
|
-
{
|
|
480
|
-
key: "injectContext",
|
|
481
|
-
value: function injectContext(runner, options) {
|
|
482
|
-
var _this = this;
|
|
483
|
-
return _asyncToGenerator(function() {
|
|
484
|
-
var appContext, config, pwd;
|
|
485
|
-
return __generator(this, function(_state) {
|
|
486
|
-
appContext = _this.initAppContext();
|
|
487
|
-
config = options.config, pwd = options.pwd;
|
|
488
|
-
ConfigContext.set(config);
|
|
489
|
-
AppContext.set(_objectSpreadProps(_objectSpread({}, appContext), {
|
|
490
|
-
distDirectory: path.join(pwd, config.output.path || "dist")
|
|
491
|
-
}));
|
|
492
|
-
return [
|
|
493
|
-
2
|
|
494
|
-
];
|
|
495
|
-
});
|
|
496
|
-
})();
|
|
497
|
-
}
|
|
498
|
-
},
|
|
499
|
-
{
|
|
500
|
-
key: "initAppContext",
|
|
501
|
-
value: function initAppContext() {
|
|
502
|
-
var options = this.options;
|
|
503
|
-
var appDirectory = options.pwd, _options_plugins = options.plugins, plugins = _options_plugins === void 0 ? [] : _options_plugins, config = options.config, appContext = options.appContext;
|
|
504
|
-
var serverPlugins = plugins.map(function(p) {
|
|
505
|
-
return {
|
|
506
|
-
server: p
|
|
507
|
-
};
|
|
247
|
+
export var Server = /* @__PURE__ */ function() {
|
|
248
|
+
"use strict";
|
|
249
|
+
function Server2(options) {
|
|
250
|
+
_class_call_check(this, Server2);
|
|
251
|
+
_define_property(this, "options", void 0);
|
|
252
|
+
_define_property(this, "serverImpl", createProdServer);
|
|
253
|
+
_define_property(this, "server", void 0);
|
|
254
|
+
_define_property(this, "app", void 0);
|
|
255
|
+
_define_property(this, "runner", void 0);
|
|
256
|
+
_define_property(this, "serverConfig", void 0);
|
|
257
|
+
options.logger = options.logger || new Logger({
|
|
258
|
+
level: "warn"
|
|
259
|
+
});
|
|
260
|
+
options.metrics = options.metrics || defaultMetrics;
|
|
261
|
+
this.options = options;
|
|
262
|
+
this.serverConfig = {};
|
|
263
|
+
}
|
|
264
|
+
_create_class(Server2, [
|
|
265
|
+
{
|
|
266
|
+
key: "init",
|
|
267
|
+
value: (
|
|
268
|
+
/**
|
|
269
|
+
* 初始化顺序
|
|
270
|
+
* - 读取 .env.{process.env.MODERN_ENV} 文件,加载环境变量
|
|
271
|
+
* - 获取 server runtime config
|
|
272
|
+
* - 设置 context
|
|
273
|
+
* - 创建 hooksRunner
|
|
274
|
+
* - 合并插件,内置插件和 serverConfig 中配置的插件
|
|
275
|
+
* - 执行 config hook
|
|
276
|
+
* - 获取最终的配置
|
|
277
|
+
* - 设置配置到 context
|
|
278
|
+
* - 初始化 server
|
|
279
|
+
* - 执行 prepare hook
|
|
280
|
+
* - 执行 server init
|
|
281
|
+
*/
|
|
282
|
+
function init() {
|
|
283
|
+
var _this = this;
|
|
284
|
+
return _async_to_generator(function() {
|
|
285
|
+
var options;
|
|
286
|
+
return __generator(this, function(_state) {
|
|
287
|
+
switch (_state.label) {
|
|
288
|
+
case 0:
|
|
289
|
+
options = _this.options;
|
|
290
|
+
return [
|
|
291
|
+
4,
|
|
292
|
+
_this.loadServerEnv(options)
|
|
293
|
+
];
|
|
294
|
+
case 1:
|
|
295
|
+
_state.sent();
|
|
296
|
+
_this.initServerConfig(options);
|
|
297
|
+
return [
|
|
298
|
+
4,
|
|
299
|
+
_this.injectContext(_this.runner, options)
|
|
300
|
+
];
|
|
301
|
+
case 2:
|
|
302
|
+
_state.sent();
|
|
303
|
+
return [
|
|
304
|
+
4,
|
|
305
|
+
_this.createHookRunner()
|
|
306
|
+
];
|
|
307
|
+
case 3:
|
|
308
|
+
_this.runner = _state.sent();
|
|
309
|
+
return [
|
|
310
|
+
4,
|
|
311
|
+
_this.initConfig(_this.runner, options)
|
|
312
|
+
];
|
|
313
|
+
case 4:
|
|
314
|
+
_state.sent();
|
|
315
|
+
return [
|
|
316
|
+
4,
|
|
317
|
+
_this.injectContext(_this.runner, options)
|
|
318
|
+
];
|
|
319
|
+
case 5:
|
|
320
|
+
_state.sent();
|
|
321
|
+
_this.server = _this.serverImpl(options);
|
|
322
|
+
return [
|
|
323
|
+
4,
|
|
324
|
+
_this.runPrepareHook(_this.runner)
|
|
325
|
+
];
|
|
326
|
+
case 6:
|
|
327
|
+
_state.sent();
|
|
328
|
+
return [
|
|
329
|
+
4,
|
|
330
|
+
_this.server.createHTTPServer(_this.getRequestHandler())
|
|
331
|
+
];
|
|
332
|
+
case 7:
|
|
333
|
+
_this.app = _state.sent();
|
|
334
|
+
return [
|
|
335
|
+
4,
|
|
336
|
+
_this.server.onInit(_this.runner, _this.app)
|
|
337
|
+
];
|
|
338
|
+
case 8:
|
|
339
|
+
_state.sent();
|
|
340
|
+
return [
|
|
341
|
+
2,
|
|
342
|
+
_this
|
|
343
|
+
];
|
|
344
|
+
}
|
|
345
|
+
});
|
|
346
|
+
})();
|
|
347
|
+
}
|
|
348
|
+
)
|
|
349
|
+
},
|
|
350
|
+
{
|
|
351
|
+
key: "runConfigHook",
|
|
352
|
+
value: (
|
|
353
|
+
/**
|
|
354
|
+
* Execute config hooks
|
|
355
|
+
* @param runner
|
|
356
|
+
* @param options
|
|
357
|
+
*/
|
|
358
|
+
function runConfigHook(runner, serverConfig) {
|
|
359
|
+
var newServerConfig = runner.config(serverConfig || {});
|
|
360
|
+
return newServerConfig;
|
|
361
|
+
}
|
|
362
|
+
)
|
|
363
|
+
},
|
|
364
|
+
{
|
|
365
|
+
key: "runPrepareHook",
|
|
366
|
+
value: function runPrepareHook(runner) {
|
|
367
|
+
return _async_to_generator(function() {
|
|
368
|
+
return __generator(this, function(_state) {
|
|
369
|
+
runner.prepare();
|
|
370
|
+
return [
|
|
371
|
+
2
|
|
372
|
+
];
|
|
373
|
+
});
|
|
374
|
+
})();
|
|
375
|
+
}
|
|
376
|
+
},
|
|
377
|
+
{
|
|
378
|
+
key: "initServerConfig",
|
|
379
|
+
value: function initServerConfig(options) {
|
|
380
|
+
var pwd = options.pwd, serverConfigFile = options.serverConfigFile;
|
|
381
|
+
var distDirectory = path.join(pwd, options.config.output.path || "dist");
|
|
382
|
+
var serverConfigPath = getServerConfigPath(distDirectory, serverConfigFile);
|
|
383
|
+
var serverConfig = requireConfig(serverConfigPath);
|
|
384
|
+
this.serverConfig = serverConfig;
|
|
385
|
+
}
|
|
386
|
+
},
|
|
387
|
+
{
|
|
388
|
+
key: "initConfig",
|
|
389
|
+
value: (
|
|
390
|
+
/**
|
|
391
|
+
*
|
|
392
|
+
* merge cliConfig and serverConfig
|
|
393
|
+
*/
|
|
394
|
+
function initConfig(runner, options) {
|
|
395
|
+
var _this = this;
|
|
396
|
+
return _async_to_generator(function() {
|
|
397
|
+
var pwd, config, serverConfig, finalServerConfig, resolvedConfigPath;
|
|
398
|
+
return __generator(this, function(_state) {
|
|
399
|
+
pwd = options.pwd, config = options.config;
|
|
400
|
+
serverConfig = _this.serverConfig;
|
|
401
|
+
finalServerConfig = _this.runConfigHook(runner, serverConfig);
|
|
402
|
+
resolvedConfigPath = path.join(pwd, config.output.path || "dist", OUTPUT_CONFIG_FILE);
|
|
403
|
+
options.config = loadConfig({
|
|
404
|
+
cliConfig: config,
|
|
405
|
+
serverConfig: finalServerConfig,
|
|
406
|
+
resolvedConfigPath
|
|
407
|
+
});
|
|
408
|
+
return [
|
|
409
|
+
2
|
|
410
|
+
];
|
|
411
|
+
});
|
|
412
|
+
})();
|
|
413
|
+
}
|
|
414
|
+
)
|
|
415
|
+
},
|
|
416
|
+
{
|
|
417
|
+
key: "close",
|
|
418
|
+
value: function close() {
|
|
419
|
+
var _this = this;
|
|
420
|
+
return _async_to_generator(function() {
|
|
421
|
+
return __generator(this, function(_state) {
|
|
422
|
+
_this.app.close();
|
|
423
|
+
return [
|
|
424
|
+
2
|
|
425
|
+
];
|
|
426
|
+
});
|
|
427
|
+
})();
|
|
428
|
+
}
|
|
429
|
+
},
|
|
430
|
+
{
|
|
431
|
+
key: "listen",
|
|
432
|
+
value: function listen(options, listener) {
|
|
433
|
+
var callback = function() {
|
|
434
|
+
listener === null || listener === void 0 ? void 0 : listener();
|
|
435
|
+
};
|
|
436
|
+
if (typeof options === "object") {
|
|
437
|
+
if (process.env.PORT) {
|
|
438
|
+
Object.assign(options, {
|
|
439
|
+
port: process.env.PORT
|
|
440
|
+
});
|
|
441
|
+
}
|
|
442
|
+
this.app.listen(options, callback);
|
|
443
|
+
} else {
|
|
444
|
+
this.app.listen(process.env.PORT || options || 8080, callback);
|
|
445
|
+
}
|
|
446
|
+
}
|
|
447
|
+
},
|
|
448
|
+
{
|
|
449
|
+
key: "getRequestHandler",
|
|
450
|
+
value: function getRequestHandler() {
|
|
451
|
+
var _this = this;
|
|
452
|
+
return function(req, res, next) {
|
|
453
|
+
var requestHandler = _this.server.getRequestHandler();
|
|
454
|
+
return requestHandler(req, res, next);
|
|
455
|
+
};
|
|
456
|
+
}
|
|
457
|
+
},
|
|
458
|
+
{
|
|
459
|
+
key: "render",
|
|
460
|
+
value: function render(req, res, url) {
|
|
461
|
+
var _this = this;
|
|
462
|
+
return _async_to_generator(function() {
|
|
463
|
+
return __generator(this, function(_state) {
|
|
464
|
+
return [
|
|
465
|
+
2,
|
|
466
|
+
_this.server.render(req, res, url)
|
|
467
|
+
];
|
|
468
|
+
});
|
|
469
|
+
})();
|
|
470
|
+
}
|
|
471
|
+
},
|
|
472
|
+
{
|
|
473
|
+
key: "createHookRunner",
|
|
474
|
+
value: function createHookRunner() {
|
|
475
|
+
var _this = this;
|
|
476
|
+
return _async_to_generator(function() {
|
|
477
|
+
var options, _options_internalPlugins, internalPlugins, pwd, _options_plugins, plugins, serverPlugins, loadedPlugins, hooksRunner;
|
|
478
|
+
return __generator(this, function(_state) {
|
|
479
|
+
switch (_state.label) {
|
|
480
|
+
case 0:
|
|
481
|
+
serverManager.clear();
|
|
482
|
+
options = _this.options;
|
|
483
|
+
_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;
|
|
484
|
+
serverPlugins = _this.serverConfig.plugins || [];
|
|
485
|
+
loadedPlugins = loadPlugins(pwd, _to_consumable_array(serverPlugins).concat(_to_consumable_array(plugins)), {
|
|
486
|
+
internalPlugins
|
|
508
487
|
});
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
488
|
+
debug("plugins", loadedPlugins);
|
|
489
|
+
loadedPlugins.forEach(function(p) {
|
|
490
|
+
serverManager.usePlugin(p);
|
|
491
|
+
});
|
|
492
|
+
return [
|
|
493
|
+
4,
|
|
494
|
+
serverManager.init()
|
|
495
|
+
];
|
|
496
|
+
case 1:
|
|
497
|
+
hooksRunner = _state.sent();
|
|
498
|
+
return [
|
|
499
|
+
2,
|
|
500
|
+
hooksRunner
|
|
501
|
+
];
|
|
517
502
|
}
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
503
|
+
});
|
|
504
|
+
})();
|
|
505
|
+
}
|
|
506
|
+
},
|
|
507
|
+
{
|
|
508
|
+
key: "injectContext",
|
|
509
|
+
value: function injectContext(runner, options) {
|
|
510
|
+
var _this = this;
|
|
511
|
+
return _async_to_generator(function() {
|
|
512
|
+
var appContext, config, pwd;
|
|
513
|
+
return __generator(this, function(_state) {
|
|
514
|
+
appContext = _this.initAppContext();
|
|
515
|
+
config = options.config, pwd = options.pwd;
|
|
516
|
+
ConfigContext.set(config);
|
|
517
|
+
AppContext.set(_object_spread_props(_object_spread({}, appContext), {
|
|
518
|
+
distDirectory: path.join(pwd, config.output.path || "dist")
|
|
519
|
+
}));
|
|
520
|
+
return [
|
|
521
|
+
2
|
|
522
|
+
];
|
|
523
|
+
});
|
|
524
|
+
})();
|
|
525
|
+
}
|
|
526
|
+
},
|
|
527
|
+
{
|
|
528
|
+
key: "initAppContext",
|
|
529
|
+
value: function initAppContext() {
|
|
530
|
+
var options = this.options;
|
|
531
|
+
var appDirectory = options.pwd, _options_plugins = options.plugins, plugins = _options_plugins === void 0 ? [] : _options_plugins, config = options.config, appContext = options.appContext;
|
|
532
|
+
var serverPlugins = plugins.map(function(p) {
|
|
533
|
+
return {
|
|
534
|
+
server: p
|
|
535
|
+
};
|
|
536
|
+
});
|
|
537
|
+
return {
|
|
538
|
+
appDirectory,
|
|
539
|
+
apiDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory,
|
|
540
|
+
lambdaDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.lambdaDirectory,
|
|
541
|
+
sharedDirectory: (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || path.resolve(appDirectory, SHARED_DIR),
|
|
542
|
+
distDirectory: path.join(appDirectory, config.output.path || "dist"),
|
|
543
|
+
plugins: serverPlugins
|
|
544
|
+
};
|
|
545
|
+
}
|
|
546
|
+
},
|
|
547
|
+
{
|
|
548
|
+
key: "loadServerEnv",
|
|
549
|
+
value: function loadServerEnv(options) {
|
|
550
|
+
return _async_to_generator(function() {
|
|
551
|
+
var appDirectory, serverEnv, defaultEnvPath, serverEnvPath, _i, _iter, envPath, _tmp, envConfig;
|
|
552
|
+
return __generator(this, function(_state) {
|
|
553
|
+
switch (_state.label) {
|
|
554
|
+
case 0:
|
|
555
|
+
appDirectory = options.pwd;
|
|
556
|
+
serverEnv = process.env.MODERN_ENV;
|
|
557
|
+
defaultEnvPath = path.resolve(appDirectory, ".env");
|
|
558
|
+
serverEnvPath = path.resolve(appDirectory, ".env.".concat(serverEnv));
|
|
559
|
+
_i = 0, _iter = [
|
|
560
|
+
serverEnvPath,
|
|
561
|
+
defaultEnvPath
|
|
562
|
+
];
|
|
563
|
+
_state.label = 1;
|
|
564
|
+
case 1:
|
|
565
|
+
if (!(_i < _iter.length))
|
|
566
|
+
return [
|
|
567
|
+
3,
|
|
568
|
+
6
|
|
569
|
+
];
|
|
570
|
+
envPath = _iter[_i];
|
|
571
|
+
return [
|
|
572
|
+
4,
|
|
573
|
+
fs.pathExists(envPath)
|
|
574
|
+
];
|
|
575
|
+
case 2:
|
|
576
|
+
_tmp = _state.sent();
|
|
577
|
+
if (!_tmp)
|
|
578
|
+
return [
|
|
579
|
+
3,
|
|
580
|
+
4
|
|
581
|
+
];
|
|
582
|
+
return [
|
|
583
|
+
4,
|
|
584
|
+
fs.stat(envPath)
|
|
585
|
+
];
|
|
586
|
+
case 3:
|
|
587
|
+
_tmp = !_state.sent().isDirectory();
|
|
588
|
+
_state.label = 4;
|
|
589
|
+
case 4:
|
|
590
|
+
if (_tmp) {
|
|
591
|
+
envConfig = dotenv.config({
|
|
592
|
+
path: envPath
|
|
593
|
+
});
|
|
594
|
+
dotenvExpand(envConfig);
|
|
595
|
+
}
|
|
596
|
+
_state.label = 5;
|
|
597
|
+
case 5:
|
|
598
|
+
_i++;
|
|
599
|
+
return [
|
|
600
|
+
3,
|
|
601
|
+
1
|
|
602
|
+
];
|
|
603
|
+
case 6:
|
|
604
|
+
return [
|
|
605
|
+
2
|
|
606
|
+
];
|
|
580
607
|
}
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
|
|
608
|
+
});
|
|
609
|
+
})();
|
|
610
|
+
}
|
|
611
|
+
}
|
|
612
|
+
]);
|
|
613
|
+
return Server2;
|
|
584
614
|
}();
|
|
585
|
-
export { Server };
|