vike 0.4.255-commit-05a7b95 → 0.4.256

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 (45) hide show
  1. package/dist/client/runtime-client-routing/createPageContextClient.d.ts +24 -2
  2. package/dist/client/runtime-client-routing/getGlobalContextClientInternal.d.ts +24 -2
  3. package/dist/client/runtime-client-routing/getPageContextFromHooks.d.ts +96 -8
  4. package/dist/client/runtime-client-routing/renderPageClient.d.ts +96 -8
  5. package/dist/client/runtime-server-routing/createPageContextClient.d.ts +24 -2
  6. package/dist/client/runtime-server-routing/getGlobalContextClientInternal.d.ts +24 -2
  7. package/dist/client/shared/getGlobalContextClientInternalShared.d.ts +24 -2
  8. package/dist/node/prerender/runPrerender.d.ts +36 -9
  9. package/dist/node/prerender/runPrerender.js +17 -11
  10. package/dist/node/vite/index.js +0 -2
  11. package/dist/node/vite/plugins/pluginExtractAssets.js +2 -0
  12. package/dist/node/vite/plugins/pluginReplaceConstantsGlobalThis.js +0 -2
  13. package/dist/node/vite/shared/addSsrMiddleware.js +0 -1
  14. package/dist/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js +0 -14
  15. package/dist/server/runtime/globalContext.d.ts +120 -10
  16. package/dist/server/runtime/renderPageServer/createHttpResponse.d.ts +3 -5
  17. package/dist/server/runtime/renderPageServer/createHttpResponse.js +1 -13
  18. package/dist/server/runtime/renderPageServer/createPageContextServer.d.ts +39 -15
  19. package/dist/server/runtime/renderPageServer/loadPageConfigsLazyServerSide.d.ts +36 -9
  20. package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.d.ts +144 -36
  21. package/dist/server/runtime/renderPageServer.d.ts +39 -13
  22. package/dist/server/runtime/renderPageServer.js +3 -51
  23. package/dist/server/runtime/universal-middleware.d.ts +2 -9
  24. package/dist/server/runtime/universal-middleware.js +1 -9
  25. package/dist/shared-server-client/createGlobalContextShared.d.ts +48 -4
  26. package/dist/shared-server-client/page-configs/resolveVikeConfigPublic.d.ts +0 -1
  27. package/dist/types/Config.d.ts +1 -21
  28. package/dist/types/PageContext.d.ts +0 -6
  29. package/dist/utils/PROJECT_VERSION.d.ts +1 -1
  30. package/dist/utils/PROJECT_VERSION.js +1 -1
  31. package/dist/utils/assertKeys.js +2 -2
  32. package/dist/utils/assertNodeVersion.js +1 -1
  33. package/dist/utils/assertVersion.js +1 -1
  34. package/dist/utils/joinEnglish.d.ts +4 -1
  35. package/dist/utils/joinEnglish.js +4 -4
  36. package/package.json +9 -26
  37. package/dist/node/vite/plugins/pluginUniversalDeploy/getDeployConfigs.d.ts +0 -12
  38. package/dist/node/vite/plugins/pluginUniversalDeploy/getDeployConfigs.js +0 -73
  39. package/dist/node/vite/plugins/pluginUniversalDeploy.d.ts +0 -5
  40. package/dist/node/vite/plugins/pluginUniversalDeploy.js +0 -155
  41. package/dist/server/runtime/fetch.d.ts +0 -10
  42. package/dist/server/runtime/fetch.js +0 -5
  43. package/dist/utils/asyncFlatten.d.ts +0 -4
  44. package/dist/utils/asyncFlatten.js +0 -7
  45. package/fetch.js +0 -3
package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.d.ts CHANGED
@@ -31,13 +31,21 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
31
31
  isPrerendering: boolean;
32
32
  _requestId: number;
