vike 0.4.250-commit-2686732 → 0.4.250-commit-0d50da9

package/dist/server/runtime/renderPageServer/html/injectAssets/mergeScriptTags.d.ts

@@ -1,3 +1,4 @@
+import '../../../../assertEnvServer.js';
 export { mergeScriptTags };
 import { type PageContextCspNonce } from '../../csp.js';
 declare function mergeScriptTags(scriptTagsHtml: string, pageContext: PageContextCspNonce): string;

package/dist/server/runtime/renderPageServer/html/injectAssets/mergeScriptTags.js

@@ -1,6 +1,7 @@
+import '../../../../assertEnvServer.js';
 export { mergeScriptTags };
 import { inferNonceAttr } from '../../csp.js';
-import { assert } from '../../../../utils.js';
+import { assert } from '../../../../../utils/assert.js';
 import { scriptCommonAttrs } from './inferHtmlTags.js';
 const scriptRE = /(<script\b(?:\s[^>]*>|>))(.*?)<\/script>/gims;
 const srcRE = /\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im;

package/dist/server/runtime/renderPageServer/html/injectAssets/sanitizeJson.d.ts

@@ -1,2 +1,4 @@
+import '../../../../assertEnvServer.js';
 export { sanitizeJson };
+/** Prevent XSS attacks, see https://github.com/vikejs/vike/pull/181#issuecomment-952846026 */
 declare function sanitizeJson(unsafe: string): string;

package/dist/server/runtime/renderPageServer/html/injectAssets/sanitizeJson.js

@@ -1,5 +1,6 @@
-// Prevent XSS attacks, see https://github.com/vikejs/vike/pull/181#issuecomment-952846026
+import '../../../../assertEnvServer.js';
 export { sanitizeJson };
