vike 0.4.250-commit-193dea3 → 0.4.250-commit-6161324

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 (32) hide show
  1. package/dist/client/runtime-client-routing/createPageContextClientSide.d.ts +19 -1
  2. package/dist/client/runtime-client-routing/createPageContextClientSide.js +19 -11
  3. package/dist/client/runtime-client-routing/getPageContextFromHooks.d.ts +58 -70
  4. package/dist/client/runtime-client-routing/renderPageClient.d.ts +100 -98
  5. package/dist/client/runtime-server-routing/createPageContextClientSide.d.ts +14 -1
  6. package/dist/client/runtime-server-routing/createPageContextClientSide.js +10 -4
  7. package/dist/node/prerender/runPrerender.d.ts +2 -5
  8. package/dist/node/prerender/runPrerender.js +2 -2
  9. package/dist/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js +5 -0
  10. package/dist/server/runtime/logErrorServer.d.ts +2 -2
  11. package/dist/server/runtime/loggerRuntime.d.ts +2 -2
  12. package/dist/server/runtime/renderPageServer/createPageContextServerSide.d.ts +12 -10
  13. package/dist/server/runtime/renderPageServer/createPageContextServerSide.js +11 -11
  14. package/dist/server/runtime/renderPageServer/execHookOnError.d.ts +2 -2
  15. package/dist/server/runtime/renderPageServer/execHookOnError.js +3 -1
  16. package/dist/server/runtime/renderPageServer/loadPageConfigsLazyServerSide.d.ts +1 -4
  17. package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.d.ts +4 -16
  18. package/dist/server/runtime/renderPageServer.d.ts +2 -9
  19. package/dist/shared-server-client/createGlobalContextShared.js +1 -1
  20. package/dist/shared-server-client/createPageContextShared.d.ts +12 -2
  21. package/dist/shared-server-client/createPageContextShared.js +1 -0
  22. package/dist/shared-server-client/getPageContextUrlComputed.d.ts +5 -2
  23. package/dist/shared-server-client/hooks/execHook.d.ts +5 -7
  24. package/dist/shared-server-client/hooks/execHook.js +77 -12
  25. package/dist/shared-server-client/prepareGlobalContextForPublicUsage.d.ts +2 -0
  26. package/dist/shared-server-client/preparePageContextForPublicUsage.d.ts +2 -3
  27. package/dist/types/Config.d.ts +10 -1
  28. package/dist/types/Config.js +1 -0
  29. package/dist/types/PageContext.d.ts +33 -26
  30. package/dist/utils/PROJECT_VERSION.d.ts +1 -1
  31. package/dist/utils/PROJECT_VERSION.js +1 -1
  32. package/package.json +1 -1
package/dist/client/runtime-client-routing/renderPageClient.d.ts CHANGED
@@ -41,6 +41,14 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
41
41
  isClientSide: true;
42
42
  isPrerendering: false;
43
43
  urlOriginal: string;
