vike 0.4.256 → 0.4.257-commit-c6e29ea
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 +2 -24
- package/dist/client/runtime-client-routing/getGlobalContextClientInternal.d.ts +2 -24
- package/dist/client/runtime-client-routing/getPageContextFromHooks.d.ts +8 -96
- package/dist/client/runtime-client-routing/renderPageClient.d.ts +8 -96
- package/dist/client/runtime-server-routing/createPageContextClient.d.ts +2 -24
- package/dist/client/runtime-server-routing/getGlobalContextClientInternal.d.ts +2 -24
- package/dist/client/shared/getGlobalContextClientInternalShared.d.ts +2 -24
- package/dist/node/api/preview.js +14 -6
- package/dist/node/prerender/runPrerender.d.ts +9 -36
- package/dist/node/vite/index.js +2 -0
- package/dist/node/vite/plugins/pluginDev/optimizeDeps.d.ts +1 -1
- package/dist/node/vite/plugins/pluginDev/optimizeDeps.js +2 -0
- package/dist/node/vite/plugins/pluginReplaceConstantsGlobalThis.js +2 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/common.d.ts +21 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/common.js +8 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/detectDeprecated.d.ts +4 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/detectDeprecated.js +21 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/getDeployConfig.d.ts +10 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/getDeployConfig.js +58 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/getServerConfig.d.ts +11 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/getServerConfig.js +49 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/pluginResolvePlusServer.d.ts +7 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/pluginResolvePlusServer.js +23 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/pluginServerEntryAlias.d.ts +5 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/pluginServerEntryAlias.js +42 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/pluginServerEntryInject.d.ts +4 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/pluginServerEntryInject.js +25 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/pluginUnwrapProdOptions.d.ts +4 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/pluginUnwrapProdOptions.js +22 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy.d.ts +5 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy.js +59 -0
- package/dist/node/vite/plugins/pluginWorkaroundVite6HmrRegression.js +2 -1
- package/dist/node/vite/shared/addSsrMiddleware.js +1 -0
- package/dist/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.d.ts +5 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js +8 -0
- package/dist/node/vite/shared/resolveVikeConfigInternal/pointerImports.d.ts +5 -2
- package/dist/node/vite/shared/resolveVikeConfigInternal/resolvePointerImport.js +9 -1
- package/dist/server/runtime/fetch.d.ts +10 -0
- package/dist/server/runtime/fetch.js +5 -0
- package/dist/server/runtime/globalContext.d.ts +10 -120
- package/dist/server/runtime/globalContext.js +11 -5
- package/dist/server/runtime/renderPageServer/createHttpResponse.d.ts +5 -3
- package/dist/server/runtime/renderPageServer/createHttpResponse.js +13 -1
- package/dist/server/runtime/renderPageServer/createPageContextServer.d.ts +15 -39
- package/dist/server/runtime/renderPageServer/loadPageConfigsLazyServerSide.d.ts +9 -36
- package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.d.ts +36 -144
- package/dist/server/runtime/renderPageServer.d.ts +13 -39
- package/dist/server/runtime/renderPageServer.js +51 -3
- package/dist/server/runtime/universal-middleware.d.ts +9 -2
- package/dist/server/runtime/universal-middleware.js +9 -1
- package/dist/shared-server-client/createGlobalContextShared.d.ts +4 -48
- package/dist/shared-server-client/page-configs/assertPlusFileExport.js +8 -4
- package/dist/shared-server-client/page-configs/resolveVikeConfigPublic.d.ts +1 -0
- package/dist/types/Config.d.ts +32 -1
- package/dist/types/FilePath.d.ts +6 -6
- package/dist/types/PageContext.d.ts +15 -4
- package/dist/types/Server.d.ts +12 -0
- package/dist/types/Server.js +1 -0
- package/dist/types/VikeNamespace.d.ts +7 -0
- package/dist/types/index.d.ts +1 -0
- package/dist/utils/PROJECT_VERSION.d.ts +1 -1
- package/dist/utils/PROJECT_VERSION.js +1 -1
- package/dist/utils/isCloudflareWorkers.d.ts +1 -0
- package/dist/utils/isCloudflareWorkers.js +4 -0
- package/fetch.js +3 -0
- package/package.json +22 -4
|
@@ -34,18 +34,7 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
34
34
|
globalContext: (Record<string, unknown> & {
|
|
35
35
|
_globalConfigPublic: {
|
|
36
36
|
pages: {
|
|
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
|
-
});
|
|
37
|
+
[k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
|
|
49
38
|
};
|
|
50
39
|
config: import("../../types/index.js").ConfigResolved;
|
|
51
40
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -53,18 +42,7 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
53
42
|
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
54
43
|
};
|
|
55
44
|
pages: {
|
|
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
|
-
});
|
|
45
|
+
[k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
|
|
68
46
|
};
|
|
69
47
|
config: import("../../types/index.js").ConfigResolved;
|
|
70
48
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -104,18 +82,7 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
104
82
|
}) | (Record<string, unknown> & {
|
|
105
83
|
_globalConfigPublic: {
|
|
106
84
|
pages: {
|
|
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
|
-
});
|
|
85
|
+
[k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
|
|
119
86
|
};
|
|
120
87
|
config: import("../../types/index.js").ConfigResolved;
|
|
121
88
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -123,18 +90,7 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
123
90
|
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
124
91
|
};
|
|
125
92
|
pages: {
|
|
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
|
-
});
|
|
93
|
+
[k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
|
|
138
94
|
};
|
|
139
95
|
config: import("../../types/index.js").ConfigResolved;
|
|
140
96
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -175,18 +131,7 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
175
131
|
}) | (Record<string, unknown> & {
|
|
176
132
|
_globalConfigPublic: {
|
|
177
133
|
pages: {
|
|
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
|
-
});
|
|
134
|
+
[k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
|
|
190
135
|
};
|
|
191
136
|
config: import("../../types/index.js").ConfigResolved;
|
|
192
137
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -194,18 +139,7 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
194
139
|
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
195
140
|
};
|
|
196
141
|
pages: {
|
|
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
|
-
});
|
|
142
|
+
[k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
|
|
209
143
|
};
|
|
210
144
|
config: import("../../types/index.js").ConfigResolved;
|
|
211
145
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -248,18 +182,7 @@ declare function getGlobalContextServerInternal(): Promise<{
|
|
|
248
182
|
declare function getGlobalContextServerInternalOptional(): (Record<string, unknown> & (({
|
|
249
183
|
_globalConfigPublic: {
|
|
250
184
|
pages: {
|
|
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
|
-
});
|
|
185
|
+
[k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
|
|
263
186
|
};
|
|
264
187
|
config: import("../../types/index.js").ConfigResolved;
|
|
265
188
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -267,18 +190,7 @@ declare function getGlobalContextServerInternalOptional(): (Record<string, unkno
|
|
|
267
190
|
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
268
191
|
};
|
|
269
192
|
pages: {
|
|
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
|
-
});
|
|
193
|
+
[k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
|
|
282
194
|
};
|
|
283
195
|
config: import("../../types/index.js").ConfigResolved;
|
|
284
196
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -377,18 +289,7 @@ declare function updateUserFiles(): Promise<{
|
|
|
377
289
|
declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Promise<({
|
|
378
290
|
_globalConfigPublic: {
|
|
379
291
|
pages: {
|
|
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
|
-
});
|
|
292
|
+
[k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
|
|
392
293
|
};
|
|
393
294
|
config: import("../../types/index.js").ConfigResolved;
|
|
394
295
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -396,18 +297,7 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
|
|
|
396
297
|
_from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
397
298
|
};
|
|
398
299
|
pages: {
|
|
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
|
-
});
|
|
300
|
+
[k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
|
|
411
301
|
};
|
|
412
302
|
config: import("../../types/index.js").ConfigResolved;
|
|
413
303
|
_source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -43,6 +43,7 @@ import { getGlobalObject } from '../../utils/getGlobalObject.js';
|
|
|
43
43
|
import { hasProp } from '../../utils/hasProp.js';
|
|
44
44
|
import { isObject } from '../../utils/isObject.js';
|
|
45
45
|
import { objectAssign } from '../../utils/objectAssign.js';
|
|
46
|
+
import { isCloudflareWorkers } from '../../utils/isCloudflareWorkers.js';
|
|
46
47
|
import { importServerProductionEntry } from '@brillout/vite-plugin-server-entry/runtime';
|
|
47
48
|
import { virtualFileIdGlobalEntryServer } from '../../shared-server-node/virtualFileId.js';
|
|
48
49
|
import pc from '@brillout/picocolors';
|
|
@@ -229,7 +230,7 @@ async function initGlobalContext() {
|
|
|
229
230
|
await globalObject.waitForUserFilesUpdate;
|
|
230
231
|
}
|
|
231
232
|
else {
|
|
232
|
-
await loadProdBuildEntry(globalObject.viteConfigRuntime?.build.outDir);
|
|
233
|
+
await loadProdBuildEntry(false, globalObject.viteConfigRuntime?.build.outDir);
|
|
233
234
|
}
|
|
234
235
|
assertGlobalContextIsDefined();
|
|
235
236
|
globalObject.isInitialized = true;
|
|
@@ -247,7 +248,9 @@ function assertViteManifest(manifest) {
|
|
|
247
248
|
})
|
|
248
249
|
*/
|
|
249
250
|
}
|
|
250
|
-
async function loadProdBuildEntry(
|
|
251
|
+
async function loadProdBuildEntry(
|
|
252
|
+
// Whether loadProdBuildEntry() is called at module initialization (when JavaScript modules are loaded), e.g. it's `false` when loadProdBuildEntry() was triggered by renderPage()
|
|
253
|
+
isModuleInit, outDir) {
|
|
251
254
|
debug('loadProdBuildEntry()');
|
|
252
255
|
if (globalObject.globalContext) {
|
|
253
256
|
debug('loadProdBuildEntry() - already done');
|
|
@@ -274,7 +277,11 @@ async function loadProdBuildEntry(outDir) {
|
|
|
274
277
|
assertProdBuildEntry(prodBuildEntry);
|
|
275
278
|
globalObject.assetsManifest = prodBuildEntry.assetsManifest;
|
|
276
279
|
globalObject.buildInfo = prodBuildEntry.buildInfo;
|
|
277
|
-
|
|
280
|
+
// Don't call +onCreateGlobalContext() during module initialization in Cloudflare Workers, to avoid the error "Disallowed operation called within global scope", see https://github.com/vikejs/vike/pull/3106#issuecomment-4209583465
|
|
281
|
+
const skipGlobalContextInit = isCloudflareWorkers() && isModuleInit;
|
|
282
|
+
if (!skipGlobalContextInit) {
|
|
283
|
+
await createGlobalContext(prodBuildEntry.virtualFileExportsGlobalEntry);
|
|
284
|
+
}
|
|
278
285
|
}
|
|
279
286
|
// This is the production entry, see:
|
|
280
287
|
// https://github.com/vikejs/vike/blob/8c350e8105a626469e87594d983090919e82099b/packages/vike/node/vite/plugins/pluginBuild/pluginProdBuildEntry.ts#L47
|
|
@@ -286,8 +293,7 @@ async function setGlobalContext_prodBuildEntry(prodBuildEntry) {
|
|
|
286
293
|
globalObject.prodBuildEntry = prodBuildEntry;
|
|
287
294
|
globalObject.prodBuildEntryPrevious = prodBuildEntry;
|
|
288
295
|
assert(globalObject.prodBuildEntry); // ensure no infinite loop
|
|
289
|
-
await loadProdBuildEntry();
|
|
290
|
-
assertGlobalContextIsDefined();
|
|
296
|
+
await loadProdBuildEntry(true);
|
|
291
297
|
debug('setGlobalContext_prodBuildEntry() - done');
|
|
292
298
|
}
|
|
293
299
|
function assertProdBuildEntry(prodBuildEntry) {
|
|
@@ -6,22 +6,23 @@ export { createHttpResponseErrorFallbackJson };
|
|
|
6
6
|
export { createHttpResponseRedirect };
|
|
7
7
|
export { createHttpResponse404 };
|
|
8
8
|
export { createHttpResponseBaseIsMissing };
|
|
9
|
+
export { createHttpResponseFromUniversalMiddleware };
|
|
9
10
|
export type { HttpResponse };
|
|
10
11
|
import type { GetPageAssets } from './getPageAssets.js';
|
|
11
12
|
import type { HtmlRender } from './html/renderHtml.js';
|
|
12
13
|
import type { RenderHook } from './execHookOnRenderHtml.js';
|
|
13
|
-
import type {
|
|
14
|
+
import type { AbortStatusCode, UrlRedirect } from '../../../shared-server-client/route/abort.js';
|
|
14
15
|
import { HttpResponseBody } from './getHttpResponseBody.js';
|
|
15
16
|
import { type EarlyHint } from './getEarlyHints.js';
|
|
16
17
|
import type { PageContextBegin } from '../renderPageServer.js';
|
|
17
18
|
import type { GlobalContextServerInternal } from '../globalContext.js';
|
|
18
19
|
import '../../assertEnvServer.js';
|
|
19
20
|
type HttpResponse = {
|
|
20
|
-
statusCode:
|
|
21
|
+
statusCode: number;
|
|
21
22
|
headers: [string, string][];
|
|
22
23
|
earlyHints: EarlyHint[];
|
|
23
24
|
/** **Deprecated**: use `headers` instead, see https://vike.dev/migration/0.4.134 */
|
|
24
|
-
contentType:
|
|
25
|
+
contentType: string | undefined;
|
|
25
26
|
} & HttpResponseBody;
|
|
26
27
|
declare function createHttpResponsePage(htmlRender: HtmlRender, renderHook: null | RenderHook, pageContext: {
|
|
27
28
|
pageId: null | string;
|
|
@@ -41,3 +42,4 @@ declare function createHttpResponseErrorFallback_noGlobalContext(): HttpResponse
|
|
|
41
42
|
declare function createHttpResponseErrorFallbackJson(): HttpResponse;
|
|
42
43
|
declare function createHttpResponsePageJson(pageContextSerialized: string): Promise<HttpResponse>;
|
|
43
44
|
declare function createHttpResponseRedirect({ url, statusCode }: UrlRedirect, pageContextInit: PageContextBegin): HttpResponse;
|
|
45
|
+
declare function createHttpResponseFromUniversalMiddleware(response: Response, earlyHints?: EarlyHint[]): HttpResponse;
|
|
@@ -6,6 +6,7 @@ export { createHttpResponseErrorFallbackJson };
|
|
|
6
6
|
export { createHttpResponseRedirect };
|
|
7
7
|
export { createHttpResponse404 };
|
|
8
8
|
export { createHttpResponseBaseIsMissing };
|
|
9
|
+
export { createHttpResponseFromUniversalMiddleware };
|
|
9
10
|
import { escapeHtml } from '../../../utils/escapeHtml.js';
|
|
10
11
|
import { assert, assertWarning } from '../../../utils/assert.js';
|
|
11
12
|
import { getErrorPageId, isErrorPage } from '../../../shared-server-client/error-page.js';
|
|
@@ -102,9 +103,20 @@ function createHttpResponseRedirect({ url, statusCode }, pageContextInit) {
|
|
|
102
103
|
// For users: showing a blank page is probably better than a flickering text.
|
|
103
104
|
`<p style="display: none">Redirecting to ${escapeHtml(url)}</p><script>console.log('This HTML was generated by Vike.')</script>`);
|
|
104
105
|
}
|
|
105
|
-
function
|
|
106
|
+
function createHttpResponseFromUniversalMiddleware(response, earlyHints) {
|
|
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) {
|
|
106
114
|
headers.push(['Content-Type', contentType]);
|
|
107
115
|
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];
|
|
108
120
|
return {
|
|
109
121
|
statusCode,
|
|
110
122
|
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 } from '../renderPageServer.js';
|
|
6
|
+
import type { PageContextInit, PageContextInitInternal } 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: PageContextInitInternal & {
|
|
10
10
|
headers?: Record<string, unknown>;
|
|
11
11
|
}, globalContext: GlobalContextServerInternal, args: {
|
|
12
12
|
requestId: number;
|
|
@@ -24,21 +24,13 @@ declare function createPageContextServer(pageContextInit: PageContextInit & {
|
|
|
24
24
|
isPrerendering: boolean;
|
|
25
25
|
_requestId: number;
|
|
26
26
|
} & PageContextInit & {
|
|
27
|
+
_reqDev?: import("http").IncomingMessage;
|
|
28
|
+
_reqWeb?: Request;
|
|
29
|
+
} & {
|
|
27
30
|
_globalContext: ({
|
|
28
31
|
_globalConfigPublic: {
|
|
29
32
|
pages: {
|
|
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
|
-
});
|
|
33
|
+
[k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
|
|
42
34
|
};
|
|
43
35
|
config: import("../../../types/index.js").ConfigResolved;
|
|
44
36
|
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -46,18 +38,7 @@ declare function createPageContextServer(pageContextInit: PageContextInit & {
|
|
|
46
38
|
_from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
47
39
|
};
|
|
48
40
|
pages: {
|
|
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
|
-
});
|
|
41
|
+
[k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
|
|
61
42
|
};
|
|
62
43
|
config: import("../../../types/index.js").ConfigResolved;
|
|
63
44
|
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -119,24 +100,16 @@ declare function createPageContextServer(pageContextInit: PageContextInit & {
|
|
|
119
100
|
_baseServer: string;
|
|
120
101
|
_baseAssets: string;
|
|
121
102
|
_pageContextInit: PageContextInit & {
|
|
103
|
+
_reqDev?: import("http").IncomingMessage;
|
|
104
|
+
_reqWeb?: Request;
|
|
105
|
+
} & {
|
|
122
106
|
headers?: Record<string, unknown>;
|
|
123
107
|
};
|
|
124
108
|
_urlHandler: ((url: string) => string) | null;
|
|
125
109
|
isClientSideNavigation: boolean;
|
|
126
110
|
} & {
|
|
127
111
|
pages: {
|
|
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
|
-
});
|
|
112
|
+
[k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
|
|
140
113
|
};
|
|
141
114
|
config: import("../../../types/index.js").ConfigResolved;
|
|
142
115
|
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -158,4 +131,7 @@ declare function createPageContextServerWithoutGlobalContext(pageContextInit: Pa
|
|
|
158
131
|
isClientSide: false;
|
|
159
132
|
isPrerendering: boolean;
|
|
160
133
|
_requestId: number;
|
|
161
|
-
} & PageContextInit
|
|
134
|
+
} & PageContextInit & {
|
|
135
|
+
_reqDev?: import("http").IncomingMessage;
|
|
136
|
+
_reqWeb?: Request;
|
|
137
|
+
};
|
|
@@ -23,21 +23,13 @@ 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
|
+
} & {
|
|
26
29
|
_globalContext: ({
|
|
27
30
|
_globalConfigPublic: {
|
|
28
31
|
pages: {
|
|
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
|
-
});
|
|
32
|
+
[k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
|
|
41
33
|
};
|
|
42
34
|
config: import("../../../types/index.js").ConfigResolved;
|
|
43
35
|
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -45,18 +37,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
|
|
|
45
37
|
_from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
|
|
46
38
|
};
|
|
47
39
|
pages: {
|
|
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
|
-
});
|
|
40
|
+
[k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
|
|
60
41
|
};
|
|
61
42
|
config: import("../../../types/index.js").ConfigResolved;
|
|
62
43
|
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|
|
@@ -118,24 +99,16 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
|
|
|
118
99
|
_baseServer: string;
|
|
119
100
|
_baseAssets: string;
|
|
120
101
|
_pageContextInit: import("../renderPageServer.js").PageContextInit & {
|
|
102
|
+
_reqDev?: import("http").IncomingMessage;
|
|
103
|
+
_reqWeb?: Request;
|
|
104
|
+
} & {
|
|
121
105
|
headers?: Record<string, unknown>;
|
|
122
106
|
};
|
|
123
107
|
_urlHandler: ((url: string) => string) | null;
|
|
124
108
|
isClientSideNavigation: boolean;
|
|
125
109
|
} & {
|
|
126
110
|
pages: {
|
|
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
|
-
});
|
|
111
|
+
[k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
|
|
139
112
|
};
|
|
140
113
|
config: import("../../../types/index.js").ConfigResolved;
|
|
141
114
|
_source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
|