+/** Prevent XSS attacks, see https://github.com/vikejs/vike/pull/181#issuecomment-952846026 */
 function sanitizeJson(unsafe) {
     const safe = unsafe.replace(/</g, '\\u003c');
     return safe;

package/dist/server/runtime/renderPageServer/html/injectAssets.d.ts

@@ -1,3 +1,4 @@
+import '../../../assertEnvServer.js';
 export { injectHtmlTagsToString };
 export { injectHtmlTagsToStream };
 export type { PageContextInjectAssets };

package/dist/server/runtime/renderPageServer/html/injectAssets.js

@@ -1,6 +1,9 @@
+import '../../../assertEnvServer.js';
 export { injectHtmlTagsToString };
 export { injectHtmlTagsToStream };
-import { assert, isCallable, isPromise } from '../../../utils.js';
+import { isPromise } from '../../../../utils/isPromise.js';
+import { isCallable } from '../../../../utils/isCallable.js';
+import { assert } from '../../../../utils/assert.js';
 import { assertPageContextProvidedByUser } from '../../../../shared-server-client/assertPageContextProvidedByUser.js';
 import { joinHtmlTags, injectHtmlTags, createHtmlHeadIfMissing, injectHtmlTagsUsingStream, } from './injectAssets/injectHtmlTags.js';
 import { getHtmlTags } from './injectAssets/getHtmlTags.js';

package/dist/server/runtime/renderPageServer/html/propKeys.d.ts

@@ -1,3 +1,4 @@
+import '../../../assertEnvServer.js';
 export { getPropVal };
 export { setPropVal };
 export { getPropKeys };

package/dist/server/runtime/renderPageServer/html/propKeys.js

@@ -1,7 +1,8 @@
+import '../../../assertEnvServer.js';
 export { getPropVal };
 export { setPropVal };
 export { getPropKeys };
-import { isObject } from '../../../utils.js';
+import { isObject } from '../../../../utils/isObject.js';
 // Get a nested property from an object using a dot-separated path such as 'user.id'
 function getPropVal(obj, prop) {
     const keys = getPropKeys(prop);

package/dist/server/runtime/renderPageServer/html/renderHtml.d.ts

@@ -1,3 +1,4 @@
+import '../../../assertEnvServer.js';
 export { escapeInject };
 export { dangerouslySkipEscape };
 export { renderDocumentHtml };

package/dist/server/runtime/renderPageServer/html/renderHtml.js

@@ -1,9 +1,16 @@
+import '../../../assertEnvServer.js';
 export { escapeInject };
 export { dangerouslySkipEscape };
 export { renderDocumentHtml };
 export { isDocumentHtml };
 export { getHtmlString };
-import { assert, assertUsage, assertWarning, checkType, escapeHtml, hasProp, isHtml, isPromise, objectAssign, } from '../../../utils.js';
+import { escapeHtml } from '../../../../utils/escapeHtml.js';
+import { isPromise } from '../../../../utils/isPromise.js';
+import { isHtml } from '../../../../utils/isHtml.js';
+import { assert, assertUsage, assertWarning } from '../../../../utils/assert.js';
+import { checkType } from '../../../../utils/checkType.js';
+import { hasProp } from '../../../../utils/hasProp.js';
+import { objectAssign } from '../../../../utils/objectAssign.js';
 import { injectHtmlTagsToString, injectHtmlTagsToStream } from './injectAssets.js';
 import { processStream, isStream, streamToString, } from './stream.js';
 import { isStreamFromReactStreamingPackage } from './stream/react-streaming.js';

package/dist/server/runtime/renderPageServer/html/serializeContext.d.ts

@@ -1,3 +1,4 @@
+import '../../../assertEnvServer.js';
 export { getPageContextClientSerialized };
 export { getPageContextClientSerializedAbort };
 export { getGlobalContextClientSerialized };
@@ -6,7 +7,7 @@ export type { PassToClient };
 export type { PassToClientPublic };
 import type { UrlRedirect } from '../../../../shared-server-client/route/abort.js';
 import type { GlobalContextServerInternal } from '../../globalContext.js';
-import type { PageContextCreatedServer } from '../createPageContextServerSide.js';
+import type { PageContextCreatedServer } from '../createPageContextServer.js';
 import type { PageContextBegin } from '../../renderPageServer.js';
 import type { PageContextCspNonce } from '../csp.js';
 type PageContextSerialization = PageContextCreatedServer & {

package/dist/server/runtime/renderPageServer/html/serializeContext.js

@@ -1,8 +1,12 @@
+import '../../../assertEnvServer.js';
 export { getPageContextClientSerialized };
 export { getPageContextClientSerializedAbort };
 export { getGlobalContextClientSerialized };
 import { stringify, isJsonSerializerError } from '@brillout/json-serializer/stringify';
-import { assert, assertUsage, assertWarning, getPropAccessNotation, hasProp, unique } from '../../../utils.js';
+import { unique } from '../../../../utils/unique.js';
+import { getPropAccessNotation } from '../../../../utils/getPropAccessNotation.js';
+import { assert, assertUsage, assertWarning } from '../../../../utils/assert.js';
+import { hasProp } from '../../../../utils/hasProp.js';
 import { isErrorPage } from '../../../../shared-server-client/error-page.js';
 import { addIs404ToPageProps } from '../../../../shared-server-client/addIs404ToPageProps.js';
 import pc from '@brillout/picocolors';

package/dist/server/runtime/renderPageServer/html/stream/react-streaming.d.ts

@@ -1,3 +1,4 @@
+import '../../../../assertEnvServer.js';
 export { isStreamFromReactStreamingPackage };
 export { streamFromReactStreamingPackageToString };
 export { getStreamOfReactStreamingPackage };

package/dist/server/runtime/renderPageServer/html/stream/react-streaming.js

@@ -1,8 +1,11 @@
+import '../../../../assertEnvServer.js';
 // Zero-config support for https://www.npmjs.com/package/react-streaming
 export { isStreamFromReactStreamingPackage };
 export { streamFromReactStreamingPackageToString };
 export { getStreamOfReactStreamingPackage };
-import { assert, assertUsage, hasProp, isVikeReactApp } from '../../../../utils.js';
+import { assert, assertUsage } from '../../../../../utils/assert.js';
+import { hasProp } from '../../../../../utils/hasProp.js';
+import { isVikeReactApp } from '../../../../../utils/isVikeReactApp.js';
 import { streamPipeNodeToString, streamReadableWebToString } from '../stream.js';
 function streamFromReactStreamingPackageToString(stream) {
     if (stream.pipe) {

package/dist/server/runtime/renderPageServer/html/stream.d.ts

@@ -1,3 +1,4 @@
+import '../../../assertEnvServer.js';
 export { processStream };
 export { streamToString };
 export { stampPipe };

package/dist/server/runtime/renderPageServer/html/stream.js

@@ -1,3 +1,4 @@
+import '../../../assertEnvServer.js';
 export { processStream };
 export { streamToString };
 export { stampPipe };
@@ -19,7 +20,14 @@ export { streamReadableWebToString };
 export { streamPipeNodeToString };
 export { isStreamWritableWeb };
 export { isStreamWritableNode };
-import { assert, assertUsage, checkType, isObject, hasProp, objectAssign, capitalizeFirstLetter, assertWarning, isCallable, createDebug, isVikeBug, } from '../../../utils.js';
+import { isCallable } from '../../../../utils/isCallable.js';
+import { capitalizeFirstLetter } from '../../../../utils/capitalizeFirstLetter.js';
+import { createDebug } from '../../../../utils/debug.js';
+import { assert, assertUsage, assertWarning, isVikeBug } from '../../../../utils/assert.js';
+import { checkType } from '../../../../utils/checkType.js';
+import { hasProp } from '../../../../utils/hasProp.js';
+import { isObject } from '../../../../utils/isObject.js';
+import { objectAssign } from '../../../../utils/objectAssign.js';
 import { getStreamOfReactStreamingPackage, isStreamFromReactStreamingPackage, streamFromReactStreamingPackageToString, } from './stream/react-streaming.js';
 import { import_ } from '@brillout/import';
 import pc from '@brillout/picocolors';

package/dist/server/runtime/renderPageServer/inferMediaType.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { inferMediaType };
 export type { MediaType };
 type MediaType = null | {

package/dist/server/runtime/renderPageServer/inferMediaType.js

@@ -1,5 +1,7 @@
+import '../../assertEnvServer.js';
 export { inferMediaType };
-import { styleFileRE, isScriptFile } from '../../utils.js';
+import { styleFileRE } from '../../../utils/styleFileRE.js';
+import { isScriptFile } from '../../../utils/isScriptFile.js';
 function inferMediaType(href) {
     // Basics
     if (styleFileRE.test(href)) {

package/dist/server/runtime/renderPageServer/isFontFallback.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { isFontFallback };
 import type { PageAsset } from './getPageAssets.js';
 declare function isFontFallback(asset: PageAsset, pageAssets: PageAsset[]): boolean;

package/dist/server/runtime/renderPageServer/isFontFallback.js

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { isFontFallback };
 import { assert } from '../../../utils/assert.js';
 function isFontFallback(asset, pageAssets) {

package/dist/server/runtime/renderPageServer/loadPageConfigsLazyServerSide.d.ts

@@ -1,14 +1,15 @@
+import '../../assertEnvServer.js';
 export { loadPageConfigsLazyServerSide };
 export type { PageContext_loadPageConfigsLazyServerSide };
 export type { PageConfigsLazy };
 export type { PageContextAfterPageEntryLoaded };
 import { type PageContextConfig } from '../../../shared-server-client/getPageFiles.js';
-import { PromiseType } from '../../utils.js';
+import { PromiseType } from '../../../utils/PromiseType.js';
 import { type PageAsset } from './getPageAssets.js';
 import type { PageConfigRuntime } from '../../../types/PageConfig.js';
 import type { PassToClient } from './html/serializeContext.js';
 import type { PageContextAfterRoute } from '../../../shared-server-client/route/index.js';
-import type { PageContextCreatedServer } from './createPageContextServerSide.js';
+import type { PageContextCreatedServer } from './createPageContextServer.js';
 type PageContext_loadPageConfigsLazyServerSide = PageContextCreatedServer & PageContextAfterRoute & {
     is404: boolean | null;
     pageId: string;
@@ -139,7 +140,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
     _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
 } & {
-    urlParsed: import("../../utils.js").UrlPublic;
+    urlParsed: import("../../../utils/parseUrl.js").UrlPublic;
     urlPathname: string;
     url: string;
 } & {

package/dist/server/runtime/renderPageServer/loadPageConfigsLazyServerSide.js

@@ -1,8 +1,14 @@
+import '../../assertEnvServer.js';
 export { loadPageConfigsLazyServerSide };
 import { getPageFilesServerSide } from '../../../shared-server-client/getPageFiles.js';
 import { resolvePageContextConfig } from '../../../shared-server-client/page-configs/resolveVikeConfigPublic.js';
 import { analyzePageClientSideInit } from '../../../shared-server-client/getPageFiles/analyzePageClientSide.js';
-import { assertUsage, assertWarning, hasProp, isArray, isObject, objectAssign, updateType, } from '../../utils.js';
+import { isArray } from '../../../utils/isArray.js';
+import { assertUsage, assertWarning } from '../../../utils/assert.js';
+import { hasProp } from '../../../utils/hasProp.js';
+import { isObject } from '../../../utils/isObject.js';
+import { objectAssign } from '../../../utils/objectAssign.js';
+import { updateType } from '../../../utils/updateType.js';
 import { getPageAssets } from './getPageAssets.js';
 import { findPageConfig } from '../../../shared-server-client/page-configs/findPageConfig.js';
 import { analyzePage } from './analyzePage.js';

package/dist/server/runtime/renderPageServer/log404/index.d.ts

@@ -1,8 +1,9 @@
+import '../../../assertEnvServer.js';
 export { log404 };
 export { getRoutesInfo };
 import type { PageRoutes } from '../../../../shared-server-client/route/index.js';
 import type { GlobalContextServerInternal } from '../../globalContext.js';
-import type { PageContextCreatedServer } from '../createPageContextServerSide.js';
+import type { PageContextCreatedServer } from '../createPageContextServer.js';
 declare function log404(pageContext: PageContextCreatedServer & {
     urlPathname: string;
     errorWhileRendering: null | Error;

package/dist/server/runtime/renderPageServer/log404/index.js

@@ -1,8 +1,13 @@
+import '../../../assertEnvServer.js';
 export { log404 };
 // Exported for ./index.spec.ts
 export { getRoutesInfo };
 import { noRouteMatch } from '../../../../shared-server-client/route/noRouteMatch.js';
-import { assert, assertUsage, assertInfo, compareString, stripAnsi, getTerminalWidth, truncateString, } from '../../../utils.js';
+import { assert, assertUsage, assertInfo } from '../../../../utils/assert.js';
+import { compareString } from '../../../../utils/compareString.js';
+import { stripAnsi } from '../../../../utils/colorsServer.js';
+import { getTerminalWidth } from '../../../../utils/getTerminalWidth.js';
+import { truncateString } from '../../../../utils/truncateString.js';
 import pc from '@brillout/picocolors';
 function log404(pageContext) {
     const { urlPathname } = pageContext;

package/dist/server/runtime/renderPageServer/loggerProd.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { loggRuntimeErrorProd };
 import { type PageContext_logRuntime } from '../loggerRuntime.js';
 declare function loggRuntimeErrorProd(err: unknown, pageContext: PageContext_logRuntime): void;

package/dist/server/runtime/renderPageServer/loggerProd.js

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 // Logger used for the production server.
 // Any other environment (dev, preview, build, and pre-rendering) uses loggerDev.ts instead.
 export { loggRuntimeErrorProd };

package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { renderPageServerAfterRoute };
 export { prerenderPage };
 export { prerenderPageEntry };
@@ -5,7 +6,7 @@ export type { PageContextAfterRender };
 import { type PageContextUrlInternal } from '../../../shared-server-client/getPageContextUrlComputed.js';
 import { HttpResponse } from './createHttpResponse.js';
 import { type PageContext_loadPageConfigsLazyServerSide, type PageConfigsLazy } from './loadPageConfigsLazyServerSide.js';
-import type { PageContextCreatedServer } from './createPageContextServerSide.js';
+import type { PageContextCreatedServer } from './createPageContextServer.js';
 import type { PageContextBegin } from '../renderPageServer.js';
 type PageContextAfterRender = {
     httpResponse: HttpResponse;
@@ -147,7 +148,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
         _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     } & {
-        urlParsed: import("../../utils.js").UrlPublic;
+        urlParsed: import("../../../utils/parseUrl.js").UrlPublic;
         urlPathname: string;
         url: string;
     } & {
@@ -308,7 +309,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
         _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
         _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     } & {
-        urlParsed: import("../../utils.js").UrlPublic;
+        urlParsed: import("../../../utils/parseUrl.js").UrlPublic;
         urlPathname: string;
         url: string;
     } & {
@@ -477,7 +478,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
         _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     } & {
-        urlParsed: import("../../utils.js").UrlPublic;
+        urlParsed: import("../../../utils/parseUrl.js").UrlPublic;
         urlPathname: string;
         url: string;
     } & {
@@ -638,7 +639,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
         _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
         _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     } & {
-        urlParsed: import("../../utils.js").UrlPublic;
+        urlParsed: import("../../../utils/parseUrl.js").UrlPublic;
         urlPathname: string;
         url: string;
     } & {

package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.js

@@ -1,16 +1,21 @@
+import '../../assertEnvServer.js';
 export { renderPageServerAfterRoute };
 export { prerenderPage };
 export { prerenderPageEntry };
 import { getErrorPageId } from '../../../shared-server-client/error-page.js';
 import { getHtmlString } from './html/renderHtml.js';
-import { assert, assertUsage, updateType, hasProp, objectAssign, isSameErrorMessage } from '../../utils.js';
+import { assert, assertUsage } from '../../../utils/assert.js';
+import { hasProp } from '../../../utils/hasProp.js';
+import { isSameErrorMessage } from '../../../utils/isSameErrorMessage.js';
+import { objectAssign } from '../../../utils/objectAssign.js';
+import { updateType } from '../../../utils/updateType.js';
 import { getPageContextClientSerialized } from './html/serializeContext.js';
 import { createHttpResponsePage, createHttpResponsePageJson } from './createHttpResponse.js';
 import { loadPageConfigsLazyServerSide, } from './loadPageConfigsLazyServerSide.js';
 import { execHookOnRenderHtml } from './execHookOnRenderHtml.js';
 import { execHookDataAndOnBeforeRender } from './execHookDataAndOnBeforeRender.js';
 import { logRuntimeError } from '../loggerRuntime.js';
-import { preparePageContextForPublicUsageServer } from './preparePageContextForPublicUsageServer.js';
+import { getPageContextPublicServer } from './getPageContextPublicServer.js';
 import { execHookGuard } from '../../../shared-server-client/route/execHookGuard.js';
 import pc from '@brillout/picocolors';
 import { isServerSideError } from '../../../shared-server-client/misc/isServerSideError.js';
@@ -26,7 +31,7 @@ async function renderPageServerAfterRoute(pageContext) {
             getErrorPageId(pageContext._globalContext._pageFilesAll, pageContext._globalContext._pageConfigs)));
     updateType(pageContext, await loadPageConfigsLazyServerSide(pageContext));
     if (!isError) {
-        await execHookGuard(pageContext, (pageContext) => preparePageContextForPublicUsageServer(pageContext));
+        await execHookGuard(pageContext, (pageContext) => getPageContextPublicServer(pageContext));
     }
     if (!isError) {
         await execHookDataAndOnBeforeRender(pageContext);
@@ -77,7 +82,7 @@ async function prerenderPageEntry(pageContext) {
     });
     /* Should we execute the guard() hook upon pre-rendering? Is there a use case for this?
      *  - It isn't trivial to implement, as it requires to duplicate / factor out the isAbortError() handling
-    await execHookGuard(pageContext, (pageContext) => preparePageContextForPublicUsageServer(pageContext))
+    await execHookGuard(pageContext, (pageContext) => getPageContextPublicServer(pageContext))
     */
     await execHookDataAndOnBeforeRender(pageContext);
     const { htmlRender, renderHook } = await execHookOnRenderHtml(pageContext);

package/dist/server/runtime/renderPageServer/resolveRedirects.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { resolveRedirects };
 export { getStaticRedirectsForPrerender };
 export { resolveRouteStringRedirect };

package/dist/server/runtime/renderPageServer/resolveRedirects.js

@@ -1,9 +1,11 @@
+import '../../assertEnvServer.js';
 export { resolveRedirects };
 export { getStaticRedirectsForPrerender };
 // For ./resolveRedirects.spec.ts
 export { resolveRouteStringRedirect };
 import { assertIsNotBrowser } from '../../../utils/assertIsNotBrowser.js';
-import { assert, assertUsage, assertUsageUrlRedirectTarget, assertWarning, isUrlRedirectTarget, } from '../../../shared-server-client/utils.js';
+import { assert, assertUsage, assertWarning } from '../../../utils/assert.js';
+import { isUrlRedirectTarget, assertUsageUrlRedirectTarget } from '../../../utils/parseUrl.js';
 import { resolveUrlPathname } from '../../../shared-server-client/route/resolveUrlPathname.js';
 import { assertRouteString, isStaticRouteString, resolveRouteString, } from '../../../shared-server-client/route/resolveRouteString.js';
 import pc from '@brillout/picocolors';

package/dist/server/runtime/renderPageServer.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvServer.js';
 export { renderPageServer };
 export type { PageContextInit };
 export type { PageContextBegin };
@@ -136,7 +137,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
     _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
 } & {
-    urlParsed: import("../utils.js").UrlPublic;
+    urlParsed: import("../../utils/parseUrl.js").UrlPublic;
     urlPathname: string;
     url: string;
 } & {

package/dist/server/runtime/renderPageServer.js

@@ -1,8 +1,19 @@
+import '../assertEnvServer.js';
 export { renderPageServer };
 import { renderPageServerAfterRoute } from './renderPageServer/renderPageServerAfterRoute.js';
-import { createPageContextServerSide, createPageContextServerSideWithoutGlobalContext, } from './renderPageServer/createPageContextServerSide.js';
+import { createPageContextServer, createPageContextServerWithoutGlobalContext, } from './renderPageServer/createPageContextServer.js';
 import { route } from '../../shared-server-client/route/index.js';
-import { assert, hasProp, objectAssign, isUrl, parseUrl, onSetupRuntime, assertWarning, getGlobalObject, checkType, assertUsage, normalizeUrlPathname, removeBaseServer, modifyUrlPathname, prependBase, removeUrlOrigin, setUrlOrigin, isUri, getUrlPretty, updateType, catchInfiniteLoop, isSameErrorMessage, } from '../utils.js';
+import { assert, assertWarning, assertUsage } from '../../utils/assert.js';
+import { onSetupRuntime } from '../../utils/assertSetup.js';
+import { catchInfiniteLoop } from '../../utils/catchInfiniteLoop.js';
+import { checkType } from '../../utils/checkType.js';
+import { getGlobalObject } from '../../utils/getGlobalObject.js';
+import { hasProp } from '../../utils/hasProp.js';
+import { isSameErrorMessage } from '../../utils/isSameErrorMessage.js';
+import { objectAssign } from '../../utils/objectAssign.js';
+import { normalizeUrlPathname, removeBaseServer, modifyUrlPathname, prependBase, removeUrlOrigin, setUrlOrigin, getUrlPretty, } from '../../utils/parseUrl-extras.js';
+import { isUrl, parseUrl, isUri } from '../../utils/parseUrl.js';
+import { updateType } from '../../utils/updateType.js';
 import { getPageContextAddendumAbort, isAbortError, logAbort, addNewPageContextAborted, } from '../../shared-server-client/route/abort.js';
 import { getGlobalContextServerInternal, initGlobalContext_renderPage, } from './globalContext.js';
 import { handlePageContextRequestUrl } from './renderPageServer/handlePageContextRequestUrl.js';
@@ -63,7 +74,7 @@ async function renderPageServerEntryOnce(pageContextInit, requestId, asyncStore)
         //   ```
         // - initGlobalContext_renderPage() depends on +onCreateGlobalContext hooks
         assert(!isAbortError(err));
-        const pageContext = createPageContextServerSideWithoutGlobalContext(pageContextInit, requestId);
+        const pageContext = createPageContextServerWithoutGlobalContext(pageContextInit, requestId);
         logRuntimeError(err, pageContext);
         const pageContextHttpErrorFallback = getPageContextHttpErrorFallback_noGlobalContext(err, pageContextInit, requestId);
         return pageContextHttpErrorFallback;
@@ -216,7 +227,7 @@ async function renderPageServerEntryRecursive_onError(err, pageContextBegin, pag
     return pageContextErrorPage;
 }
 function logHttpRequest(urlOriginal, pageContextInit, requestId) {
-    const pageContext = createPageContextServerSideWithoutGlobalContext(pageContextInit, requestId);
+    const pageContext = createPageContextServerWithoutGlobalContext(pageContextInit, requestId);
     logRuntimeInfo?.(getRequestInfoMessage(urlOriginal), pageContext, 'info');
 }
 /* Alternative icons:
@@ -288,7 +299,7 @@ function getPageContextHttpErrorFallback(err, pageContextBegin) {
     return pageContextHttpErrorFallback;
 }
 function getPageContextHttpErrorFallback_noGlobalContext(err, pageContextInit, requestId) {
-    const pageContextHttpErrorFallback = createPageContextServerSideWithoutGlobalContext(pageContextInit, requestId);
+    const pageContextHttpErrorFallback = createPageContextServerWithoutGlobalContext(pageContextInit, requestId);
     const httpResponse = createHttpResponseErrorFallback_noGlobalContext();
     objectAssign(pageContextHttpErrorFallback, {
         httpResponse,
@@ -298,7 +309,7 @@ function getPageContextHttpErrorFallback_noGlobalContext(err, pageContextInit, r
 }
 function getPageContextBegin(pageContextInit, globalContext, requestId, asyncStore) {
     const { isClientSideNavigation, _urlHandler, _isPageContextJsonRequest } = handlePageContextUrl(pageContextInit.urlOriginal);
-    const pageContextBegin = createPageContextServerSide(pageContextInit, globalContext, {
+    const pageContextBegin = createPageContextServer(pageContextInit, globalContext, {
         isPrerendering: false,
         urlHandler: _urlHandler,
         isClientSideNavigation,
@@ -479,14 +490,14 @@ function getPageContextSkipRequest(pageContextInit, requestId) {
     }
     if (!errMsg404)
         return;
-    const pageContext = createPageContextServerSideWithoutGlobalContext(pageContextInit, requestId);
+    const pageContext = createPageContextServerWithoutGlobalContext(pageContextInit, requestId);
     const httpResponse = createHttpResponse404(errMsg404);
     objectAssign(pageContext, { httpResponse });
     checkType(pageContext);
     return pageContext;
 }
 function getPageContextInvalidVikeConfig(err, pageContextInit, requestId) {
-    const pageContext = createPageContextServerSideWithoutGlobalContext(pageContextInit, requestId);
+    const pageContext = createPageContextServerWithoutGlobalContext(pageContextInit, requestId);
     logRuntimeInfo?.(pc.bold(pc.red('Error loading Vike config — see error above')), pageContext, 'error');
     const pageContextHttpErrorFallback = getPageContextHttpErrorFallback_noGlobalContext(err, pageContextInit, requestId);
     return pageContextHttpErrorFallback;

package/dist/server/runtime/universal-middleware.d.ts

@@ -1 +1,3 @@
-export default function universalVikeHandler(request: Request, context: Record<string, unknown>, runtime: Record<string, unknown>): Promise<Response>;
+import '../assertEnvServer.js';
+export default universalVikeHandler;
+declare function universalVikeHandler(request: Request, context: Record<string, unknown>, runtime: Record<string, unknown>): Promise<Response>;

package/dist/server/runtime/universal-middleware.js

@@ -1,5 +1,7 @@
+import '../assertEnvServer.js';
+export default universalVikeHandler;
 import { renderPageServer } from './renderPageServer.js';
-export default async function universalVikeHandler(request, context, runtime) {
+async function universalVikeHandler(request, context, runtime) {
     const pageContextInit = {
         ...context,
         ...runtime,

package/dist/shared-server-client/addIs404ToPageProps.js

@@ -1,5 +1,6 @@
 export { addIs404ToPageProps };
-import { assertWarning, isObject } from './utils.js';
+import { assertWarning } from '../utils/assert.js';
+import { isObject } from '../utils/isObject.js';
 function addIs404ToPageProps(pageContext) {
     addIs404(pageContext);
 }

package/dist/shared-server-client/assertHookReturnedObject.js

@@ -1,5 +1,6 @@
 export { assertHookReturnedObject };
-import { assert, assertUsage, stringifyStringArray } from './utils.js';
+import { assert, assertUsage } from '../utils/assert.js';
+import { stringifyStringArray } from '../utils/stringifyStringArray.js';
 function assertHookReturnedObject(obj, keysExpected, errPrefix) {
     assert(!errPrefix.endsWith(' '));
     const keysUnknown = [];

package/dist/shared-server-client/assertOnBeforeRenderHookReturn.js

@@ -1,5 +1,6 @@
 export { assertOnBeforeRenderHookReturn };
-import { assertUsage, isPlainObject } from './utils.js';
+import { assertUsage } from '../utils/assert.js';
+import { isPlainObject } from '../utils/isPlainObject.js';
 import { assertPageContextProvidedByUser } from './assertPageContextProvidedByUser.js';
 import { assertHookReturnedObject } from './assertHookReturnedObject.js';
 import pc from '@brillout/picocolors';

package/dist/shared-server-client/assertPageContextProvidedByUser.js

@@ -1,5 +1,6 @@
 export { assertPageContextProvidedByUser };
-import { assert, assertUsage, assertWarning, isObject } from './utils.js';
+import { assert, assertUsage, assertWarning } from '../utils/assert.js';
+import { isObject } from '../utils/isObject.js';
 import pc from '@brillout/picocolors';
 function assertPageContextProvidedByUser(pageContextProvidedByUser, { hookName, hookFilePath, }) {
     if (pageContextProvidedByUser === undefined || pageContextProvidedByUser === null)

package/dist/shared-server-client/assertVirtualFileExports.js

@@ -1,5 +1,5 @@
 export { assertVirtualFileExports };
-import { assert } from './utils.js';
+import { assert } from '../utils/assert.js';
 function assertVirtualFileExports(moduleExports, test, moduleId) {
     if (!moduleExports || !test(moduleExports)) {
         /* https://github.com/vikejs/vike/issues/2903#issuecomment-3642285811

package/dist/shared-server-client/createGlobalContextShared.d.ts

@@ -5,14 +5,14 @@ export type { GlobalContextBasePublic };
 export type GlobalContextInternal = GlobalContextServerInternal | GlobalContextClientInternal;
 import type { PageFile } from './getPageFiles.js';
 import type { PageConfigRuntime } from '../types/PageConfig.js';
-import { type GlobalContextPrepareMinimum } from './prepareGlobalContextForPublicUsage.js';
+import { type GlobalContextPublicMinimum } from './getGlobalContextPublicShared.js';
 import type { GlobalContextServerInternal } from '../server/runtime/globalContext.js';
 import type { GlobalContextClientInternal } from '../client/runtime-client-routing/getGlobalContextClientInternal.js';
 import { type Hook } from './hooks/getHook.js';
 declare const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 declare function createGlobalContextShared<GlobalContextAdded extends {}, GlobalContextAddedAsync extends {}>(virtualFileExportsGlobalEntry: unknown, globalObject: {
     globalContext?: {};
-    onCreateGlobalContextHooks?: Hook<GlobalContextPrepareMinimum>[];
+    onCreateGlobalContextHooks?: Hook<GlobalContextPublicMinimum>[];
     previousCreateGlobalContextPromise?: Promise<void>;
 }, addGlobalContext?: (globalContext: GlobalContextBase) => GlobalContextAdded, addGlobalContextTmp?: (globalContext: GlobalContextBase) => Promise<GlobalContextAdded>, addGlobalContextAsync?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddedAsync>): Promise<{
     _globalConfigPublic: {

package/dist/shared-server-client/createGlobalContextShared.js

@@ -1,11 +1,16 @@
 export { createGlobalContextShared };
 export { getGlobalContextSyncErrMsg };
-import { assert, changeEnumerable, genPromise, objectAssign, objectReplace, unique } from './utils.js';
+import { assert } from '../utils/assert.js';
+import { objectReplace } from '../utils/objectReplace.js';
+import { changeEnumerable } from '../utils/changeEnumerable.js';
+import { genPromise } from '../utils/genPromise.js';
+import { objectAssign } from '../utils/objectAssign.js';
+import { unique } from '../utils/unique.js';
 import { parseVirtualFileExportsGlobalEntry } from './getPageFiles/parseVirtualFileExportsGlobalEntry.js';
 import { resolveGlobalContextConfig } from './page-configs/resolveVikeConfigPublic.js';
 import { execHookGlobal } from './hooks/execHook.js';
-import { prepareGlobalContextForPublicUsage, } from './prepareGlobalContextForPublicUsage.js';
-import { getHookFromPageConfigGlobalCumulative } from './hooks/getHook.js';
+import { getGlobalContextPublicShared } from './getGlobalContextPublicShared.js';
+import { getHooksFromPageConfigGlobalCumulative } from './hooks/getHook.js';
 const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 // TO-DO/eventually use flat globalContext — like flat pageContext
 async function createGlobalContextShared(virtualFileExportsGlobalEntry, globalObject, addGlobalContext, 
@@ -50,11 +55,11 @@ addGlobalContextTmp, addGlobalContextAsync) {
             const globalContextAddedAsync = await addGlobalContextAsync?.(globalContext);
             objectAssign(globalContext, globalContextAddedAsync);
         }
-        const onCreateGlobalContextHooks = getHookFromPageConfigGlobalCumulative(globalContext._pageConfigGlobal, 'onCreateGlobalContext');
+        const onCreateGlobalContextHooks = getHooksFromPageConfigGlobalCumulative(globalContext._pageConfigGlobal, 'onCreateGlobalContext');
         let hooksCalled = false;
         if (!hooksAreEqual(globalObject.onCreateGlobalContextHooks ?? [], onCreateGlobalContextHooks)) {
             globalObject.onCreateGlobalContextHooks = onCreateGlobalContextHooks;
-            await execHookGlobal('onCreateGlobalContext', globalContext, null, globalContext, prepareGlobalContextForPublicUsage);
+            await execHookGlobal('onCreateGlobalContext', globalContext, getGlobalContextPublicShared);
             hooksCalled = true;
         }
         if (isNewGlobalContext) {