44
+ _urlHandler: null;
45
+ } & {
46
+ _baseServer: string;
47
+ } & {
48
+ urlParsed: import("./utils.js").UrlPublic;
49
+ urlPathname: string;
50
+ url: string;
51
+ } & {
44
52
  _globalContext: {
45
53
  _globalConfigPublic: {
46
54
  pages: {
@@ -94,13 +102,9 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
94
102
  _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
95
103
  };
96
104
  _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
97
- _urlHandler: null;
98
- _baseServer: string;
99
- } & {
100
- urlParsed: import("./utils.js").UrlPublic;
101
- urlPathname: string;
102
- url: string;
103
- } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & PageContextConfig & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & PageContextInternalClient & {
105
+ } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & PageContextConfig & {
106
+ _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
107
+ } & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & PageContextInternalClient & {
104
108
  isBackwardNavigation: boolean | null;
105
109
  isHistoryNavigation: boolean;
106
110
  isClientSideNavigation: boolean;
@@ -114,6 +118,14 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
114
118
  isClientSide: true;
115
119
  isPrerendering: false;
116
120
  urlOriginal: string;
121
+ _urlHandler: null;
122
+ } & {
123
+ _baseServer: string;
124
+ } & {
125
+ urlParsed: import("./utils.js").UrlPublic;
126
+ urlPathname: string;
127
+ url: string;
128
+ } & {
117
129
  _globalContext: {
118
130
  _globalConfigPublic: {
119
131
  pages: {
@@ -167,20 +179,13 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
167
179
  _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
168
180
  };
169
181
  _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
170
- _urlHandler: null;
171
- _baseServer: string;
172
- } & {
173
- urlParsed: import("./utils.js").UrlPublic;
174
- urlPathname: string;
175
- url: string;
176
- } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & PageContextInternalClient & Omit<Partial<PageContextConfig & {
182
+ } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
183
+ _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
184
+ } & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & PageContextInternalClient & Omit<Partial<PageContextConfig & {
177
185
  isPageContext: true;
178
186
  Page: import("../../types/Config.js").Config["Page"];
179
187
  routeParams: Record<string, string>;
180
188
  data: unknown;
181
- urlOriginal: string;
182
- headers: Record<string, string> | null;
183
- headersOriginal?: unknown;
184
189
  headersResponse: Headers;
185
190
  is404: boolean | null;
186
191
  isClientSideNavigation: boolean;
@@ -191,7 +196,6 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
191
196
  from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
192
197
  source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
193
198
  sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
194
- url: string;
195
199
  pageExports: Record<string, unknown>;
196
200
  isBaseMissing?: true;
197
201
  }> & Pick<PageContextConfig & {
@@ -199,9 +203,6 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
199
203
  Page: import("../../types/Config.js").Config["Page"];
200
204
  routeParams: Record<string, string>;
201
205
  data: unknown;
202
- urlOriginal: string;
203
- headers: Record<string, string> | null;
204
- headersOriginal?: unknown;
205
206
  headersResponse: Headers;
206
207
  is404: boolean | null;
207
208
  isClientSideNavigation: boolean;
@@ -212,13 +213,13 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
212
213
  from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
213
214
  source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
214
215
  sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
215
- url: string;
216
216
  pageExports: Record<string, unknown>;
217
217
  isBaseMissing?: true;
218
- }, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
218
+ }, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
219
219
  isClientSide: true;
220
220
  isPrerendering: false;
221
221
  } & {
222
+ urlOriginal: string;
222
223
  isHydration: boolean;
223
224
  isBackwardNavigation: boolean | null;
224
225
  isHistoryNavigation: boolean;
@@ -231,7 +232,7 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
231
232
  urlParsed: import("./utils.js").UrlPublic;
232
233
  urlPathname: string;
233
234
  url: string;
234
- }, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
235
+ }, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
235
236
  previousPageContext: {
236
237
  pageId: string;
237
238
  } | null;
@@ -241,7 +242,7 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
241
242
  pageContextsAborted: PageContextAborted[];
