@modern-js/prod-server 2.19.0 → 2.20.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.
Files changed (69) hide show
  1. package/CHANGELOG.md +20 -0
  2. package/dist/cjs/index.js +3 -15
  3. package/dist/cjs/libs/context/context.js +10 -26
  4. package/dist/cjs/libs/hook-api/index.js +13 -29
  5. package/dist/cjs/libs/hook-api/route.js +4 -16
  6. package/dist/cjs/libs/hook-api/template.js +2 -14
  7. package/dist/cjs/libs/loadConfig.js +4 -47
  8. package/dist/cjs/libs/logger.js +5 -17
  9. package/dist/cjs/libs/render/cache/__tests__/cache.fun.test.js +2 -6
  10. package/dist/cjs/libs/render/cache/page-caches/lru.js +5 -21
  11. package/dist/cjs/libs/render/cache/spr.js +7 -23
  12. package/dist/cjs/libs/render/cache/util.js +2 -6
  13. package/dist/cjs/libs/render/index.js +4 -47
  14. package/dist/cjs/libs/render/reader.js +4 -20
  15. package/dist/cjs/libs/render/ssr.js +3 -7
  16. package/dist/cjs/libs/render/static.js +2 -6
  17. package/dist/cjs/libs/route/index.js +3 -15
  18. package/dist/cjs/libs/route/matcher.js +5 -17
  19. package/dist/cjs/libs/route/route.js +10 -22
  20. package/dist/cjs/libs/serveFile.js +2 -6
  21. package/dist/cjs/server/index.js +9 -25
  22. package/dist/cjs/server/modernServer.js +25 -80
  23. package/dist/cjs/workerServer.js +103 -48
  24. package/dist/esm/libs/context/context.js +4 -42
  25. package/dist/esm/libs/hook-api/index.js +6 -132
  26. package/dist/esm/libs/hook-api/route.js +3 -35
  27. package/dist/esm/libs/hook-api/template.js +3 -35
  28. package/dist/esm/libs/loadConfig.js +2 -52
  29. package/dist/esm/libs/logger.js +7 -101
  30. package/dist/esm/libs/proxy.js +5 -194
  31. package/dist/esm/libs/render/cache/__tests__/cache.fun.test.js +6 -192
  32. package/dist/esm/libs/render/cache/__tests__/cache.test.js +13 -202
  33. package/dist/esm/libs/render/cache/index.js +8 -164
  34. package/dist/esm/libs/render/cache/page-caches/index.js +3 -132
  35. package/dist/esm/libs/render/cache/page-caches/lru.js +3 -35
  36. package/dist/esm/libs/render/cache/spr.js +10 -171
  37. package/dist/esm/libs/render/cache/util.js +6 -211
  38. package/dist/esm/libs/render/index.js +3 -132
  39. package/dist/esm/libs/render/measure.js +4 -93
  40. package/dist/esm/libs/render/reader.js +8 -169
  41. package/dist/esm/libs/render/ssr.js +3 -132
  42. package/dist/esm/libs/render/static.js +3 -132
  43. package/dist/esm/libs/route/index.js +3 -35
  44. package/dist/esm/libs/route/matcher.js +3 -35
  45. package/dist/esm/libs/route/route.js +2 -18
  46. package/dist/esm/libs/serveFile.js +3 -132
  47. package/dist/esm/server/index.js +16 -247
  48. package/dist/esm/server/modernServer.js +21 -227
  49. package/dist/esm/server/modernServerSplit.js +12 -253
  50. package/dist/esm/utils.js +2 -62
  51. package/dist/esm/workerServer.js +134 -190
  52. package/dist/esm-node/libs/context/context.js +1 -13
  53. package/dist/esm-node/libs/hook-api/index.js +1 -13
  54. package/dist/esm-node/libs/hook-api/route.js +1 -13
  55. package/dist/esm-node/libs/hook-api/template.js +1 -13
  56. package/dist/esm-node/libs/logger.js +1 -13
  57. package/dist/esm-node/libs/render/cache/page-caches/lru.js +1 -13
  58. package/dist/esm-node/libs/render/cache/spr.js +1 -13
  59. package/dist/esm-node/libs/render/reader.js +1 -13
  60. package/dist/esm-node/libs/route/index.js +1 -13
  61. package/dist/esm-node/libs/route/matcher.js +1 -13
  62. package/dist/esm-node/libs/route/route.js +1 -13
  63. package/dist/esm-node/server/index.js +1 -13
  64. package/dist/esm-node/server/modernServer.js +1 -13
  65. package/dist/esm-node/workerServer.js +102 -47
  66. package/dist/types/libs/context/context.d.ts +1 -1
  67. package/dist/types/utils.d.ts +1 -1
  68. package/dist/types/workerServer.d.ts +33 -4
  69. package/package.json +8 -7
