@modern-js/prod-server 2.27.0 → 2.28.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 (42) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/dist/cjs/index.js +4 -0
  3. package/dist/cjs/libs/render/cache/__tests__/cache.test.js +12 -7
  4. package/dist/cjs/libs/render/cache/index.js +2 -1
  5. package/dist/cjs/libs/render/cache/spr.js +2 -1
  6. package/dist/cjs/libs/render/index.js +12 -3
  7. package/dist/cjs/libs/render/reader.js +2 -1
  8. package/dist/cjs/libs/render/ssr.js +17 -18
  9. package/dist/cjs/libs/route/matcher.js +2 -2
  10. package/dist/cjs/server/index.js +6 -4
  11. package/dist/cjs/server/modernServer.js +21 -14
  12. package/dist/cjs/workerServer.js +3 -3
  13. package/dist/esm/index.js +1 -0
  14. package/dist/esm/libs/render/cache/__tests__/cache.test.js +12 -12
  15. package/dist/esm/libs/render/cache/index.js +2 -2
  16. package/dist/esm/libs/render/cache/spr.js +2 -2
  17. package/dist/esm/libs/render/index.js +12 -3
  18. package/dist/esm/libs/render/reader.js +2 -2
  19. package/dist/esm/libs/render/ssr.js +2 -1
  20. package/dist/esm/libs/route/matcher.js +2 -2
  21. package/dist/esm/renderHtml.js +6 -6
  22. package/dist/esm/server/index.js +6 -4
  23. package/dist/esm/server/modernServer.js +27 -18
  24. package/dist/esm/server/modernServerSplit.js +6 -6
  25. package/dist/esm/workerServer.js +2 -2
  26. package/dist/esm-node/index.js +1 -0
  27. package/dist/esm-node/libs/render/cache/__tests__/cache.test.js +12 -7
  28. package/dist/esm-node/libs/render/cache/index.js +2 -1
  29. package/dist/esm-node/libs/render/cache/spr.js +2 -1
  30. package/dist/esm-node/libs/render/index.js +12 -3
  31. package/dist/esm-node/libs/render/reader.js +2 -1
  32. package/dist/esm-node/libs/render/ssr.js +17 -18
  33. package/dist/esm-node/libs/route/matcher.js +2 -2
  34. package/dist/esm-node/server/index.js +6 -4
  35. package/dist/esm-node/server/modernServer.js +21 -14
  36. package/dist/esm-node/workerServer.js +3 -3
  37. package/dist/types/index.d.ts +1 -0
  38. package/dist/types/libs/context/context.d.ts +1 -1
  39. package/dist/types/libs/render/index.d.ts +13 -18
  40. package/dist/types/server/modernServer.d.ts +5 -3
  41. package/dist/types/utils.d.ts +1 -1
  42. package/package.json +8 -8
@@ -2,7 +2,7 @@
2
2
  /// <reference types="node" />
3
3
  /// <reference types="node" />
4
4
  /// <reference types="node/http" />
5
- /// <reference types=".dts-temp/kKZBfG7unyISzN2HX-IzS/src/type" />
5
+ /// <reference types=".dts-temp/3ag51RGwEKkAOCZCey_Qe/src/type" />
6
6
  import { IncomingMessage, ServerResponse } from 'http';
7
7
  import qs from 'querystring';
8
8
  import type { ModernServerContext as ModernServerContextInterface } from '@modern-js/types';
@@ -1,24 +1,19 @@
1
1
  import type { ModernServerContext } from '@modern-js/types';
2
2
  import { RenderResult, ServerHookRunner } from '../../type';
3
3
  import { ModernRoute } from '../route';
4
- export declare const createRenderHandler: ({
5
- distDir,
6
- staticGenerate,
7
- forceCSR,
8
- nonce,
9
- metaName
10
- }: {
11
- distDir: string;
12
- staticGenerate: boolean;
13
- forceCSR?: boolean | undefined;
14
- nonce?: string | undefined;
15
- metaName?: string | undefined;
16
- }) => ({
17
- ctx,
18
- route,
19
- runner
20
- }: {
4
+ import * as ssr from './ssr';
5
+ export type RenderHandler = (options: {
21
6
  ctx: ModernServerContext;
22
7
  route: ModernRoute;
23
8
  runner: ServerHookRunner;
24
- }) => Promise<RenderResult | null>;
9
+ }) => Promise<RenderResult | null>;
10
+ type CreateRenderHandler = (ctx: {
11
+ distDir: string;
12
+ staticGenerate: boolean;
13
+ ssrRender?: typeof ssr.render;
14
+ forceCSR?: boolean;
15
+ nonce?: string;
16
+ metaName?: string;
17
+ }) => RenderHandler;
18
+ export declare const createRenderHandler: CreateRenderHandler;
19
+ export {};
@@ -6,6 +6,7 @@ import type { ModernServerContext, ServerRoute } from '@modern-js/types';
6
6
  import type { ContextOptions } from '../libs/context';