242
243
  } & {
243
244
  _abortCall: `redirect(${string})` | `render(${string})` | "RenderErrorPage()";
244
- _abortCaller: "throw render()" | "throw redirect()" | "throw RenderErrorPage()";
245
+ _abortCaller: "throw redirect()" | "throw render()" | "throw RenderErrorPage()";
245
246
  } & {
246
247
  _abortCall: `redirect(${string})`;
247
248
  _abortCaller: "throw redirect()";
@@ -266,6 +267,14 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
266
267
  isClientSide: true;
267
268
  isPrerendering: false;
268
269
  urlOriginal: string;
270
+ _urlHandler: null;
271
+ } & {
272
+ _baseServer: string;
273
+ } & {
274
+ urlParsed: import("./utils.js").UrlPublic;
275
+ urlPathname: string;
276
+ url: string;
277
+ } & {
269
278
  _globalContext: {
270
279
  _globalConfigPublic: {
271
280
  pages: {
@@ -319,13 +328,9 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
319
328
  _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
320
329
  };
321
330
  _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
322
- _urlHandler: null;
323
- _baseServer: string;
324
- } & {
325
- urlParsed: import("./utils.js").UrlPublic;
326
- urlPathname: string;
327
- url: string;
328
- } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & PageContextConfig & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & PageContextInternalClient & {
331
+ } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & PageContextConfig & {
332
+ _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
333
+ } & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & PageContextInternalClient & {
329
334
  isBackwardNavigation: boolean | null;
330
335
  isHistoryNavigation: boolean;
331
336
  isClientSideNavigation: boolean;
@@ -339,6 +344,14 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
339
344
  isClientSide: true;
340
345
  isPrerendering: false;
341
346
  urlOriginal: string;
347
+ _urlHandler: null;
348
+ } & {
349
+ _baseServer: string;
350
+ } & {
351
+ urlParsed: import("./utils.js").UrlPublic;
352
+ urlPathname: string;
353
+ url: string;
354
+ } & {
342
355
  _globalContext: {
343
356
  _globalConfigPublic: {
344
357
  pages: {
@@ -392,20 +405,13 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
392
405
  _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
393
406
  };
394
407
  _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
395
- _urlHandler: null;
396
- _baseServer: string;
397
- } & {
398
- urlParsed: import("./utils.js").UrlPublic;
399
- urlPathname: string;
400
- url: string;
401
- } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & PageContextInternalClient & Omit<Partial<PageContextConfig & {
408
+ } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
409
+ _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
410
+ } & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & PageContextInternalClient & Omit<Partial<PageContextConfig & {
402
411
  isPageContext: true;
403
412
  Page: import("../../types/Config.js").Config["Page"];
404
413
  routeParams: Record<string, string>;
405
414
  data: unknown;
406
- urlOriginal: string;
407
- headers: Record<string, string> | null;
408
- headersOriginal?: unknown;
409
415
  headersResponse: Headers;
410
416
  is404: boolean | null;
411
417
  isClientSideNavigation: boolean;
@@ -416,7 +422,6 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
416
422
  from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
417
423
  source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
418
424
  sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
419
- url: string;
420
425
  pageExports: Record<string, unknown>;
421
426
  isBaseMissing?: true;
422
427
  }> & Pick<PageContextConfig & {
@@ -424,9 +429,6 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
424
429
  Page: import("../../types/Config.js").Config["Page"];
425
430
  routeParams: Record<string, string>;
426
431
  data: unknown;
427
- urlOriginal: string;
428
- headers: Record<string, string> | null;
429
- headersOriginal?: unknown;
430
432
  headersResponse: Headers;
431
433
  is404: boolean | null;
432
434
  isClientSideNavigation: boolean;
@@ -437,13 +439,13 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
437
439
  from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
438
440
  source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
439
441
  sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
440
- url: string;
441
442
  pageExports: Record<string, unknown>;
442
443
  isBaseMissing?: true;
443
- }, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
444
+ }, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
444
445
  isClientSide: true;
445
446
  isPrerendering: false;
446
447
  } & {
448
+ urlOriginal: string;
447
449
  isHydration: boolean;
448
450
  isBackwardNavigation: boolean | null;
449
451
  isHistoryNavigation: boolean;
@@ -456,7 +458,7 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
456
458
  urlParsed: import("./utils.js").UrlPublic;
457
459
  urlPathname: string;
458
460
  url: string;
459
- }, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
461
+ }, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
460
462
  previousPageContext: {
461
463
  pageId: string;
462
464
  } | null;
@@ -466,7 +468,7 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
466
468
  pageContextsAborted: PageContextAborted[];
