@modern-js/prod-server 2.48.0 → 2.48.2

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 (47) hide show
  1. package/dist/cjs/libs/context/context.js +4 -8
  2. package/dist/cjs/libs/hook-api/base.js +0 -11
  3. package/dist/cjs/libs/hook-api/index.worker.js +0 -3
  4. package/dist/cjs/libs/hook-api/route.js +0 -4
  5. package/dist/cjs/libs/hook-api/template.js +0 -2
  6. package/dist/cjs/libs/render/ssrCache/cacheMod.js +0 -5
  7. package/dist/cjs/libs/render/ssrCache/manager.js +2 -3
  8. package/dist/cjs/libs/route/index.js +1 -3
  9. package/dist/cjs/libs/route/matcher.js +1 -5
  10. package/dist/cjs/libs/route/route.js +1 -10
  11. package/dist/cjs/libs/serverTiming.js +0 -3
  12. package/dist/cjs/renderHtml.js +0 -7
  13. package/dist/cjs/server/index.js +1 -7
  14. package/dist/cjs/server/modernServer.js +4 -20
  15. package/dist/cjs/workerServer.js +4 -8
  16. package/dist/esm/libs/context/context.js +66 -98
  17. package/dist/esm/libs/hook-api/base.js +36 -71
  18. package/dist/esm/libs/hook-api/index.worker.js +15 -29
  19. package/dist/esm/libs/hook-api/route.js +12 -27
  20. package/dist/esm/libs/hook-api/template.js +33 -61
  21. package/dist/esm/libs/render/ssrCache/cacheMod.js +10 -18
  22. package/dist/esm/libs/render/ssrCache/manager.js +145 -157
  23. package/dist/esm/libs/route/index.js +62 -96
  24. package/dist/esm/libs/route/matcher.js +58 -94
  25. package/dist/esm/libs/route/route.js +1 -10
  26. package/dist/esm/libs/serverTiming.js +8 -16
  27. package/dist/esm/renderHtml.js +22 -39
  28. package/dist/esm/server/index.js +307 -383
  29. package/dist/esm/server/modernServer.js +802 -942
  30. package/dist/esm/server/modernServerSplit.js +61 -86
  31. package/dist/esm/workerServer.js +87 -82
  32. package/dist/esm-node/libs/context/context.js +4 -8
  33. package/dist/esm-node/libs/hook-api/base.js +0 -11
  34. package/dist/esm-node/libs/hook-api/index.worker.js +0 -3
  35. package/dist/esm-node/libs/hook-api/route.js +0 -4
  36. package/dist/esm-node/libs/hook-api/template.js +0 -2
  37. package/dist/esm-node/libs/render/ssrCache/cacheMod.js +0 -5
  38. package/dist/esm-node/libs/render/ssrCache/manager.js +2 -3
  39. package/dist/esm-node/libs/route/index.js +1 -3
  40. package/dist/esm-node/libs/route/matcher.js +1 -5
  41. package/dist/esm-node/libs/route/route.js +1 -10
  42. package/dist/esm-node/libs/serverTiming.js +0 -3
  43. package/dist/esm-node/renderHtml.js +0 -7
  44. package/dist/esm-node/server/index.js +1 -7
  45. package/dist/esm-node/server/modernServer.js +4 -20
  46. package/dist/esm-node/workerServer.js +4 -8
  47. package/package.json +8 -8
@@ -1,4 +1,3 @@
1
- import { _ as _define_property } from "@swc/helpers/_/_define_property";
2
1
  import { createServer } from "http";
3
2
  import path from "path";
4
3
  import { fs, isProd, isPromise, isWebOnly, mime, ROUTE_SPEC_FILE } from "@modern-js/utils";
@@ -464,25 +463,10 @@ class ModernServer {
464
463
  context.res.end(createErrorDocument(status, text));
465
464
  }
