vike 0.4.229-commit-845a4e0 → 0.4.229-commit-7056ef0
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.
- package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js +1 -3
- package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js +12 -6
- package/dist/cjs/node/prerender/runPrerender.js +2 -2
- package/dist/cjs/node/runtime/renderPage/createHttpResponse/getCacheControl.js +7 -5
- package/dist/cjs/node/runtime/renderPage/createHttpResponse.js +0 -1
- package/dist/cjs/node/runtime/renderPage/createPageContextServerSide.js +2 -1
- package/dist/cjs/node/runtime/renderPage/executeHookServer.js +11 -0
- package/dist/cjs/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.js +8 -16
- package/dist/cjs/node/runtime/renderPage/{loadUserFilesServerSide.js → loadPageConfigsLazyServerSide.js} +4 -4
- package/dist/cjs/node/runtime/renderPage/renderPageAlreadyRouted.js +2 -2
- package/dist/cjs/node/runtime/renderPage.js +2 -2
- package/dist/cjs/shared/createGlobalContextShared.js +33 -7
- package/dist/cjs/shared/createPageContextShared.js +5 -11
- package/dist/cjs/shared/hooks/executeHook.js +21 -0
- package/dist/cjs/shared/hooks/getHook.js +23 -4
- package/dist/cjs/shared/page-configs/{getPageConfigUserFriendly.js → getUserFriendlyConfigs.js} +37 -32
- package/dist/cjs/utils/PROJECT_VERSION.js +1 -1
- package/dist/esm/client/client-routing-runtime/{createPageContext.d.ts → createPageContextClientSide.d.ts} +11 -6
- package/dist/esm/client/client-routing-runtime/{createPageContext.js → createPageContextClientSide.js} +1 -1
- package/dist/esm/client/client-routing-runtime/getPageContextFromHooks.d.ts +15 -7
- package/dist/esm/client/client-routing-runtime/getPageContextFromHooks.js +38 -46
- package/dist/esm/client/client-routing-runtime/globalContext.d.ts +10 -1
- package/dist/esm/client/client-routing-runtime/prefetch.js +3 -3
- package/dist/esm/client/client-routing-runtime/renderPageClientSide.js +14 -22
- package/dist/esm/client/server-routing-runtime/createPageContextClientSide.d.ts +12 -8
- package/dist/esm/client/server-routing-runtime/createPageContextClientSide.js +7 -16
- package/dist/esm/client/server-routing-runtime/entry.js +5 -3
- package/dist/esm/client/server-routing-runtime/globalContext.d.ts +10 -1
- package/dist/esm/client/shared/createGetGlobalContextClient.d.ts +10 -1
- package/dist/esm/client/shared/{loadUserFilesClientSide.d.ts → loadPageConfigsLazyClientSide.d.ts} +2 -2
- package/dist/esm/client/shared/{loadUserFilesClientSide.js → loadPageConfigsLazyClientSide.js} +4 -4
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js +1 -3
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.d.ts +1 -1
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js +12 -6
- package/dist/esm/node/prerender/runPrerender.d.ts +82 -18
- package/dist/esm/node/prerender/runPrerender.js +2 -2
- package/dist/esm/node/runtime/globalContext.d.ts +181 -18
- package/dist/esm/node/runtime/renderPage/createHttpResponse/getCacheControl.d.ts +1 -1
- package/dist/esm/node/runtime/renderPage/createHttpResponse/getCacheControl.js +7 -5
- package/dist/esm/node/runtime/renderPage/createHttpResponse.js +0 -1
- package/dist/esm/node/runtime/renderPage/createPageContextServerSide.d.ts +41 -9
- package/dist/esm/node/runtime/renderPage/createPageContextServerSide.js +2 -1
- package/dist/esm/node/runtime/renderPage/executeHookServer.d.ts +13 -0
- package/dist/esm/node/runtime/renderPage/executeHookServer.js +9 -0
- package/dist/esm/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.d.ts +2 -3
- package/dist/esm/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.js +8 -16
- package/dist/esm/node/runtime/renderPage/{loadUserFilesServerSide.d.ts → loadPageConfigsLazyServerSide.d.ts} +6 -6
- package/dist/esm/node/runtime/renderPage/{loadUserFilesServerSide.js → loadPageConfigsLazyServerSide.js} +4 -4
- package/dist/esm/node/runtime/renderPage/preparePageContextForUserConsumptionServerSide.d.ts +1 -1
- package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts +84 -20
- package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.js +2 -2
- package/dist/esm/node/runtime/renderPage.d.ts +41 -9
- package/dist/esm/node/runtime/renderPage.js +2 -2
- package/dist/esm/shared/createGlobalContextShared.d.ts +26 -6
- package/dist/esm/shared/createGlobalContextShared.js +33 -7
- package/dist/esm/shared/createPageContextShared.d.ts +3 -6
- package/dist/esm/shared/createPageContextShared.js +5 -11
- package/dist/esm/shared/getPageFiles.d.ts +1 -1
- package/dist/esm/shared/hooks/executeHook.d.ts +14 -1
- package/dist/esm/shared/hooks/executeHook.js +21 -0
- package/dist/esm/shared/hooks/getHook.d.ts +7 -10
- package/dist/esm/shared/hooks/getHook.js +23 -4
- package/dist/esm/shared/page-configs/Config.d.ts +4 -2
- package/dist/esm/shared/page-configs/{getPageConfigUserFriendly.d.ts → getUserFriendlyConfigs.d.ts} +8 -6
- package/dist/esm/shared/page-configs/{getPageConfigUserFriendly.js → getUserFriendlyConfigs.js} +37 -32
- package/dist/esm/shared/types.d.ts +1 -1
- package/dist/esm/types/index.d.ts +1 -1
- package/dist/esm/utils/PROJECT_VERSION.d.ts +1 -1
- package/dist/esm/utils/PROJECT_VERSION.js +1 -1
- package/package.json +1 -1
- package/dist/cjs/shared/getPageConfigsRuntime.js +0 -23
- package/dist/cjs/shared/hooks/executeHookGeneric.js +0 -18
- package/dist/esm/shared/getPageConfigsRuntime.d.ts +0 -14
- package/dist/esm/shared/getPageConfigsRuntime.js +0 -21
- package/dist/esm/shared/hooks/executeHookGeneric.d.ts +0 -8
- package/dist/esm/shared/hooks/executeHookGeneric.js +0 -16
|
@@ -81,8 +81,17 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
|
|
|
81
81
|
_pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
|
|
82
82
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
83
83
|
_allPageIds: string[];
|
|
84
|
+
_userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
|
|
84
85
|
config: import("../../types/index.js").ConfigResolved;
|
|
85
|
-
pages:
|
|
86
|
+
pages: {
|
|
87
|
+
[k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
|
|
88
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
89
|
+
isErrorPage?: undefined;
|
|
90
|
+
} | {
|
|
91
|
+
route?: undefined;
|
|
92
|
+
isErrorPage: true;
|
|
93
|
+
});
|
|
94
|
+
};
|
|
86
95
|
} & ({
|
|
87
96
|
_isProduction: false;
|
|
88
97
|
_isPrerendering: false;
|
|
@@ -110,8 +119,17 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
|
|
|
110
119
|
_pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
|
|
111
120
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
112
121
|
_allPageIds: string[];
|
|
122
|
+
_userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
|
|
113
123
|
config: import("../../types/index.js").ConfigResolved;
|
|
114
|
-
pages:
|
|
124
|
+
pages: {
|
|
125
|
+
[k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
|
|
126
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
127
|
+
isErrorPage?: undefined;
|
|
128
|
+
} | {
|
|
129
|
+
route?: undefined;
|
|
130
|
+
isErrorPage: true;
|
|
131
|
+
});
|
|
132
|
+
};
|
|
115
133
|
} | {
|
|
116
134
|
_isPrerendering: true;
|
|
117
135
|
viteConfig: ResolvedConfig;
|
|
@@ -140,8 +158,17 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
|
|
|
140
158
|
_pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
|
|
141
159
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
142
160
|
_allPageIds: string[];
|
|
161
|
+
_userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
|
|
143
162
|
config: import("../../types/index.js").ConfigResolved;
|
|
144
|
-
pages:
|
|
163
|
+
pages: {
|
|
164
|
+
[k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
|
|
165
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
166
|
+
isErrorPage?: undefined;
|
|
167
|
+
} | {
|
|
168
|
+
route?: undefined;
|
|
169
|
+
isErrorPage: true;
|
|
170
|
+
});
|
|
171
|
+
};
|
|
145
172
|
} | {
|
|
146
173
|
_isPrerendering: false;
|
|
147
174
|
viteConfig: null;
|
|
@@ -170,8 +197,17 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
|
|
|
170
197
|
_pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
|
|
171
198
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
172
199
|
_allPageIds: string[];
|
|
200
|
+
_userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
|
|
173
201
|
config: import("../../types/index.js").ConfigResolved;
|
|
174
|
-
pages:
|
|
202
|
+
pages: {
|
|
203
|
+
[k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
|
|
204
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
205
|
+
isErrorPage?: undefined;
|
|
206
|
+
} | {
|
|
207
|
+
route?: undefined;
|
|
208
|
+
isErrorPage: true;
|
|
209
|
+
});
|
|
210
|
+
};
|
|
175
211
|
});
|
|
176
212
|
_baseServer: string;
|
|
177
213
|
_baseAssets: string;
|
|
@@ -186,17 +222,13 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
|
|
|
186
222
|
_urlRewrite: null;
|
|
187
223
|
_urlHandler: ((url: string) => string) | null;
|
|
188
224
|
isClientSideNavigation: boolean;
|
|
189
|
-
} & {
|
|
225
|
+
} & import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & {
|
|
190
226
|
urlParsed: import("../shared/utils.js").UrlPublic;
|
|
191
227
|
urlPathname: string;
|
|
192
228
|
url: string;
|
|
193
229
|
} & {
|
|
194
230
|
headers: Record<string, string> | null;
|
|
195
231
|
} & {
|
|
196
|
-
config: import("../../types/index.js").ConfigResolved;
|
|
197
|
-
_source: import("../../shared/page-configs/getPageConfigUserFriendly.js").Source;
|
|
198
|
-
_sources: import("../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
|
|
199
|
-
_from: import("../../shared/page-configs/getPageConfigUserFriendly.js").From;
|
|
200
232
|
isPageContext: true;
|
|
201
233
|
} & {
|
|
202
234
|
_urlHandler: null;
|
|
@@ -222,8 +254,17 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
|
|
|
222
254
|
_pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
|
|
223
255
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
224
256
|
_allPageIds: string[];
|
|
257
|
+
_userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
|
|
225
258
|
config: import("../../types/index.js").ConfigResolved;
|
|
226
|
-
pages:
|
|
259
|
+
pages: {
|
|
260
|
+
[k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
|
|
261
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
262
|
+
isErrorPage?: undefined;
|
|
263
|
+
} | {
|
|
264
|
+
route?: undefined;
|
|
265
|
+
isErrorPage: true;
|
|
266
|
+
});
|
|
267
|
+
};
|
|
227
268
|
} & ({
|
|
228
269
|
_isProduction: false;
|
|
229
270
|
_isPrerendering: false;
|
|
@@ -251,8 +292,17 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
|
|
|
251
292
|
_pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
|
|
252
293
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
253
294
|
_allPageIds: string[];
|
|
295
|
+
_userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
|
|
254
296
|
config: import("../../types/index.js").ConfigResolved;
|
|
255
|
-
pages:
|
|
297
|
+
pages: {
|
|
298
|
+
[k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
|
|
299
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
300
|
+
isErrorPage?: undefined;
|
|
301
|
+
} | {
|
|
302
|
+
route?: undefined;
|
|
303
|
+
isErrorPage: true;
|
|
304
|
+
});
|
|
305
|
+
};
|
|
256
306
|
} | {
|
|
257
307
|
_isPrerendering: true;
|
|
258
308
|
viteConfig: ResolvedConfig;
|
|
@@ -281,8 +331,17 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
|
|
|
281
331
|
_pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
|
|
282
332
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
283
333
|
_allPageIds: string[];
|
|
334
|
+
_userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
|
|
284
335
|
config: import("../../types/index.js").ConfigResolved;
|
|
285
|
-
pages:
|
|
336
|
+
pages: {
|
|
337
|
+
[k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
|
|
338
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
339
|
+
isErrorPage?: undefined;
|
|
340
|
+
} | {
|
|
341
|
+
route?: undefined;
|
|
342
|
+
isErrorPage: true;
|
|
343
|
+
});
|
|
344
|
+
};
|
|
286
345
|
} | {
|
|
287
346
|
_isPrerendering: false;
|
|
288
347
|
viteConfig: null;
|
|
@@ -311,8 +370,17 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
|
|
|
311
370
|
_pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
|
|
312
371
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
313
372
|
_allPageIds: string[];
|
|
373
|
+
_userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
|
|
314
374
|
config: import("../../types/index.js").ConfigResolved;
|
|
315
|
-
pages:
|
|
375
|
+
pages: {
|
|
376
|
+
[k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
|
|
377
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
378
|
+
isErrorPage?: undefined;
|
|
379
|
+
} | {
|
|
380
|
+
route?: undefined;
|
|
381
|
+
isErrorPage: true;
|
|
382
|
+
});
|
|
383
|
+
};
|
|
316
384
|
});
|
|
317
385
|
_baseServer: string;
|
|
318
386
|
_baseAssets: string;
|
|
@@ -327,17 +395,13 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
|
|
|
327
395
|
_urlRewrite: null;
|
|
328
396
|
_urlHandler: ((url: string) => string) | null;
|
|
329
397
|
isClientSideNavigation: boolean;
|
|
330
|
-
} & {
|
|
398
|
+
} & import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & {
|
|
331
399
|
urlParsed: import("../shared/utils.js").UrlPublic;
|
|
332
400
|
urlPathname: string;
|
|
333
401
|
url: string;
|
|
334
402
|
} & {
|
|
335
403
|
headers: Record<string, string> | null;
|
|
336
404
|
} & {
|
|
337
|
-
config: import("../../types/index.js").ConfigResolved;
|
|
338
|
-
_source: import("../../shared/page-configs/getPageConfigUserFriendly.js").Source;
|
|
339
|
-
_sources: import("../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
|
|
340
|
-
_from: import("../../shared/page-configs/getPageConfigUserFriendly.js").From;
|
|
341
405
|
isPageContext: true;
|
|
342
406
|
} & {
|
|
343
407
|
_urlHandler: null;
|
|
@@ -18,7 +18,7 @@ import { getConfigValueRuntime } from '../../shared/page-configs/getConfigValueR
|
|
|
18
18
|
import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
|
|
19
19
|
import { getErrorPageId, isErrorPage } from '../../shared/error-page.js';
|
|
20
20
|
import { isAbortError } from '../../shared/route/abort.js';
|
|
21
|
-
import {
|
|
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 { getVikeConfig } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
|
|
@@ -348,7 +348,7 @@ async function createPageContextPrerendering(urlOriginal, prerenderContext, glob
|
|
|
348
348
|
routeParams: {}
|
|
349
349
|
});
|
|
350
350
|
}
|
|
351
|
-
objectAssign(pageContext, await
|
|
351
|
+
objectAssign(pageContext, await loadPageConfigsLazyServerSide(pageContext));
|
|
352
352
|
let usesClientRouter;
|
|
353
353
|
{
|
|
354
354
|
const { pageId } = pageContext;
|
|
@@ -20,6 +20,7 @@ export type { GlobalContextServerInternal as GlobalContextServerInternal };
|
|
|
20
20
|
export type { GlobalContextServer };
|
|
21
21
|
import type { ViteManifest } from '../shared/ViteManifest.js';
|
|
22
22
|
import type { ResolvedConfig, ViteDevServer } from 'vite';
|
|
23
|
+
import type { PageConfigUserFriendly } from '../../shared/page-configs/getUserFriendlyConfigs.js';
|
|
23
24
|
import type { ViteConfigRuntime } from '../plugin/shared/getViteConfigRuntime.js';
|
|
24
25
|
import type { GlobalContext } from '../../shared/types.js';
|
|
25
26
|
type GlobalContextServer = ReturnType<typeof makePublic> & Vike.GlobalContext & Vike.GlobalContextServer;
|
|
@@ -32,8 +33,17 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
32
33
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
33
34
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
34
35
|
_allPageIds: string[];
|
|
36
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
35
37
|
config: import("../../types/index.js").ConfigResolved;
|
|
36
|
-
pages:
|
|
38
|
+
pages: {
|
|
39
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
40
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
41
|
+
isErrorPage?: undefined;
|
|
42
|
+
} | {
|
|
43
|
+
route?: undefined;
|
|
44
|
+
isErrorPage: true;
|
|
45
|
+
});
|
|
46
|
+
};
|
|
37
47
|
} & {
|
|
38
48
|
_isProduction: false;
|
|
39
49
|
_isPrerendering: false;
|
|
@@ -61,8 +71,17 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
61
71
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
62
72
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
63
73
|
_allPageIds: string[];
|
|
74
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
64
75
|
config: import("../../types/index.js").ConfigResolved;
|
|
65
|
-
pages:
|
|
76
|
+
pages: {
|
|
77
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
78
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
79
|
+
isErrorPage?: undefined;
|
|
80
|
+
} | {
|
|
81
|
+
route?: undefined;
|
|
82
|
+
isErrorPage: true;
|
|
83
|
+
});
|
|
84
|
+
};
|
|
66
85
|
}) | (Record<string, unknown> & {
|
|
67
86
|
isGlobalContext: true;
|
|
68
87
|
_virtualFileExports: unknown;
|
|
@@ -70,8 +89,17 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
70
89
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
71
90
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
72
91
|
_allPageIds: string[];
|
|
92
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
73
93
|
config: import("../../types/index.js").ConfigResolved;
|
|
74
|
-
pages:
|
|
94
|
+
pages: {
|
|
95
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
96
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
97
|
+
isErrorPage?: undefined;
|
|
98
|
+
} | {
|
|
99
|
+
route?: undefined;
|
|
100
|
+
isErrorPage: true;
|
|
101
|
+
});
|
|
102
|
+
};
|
|
75
103
|
} & {
|
|
76
104
|
_isPrerendering: true;
|
|
77
105
|
viteConfig: ResolvedConfig;
|
|
@@ -100,8 +128,17 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
100
128
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
101
129
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
102
130
|
_allPageIds: string[];
|
|
131
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
103
132
|
config: import("../../types/index.js").ConfigResolved;
|
|
104
|
-
pages:
|
|
133
|
+
pages: {
|
|
134
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
135
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
136
|
+
isErrorPage?: undefined;
|
|
137
|
+
} | {
|
|
138
|
+
route?: undefined;
|
|
139
|
+
isErrorPage: true;
|
|
140
|
+
});
|
|
141
|
+
};
|
|
105
142
|
}) | (Record<string, unknown> & {
|
|
106
143
|
isGlobalContext: true;
|
|
107
144
|
_virtualFileExports: unknown;
|
|
@@ -109,8 +146,17 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
109
146
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
110
147
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
111
148
|
_allPageIds: string[];
|
|
149
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
112
150
|
config: import("../../types/index.js").ConfigResolved;
|
|
113
|
-
pages:
|
|
151
|
+
pages: {
|
|
152
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
153
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
154
|
+
isErrorPage?: undefined;
|
|
155
|
+
} | {
|
|
156
|
+
route?: undefined;
|
|
157
|
+
isErrorPage: true;
|
|
158
|
+
});
|
|
159
|
+
};
|
|
114
160
|
} & {
|
|
115
161
|
_isPrerendering: false;
|
|
116
162
|
viteConfig: null;
|
|
@@ -139,8 +185,17 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
139
185
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
140
186
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
141
187
|
_allPageIds: string[];
|
|
188
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
142
189
|
config: import("../../types/index.js").ConfigResolved;
|
|
143
|
-
pages:
|
|
190
|
+
pages: {
|
|
191
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
192
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
193
|
+
isErrorPage?: undefined;
|
|
194
|
+
} | {
|
|
195
|
+
route?: undefined;
|
|
196
|
+
isErrorPage: true;
|
|
197
|
+
});
|
|
198
|
+
};
|
|
144
199
|
});
|
|
145
200
|
globalContext_public: Record<string, unknown> & Pick<{
|
|
146
201
|
isGlobalContext: true;
|
|
@@ -149,8 +204,17 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
149
204
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
150
205
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
151
206
|
_allPageIds: string[];
|
|
207
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
152
208
|
config: import("../../types/index.js").ConfigResolved;
|
|
153
|
-
pages:
|
|
209
|
+
pages: {
|
|
210
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
211
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
212
|
+
isErrorPage?: undefined;
|
|
213
|
+
} | {
|
|
214
|
+
route?: undefined;
|
|
215
|
+
isErrorPage: true;
|
|
216
|
+
});
|
|
217
|
+
};
|
|
154
218
|
} & ({
|
|
155
219
|
_isProduction: false;
|
|
156
220
|
_isPrerendering: false;
|
|
@@ -178,8 +242,17 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
178
242
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
179
243
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
180
244
|
_allPageIds: string[];
|
|
245
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
181
246
|
config: import("../../types/index.js").ConfigResolved;
|
|
182
|
-
pages:
|
|
247
|
+
pages: {
|
|
248
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
249
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
250
|
+
isErrorPage?: undefined;
|
|
251
|
+
} | {
|
|
252
|
+
route?: undefined;
|
|
253
|
+
isErrorPage: true;
|
|
254
|
+
});
|
|
255
|
+
};
|
|
183
256
|
} | {
|
|
184
257
|
_isPrerendering: true;
|
|
185
258
|
viteConfig: ResolvedConfig;
|
|
@@ -208,8 +281,17 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
208
281
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
209
282
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
210
283
|
_allPageIds: string[];
|
|
284
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
211
285
|
config: import("../../types/index.js").ConfigResolved;
|
|
212
|
-
pages:
|
|
286
|
+
pages: {
|
|
287
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
288
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
289
|
+
isErrorPage?: undefined;
|
|
290
|
+
} | {
|
|
291
|
+
route?: undefined;
|
|
292
|
+
isErrorPage: true;
|
|
293
|
+
});
|
|
294
|
+
};
|
|
213
295
|
} | {
|
|
214
296
|
_isPrerendering: false;
|
|
215
297
|
viteConfig: null;
|
|
@@ -238,8 +320,17 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
238
320
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
239
321
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
240
322
|
_allPageIds: string[];
|
|
323
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
241
324
|
config: import("../../types/index.js").ConfigResolved;
|
|
242
|
-
pages:
|
|
325
|
+
pages: {
|
|
326
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
327
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
328
|
+
isErrorPage?: undefined;
|
|
329
|
+
} | {
|
|
330
|
+
route?: undefined;
|
|
331
|
+
isErrorPage: true;
|
|
332
|
+
});
|
|
333
|
+
};
|
|
243
334
|
}), "pages" | "viteConfig" | "viteConfigRuntime" | "assetsManifest" | "baseServer" | "baseAssets" | "config" | "isClientSide"> & Vike.GlobalContext & Vike.GlobalContextServer;
|
|
244
335
|
}>;
|
|
245
336
|
/**
|
|
@@ -269,8 +360,17 @@ declare function makePublic(globalContext: GlobalContextServerInternal): Pick<{
|
|
|
269
360
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
270
361
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
271
362
|
_allPageIds: string[];
|
|
363
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
272
364
|
config: import("../../types/index.js").ConfigResolved;
|
|
273
|
-
pages:
|
|
365
|
+
pages: {
|
|
366
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
367
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
368
|
+
isErrorPage?: undefined;
|
|
369
|
+
} | {
|
|
370
|
+
route?: undefined;
|
|
371
|
+
isErrorPage: true;
|
|
372
|
+
});
|
|
373
|
+
};
|
|
274
374
|
} & ({
|
|
275
375
|
_isProduction: false;
|
|
276
376
|
_isPrerendering: false;
|
|
@@ -298,8 +398,17 @@ declare function makePublic(globalContext: GlobalContextServerInternal): Pick<{
|
|
|
298
398
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
299
399
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
300
400
|
_allPageIds: string[];
|
|
401
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
301
402
|
config: import("../../types/index.js").ConfigResolved;
|
|
302
|
-
pages:
|
|
403
|
+
pages: {
|
|
404
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
405
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
406
|
+
isErrorPage?: undefined;
|
|
407
|
+
} | {
|
|
408
|
+
route?: undefined;
|
|
409
|
+
isErrorPage: true;
|
|
410
|
+
});
|
|
411
|
+
};
|
|
303
412
|
} | {
|
|
304
413
|
_isPrerendering: true;
|
|
305
414
|
viteConfig: ResolvedConfig;
|
|
@@ -328,8 +437,17 @@ declare function makePublic(globalContext: GlobalContextServerInternal): Pick<{
|
|
|
328
437
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
329
438
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
330
439
|
_allPageIds: string[];
|
|
440
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
331
441
|
config: import("../../types/index.js").ConfigResolved;
|
|
332
|
-
pages:
|
|
442
|
+
pages: {
|
|
443
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
444
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
445
|
+
isErrorPage?: undefined;
|
|
446
|
+
} | {
|
|
447
|
+
route?: undefined;
|
|
448
|
+
isErrorPage: true;
|
|
449
|
+
});
|
|
450
|
+
};
|
|
333
451
|
} | {
|
|
334
452
|
_isPrerendering: false;
|
|
335
453
|
viteConfig: null;
|
|
@@ -358,8 +476,17 @@ declare function makePublic(globalContext: GlobalContextServerInternal): Pick<{
|
|
|
358
476
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
359
477
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
360
478
|
_allPageIds: string[];
|
|
479
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
361
480
|
config: import("../../types/index.js").ConfigResolved;
|
|
362
|
-
pages:
|
|
481
|
+
pages: {
|
|
482
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
483
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
484
|
+
isErrorPage?: undefined;
|
|
485
|
+
} | {
|
|
486
|
+
route?: undefined;
|
|
487
|
+
isErrorPage: true;
|
|
488
|
+
});
|
|
489
|
+
};
|
|
363
490
|
}), "pages" | "viteConfig" | "viteConfigRuntime" | "assetsManifest" | "baseServer" | "baseAssets" | "config" | "isClientSide">;
|
|
364
491
|
declare function setGlobalContext_viteDevServer(viteDevServer: ViteDevServer): Promise<void>;
|
|
365
492
|
declare function setGlobalContext_viteConfig(viteConfig: ResolvedConfig, viteConfigRuntime: ViteConfigRuntime): void;
|
|
@@ -385,8 +512,17 @@ declare function setGlobalContext(virtualFileExports: unknown): Promise<{
|
|
|
385
512
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
386
513
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
387
514
|
_allPageIds: string[];
|
|
515
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
388
516
|
config: import("../../types/index.js").ConfigResolved;
|
|
389
|
-
pages:
|
|
517
|
+
pages: {
|
|
518
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
519
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
520
|
+
isErrorPage?: undefined;
|
|
521
|
+
} | {
|
|
522
|
+
route?: undefined;
|
|
523
|
+
isErrorPage: true;
|
|
524
|
+
});
|
|
525
|
+
};
|
|
390
526
|
} & ({
|
|
391
527
|
_isProduction: false;
|
|
392
528
|
_isPrerendering: false;
|
|
@@ -414,8 +550,17 @@ declare function setGlobalContext(virtualFileExports: unknown): Promise<{
|
|
|
414
550
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
415
551
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
416
552
|
_allPageIds: string[];
|
|
553
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
417
554
|
config: import("../../types/index.js").ConfigResolved;
|
|
418
|
-
pages:
|
|
555
|
+
pages: {
|
|
556
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
557
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
558
|
+
isErrorPage?: undefined;
|
|
559
|
+
} | {
|
|
560
|
+
route?: undefined;
|
|
561
|
+
isErrorPage: true;
|
|
562
|
+
});
|
|
563
|
+
};
|
|
419
564
|
} | {
|
|
420
565
|
_isPrerendering: true;
|
|
421
566
|
viteConfig: ResolvedConfig;
|
|
@@ -444,8 +589,17 @@ declare function setGlobalContext(virtualFileExports: unknown): Promise<{
|
|
|
444
589
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
445
590
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
446
591
|
_allPageIds: string[];
|
|
592
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
447
593
|
config: import("../../types/index.js").ConfigResolved;
|
|
448
|
-
pages:
|
|
594
|
+
pages: {
|
|
595
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
596
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
597
|
+
isErrorPage?: undefined;
|
|
598
|
+
} | {
|
|
599
|
+
route?: undefined;
|
|
600
|
+
isErrorPage: true;
|
|
601
|
+
});
|
|
602
|
+
};
|
|
449
603
|
} | {
|
|
450
604
|
_isPrerendering: false;
|
|
451
605
|
viteConfig: null;
|
|
@@ -474,7 +628,16 @@ declare function setGlobalContext(virtualFileExports: unknown): Promise<{
|
|
|
474
628
|
_pageConfigs: import("../../__internal/index.js").PageConfig[];
|
|
475
629
|
_pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
476
630
|
_allPageIds: string[];
|
|
631
|
+
_userFriendlyConfigsGlobal: PageConfigUserFriendly;
|
|
477
632
|
config: import("../../types/index.js").ConfigResolved;
|
|
478
|
-
pages:
|
|
633
|
+
pages: {
|
|
634
|
+
[k: string]: PageConfigUserFriendly & ({
|
|
635
|
+
route: import("../../shared/page-configs/Config.js").Route;
|
|
636
|
+
isErrorPage?: undefined;
|
|
637
|
+
} | {
|
|
638
|
+
route?: undefined;
|
|
639
|
+
isErrorPage: true;
|
|
640
|
+
});
|
|
641
|
+
};
|
|
479
642
|
})>;
|
|
480
643
|
declare function clearGlobalContext(): void;
|
|
@@ -2,4 +2,4 @@ export { getCacheControl };
|
|
|
2
2
|
import type { PageConfigRuntime } from '../../../../shared/page-configs/PageConfig.js';
|
|
3
3
|
import type { HttpResponse } from '../createHttpResponse.js';
|
|
4
4
|
type StatusCode = HttpResponse['statusCode'];
|
|
5
|
-
declare function getCacheControl(pageId: string, pageConfigs: PageConfigRuntime[], statusCode: StatusCode): string;
|
|
5
|
+
declare function getCacheControl(pageId: string | null, pageConfigs: PageConfigRuntime[], statusCode: StatusCode): string;
|
|
@@ -8,11 +8,13 @@ function getCacheControl(pageId, pageConfigs, statusCode) {
|
|
|
8
8
|
return defaultValue;
|
|
9
9
|
if (statusCode > 499)
|
|
10
10
|
return defaultValue;
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
11
|
+
if (pageId) {
|
|
12
|
+
const pageConfig = getPageConfig(pageId, pageConfigs);
|
|
13
|
+
const configValue = getConfigValueRuntime(pageConfig, 'cacheControl', 'string');
|
|
14
|
+
const value = configValue?.value;
|
|
15
|
+
if (value)
|
|
16
|
+
return value;
|
|
17
|
+
}
|
|
16
18
|
// - Disabling caching by default is the safest strategy, because caching is problematic with authentication as described in https://github.com/vikejs/vike/issues/1275#issuecomment-1824366875
|
|
17
19
|
// - Are there use cases when we don't need to disable caching?
|
|
18
20
|
// - When there isn't any <script id="vike_pageContext" type="application/json"> then we can safely have caching. (We don't implement this exception because we're lazy and it's quite a rare situation.)
|
|
@@ -29,7 +29,6 @@ async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
|
|
|
29
29
|
}
|
|
30
30
|
const earlyHints = getEarlyHints(await pageContext.__getPageAssets());
|
|
31
31
|
const headers = [];
|
|
32
|
-
assert(pageContext.pageId);
|
|
33
32
|
const cacheControl = getCacheControl(pageContext.pageId, pageContext._pageConfigs, statusCode);
|
|
34
33
|
if (cacheControl) {
|
|
35
34
|
headers.push(['Cache-Control', cacheControl]);
|