467
469
  } & {
468
470
  _abortCall: `redirect(${string})` | `render(${string})` | "RenderErrorPage()";
469
- _abortCaller: "throw render()" | "throw redirect()" | "throw RenderErrorPage()";
471
+ _abortCaller: "throw redirect()" | "throw render()" | "throw RenderErrorPage()";
470
472
  } & {
471
473
  _abortCall: `render(${string})` | `RenderErrorPage()`;
472
474
  _abortCaller: "throw render()" | "throw RenderErrorPage()";
@@ -492,6 +494,14 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
492
494
  isClientSide: true;
493
495
  isPrerendering: false;
494
496
  urlOriginal: string;
497
+ _urlHandler: null;
498
+ } & {
499
+ _baseServer: string;
500
+ } & {
501
+ urlParsed: import("./utils.js").UrlPublic;
502
+ urlPathname: string;
503
+ url: string;
504
+ } & {
495
505
  _globalContext: {
496
506
  _globalConfigPublic: {
497
507
  pages: {
@@ -545,13 +555,9 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
545
555
  _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
546
556
  };
547
557
  _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
548
- _urlHandler: null;
549
- _baseServer: string;
550
- } & {
551
- urlParsed: import("./utils.js").UrlPublic;
552
- urlPathname: string;
553
- url: string;
554
- } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & PageContextConfig & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & PageContextInternalClient & {
558
+ } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & PageContextConfig & {
559
+ _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
560
+ } & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & PageContextInternalClient & {
555
561
  isBackwardNavigation: boolean | null;
556
562
  isHistoryNavigation: boolean;
557
563
  isClientSideNavigation: boolean;
@@ -565,6 +571,14 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
565
571
  isClientSide: true;
566
572
  isPrerendering: false;
567
573
  urlOriginal: string;
574
+ _urlHandler: null;
575
+ } & {
576
+ _baseServer: string;
577
+ } & {
578
+ urlParsed: import("./utils.js").UrlPublic;
579
+ urlPathname: string;
580
+ url: string;
581
+ } & {
568
582
  _globalContext: {
569
583
  _globalConfigPublic: {
570
584
  pages: {
@@ -618,20 +632,13 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
618
632
  _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
619
633
  };
620
634
  _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
621
- _urlHandler: null;
622
- _baseServer: string;
623
- } & {
624
- urlParsed: import("./utils.js").UrlPublic;
625
- urlPathname: string;
626
- url: string;
627
- } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & PageContextInternalClient & Omit<Partial<PageContextConfig & {
635
+ } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
636
+ _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
637
+ } & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & PageContextInternalClient & Omit<Partial<PageContextConfig & {
628
638
  isPageContext: true;
629
639
  Page: import("../../types/Config.js").Config["Page"];
630
640
  routeParams: Record<string, string>;
631
641
  data: unknown;
632
- urlOriginal: string;
633
- headers: Record<string, string> | null;
634
- headersOriginal?: unknown;
635
642
  headersResponse: Headers;
636
643
  is404: boolean | null;
637
644
  isClientSideNavigation: boolean;
@@ -642,7 +649,6 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
642
649
  from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
643
650
  source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
644
651
  sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
645
- url: string;
646
652
  pageExports: Record<string, unknown>;
647
653
  isBaseMissing?: true;
648
654
  }> & Pick<PageContextConfig & {
@@ -650,9 +656,6 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
650
656
  Page: import("../../types/Config.js").Config["Page"];
651
657
  routeParams: Record<string, string>;
652
658
  data: unknown;
653
- urlOriginal: string;
654
- headers: Record<string, string> | null;
655
- headersOriginal?: unknown;
656
659
  headersResponse: Headers;
657
660
  is404: boolean | null;
658
661
  isClientSideNavigation: boolean;
@@ -663,13 +666,13 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
663
666
  from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
664
667
  source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
665
668
  sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
666
- url: string;
667
669
  pageExports: Record<string, unknown>;
668
670
  isBaseMissing?: true;
669
- }, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
671
+ }, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
670
672
  isClientSide: true;
671
673
  isPrerendering: false;
672
674
  } & {
675
+ urlOriginal: string;
673
676
  isHydration: boolean;
674
677
  isBackwardNavigation: boolean | null;
675
678
  isHistoryNavigation: boolean;
@@ -682,7 +685,7 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
682
685
  urlParsed: import("./utils.js").UrlPublic;
683
686
  urlPathname: string;
684
687
  url: string;
685
- }, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
688
+ }, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
686
689
  previousPageContext: {
687
690
  pageId: string;
688
691
  } | null;
@@ -692,7 +695,7 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
692
695
  pageContextsAborted: PageContextAborted[];
