vike 0.4.228-commit-d423e4f → 0.4.228-commit-ae4784f
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/client/client-routing-runtime/globalContextClientSide.js +10 -0
- package/dist/cjs/client/client-routing-runtime/onLoad.js +10 -0
- package/dist/cjs/client/client-routing-runtime/utils.js +43 -0
- package/dist/cjs/client/server-routing-runtime/utils.js +0 -1
- package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js +5 -0
- package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/crawlPlusFiles/ignorePatternsBuiltIn.js +2 -0
- package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js +1 -1
- package/dist/cjs/node/prerender/runPrerender.js +8 -7
- package/dist/cjs/node/runtime/renderPage/createHttpResponse.js +8 -3
- package/dist/cjs/node/runtime/renderPage/createPageContextServerSide.js +73 -0
- package/dist/cjs/node/runtime/renderPage/executeHookGeneric.js +18 -0
- package/dist/cjs/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.js +2 -2
- package/dist/cjs/node/runtime/renderPage/executeOnRenderHtmlHook.js +2 -2
- package/dist/cjs/node/runtime/renderPage/getPageAssets/retrieveAssetsDev.js +1 -17
- package/dist/cjs/node/runtime/renderPage/renderPageAlreadyRouted.js +0 -65
- package/dist/cjs/node/runtime/renderPage.js +96 -75
- package/dist/cjs/shared/hooks/getHook.js +45 -27
- package/dist/cjs/shared/route/executeGuardHook.js +1 -1
- package/dist/cjs/shared/route/loadPageRoutes.js +1 -0
- package/dist/cjs/utils/PROJECT_VERSION.js +1 -1
- package/dist/cjs/utils/objectAssign.js +2 -6
- package/dist/esm/client/client-routing-runtime/createPageContext.d.ts +3 -0
- package/dist/esm/client/client-routing-runtime/createPageContext.js +2 -0
- package/dist/esm/client/client-routing-runtime/getPageContextFromHooks.js +4 -3
- package/dist/esm/client/client-routing-runtime/globalContextClientSide.d.ts +5 -0
- package/dist/esm/client/client-routing-runtime/globalContextClientSide.js +8 -0
- package/dist/esm/client/client-routing-runtime/renderPageClientSide.js +8 -6
- package/dist/esm/client/client-routing-runtime/utils.d.ts +0 -1
- package/dist/esm/client/client-routing-runtime/utils.js +0 -1
- package/dist/esm/client/server-routing-runtime/utils.d.ts +0 -1
- package/dist/esm/client/server-routing-runtime/utils.js +0 -1
- package/dist/esm/client/shared/executeOnRenderClientHook.js +5 -4
- package/dist/esm/client/shared/removeFoucBuster.js +1 -0
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js +5 -0
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/crawlPlusFiles/ignorePatternsBuiltIn.d.ts +1 -1
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/crawlPlusFiles/ignorePatternsBuiltIn.js +2 -0
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js +1 -1
- package/dist/esm/node/prerender/runPrerender.js +9 -8
- package/dist/esm/node/runtime/renderPage/createHttpResponse.d.ts +5 -4
- package/dist/esm/node/runtime/renderPage/createHttpResponse.js +8 -3
- package/dist/esm/node/runtime/renderPage/createPageContextServerSide.d.ts +85 -0
- package/dist/esm/node/runtime/renderPage/createPageContextServerSide.js +71 -0
- package/dist/esm/node/runtime/renderPage/executeHookGeneric.d.ts +9 -0
- package/dist/esm/node/runtime/renderPage/executeHookGeneric.js +16 -0
- package/dist/esm/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.js +3 -3
- package/dist/esm/node/runtime/renderPage/executeOnRenderHtmlHook.js +3 -3
- package/dist/esm/node/runtime/renderPage/getPageAssets/retrieveAssetsDev.js +1 -17
- package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts +15 -113
- package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.js +1 -66
- package/dist/esm/node/runtime/renderPage.d.ts +74 -7
- package/dist/esm/node/runtime/renderPage.js +98 -77
- package/dist/esm/shared/hooks/getHook.d.ts +4 -2
- package/dist/esm/shared/hooks/getHook.js +47 -29
- package/dist/esm/shared/page-configs/Config.d.ts +6 -1
- package/dist/esm/shared/route/executeGuardHook.js +2 -2
- package/dist/esm/shared/route/loadPageRoutes.js +1 -0
- package/dist/esm/shared/types.d.ts +8 -6
- package/dist/esm/utils/PROJECT_VERSION.d.ts +1 -1
- package/dist/esm/utils/PROJECT_VERSION.js +1 -1
- package/dist/esm/utils/objectAssign.js +2 -6
- package/package.json +1 -1
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.renderPage = renderPage;
|
|
7
7
|
exports.renderPage_addAsyncHookwrapper = renderPage_addAsyncHookwrapper;
|
|
8
8
|
const renderPageAlreadyRouted_js_1 = require("./renderPage/renderPageAlreadyRouted.js");
|
|
9
|
+
const createPageContextServerSide_js_1 = require("./renderPage/createPageContextServerSide.js");
|
|
9
10
|
const index_js_1 = require("../../shared/route/index.js");
|
|
10
11
|
const utils_js_1 = require("./utils.js");
|
|
11
12
|
const abort_js_1 = require("../../shared/route/abort.js");
|
|
@@ -32,13 +33,13 @@ async function renderPage(pageContextInit) {
|
|
|
32
33
|
(0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextInit, 'urlOriginal', 'string')); // assertUsage() already implemented at assertArguments()
|
|
33
34
|
assertIsUrl(pageContextInit.urlOriginal);
|
|
34
35
|
(0, utils_js_1.onSetupRuntime)();
|
|
35
|
-
const pageContextInvalidRequest =
|
|
36
|
+
const pageContextInvalidRequest = getPageContextInvalidRequest(pageContextInit);
|
|
36
37
|
if (pageContextInvalidRequest)
|
|
37
38
|
return pageContextInvalidRequest;
|
|
38
39
|
const httpRequestId = getRequestId();
|
|
39
40
|
const urlOriginalPretty = (0, utils_js_1.getUrlPretty)(pageContextInit.urlOriginal);
|
|
40
41
|
logHttpRequest(urlOriginalPretty, httpRequestId);
|
|
41
|
-
const { pageContextReturn } = await asyncHookWrapper(httpRequestId, () =>
|
|
42
|
+
const { pageContextReturn } = await asyncHookWrapper(httpRequestId, () => renderPagePrepare(pageContextInit, httpRequestId));
|
|
42
43
|
logHttpResponse(urlOriginalPretty, httpRequestId, pageContextReturn);
|
|
43
44
|
(0, utils_js_1.checkType)(pageContextReturn);
|
|
44
45
|
(0, utils_js_1.assert)(pageContextReturn.httpResponse);
|
|
@@ -52,13 +53,12 @@ let asyncHookWrapper = async (_httpRequestId, ret) => ({
|
|
|
52
53
|
function renderPage_addAsyncHookwrapper(wrapper) {
|
|
53
54
|
asyncHookWrapper = wrapper;
|
|
54
55
|
}
|
|
55
|
-
async function
|
|
56
|
+
async function renderPagePrepare(pageContextInit, httpRequestId) {
|
|
56
57
|
// Invalid config
|
|
57
|
-
if (isVikeConfigInvalid_js_1.isVikeConfigInvalid
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
}
|
|
58
|
+
if (isVikeConfigInvalid_js_1.isVikeConfigInvalid &&
|
|
59
|
+
true // Make TS happy
|
|
60
|
+
) {
|
|
61
|
+
return getPageContextInvalidVikeConfig(isVikeConfigInvalid_js_1.isVikeConfigInvalid.err, pageContextInit, httpRequestId);
|
|
62
62
|
}
|
|
63
63
|
// Prepare context
|
|
64
64
|
try {
|
|
@@ -72,49 +72,52 @@ async function renderPageAndPrepare(pageContextInit, httpRequestId) {
|
|
|
72
72
|
// initGlobalContext_renderPage() doens't call any user hook => err isn't thrown from user code.
|
|
73
73
|
(0, utils_js_1.assert)(!(0, abort_js_1.isAbortError)(err));
|
|
74
74
|
(0, loggerRuntime_js_1.logRuntimeError)(err, httpRequestId);
|
|
75
|
-
const pageContextWithError =
|
|
75
|
+
const pageContextWithError = getPageContextHttpResponseErrorWithoutGlobalContext(err, pageContextInit);
|
|
76
76
|
return pageContextWithError;
|
|
77
77
|
}
|
|
78
78
|
if (isVikeConfigInvalid_js_1.isVikeConfigInvalid) {
|
|
79
|
-
return
|
|
79
|
+
return getPageContextInvalidVikeConfig(isVikeConfigInvalid_js_1.isVikeConfigInvalid.err, pageContextInit, httpRequestId);
|
|
80
80
|
}
|
|
81
81
|
else {
|
|
82
82
|
// `globalContext` now contains the entire Vike config and getVikeConfig() isn't called anymore for this request.
|
|
83
83
|
}
|
|
84
84
|
const globalContext = await (0, globalContext_js_1.getGlobalContextInternal)();
|
|
85
|
+
const pageContextBegin = await getPageContextBegin(pageContextInit, globalContext, httpRequestId);
|
|
85
86
|
// Check Base URL
|
|
86
87
|
{
|
|
87
|
-
const pageContextHttpResponse = await checkBaseUrl(
|
|
88
|
+
const pageContextHttpResponse = await checkBaseUrl(pageContextBegin, globalContext);
|
|
88
89
|
if (pageContextHttpResponse)
|
|
89
90
|
return pageContextHttpResponse;
|
|
90
91
|
}
|
|
91
92
|
// Normalize URL
|
|
92
93
|
{
|
|
93
|
-
const pageContextHttpResponse = await normalizeUrl(
|
|
94
|
+
const pageContextHttpResponse = await normalizeUrl(pageContextBegin, globalContext, httpRequestId);
|
|
94
95
|
if (pageContextHttpResponse)
|
|
95
96
|
return pageContextHttpResponse;
|
|
96
97
|
}
|
|
97
98
|
// Permanent redirects (HTTP status code `301`)
|
|
98
99
|
{
|
|
99
|
-
const pageContextHttpResponse = await getPermanentRedirect(
|
|
100
|
+
const pageContextHttpResponse = await getPermanentRedirect(pageContextBegin, globalContext, httpRequestId);
|
|
100
101
|
if (pageContextHttpResponse)
|
|
101
102
|
return pageContextHttpResponse;
|
|
102
103
|
}
|
|
103
|
-
return await renderPageAlreadyPrepared(
|
|
104
|
+
return await renderPageAlreadyPrepared(pageContextBegin, globalContext, httpRequestId, []);
|
|
104
105
|
}
|
|
105
|
-
async function renderPageAlreadyPrepared(
|
|
106
|
+
async function renderPageAlreadyPrepared(pageContextBegin, globalContext, httpRequestId, pageContextsFromRewrite) {
|
|
107
|
+
const pageContextNominalPageBegin = forkPageContext(pageContextBegin);
|
|
106
108
|
(0, abort_js_1.assertNoInfiniteAbortLoop)(pageContextsFromRewrite.length,
|
|
107
109
|
// There doesn't seem to be a way to count the number of HTTP redirects (vike don't have access to the HTTP request headers/cookies)
|
|
108
110
|
// https://stackoverflow.com/questions/9683007/detect-infinite-http-redirect-loop-on-server-side
|
|
109
111
|
0);
|
|
110
112
|
let pageContextNominalPageSuccess;
|
|
111
113
|
const pageContextFromAllRewrites = (0, abort_js_1.getPageContextFromAllRewrites)(pageContextsFromRewrite);
|
|
112
|
-
|
|
113
|
-
(0, utils_js_1.
|
|
114
|
+
// This is where pageContext._urlRewrite is set
|
|
115
|
+
(0, utils_js_1.assert)(pageContextFromAllRewrites._urlRewrite === null || typeof pageContextFromAllRewrites._urlRewrite === 'string');
|
|
116
|
+
(0, utils_js_1.objectAssign)(pageContextNominalPageBegin, pageContextFromAllRewrites);
|
|
114
117
|
let errNominalPage;
|
|
115
118
|
{
|
|
116
119
|
try {
|
|
117
|
-
pageContextNominalPageSuccess = await renderPageNominal(
|
|
120
|
+
pageContextNominalPageSuccess = await renderPageNominal(pageContextNominalPageBegin);
|
|
118
121
|
}
|
|
119
122
|
catch (err) {
|
|
120
123
|
errNominalPage = err;
|
|
@@ -122,7 +125,7 @@ async function renderPageAlreadyPrepared(pageContextInit, globalContext, httpReq
|
|
|
122
125
|
(0, loggerRuntime_js_1.logRuntimeError)(errNominalPage, httpRequestId);
|
|
123
126
|
}
|
|
124
127
|
if (!errNominalPage) {
|
|
125
|
-
(0, utils_js_1.assert)(pageContextNominalPageSuccess ===
|
|
128
|
+
(0, utils_js_1.assert)(pageContextNominalPageSuccess === pageContextNominalPageBegin);
|
|
126
129
|
}
|
|
127
130
|
}
|
|
128
131
|
// Log upon 404
|
|
@@ -138,12 +141,12 @@ async function renderPageAlreadyPrepared(pageContextInit, globalContext, httpReq
|
|
|
138
141
|
else {
|
|
139
142
|
(0, utils_js_1.assert)(errNominalPage);
|
|
140
143
|
(0, utils_js_1.assert)(pageContextNominalPageSuccess === undefined);
|
|
141
|
-
(0, utils_js_1.assert)(
|
|
142
|
-
(0, utils_js_1.assert)((0, utils_js_1.hasProp)(
|
|
143
|
-
const pageContextErrorPageInit = await getPageContextErrorPageInit(
|
|
144
|
+
(0, utils_js_1.assert)(pageContextNominalPageBegin);
|
|
145
|
+
(0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextNominalPageBegin, 'urlOriginal', 'string'));
|
|
146
|
+
const pageContextErrorPageInit = await getPageContextErrorPageInit(pageContextBegin, errNominalPage, pageContextNominalPageBegin);
|
|
144
147
|
// Handle `throw redirect()` and `throw render()` while rendering nominal page
|
|
145
148
|
if ((0, abort_js_1.isAbortError)(errNominalPage)) {
|
|
146
|
-
const handled = await handleAbortError(errNominalPage, pageContextsFromRewrite,
|
|
149
|
+
const handled = await handleAbortError(errNominalPage, pageContextsFromRewrite, pageContextBegin, pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalContext);
|
|
147
150
|
if (handled.pageContextReturn) {
|
|
148
151
|
// - throw redirect()
|
|
149
152
|
// - throw render(url)
|
|
@@ -172,12 +175,12 @@ async function renderPageAlreadyPrepared(pageContextInit, globalContext, httpReq
|
|
|
172
175
|
catch (errErrorPage) {
|
|
173
176
|
// Handle `throw redirect()` and `throw render()` while rendering error page
|
|
174
177
|
if ((0, abort_js_1.isAbortError)(errErrorPage)) {
|
|
175
|
-
const handled = await handleAbortError(errErrorPage, pageContextsFromRewrite,
|
|
178
|
+
const handled = await handleAbortError(errErrorPage, pageContextsFromRewrite, pageContextBegin, pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalContext);
|
|
176
179
|
// throw render(abortStatusCode)
|
|
177
180
|
if (!handled.pageContextReturn) {
|
|
178
181
|
const pageContextAbort = errErrorPage._pageContextAbort;
|
|
179
182
|
(0, utils_js_1.assertWarning)(false, `Failed to render error page because ${picocolors_1.default.cyan(pageContextAbort._abortCall)} was called: make sure ${picocolors_1.default.cyan(pageContextAbort._abortCaller)} doesn't occur while the error page is being rendered.`, { onlyOnce: false });
|
|
180
|
-
const pageContextHttpWithError = getPageContextHttpResponseError(errNominalPage,
|
|
183
|
+
const pageContextHttpWithError = getPageContextHttpResponseError(errNominalPage, pageContextBegin);
|
|
181
184
|
return pageContextHttpWithError;
|
|
182
185
|
}
|
|
183
186
|
// `throw redirect()` / `throw render(url)`
|
|
@@ -186,7 +189,7 @@ async function renderPageAlreadyPrepared(pageContextInit, globalContext, httpReq
|
|
|
186
189
|
if ((0, isNewError_js_1.isNewError)(errErrorPage, errNominalPage)) {
|
|
187
190
|
(0, loggerRuntime_js_1.logRuntimeError)(errErrorPage, httpRequestId);
|
|
188
191
|
}
|
|
189
|
-
const pageContextWithError = getPageContextHttpResponseError(errNominalPage,
|
|
192
|
+
const pageContextWithError = getPageContextHttpResponseError(errNominalPage, pageContextBegin);
|
|
190
193
|
return pageContextWithError;
|
|
191
194
|
}
|
|
192
195
|
return pageContextErrorPage;
|
|
@@ -238,11 +241,26 @@ function logHttpResponse(urlOriginalPretty, httpRequestId, pageContextReturn) {
|
|
|
238
241
|
(0, loggerRuntime_js_1.logRuntimeInfo)?.(msg, httpRequestId, isNominal ? 'info' : 'error');
|
|
239
242
|
}
|
|
240
243
|
function prettyUrl(url) {
|
|
241
|
-
|
|
244
|
+
try {
|
|
245
|
+
url = decodeURI(url);
|
|
246
|
+
}
|
|
247
|
+
catch {
|
|
248
|
+
// https://github.com/vikejs/vike/pull/2367#issuecomment-2800967564
|
|
249
|
+
}
|
|
250
|
+
return picocolors_1.default.bold(url);
|
|
242
251
|
}
|
|
243
|
-
function getPageContextHttpResponseError(err,
|
|
244
|
-
const pageContextWithError = (
|
|
245
|
-
const httpResponse = (0, createHttpResponse_js_1.createHttpResponseError)(
|
|
252
|
+
function getPageContextHttpResponseError(err, pageContextBegin) {
|
|
253
|
+
const pageContextWithError = forkPageContext(pageContextBegin);
|
|
254
|
+
const httpResponse = (0, createHttpResponse_js_1.createHttpResponseError)(pageContextBegin);
|
|
255
|
+
(0, utils_js_1.objectAssign)(pageContextWithError, {
|
|
256
|
+
httpResponse,
|
|
257
|
+
errorWhileRendering: err
|
|
258
|
+
});
|
|
259
|
+
return pageContextWithError;
|
|
260
|
+
}
|
|
261
|
+
function getPageContextHttpResponseErrorWithoutGlobalContext(err, pageContextInit) {
|
|
262
|
+
const pageContextWithError = (0, createPageContextServerSide_js_1.createPageContextServerSideWithoutGlobalContext)(pageContextInit);
|
|
263
|
+
const httpResponse = (0, createHttpResponse_js_1.createHttpResponseErrorWithoutGlobalContext)();
|
|
246
264
|
(0, utils_js_1.objectAssign)(pageContextWithError, {
|
|
247
265
|
httpResponse,
|
|
248
266
|
errorWhileRendering: err
|
|
@@ -272,8 +290,8 @@ async function renderPageNominal(pageContext) {
|
|
|
272
290
|
(0, utils_js_1.assert)(pageContext === pageContextAfterRender);
|
|
273
291
|
return pageContextAfterRender;
|
|
274
292
|
}
|
|
275
|
-
async function getPageContextErrorPageInit(
|
|
276
|
-
const pageContext =
|
|
293
|
+
async function getPageContextErrorPageInit(pageContextBegin, errNominalPage, pageContextNominalPagePartial) {
|
|
294
|
+
const pageContext = forkPageContext(pageContextBegin);
|
|
277
295
|
(0, utils_js_1.assert)(errNominalPage);
|
|
278
296
|
(0, utils_js_1.objectAssign)(pageContext, {
|
|
279
297
|
is404: false,
|
|
@@ -286,17 +304,17 @@ async function getPageContextErrorPageInit(pageContextInit, globalContext, errNo
|
|
|
286
304
|
(0, utils_js_1.assert)(pageContext.errorWhileRendering);
|
|
287
305
|
return pageContext;
|
|
288
306
|
}
|
|
289
|
-
async function
|
|
307
|
+
async function getPageContextBegin(pageContextInit, globalContext, httpRequestId) {
|
|
290
308
|
const { isClientSideNavigation, _urlHandler } = handlePageContextUrl(pageContextInit.urlOriginal);
|
|
291
|
-
const
|
|
309
|
+
const pageContextBegin = await (0, createPageContextServerSide_js_1.createPageContextServerSide)(pageContextInit, globalContext, {
|
|
310
|
+
isPrerendering: false,
|
|
292
311
|
ssr: {
|
|
293
|
-
urlRewrite,
|
|
294
312
|
urlHandler: _urlHandler,
|
|
295
313
|
isClientSideNavigation
|
|
296
314
|
}
|
|
297
315
|
});
|
|
298
|
-
(0, utils_js_1.objectAssign)(
|
|
299
|
-
return
|
|
316
|
+
(0, utils_js_1.objectAssign)(pageContextBegin, { _httpRequestId: httpRequestId });
|
|
317
|
+
return pageContextBegin;
|
|
300
318
|
}
|
|
301
319
|
function handlePageContextUrl(urlOriginal) {
|
|
302
320
|
const { isPageContextRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
|
|
@@ -319,11 +337,12 @@ function assertIsNotViteRequest(urlPathname, urlOriginal) {
|
|
|
319
337
|
return;
|
|
320
338
|
(0, utils_js_1.assertUsage)(false, `${picocolors_1.default.code('renderPage(pageContextInit)')} called with ${picocolors_1.default.code(`pageContextInit.urlOriginal===${JSON.stringify(urlOriginal)}`)} which is unexpected because the URL ${picocolors_1.default.bold(urlOriginal)} should have already been handled by the development middleware: make sure the ${picocolors_1.default.cyan('createDevMiddleware()')} middleware is executed *before* the ${picocolors_1.default.cyan('renderPage()')} middleware, see ${picocolors_1.default.underline('https://vike.dev/renderPage')}`);
|
|
321
339
|
}
|
|
322
|
-
async function normalizeUrl(
|
|
340
|
+
async function normalizeUrl(pageContextBegin, globalContext, httpRequestId) {
|
|
341
|
+
const pageContext = forkPageContext(pageContextBegin);
|
|
323
342
|
const { trailingSlash, disableUrlNormalization } = globalContext.config;
|
|
324
343
|
if (disableUrlNormalization)
|
|
325
344
|
return null;
|
|
326
|
-
const { urlOriginal } =
|
|
345
|
+
const { urlOriginal } = pageContext;
|
|
327
346
|
const { isPageContextRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
|
|
328
347
|
if (isPageContextRequest)
|
|
329
348
|
return null;
|
|
@@ -331,13 +350,13 @@ async function normalizeUrl(pageContextInit, globalContext, httpRequestId) {
|
|
|
331
350
|
if (!urlNormalized)
|
|
332
351
|
return null;
|
|
333
352
|
(0, loggerRuntime_js_1.logRuntimeInfo)?.(`URL normalized from ${picocolors_1.default.cyan(urlOriginal)} to ${picocolors_1.default.cyan(urlNormalized)} (https://vike.dev/url-normalization)`, httpRequestId, 'info');
|
|
334
|
-
const httpResponse = (0, createHttpResponse_js_1.createHttpResponseRedirect)({ url: urlNormalized, statusCode: 301 },
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
return pageContextHttpResponse;
|
|
353
|
+
const httpResponse = (0, createHttpResponse_js_1.createHttpResponseRedirect)({ url: urlNormalized, statusCode: 301 }, pageContext);
|
|
354
|
+
(0, utils_js_1.objectAssign)(pageContext, { httpResponse });
|
|
355
|
+
return pageContext;
|
|
338
356
|
}
|
|
339
|
-
async function getPermanentRedirect(
|
|
340
|
-
const
|
|
357
|
+
async function getPermanentRedirect(pageContextBegin, globalContext, httpRequestId) {
|
|
358
|
+
const pageContext = forkPageContext(pageContextBegin);
|
|
359
|
+
const urlWithoutBase = (0, utils_js_1.removeBaseServer)(pageContext.urlOriginal, globalContext.baseServer);
|
|
341
360
|
let origin = null;
|
|
342
361
|
let urlTargetExternal = null;
|
|
343
362
|
let urlTarget = (0, utils_js_1.modifyUrlPathname)(urlWithoutBase, (urlPathname) => {
|
|
@@ -370,32 +389,29 @@ async function getPermanentRedirect(pageContextInit, globalContext, httpRequestI
|
|
|
370
389
|
return null;
|
|
371
390
|
if (!originChanged)
|
|
372
391
|
urlTarget = (0, utils_js_1.prependBase)(urlTarget, globalContext.baseServer);
|
|
373
|
-
(0, utils_js_1.assert)(urlTarget !==
|
|
392
|
+
(0, utils_js_1.assert)(urlTarget !== pageContext.urlOriginal);
|
|
374
393
|
}
|
|
375
394
|
(0, loggerRuntime_js_1.logRuntimeInfo)?.(`Permanent redirection defined by config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
|
|
376
|
-
const httpResponse = (0, createHttpResponse_js_1.createHttpResponseRedirect)({ url: urlTarget, statusCode: 301 },
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
return pageContextHttpResponse;
|
|
395
|
+
const httpResponse = (0, createHttpResponse_js_1.createHttpResponseRedirect)({ url: urlTarget, statusCode: 301 }, pageContext);
|
|
396
|
+
(0, utils_js_1.objectAssign)(pageContext, { httpResponse });
|
|
397
|
+
return pageContext;
|
|
380
398
|
}
|
|
381
399
|
function normalize(url) {
|
|
382
400
|
return url || '/';
|
|
383
401
|
}
|
|
384
|
-
async function handleAbortError(errAbort, pageContextsFromRewrite,
|
|
385
|
-
//
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalContext) {
|
|
389
|
-
(0, abort_js_1.logAbortErrorHandled)(errAbort, globalContext.isProduction, pageContextNominalPageInit);
|
|
402
|
+
async function handleAbortError(errAbort, pageContextsFromRewrite, pageContextBegin,
|
|
403
|
+
// handleAbortError() creates a new pageContext object and we don't merge pageContextNominalPageBegin to it: we only use some pageContextNominalPageBegin information.
|
|
404
|
+
pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalContext) {
|
|
405
|
+
(0, abort_js_1.logAbortErrorHandled)(errAbort, globalContext.isProduction, pageContextNominalPageBegin);
|
|
390
406
|
const pageContextAbort = errAbort._pageContextAbort;
|
|
391
407
|
let pageContextSerialized;
|
|
392
|
-
if (
|
|
408
|
+
if (pageContextNominalPageBegin.isClientSideNavigation) {
|
|
393
409
|
if (pageContextAbort.abortStatusCode) {
|
|
394
410
|
const errorPageId = (0, error_page_js_1.getErrorPageId)(globalContext.pageFilesAll, globalContext.pageConfigs);
|
|
395
411
|
const abortCall = pageContextAbort._abortCall;
|
|
396
412
|
(0, utils_js_1.assert)(abortCall);
|
|
397
413
|
(0, utils_js_1.assertUsage)(errorPageId, `You called ${picocolors_1.default.cyan(abortCall)} but you didn't define an error page, make sure to define one https://vike.dev/error-page`);
|
|
398
|
-
const pageContext = (
|
|
414
|
+
const pageContext = forkPageContext(pageContextBegin);
|
|
399
415
|
(0, utils_js_1.objectAssign)(pageContext, { pageId: errorPageId });
|
|
400
416
|
(0, utils_js_1.objectAssign)(pageContext, pageContextAbort);
|
|
401
417
|
(0, utils_js_1.objectAssign)(pageContext, pageContextErrorPageInit, true);
|
|
@@ -411,7 +427,7 @@ pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalConte
|
|
|
411
427
|
return { pageContextReturn };
|
|
412
428
|
}
|
|
413
429
|
if (pageContextAbort._urlRewrite) {
|
|
414
|
-
const pageContextReturn = await renderPageAlreadyPrepared(
|
|
430
|
+
const pageContextReturn = await renderPageAlreadyPrepared(pageContextBegin, globalContext, httpRequestId, [
|
|
415
431
|
...pageContextsFromRewrite,
|
|
416
432
|
pageContextAbort
|
|
417
433
|
]);
|
|
@@ -419,22 +435,22 @@ pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalConte
|
|
|
419
435
|
return { pageContextReturn };
|
|
420
436
|
}
|
|
421
437
|
if (pageContextAbort._urlRedirect) {
|
|
422
|
-
const pageContextReturn = (
|
|
438
|
+
const pageContextReturn = forkPageContext(pageContextBegin);
|
|
423
439
|
(0, utils_js_1.objectAssign)(pageContextReturn, pageContextAbort);
|
|
424
|
-
const httpResponse = (0, createHttpResponse_js_1.createHttpResponseRedirect)(pageContextAbort._urlRedirect,
|
|
440
|
+
const httpResponse = (0, createHttpResponse_js_1.createHttpResponseRedirect)(pageContextAbort._urlRedirect, pageContextBegin);
|
|
425
441
|
(0, utils_js_1.objectAssign)(pageContextReturn, { httpResponse });
|
|
426
442
|
return { pageContextReturn };
|
|
427
443
|
}
|
|
428
444
|
(0, utils_js_1.assert)(pageContextAbort.abortStatusCode);
|
|
429
445
|
return { pageContextAbort };
|
|
430
446
|
}
|
|
431
|
-
async function checkBaseUrl(
|
|
447
|
+
async function checkBaseUrl(pageContextBegin, globalContext) {
|
|
448
|
+
const pageContext = forkPageContext(pageContextBegin);
|
|
432
449
|
const { baseServer } = globalContext;
|
|
433
|
-
const { urlOriginal } =
|
|
450
|
+
const { urlOriginal } = pageContext;
|
|
434
451
|
const { isBaseMissing } = (0, utils_js_1.parseUrl)(urlOriginal, baseServer);
|
|
435
452
|
if (!isBaseMissing)
|
|
436
453
|
return;
|
|
437
|
-
const pageContext = (0, renderPageAlreadyRouted_js_1.createPageContext)(pageContextInit, false);
|
|
438
454
|
const httpResponse = (0, createHttpResponse_js_1.createHttpResponseBaseIsMissing)(urlOriginal, baseServer);
|
|
439
455
|
(0, utils_js_1.objectAssign)(pageContext, {
|
|
440
456
|
httpResponse,
|
|
@@ -443,20 +459,25 @@ async function checkBaseUrl(pageContextInit, globalContext) {
|
|
|
443
459
|
(0, utils_js_1.checkType)(pageContext);
|
|
444
460
|
return pageContext;
|
|
445
461
|
}
|
|
446
|
-
function
|
|
462
|
+
function getPageContextInvalidRequest(pageContextInit) {
|
|
447
463
|
const urlPathnameWithBase = (0, utils_js_1.parseUrl)(pageContextInit.urlOriginal, '/').pathname;
|
|
448
464
|
assertIsNotViteRequest(urlPathnameWithBase, pageContextInit.urlOriginal);
|
|
449
|
-
if (urlPathnameWithBase.endsWith('/favicon.ico'))
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
return null;
|
|
465
|
+
if (!urlPathnameWithBase.endsWith('/favicon.ico'))
|
|
466
|
+
return;
|
|
467
|
+
const pageContext = (0, createPageContextServerSide_js_1.createPageContextServerSideWithoutGlobalContext)(pageContextInit);
|
|
468
|
+
const httpResponse = (0, createHttpResponse_js_1.createHttpResponseFavicon404)();
|
|
469
|
+
(0, utils_js_1.objectAssign)(pageContext, { httpResponse });
|
|
470
|
+
(0, utils_js_1.checkType)(pageContext);
|
|
471
|
+
return pageContext;
|
|
457
472
|
}
|
|
458
|
-
function
|
|
473
|
+
function getPageContextInvalidVikeConfig(err, pageContextInit, httpRequestId) {
|
|
459
474
|
(0, loggerRuntime_js_1.logRuntimeInfo)?.(picocolors_1.default.bold(picocolors_1.default.red('Error while loading a Vike config file, see error above.')), httpRequestId, 'error');
|
|
460
|
-
const pageContextWithError =
|
|
475
|
+
const pageContextWithError = getPageContextHttpResponseErrorWithoutGlobalContext(err, pageContextInit);
|
|
461
476
|
return pageContextWithError;
|
|
462
477
|
}
|
|
478
|
+
// Create pageContext forks to avoid leaks: upon an error (bug or abort) a brand new pageContext object is created, in order to avoid previous pageContext modifications that are now obsolete to leak to the new pageContext object.
|
|
479
|
+
function forkPageContext(pageContextBegin) {
|
|
480
|
+
const pageContext = {};
|
|
481
|
+
(0, utils_js_1.objectAssign)(pageContext, pageContextBegin, true);
|
|
482
|
+
return pageContext;
|
|
483
|
+
}
|
|
@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.getHookFromPageContext = getHookFromPageContext;
|
|
7
7
|
exports.getHookFromPageConfig = getHookFromPageConfig;
|
|
8
8
|
exports.getHookFromPageConfigGlobal = getHookFromPageConfigGlobal;
|
|
9
|
+
exports.getHookFromPageConfigGlobalCumulative = getHookFromPageConfigGlobalCumulative;
|
|
9
10
|
exports.assertHook = assertHook;
|
|
10
11
|
exports.getHook_setIsPrerenderering = getHook_setIsPrerenderering;
|
|
11
12
|
exports.getHookTimeoutDefault = getHookTimeoutDefault;
|
|
@@ -15,59 +16,76 @@ const getConfigValueRuntime_js_1 = require("../page-configs/getConfigValueRuntim
|
|
|
15
16
|
const utils_js_1 = require("../utils.js");
|
|
16
17
|
const picocolors_1 = __importDefault(require("@brillout/picocolors"));
|
|
17
18
|
const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('hooks/getHook.ts', {});
|
|
18
|
-
function
|
|
19
|
+
function getHookFromPageContext(pageContext, hookName) {
|
|
19
20
|
if (!(hookName in pageContext.exports)) {
|
|
20
21
|
return null;
|
|
21
22
|
}
|
|
22
23
|
const { hooksTimeout } = pageContext.config;
|
|
23
24
|
const hookTimeout = getHookTimeout(hooksTimeout, hookName);
|
|
24
25
|
const hookFn = pageContext.exports[hookName];
|
|
25
|
-
const file = pageContext.exportsAll[hookName][0];
|
|
26
|
-
(0, utils_js_1.assert)(file.exportValue === hookFn);
|
|
27
26
|
if (hookFn === null)
|
|
28
27
|
return null;
|
|
28
|
+
const file = pageContext.exportsAll[hookName][0];
|
|
29
|
+
(0, utils_js_1.assert)(file.exportValue === hookFn);
|
|
29
30
|
const hookFilePath = file.filePath;
|
|
30
31
|
(0, utils_js_1.assert)(hookFilePath);
|
|
31
|
-
(
|
|
32
|
-
assertHookFn(hookFn, { hookName, hookFilePath });
|
|
33
|
-
return { hookFn, hookName, hookFilePath, hookTimeout };
|
|
32
|
+
return getHook(hookFn, hookName, hookFilePath, hookTimeout);
|
|
34
33
|
}
|
|
35
34
|
function getHookFromPageConfig(pageConfig, hookName) {
|
|
36
35
|
const configValue = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, hookName);
|
|
37
|
-
|
|
38
|
-
if (!configValue)
|
|
36
|
+
if (!configValue?.value)
|
|
39
37
|
return null;
|
|
40
|
-
const hookFn = configValue
|
|
41
|
-
|
|
42
|
-
return null;
|
|
43
|
-
const hookFilePath = (0, helpers_js_1.getHookFilePathToShowToUser)(configValue.definedAtData);
|
|
44
|
-
// hook isn't a computed nor a cumulative config => hookFilePath should always be defined
|
|
45
|
-
(0, utils_js_1.assert)(hookFilePath);
|
|
46
|
-
assertHookFn(hookFn, { hookName, hookFilePath });
|
|
38
|
+
const { hookFn, hookFilePath } = getHookFromConfigValue(configValue);
|
|
39
|
+
const hooksTimeout = (0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'hooksTimeout')?.value;
|
|
47
40
|
const hookTimeout = getHookTimeout(hooksTimeout, hookName);
|
|
48
|
-
return
|
|
41
|
+
return getHook(hookFn, hookName, hookFilePath, hookTimeout);
|
|
49
42
|
}
|
|
50
43
|
function getHookFromPageConfigGlobal(pageConfigGlobal, hookName) {
|
|
51
44
|
const configValue = pageConfigGlobal.configValues[hookName];
|
|
52
|
-
if (!configValue)
|
|
53
|
-
return null;
|
|
54
|
-
const hookFn = configValue.value;
|
|
55
|
-
if (!hookFn)
|
|
45
|
+
if (!configValue?.value)
|
|
56
46
|
return null;
|
|
57
|
-
const hookFilePath = (
|
|
58
|
-
|
|
47
|
+
const { hookFn, hookFilePath } = getHookFromConfigValue(configValue);
|
|
48
|
+
const hookTimeout = getHookTimeoutGlobal(hookName);
|
|
49
|
+
return getHook(hookFn, hookName, hookFilePath, hookTimeout);
|
|
50
|
+
}
|
|
51
|
+
function getHookFromPageConfigGlobalCumulative(pageConfigGlobal, hookName) {
|
|
52
|
+
const configValue = pageConfigGlobal.configValues[hookName];
|
|
53
|
+
if (!configValue?.value)
|
|
54
|
+
return [];
|
|
55
|
+
const val = configValue.value;
|
|
56
|
+
(0, utils_js_1.assert)((0, utils_js_1.isArray)(val));
|
|
57
|
+
return val.map((v, i) => {
|
|
58
|
+
const hookFn = v;
|
|
59
|
+
const hookTimeout = getHookTimeoutGlobal(hookName);
|
|
60
|
+
(0, utils_js_1.assert)((0, utils_js_1.isArray)(configValue.definedAtData));
|
|
61
|
+
const hookFilePath = (0, helpers_js_1.getHookFilePathToShowToUser)(configValue.definedAtData[i]);
|
|
62
|
+
return getHook(hookFn, hookName, hookFilePath, hookTimeout);
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
function getHookTimeoutGlobal(hookName) {
|
|
66
|
+
// TO-DO/perfection: we could use the global value of configooksTimeout but it requires some non-trivial refactoring
|
|
67
|
+
const hookTimeout = getHookTimeoutDefault(hookName);
|
|
68
|
+
return hookTimeout;
|
|
69
|
+
}
|
|
70
|
+
function getHook(hookFn, hookName, hookFilePath, hookTimeout) {
|
|
59
71
|
(0, utils_js_1.assert)(hookFilePath);
|
|
60
72
|
assertHookFn(hookFn, { hookName, hookFilePath });
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
73
|
+
const hook = { hookFn, hookName, hookFilePath, hookTimeout };
|
|
74
|
+
return hook;
|
|
75
|
+
}
|
|
76
|
+
function getHookFromConfigValue(configValue) {
|
|
77
|
+
const hookFn = configValue.value;
|
|
78
|
+
(0, utils_js_1.assert)(hookFn);
|
|
79
|
+
const hookFilePath = (0, helpers_js_1.getHookFilePathToShowToUser)(configValue.definedAtData);
|
|
80
|
+
return { hookFn, hookFilePath };
|
|
64
81
|
}
|
|
65
82
|
function assertHook(pageContext, hookName) {
|
|
66
|
-
|
|
83
|
+
getHookFromPageContext(pageContext, hookName);
|
|
67
84
|
}
|
|
68
85
|
function assertHookFn(hookFn, { hookName, hookFilePath }) {
|
|
69
86
|
(0, utils_js_1.assert)(hookName && hookFilePath);
|
|
70
87
|
(0, utils_js_1.assert)(!hookName.endsWith(')'));
|
|
88
|
+
(0, utils_js_1.assert)(!hookFilePath.endsWith(' '));
|
|
71
89
|
(0, utils_js_1.assertUsage)((0, utils_js_1.isCallable)(hookFn), `Hook ${hookName}() defined by ${hookFilePath} should be a function`);
|
|
72
90
|
(0, utils_js_1.checkType)(hookFn);
|
|
73
91
|
}
|
|
@@ -14,7 +14,7 @@ async function executeGuardHook(pageContext, prepareForUserConsumption) {
|
|
|
14
14
|
}
|
|
15
15
|
else {
|
|
16
16
|
// V1 design
|
|
17
|
-
hook = (0, getHook_js_1.
|
|
17
|
+
hook = (0, getHook_js_1.getHookFromPageContext)(pageContext, 'guard');
|
|
18
18
|
}
|
|
19
19
|
if (!hook)
|
|
20
20
|
return;
|
|
@@ -47,6 +47,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
|
|
|
47
47
|
}
|
|
48
48
|
else {
|
|
49
49
|
(0, utils_js_1.assert)((0, utils_js_2.isCallable)(route));
|
|
50
|
+
// TODO/next-major: remove
|
|
50
51
|
if ((0, getConfigValueRuntime_js_1.getConfigValueRuntime)(pageConfig, 'iKnowThePerformanceRisksOfAsyncRouteFunctions', 'boolean'))
|
|
51
52
|
(0, resolveRouteFunction_js_1.warnDeprecatedAllowKey)();
|
|
52
53
|
pageRoute = {
|
|
@@ -4,15 +4,11 @@ exports.objectAssign = objectAssign;
|
|
|
4
4
|
const assert_js_1 = require("./assert.js");
|
|
5
5
|
// Same as Object.assign() but:
|
|
6
6
|
// - With type inference
|
|
7
|
-
// - Preserves property descriptors, which we need for preserving the getters
|
|
7
|
+
// - Preserves property descriptors, which we need for preserving the getters of getPageContextUrlComputed()
|
|
8
8
|
function objectAssign(obj, objAddendum, objAddendumCanBePageContextObject) {
|
|
9
9
|
if (objAddendum) {
|
|
10
|
-
if (!objAddendumCanBePageContextObject)
|
|
11
|
-
// We only need this assert() in the rare case when the user is expected to mutate `pageContext` after the Vike hook was executed (and its promise resolved).
|
|
12
|
-
// - The only use case I can think of is the user mutating `pageContext` after the onRenderClient() promise resolved (which can happen when client-side rendering finishes after onRenderClient() resolves). In that case, having Vike await async Vike hooks isn't enough.
|
|
13
|
-
// - IIRC this assert() was mostly needed for preserving the getters added by getPageContextUrlComputed() but we don't need this anymore.
|
|
10
|
+
if (!objAddendumCanBePageContextObject)
|
|
14
11
|
(0, assert_js_1.assert)(!('_isPageContextObject' in objAddendum));
|
|
15
|
-
}
|
|
16
12
|
Object.defineProperties(obj, Object.getOwnPropertyDescriptors(objAddendum));
|
|
17
13
|
}
|
|
18
14
|
}
|
|
@@ -4,6 +4,9 @@ declare function createPageContext(urlOriginal: string): Promise<{
|
|
|
4
4
|
isClientSide: boolean;
|
|
5
5
|
isPrerendering: boolean;
|
|
6
6
|
urlOriginal: string;
|
|
7
|
+
globalContext: {
|
|
8
|
+
[x: string]: unknown;
|
|
9
|
+
};
|
|
7
10
|
_objectCreatedByVike: boolean;
|
|
8
11
|
_urlHandler: null;
|
|
9
12
|
_urlRewrite: null;
|
|
@@ -3,6 +3,7 @@ import { getPageConfigsRuntime } from '../../shared/getPageConfigsRuntime.js';
|
|
|
3
3
|
import { getPageContextUrlComputed } from '../../shared/getPageContextUrlComputed.js';
|
|
4
4
|
import { loadPageRoutes } from '../../shared/route/loadPageRoutes.js';
|
|
5
5
|
import { getBaseServer } from './getBaseServer.js';
|
|
6
|
+
import { getGlobalContext } from './globalContextClientSide.js';
|
|
6
7
|
import { assert, isBaseServer, objectAssign } from './utils.js';
|
|
7
8
|
// @ts-ignore
|
|
8
9
|
import * as virtualFileExports from 'virtual:vike:importUserCode:client:client-routing';
|
|
@@ -16,6 +17,7 @@ async function createPageContext(urlOriginal) {
|
|
|
16
17
|
isClientSide: true,
|
|
17
18
|
isPrerendering: false,
|
|
18
19
|
urlOriginal,
|
|
20
|
+
globalContext: getGlobalContext(),
|
|
19
21
|
_objectCreatedByVike: true,
|
|
20
22
|
_urlHandler: null,
|
|
21
23
|
_urlRewrite: null,
|
|
@@ -3,11 +3,11 @@ export { getPageContextFromHooks_serialized };
|
|
|
3
3
|
export { getPageContextFromServerHooks };
|
|
4
4
|
export { getPageContextFromClientHooks };
|
|
5
5
|
export { setPageContextInitIsPassedToClient };
|
|
6
|
-
import { assert, assertUsage, hasProp, objectAssign, getProjectError, redirectHard,
|
|
6
|
+
import { assert, assertUsage, hasProp, objectAssign, getProjectError, redirectHard, isObject, getGlobalObject } from './utils.js';
|
|
7
7
|
import { parse } from '@brillout/json-serializer/parse';
|
|
8
8
|
import { getPageContextSerializedInHtml } from '../shared/getPageContextSerializedInHtml.js';
|
|
9
9
|
import { analyzePageServerSide } from '../../shared/getPageFiles/analyzePageServerSide.js';
|
|
10
|
-
import {
|
|
10
|
+
import { getHookFromPageContext } from '../../shared/hooks/getHook.js';
|
|
11
11
|
import { preparePageContextForUserConsumptionClientSide } from '../shared/preparePageContextForUserConsumptionClientSide.js';
|
|
12
12
|
import { removeBuiltInOverrides } from './getPageContext/removeBuiltInOverrides.js';
|
|
13
13
|
import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
|
|
@@ -18,6 +18,7 @@ import { executeGuardHook } from '../../shared/route/executeGuardHook.js';
|
|
|
18
18
|
import { AbortRender, isAbortPageContext } from '../../shared/route/abort.js';
|
|
19
19
|
import { pageContextInitIsPassedToClient } from '../../shared/misc/pageContextInitIsPassedToClient.js';
|
|
20
20
|
import { isServerSideError } from '../../shared/misc/isServerSideError.js';
|
|
21
|
+
import { executeHook } from '../../shared/hooks/executeHook.js';
|
|
21
22
|
const globalObject = getGlobalObject('client-routing-runtime/getPageContextFromHooks.ts', {});
|
|
22
23
|
// TODO/eventually: rename
|
|
23
24
|
function getPageContextFromHooks_serialized() {
|
|
@@ -101,7 +102,7 @@ async function getPageContextFromClientHooks(pageContext, isErrorPage) {
|
|
|
101
102
|
return pageContextFromClientHooks;
|
|
102
103
|
}
|
|
103
104
|
async function executeHookClientSide(hookName, pageContext) {
|
|
104
|
-
const hook =
|
|
105
|
+
const hook = getHookFromPageContext(pageContext, hookName);
|
|
105
106
|
if (!hook) {
|
|
106
107
|
// No hook defined or hook's env.client is false
|
|
107
108
|
return {};
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export { getGlobalContext };
|
|
2
|
+
import { getGlobalObject } from './utils.js';
|
|
3
|
+
const globalObject = getGlobalObject('client-routing-runtime/globalContextClientSide.ts', {});
|
|
4
|
+
function getGlobalContext() {
|
|
5
|
+
if (!globalObject.globalContext)
|
|
6
|
+
globalObject.globalContext = {};
|
|
7
|
+
return globalObject.globalContext;
|
|
8
|
+
}
|