@@ -1,134 +1,5 @@
1
- function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
2
- try {
3
- var info = gen[key](arg);
4
- var value = info.value;
5
- } catch (error) {
6
- reject(error);
7
- return;
8
- }
9
- if (info.done) {
10
- resolve(value);
11
- } else {
12
- Promise.resolve(value).then(_next, _throw);
13
- }
14
- }
15
- function _async_to_generator(fn) {
16
- return function() {
17
- var self = this, args = arguments;
18
- return new Promise(function(resolve, reject) {
19
- var gen = fn.apply(self, args);
20
- function _next(value) {
21
- asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
22
- }
23
- function _throw(err) {
24
- asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
25
- }
26
- _next(void 0);
27
- });
28
- };
29
- }
30
- var __generator = function(thisArg, body) {
31
- var f, y, t, g, _ = {
32
- label: 0,
33
- sent: function() {
34
- if (t[0] & 1)
35
- throw t[1];
36
- return t[1];
37
- },
38
- trys: [],
39
- ops: []
40
- };
41
- return g = {
42
- next: verb(0),
43
- "throw": verb(1),
44
- "return": verb(2)
45
- }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
46
- return this;
47
- }), g;
48
- function verb(n) {
49
- return function(v) {
50
- return step([
51
- n,
52
- v
53
- ]);
54
- };
55
- }
56
- function step(op) {
57
- if (f)
58
- throw new TypeError("Generator is already executing.");
59
- while (_)
60
- try {
61
- 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)
62
- return t;
63
- if (y = 0, t)
64
- op = [
65
- op[0] & 2,
66
- t.value
67
- ];
68
- switch (op[0]) {
69
- case 0:
70
- case 1:
71
- t = op;
72
- break;
73
- case 4:
74
- _.label++;
75
- return {
76
- value: op[1],
77
- done: false
78
- };
79
- case 5:
80
- _.label++;
81
- y = op[1];
82
- op = [
83
- 0
84
- ];
85
- continue;
86
- case 7:
87
- op = _.ops.pop();
88
- _.trys.pop();
89
- continue;
90
- default:
91
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
92
- _ = 0;
93
- continue;
94
- }
95
- if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
96
- _.label = op[1];
97
- break;
98
- }
99
- if (op[0] === 6 && _.label < t[1]) {
100
- _.label = t[1];
101
- t = op;
102
- break;
103
- }
104
- if (t && _.label < t[2]) {
105
- _.label = t[2];
106
- _.ops.push(op);
107
- break;
108
- }
109
- if (t[2])
110
- _.ops.pop();
111
- _.trys.pop();
112
- continue;
113
- }
114
- op = body.call(thisArg, _);
115
- } catch (e) {
116
- op = [
117
- 6,
118
- e
119
- ];
120
- y = 0;
121
- } finally {
122
- f = t = 0;
123
- }
124
- if (op[0] & 5)
125
- throw op[1];
126
- return {
127
- value: op[0] ? op[1] : void 0,
128
- done: true
129
- };
130
- }
131
- };
1
+ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
2
+ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
132
3
  import serve from "serve-static";
133
4
  import { isString, isRegExp } from "@modern-js/utils";
134
5
  var removedPrefix = function(req, prefix) {
@@ -158,7 +29,7 @@ export var createStaticFileHandler = function(rules) {
158
29
  // eslint-disable-next-line consistent-return
159
30
  _async_to_generator(function(context, next) {
160
31
  var requestUrl, req, res, hitRule, resume;
161
- return __generator(this, function(_state) {
32
+ return _ts_generator(this, function(_state) {
162
33
  requestUrl = context.url, req = context.req, res = context.res;
163
34
  hitRule = rules.find(function(item) {
164
35
  if (isString(item.path) && requestUrl.startsWith(item.path)) {
@@ -1,242 +1,11 @@
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;
7
- }
8
- function _array_without_holes(arr) {
9
- if (Array.isArray(arr))
10
- return _array_like_to_array(arr);
11
- }
12
- function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
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
- }
25
- }
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
- };
40
- }
41
- function _class_call_check(instance, Constructor) {
42
- if (!(instance instanceof Constructor)) {
43
- throw new TypeError("Cannot call a class as a function");
44
- }
45
- }
46
- function _defineProperties(target, props) {
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
- }
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;
62
- }
63
- function _define_property(obj, key, value) {
64
- if (key in obj) {
65
- Object.defineProperty(obj, key, {
66
- value: value,
67
- enumerable: true,
68
- configurable: true,
69
- writable: true
70
- });
71
- } else {
72
- obj[key] = value;
73
- }
74
- return obj;
75
- }
76
- function _iterable_to_array(iter) {
77
- if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null)
78
- return Array.from(iter);
79
- }
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.");
82
- }
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
- }));
91
- }
92
- ownKeys2.forEach(function(key) {
93
- _define_property(target, key, source[key]);
94
- });
95
- }
96
- return target;
97
- }
98
- function ownKeys(object, enumerableOnly) {
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
- });
106
- }
107
- keys.push.apply(keys, symbols);
108
- }
109
- return keys;
110
- }
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;
121
- }
122
- function _to_consumable_array(arr) {
123
- return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
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);
137
- }
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
- ]);
162
- };
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];
190
- op = [
191
- 0
192
- ];
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;
221
- }
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
- }
239
- };
1
+ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
2
+ import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
3
+ import { _ as _create_class } from "@swc/helpers/_/_create_class";
4
+ import { _ as _define_property } from "@swc/helpers/_/_define_property";
5
+ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
6
+ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
7
+ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
8
+ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
240
9
  import path from "path";