693
696
  } & {
694
697
  _abortCall: `redirect(${string})` | `render(${string})` | "RenderErrorPage()";
695
- _abortCaller: "throw render()" | "throw redirect()" | "throw RenderErrorPage()";
698
+ _abortCaller: "throw redirect()" | "throw render()" | "throw RenderErrorPage()";
696
699
  } & {
697
700
  _abortCall: `render(${string})` | `RenderErrorPage()`;
698
701
  _abortCaller: "throw render()" | "throw RenderErrorPage()";
@@ -721,6 +724,14 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
721
724
  isClientSide: true;
722
725
  isPrerendering: false;
723
726
  urlOriginal: string;
727
+ _urlHandler: null;
728
+ } & {
729
+ _baseServer: string;
730
+ } & {
731
+ urlParsed: import("./utils.js").UrlPublic;
732
+ urlPathname: string;
733
+ url: string;
734
+ } & {
724
735
  _globalContext: {
725
736
  _globalConfigPublic: {
726
737
  pages: {
@@ -774,12 +785,6 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
774
785
  _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
775
786
  };
776
787
  _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
777
- _urlHandler: null;
778
- _baseServer: string;
779
- } & {
780
- urlParsed: import("./utils.js").UrlPublic;
781
- urlPathname: string;
782
- url: string;
783
788
  } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
784
789
  isBackwardNavigation: boolean | null;
785
790
  isHistoryNavigation: boolean;
@@ -794,6 +799,14 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
794
799
  isClientSide: true;
795
800
  isPrerendering: false;
796
801
  urlOriginal: string;
802
+ _urlHandler: null;
803
+ } & {
804
+ _baseServer: string;
805
+ } & {
806
+ urlParsed: import("./utils.js").UrlPublic;
807
+ urlPathname: string;
808
+ url: string;
809
+ } & {
797
810
  _globalContext: {
798
811
  _globalConfigPublic: {
799
812
  pages: {
@@ -847,20 +860,13 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
847
860
  _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
848
861
  };
849
862
  _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
850
- _urlHandler: null;
851
- _baseServer: string;
852
- } & {
853
- urlParsed: import("./utils.js").UrlPublic;
854
- urlPathname: string;
855
- url: string;
856
- } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & PageContextInternalClient & Omit<Partial<PageContextConfig & {
863
+ } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
864
+ _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
865
+ } & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & PageContextInternalClient & Omit<Partial<PageContextConfig & {
857
866
  isPageContext: true;
858
867
  Page: import("../../types/Config.js").Config["Page"];
859
868
  routeParams: Record<string, string>;
860
869
  data: unknown;
861
- urlOriginal: string;
862
- headers: Record<string, string> | null;
863
- headersOriginal?: unknown;
864
870
  headersResponse: Headers;
865
871
  is404: boolean | null;
866
872
  isClientSideNavigation: boolean;
@@ -871,7 +877,6 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
871
877
  from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
872
878
  source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
873
879
  sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
874
- url: string;
875
880
  pageExports: Record<string, unknown>;
876
881
  isBaseMissing?: true;
877
882
  }> & Pick<PageContextConfig & {
@@ -879,9 +884,6 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
879
884
  Page: import("../../types/Config.js").Config["Page"];
880
885
  routeParams: Record<string, string>;
881
886
  data: unknown;
882
- urlOriginal: string;
883
- headers: Record<string, string> | null;
884
- headersOriginal?: unknown;
885
887
  headersResponse: Headers;
886
888
  is404: boolean | null;
887
889
  isClientSideNavigation: boolean;
@@ -892,13 +894,13 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
892
894
  from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
893
895
  source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
894
896
  sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
895
- url: string;
896
897
  pageExports: Record<string, unknown>;
897
898
  isBaseMissing?: true;
898
- }, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
899
+ }, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
899
900
  isClientSide: true;
900
901
  isPrerendering: false;
901
902
  } & {
903
+ urlOriginal: string;
902
904
  isHydration: boolean;
903
905
  isBackwardNavigation: boolean | null;
904
906
  isHistoryNavigation: boolean;
@@ -911,7 +913,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
911
913
  urlParsed: import("./utils.js").UrlPublic;
912
914
  urlPathname: string;
913
915
  url: string;
914
- }, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
916
+ }, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
915
917
  previousPageContext: {
916
918
  pageId: string;
917
919
  } | null;