33
33
  } & import("../renderPageServer.js").PageContextInit & {
34
- _reqDev?: import("http").IncomingMessage;
35
- _reqWeb?: Request;
36
- } & {
37
34
  _globalContext: ({
38
35
  _globalConfigPublic: {
39
36
  pages: {
40
- [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
37
+ [k: string]: {
38
+ config: import("../../../types/index.js").ConfigResolved;
39
+ _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
40
+ _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
41
+ _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
42
+ } & ({
43
+ route: import("../../../types/Config.js").Route;
44
+ isErrorPage?: undefined;
45
+ } | {
46
+ route?: undefined;
47
+ isErrorPage: true;
48
+ });
41
49
  };
42
50
  config: import("../../../types/index.js").ConfigResolved;
43
51
  _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -45,7 +53,18 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
45
53
  _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
46
54
  };
47
55
  pages: {
48
- [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
56
+ [k: string]: {
57
+ config: import("../../../types/index.js").ConfigResolved;
58
+ _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
59
+ _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
60
+ _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
61
+ } & ({
62
+ route: import("../../../types/Config.js").Route;
63
+ isErrorPage?: undefined;
64
+ } | {
65
+ route?: undefined;
66
+ isErrorPage: true;
67
+ });
49
68
  };
50
69
  config: import("../../../types/index.js").ConfigResolved;
51
70
  _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -107,16 +126,24 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
107
126
  _baseServer: string;
108
127
  _baseAssets: string;
109
128
  _pageContextInit: import("../renderPageServer.js").PageContextInit & {
110
- _reqDev?: import("http").IncomingMessage;
111
- _reqWeb?: Request;
112
- } & {
113
129
  headers?: Record<string, unknown>;
114
130
  };
115
131
  _urlHandler: ((url: string) => string) | null;
116
132
  isClientSideNavigation: boolean;
117
133
  } & {
118
134
  pages: {
119
- [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
135
+ [k: string]: {
136
+ config: import("../../../types/index.js").ConfigResolved;
137
+ _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
138
+ _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
139
+ _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
140
+ } & ({
141
+ route: import("../../../types/Config.js").Route;
142
+ isErrorPage?: undefined;
143
+ } | {
144
+ route?: undefined;
145
+ isErrorPage: true;
146
+ });
120
147
  };
121
148
  config: import("../../../types/index.js").ConfigResolved;
122
149
  _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -167,13 +194,21 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
167
194
  isPrerendering: boolean;
168
195
  _requestId: number;
169
196
  } & import("../renderPageServer.js").PageContextInit & {
170
- _reqDev?: import("http").IncomingMessage;
171
- _reqWeb?: Request;
172
- } & {
173
197
  _globalContext: ({
174
198
  _globalConfigPublic: {
175
199
  pages: {
176
- [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
200
+ [k: string]: {
201
+ config: import("../../../types/index.js").ConfigResolved;
202
+ _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
203
+ _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
204
+ _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
205
+ } & ({
206
+ route: import("../../../types/Config.js").Route;
207
+ isErrorPage?: undefined;
208
+ } | {
209
+ route?: undefined;
210
+ isErrorPage: true;
211
+ });
177
212
  };
178
213
  config: import("../../../types/index.js").ConfigResolved;
179
214
  _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -181,7 +216,18 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
181
216
  _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
182
217
  };
183
218
  pages: {
184
- [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
219
+ [k: string]: {
220
+ config: import("../../../types/index.js").ConfigResolved;
221
+ _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
222
+ _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
223
+ _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
224
+ } & ({
225
+ route: import("../../../types/Config.js").Route;
226
+ isErrorPage?: undefined;
227
+ } | {
228
+ route?: undefined;
229
+ isErrorPage: true;
230
+ });
185
231
  };
186
232
  config: import("../../../types/index.js").ConfigResolved;
187
233
  _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -243,16 +289,24 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
243
289
  _baseServer: string;
244
290
  _baseAssets: string;
245
291
  _pageContextInit: import("../renderPageServer.js").PageContextInit & {
246
- _reqDev?: import("http").IncomingMessage;
247
- _reqWeb?: Request;
248
- } & {
249
292
  headers?: Record<string, unknown>;
250
293
  };
251
294
  _urlHandler: ((url: string) => string) | null;
252
295
  isClientSideNavigation: boolean;
253
296
  } & {
254
297
  pages: {
255
- [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
298
+ [k: string]: {
299
+ config: import("../../../types/index.js").ConfigResolved;
300
+ _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
301
+ _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
302
+ _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
303
+ } & ({
304
+ route: import("../../../types/Config.js").Route;
305
+ isErrorPage?: undefined;
306
+ } | {
307
+ route?: undefined;
308
+ isErrorPage: true;
309
+ });
256
310
  };
257
311
  config: import("../../../types/index.js").ConfigResolved;
258
312
  _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -311,13 +365,21 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
311
365
  isPrerendering: boolean;
312
366
  _requestId: number;
313
367
  } & import("../renderPageServer.js").PageContextInit & {
314
- _reqDev?: import("http").IncomingMessage;
315
- _reqWeb?: Request;
316
- } & {
317
368
  _globalContext: ({
318
369
  _globalConfigPublic: {
319
370
  pages: {
320
- [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
371
+ [k: string]: {
372
+ config: import("../../../types/index.js").ConfigResolved;
373
+ _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
374
+ _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
375
+ _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
376
+ } & ({
377
+ route: import("../../../types/Config.js").Route;
378
+ isErrorPage?: undefined;
379
+ } | {
380
+ route?: undefined;
381
+ isErrorPage: true;
382
+ });
321
383
  };
322
384
  config: import("../../../types/index.js").ConfigResolved;
323
385
  _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -325,7 +387,18 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
325
387
  _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
326
388
  };
327
389
  pages: {
328
- [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
390
+ [k: string]: {
391
+ config: import("../../../types/index.js").ConfigResolved;
392
+ _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
393
+ _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
394
+ _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
395
+ } & ({
396
+ route: import("../../../types/Config.js").Route;
397
+ isErrorPage?: undefined;
398
+ } | {
399
+ route?: undefined;
400
+ isErrorPage: true;
401
+ });
329
402
  };
330
403
  config: import("../../../types/index.js").ConfigResolved;
331
404
  _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -387,16 +460,24 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
387
460
  _baseServer: string;
388
461
  _baseAssets: string;
389
462
  _pageContextInit: import("../renderPageServer.js").PageContextInit & {
390
- _reqDev?: import("http").IncomingMessage;
391
- _reqWeb?: Request;
392
- } & {
393
463
  headers?: Record<string, unknown>;
394
464
  };
395
465
  _urlHandler: ((url: string) => string) | null;
396
466
  isClientSideNavigation: boolean;
397
467
  } & {
398
468
  pages: {
399
- [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
469
+ [k: string]: {
470
+ config: import("../../../types/index.js").ConfigResolved;
471
+ _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
472
+ _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
473
+ _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
474
+ } & ({
475
+ route: import("../../../types/Config.js").Route;
476
+ isErrorPage?: undefined;
477
+ } | {
478
+ route?: undefined;
479
+ isErrorPage: true;
480
+ });
400
481
  };
401
482
  config: import("../../../types/index.js").ConfigResolved;
402
483
  _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -447,13 +528,21 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
447
528
  isPrerendering: boolean;
448
529
  _requestId: number;
449
530
  } & import("../renderPageServer.js").PageContextInit & {
450
- _reqDev?: import("http").IncomingMessage;
451
- _reqWeb?: Request;
452
- } & {
453
531
  _globalContext: ({
454
532
  _globalConfigPublic: {
455
533
  pages: {
456
- [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
534
+ [k: string]: {
535
+ config: import("../../../types/index.js").ConfigResolved;
536
+ _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
537
+ _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
538
+ _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
539
+ } & ({
540
+ route: import("../../../types/Config.js").Route;
541
+ isErrorPage?: undefined;
542
+ } | {
543
+ route?: undefined;
544
+ isErrorPage: true;
545
+ });
457
546
  };
458
547
  config: import("../../../types/index.js").ConfigResolved;
459
548
  _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -461,7 +550,18 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
461
550
  _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
462
551
  };
463
552
  pages: {
464
- [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
553
+ [k: string]: {
554
+ config: import("../../../types/index.js").ConfigResolved;
555
+ _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
556
+ _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
557
+ _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
558
+ } & ({
559
+ route: import("../../../types/Config.js").Route;
560
+ isErrorPage?: undefined;
561
+ } | {
562
+ route?: undefined;
563
+ isErrorPage: true;
564
+ });
465
565
  };
466
566
  config: import("../../../types/index.js").ConfigResolved;
467
567
  _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -523,16 +623,24 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
523
623
  _baseServer: string;
524
624
  _baseAssets: string;
525
625
  _pageContextInit: import("../renderPageServer.js").PageContextInit & {
526
- _reqDev?: import("http").IncomingMessage;
527
- _reqWeb?: Request;
528
- } & {
529
626
  headers?: Record<string, unknown>;
530
627
  };
531
628
  _urlHandler: ((url: string) => string) | null;
532
629
  isClientSideNavigation: boolean;
533
630
  } & {
534
631
  pages: {
535
- [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
632
+ [k: string]: {
633
+ config: import("../../../types/index.js").ConfigResolved;
634
+ _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
635
+ _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
636
+ _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
637
+ } & ({
638
+ route: import("../../../types/Config.js").Route;
639
+ isErrorPage?: undefined;
640
+ } | {
641
+ route?: undefined;
642
+ isErrorPage: true;
643
+ });
536
644
  };
537
645
  config: import("../../../types/index.js").ConfigResolved;
538
646
  _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
package/dist/server/runtime/renderPageServer.d.ts CHANGED
@@ -1,21 +1,20 @@
1
1
  export { renderPageServer };
2
2
  export { getRequestTag };
3
3
  export type { PageContextInit };
4
- export type { PageContextInternalInit };
5
4
  export type { PageContextBegin };
6
5
  export type { RequestTag };
7
6
  import { type PageContextAborted } from '../../shared-server-client/route/abort.js';
8
7
  import { type GlobalContextServerInternal } from './globalContext.js';
9
8
  import { type HttpResponse } from './renderPageServer/createHttpResponse.js';
10
9
  import type { PageContextServer } from '../../types/index.js';
11
- import type { PageContextInit, PageContextInternalInit } from '../../types/PageContext.js';
10
+ import type { PageContextInit } from '../../types/PageContext.js';
12
11
  import { type AsyncStore } from './asyncHook.js';
13
12
  import '../assertEnvServer.js';
14
13
  type PageContextBegin = ReturnType<typeof getPageContextBegin>;
15
- declare function renderPageServer<PageContextUserAdded extends {}, PageContextInitUser extends PageContextInternalInit>(pageContextInit: PageContextInitUser): Promise<PageContextInitUser & {
14
+ declare function renderPageServer<PageContextUserAdded extends {}, PageContextInitUser extends PageContextInit>(pageContextInit: PageContextInitUser): Promise<PageContextInitUser & {
16
15
  httpResponse: HttpResponse;
17
16
  } & Partial<PageContextServer & PageContextUserAdded>>;
18
- declare function getPageContextBegin(pageContextInit: PageContextInternalInit, globalContext: GlobalContextServerInternal, requestId: number, asyncStore: AsyncStore): {
17
+ declare function getPageContextBegin(pageContextInit: PageContextInit, globalContext: GlobalContextServerInternal, requestId: number, asyncStore: AsyncStore): {
19
18
  _isOriginalObject: true;
20
19
  isPageContext: true;
21
20
  } & {
@@ -23,13 +22,21 @@ declare function getPageContextBegin(pageContextInit: PageContextInternalInit, g
23
22
  isPrerendering: boolean;
24
23
  _requestId: number;
25
24
  } & PageContextInit & {
26
- _reqDev?: import("http").IncomingMessage;
27
- _reqWeb?: Request;
28
- } & {
29
25
  _globalContext: ({
30
26
  _globalConfigPublic: {
31
27
  pages: {
32
- [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
28
+ [k: string]: {
29
+ config: import("../../types/index.js").ConfigResolved;
30
+ _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
31
+ _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
32
+ _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
33
+ } & ({
34
+ route: import("../../types/Config.js").Route;
35
+ isErrorPage?: undefined;
36
+ } | {
37
+ route?: undefined;
38
+ isErrorPage: true;
39
+ });
33
40
  };
34
41
  config: import("../../types/index.js").ConfigResolved;
35
42
  _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -37,7 +44,18 @@ declare function getPageContextBegin(pageContextInit: PageContextInternalInit, g
37
44
  _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
38
45
  };
39
46
  pages: {
40
- [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
47
+ [k: string]: {
48
+ config: import("../../types/index.js").ConfigResolved;
49
+ _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
50
+ _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
51
+ _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
52
+ } & ({
53
+ route: import("../../types/Config.js").Route;
54
+ isErrorPage?: undefined;
55
+ } | {
56
+ route?: undefined;
57
+ isErrorPage: true;
58
+ });
41
59
  };
42
60
  config: import("../../types/index.js").ConfigResolved;
43
61
  _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -99,16 +117,24 @@ declare function getPageContextBegin(pageContextInit: PageContextInternalInit, g
99
117
  _baseServer: string;
100
118
  _baseAssets: string;
101
119
  _pageContextInit: PageContextInit & {
102
- _reqDev?: import("http").IncomingMessage;
103
- _reqWeb?: Request;
104
- } & {
105
120
  headers?: Record<string, unknown>;
106
121
  };
107
122
  _urlHandler: ((url: string) => string) | null;
108
123
  isClientSideNavigation: boolean;
109
124
  } & {
110
125
  pages: {
111
- [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
126
+ [k: string]: {
127
+ config: import("../../types/index.js").ConfigResolved;
128
+ _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
129
+ _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
130
+ _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
131
+ } & ({
132
+ route: import("../../types/Config.js").Route;
133
+ isErrorPage?: undefined;
134
+ } | {
135
+ route?: undefined;
136
+ isErrorPage: true;
137
+ });
112
138
  };
113
139
  config: import("../../types/index.js").ConfigResolved;
114
140
  _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
package/dist/server/runtime/renderPageServer.js CHANGED
@@ -17,7 +17,7 @@ import { updateType } from '../../utils/updateType.js';
17
17
  import { getPageContextAddendumAbort, isAbortError, logAbort, addNewPageContextAborted, } from '../../shared-server-client/route/abort.js';
18
18
  import { getGlobalContextServerInternal, initGlobalContext_renderPage, } from './globalContext.js';
19
19
  import { handlePageContextRequestUrl } from './renderPageServer/handlePageContextRequestUrl.js';
20
- import { createHttpResponse404, createHttpResponseRedirect, createHttpResponsePageJson, createHttpResponseErrorFallback, createHttpResponseErrorFallback_noGlobalContext, createHttpResponseBaseIsMissing, createHttpResponseFromUniversalMiddleware, } from './renderPageServer/createHttpResponse.js';
20
+ import { createHttpResponse404, createHttpResponseRedirect, createHttpResponsePageJson, createHttpResponseErrorFallback, createHttpResponseErrorFallback_noGlobalContext, createHttpResponseBaseIsMissing, } from './renderPageServer/createHttpResponse.js';
21
21
  import { logRuntimeError, logRuntimeInfo } from './loggerRuntime.js';
22
22
  import { assertArguments } from './renderPageServer/assertArguments.js';
23
23
  import { log404 } from './renderPageServer/log404/index.js';
@@ -31,8 +31,6 @@ import { getVikeConfigError } from '../../shared-server-node/getVikeConfigError.
31
31
  import { forkPageContext } from '../../shared-server-client/forkPageContext.js';
32
32
  import { getAsyncLocalStorage } from './asyncHook.js';
33
33
  import '../assertEnvServer.js';
34
- import { enhance, apply, universalSymbol, UniversalRouter, getAdapterRuntime, } from '@universal-middleware/core';
35
- import { createRequestAdapter } from '@universal-middleware/node/request';
36
34
  const globalObject = getGlobalObject('runtime/renderPageServer.ts', {
37
35
  httpRequestsCount: 0,
38
36
  });
@@ -50,14 +48,14 @@ async function renderPageServer(pageContextInit) {
50
48
  logHttpRequest(urlOriginalPretty, pageContextInit, requestId);
51
49
  const asyncLocalStorage = await getAsyncLocalStorage();
52
50
  const asyncStore = !asyncLocalStorage ? null : { requestId };
53
- const render = async () => await renderPageServerEntryOnceBegin(pageContextInit, requestId, asyncStore);
51
+ const render = async () => await renderPageServerEntryOnce(pageContextInit, requestId, asyncStore);
54
52
  const pageContextFinish = !asyncLocalStorage ? await render() : await asyncLocalStorage.run(asyncStore, render);
55
53
  logHttpResponse(urlOriginalPretty, pageContextFinish);
56
54
  checkType(pageContextFinish);
57
55
  assertPageContextFinish(pageContextFinish);
58
56
  return pageContextFinish;
59
57
  }
60
- async function renderPageServerEntryOnceBegin(pageContextInit, requestId, asyncStore) {
58
+ async function renderPageServerEntryOnce(pageContextInit, requestId, asyncStore) {
61
59
  // Invalid config
62
60
  {
63
61
  const vikeConfigError = getVikeConfigError();
@@ -93,16 +91,6 @@ async function renderPageServerEntryOnceBegin(pageContextInit, requestId, asyncS
93
91
  }
94
92
  const { globalContext } = await getGlobalContextServerInternal();
95
93
  const pageContextBegin = getPageContextBegin(pageContextInit, globalContext, requestId, asyncStore);
96
- const middlewares = (globalContext.config.middleware ?? []).flat();
97
- const renderPageServerEntry = () => renderPageServerEntryOnce(pageContextBegin, globalContext, requestId);
98
- if (middlewares.length === 0) {
99
- return renderPageServerEntry();
100
- }
101
- else {
102
- return renderPageServerEntryWithMiddlewares(pageContextBegin, renderPageServerEntry, middlewares);
103
- }
104
- }
105
- async function renderPageServerEntryOnce(pageContextBegin, globalContext, requestId) {
106
94
  // Check Base URL
107
95
  {
108
96
  const pageContextHttpResponse = await checkBaseUrl(pageContextBegin, globalContext);
@@ -239,42 +227,6 @@ async function renderPageServerEntryRecursive_onError(err, pageContextBegin, pag
239
227
  }
240
228
  return pageContextErrorPage;
241
229
  }
242
- const requestAdapter = createRequestAdapter();
243
- async function renderPageServerEntryWithMiddlewares(pageContext, renderPageServerEntry, middlewares) {
244
- const router = new UniversalRouter(true, false);
245
- let httpResponseVikeCore = undefined;
246
- // Wrap rendering into universal-middleware routing
247
- apply(router, [
248
- enhance(async function adaptRenderPageServerEntryOnceInternal() {
249
- const pageContextHttpResponse = await renderPageServerEntry();
250
- const { httpResponse } = pageContextHttpResponse;
251
- pageContext = pageContextHttpResponse;
252
- httpResponseVikeCore = httpResponse;
253
- const readable = httpResponse.getReadableWebStream();
254
- return new Response(readable, {
255
- status: httpResponse.statusCode,
256
- headers: httpResponse.headers,
257
- });
258
- }, {
259
- name: 'vike',
260
- method: ['GET', 'POST', 'PUT', 'PATCH', 'HEAD', 'OPTIONS'],
261
- path: '/**', // rou3 format
262
- immutable: true, // avoids cloning the function we just created
263
- }),
264
- ...middlewares,
265
- ]);
266
- const handler = router[universalSymbol];
267
- const request = pageContext._reqWeb ??
268
- (pageContext._reqDev
269
- ? requestAdapter(pageContext._reqDev)
270
- : new Request(new URL(pageContext.urlOriginal, 'http://localhost').toString(), {
271
- headers: pageContext.headers ?? {},
272
- }));
273
- const res = await handler(request, {}, getAdapterRuntime('other', { params: undefined }));
274
- const httpResponse = createHttpResponseFromUniversalMiddleware(res, httpResponseVikeCore?.earlyHints);
275
- objectAssign(pageContext, { httpResponse });
276
- return pageContext;
277
- }
278
230
  function logHttpRequest(urlOriginal, pageContextInit, requestId) {
279
231
  const pageContext = createPageContextServerWithoutGlobalContext(pageContextInit, requestId);
280
232
  logRuntimeInfo?.(getRequestInfoMessage(urlOriginal), pageContext, 'info');
package/dist/server/runtime/universal-middleware.d.ts CHANGED
@@ -1,10 +1,3 @@
1
- import { type RuntimeAdapterTarget } from '@universal-middleware/core';
1
+ export default universalVikeHandler;
2
2
  import '../assertEnvServer.js';
3
- declare function universalVikeHandler<T extends string>(request: Request, context: Universal.Context, runtime: RuntimeAdapterTarget<T>): Promise<Response>;
4
- declare const universalVikeHandlerEnhanced: typeof universalVikeHandler & import("@universal-middleware/core").WithUniversalSymbols<{
5
- name: string;
6
- method: ("GET" | "HEAD" | "POST" | "PUT" | "OPTIONS" | "PATCH")[];
7
- path: string;
8
- immutable: true;
9
- }>;
10
- export default universalVikeHandlerEnhanced;
3
+ declare function universalVikeHandler(request: Request, context: Record<string, unknown>, runtime: Record<string, unknown>): Promise<Response>;
package/dist/server/runtime/universal-middleware.js CHANGED
@@ -1,4 +1,4 @@
1
- import { enhance } from '@universal-middleware/core';
1
+ export default universalVikeHandler;
2
2
  import { renderPageServer } from './renderPageServer.js';
3
3
  import '../assertEnvServer.js';
4
4
  async function universalVikeHandler(request, context, runtime) {
@@ -8,7 +8,6 @@ async function universalVikeHandler(request, context, runtime) {
8
8
  runtime,
9
9
  urlOriginal: request.url,
10
10
  headersOriginal: request.headers,
11
- _reqWeb: request,
12
11
  };
13
12
  const pageContext = await renderPageServer(pageContextInit);
14
13
  const response = pageContext.httpResponse;
@@ -18,10 +17,3 @@ async function universalVikeHandler(request, context, runtime) {
18
17
  headers: response.headers,
19
18
  });
20
19
  }
21
- const universalVikeHandlerEnhanced = enhance(universalVikeHandler, {
22
- name: 'vike',
23
- method: ['GET', 'POST', 'PUT', 'PATCH', 'HEAD', 'OPTIONS'],
24
- path: '/**',
25
- immutable: true,
26
- });
27
- export default universalVikeHandlerEnhanced;
package/dist/shared-server-client/createGlobalContextShared.d.ts CHANGED
@@ -17,7 +17,18 @@ declare function createGlobalContextShared<GlobalContextAdded extends {}, Global
17
17
  }, addGlobalContext?: (globalContext: GlobalContextBase) => GlobalContextAdded, addGlobalContextTmp?: (globalContext: GlobalContextBase) => Promise<GlobalContextAdded>, addGlobalContextAsync?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddedAsync>): Promise<{
18
18
  _globalConfigPublic: {
19
19
  pages: {
20
- [k: string]: import("./page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
20
+ [k: string]: {
21
+ config: import("../types/index.js").ConfigResolved;
22
+ _source: import("./page-configs/resolveVikeConfigPublic.js").Source;
23
+ _sources: import("./page-configs/resolveVikeConfigPublic.js").Sources;
24
+ _from: import("./page-configs/resolveVikeConfigPublic.js").From;
25
+ } & ({
26
+ route: import("../types/Config.js").Route;
27
+ isErrorPage?: undefined;
28
+ } | {
29
+ route?: undefined;
30
+ isErrorPage: true;
31
+ });
21
32
  };
22
33
  config: import("../types/index.js").ConfigResolved;
23
34
  _source: import("./page-configs/resolveVikeConfigPublic.js").Source;
@@ -25,7 +36,18 @@ declare function createGlobalContextShared<GlobalContextAdded extends {}, Global
25
36
  _from: import("./page-configs/resolveVikeConfigPublic.js").From;
26
37
  };
27
38
  pages: {
28
- [k: string]: import("./page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
39
+ [k: string]: {
40
+ config: import("../types/index.js").ConfigResolved;
41
+ _source: import("./page-configs/resolveVikeConfigPublic.js").Source;
42
+ _sources: import("./page-configs/resolveVikeConfigPublic.js").Sources;
43
+ _from: import("./page-configs/resolveVikeConfigPublic.js").From;
44
+ } & ({
45
+ route: import("../types/Config.js").Route;
46
+ isErrorPage?: undefined;
47
+ } | {
48
+ route?: undefined;
49
+ isErrorPage: true;
50
+ });
29
51
  };
30
52
  config: import("../types/index.js").ConfigResolved;
31
53
  _source: import("./page-configs/resolveVikeConfigPublic.js").Source;
@@ -49,7 +71,18 @@ type GlobalContextBase = ReturnType<typeof createGlobalContextBase>;
49
71
  declare function createGlobalContextBase(virtualFileExportsGlobalEntry: unknown): {
50
72
  _globalConfigPublic: {
51
73
  pages: {
52
- [k: string]: import("./page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
74
+ [k: string]: {
75
+ config: import("../types/index.js").ConfigResolved;
76
+ _source: import("./page-configs/resolveVikeConfigPublic.js").Source;
77
+ _sources: import("./page-configs/resolveVikeConfigPublic.js").Sources;
78
+ _from: import("./page-configs/resolveVikeConfigPublic.js").From;
79
+ } & ({
80
+ route: import("../types/Config.js").Route;
81
+ isErrorPage?: undefined;
82
+ } | {
83
+ route?: undefined;
84
+ isErrorPage: true;
85
+ });
53
86
  };
54
87
  config: import("../types/index.js").ConfigResolved;
55
88
  _source: import("./page-configs/resolveVikeConfigPublic.js").Source;
@@ -57,7 +90,18 @@ declare function createGlobalContextBase(virtualFileExportsGlobalEntry: unknown)
57
90
  _from: import("./page-configs/resolveVikeConfigPublic.js").From;
58
91
  };
59
92
  pages: {
60
- [k: string]: import("./page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
93
+ [k: string]: {
94
+ config: import("../types/index.js").ConfigResolved;
95
+ _source: import("./page-configs/resolveVikeConfigPublic.js").Source;
96
+ _sources: import("./page-configs/resolveVikeConfigPublic.js").Sources;
97
+ _from: import("./page-configs/resolveVikeConfigPublic.js").From;
98
+ } & ({
99
+ route: import("../types/Config.js").Route;
100
+ isErrorPage?: undefined;
101
+ } | {
102
+ route?: undefined;
103
+ isErrorPage: true;
104
+ });
61
105
  };
62
106
  config: import("../types/index.js").ConfigResolved;
63
107
  _source: import("./page-configs/resolveVikeConfigPublic.js").Source;
package/dist/shared-server-client/page-configs/resolveVikeConfigPublic.d.ts CHANGED
@@ -2,7 +2,6 @@ export { resolveGlobalConfigPublic };
2
2
  export { resolvePageContextConfig };
3
3
  export { resolveGlobalContextConfig };
4
4
  export type { PageContextConfig };
5
- export type { PageConfigPublicWithRoute };
6
5
  export type { GlobalConfigPublic };
7
6
  export type { Source };
8
7
  export type { Sources };