241
10
  import { fs, Logger, SHARED_DIR, OUTPUT_CONFIG_FILE, dotenv, dotenvExpand, INTERNAL_SERVER_PLUGINS } from "@modern-js/utils";
242
11
  import { serverManager, AppContext, ConfigContext, loadPlugins } from "@modern-js/server-core";
@@ -283,7 +52,7 @@ export var Server = /* @__PURE__ */ function() {
283
52
  var _this = this;
284
53
  return _async_to_generator(function() {
285
54
  var options;
286
- return __generator(this, function(_state) {
55
+ return _ts_generator(this, function(_state) {
287
56
  switch (_state.label) {
288
57
  case 0:
289
58
  options = _this.options;
@@ -365,7 +134,7 @@ export var Server = /* @__PURE__ */ function() {
365
134
  key: "runPrepareHook",
366
135
  value: function runPrepareHook(runner) {
367
136
  return _async_to_generator(function() {
368
- return __generator(this, function(_state) {
137
+ return _ts_generator(this, function(_state) {
369
138
  runner.prepare();
370
139
  return [
371
140
  2
@@ -395,7 +164,7 @@ export var Server = /* @__PURE__ */ function() {
395
164
  var _this = this;
396
165
  return _async_to_generator(function() {
397
166
  var pwd, config, serverConfig, finalServerConfig, resolvedConfigPath;
398
- return __generator(this, function(_state) {
167
+ return _ts_generator(this, function(_state) {
399
168
  pwd = options.pwd, config = options.config;
400
169
  serverConfig = _this.serverConfig;
401
170
  finalServerConfig = _this.runConfigHook(runner, serverConfig);
@@ -418,7 +187,7 @@ export var Server = /* @__PURE__ */ function() {
418
187
  value: function close() {
419
188
  var _this = this;
420
189
  return _async_to_generator(function() {
421
- return __generator(this, function(_state) {
190
+ return _ts_generator(this, function(_state) {
422
191
  _this.app.close();
423
192
  return [
424
193
  2
@@ -460,7 +229,7 @@ export var Server = /* @__PURE__ */ function() {
460
229
  value: function render(req, res, url) {
461
230
  var _this = this;
462
231
  return _async_to_generator(function() {
463
- return __generator(this, function(_state) {
232
+ return _ts_generator(this, function(_state) {
464
233
  return [
465
234
  2,
466
235
  _this.server.render(req, res, url)
@@ -475,7 +244,7 @@ export var Server = /* @__PURE__ */ function() {
475
244
  var _this = this;
476
245
  return _async_to_generator(function() {
477
246
  var options, _options_internalPlugins, internalPlugins, pwd, _options_plugins, plugins, serverPlugins, loadedPlugins, hooksRunner;
478
- return __generator(this, function(_state) {
247
+ return _ts_generator(this, function(_state) {
479
248
  switch (_state.label) {
480
249
  case 0:
481
250
  serverManager.clear();
@@ -510,7 +279,7 @@ export var Server = /* @__PURE__ */ function() {
510
279
  var _this = this;
511
280
  return _async_to_generator(function() {
512
281
  var appContext, config, pwd;
513
- return __generator(this, function(_state) {
282
+ return _ts_generator(this, function(_state) {
514
283
  appContext = _this.initAppContext();
515
284
  config = options.config, pwd = options.pwd;
516
285
  ConfigContext.set(config);
@@ -549,7 +318,7 @@ export var Server = /* @__PURE__ */ function() {
549
318
  value: function loadServerEnv(options) {
550
319
  return _async_to_generator(function() {
551
320
  var appDirectory, serverEnv, defaultEnvPath, serverEnvPath, _i, _iter, envPath, _tmp, envConfig;
552
- return __generator(this, function(_state) {
321
+ return _ts_generator(this, function(_state) {
553
322
  switch (_state.label) {
554
323
  case 0:
555
324
  appDirectory = options.pwd;