package/dist/client/runtime-server-routing/createPageContextClientSide.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  export { createPageContextClientSide };
2
2
  export type PageContextCreatedClient_ServerRouting = Awaited<ReturnType<typeof createPageContextClientSide>>;
3
+ export type PageContextCreatedClientBase_ServerRouting = Awaited<ReturnType<typeof createPageContextBase>>;
3
4
  declare function createPageContextClientSide(): Promise<{
4
5
  _isOriginalObject: true;
5
6
  isPageContext: true;
@@ -7,6 +8,10 @@ declare function createPageContextClientSide(): Promise<{
7
8
  isClientSide: true;
8
9
  isPrerendering: false;
9
10
  isHydration: true;
11
+ isBackwardNavigation: null;
12
+ isHistoryNavigation: null;
13
+ _hasPageContextFromServer: true;
14
+ } & {
10
15
  _globalContext: {
11
16
  _globalConfigPublic: {
12
17
  pages: {
@@ -57,7 +62,15 @@ declare function createPageContextClientSide(): Promise<{
57
62
  isClientSide: true;
58
63
  };
59
64
  _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
65
+ } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic>;
66
+ declare function createPageContextBase(): {
67
+ _isOriginalObject: true;
68
+ isPageContext: true;
69
+ } & {
70
+ isClientSide: true;
71
+ isPrerendering: false;
72
+ isHydration: true;
60
73
  isBackwardNavigation: null;
61
74
  isHistoryNavigation: null;
62
75
  _hasPageContextFromServer: true;
63
- } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic>;
76
+ };
package/dist/client/runtime-server-routing/createPageContextClientSide.js CHANGED
@@ -3,19 +3,25 @@ import { updateType, objectAssign } from './utils.js';
3
3
  import { createPageContextObject, createPageContextShared } from '../../shared-server-client/createPageContextShared.js';
4
4
  import { getGlobalContextClientInternal } from './getGlobalContextClientInternal.js';
5
5
  async function createPageContextClientSide() {
6
+ const pageContext = createPageContextBase();
6
7
  const globalContext = await getGlobalContextClientInternal();
8
+ objectAssign(pageContext, {
9
+ _globalContext: globalContext,
10
+ _pageFilesAll: globalContext._pageFilesAll, // TO-DO/next-major-release: remove
11
+ });
12
+ // Sets pageContext.config to global configs
13
+ updateType(pageContext, createPageContextShared(pageContext, globalContext._globalConfigPublic));
14
+ return pageContext;
15
+ }
16
+ function createPageContextBase() {
7
17
  const pageContextCreated = createPageContextObject();
8
18
  objectAssign(pageContextCreated, {
9
19
  isClientSide: true,
10
20
  isPrerendering: false,
11
21
  isHydration: true,
12
- _globalContext: globalContext,
13
- _pageFilesAll: globalContext._pageFilesAll, // TO-DO/next-major-release: remove
14
22
  isBackwardNavigation: null,
15
23
  isHistoryNavigation: null,
16
24
  _hasPageContextFromServer: true,
17
25
  });
18
- // Sets pageContext.config to global configs
19
- updateType(pageContextCreated, createPageContextShared(pageContextCreated, globalContext._globalConfigPublic));
20
26
  return pageContextCreated;
21
27
  }
package/dist/node/prerender/runPrerender.d.ts CHANGED
@@ -72,10 +72,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
72
72
  isClientSide: false;
73
73
  isPrerendering: boolean;
74
74
  _requestId: number;
75
- } & Pick<import("../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
76
- url?: string;
77
- headers?: Record<string, string>;
78
- } & {
75
+ } & import("../../types/PageContext.js").PageContextInit & {
79
76
  _globalContext: ({
80
77
  _globalConfigPublic: {
81
78
  pages: {
@@ -170,7 +167,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
170
167
  _pageFilesAll: PageFile[];
171
168
  _baseServer: string;
172
169
  _baseAssets: string;
173
- _pageContextInit: import("../../server/runtime/renderPageServer.js").PageContextInit;
170
+ _pageContextInit: import("../../types/PageContext.js").PageContextInit;
174
171
  _urlHandler: ((url: string) => string) | null;
175
172
  isClientSideNavigation: boolean;
176
173
  } & {
package/dist/node/prerender/runPrerender.js CHANGED
@@ -218,7 +218,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, globalContext,
218
218
  if (doNotPrerenderList.find((p) => p.pageId === pageId))
219
219
  return;
220
220
  const { hookName, hookFilePath } = hook;
221
- const prerenderResult = await execHookDirectWithoutPageContext(() => hook.hookFn(), hook);
221
+ const prerenderResult = await execHookDirectWithoutPageContext(() => hook.hookFn(), hook, globalContext);
222
222
  const result = normalizeOnPrerenderHookResult(prerenderResult, hookFilePath, hookName);
223
223
  // Handle result
224
224
  await Promise.all(result.map(async ({ url, pageContext }) => {
@@ -446,7 +446,7 @@ async function callOnPrerenderStartHook(prerenderContext, globalContext, concurr
446
446
  preservePropertyGetters(pageContext);
447
447
  });
448
448
  const prerenderContextPublic = preparePrerenderContextForPublicUsage(prerenderContext);
449
- let result = await execHookDirectWithoutPageContext(() => hookFn(prerenderContextPublic), onPrerenderStartHook);
449
+ let result = await execHookDirectWithoutPageContext(() => hookFn(prerenderContextPublic), onPrerenderStartHook, globalContext);
450
450
  // Before applying result
451
451
  prerenderContext.pageContexts.forEach((pageContext) => {
452
452
  ;
package/dist/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js CHANGED
@@ -33,6 +33,11 @@ const configDefinitionsBuiltIn = {
33
33
  global: true,
34
34
  cumulative: true,
35
35
  },
36
+ onHookCall: {
37
+ env: { server: true, client: true },
38
+ global: true,
39
+ cumulative: true,
40
+ },
36
41
  onBeforeRender: {
37
42
  env: { server: true },
38
43
  },
package/dist/server/runtime/logErrorServer.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  export { logErrorServer };
2
2
  export { hasAlreadyLogged };
3
- import type { PageContextCreatedServerMinimum } from './renderPageServer/createPageContextServerSide.js';
4
- declare function logErrorServer(err: unknown, pageContext: PageContextCreatedServerMinimum | null): void;
3
+ import type { PageContextCreatedServerBase } from './renderPageServer/createPageContextServerSide.js';
4
+ declare function logErrorServer(err: unknown, pageContext: PageContextCreatedServerBase | null): void;
5
5
  declare function hasAlreadyLogged(err: unknown): boolean;
package/dist/server/runtime/loggerRuntime.d.ts CHANGED
@@ -4,10 +4,10 @@ export { setLogRuntimeDev };
4
4
  export { assertPageContext_logRuntime };
5
5
  export type { PageContext_logRuntime };
6
6
  import type { LogType } from '../../node/vite/shared/loggerDev.js';
7
- import type { PageContextCreatedServerMinimum } from './renderPageServer/createPageContextServerSide.js';
7
+ import type { PageContextCreatedServerBase } from './renderPageServer/createPageContextServerSide.js';
8
8
  type LogRuntimeInfo = (msg: string, pageContext: PageContext_logRuntime, logType: LogType) => void;
9
9
  type LogRuntimeError = (err: unknown, pageContext: PageContext_logRuntime) => void;
10
- type PageContext_logRuntime = null | (PageContextCreatedServerMinimum & {
10
+ type PageContext_logRuntime = null | (PageContextCreatedServerBase & {
11
11
  _requestId: number;
12
12
  });
13
13
  declare function setLogRuntimeDev(logRuntimeErrorDev: LogRuntimeError, logRuntimeInfoDev: LogRuntimeInfo): void;