vike 0.4.228-commit-c2f6e1f → 0.4.228-commit-558224a
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/__internal/index.js +2 -2
- package/dist/cjs/client/client-routing-runtime/globalContext.js +49 -0
- package/dist/cjs/client/server-routing-runtime/globalContext.js +41 -0
- package/dist/cjs/client/shared/createGetGlobalContext.js +31 -0
- package/dist/cjs/client/shared/getJsonSerializedInHtml.js +31 -0
- package/dist/cjs/client/shared/utils.js +21 -0
- package/dist/cjs/node/plugin/plugins/build/pluginModuleBanner.js +1 -0
- package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js +5 -0
- package/dist/cjs/node/prerender/runPrerender.js +42 -40
- package/dist/cjs/node/prerender/utils.js +1 -1
- package/dist/cjs/node/runtime/globalContext.js +87 -119
- package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js +18 -5
- package/dist/cjs/node/runtime/html/injectAssets/getViteDevScript.js +2 -2
- package/dist/cjs/node/runtime/html/propKeys.js +47 -0
- package/dist/cjs/node/runtime/html/renderHtml.js +1 -1
- package/dist/cjs/node/runtime/html/{serializePageContextClientSide.js → serializeContext.js} +37 -67
- package/dist/cjs/node/runtime/renderPage/analyzePage.js +1 -1
- package/dist/cjs/node/runtime/renderPage/createPageContextServerSide.js +14 -13
- package/dist/cjs/node/runtime/renderPage/getPageAssets.js +2 -2
- package/dist/cjs/node/runtime/renderPage/handleErrorWithoutErrorPage.js +1 -1
- package/dist/cjs/node/runtime/renderPage/loadUserFilesServerSide.js +1 -1
- package/dist/cjs/node/runtime/renderPage/log404/index.js +1 -1
- package/dist/cjs/node/runtime/renderPage/renderPageAlreadyRouted.js +3 -3
- package/dist/cjs/node/runtime/renderPage.js +10 -10
- package/dist/cjs/node/runtime/utils.js +1 -1
- package/dist/cjs/shared/createGlobalContextShared.js +45 -0
- package/dist/cjs/shared/createPageContextShared.js +2 -2
- package/dist/cjs/{node/runtime/renderPage → shared/hooks}/executeHookGeneric.js +4 -4
- package/dist/cjs/shared/htmlElementIds.js +5 -0
- package/dist/cjs/utils/PROJECT_VERSION.js +1 -1
- package/dist/cjs/utils/catchInfiniteLoop.js +3 -3
- package/dist/cjs/utils/getPublicProxy.js +27 -0
- package/dist/cjs/utils/objectAssign.js +5 -5
- package/dist/cjs/utils/objectReplace.js +4 -4
- package/dist/esm/__internal/index.js +2 -2
- package/dist/esm/client/client-routing-runtime/{createPageContextClientSide.d.ts → createPageContext.d.ts} +17 -8
- package/dist/esm/client/client-routing-runtime/{createPageContextClientSide.js → createPageContext.js} +14 -16
- package/dist/esm/client/client-routing-runtime/getPageContextFromHooks.js +1 -1
- package/dist/esm/client/client-routing-runtime/globalContext.d.ts +16 -0
- package/dist/esm/client/client-routing-runtime/globalContext.js +13 -0
- package/dist/esm/client/client-routing-runtime/prefetch.js +1 -1
- package/dist/esm/client/client-routing-runtime/renderPageClientSide.js +2 -3
- package/dist/esm/client/server-routing-runtime/createPageContextClientSide.d.ts +13 -4
- package/dist/esm/client/server-routing-runtime/createPageContextClientSide.js +16 -15
- package/dist/esm/client/server-routing-runtime/globalContext.d.ts +13 -0
- package/dist/esm/client/server-routing-runtime/globalContext.js +5 -0
- package/dist/esm/client/shared/createGetGlobalContext.d.ts +11 -0
- package/dist/esm/client/shared/createGetGlobalContext.js +29 -0
- package/dist/esm/client/shared/{getPageContextSerializedInHtml.d.ts → getJsonSerializedInHtml.d.ts} +2 -0
- package/dist/esm/client/shared/getJsonSerializedInHtml.js +29 -0
- package/dist/esm/client/shared/utils.d.ts +3 -0
- package/dist/esm/client/shared/utils.js +3 -0
- package/dist/esm/node/plugin/plugins/build/pluginModuleBanner.js +1 -0
- package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js +5 -0
- package/dist/esm/node/prerender/runPrerender.d.ts +300 -5
- package/dist/esm/node/prerender/runPrerender.js +43 -41
- package/dist/esm/node/prerender/utils.d.ts +1 -1
- package/dist/esm/node/prerender/utils.js +1 -1
- package/dist/esm/node/runtime/globalContext.d.ts +393 -46
- package/dist/esm/node/runtime/globalContext.js +88 -120
- package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.js +18 -5
- package/dist/esm/node/runtime/html/injectAssets/getViteDevScript.js +2 -2
- package/dist/esm/node/runtime/html/injectAssets.d.ts +1 -1
- package/dist/esm/node/runtime/html/propKeys.d.ts +8 -0
- package/dist/esm/node/runtime/html/propKeys.js +45 -0
- package/dist/esm/node/runtime/html/renderHtml.js +1 -1
- package/dist/esm/node/runtime/html/{serializePageContextClientSide.d.ts → serializeContext.d.ts} +7 -6
- package/dist/esm/node/runtime/html/{serializePageContextClientSide.js → serializeContext.js} +36 -67
- package/dist/esm/node/runtime/renderPage/analyzePage.js +1 -1
- package/dist/esm/node/runtime/renderPage/createPageContextServerSide.d.ts +95 -35
- package/dist/esm/node/runtime/renderPage/createPageContextServerSide.js +14 -13
- package/dist/esm/node/runtime/renderPage/executeOnRenderHtmlHook.d.ts +1 -1
- package/dist/esm/node/runtime/renderPage/getPageAssets.js +2 -2
- package/dist/esm/node/runtime/renderPage/handleErrorWithoutErrorPage.js +1 -1
- package/dist/esm/node/runtime/renderPage/loadUserFilesServerSide.js +1 -1
- package/dist/esm/node/runtime/renderPage/log404/index.js +1 -1
- package/dist/esm/node/runtime/renderPage/preparePageContextForUserConsumptionServerSide.d.ts +2 -2
- package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts +186 -64
- package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.js +3 -3
- package/dist/esm/node/runtime/renderPage.d.ts +95 -34
- package/dist/esm/node/runtime/renderPage.js +10 -10
- package/dist/esm/node/runtime/utils.d.ts +1 -1
- package/dist/esm/node/runtime/utils.js +1 -1
- package/dist/esm/shared/VikeNamespace.d.ts +6 -0
- package/dist/esm/shared/createGlobalContextShared.d.ts +25 -0
- package/dist/esm/shared/createGlobalContextShared.js +43 -0
- package/dist/esm/shared/createPageContextShared.js +2 -2
- package/dist/esm/shared/hooks/executeHookGeneric.d.ts +8 -0
- package/dist/esm/{node/runtime/renderPage → shared/hooks}/executeHookGeneric.js +4 -4
- package/dist/esm/shared/htmlElementIds.d.ts +2 -0
- package/dist/esm/shared/htmlElementIds.js +2 -0
- package/dist/esm/shared/page-configs/Config.d.ts +7 -2
- package/dist/esm/shared/types.d.ts +20 -13
- package/dist/esm/types/index.d.ts +1 -5
- package/dist/esm/utils/PROJECT_VERSION.d.ts +1 -1
- package/dist/esm/utils/PROJECT_VERSION.js +1 -1
- package/dist/esm/utils/catchInfiniteLoop.js +4 -4
- package/dist/esm/utils/getGlobalObject.d.ts +1 -1
- package/dist/esm/utils/getPublicProxy.d.ts +2 -0
- package/dist/esm/utils/getPublicProxy.js +25 -0
- package/dist/esm/utils/objectAssign.d.ts +1 -1
- package/dist/esm/utils/objectAssign.js +5 -5
- package/dist/esm/utils/objectReplace.d.ts +1 -1
- package/dist/esm/utils/objectReplace.js +4 -4
- package/package.json +2 -2
- package/dist/cjs/client/client-routing-runtime/globalContextClientSide.js +0 -10
- package/dist/cjs/client/client-routing-runtime/onLoad.js +0 -10
- package/dist/cjs/client/client-routing-runtime/utils.js +0 -43
- package/dist/cjs/utils/makePublicCopy.js +0 -32
- package/dist/esm/client/client-routing-runtime/globalContextClientSide.d.ts +0 -5
- package/dist/esm/client/client-routing-runtime/globalContextClientSide.js +0 -8
- package/dist/esm/client/shared/getPageContextSerializedInHtml.js +0 -20
- package/dist/esm/node/runtime/renderPage/executeHookGeneric.d.ts +0 -8
- package/dist/esm/utils/makePublicCopy.d.ts +0 -3
- package/dist/esm/utils/makePublicCopy.js +0 -30
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
export { createPageContextServerSide };
|
|
2
2
|
export { createPageContextServerSideWithoutGlobalContext };
|
|
3
3
|
export type { PageContextCreatedServerSide };
|
|
4
|
-
import type { GlobalContextInternal } from '../globalContext.js';
|
|
4
|
+
import type { GlobalContextInternal, GlobalContextServer } from '../globalContext.js';
|
|
5
5
|
import type { PageContextInit } from '../renderPage.js';
|
|
6
6
|
type PageContextCreatedServerSide = Awaited<ReturnType<typeof createPageContextServerSide>>;
|
|
7
|
-
declare function createPageContextServerSide(pageContextInit: PageContextInit, globalContext: GlobalContextInternal, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } }: {
|
|
7
|
+
declare function createPageContextServerSide(pageContextInit: PageContextInit, globalContext: GlobalContextInternal, globalObject_public: GlobalContextServer, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } }: {
|
|
8
8
|
isPrerendering: false;
|
|
9
9
|
ssr: {
|
|
10
10
|
urlHandler: null | ((url: string) => string);
|
|
@@ -20,6 +20,99 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
|
|
|
20
20
|
url?: string;
|
|
21
21
|
headers?: Record<string, string>;
|
|
22
22
|
} & {
|
|
23
|
+
globalContext: GlobalContextServer;
|
|
24
|
+
_globalContext: {
|
|
25
|
+
_virtualFileExports: unknown;
|
|
26
|
+
_pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
27
|
+
_pageConfigs: import("../../../__internal/index.js").PageConfig[];
|
|
28
|
+
_pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
29
|
+
_allPageIds: string[];
|
|
30
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
31
|
+
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
32
|
+
} & ({
|
|
33
|
+
_isProduction: false;
|
|
34
|
+
_isPrerendering: false;
|
|
35
|
+
assetsManifest: null;
|
|
36
|
+
_viteDevServer: import("vite").ViteDevServer;
|
|
37
|
+
viteConfig: import("vite").ResolvedConfig;
|
|
38
|
+
viteConfigRuntime: {
|
|
39
|
+
root: string;
|
|
40
|
+
build: {
|
|
41
|
+
outDir: string;
|
|
42
|
+
};
|
|
43
|
+
_baseViteOriginal: string;
|
|
44
|
+
vitePluginServerEntry: {
|
|
45
|
+
inject: boolean | undefined;
|
|
46
|
+
};
|
|
47
|
+
};
|
|
48
|
+
baseServer: string;
|
|
49
|
+
baseAssets: string;
|
|
50
|
+
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
51
|
+
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
52
|
+
_virtualFileExports: unknown;
|
|
53
|
+
_pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
54
|
+
_pageConfigs: import("../../../__internal/index.js").PageConfig[];
|
|
55
|
+
_pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
56
|
+
_allPageIds: string[];
|
|
57
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
58
|
+
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
59
|
+
} | {
|
|
60
|
+
_isPrerendering: true;
|
|
61
|
+
viteConfig: import("vite").ResolvedConfig;
|
|
62
|
+
_isProduction: true;
|
|
63
|
+
assetsManifest: import("../../shared/ViteManifest.js").ViteManifest;
|
|
64
|
+
_viteDevServer: null;
|
|
65
|
+
viteConfigRuntime: {
|
|
66
|
+
root: string;
|
|
67
|
+
build: {
|
|
68
|
+
outDir: string;
|
|
69
|
+
};
|
|
70
|
+
_baseViteOriginal: string;
|
|
71
|
+
vitePluginServerEntry: {
|
|
72
|
+
inject: boolean | undefined;
|
|
73
|
+
};
|
|
74
|
+
};
|
|
75
|
+
_usesClientRouter: boolean;
|
|
76
|
+
baseServer: string;
|
|
77
|
+
baseAssets: string;
|
|
78
|
+
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
79
|
+
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
80
|
+
_virtualFileExports: unknown;
|
|
81
|
+
_pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
82
|
+
_pageConfigs: import("../../../__internal/index.js").PageConfig[];
|
|
83
|
+
_pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
84
|
+
_allPageIds: string[];
|
|
85
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
86
|
+
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
87
|
+
} | {
|
|
88
|
+
_isPrerendering: false;
|
|
89
|
+
viteConfig: null;
|
|
90
|
+
_isProduction: true;
|
|
91
|
+
assetsManifest: import("../../shared/ViteManifest.js").ViteManifest;
|
|
92
|
+
_viteDevServer: null;
|
|
93
|
+
viteConfigRuntime: {
|
|
94
|
+
root: string;
|
|
95
|
+
build: {
|
|
96
|
+
outDir: string;
|
|
97
|
+
};
|
|
98
|
+
_baseViteOriginal: string;
|
|
99
|
+
vitePluginServerEntry: {
|
|
100
|
+
inject: boolean | undefined;
|
|
101
|
+
};
|
|
102
|
+
};
|
|
103
|
+
_usesClientRouter: boolean;
|
|
104
|
+
baseServer: string;
|
|
105
|
+
baseAssets: string;
|
|
106
|
+
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
107
|
+
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
108
|
+
_virtualFileExports: unknown;
|
|
109
|
+
_pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
110
|
+
_pageConfigs: import("../../../__internal/index.js").PageConfig[];
|
|
111
|
+
_pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
112
|
+
_allPageIds: string[];
|
|
113
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
114
|
+
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
115
|
+
});
|
|
23
116
|
_baseServer: string;
|
|
24
117
|
_baseAssets: string;
|
|
25
118
|
_includeAssetsImportedByServer: boolean;
|
|
@@ -29,39 +122,6 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
|
|
|
29
122
|
_allPageIds: string[];
|
|
30
123
|
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
31
124
|
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
32
|
-
_globalContext: GlobalContextInternal;
|
|
33
|
-
/** @experimental This is a beta feature https://vike.dev/getGlobalContext */
|
|
34
|
-
globalContext: Pick<{
|
|
35
|
-
viteConfigRuntime: import("../../plugin/shared/getViteConfigRuntime.js").ViteConfigRuntime;
|
|
36
|
-
config: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigUserFriendly["config"];
|
|
37
|
-
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
38
|
-
} & import("../../shared/resolveBase.js").BaseUrlsResolved & ({
|
|
39
|
-
pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
40
|
-
pageConfigs: import("../../../__internal/index.js").PageConfig[];
|
|
41
|
-
pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
42
|
-
allPageIds: string[];
|
|
43
|
-
pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
44
|
-
onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
45
|
-
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
46
|
-
config: import("../../../types/index.js").ConfigResolved;
|
|
47
|
-
} & ({
|
|
48
|
-
isProduction: false;
|
|
49
|
-
isPrerendering: false;
|
|
50
|
-
viteConfig: import("vite").ResolvedConfig;
|
|
51
|
-
viteDevServer: import("vite").ViteDevServer;
|
|
52
|
-
assetsManifest: null;
|
|
53
|
-
} | ({
|
|
54
|
-
isProduction: true;
|
|
55
|
-
assetsManifest: import("../../shared/ViteManifest.js").ViteManifest;
|
|
56
|
-
viteDevServer: null;
|
|
57
|
-
} & ({
|
|
58
|
-
isPrerendering: false;
|
|
59
|
-
viteConfig: null;
|
|
60
|
-
} | {
|
|
61
|
-
isPrerendering: true;
|
|
62
|
-
usesClientRouter: boolean;
|
|
63
|
-
viteConfig: import("vite").ResolvedConfig;
|
|
64
|
-
})))), "pages" | "baseServer" | "baseAssets" | "config" | "assetsManifest" | "viteConfig" | "viteConfigRuntime">;
|
|
65
125
|
_pageContextInit: PageContextInit;
|
|
66
126
|
_urlRewrite: null;
|
|
67
127
|
_urlHandler: ((url: string) => string) | null;
|
|
@@ -3,30 +3,31 @@ export { createPageContextServerSideWithoutGlobalContext };
|
|
|
3
3
|
import { assert, assertUsage, assertWarning, augmentType, normalizeHeaders, objectAssign } from '../utils.js';
|
|
4
4
|
import { getPageContextUrlComputed } from '../../../shared/getPageContextUrlComputed.js';
|
|
5
5
|
import { createPageContextShared } from '../../../shared/createPageContextShared.js';
|
|
6
|
-
async function createPageContextServerSide(pageContextInit, globalContext, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
|
|
6
|
+
async function createPageContextServerSide(pageContextInit, globalContext, globalObject_public, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
|
|
7
7
|
urlHandler: null,
|
|
8
8
|
isClientSideNavigation: false
|
|
9
9
|
} }) {
|
|
10
10
|
assert(pageContextInit.urlOriginal);
|
|
11
11
|
const pageContextCreated = createPageContext(pageContextInit, isPrerendering);
|
|
12
|
-
objectAssign(pageContextCreated, pageContextInit);
|
|
13
12
|
objectAssign(pageContextCreated, {
|
|
13
|
+
/* Don't spread globalContext for now? Or never spread it as it leads to confusion? The convenience isn't worth the added confusion?
|
|
14
|
+
// We must use Flatten<T> otherwise TypeScript complains upon assigning types
|
|
15
|
+
...(globalContext as Flatten<typeof globalContext>), // least precedence
|
|
16
|
+
*/
|
|
17
|
+
globalContext: globalObject_public,
|
|
18
|
+
_globalContext: globalContext,
|
|
14
19
|
// The following is defined on `pageContext` because we can eventually make these non-global
|
|
15
20
|
_baseServer: globalContext.baseServer,
|
|
16
21
|
_baseAssets: globalContext.baseAssets,
|
|
17
22
|
// TODO/now: add meta.default
|
|
18
23
|
_includeAssetsImportedByServer: globalContext.config.includeAssetsImportedByServer ?? true,
|
|
19
24
|
// TODO/soon: use GloablContext instead
|
|
20
|
-
_pageFilesAll: globalContext.
|
|
21
|
-
_pageConfigs: globalContext.
|
|
22
|
-
_pageConfigGlobal: globalContext.
|
|
23
|
-
_allPageIds: globalContext.
|
|
24
|
-
_pageRoutes: globalContext.
|
|
25
|
-
_onBeforeRouteHook: globalContext.
|
|
26
|
-
_globalContext: globalContext,
|
|
27
|
-
// TODO/now: add PageContext['globalContext']
|
|
28
|
-
/** @experimental This is a beta feature https://vike.dev/getGlobalContext */
|
|
29
|
-
globalContext: globalContext.globalContext_public,
|
|
25
|
+
_pageFilesAll: globalContext._pageFilesAll,
|
|
26
|
+
_pageConfigs: globalContext._pageConfigs,
|
|
27
|
+
_pageConfigGlobal: globalContext._pageConfigGlobal,
|
|
28
|
+
_allPageIds: globalContext._allPageIds,
|
|
29
|
+
_pageRoutes: globalContext._pageRoutes,
|
|
30
|
+
_onBeforeRouteHook: globalContext._onBeforeRouteHook,
|
|
30
31
|
_pageContextInit: pageContextInit,
|
|
31
32
|
_urlRewrite: null,
|
|
32
33
|
_urlHandler: urlHandler,
|
|
@@ -52,7 +53,7 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
|
|
|
52
53
|
}
|
|
53
54
|
objectAssign(pageContextCreated, { headers });
|
|
54
55
|
}
|
|
55
|
-
const pageContextAugmented = await createPageContextShared(pageContextCreated, globalContext.
|
|
56
|
+
const pageContextAugmented = await createPageContextShared(pageContextCreated, globalContext._pageConfigGlobal);
|
|
56
57
|
augmentType(pageContextCreated, pageContextAugmented);
|
|
57
58
|
return pageContextCreated;
|
|
58
59
|
}
|
|
@@ -5,7 +5,7 @@ import { type Hook } from '../../../shared/hooks/getHook.js';
|
|
|
5
5
|
import type { PageAsset } from './getPageAssets.js';
|
|
6
6
|
import { type PageContextForUserConsumptionServerSide } from './preparePageContextForUserConsumptionServerSide.js';
|
|
7
7
|
import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
|
|
8
|
-
import type { PageContextSerialization } from '../html/
|
|
8
|
+
import type { PageContextSerialization } from '../html/serializeContext.js';
|
|
9
9
|
type GetPageAssets = () => Promise<PageAsset[]>;
|
|
10
10
|
type RenderHook = Hook & {
|
|
11
11
|
hookName: HookName;
|
|
@@ -11,12 +11,12 @@ const globalObject = getGlobalObject('renderPage/getPageAssets.ts', {
|
|
|
11
11
|
});
|
|
12
12
|
async function getPageAssets(pageContext, clientDependencies, clientEntries) {
|
|
13
13
|
const globalContext = pageContext._globalContext;
|
|
14
|
-
const { isProduction } = globalContext;
|
|
14
|
+
const { _isProduction: isProduction } = globalContext;
|
|
15
15
|
const isDev = !isProduction;
|
|
16
16
|
let assetUrls;
|
|
17
17
|
let clientEntriesSrc;
|
|
18
18
|
if (isDev) {
|
|
19
|
-
const { viteDevServer } = globalContext;
|
|
19
|
+
const { _viteDevServer: viteDevServer } = globalContext;
|
|
20
20
|
clientEntriesSrc = await Promise.all(clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer)));
|
|
21
21
|
assetUrls = await retrieveAssetsDev(clientDependencies, viteDevServer);
|
|
22
22
|
}
|
|
@@ -9,7 +9,7 @@ async function handleErrorWithoutErrorPage(pageContext) {
|
|
|
9
9
|
assert(pageContext.errorWhileRendering || pageContext.is404);
|
|
10
10
|
{
|
|
11
11
|
const isV1 = pageContext._pageConfigs.length > 0;
|
|
12
|
-
await warnMissingErrorPage(isV1, pageContext._globalContext.
|
|
12
|
+
await warnMissingErrorPage(isV1, pageContext._globalContext._isProduction);
|
|
13
13
|
}
|
|
14
14
|
if (!pageContext.isClientSideNavigation) {
|
|
15
15
|
const httpResponse = createHttpResponseError(pageContext);
|
|
@@ -12,7 +12,7 @@ async function loadUserFilesServerSide(pageContext) {
|
|
|
12
12
|
const pageConfig = findPageConfig(pageContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig?
|
|
13
13
|
const globalContext = pageContext._globalContext;
|
|
14
14
|
const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
|
|
15
|
-
loadPageUserFiles(pageContext._pageFilesAll, pageConfig, globalContext.
|
|
15
|
+
loadPageUserFiles(pageContext._pageFilesAll, pageConfig, globalContext._pageConfigGlobal, pageContext.pageId, !globalContext._isProduction),
|
|
16
16
|
analyzePageClientSideInit(pageContext._pageFilesAll, pageContext.pageId, { sharedPageFilesAlreadyLoaded: true })
|
|
17
17
|
]);
|
|
18
18
|
const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await analyzePage(pageContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
|
|
@@ -13,7 +13,7 @@ async function log404(pageContext) {
|
|
|
13
13
|
*/
|
|
14
14
|
);
|
|
15
15
|
const globalContext = pageContext._globalContext;
|
|
16
|
-
if (!globalContext.
|
|
16
|
+
if (!globalContext._isProduction && !isFileRequest(urlPathname) && !pageContext.isClientSideNavigation) {
|
|
17
17
|
const routesInfo = getRoutesInfo(pageRoutes);
|
|
18
18
|
let msg = `URL ${pc.cyan(urlPathname)} ${noRouteMatch}`;
|
|
19
19
|
const outro = 'See https://vike.dev/routing for more information about routing.';
|
package/dist/esm/node/runtime/renderPage/preparePageContextForUserConsumptionServerSide.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { PageContextUrlInternal } from '../../../shared/getPageContextUrlCompute
|
|
|
4
4
|
import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
|
|
5
5
|
import type { PageConfigUserFriendlyOld } from '../../../shared/page-configs/getPageConfigUserFriendly.js';
|
|
6
6
|
import { PageContextBuiltInServerInternal } from '../../../shared/types.js';
|
|
7
|
-
import type { GlobalContextInternal,
|
|
7
|
+
import type { GlobalContextInternal, GlobalContextServer } from '../globalContext.js';
|
|
8
8
|
type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal & PageConfigUserFriendlyOld & {
|
|
9
9
|
urlOriginal: string;
|
|
10
10
|
/** @deprecated */
|
|
@@ -19,6 +19,6 @@ type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal
|
|
|
19
19
|
isClientSideNavigation: boolean;
|
|
20
20
|
pageProps?: Record<string, unknown>;
|
|
21
21
|
_globalContext: GlobalContextInternal;
|
|
22
|
-
globalContext:
|
|
22
|
+
globalContext: GlobalContextServer;
|
|
23
23
|
} & Record<string, unknown>;
|
|
24
24
|
declare function preparePageContextForUserConsumptionServerSide(pageContext: PageContextForUserConsumptionServerSide): void;
|
|
@@ -35,6 +35,99 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
|
|
|
35
35
|
url?: string;
|
|
36
36
|
headers?: Record<string, string>;
|
|
37
37
|
} & {
|
|
38
|
+
globalContext: import("../globalContext.js").GlobalContextServer;
|
|
39
|
+
_globalContext: {
|
|
40
|
+
_virtualFileExports: unknown;
|
|
41
|
+
_pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
42
|
+
_pageConfigs: import("../../../__internal/index.js").PageConfig[];
|
|
43
|
+
_pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
44
|
+
_allPageIds: string[];
|
|
45
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
46
|
+
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
47
|
+
} & ({
|
|
48
|
+
_isProduction: false;
|
|
49
|
+
_isPrerendering: false;
|
|
50
|
+
assetsManifest: null;
|
|
51
|
+
_viteDevServer: import("vite").ViteDevServer;
|
|
52
|
+
viteConfig: import("vite").ResolvedConfig;
|
|
53
|
+
viteConfigRuntime: {
|
|
54
|
+
root: string;
|
|
55
|
+
build: {
|
|
56
|
+
outDir: string;
|
|
57
|
+
};
|
|
58
|
+
_baseViteOriginal: string;
|
|
59
|
+
vitePluginServerEntry: {
|
|
60
|
+
inject: boolean | undefined;
|
|
61
|
+
};
|
|
62
|
+
};
|
|
63
|
+
baseServer: string;
|
|
64
|
+
baseAssets: string;
|
|
65
|
+
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
66
|
+
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
67
|
+
_virtualFileExports: unknown;
|
|
68
|
+
_pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
69
|
+
_pageConfigs: import("../../../__internal/index.js").PageConfig[];
|
|
70
|
+
_pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
71
|
+
_allPageIds: string[];
|
|
72
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
73
|
+
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
74
|
+
} | {
|
|
75
|
+
_isPrerendering: true;
|
|
76
|
+
viteConfig: import("vite").ResolvedConfig;
|
|
77
|
+
_isProduction: true;
|
|
78
|
+
assetsManifest: import("../../shared/ViteManifest.js").ViteManifest;
|
|
79
|
+
_viteDevServer: null;
|
|
80
|
+
viteConfigRuntime: {
|
|
81
|
+
root: string;
|
|
82
|
+
build: {
|
|
83
|
+
outDir: string;
|
|
84
|
+
};
|
|
85
|
+
_baseViteOriginal: string;
|
|
86
|
+
vitePluginServerEntry: {
|
|
87
|
+
inject: boolean | undefined;
|
|
88
|
+
};
|
|
89
|
+
};
|
|
90
|
+
_usesClientRouter: boolean;
|
|
91
|
+
baseServer: string;
|
|
92
|
+
baseAssets: string;
|
|
93
|
+
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
94
|
+
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
95
|
+
_virtualFileExports: unknown;
|
|
96
|
+
_pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
97
|
+
_pageConfigs: import("../../../__internal/index.js").PageConfig[];
|
|
98
|
+
_pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
99
|
+
_allPageIds: string[];
|
|
100
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
101
|
+
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
102
|
+
} | {
|
|
103
|
+
_isPrerendering: false;
|
|
104
|
+
viteConfig: null;
|
|
105
|
+
_isProduction: true;
|
|
106
|
+
assetsManifest: import("../../shared/ViteManifest.js").ViteManifest;
|
|
107
|
+
_viteDevServer: null;
|
|
108
|
+
viteConfigRuntime: {
|
|
109
|
+
root: string;
|
|
110
|
+
build: {
|
|
111
|
+
outDir: string;
|
|
112
|
+
};
|
|
113
|
+
_baseViteOriginal: string;
|
|
114
|
+
vitePluginServerEntry: {
|
|
115
|
+
inject: boolean | undefined;
|
|
116
|
+
};
|
|
117
|
+
};
|
|
118
|
+
_usesClientRouter: boolean;
|
|
119
|
+
baseServer: string;
|
|
120
|
+
baseAssets: string;
|
|
121
|
+
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
122
|
+
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
123
|
+
_virtualFileExports: unknown;
|
|
124
|
+
_pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
125
|
+
_pageConfigs: import("../../../__internal/index.js").PageConfig[];
|
|
126
|
+
_pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
127
|
+
_allPageIds: string[];
|
|
128
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
129
|
+
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
130
|
+
});
|
|
38
131
|
_baseServer: string;
|
|
39
132
|
_baseAssets: string;
|
|
40
133
|
_includeAssetsImportedByServer: boolean;
|
|
@@ -44,38 +137,6 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
|
|
|
44
137
|
_allPageIds: string[];
|
|
45
138
|
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
46
139
|
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
47
|
-
_globalContext: import("../globalContext.js").GlobalContextInternal;
|
|
48
|
-
globalContext: Pick<{
|
|
49
|
-
viteConfigRuntime: import("../../plugin/shared/getViteConfigRuntime.js").ViteConfigRuntime;
|
|
50
|
-
config: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigUserFriendly["config"];
|
|
51
|
-
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
52
|
-
} & import("../../shared/resolveBase.js").BaseUrlsResolved & ({
|
|
53
|
-
pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
54
|
-
pageConfigs: import("../../../__internal/index.js").PageConfig[];
|
|
55
|
-
pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
56
|
-
allPageIds: string[];
|
|
57
|
-
pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
58
|
-
onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
59
|
-
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
60
|
-
config: import("../../../types/index.js").ConfigResolved;
|
|
61
|
-
} & ({
|
|
62
|
-
isProduction: false;
|
|
63
|
-
isPrerendering: false;
|
|
64
|
-
viteConfig: import("vite").ResolvedConfig;
|
|
65
|
-
viteDevServer: import("vite").ViteDevServer;
|
|
66
|
-
assetsManifest: null;
|
|
67
|
-
} | ({
|
|
68
|
-
isProduction: true;
|
|
69
|
-
assetsManifest: import("../../shared/ViteManifest.js").ViteManifest;
|
|
70
|
-
viteDevServer: null;
|
|
71
|
-
} & ({
|
|
72
|
-
isPrerendering: false;
|
|
73
|
-
viteConfig: null;
|
|
74
|
-
} | {
|
|
75
|
-
isPrerendering: true;
|
|
76
|
-
usesClientRouter: boolean;
|
|
77
|
-
viteConfig: import("vite").ResolvedConfig;
|
|
78
|
-
})))), "pages" | "baseServer" | "baseAssets" | "config" | "assetsManifest" | "viteConfig" | "viteConfigRuntime">;
|
|
79
140
|
_pageContextInit: import("../renderPage.js").PageContextInit;
|
|
80
141
|
_urlRewrite: null;
|
|
81
142
|
_urlHandler: ((url: string) => string) | null;
|
|
@@ -121,6 +182,99 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
|
|
|
121
182
|
url?: string;
|
|
122
183
|
headers?: Record<string, string>;
|
|
123
184
|
} & {
|
|
185
|
+
globalContext: import("../globalContext.js").GlobalContextServer;
|
|
186
|
+
_globalContext: {
|
|
187
|
+
_virtualFileExports: unknown;
|
|
188
|
+
_pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
189
|
+
_pageConfigs: import("../../../__internal/index.js").PageConfig[];
|
|
190
|
+
_pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
191
|
+
_allPageIds: string[];
|
|
192
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
193
|
+
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
194
|
+
} & ({
|
|
195
|
+
_isProduction: false;
|
|
196
|
+
_isPrerendering: false;
|
|
197
|
+
assetsManifest: null;
|
|
198
|
+
_viteDevServer: import("vite").ViteDevServer;
|
|
199
|
+
viteConfig: import("vite").ResolvedConfig;
|
|
200
|
+
viteConfigRuntime: {
|
|
201
|
+
root: string;
|
|
202
|
+
build: {
|
|
203
|
+
outDir: string;
|
|
204
|
+
};
|
|
205
|
+
_baseViteOriginal: string;
|
|
206
|
+
vitePluginServerEntry: {
|
|
207
|
+
inject: boolean | undefined;
|
|
208
|
+
};
|
|
209
|
+
};
|
|
210
|
+
baseServer: string;
|
|
211
|
+
baseAssets: string;
|
|
212
|
+
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
213
|
+
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
214
|
+
_virtualFileExports: unknown;
|
|
215
|
+
_pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
216
|
+
_pageConfigs: import("../../../__internal/index.js").PageConfig[];
|
|
217
|
+
_pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
218
|
+
_allPageIds: string[];
|
|
219
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
220
|
+
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
221
|
+
} | {
|
|
222
|
+
_isPrerendering: true;
|
|
223
|
+
viteConfig: import("vite").ResolvedConfig;
|
|
224
|
+
_isProduction: true;
|
|
225
|
+
assetsManifest: import("../../shared/ViteManifest.js").ViteManifest;
|
|
226
|
+
_viteDevServer: null;
|
|
227
|
+
viteConfigRuntime: {
|
|
228
|
+
root: string;
|
|
229
|
+
build: {
|
|
230
|
+
outDir: string;
|
|
231
|
+
};
|
|
232
|
+
_baseViteOriginal: string;
|
|
233
|
+
vitePluginServerEntry: {
|
|
234
|
+
inject: boolean | undefined;
|
|
235
|
+
};
|
|
236
|
+
};
|
|
237
|
+
_usesClientRouter: boolean;
|
|
238
|
+
baseServer: string;
|
|
239
|
+
baseAssets: string;
|
|
240
|
+
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
241
|
+
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
242
|
+
_virtualFileExports: unknown;
|
|
243
|
+
_pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
244
|
+
_pageConfigs: import("../../../__internal/index.js").PageConfig[];
|
|
245
|
+
_pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
246
|
+
_allPageIds: string[];
|
|
247
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
248
|
+
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
249
|
+
} | {
|
|
250
|
+
_isPrerendering: false;
|
|
251
|
+
viteConfig: null;
|
|
252
|
+
_isProduction: true;
|
|
253
|
+
assetsManifest: import("../../shared/ViteManifest.js").ViteManifest;
|
|
254
|
+
_viteDevServer: null;
|
|
255
|
+
viteConfigRuntime: {
|
|
256
|
+
root: string;
|
|
257
|
+
build: {
|
|
258
|
+
outDir: string;
|
|
259
|
+
};
|
|
260
|
+
_baseViteOriginal: string;
|
|
261
|
+
vitePluginServerEntry: {
|
|
262
|
+
inject: boolean | undefined;
|
|
263
|
+
};
|
|
264
|
+
};
|
|
265
|
+
_usesClientRouter: boolean;
|
|
266
|
+
baseServer: string;
|
|
267
|
+
baseAssets: string;
|
|
268
|
+
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
269
|
+
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
270
|
+
_virtualFileExports: unknown;
|
|
271
|
+
_pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
272
|
+
_pageConfigs: import("../../../__internal/index.js").PageConfig[];
|
|
273
|
+
_pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
274
|
+
_allPageIds: string[];
|
|
275
|
+
config: import("../../../types/index.js").ConfigResolved;
|
|
276
|
+
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
277
|
+
});
|
|
124
278
|
_baseServer: string;
|
|
125
279
|
_baseAssets: string;
|
|
126
280
|
_includeAssetsImportedByServer: boolean;
|
|
@@ -130,38 +284,6 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
|
|
|
130
284
|
_allPageIds: string[];
|
|
131
285
|
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
132
286
|
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
133
|
-
_globalContext: import("../globalContext.js").GlobalContextInternal;
|
|
134
|
-
globalContext: Pick<{
|
|
135
|
-
viteConfigRuntime: import("../../plugin/shared/getViteConfigRuntime.js").ViteConfigRuntime;
|
|
136
|
-
config: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigUserFriendly["config"];
|
|
137
|
-
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
138
|
-
} & import("../../shared/resolveBase.js").BaseUrlsResolved & ({
|
|
139
|
-
pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
140
|
-
pageConfigs: import("../../../__internal/index.js").PageConfig[];
|
|
141
|
-
pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
|
|
142
|
-
allPageIds: string[];
|
|
143
|
-
pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
144
|
-
onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
145
|
-
pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
|
|
146
|
-
config: import("../../../types/index.js").ConfigResolved;
|
|
147
|
-
} & ({
|
|
148
|
-
isProduction: false;
|
|
149
|
-
isPrerendering: false;
|
|
150
|
-
viteConfig: import("vite").ResolvedConfig;
|
|
151
|
-
viteDevServer: import("vite").ViteDevServer;
|
|
152
|
-
assetsManifest: null;
|
|
153
|
-
} | ({
|
|
154
|
-
isProduction: true;
|
|
155
|
-
assetsManifest: import("../../shared/ViteManifest.js").ViteManifest;
|
|
156
|
-
viteDevServer: null;
|
|
157
|
-
} & ({
|
|
158
|
-
isPrerendering: false;
|
|
159
|
-
viteConfig: null;
|
|
160
|
-
} | {
|
|
161
|
-
isPrerendering: true;
|
|
162
|
-
usesClientRouter: boolean;
|
|
163
|
-
viteConfig: import("vite").ResolvedConfig;
|
|
164
|
-
})))), "pages" | "baseServer" | "baseAssets" | "config" | "assetsManifest" | "viteConfig" | "viteConfigRuntime">;
|
|
165
287
|
_pageContextInit: import("../renderPage.js").PageContextInit;
|
|
166
288
|
_urlRewrite: null;
|
|
167
289
|
_urlHandler: ((url: string) => string) | null;
|
|
@@ -3,7 +3,7 @@ export { prerenderPage };
|
|
|
3
3
|
import { getErrorPageId } from '../../../shared/error-page.js';
|
|
4
4
|
import { getHtmlString } from '../html/renderHtml.js';
|
|
5
5
|
import { assert, assertUsage, hasProp, objectAssign } from '../utils.js';
|
|
6
|
-
import {
|
|
6
|
+
import { getPageContextClientSerialized } from '../html/serializeContext.js';
|
|
7
7
|
import { createHttpResponsePage, createHttpResponsePageContextJson } from './createHttpResponse.js';
|
|
8
8
|
import { loadUserFilesServerSide } from './loadUserFilesServerSide.js';
|
|
9
9
|
import { executeOnRenderHtmlHook } from './executeOnRenderHtmlHook.js';
|
|
@@ -42,7 +42,7 @@ async function renderPageAlreadyRouted(pageContext) {
|
|
|
42
42
|
if (isError) {
|
|
43
43
|
objectAssign(pageContext, { [isServerSideError]: true });
|
|
44
44
|
}
|
|
45
|
-
const pageContextSerialized =
|
|
45
|
+
const pageContextSerialized = getPageContextClientSerialized(pageContext);
|
|
46
46
|
const httpResponse = await createHttpResponsePageContextJson(pageContextSerialized);
|
|
47
47
|
objectAssign(pageContext, { httpResponse });
|
|
48
48
|
return pageContext;
|
|
@@ -72,7 +72,7 @@ async function prerenderPage(pageContext) {
|
|
|
72
72
|
return { documentHtml, pageContextSerialized: null, pageContext };
|
|
73
73
|
}
|
|
74
74
|
else {
|
|
75
|
-
const pageContextSerialized =
|
|
75
|
+
const pageContextSerialized = getPageContextClientSerialized(pageContext);
|
|
76
76
|
return { documentHtml, pageContextSerialized, pageContext };
|
|
77
77
|
}
|
|
78
78
|
}
|