vike 0.4.228 → 0.4.229

package/dist/cjs/node/runtime/index-deprecated.js

@@ -1,6 +1,4 @@
 "use strict";
-// TODO/v1-release: replace this with:
-// assertUsage(false, "`import { something } from 'vike'` doesn't exist: instead import from 'vike/server', 'vike/client', 'vike/plugin', ...")
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -19,44 +17,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RenderErrorPage = void 0;
-const isBrowser_js_1 = require("../../utils/isBrowser.js");
-const assert_js_1 = require("../../utils/assert.js");
-(0, assert_js_1.assertUsage)(!(0, isBrowser_js_1.isBrowser)(), "It's forbidden to `import { something } from 'vike'` on the client-side: the module 'vike' is a server-only module.", { showStackTrace: true });
-__exportStar(require("./index-common.js"), exports);
-__exportStar(require("../../types/index-dreprecated.js"), exports);
+// TODO/soon: point package.json#exports['./server'] to this file.
+// - Write migration guide, see comment below.
+__exportStar(require("./index.js"), exports);
 const utils_js_1 = require("./utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const abort_js_1 = require("../../shared/route/abort.js");
-/** @deprecated
- * Replace:
- *   ```
- *   import { RenderErrorPage } from 'vike'
- *   ```
- * With:
- *   ```
- *   import { render } from 'vike/abort'
- *   ```
- *
- * See https://vike.dev/render
- */
-const RenderErrorPage = (...args) => {
-    (0, utils_js_1.assertWarning)(false, [
-        'Replace:',
-        picocolors_1.default.red("  import { RenderErrorPage } from 'vike'"),
-        'With:',
-        picocolors_1.default.green("  import { render } from 'vike/abort'"),
-        'See https://vike.dev/render'
-    ].join('\n'), { onlyOnce: true, showStackTrace: true });
-    return (0, abort_js_1.RenderErrorPage)(...args);
-};
-exports.RenderErrorPage = RenderErrorPage;
 (0, utils_js_1.assertWarning)(false, [
-    'You have following imports which are outdated:',
-    picocolors_1.default.red("  import { something } from 'vike'"),
+    'You have outdated imports:',
+    picocolors_1.default.bold(picocolors_1.default.red("  import { something } from 'vike/server'")),
     'Replace them with:',
-    picocolors_1.default.green("  import { something } from 'vike/server'"),
-    `Or if ${picocolors_1.default.cyan('something')} is a type:`,
-    picocolors_1.default.green("  import type { something } from 'vike/types'"),
-    "Make sure to import renderPage(), escapeInject, html, dangerouslySkipEscape(), pipeWebStream(), pipeNodeStream(), pipeStream(), stampPipe() from 'vike/server'. (Or inspect the error stack below to find the import causing this warning.)"
+    picocolors_1.default.bold(picocolors_1.default.green("  import { something } from 'vike'"))
+    /* Add migration guide, with migration scritps such as `$ rename vike/server vike`
+    `See ${pc.underline('https://vike.dev/migration/0.4.xxx')}`
+    */
 ].join('\n'), { showStackTrace: true, onlyOnce: true });

package/dist/cjs/node/runtime/index.js

@@ -13,8 +13,62 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RenderErrorPage = exports.createPageRenderer = exports._injectAssets = exports.createDevMiddleware = exports.getGlobalContextAsync = exports.getGlobalContextSync = exports.getGlobalContext = exports.version = exports.stampPipe = exports.pipeStream = exports.pipeNodeStream = exports.pipeWebStream = exports.dangerouslySkipEscape = exports.escapeInject = exports.renderPage = void 0;
 const isBrowser_js_1 = require("../../utils/isBrowser.js");
 const assert_js_1 = require("../../utils/assert.js");
-(0, assert_js_1.assertUsage)(!(0, isBrowser_js_1.isBrowser)(), "It's forbidden to `import { something } from 'vike/server'` on the client-side: the module 'vike/server' is a server-only module.", { showStackTrace: true });
-__exportStar(require("./index-common.js"), exports);
+(0, assert_js_1.assert)(!(0, isBrowser_js_1.isBrowser)());
+var renderPage_js_1 = require("./renderPage.js");
+Object.defineProperty(exports, "renderPage", { enumerable: true, get: function () { return renderPage_js_1.renderPage; } });
+var renderHtml_js_1 = require("./html/renderHtml.js");
+Object.defineProperty(exports, "escapeInject", { enumerable: true, get: function () { return renderHtml_js_1.escapeInject; } });
+Object.defineProperty(exports, "dangerouslySkipEscape", { enumerable: true, get: function () { return renderHtml_js_1.dangerouslySkipEscape; } });
+var stream_js_1 = require("./html/stream.js");
+Object.defineProperty(exports, "pipeWebStream", { enumerable: true, get: function () { return stream_js_1.pipeWebStream; } });
+Object.defineProperty(exports, "pipeNodeStream", { enumerable: true, get: function () { return stream_js_1.pipeNodeStream; } });
+Object.defineProperty(exports, "pipeStream", { enumerable: true, get: function () { return stream_js_1.pipeStream; } });
+Object.defineProperty(exports, "stampPipe", { enumerable: true, get: function () { return stream_js_1.stampPipe; } });
+var utils_js_1 = require("./utils.js");
+Object.defineProperty(exports, "version", { enumerable: true, get: function () { return utils_js_1.PROJECT_VERSION; } });
+var globalContext_js_1 = require("./globalContext.js");
+Object.defineProperty(exports, "getGlobalContext", { enumerable: true, get: function () { return globalContext_js_1.getGlobalContext; } });
+Object.defineProperty(exports, "getGlobalContextSync", { enumerable: true, get: function () { return globalContext_js_1.getGlobalContextSync; } });
+Object.defineProperty(exports, "getGlobalContextAsync", { enumerable: true, get: function () { return globalContext_js_1.getGlobalContextAsync; } });
+var index_js_1 = require("../runtime-dev/index.js");
+Object.defineProperty(exports, "createDevMiddleware", { enumerable: true, get: function () { return index_js_1.createDevMiddleware; } });
+// TODO/v1-release: remove
+// Deprecated exports
+__exportStar(require("../../types/index-dreprecated.js"), exports);
+var injectAssets__public_js_1 = require("./html/injectAssets/injectAssets__public.js");
+Object.defineProperty(exports, "_injectAssets", { enumerable: true, get: function () { return injectAssets__public_js_1.injectAssets__public; } });
+var createPageRenderer_js_1 = require("../createPageRenderer.js");
+Object.defineProperty(exports, "createPageRenderer", { enumerable: true, get: function () { return createPageRenderer_js_1.createPageRenderer; } });
+const utils_js_2 = require("./utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const abort_js_1 = require("../../shared/route/abort.js");
+/** @deprecated
+ * Replace:
+ *   ```
+ *   import { RenderErrorPage } from 'vike'
+ *   ```
+ * With:
+ *   ```
+ *   import { render } from 'vike/abort'
+ *   ```
+ *
+ * See https://vike.dev/render
+ */
+const RenderErrorPage = (...args) => {
+    (0, utils_js_2.assertWarning)(false, [
+        'Replace:',
+        picocolors_1.default.red("  import { RenderErrorPage } from 'vike'"),
+        'With:',
+        picocolors_1.default.green("  import { render } from 'vike/abort'"),
+        'See https://vike.dev/render'
+    ].join('\n'), { onlyOnce: true, showStackTrace: true });
+    return (0, abort_js_1.RenderErrorPage)(...args);
+};
+exports.RenderErrorPage = RenderErrorPage;

package/dist/cjs/node/runtime/renderPage/analyzePage.js

@@ -22,7 +22,7 @@ async function analyzePage(pageFilesAll, pageConfig, pageId, globalContext) {
             eagerlyImported: false
         });
         // In production we inject the import of the server virtual module with ?extractAssets inside the client virtual module
-        if (!globalContext.isProduction) {
+        if (!globalContext._isProduction) {
             clientDependencies.push({
                 id: (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageConfig.pageId, false),
                 onlyAssets: true,

package/dist/cjs/node/runtime/renderPage/createHttpResponse.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createHttpResponsePage = createHttpResponsePage;
 exports.createHttpResponsePageContextJson = createHttpResponsePageContextJson;
 exports.createHttpResponseError = createHttpResponseError;
+exports.createHttpResponseErrorWithoutGlobalContext = createHttpResponseErrorWithoutGlobalContext;
 exports.createHttpResponseRedirect = createHttpResponseRedirect;
 exports.createHttpResponseFavicon404 = createHttpResponseFavicon404;
 exports.createHttpResponseBaseIsMissing = createHttpResponseBaseIsMissing;
@@ -66,9 +67,6 @@ function createHttpResponseBaseIsMissing(urlOriginal, baseServer) {
 }
 function createHttpResponseError(pageContext) {
     const reason = (() => {
-        if (!pageContext) {
-            return 'no error page (https://vike.dev/error-page) could be rendered';
-        }
         const errorPageId = (0, error_page_js_1.getErrorPageId)(pageContext._pageFilesAll, pageContext._pageConfigs);
         if (errorPageId) {
             return "the error page (https://vike.dev/error-page) couldn't be rendered (for example if an error occurred while rendering the error page)";
@@ -77,6 +75,13 @@ function createHttpResponseError(pageContext) {
             return 'no error page (https://vike.dev/error-page) is defined, make sure to create one';
         }
     })();
+    return createHttpResponseError_(reason);
+}
+function createHttpResponseErrorWithoutGlobalContext() {
+    const reason = 'no error page (https://vike.dev/error-page) could be rendered';
+    return createHttpResponseError_(reason);
+}
+function createHttpResponseError_(reason) {
     const httpResponse = createHttpResponse(500, 'text/html;charset=utf-8', [], `<p>An error occurred.</p><script>console.log(${JSON.stringify(`This HTTP response was generated by Vike. Vike returned this response because ${reason}.`)})</script>`);
     return httpResponse;
 }

package/dist/cjs/node/runtime/renderPage/createPageContextServerSide.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createPageContextServerSide = createPageContextServerSide;
+exports.createPageContextServerSideWithoutGlobalContext = createPageContextServerSideWithoutGlobalContext;
+const utils_js_1 = require("../utils.js");
+const getPageContextUrlComputed_js_1 = require("../../../shared/getPageContextUrlComputed.js");
+const createPageContextShared_js_1 = require("../../../shared/createPageContextShared.js");
+async function createPageContextServerSide(pageContextInit, globalContext, globalObject_public, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
+    urlHandler: null,
+    isClientSideNavigation: false
+} }) {
+    (0, utils_js_1.assert)(pageContextInit.urlOriginal);
+    const pageContextCreated = createPageContext(pageContextInit, isPrerendering);
+    (0, utils_js_1.objectAssign)(pageContextCreated, {
+        /* Don't spread globalContext for now? Or never spread it as it leads to confusion? The convenience isn't worth the added confusion?
+        // We must use Flatten<T> otherwise TypeScript complains upon assigning types
+        ...(globalContext as Flatten<typeof globalContext>), // least precedence
+        */
+        globalContext: globalObject_public,
+        _globalContext: globalContext,
+        // The following is defined on `pageContext` because we can eventually make these non-global
+        _baseServer: globalContext.baseServer,
+        _baseAssets: globalContext.baseAssets,
+        // TODO/now: add meta.default
+        _includeAssetsImportedByServer: globalContext.config.includeAssetsImportedByServer ?? true,
+        // TODO/soon: use GloablContext instead
+        _pageFilesAll: globalContext._pageFilesAll,
+        _pageConfigs: globalContext._pageConfigs,
+        _pageConfigGlobal: globalContext._pageConfigGlobal,
+        _allPageIds: globalContext._allPageIds,
+        _pageRoutes: globalContext._pageRoutes,
+        _onBeforeRouteHook: globalContext._onBeforeRouteHook,
+        _pageContextInit: pageContextInit,
+        _urlRewrite: null,
+        _urlHandler: urlHandler,
+        isClientSideNavigation
+    });
+    // pageContext.urlParsed
+    const pageContextUrlComputed = (0, getPageContextUrlComputed_js_1.getPageContextUrlComputed)(pageContextCreated);
+    (0, utils_js_1.objectAssign)(pageContextCreated, pageContextUrlComputed);
+    // pageContext.headers
+    {
+        let headers;
+        if (pageContextInit.headersOriginal) {
+            headers = (0, utils_js_1.normalizeHeaders)(pageContextInit.headersOriginal);
+            (0, utils_js_1.assertUsage)(!('headers' in pageContextInit), "You're defining pageContextInit.headersOriginal as well as pageContextInit.headers but you should only define pageContextInit.headersOriginal instead, see https://vike.dev/headers");
+        }
+        else if (pageContextInit.headers) {
+            headers = pageContextInit.headers;
+            // TODO/next-major-release: remove
+            (0, utils_js_1.assertWarning)(false, 'Setting pageContextInit.headers is deprecated: set pageContextInit.headersOriginal instead, see https://vike.dev/headers', { onlyOnce: true });
+        }
+        else {
+            headers = null;
+        }
+        (0, utils_js_1.objectAssign)(pageContextCreated, { headers });
+    }
+    const pageContextAugmented = await (0, createPageContextShared_js_1.createPageContextShared)(pageContextCreated, globalContext._pageConfigGlobal);
+    (0, utils_js_1.augmentType)(pageContextCreated, pageContextAugmented);
+    return pageContextCreated;
+}
+function createPageContextServerSideWithoutGlobalContext(pageContextInit) {
+    const pageContext = createPageContext(pageContextInit, false);
+    return pageContext;
+}
+function createPageContext(pageContextInit, isPrerendering) {
+    const pageContext = {
+        isClientSide: false,
+        isPrerendering
+    };
+    (0, utils_js_1.objectAssign)(pageContext, pageContextInit);
+    return pageContext;
+}

package/dist/cjs/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.js

@@ -9,8 +9,8 @@ async function executeOnBeforeRenderAndDataHooks(pageContext) {
     if (pageContext._pageContextAlreadyProvidedByOnPrerenderHook) {
         return;
     }
-    const dataHook = (0, getHook_js_1.getHook)(pageContext, 'data');
-    const onBeforeRenderHook = (0, getHook_js_1.getHook)(pageContext, 'onBeforeRender');
+    const dataHook = (0, getHook_js_1.getHookFromPageContext)(pageContext, 'data');
+    const onBeforeRenderHook = (0, getHook_js_1.getHookFromPageContext)(pageContext, 'onBeforeRender');
     if (!dataHook && !onBeforeRenderHook) {
         return;
     }

package/dist/cjs/node/runtime/renderPage/executeOnRenderHtmlHook.js

@@ -41,12 +41,12 @@ function getRenderHook(pageContext) {
     {
         let hook;
         let hookName = undefined;
-        hook = (0, getHook_js_1.getHook)(pageContext, 'onRenderHtml');
+        hook = (0, getHook_js_1.getHookFromPageContext)(pageContext, 'onRenderHtml');
         if (hook) {
             hookName = 'onRenderHtml';
         }
         else {
-            hook = (0, getHook_js_1.getHook)(pageContext, 'render');
+            hook = (0, getHook_js_1.getHookFromPageContext)(pageContext, 'render');
             if (hook) {
                 hookName = 'render';
             }

package/dist/cjs/node/runtime/renderPage/getPageAssets/getManifestEntry.js

@@ -42,7 +42,7 @@ function getManifestEntry(id, assetsManifest) {
         return { manifestEntry, manifestKey };
     }
     // npm package import
-    (0, utils_js_1.assertIsNpmPackageImport)(id);
+    (0, utils_js_1.assertIsImportPathNpmPackage)(id);
     const found = Object.entries(assetsManifest).find(([, e]) => e.name === (0, prependEntriesDir_js_1.prependEntriesDir)(id));
     (0, utils_js_1.assert)(found);
     const [manifestKey, manifestEntry] = found;

package/dist/cjs/node/runtime/renderPage/getPageAssets/retrieveAssetsDev.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.retrieveAssetsDev = retrieveAssetsDev;
 const utils_js_1 = require("../../utils.js");
 async function retrieveAssetsDev(clientDependencies, viteDevServer) {
-    const visitedModules = new Set();
     const assetUrls = new Set();
     await Promise.all(clientDependencies.map(async ({ id }) => {
         if (id.startsWith('@@vike'))
@@ -22,7 +21,7 @@ async function retrieveAssetsDev(clientDependencies, viteDevServer) {
             return;
         }
         (0, utils_js_1.assert)(mod, { id });
-        collectCss(mod, assetUrls, visitedModules);
+        collectCss(mod, assetUrls, new Set());
     }));
     return Array.from(assetUrls);
 }
@@ -52,9 +51,6 @@ function collectCss(mod, styleUrls, visitedModules, importer) {
             // Is this useful? Maybe for virtual modules that don't respect the \0 virtual module convention?
             styleUrls.add(`/@id/${mod.url}`);
         }
-        /* Debug:
-        logModule(mod)
-        //*/
     }
     mod.importedModules.forEach((dep) => {
         collectCss(dep, styleUrls, visitedModules, mod);
@@ -69,15 +65,3 @@ function isStyle(mod) {
         // CSS of .vue files
         (mod.id && /\?vue&type=style/.test(mod.id)));
 }
-/*
-function logModule(mod: ModuleNode) {
-  const redacted = 'redacted'
-  console.log({
-    ...mod,
-    ssrModule: redacted,
-    ssrTransformResult: redacted,
-    importedModules: redacted,
-    importers: redacted
-  })
-}
-//*/

package/dist/cjs/node/runtime/renderPage/getPageAssets/retrieveAssetsProd.js

@@ -16,7 +16,7 @@ function retrieveAssetsProd(clientDependencies, assetsManifest, includeAssetsImp
             onlyAssets &&
             id.includes('.page.server.') &&
             // We assume that all npm packages have already built their files: bundlers (Rollup, esbuild, tsup, ...) extract the CSS out of JavaScript => we can assume JavaScript to not import any CSS/assets.
-            !(0, utils_js_1.isNpmPackageImport)(id, {
+            !(0, utils_js_1.isImportPathNpmPackage)(id, {
                 // I presume Vite already resolves path aliases when Vite sets the module's id
                 cannotBePathAlias: true
             })) {

package/dist/cjs/node/runtime/renderPage/getPageAssets.js

@@ -13,12 +13,12 @@ const globalObject = (0, utils_js_1.getGlobalObject)('renderPage/getPageAssets.t
 });
 async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const globalContext = pageContext._globalContext;
-    const { isProduction } = globalContext;
+    const { _isProduction: isProduction } = globalContext;
     const isDev = !isProduction;
     let assetUrls;
     let clientEntriesSrc;
     if (isDev) {
-        const { viteDevServer } = globalContext;
+        const { _viteDevServer: viteDevServer } = globalContext;
         clientEntriesSrc = await Promise.all(clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer)));
         assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
     }

package/dist/cjs/node/runtime/renderPage/handleErrorWithoutErrorPage.js

@@ -14,7 +14,7 @@ async function handleErrorWithoutErrorPage(pageContext) {
     (0, utils_js_1.assert)(pageContext.errorWhileRendering || pageContext.is404);
     {
         const isV1 = pageContext._pageConfigs.length > 0;
-        await warnMissingErrorPage(isV1, pageContext._globalContext.isProduction);
+        await warnMissingErrorPage(isV1, pageContext._globalContext._isProduction);
     }
     if (!pageContext.isClientSideNavigation) {
         const httpResponse = (0, createHttpResponse_js_1.createHttpResponseError)(pageContext);

package/dist/cjs/node/runtime/renderPage/loadUserFilesServerSide.js

@@ -14,7 +14,7 @@ async function loadUserFilesServerSide(pageContext) {
     const pageConfig = (0, findPageConfig_js_1.findPageConfig)(pageContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig?
     const globalContext = pageContext._globalContext;
     const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
-        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, globalContext.pageConfigGlobal, pageContext.pageId, !globalContext.isProduction),
+        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, globalContext._pageConfigGlobal, pageContext.pageId, !globalContext._isProduction),
         (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._pageFilesAll, pageContext.pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
     const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await (0, analyzePage_js_1.analyzePage)(pageContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);

package/dist/cjs/node/runtime/renderPage/log404/index.js

@@ -17,7 +17,7 @@ async function log404(pageContext) {
     */
     );
     const globalContext = pageContext._globalContext;
-    if (!globalContext.isProduction && !isFileRequest(urlPathname) && !pageContext.isClientSideNavigation) {
+    if (!globalContext._isProduction && !isFileRequest(urlPathname) && !pageContext.isClientSideNavigation) {
         const routesInfo = getRoutesInfo(pageRoutes);
         let msg = `URL ${picocolors_1.default.cyan(urlPathname)} ${noRouteMatch_js_1.noRouteMatch}`;
         const outro = 'See https://vike.dev/routing for more information about routing.';

package/dist/cjs/node/runtime/renderPage/preparePageContextForUserConsumptionServerSide.js

@@ -9,7 +9,7 @@ function preparePageContextForUserConsumptionServerSide(pageContext) {
     (0, utils_js_1.assert)((0, utils_js_1.isPlainObject)(pageContext.routeParams));
     (0, utils_js_1.assert)('Page' in pageContext);
     (0, utils_js_1.assert)(typeof pageContext.isClientSideNavigation === 'boolean');
-    (0, utils_js_1.assert)(pageContext._isPageContextObject);
+    (0, utils_js_1.assert)(pageContext.isPageContext);
     (0, utils_js_1.assert)(pageContext.isClientSide === false);
     (0, utils_js_1.assert)(typeof pageContext.isPrerendering === 'boolean');
     (0, preparePageContextForUserConsumption_js_1.preparePageContextForUserConsumption)(pageContext);

package/dist/cjs/node/runtime/renderPage/renderPageAlreadyRouted.js

@@ -5,13 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderPageAlreadyRouted = renderPageAlreadyRouted;
 exports.prerenderPage = prerenderPage;
-exports.getPageContextInitEnhanced = getPageContextInitEnhanced;
-exports.createPageContext = createPageContext;
 const error_page_js_1 = require("../../../shared/error-page.js");
 const renderHtml_js_1 = require("../html/renderHtml.js");
 const utils_js_1 = require("../utils.js");
-const serializePageContextClientSide_js_1 = require("../html/serializePageContextClientSide.js");
-const getPageContextUrlComputed_js_1 = require("../../../shared/getPageContextUrlComputed.js");
+const serializeContext_js_1 = require("../html/serializeContext.js");
 const createHttpResponse_js_1 = require("./createHttpResponse.js");
 const loadUserFilesServerSide_js_1 = require("./loadUserFilesServerSide.js");
 const executeOnRenderHtmlHook_js_1 = require("./executeOnRenderHtmlHook.js");
@@ -50,7 +47,7 @@ async function renderPageAlreadyRouted(pageContext) {
         if (isError) {
             (0, utils_js_1.objectAssign)(pageContext, { [isServerSideError_js_1.isServerSideError]: true });
         }
-        const pageContextSerialized = (0, serializePageContextClientSide_js_1.serializePageContextClientSide)(pageContext);
+        const pageContextSerialized = (0, serializeContext_js_1.getPageContextClientSerialized)(pageContext);
         const httpResponse = await (0, createHttpResponse_js_1.createHttpResponsePageContextJson)(pageContextSerialized);
         (0, utils_js_1.objectAssign)(pageContext, { httpResponse });
         return pageContext;
@@ -80,69 +77,7 @@ async function prerenderPage(pageContext) {
         return { documentHtml, pageContextSerialized: null, pageContext };
     }
     else {
-        const pageContextSerialized = (0, serializePageContextClientSide_js_1.serializePageContextClientSide)(pageContext);
+        const pageContextSerialized = (0, serializeContext_js_1.getPageContextClientSerialized)(pageContext);
         return { documentHtml, pageContextSerialized, pageContext };
     }
 }
-async function getPageContextInitEnhanced(pageContextInit, globalContext, isPrerendering, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
-    urlRewrite: null,
-    urlHandler: null,
-    isClientSideNavigation: false
-} } = {}) {
-    (0, utils_js_1.assert)(pageContextInit.urlOriginal);
-    const pageContextInitEnhanced = createPageContext(pageContextInit, isPrerendering);
-    (0, utils_js_1.objectAssign)(pageContextInitEnhanced, pageContextInit);
-    (0, utils_js_1.objectAssign)(pageContextInitEnhanced, {
-        _objectCreatedByVike: true,
-        // The following is defined on `pageContext` because we can eventually make these non-global
-        _baseServer: globalContext.baseServer,
-        _baseAssets: globalContext.baseAssets,
-        // TODO/now: add meta.default
-        _includeAssetsImportedByServer: globalContext.config.includeAssetsImportedByServer ?? true,
-        // TODO/soon: use GloablContext instead
-        _pageFilesAll: globalContext.pageFilesAll,
-        _pageConfigs: globalContext.pageConfigs,
-        _pageConfigGlobal: globalContext.pageConfigGlobal,
-        _allPageIds: globalContext.allPageIds,
-        _pageRoutes: globalContext.pageRoutes,
-        _onBeforeRouteHook: globalContext.onBeforeRouteHook,
-        _globalContext: globalContext,
-        // TODO/now: add PageContext['globalContext']
-        /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
-        globalContext: globalContext.globalContext_public,
-        _pageContextInit: pageContextInit,
-        _urlRewrite: urlRewrite,
-        _urlHandler: urlHandler,
-        isClientSideNavigation
-    });
-    // pageContext.urlParsed
-    const pageContextUrlComputed = (0, getPageContextUrlComputed_js_1.getPageContextUrlComputed)(pageContextInitEnhanced);
-    (0, utils_js_1.objectAssign)(pageContextInitEnhanced, pageContextUrlComputed);
-    // pageContext.headers
-    {
-        let headers;
-        if (pageContextInit.headersOriginal) {
-            headers = (0, utils_js_1.normalizeHeaders)(pageContextInit.headersOriginal);
-            (0, utils_js_1.assertUsage)(!('headers' in pageContextInit), "You're defining pageContextInit.headersOriginal as well as pageContextInit.headers but you should only define pageContextInit.headersOriginal instead, see https://vike.dev/headers");
-        }
-        else if (pageContextInit.headers) {
-            headers = pageContextInit.headers;
-            // TODO/next-major-release: assertUsage() instead of assertWarning()
-            (0, utils_js_1.assertWarning)(false, 'Setting pageContextInit.headers is deprecated: set pageContextInit.headersOriginal instead, see https://vike.dev/headers', { onlyOnce: true });
-        }
-        else {
-            headers = null;
-        }
-        (0, utils_js_1.objectAssign)(pageContextInitEnhanced, { headers });
-    }
-    return pageContextInitEnhanced;
-}
-function createPageContext(pageContextInit, isPrerendering) {
-    const pageContext = {
-        _isPageContextObject: true,
-        isClientSide: false,
-        isPrerendering
-    };
-    (0, utils_js_1.objectAssign)(pageContext, pageContextInit);
-    return pageContext;
-}