7
7
  import { ModernServerOptions, NextFunction, ServerHookRunner, Metrics, Logger, ModernServerInterface, BuildOptions, ModernServerHandler } from '../type';
8
8
  import { RouteMatchManager, ModernRouteInterface, ModernRoute } from '../libs/route';
9
+ import { RenderHandler } from '../libs/render';
9
10
  import { mergeExtension } from '../utils';
10
11
  import * as reader from '../libs/render/reader';
11
12
  type ModernServerAsyncHandler = (context: ModernServerContext, next: NextFunction) => Promise<void>;
@@ -23,14 +24,14 @@ export declare class ModernServer implements ModernServerInterface {
23
24
  protected readonly runMode: string;
24
25
  protected reader: typeof reader;
25
26
  protected readonly proxyTarget: ModernServerOptions['proxyTarget'];
26
- private routeRenderHandler;
27
+ protected routeRenderHandler: RenderHandler;
28
+ protected readonly staticGenerate: boolean;
29
+ protected readonly metaName?: string;
27
30
  private loaderHandler;
28
31
  private frameWebHandler;
29
32
  private frameAPIHandler;
30
33
  private proxyHandler;
31
34
  private _handler;
32
- private readonly staticGenerate;
33
- private readonly metaName?;
34
35
  constructor({
35
36
  pwd,
36
37
  config,
@@ -43,6 +44,7 @@ export declare class ModernServer implements ModernServerInterface {
43
44
  appContext
44
45
  }: ModernServerOptions);
45
46
  onInit(runner: ServerHookRunner, app: Server): Promise<void>;
47
+ getRenderHandler(): RenderHandler;
46
48
  onRepack(_: BuildOptions): void;
47
49
  getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: () => void) => void | ServerResponse;
48
50
  render(req: IncomingMessage, res: ServerResponse, url?: string): Promise<string | import("stream").Readable | null>;
@@ -1,6 +1,6 @@
1
1
  /// <reference types="node" />
2
2
  /// <reference types="node/http" />
3
- /// <reference types=".dts-temp/kKZBfG7unyISzN2HX-IzS/src/type" />
3
+ /// <reference types=".dts-temp/3ag51RGwEKkAOCZCey_Qe/src/type" />
4
4
  import { IncomingMessage } from 'http';
5
5
  import type { OutputNormalizedConfig, HtmlNormalizedConfig } from '@modern-js/server-core';
6
6
  export declare const debug: any;
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.27.0",
18
+ "version": "2.28.0",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./dist/types/index.d.ts",
21
21
  "main": "./dist/cjs/index.js",
@@ -73,9 +73,9 @@
73
73
  "path-to-regexp": "^6.2.0",
74
74
  "serve-static": "^1.14.1",
75
75
  "@swc/helpers": "0.5.1",
76
- "@modern-js/utils": "2.27.0",
77
- "@modern-js/server-core": "2.27.0",
78
- "@modern-js/plugin": "2.27.0"
76
+ "@modern-js/utils": "2.28.0",
77
+ "@modern-js/server-core": "2.28.0",
78
+ "@modern-js/plugin": "2.28.0"
79
79
  },
80
80
  "devDependencies": {
81
81
  "@types/cookie": "^0.4.1",
@@ -92,10 +92,10 @@
92
92
  "portfinder": "^1.0.28",
93
93
  "typescript": "^5",
94
94
  "memfs": "^3.5.1",
95
- "@modern-js/types": "2.27.0",
96
- "@modern-js/server-core": "2.27.0",
97
- "@scripts/build": "2.27.0",
98
- "@scripts/jest-config": "2.27.0"
95
+ "@modern-js/types": "2.28.0",
96
+ "@modern-js/server-core": "2.28.0",
97
+ "@scripts/build": "2.28.0",
98
+ "@scripts/jest-config": "2.28.0"
99
99
  },
100
100
  "sideEffects": false,
101
101
  "publishConfig": {