vike 0.4.255-commit-05a7b95 → 0.4.256
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/client/runtime-client-routing/createPageContextClient.d.ts +24 -2
- package/dist/client/runtime-client-routing/getGlobalContextClientInternal.d.ts +24 -2
- package/dist/client/runtime-client-routing/getPageContextFromHooks.d.ts +96 -8
- package/dist/client/runtime-client-routing/renderPageClient.d.ts +96 -8
- package/dist/client/runtime-server-routing/createPageContextClient.d.ts +24 -2
- package/dist/client/runtime-server-routing/getGlobalContextClientInternal.d.ts +24 -2
- package/dist/client/shared/getGlobalContextClientInternalShared.d.ts +24 -2
- package/dist/node/prerender/runPrerender.d.ts +36 -9
- package/dist/node/prerender/runPrerender.js +17 -11
- package/dist/node/vite/index.js +0 -2
- package/dist/node/vite/plugins/pluginExtractAssets.js +2 -0
- package/dist/node/vite/plugins/pluginReplaceConstantsGlobalThis.js +0 -2
- package/dist/node/vite/shared/addSsrMiddleware.js +0 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js +0 -14
- package/dist/server/runtime/globalContext.d.ts +120 -10
- package/dist/server/runtime/renderPageServer/createHttpResponse.d.ts +3 -5
- package/dist/server/runtime/renderPageServer/createHttpResponse.js +1 -13
- package/dist/server/runtime/renderPageServer/createPageContextServer.d.ts +39 -15
- package/dist/server/runtime/renderPageServer/loadPageConfigsLazyServerSide.d.ts +36 -9
- package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.d.ts +144 -36
- package/dist/server/runtime/renderPageServer.d.ts +39 -13
- package/dist/server/runtime/renderPageServer.js +3 -51
- package/dist/server/runtime/universal-middleware.d.ts +2 -9
- package/dist/server/runtime/universal-middleware.js +1 -9
- package/dist/shared-server-client/createGlobalContextShared.d.ts +48 -4
- package/dist/shared-server-client/page-configs/resolveVikeConfigPublic.d.ts +0 -1
- package/dist/types/Config.d.ts +1 -21
- package/dist/types/PageContext.d.ts +0 -6
- package/dist/utils/PROJECT_VERSION.d.ts +1 -1
- package/dist/utils/PROJECT_VERSION.js +1 -1
- package/dist/utils/assertKeys.js +2 -2
- package/dist/utils/assertNodeVersion.js +1 -1
- package/dist/utils/assertVersion.js +1 -1
- package/dist/utils/joinEnglish.d.ts +4 -1
- package/dist/utils/joinEnglish.js +4 -4
- package/package.json +9 -26
- package/dist/node/vite/plugins/pluginUniversalDeploy/getDeployConfigs.d.ts +0 -12
- package/dist/node/vite/plugins/pluginUniversalDeploy/getDeployConfigs.js +0 -73
- package/dist/node/vite/plugins/pluginUniversalDeploy.d.ts +0 -5
- package/dist/node/vite/plugins/pluginUniversalDeploy.js +0 -155
- package/dist/server/runtime/fetch.d.ts +0 -10
- package/dist/server/runtime/fetch.js +0 -5
- package/dist/utils/asyncFlatten.d.ts +0 -4
- package/dist/utils/asyncFlatten.js +0 -7
- package/fetch.js +0 -3
package/dist/node/vite/index.js
CHANGED
|
@@ -40,7 +40,6 @@ import { pluginStripPointerImportAttribute } from './plugins/pluginStripPointerI
|
|
|
40
40
|
import { getVikeConfigInternalEarly, isOnlyResolvingUserConfig } from '../api/resolveViteConfigFromUser.js';
|
|
41
41
|
import './assertEnvVite.js';
|
|
42
42
|
import { isStorybook } from '../../utils/isStorybook.js';
|
|
43
|
-
import { pluginUniversalDeploy } from './plugins/pluginUniversalDeploy.js';
|
|
44
43
|
// We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
|
|
45
44
|
setGetClientEntrySrcDev(getClientEntrySrcDev);
|
|
46
45
|
assertIsNotProductionRuntime();
|
|
@@ -71,7 +70,6 @@ function plugin(vikeVitePluginOptions = {}) {
|
|
|
71
70
|
...pluginStaticReplace(vikeConfig),
|
|
72
71
|
...pluginNonRunnabeDev(),
|
|
73
72
|
...pluginStripPointerImportAttribute(),
|
|
74
|
-
...pluginUniversalDeploy(vikeConfig),
|
|
75
73
|
...(await pluginViteConfigVikeExtensions(vikeConfig)),
|
|
76
74
|
];
|
|
77
75
|
Object.assign(plugin, pluginAddendum);
|
|
@@ -41,6 +41,8 @@ const filterFunction = (id) => extractAssetsRE.test(id);
|
|
|
41
41
|
function pluginExtractAssets() {
|
|
42
42
|
let config;
|
|
43
43
|
let vikeConfig;
|
|
44
|
+
if (handleAssetsManifest_isFixEnabled())
|
|
45
|
+
return [];
|
|
44
46
|
let isFixEnabled;
|
|
45
47
|
return [
|
|
46
48
|
// This plugin removes all JavaScript from server-side only code, so that only CSS imports remains. (And also static files imports e.g. `import logoURL from './logo.svg.js'`).
|
|
@@ -39,11 +39,9 @@ function pluginReplaceConstantsGlobalThis() {
|
|
|
39
39
|
},
|
|
40
40
|
},
|
|
41
41
|
configEnvironment: {
|
|
42
|
-
order: 'pre',
|
|
43
42
|
handler(name, config) {
|
|
44
43
|
const isClientSide = !isViteServerSide_configEnvironment(name, config);
|
|
45
44
|
return {
|
|
46
|
-
consumer: isClientSide ? 'client' : 'server',
|
|
47
45
|
define: {
|
|
48
46
|
'globalThis.__VIKE__IS_CLIENT': JSON.stringify(isClientSide),
|
|
49
47
|
},
|
|
@@ -4,7 +4,6 @@ import { getConfigDefinedAt, } from '../../../../shared-server-client/page-confi
|
|
|
4
4
|
import { getConfigValueSourceRelevantAnyEnv, getConfigValueSourcesRelevant, isConfigSourceValueNull, } from '../../plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js';
|
|
5
5
|
import { getFileSuffixes } from '../../../../shared-server-node/getFileSuffixes.js';
|
|
6
6
|
import '../../assertEnvVite.js';
|
|
7
|
-
// TODO/after-PR-merge: rename_full configDefinitionsBuiltIn metaBuiltIn
|
|
8
7
|
const configDefinitionsBuiltIn = {
|
|
9
8
|
onRenderHtml: {
|
|
10
9
|
env: { server: true },
|
|
@@ -226,10 +225,6 @@ const configDefinitionsBuiltIn = {
|
|
|
226
225
|
eager: true,
|
|
227
226
|
global: true,
|
|
228
227
|
},
|
|
229
|
-
server: {
|
|
230
|
-
env: { server: true },
|
|
231
|
-
global: true,
|
|
232
|
-
},
|
|
233
228
|
cli: {
|
|
234
229
|
env: { config: true },
|
|
235
230
|
global: true,
|
|
@@ -310,15 +305,6 @@ const configDefinitionsBuiltIn = {
|
|
|
310
305
|
env: { config: true },
|
|
311
306
|
global: true,
|
|
312
307
|
},
|
|
313
|
-
// -- Vercel --
|
|
314
|
-
isr: {
|
|
315
|
-
env: { server: true, config: true },
|
|
316
|
-
eager: true,
|
|
317
|
-
},
|
|
318
|
-
edge: {
|
|
319
|
-
env: { server: true, config: true },
|
|
320
|
-
eager: true,
|
|
321
|
-
},
|
|
322
308
|
};
|
|
323
309
|
function getConfigEnv(pageConfig, configName) {
|
|
324
310
|
const source = getConfigValueSourceRelevantAnyEnv(configName, pageConfig);
|
|
@@ -34,7 +34,18 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
34
34
|
globalContext: (Record<string, unknown> & {
|
|
35
35
|
_globalConfigPublic: {
|
|
36
36
|
pages: {
|
|
37
|
-
[k: string]:
|
|
37
|
+
[k: string]: {
|
|
38
|
+
config: import("../../types/index.js").ConfigResolved;
|
|
39
|
+
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
40
|
+
_sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
|
|
41
|
+
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
42
|
+
} & ({
|
|
43
|
+
route: import("../../types/Config.js").Route;
|
|
44
|
+
isErrorPage?: undefined;
|
|
45
|
+
} | {
|
|
46
|
+
route?: undefined;
|
|
47
|
+
isErrorPage: true;
|
|
48
|
+
});
|
|
38
49
|
};
|
|
39
50
|
config: import("../../types/index.js").ConfigResolved;
|
|
40
51
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -42,7 +53,18 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
42
53
|
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
43
54
|
};
|
|
44
55
|
pages: {
|
|
45
|
-
[k: string]:
|
|
56
|
+
[k: string]: {
|
|
57
|
+
config: import("../../types/index.js").ConfigResolved;
|
|
58
|
+
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
59
|
+
_sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
|
|
60
|
+
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
61
|
+
} & ({
|
|
62
|
+
route: import("../../types/Config.js").Route;
|
|
63
|
+
isErrorPage?: undefined;
|
|
64
|
+
} | {
|
|
65
|
+
route?: undefined;
|
|
66
|
+
isErrorPage: true;
|
|
67
|
+
});
|
|
46
68
|
};
|
|
47
69
|
config: import("../../types/index.js").ConfigResolved;
|
|
48
70
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -82,7 +104,18 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
82
104
|
}) | (Record<string, unknown> & {
|
|
83
105
|
_globalConfigPublic: {
|
|
84
106
|
pages: {
|
|
85
|
-
[k: string]:
|
|
107
|
+
[k: string]: {
|
|
108
|
+
config: import("../../types/index.js").ConfigResolved;
|
|
109
|
+
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
110
|
+
_sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
|
|
111
|
+
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
112
|
+
} & ({
|
|
113
|
+
route: import("../../types/Config.js").Route;
|
|
114
|
+
isErrorPage?: undefined;
|
|
115
|
+
} | {
|
|
116
|
+
route?: undefined;
|
|
117
|
+
isErrorPage: true;
|
|
118
|
+
});
|
|
86
119
|
};
|
|
87
120
|
config: import("../../types/index.js").ConfigResolved;
|
|
88
121
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -90,7 +123,18 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
90
123
|
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
91
124
|
};
|
|
92
125
|
pages: {
|
|
93
|
-
[k: string]:
|
|
126
|
+
[k: string]: {
|
|
127
|
+
config: import("../../types/index.js").ConfigResolved;
|
|
128
|
+
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
129
|
+
_sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
|
|
130
|
+
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
131
|
+
} & ({
|
|
132
|
+
route: import("../../types/Config.js").Route;
|
|
133
|
+
isErrorPage?: undefined;
|
|
134
|
+
} | {
|
|
135
|
+
route?: undefined;
|
|
136
|
+
isErrorPage: true;
|
|
137
|
+
});
|
|
94
138
|
};
|
|
95
139
|
config: import("../../types/index.js").ConfigResolved;
|
|
96
140
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -131,7 +175,18 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
131
175
|
}) | (Record<string, unknown> & {
|
|
132
176
|
_globalConfigPublic: {
|
|
133
177
|
pages: {
|
|
134
|
-
[k: string]:
|
|
178
|
+
[k: string]: {
|
|
179
|
+
config: import("../../types/index.js").ConfigResolved;
|
|
180
|
+
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
181
|
+
_sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
|
|
182
|
+
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
183
|
+
} & ({
|
|
184
|
+
route: import("../../types/Config.js").Route;
|
|
185
|
+
isErrorPage?: undefined;
|
|
186
|
+
} | {
|
|
187
|
+
route?: undefined;
|
|
188
|
+
isErrorPage: true;
|
|
189
|
+
});
|
|
135
190
|
};
|
|
136
191
|
config: import("../../types/index.js").ConfigResolved;
|
|
137
192
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -139,7 +194,18 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
139
194
|
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
140
195
|
};
|
|
141
196
|
pages: {
|
|
142
|
-
[k: string]:
|
|
197
|
+
[k: string]: {
|
|
198
|
+
config: import("../../types/index.js").ConfigResolved;
|
|
199
|
+
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
200
|
+
_sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
|
|
201
|
+
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
202
|
+
} & ({
|
|
203
|
+
route: import("../../types/Config.js").Route;
|
|
204
|
+
isErrorPage?: undefined;
|
|
205
|
+
} | {
|
|
206
|
+
route?: undefined;
|
|
207
|
+
isErrorPage: true;
|
|
208
|
+
});
|
|
143
209
|
};
|
|
144
210
|
config: import("../../types/index.js").ConfigResolved;
|
|
145
211
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -182,7 +248,18 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
182
248
|
declare function getGlobalContextServerInternalOptional(): (Record<string, unknown> & (({
|
|
183
249
|
_globalConfigPublic: {
|
|
184
250
|
pages: {
|
|
185
|
-
[k: string]:
|
|
251
|
+
[k: string]: {
|
|
252
|
+
config: import("../../types/index.js").ConfigResolved;
|
|
253
|
+
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
254
|
+
_sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
|
|
255
|
+
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
256
|
+
} & ({
|
|
257
|
+
route: import("../../types/Config.js").Route;
|
|
258
|
+
isErrorPage?: undefined;
|
|
259
|
+
} | {
|
|
260
|
+
route?: undefined;
|
|
261
|
+
isErrorPage: true;
|
|
262
|
+
});
|
|
186
263
|
};
|
|
187
264
|
config: import("../../types/index.js").ConfigResolved;
|
|
188
265
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -190,7 +267,18 @@ declare function getGlobalContextServerInternalOptional(): (Record<string, unkno
|
|
|
190
267
|
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
191
268
|
};
|
|
192
269
|
pages: {
|
|
193
|
-
[k: string]:
|
|
270
|
+
[k: string]: {
|
|
271
|
+
config: import("../../types/index.js").ConfigResolved;
|
|
272
|
+
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
273
|
+
_sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
|
|
274
|
+
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
275
|
+
} & ({
|
|
276
|
+
route: import("../../types/Config.js").Route;
|
|
277
|
+
isErrorPage?: undefined;
|
|
278
|
+
} | {
|
|
279
|
+
route?: undefined;
|
|
280
|
+
isErrorPage: true;
|
|
281
|
+
});
|
|
194
282
|
};
|
|
195
283
|
config: import("../../types/index.js").ConfigResolved;
|
|
196
284
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -289,7 +377,18 @@ declare function updateUserFiles(): Promise<{
|
|
|
289
377
|
declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Promise<({
|
|
290
378
|
_globalConfigPublic: {
|
|
291
379
|
pages: {
|
|
292
|
-
[k: string]:
|
|
380
|
+
[k: string]: {
|
|
381
|
+
config: import("../../types/index.js").ConfigResolved;
|
|
382
|
+
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
383
|
+
_sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
|
|
384
|
+
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
385
|
+
} & ({
|
|
386
|
+
route: import("../../types/Config.js").Route;
|
|
387
|
+
isErrorPage?: undefined;
|
|
388
|
+
} | {
|
|
389
|
+
route?: undefined;
|
|
390
|
+
isErrorPage: true;
|
|
391
|
+
});
|
|
293
392
|
};
|
|
294
393
|
config: import("../../types/index.js").ConfigResolved;
|
|
295
394
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -297,7 +396,18 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
|
|
|
297
396
|
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
298
397
|
};
|
|
299
398
|
pages: {
|
|
300
|
-
[k: string]:
|
|
399
|
+
[k: string]: {
|
|
400
|
+
config: import("../../types/index.js").ConfigResolved;
|
|
401
|
+
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
402
|
+
_sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
|
|
403
|
+
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
404
|
+
} & ({
|
|
405
|
+
route: import("../../types/Config.js").Route;
|
|
406
|
+
isErrorPage?: undefined;
|
|
407
|
+
} | {
|
|
408
|
+
route?: undefined;
|
|
409
|
+
isErrorPage: true;
|
|
410
|
+
});
|
|
301
411
|
};
|
|
302
412
|
config: import("../../types/index.js").ConfigResolved;
|
|
303
413
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -6,23 +6,22 @@ export { createHttpResponseErrorFallbackJson };
|
|
|
6
6
|
export { createHttpResponseRedirect };
|
|
7
7
|
export { createHttpResponse404 };
|
|
8
8
|
export { createHttpResponseBaseIsMissing };
|
|
9
|
-
export { createHttpResponseFromUniversalMiddleware };
|
|
10
9
|
export type { HttpResponse };
|
|
11
10
|
import type { GetPageAssets } from './getPageAssets.js';
|
|
12
11
|
import type { HtmlRender } from './html/renderHtml.js';
|
|
13
12
|
import type { RenderHook } from './execHookOnRenderHtml.js';
|
|
14
|
-
import type { AbortStatusCode, UrlRedirect } from '../../../shared-server-client/route/abort.js';
|
|
13
|
+
import type { RedirectStatusCode, AbortStatusCode, UrlRedirect } from '../../../shared-server-client/route/abort.js';
|
|
15
14
|
import { HttpResponseBody } from './getHttpResponseBody.js';
|
|
16
15
|
import { type EarlyHint } from './getEarlyHints.js';
|
|
17
16
|
import type { PageContextBegin } from '../renderPageServer.js';
|
|
18
17
|
import type { GlobalContextServerInternal } from '../globalContext.js';
|
|
19
18
|
import '../../assertEnvServer.js';
|
|
20
19
|
type HttpResponse = {
|
|
21
|
-
statusCode:
|
|
20
|
+
statusCode: 200 | 404 | 500 | RedirectStatusCode | AbortStatusCode;
|
|
22
21
|
headers: [string, string][];
|
|
23
22
|
earlyHints: EarlyHint[];
|
|
24
23
|
/** **Deprecated**: use `headers` instead, see https://vike.dev/migration/0.4.134 */
|
|
25
|
-
contentType:
|
|
24
|
+
contentType: 'application/json' | 'text/html;charset=utf-8';
|
|
26
25
|
} & HttpResponseBody;
|
|
27
26
|
declare function createHttpResponsePage(htmlRender: HtmlRender, renderHook: null | RenderHook, pageContext: {
|
|
28
27
|
pageId: null | string;
|
|
@@ -42,4 +41,3 @@ declare function createHttpResponseErrorFallback_noGlobalContext(): HttpResponse
|
|
|
42
41
|
declare function createHttpResponseErrorFallbackJson(): HttpResponse;
|
|
43
42
|
declare function createHttpResponsePageJson(pageContextSerialized: string): Promise<HttpResponse>;
|
|
44
43
|
declare function createHttpResponseRedirect({ url, statusCode }: UrlRedirect, pageContextInit: PageContextBegin): HttpResponse;
|
|
45
|
-
declare function createHttpResponseFromUniversalMiddleware(response: Response, earlyHints?: EarlyHint[]): HttpResponse;
|
|
@@ -6,7 +6,6 @@ export { createHttpResponseErrorFallbackJson };
|
|
|
6
6
|
export { createHttpResponseRedirect };
|
|
7
7
|
export { createHttpResponse404 };
|
|
8
8
|
export { createHttpResponseBaseIsMissing };
|
|
9
|
-
export { createHttpResponseFromUniversalMiddleware };
|
|
10
9
|
import { escapeHtml } from '../../../utils/escapeHtml.js';
|
|
11
10
|
import { assert, assertWarning } from '../../../utils/assert.js';
|
|
12
11
|
import { getErrorPageId, isErrorPage } from '../../../shared-server-client/error-page.js';
|
|
@@ -103,20 +102,9 @@ function createHttpResponseRedirect({ url, statusCode }, pageContextInit) {
|
|
|
103
102
|
// For users: showing a blank page is probably better than a flickering text.
|
|
104
103
|
`<p style="display: none">Redirecting to ${escapeHtml(url)}</p><script>console.log('This HTML was generated by Vike.')</script>`);
|
|
105
104
|
}
|
|
106
|
-
function
|
|
107
|
-
// @brillout TODO/after-PR-merge: dedupe such HTML responses generated by Vike
|
|
108
|
-
const body = response.body ??
|
|
109
|
-
`<p style="display: none">No HTTP response body.</p><script>console.log('This HTML was generated by Vike.')</script>`;
|
|
110
|
-
const httpResponse = createHttpResponseCommon(response.status, Array.from(response.headers.entries()), body, earlyHints);
|
|
111
|
-
return httpResponse;
|
|
112
|
-
}
|
|
113
|
-
function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyHints, renderHook) {
|
|
105
|
+
function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyHints = [], renderHook = null) {
|
|
114
106
|
headers.push(['Content-Type', contentType]);
|
|
115
107
|
assert(renderHook || typeof htmlRender === 'string');
|
|
116
|
-
return createHttpResponseCommon(statusCode, headers, htmlRender, earlyHints, renderHook);
|
|
117
|
-
}
|
|
118
|
-
function createHttpResponseCommon(statusCode, headers, htmlRender, earlyHints = [], renderHook = null) {
|
|
119
|
-
const contentType = headers.find(([k]) => k.toLowerCase() === 'content-type')?.[1];
|
|
120
108
|
return {
|
|
121
109
|
statusCode,
|
|
122
110
|
headers,
|
|
@@ -3,10 +3,10 @@ export { createPageContextServerWithoutGlobalContext };
|
|
|
3
3
|
export type { PageContextCreatedServer };
|
|
4
4
|
export type { PageContextCreatedServerWithoutGlobalContext };
|
|
5
5
|
import type { GlobalContextServerInternal } from '../globalContext.js';
|
|
6
|
-
import type { PageContextInit
|
|
6
|
+
import type { PageContextInit } from '../renderPageServer.js';
|
|
7
7
|
import '../../assertEnvServer.js';
|
|
8
8
|
type PageContextCreatedServer = Awaited<ReturnType<typeof createPageContextServer>>;
|
|
9
|
-
declare function createPageContextServer(pageContextInit:
|
|
9
|
+
declare function createPageContextServer(pageContextInit: PageContextInit & {
|
|
10
10
|
headers?: Record<string, unknown>;
|
|
11
11
|
}, globalContext: GlobalContextServerInternal, args: {
|
|
12
12
|
requestId: number;
|
|
@@ -24,13 +24,21 @@ declare function createPageContextServer(pageContextInit: PageContextInternalIni
|
|
|
24
24
|
isPrerendering: boolean;
|
|
25
25
|
_requestId: number;
|
|
26
26
|
} & PageContextInit & {
|
|
27
|
-
_reqDev?: import("http").IncomingMessage;
|
|
28
|
-
_reqWeb?: Request;
|
|
29
|
-
} & {
|
|
30
27
|
_globalContext: ({
|
|
31
28
|
_globalConfigPublic: {
|
|
32
29
|
pages: {
|
|
33
|
-
[k: string]:
|
|
30
|
+
[k: string]: {
|
|
31
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
32
|
+
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
33
|
+
_sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
|
|
34
|
+
_from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
35
|
+
} & ({
|
|
36
|
+
route: import("../../../types/Config.js").Route;
|
|
37
|
+
isErrorPage?: undefined;
|
|
38
|
+
} | {
|
|
39
|
+
route?: undefined;
|
|
40
|
+
isErrorPage: true;
|
|
41
|
+
});
|
|
34
42
|
};
|
|
35
43
|
config: import("../../../types/index.js").ConfigResolved;
|
|
36
44
|
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -38,7 +46,18 @@ declare function createPageContextServer(pageContextInit: PageContextInternalIni
|
|
|
38
46
|
_from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
39
47
|
};
|
|
40
48
|
pages: {
|
|
41
|
-
[k: string]:
|
|
49
|
+
[k: string]: {
|
|
50
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
51
|
+
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
52
|
+
_sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
|
|
53
|
+
_from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
54
|
+
} & ({
|
|
55
|
+
route: import("../../../types/Config.js").Route;
|
|
56
|
+
isErrorPage?: undefined;
|
|
57
|
+
} | {
|
|
58
|
+
route?: undefined;
|
|
59
|
+
isErrorPage: true;
|
|
60
|
+
});
|
|
42
61
|
};
|
|
43
62
|
config: import("../../../types/index.js").ConfigResolved;
|
|
44
63
|
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -100,16 +119,24 @@ declare function createPageContextServer(pageContextInit: PageContextInternalIni
|
|
|
100
119
|
_baseServer: string;
|
|
101
120
|
_baseAssets: string;
|
|
102
121
|
_pageContextInit: PageContextInit & {
|
|
103
|
-
_reqDev?: import("http").IncomingMessage;
|
|
104
|
-
_reqWeb?: Request;
|
|
105
|
-
} & {
|
|
106
122
|
headers?: Record<string, unknown>;
|
|
107
123
|
};
|
|
108
124
|
_urlHandler: ((url: string) => string) | null;
|
|
109
125
|
isClientSideNavigation: boolean;
|
|
110
126
|
} & {
|
|
111
127
|
pages: {
|
|
112
|
-
[k: string]:
|
|
128
|
+
[k: string]: {
|
|
129
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
130
|
+
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
131
|
+
_sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
|
|
132
|
+
_from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
133
|
+
} & ({
|
|
134
|
+
route: import("../../../types/Config.js").Route;
|
|
135
|
+
isErrorPage?: undefined;
|
|
136
|
+
} | {
|
|
137
|
+
route?: undefined;
|
|
138
|
+
isErrorPage: true;
|
|
139
|
+
});
|
|
113
140
|
};
|
|
114
141
|
config: import("../../../types/index.js").ConfigResolved;
|
|
115
142
|
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -131,7 +158,4 @@ declare function createPageContextServerWithoutGlobalContext(pageContextInit: Pa
|
|
|
131
158
|
isClientSide: false;
|
|
132
159
|
isPrerendering: boolean;
|
|
133
160
|
_requestId: number;
|
|
134
|
-
} & PageContextInit
|
|
135
|
-
_reqDev?: import("http").IncomingMessage;
|
|
136
|
-
_reqWeb?: Request;
|
|
137
|
-
};
|
|
161
|
+
} & PageContextInit;
|
|
@@ -23,13 +23,21 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
|
|
|
23
23
|
isPrerendering: boolean;
|
|
24
24
|
_requestId: number;
|
|
25
25
|
} & import("../renderPageServer.js").PageContextInit & {
|
|
26
|
-
_reqDev?: import("http").IncomingMessage;
|
|
27
|
-
_reqWeb?: Request;
|
|
28
|
-
} & {
|
|
29
26
|
_globalContext: ({
|
|
30
27
|
_globalConfigPublic: {
|
|
31
28
|
pages: {
|
|
32
|
-
[k: string]:
|
|
29
|
+
[k: string]: {
|
|
30
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
31
|
+
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
32
|
+
_sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
|
|
33
|
+
_from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
34
|
+
} & ({
|
|
35
|
+
route: import("../../../types/Config.js").Route;
|
|
36
|
+
isErrorPage?: undefined;
|
|
37
|
+
} | {
|
|
38
|
+
route?: undefined;
|
|
39
|
+
isErrorPage: true;
|
|
40
|
+
});
|
|
33
41
|
};
|
|
34
42
|
config: import("../../../types/index.js").ConfigResolved;
|
|
35
43
|
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -37,7 +45,18 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
|
|
|
37
45
|
_from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
38
46
|
};
|
|
39
47
|
pages: {
|
|
40
|
-
[k: string]:
|
|
48
|
+
[k: string]: {
|
|
49
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
50
|
+
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
51
|
+
_sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
|
|
52
|
+
_from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
53
|
+
} & ({
|
|
54
|
+
route: import("../../../types/Config.js").Route;
|
|
55
|
+
isErrorPage?: undefined;
|
|
56
|
+
} | {
|
|
57
|
+
route?: undefined;
|
|
58
|
+
isErrorPage: true;
|
|
59
|
+
});
|
|
41
60
|
};
|
|
42
61
|
config: import("../../../types/index.js").ConfigResolved;
|
|
43
62
|
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -99,16 +118,24 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
|
|
|
99
118
|
_baseServer: string;
|
|
100
119
|
_baseAssets: string;
|
|
101
120
|
_pageContextInit: import("../renderPageServer.js").PageContextInit & {
|
|
102
|
-
_reqDev?: import("http").IncomingMessage;
|
|
103
|
-
_reqWeb?: Request;
|
|
104
|
-
} & {
|
|
105
121
|
headers?: Record<string, unknown>;
|
|
106
122
|
};
|
|
107
123
|
_urlHandler: ((url: string) => string) | null;
|
|
108
124
|
isClientSideNavigation: boolean;
|
|
109
125
|
} & {
|
|
110
126
|
pages: {
|
|
111
|
-
[k: string]:
|
|
127
|
+
[k: string]: {
|
|
128
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
129
|
+
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
130
|
+
_sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
|
|
131
|
+
_from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
132
|
+
} & ({
|
|
133
|
+
route: import("../../../types/Config.js").Route;
|
|
134
|
+
isErrorPage?: undefined;
|
|
135
|
+
} | {
|
|
136
|
+
route?: undefined;
|
|
137
|
+
isErrorPage: true;
|
|
138
|
+
});
|
|
112
139
|
};
|
|
113
140
|
config: import("../../../types/index.js").ConfigResolved;
|
|
114
141
|
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|