466
465
  constructor({ pwd, config, routes, staticGenerate, logger, metrics, runMode, proxyTarget, appContext }) {
467
- _define_property(this, "pwd", void 0);
468
- _define_property(this, "distDir", void 0);
469
- _define_property(this, "workDir", void 0);
470
- _define_property(this, "router", void 0);
471
- _define_property(this, "conf", void 0);
472
- _define_property(this, "handlers", []);
473
- _define_property(this, "presetRoutes", void 0);
474
- _define_property(this, "runner", void 0);
475
- _define_property(this, "logger", void 0);
476
- _define_property(this, "metrics", void 0);
477
- _define_property(this, "runMode", void 0);
478
- _define_property(this, "proxyTarget", void 0);
479
- _define_property(this, "routeRenderHandler", void 0);
480
- _define_property(this, "staticGenerate", void 0);
481
- _define_property(this, "metaName", void 0);
482
- _define_property(this, "loaderHandler", null);
483
- _define_property(this, "frameWebHandler", null);
484
- _define_property(this, "frameAPIHandler", null);
485
- _define_property(this, "_handler", void 0);
466
+ this.handlers = [];
467
+ this.loaderHandler = null;
468
+ this.frameWebHandler = null;
469
+ this.frameAPIHandler = null;
486
470
  require("ignore-styles");
487
471
  this.pwd = pwd;
488
472
  this.distDir = path.resolve(pwd, config.output.path || "dist");
@@ -1,4 +1,3 @@
1
- import { _ as _define_property } from "@swc/helpers/_/_define_property";
2
1
  import { createAsyncPipeline } from "@modern-js/plugin";
3
2
  import { createAfterMatchContext, createAfterRenderContext, createMiddlewareContext } from "./libs/hook-api/index.worker";
4
3
  import { RouteMatchManager } from "./libs/route";
@@ -51,9 +50,6 @@ class ReturnResponse {
51
50
  return this;
52
51
  }
53
52
  constructor(body, status, headers = {}) {
54
- _define_property(this, "body", void 0);
55
- _define_property(this, "status", void 0);
56
- _define_property(this, "headers", void 0);
57
53
  this.body = body;
58
54
  this.status = status;
59
55
  this.headers = new Headers(headers);
@@ -103,7 +99,7 @@ const createHandler = (manifest) => {
103
99
  const route = pageMatch.generate(url.pathname);
104
100
  const hookContext = createWorkerHookContext(request.url, logger, metrics, reporter);
105
101
  const afterMatchHookContext = createAfterMatchContext(hookContext, entryName);
106
- page === null || page === void 0 ? void 0 : (_page_serverHooks = page.serverHooks) === null || _page_serverHooks === void 0 ? void 0 : (_page_serverHooks_afterMatch = _page_serverHooks.afterMatch) === null || _page_serverHooks_afterMatch === void 0 ? void 0 : _page_serverHooks_afterMatch.call(_page_serverHooks, afterMatchHookContext, () => void 0);
102
+ await (page === null || page === void 0 ? void 0 : (_page_serverHooks = page.serverHooks) === null || _page_serverHooks === void 0 ? void 0 : (_page_serverHooks_afterMatch = _page_serverHooks.afterMatch) === null || _page_serverHooks_afterMatch === void 0 ? void 0 : _page_serverHooks_afterMatch.call(_page_serverHooks, afterMatchHookContext, () => void 0));
107
103
  if (checkIsSent(hookContext)) {
108
104
  return new ReturnResponse(hookContext.res.body || "Unkown body", hookContext.res.status, hookContext.res.headers);
109
105
  }
@@ -152,7 +148,7 @@ const createHandler = (manifest) => {
152
148
  };
153
149
  const body = await page.serverRender(serverRenderContext);
154
150
  const afterRenderHookContext = createAfterRenderContext(hookContext, route, body);
155
- (_page_serverHooks2 = page.serverHooks) === null || _page_serverHooks2 === void 0 ? void 0 : (_page_serverHooks_afterRender = _page_serverHooks2.afterRender) === null || _page_serverHooks_afterRender === void 0 ? void 0 : _page_serverHooks_afterRender.call(_page_serverHooks2, afterRenderHookContext, () => void 0);
151
+ await ((_page_serverHooks2 = page.serverHooks) === null || _page_serverHooks2 === void 0 ? void 0 : (_page_serverHooks_afterRender = _page_serverHooks2.afterRender) === null || _page_serverHooks_afterRender === void 0 ? void 0 : _page_serverHooks_afterRender.call(_page_serverHooks2, afterRenderHookContext, () => void 0));
156
152
  if (checkIsSent(hookContext)) {
157
153
  return new ReturnResponse(hookContext.res.body || "Unkown body", hookContext.res.status, hookContext.res.headers);
158
154
  }
@@ -211,7 +207,7 @@ function createWorkerHookContext(url, logger, metrics, reporter) {
211
207
  };
212
208
  }
213
209
  let appliedMiddlewares = false;
214
- function applyMiddlewares(ctx, middleware) {
210
+ async function applyMiddlewares(ctx, middleware) {
215
211
  if (middleware) {
216
212
  const middlewares = (() => {
217
213
  if (Array.isArray(middleware)) {
@@ -228,7 +224,7 @@ function applyMiddlewares(ctx, middleware) {
228
224
  });
229
225
  appliedMiddlewares = true;
230
226
  }
231
- middlewarePipeline.run(ctx, {
227
+ await middlewarePipeline.run(ctx, {
232
228
  onLast: () => void 0
233
229
  });
234
230
  }
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.48.0",
18
+ "version": "2.48.2",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./dist/types/index.d.ts",
21
21
  "main": "./dist/cjs/index.js",
@@ -74,10 +74,10 @@
74
74
  "node-html-parser": "^6.1.5",
75
75
  "path-to-regexp": "^6.2.0",
76
76
  "serve-static": "^1.14.1",
77
- "@modern-js/plugin": "2.48.0",
78
- "@modern-js/utils": "2.48.0",
79
- "@modern-js/server-core": "2.48.0",
80
- "@modern-js/runtime-utils": "2.48.0"
77
+ "@modern-js/plugin": "2.48.2",
78
+ "@modern-js/server-core": "2.48.2",
79
+ "@modern-js/utils": "2.48.2",
80
+ "@modern-js/runtime-utils": "2.48.2"
81
81
  },
82
82
  "devDependencies": {
83
83
  "@types/cookie": "0.5.1",
@@ -95,9 +95,9 @@
95
95
  "portfinder": "^1.0.28",
96
96
  "typescript": "^5",
97
97
  "ws": "^8.13.0",
98
- "@modern-js/types": "2.48.0",
99
- "@scripts/build": "2.48.0",
100
- "@scripts/jest-config": "2.48.0"
98
+ "@modern-js/types": "2.48.2",
99
+ "@scripts/build": "2.48.2",
100
+ "@scripts/jest-config": "2.48.2"
101
101
  },
102
102
  "sideEffects": false,
103
103
  "publishConfig": {