vike 0.4.237-commit-92dc549 → 0.4.237-commit-fd8294f

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 (77) hide show
  1. package/dist/cjs/client/runtime-server-routing/utils.js +1 -1
  2. package/dist/cjs/node/api/build.js +4 -30
  3. package/dist/cjs/node/prerender/runPrerender.js +5 -6
  4. package/dist/cjs/node/runtime/renderPage/analyzePage.js +3 -1
  5. package/dist/cjs/node/runtime/renderPage/createPageContextServerSide.js +1 -1
  6. package/dist/cjs/node/runtime/renderPage/execHookOnRenderHtml.js +1 -11
  7. package/dist/cjs/node/runtime/renderPage/loadPageConfigsLazyServerSide.js +42 -46
  8. package/dist/cjs/node/runtime/renderPage/{renderPageAlreadyRouted.js → renderPageAfterRoute.js} +3 -4
  9. package/dist/cjs/node/runtime/renderPage.js +6 -9
  10. package/dist/cjs/node/runtime/utils.js +1 -1
  11. package/dist/cjs/node/vite/plugins/pluginBuild/handleAssetsManifest.js +3 -5
  12. package/dist/cjs/node/vite/plugins/pluginBuild/pluginAutoFullBuild.js +8 -26
  13. package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildApp.js +2 -9
  14. package/dist/cjs/node/vite/plugins/pluginDev/determineOptimizeDeps.js +3 -2
  15. package/dist/cjs/node/vite/plugins/pluginFileEnv.js +4 -3
  16. package/dist/cjs/node/vite/shared/getOutDirs.js +5 -4
  17. package/dist/cjs/node/vite/shared/isViteServerSide.js +46 -19
  18. package/dist/cjs/shared/page-configs/{loadPageEntry.js → loadAndParseVirtualFilePageEntry.js} +2 -2
  19. package/dist/cjs/shared/page-configs/resolveVikeConfigPublic.js +5 -0
  20. package/dist/cjs/shared/route/execHookOnBeforeRoute.js +0 -1
  21. package/dist/cjs/shared/route/index.js +0 -1
  22. package/dist/cjs/utils/PROJECT_VERSION.js +1 -1
  23. package/dist/cjs/utils/{augmentType.js → updateType.js} +3 -3
  24. package/dist/esm/__internal/index.d.ts +1 -1
  25. package/dist/esm/client/runtime-client-routing/createPageContextClientSide.js +2 -2
  26. package/dist/esm/client/runtime-client-routing/renderPageClientSide.js +6 -6
  27. package/dist/esm/client/runtime-client-routing/utils.d.ts +1 -1
  28. package/dist/esm/client/runtime-client-routing/utils.js +1 -1
  29. package/dist/esm/client/runtime-server-routing/createPageContextClientSide.js +3 -3
  30. package/dist/esm/client/runtime-server-routing/utils.d.ts +1 -1
  31. package/dist/esm/client/runtime-server-routing/utils.js +1 -1
  32. package/dist/esm/client/shared/loadPageConfigsLazyClientSide.js +2 -2
  33. package/dist/esm/node/api/build.js +5 -31
  34. package/dist/esm/node/prerender/runPrerender.d.ts +9 -300
  35. package/dist/esm/node/prerender/runPrerender.js +6 -7
  36. package/dist/esm/node/runtime/renderPage/analyzePage.d.ts +4 -3
  37. package/dist/esm/node/runtime/renderPage/analyzePage.js +3 -1
  38. package/dist/esm/node/runtime/renderPage/createPageContextServerSide.js +2 -2
  39. package/dist/esm/node/runtime/renderPage/execHookOnRenderHtml.d.ts +0 -1
  40. package/dist/esm/node/runtime/renderPage/execHookOnRenderHtml.js +1 -11
  41. package/dist/esm/node/runtime/renderPage/getPageAssets.d.ts +2 -4
  42. package/dist/esm/node/runtime/renderPage/handleErrorWithoutErrorPage.d.ts +1 -1
  43. package/dist/esm/node/runtime/renderPage/loadPageConfigsLazyServerSide.d.ts +105 -19
  44. package/dist/esm/node/runtime/renderPage/loadPageConfigsLazyServerSide.js +44 -48
  45. package/dist/esm/node/runtime/renderPage/{renderPageAlreadyRouted.d.ts → renderPageAfterRoute.d.ts} +20 -4
  46. package/dist/esm/node/runtime/renderPage/{renderPageAlreadyRouted.js → renderPageAfterRoute.js} +5 -6
  47. package/dist/esm/node/runtime/renderPage.js +8 -11
  48. package/dist/esm/node/runtime/utils.d.ts +1 -1
  49. package/dist/esm/node/runtime/utils.js +1 -1
  50. package/dist/esm/node/vite/plugins/pluginBuild/handleAssetsManifest.d.ts +0 -1
  51. package/dist/esm/node/vite/plugins/pluginBuild/handleAssetsManifest.js +5 -7
  52. package/dist/esm/node/vite/plugins/pluginBuild/pluginAutoFullBuild.js +10 -28
  53. package/dist/esm/node/vite/plugins/pluginBuild/pluginBuildApp.js +2 -9
  54. package/dist/esm/node/vite/plugins/pluginDev/determineOptimizeDeps.js +3 -2
  55. package/dist/esm/node/vite/plugins/pluginFileEnv.js +4 -3
  56. package/dist/esm/node/vite/shared/getOutDirs.js +5 -4
  57. package/dist/esm/node/vite/shared/isViteServerSide.d.ts +1 -1
  58. package/dist/esm/node/vite/shared/isViteServerSide.js +46 -19
  59. package/dist/esm/shared/page-configs/loadAndParseVirtualFilePageEntry.d.ts +3 -0
  60. package/dist/esm/shared/page-configs/{loadPageEntry.js → loadAndParseVirtualFilePageEntry.js} +2 -2
  61. package/dist/esm/shared/page-configs/resolveVikeConfigPublic.js +5 -0
  62. package/dist/esm/shared/route/execHookOnBeforeRoute.d.ts +3 -3
  63. package/dist/esm/shared/route/execHookOnBeforeRoute.js +0 -1
  64. package/dist/esm/shared/route/index.d.ts +5 -6
  65. package/dist/esm/shared/route/index.js +0 -1
  66. package/dist/esm/types/Config.d.ts +2 -4
  67. package/dist/esm/utils/PROJECT_VERSION.d.ts +1 -1
  68. package/dist/esm/utils/PROJECT_VERSION.js +1 -1
  69. package/dist/esm/utils/updateType.d.ts +3 -0
  70. package/dist/esm/utils/updateType.js +7 -0
  71. package/package.json +3 -3
  72. package/dist/cjs/node/runtime/renderPage/debugPageFiles.js +0 -52
  73. package/dist/esm/node/runtime/renderPage/debugPageFiles.d.ts +0 -23
  74. package/dist/esm/node/runtime/renderPage/debugPageFiles.js +0 -47
  75. package/dist/esm/shared/page-configs/loadPageEntry.d.ts +0 -3
  76. package/dist/esm/utils/augmentType.d.ts +0 -3
  77. package/dist/esm/utils/augmentType.js +0 -7
@@ -64,105 +64,7 @@ type PrerenderTrigger = '$ vike prerender' | 'prerender()' | 'auto-run';
64
64
  declare function runPrerender(options: PrerenderOptions | undefined, trigger: PrerenderTrigger): Promise<{
65
65
  viteConfig: ResolvedConfig;
66
66
  }>;
67
- declare function createPageContextPrerendering(urlOriginal: string, prerenderContext: PrerenderContext, globalContext: GlobalContextServerInternal, is404: boolean, pageId: string | undefined, providedByHook: ProvidedByHook): Promise<((({
68
- _isOriginalObject: true;
69
- isPageContext: true;
70
- } & {
71
- isClientSide: false;
72
- isPrerendering: boolean;
73
- } & Pick<import("../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
74
- url?: string;
75
- headers?: Record<string, string>;
76
- } & {
77
- _globalContext: {
78
- isGlobalContext: true;
79
- _isOriginalObject: true;
80
- _virtualFileExportsGlobalEntry: unknown;
81
- _pageFilesAll: PageFile[];
82
- _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
83
- _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
84
- _allPageIds: string[];
85
- _vikeConfigPublicGlobal: {
86
- config: import("../../types/index.js").ConfigResolved;
87
- _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
88
- _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
89
- _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
90
- };
91
- config: import("../../types/index.js").ConfigResolved;
92
- pages: {
93
- [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
94
- };
95
- } & (({
96
- _isProduction: false;
97
- _isPrerendering: false;
98
- assetsManifest: null;
99
- _viteDevServer: import("vite").ViteDevServer | undefined;
100
- viteConfig: ResolvedConfig | undefined;
101
- isClientSide: false;
102
- _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
103
- _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
104
- } | {
105
- _isPrerendering: true;
106
- viteConfig: ResolvedConfig;
107
- _isProduction: true;
108
- assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
109
- _viteDevServer: null;
110
- _usesClientRouter: boolean;
111
- isClientSide: false;
112
- _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
113
- _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
114
- } | {
115
- _isPrerendering: false;
116
- viteConfig: null;
117
- _isProduction: true;
118
- assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
119
- _viteDevServer: null;
120
- _usesClientRouter: boolean;
121
- isClientSide: false;
122
- _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
123
- _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
124
- }) & {
125
- baseServer: string;
126
- baseAssets: string;
127
- viteConfigRuntime: {
128
- root: string;
129
- build: {
130
- outDir: string;
131
- };
132
- _baseViteOriginal: string;
133
- vitePluginServerEntry: {
134
- inject: boolean | undefined;
135
- };
136
- };
137
- });
138
- _pageFilesAll: PageFile[];
139
- _baseServer: string;
140
- _baseAssets: string;
141
- _pageContextInit: import("../runtime/renderPage.js").PageContextInit;
142
- _urlRewrite: null;
143
- _urlHandler: ((url: string) => string) | null;
144
- isClientSideNavigation: boolean;
145
- } & {
146
- config: import("../../types/index.js").ConfigResolved;
147
- _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
148
- _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
149
- _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
150
- } & {
151
- urlParsed: import("../runtime/utils.js").UrlPublic;
152
- urlPathname: string;
153
- url: string;
154
- } & {
155
- headers: Record<string, string> | null;
156
- } & {
157
- _urlHandler: null;
158
- _httpRequestId: null;
159
- _urlRewrite: null;
160
- _noExtraDir: boolean | null;
161
- _prerenderContext: PrerenderContext;
162
- _providedByHook: ProvidedByHook;
163
- _urlOriginalModifiedByHook: ProvidedByHookTransformer;
164
- is404: boolean;
165
- } & import("../../shared/route/index.js").PageContextFromRoute & Record<"pageId", string>) | ({
67
+ declare function createPageContextPrerendering(urlOriginal: string, prerenderContext: PrerenderContext, globalContext: GlobalContextServerInternal, is404: boolean, pageId: string | undefined, providedByHook: ProvidedByHook): Promise<{
166
68
  _isOriginalObject: true;
167
69
  isPageContext: true;
168
70
  } & {
@@ -262,216 +164,23 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
262
164
  is404: boolean;
263
165
  } & {
264
166
  pageId: string;
265
- _debugRouteMatches: never[];
266
167
  routeParams: {};
267
- })) & (((({
268
- _isOriginalObject: true;
269
- isPageContext: true;
270
- } & {
271
- isClientSide: false;
272
- isPrerendering: boolean;
273
- } & Pick<import("../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
274
- url?: string;
275
- headers?: Record<string, string>;
276
- } & {
277
- _globalContext: {
278
- isGlobalContext: true;
279
- _isOriginalObject: true;
280
- _virtualFileExportsGlobalEntry: unknown;
281
- _pageFilesAll: PageFile[];
282
- _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
283
- _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
284
- _allPageIds: string[];
285
- _vikeConfigPublicGlobal: {
286
- config: import("../../types/index.js").ConfigResolved;
287
- _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
288
- _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
289
- _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
290
- };
291
- config: import("../../types/index.js").ConfigResolved;
292
- pages: {
293
- [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
294
- };
295
- } & (({
296
- _isProduction: false;
297
- _isPrerendering: false;
298
- assetsManifest: null;
299
- _viteDevServer: import("vite").ViteDevServer | undefined;
300
- viteConfig: ResolvedConfig | undefined;
301
- isClientSide: false;
302
- _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
303
- _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
304
- } | {
305
- _isPrerendering: true;
306
- viteConfig: ResolvedConfig;
307
- _isProduction: true;
308
- assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
309
- _viteDevServer: null;
310
- _usesClientRouter: boolean;
311
- isClientSide: false;
312
- _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
313
- _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
314
- } | {
315
- _isPrerendering: false;
316
- viteConfig: null;
317
- _isProduction: true;
318
- assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
319
- _viteDevServer: null;
320
- _usesClientRouter: boolean;
321
- isClientSide: false;
322
- _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
323
- _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
324
- }) & {
325
- baseServer: string;
326
- baseAssets: string;
327
- viteConfigRuntime: {
328
- root: string;
329
- build: {
330
- outDir: string;
331
- };
332
- _baseViteOriginal: string;
333
- vitePluginServerEntry: {
334
- inject: boolean | undefined;
335
- };
336
- };
337
- });
338
- _pageFilesAll: PageFile[];
339
- _baseServer: string;
340
- _baseAssets: string;
341
- _pageContextInit: import("../runtime/renderPage.js").PageContextInit;
342
- _urlRewrite: null;
343
- _urlHandler: ((url: string) => string) | null;
344
- isClientSideNavigation: boolean;
345
- } & {
346
- config: import("../../types/index.js").ConfigResolved;
347
- _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
348
- _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
349
- _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
350
- } & {
351
- urlParsed: import("../runtime/utils.js").UrlPublic;
352
- urlPathname: string;
353
- url: string;
354
- } & {
355
- headers: Record<string, string> | null;
356
- } & {
357
- _urlHandler: null;
358
- _httpRequestId: null;
359
- _urlRewrite: null;
360
- _noExtraDir: boolean | null;
361
- _prerenderContext: PrerenderContext;
362
- _providedByHook: ProvidedByHook;
363
- _urlOriginalModifiedByHook: ProvidedByHookTransformer;
364
- is404: boolean;
365
- } & import("../../shared/route/index.js").PageContextFromRoute & Record<"pageId", string>) | ({
366
- _isOriginalObject: true;
367
- isPageContext: true;
368
- } & {
369
- isClientSide: false;
370
- isPrerendering: boolean;
371
- } & Pick<import("../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
372
- url?: string;
373
- headers?: Record<string, string>;
374
- } & {
375
- _globalContext: {
376
- isGlobalContext: true;
377
- _isOriginalObject: true;
378
- _virtualFileExportsGlobalEntry: unknown;
379
- _pageFilesAll: PageFile[];
380
- _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
381
- _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
382
- _allPageIds: string[];
383
- _vikeConfigPublicGlobal: {
384
- config: import("../../types/index.js").ConfigResolved;
385
- _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
386
- _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
387
- _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
388
- };
389
- config: import("../../types/index.js").ConfigResolved;
390
- pages: {
391
- [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
392
- };
393
- } & (({
394
- _isProduction: false;
395
- _isPrerendering: false;
396
- assetsManifest: null;
397
- _viteDevServer: import("vite").ViteDevServer | undefined;
398
- viteConfig: ResolvedConfig | undefined;
399
- isClientSide: false;
400
- _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
401
- _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
402
- } | {
403
- _isPrerendering: true;
404
- viteConfig: ResolvedConfig;
405
- _isProduction: true;
406
- assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
407
- _viteDevServer: null;
408
- _usesClientRouter: boolean;
409
- isClientSide: false;
410
- _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
411
- _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
412
- } | {
413
- _isPrerendering: false;
414
- viteConfig: null;
415
- _isProduction: true;
416
- assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
417
- _viteDevServer: null;
418
- _usesClientRouter: boolean;
419
- isClientSide: false;
420
- _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
421
- _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
422
- }) & {
423
- baseServer: string;
424
- baseAssets: string;
425
- viteConfigRuntime: {
426
- root: string;
427
- build: {
428
- outDir: string;
429
- };
430
- _baseViteOriginal: string;
431
- vitePluginServerEntry: {
432
- inject: boolean | undefined;
433
- };
434
- };
435
- });
436
- _pageFilesAll: PageFile[];
437
- _baseServer: string;
438
- _baseAssets: string;
439
- _pageContextInit: import("../runtime/renderPage.js").PageContextInit;
440
- _urlRewrite: null;
441
- _urlHandler: ((url: string) => string) | null;
442
- isClientSideNavigation: boolean;
443
- } & {
444
- config: import("../../types/index.js").ConfigResolved;
445
- _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
446
- _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
447
- _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
448
- } & {
449
- urlParsed: import("../runtime/utils.js").UrlPublic;
450
- urlPathname: string;
451
- url: string;
168
+ } & import("../../shared/route/index.js").PageContextAfterRoute & {
169
+ is404: boolean | null;
170
+ pageId: string;
452
171
  } & {
453
- headers: Record<string, string> | null;
172
+ _pageConfig: import("../../types/PageConfig.js").PageConfigRuntime | null;
454
173
  } & {
455
- _urlHandler: null;
456
- _httpRequestId: null;
457
- _urlRewrite: null;
458
- _noExtraDir: boolean | null;
459
- _prerenderContext: PrerenderContext;
460
- _providedByHook: ProvidedByHook;
461
- _urlOriginalModifiedByHook: ProvidedByHookTransformer;
462
- is404: boolean;
174
+ _pageConfig: null | import("../../types/PageConfig.js").PageConfigRuntime;
175
+ } & import("../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded & {
176
+ _pageConfig: null | import("../../types/PageConfig.js").PageConfigRuntime;
463
177
  } & {
464
- pageId: string;
465
- _debugRouteMatches: never[];
466
- routeParams: {};
467
- })) & import("../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded) & {
468
178
  Page: unknown;
469
179
  _isHtmlOnly: boolean;
470
180
  _passToClient: import("../runtime/html/serializeContext.js").PassToClient;
471
- _pageFilePathsLoaded: string[];
472
181
  headersResponse: Headers;
473
182
  } & {
474
183
  __getPageAssets: () => Promise<import("../runtime/renderPage/getPageAssets.js").PageAsset[]>;
475
- })) & {
184
+ } & {
476
185
  _usesClientRouter: boolean;
477
186
  }>;
@@ -5,7 +5,7 @@ export { runPrerender };
5
5
  import path from 'node:path';
6
6
  import { route } from '../../shared/route/index.js';
7
7
  import { assert, assertUsage, assertWarning, hasProp, objectAssign, isObjectWithKeys, isCallable, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, pLimit, isArray, onSetupPrerender, PROJECT_VERSION, preservePropertyGetters, changeEnumerable, escapeHtml, } from './utils.js';
8
- import { prerenderPage } from '../runtime/renderPage/renderPageAlreadyRouted.js';
8
+ import { prerenderPage } from '../runtime/renderPage/renderPageAfterRoute.js';
9
9
  import { createPageContextServerSide } from '../runtime/renderPage/createPageContextServerSide.js';
10
10
  import pc from '@brillout/picocolors';
11
11
  import { cpus } from 'node:os';
@@ -15,10 +15,10 @@ import { getPageFilesServerSide } from '../../shared/getPageFiles.js';
15
15
  import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
16
16
  import { getUrlFromRouteString } from '../../shared/route/resolveRouteString.js';
17
17
  import { getConfigValueRuntime } from '../../shared/page-configs/getConfigValueRuntime.js';
18
- import { loadPageEntry } from '../../shared/page-configs/loadPageEntry.js';
18
+ import { loadAndParseVirtualFilePageEntry } from '../../shared/page-configs/loadAndParseVirtualFilePageEntry.js';
19
19
  import { getErrorPageId, isErrorPage } from '../../shared/error-page.js';
20
20
  import { isAbortError } from '../../shared/route/abort.js';
21
- import { loadPageConfigsLazyServerSideAndExecHook } from '../runtime/renderPage/loadPageConfigsLazyServerSide.js';
21
+ import { loadPageConfigsLazyServerSide } from '../runtime/renderPage/loadPageConfigsLazyServerSide.js';
22
22
  import { getHookFromPageConfig, getHookFromPageConfigGlobal, getHookTimeoutDefault, getHook_setIsPrerenderering, } from '../../shared/hooks/getHook.js';
23
23
  import { noRouteMatch } from '../../shared/route/noRouteMatch.js';
24
24
  import { getVikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js';
@@ -29,7 +29,7 @@ import { getOutDirs } from '../vite/shared/getOutDirs.js';
29
29
  import fs from 'node:fs';
30
30
  import { getProxyForPublicUsage } from '../../shared/getProxyForPublicUsage.js';
31
31
  import { getStaticRedirectsForPrerender } from '../runtime/renderPage/resolveRedirects.js';
32
- import { augmentType } from '../runtime/utils.js';
32
+ import { updateType } from '../runtime/utils.js';
33
33
  const docLink = 'https://vike.dev/i18n#pre-rendering';
34
34
  async function runPrerender(options = {}, trigger) {
35
35
  setWasPrerenderRun(trigger);
@@ -174,7 +174,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, globalContext,
174
174
  // V1 design
175
175
  await Promise.all(globalContext._pageConfigs.map((pageConfig) => concurrencyLimit(async () => {
176
176
  const hookName = 'onBeforePrerenderStart';
177
- const pageConfigLoaded = await loadPageEntry(pageConfig, false);
177
+ const pageConfigLoaded = await loadAndParseVirtualFilePageEntry(pageConfig, false);
178
178
  const hook = getHookFromPageConfig(pageConfigLoaded, hookName);
179
179
  if (!hook)
180
180
  return;
@@ -319,11 +319,10 @@ async function createPageContextPrerendering(urlOriginal, prerenderContext, glob
319
319
  assert(pageId);
320
320
  objectAssign(pageContext, {
321
321
  pageId,
322
- _debugRouteMatches: [],
323
322
  routeParams: {},
324
323
  });
325
324
  }
326
- augmentType(pageContext, await loadPageConfigsLazyServerSideAndExecHook(pageContext));
325
+ updateType(pageContext, await loadPageConfigsLazyServerSide(pageContext));
327
326
  let usesClientRouter;
328
327
  {
329
328
  const { pageId } = pageContext;
@@ -1,6 +1,7 @@
1
1
  export { analyzePage };
2
- import type { PageFile } from '../../../shared/getPageFiles/getPageFileObject.js';
3
2
  import type { PageConfigRuntime } from '../../../types/PageConfig.js';
4
3
  import { type AnalysisResult } from '../../../shared/getPageFiles/analyzePageClientSide.js';
5
- import type { GlobalContextServerInternal } from '../globalContext.js';
6
- declare function analyzePage(pageFilesAll: PageFile[], pageConfig: null | PageConfigRuntime, pageId: string, globalContext: GlobalContextServerInternal): Promise<AnalysisResult>;
4
+ import type { PageContext_loadPageConfigsLazyServerSide } from './loadPageConfigsLazyServerSide.js';
5
+ declare function analyzePage(pageContext: PageContext_loadPageConfigsLazyServerSide & {
6
+ _pageConfig: null | PageConfigRuntime;
7
+ }): AnalysisResult;
@@ -4,7 +4,9 @@ import { analyzePageClientSide } from '../../../shared/getPageFiles/analyzePageC
4
4
  import { generateVirtualFileId } from '../../shared/virtualFileId.js';
5
5
  import { analyzeClientSide } from '../../../shared/getPageFiles/analyzeClientSide.js';
6
6
  import { getConfigValueRuntime } from '../../../shared/page-configs/getConfigValueRuntime.js';
7
- async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
7
+ function analyzePage(pageContext) {
8
+ const { pageId, _pageConfig: pageConfig, _globalContext: globalContext } = pageContext;
9
+ const { _pageFilesAll: pageFilesAll } = globalContext;
8
10
  if (pageConfig) {
9
11
  const { isClientRuntimeLoaded, isClientRouting } = analyzeClientSide(pageConfig, pageFilesAll, pageId);
10
12
  const clientEntries = [];
@@ -1,6 +1,6 @@
1
1
  export { createPageContextServerSide };
2
2
  export { createPageContextServerSideWithoutGlobalContext };
3
- import { assert, assertUsage, assertWarning, augmentType, normalizeHeaders, objectAssign } from '../utils.js';
3
+ import { assert, assertUsage, assertWarning, updateType, normalizeHeaders, objectAssign } from '../utils.js';
4
4
  import { getPageContextUrlComputed } from '../../../shared/getPageContextUrlComputed.js';
5
5
  import { createPageContextObject, createPageContextShared } from '../../../shared/createPageContextShared.js';
6
6
  function createPageContextServerSide(pageContextInit, globalContext, args) {
@@ -39,7 +39,7 @@ function createPageContextServerSide(pageContextInit, globalContext, args) {
39
39
  objectAssign(pageContextCreated, { headers });
40
40
  }
41
41
  const pageContextAugmented = createPageContextShared(pageContextCreated, globalContext._vikeConfigPublicGlobal);
42
- augmentType(pageContextCreated, pageContextAugmented);
42
+ updateType(pageContextCreated, pageContextAugmented);
43
43
  return pageContextCreated;
44
44
  }
45
45
  function createPageContextServerSideWithoutGlobalContext(pageContextInit) {
@@ -17,7 +17,6 @@ declare function execHookOnRenderHtml(pageContext: PageContextForPublicUsageServ
17
17
  __getPageAssets: GetPageAssets;
18
18
  _isHtmlOnly: boolean;
19
19
  _baseServer: string;
20
- _pageFilePathsLoaded: string[];
21
20
  _httpRequestId: number | null;
22
21
  }): Promise<{
23
22
  renderHook: RenderHook;
@@ -53,17 +53,7 @@ function getRenderHook(pageContext) {
53
53
  }
54
54
  if (!hookFound) {
55
55
  const hookName = pageContext._globalContext._pageConfigs.length > 0 ? 'onRenderHtml' : 'render';
56
- assertUsage(false, [
57
- `No ${hookName}() hook found, see https://vike.dev/${hookName}`,
58
- /*
59
- 'See https://vike.dev/render-modes for more information.',
60
- [
61
- // 'Loaded config files (none of them define the onRenderHtml() hook):',
62
- 'Loaded server-side page files (none of them `export { render }`):',
63
- ...pageContext._pageFilePathsLoaded.map((f, i) => ` (${i + 1}): ${f}`)
64
- ].join('\n')
65
- */
66
- ].join(' '));
56
+ assertUsage(false, `No ${hookName}() hook found, see https://vike.dev/${hookName}`);
67
57
  }
68
58
  return hookFound;
69
59
  }
@@ -1,7 +1,6 @@
1
1
  export { getPageAssets };
2
2
  export type { PageAsset };
3
3
  export type { GetPageAssets };
4
- export type { PageContextGetPageAssets };
5
4
  import { type MediaType } from './inferMediaType.js';
6
5
  import type { ClientDependency } from '../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
7
6
  import type { GlobalContextServerInternal } from '../globalContext.js';
@@ -12,9 +11,8 @@ type PageAsset = {
12
11
  isEntry: boolean;
13
12
  };
14
13
  type GetPageAssets = () => Promise<PageAsset[]>;
15
- type PageContextGetPageAssets = {
14
+ declare function getPageAssets(pageContext: {
16
15
  _baseServer: string;
17
16
  _baseAssets: string | null;
18
17
  _globalContext: GlobalContextServerInternal;
19
- };
20
- declare function getPageAssets(pageContext: PageContextGetPageAssets, clientDependencies: ClientDependency[], clientEntries: string[]): Promise<PageAsset[]>;
18
+ }, clientDependencies: ClientDependency[], clientEntries: string[]): Promise<PageAsset[]>;
@@ -1,6 +1,6 @@
1
1
  export { handleErrorWithoutErrorPage };
2
2
  import type { GlobalContextServerInternal } from '../globalContext.js';
3
- import type { PageContextAfterRender } from './renderPageAlreadyRouted.js';
3
+ import type { PageContextAfterRender } from './renderPageAfterRoute.js';
4
4
  import type { PageContextCreated } from './createPageContextServerSide.js';
5
5
  declare function handleErrorWithoutErrorPage<PageContext extends PageContextCreated & {
6
6
  errorWhileRendering: null | Error;
@@ -1,34 +1,120 @@
1
- export { loadPageConfigsLazyServerSideAndExecHook };
1
+ export { loadPageConfigsLazyServerSide };
2
2
  export type { PageContext_loadPageConfigsLazyServerSide };
3
3
  export type { PageConfigsLazy };
4
4
  import { type VikeConfigPublicPageLazyLoaded } from '../../../shared/getPageFiles.js';
5
5
  import { PromiseType } from '../utils.js';
6
- import { PageContextGetPageAssets, type PageAsset } from './getPageAssets.js';
7
- import { type PageContextDebugRouteMatches } from './debugPageFiles.js';
8
- import type { GlobalContextServerInternal } from '../globalContext.js';
9
- import { type PageContextExecHookServer } from './execHookServer.js';
6
+ import { type PageAsset } from './getPageAssets.js';
7
+ import type { PageConfigRuntime } from '../../../types/PageConfig.js';
10
8
  import type { PassToClient } from '../html/serializeContext.js';
11
- type PageContextExecuteHook = Omit<PageContextExecHookServer, keyof Awaited<ReturnType<typeof loadPageConfigsLazyServerSide>>>;
12
- type PageContext_loadPageConfigsLazyServerSide = PageContextGetPageAssets & PageContextDebugRouteMatches & {
9
+ import type { PageContextAfterRoute } from '../../../shared/route/index.js';
10
+ import type { PageContextCreated } from './createPageContextServerSide.js';
11
+ type PageContext_loadPageConfigsLazyServerSide = PageContextCreated & PageContextAfterRoute & {
12
+ is404: boolean | null;
13
13
  pageId: string;
14
- urlOriginal: string;
15
- _globalContext: GlobalContextServerInternal;
16
14
  };
17
15
  type PageConfigsLazy = PromiseType<ReturnType<typeof loadPageConfigsLazyServerSide>>;
18
- declare function loadPageConfigsLazyServerSideAndExecHook<PageContext extends PageContext_loadPageConfigsLazyServerSide & PageContextExecuteHook>(pageContext: PageContext): Promise<PageContext & VikeConfigPublicPageLazyLoaded & {
19
- Page: unknown;
20
- _isHtmlOnly: boolean;
21
- _passToClient: PassToClient;
22
- _pageFilePathsLoaded: string[];
23
- headersResponse: Headers;
16
+ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPageConfigsLazyServerSide): Promise<{
17
+ _isOriginalObject: true;
18
+ isPageContext: true;
19
+ } & {
20
+ isClientSide: false;
21
+ isPrerendering: boolean;
22
+ } & Pick<import("../../../types/PageContext.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
23
+ url?: string;
24
+ headers?: Record<string, string>;
25
+ } & {
26
+ _globalContext: {
27
+ isGlobalContext: true;
28
+ _isOriginalObject: true;
29
+ _virtualFileExportsGlobalEntry: unknown;
30
+ _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
31
+ _pageConfigs: PageConfigRuntime[];
32
+ _pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
33
+ _allPageIds: string[];
34
+ _vikeConfigPublicGlobal: {
35
+ config: import("../../../types/index.js").ConfigResolved;
36
+ _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
37
+ _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
38
+ _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
39
+ };
40
+ config: import("../../../types/index.js").ConfigResolved;
41
+ pages: {
42
+ [k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
43
+ };
44
+ } & (({
45
+ _isProduction: false;
46
+ _isPrerendering: false;
47
+ assetsManifest: null;
48
+ _viteDevServer: import("vite").ViteDevServer | undefined;
49
+ viteConfig: import("vite").ResolvedConfig | undefined;
50
+ isClientSide: false;
51
+ _pageRoutes: import("../../../shared/route/loadPageRoutes.js").PageRoutes;
52
+ _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
53
+ } | {
54
+ _isPrerendering: true;
55
+ viteConfig: import("vite").ResolvedConfig;
56
+ _isProduction: true;
57
+ assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
58
+ _viteDevServer: null;
59
+ _usesClientRouter: boolean;
60
+ isClientSide: false;
61
+ _pageRoutes: import("../../../shared/route/loadPageRoutes.js").PageRoutes;
62
+ _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
63
+ } | {
64
+ _isPrerendering: false;
65
+ viteConfig: null;
66
+ _isProduction: true;
67
+ assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
68
+ _viteDevServer: null;
69
+ _usesClientRouter: boolean;
70
+ isClientSide: false;
71
+ _pageRoutes: import("../../../shared/route/loadPageRoutes.js").PageRoutes;
72
+ _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
73
+ }) & {
74
+ baseServer: string;
75
+ baseAssets: string;
76
+ viteConfigRuntime: {
77
+ root: string;
78
+ build: {
79
+ outDir: string;
80
+ };
81
+ _baseViteOriginal: string;
82
+ vitePluginServerEntry: {
83
+ inject: boolean | undefined;
84
+ };
85
+ };
86
+ });
87
+ _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
88
+ _baseServer: string;
89
+ _baseAssets: string;
90
+ _pageContextInit: import("../renderPage.js").PageContextInit;
91
+ _urlRewrite: null;
92
+ _urlHandler: ((url: string) => string) | null;
93
+ isClientSideNavigation: boolean;
94
+ } & {
95
+ config: import("../../../types/index.js").ConfigResolved;
96
+ _source: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Source;
97
+ _sources: import("../../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
98
+ _from: import("../../../shared/page-configs/resolveVikeConfigPublic.js").From;
99
+ } & {
100
+ urlParsed: import("../utils.js").UrlPublic;
101
+ urlPathname: string;
102
+ url: string;
103
+ } & {
104
+ headers: Record<string, string> | null;
105
+ } & PageContextAfterRoute & {
106
+ is404: boolean | null;
107
+ pageId: string;
108
+ } & {
109
+ _pageConfig: PageConfigRuntime | null;
110
+ } & {
111
+ _pageConfig: null | PageConfigRuntime;
112
+ } & VikeConfigPublicPageLazyLoaded & {
113
+ _pageConfig: null | PageConfigRuntime;
24
114
  } & {
25
- __getPageAssets: () => Promise<PageAsset[]>;
26
- }>;
27
- declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPageConfigsLazyServerSide): Promise<VikeConfigPublicPageLazyLoaded & {
28
115
  Page: unknown;
29
116
  _isHtmlOnly: boolean;
30
117
  _passToClient: PassToClient;
31
- _pageFilePathsLoaded: string[];
32
118
  headersResponse: Headers;
33
119
  } & {
34
120
  __getPageAssets: () => Promise<PageAsset[]>;