vike 0.4.250 → 0.4.251-commit-9c5fb90

package/dist/server/runtime/renderPageServer/{createPageContextServerSide.js → createPageContextServer.js}

@@ -1,12 +1,16 @@
-export { createPageContextServerSide };
-export { createPageContextServerSideWithoutGlobalContext };
-import { assert, assertUsage, assertWarning, updateType, normalizeHeaders, objectAssign } from '../../utils.js';
+import '../../assertEnvServer.js';
+export { createPageContextServer };
+export { createPageContextServerWithoutGlobalContext };
+import { normalizeHeaders } from '../../../utils/normalizeHeaders.js';
+import { assert, assertUsage, assertWarning } from '../../../utils/assert.js';
+import { objectAssign } from '../../../utils/objectAssign.js';
+import { updateType } from '../../../utils/updateType.js';
 import { getPageContextUrlComputed } from '../../../shared-server-client/getPageContextUrlComputed.js';
 import { createPageContextObject, createPageContextShared, } from '../../../shared-server-client/createPageContextShared.js';
-function createPageContextServerSide(pageContextInit, globalContext, args) {
+function createPageContextServer(pageContextInit, globalContext, args) {
     assert(pageContextInit.urlOriginal);
-    const pageContextCreated = createPageContext(pageContextInit, args.isPrerendering, args.requestId);
-    objectAssign(pageContextCreated, {
+    const pageContext = createPageContextBase(pageContextInit, args.isPrerendering, args.requestId);
+    objectAssign(pageContext, {
         _globalContext: globalContext,
         _pageFilesAll: globalContext._pageFilesAll, // TO-DO/next-major-release: remove
         // We use pageContext._baseServer and pageContext._baseAssets instead of pageContext._globalContext.baseServer and pageContext._globalContext.baseAssets because the Base URLs can (eventually one day if needed) be made non-global
@@ -16,10 +20,10 @@ function createPageContextServerSide(pageContextInit, globalContext, args) {
         _urlHandler: args.isPrerendering ? null : args.urlHandler,
         isClientSideNavigation: args.isPrerendering ? false : args.isClientSideNavigation,
     });
-    objectAssign(pageContextCreated, globalContext._globalConfigPublic);
+    objectAssign(pageContext, globalContext._globalConfigPublic);
     // pageContext.urlParsed
-    const pageContextUrlComputed = getPageContextUrlComputed(pageContextCreated);
-    objectAssign(pageContextCreated, pageContextUrlComputed);
+    const pageContextUrlComputed = getPageContextUrlComputed(pageContext);
+    objectAssign(pageContext, pageContextUrlComputed);
     // pageContext.headers
     {
         let headers;
@@ -35,17 +39,18 @@ function createPageContextServerSide(pageContextInit, globalContext, args) {
         else {
             headers = null;
         }
-        objectAssign(pageContextCreated, { headers });
+        objectAssign(pageContext, { headers });
     }
-    const pageContextAugmented = createPageContextShared(pageContextCreated, globalContext._globalConfigPublic);
-    updateType(pageContextCreated, pageContextAugmented);
-    return pageContextCreated;
+    const pageContextAugmented = createPageContextShared(pageContext, globalContext._globalConfigPublic);
+    updateType(pageContext, pageContextAugmented);
+    return pageContext;
 }
-function createPageContextServerSideWithoutGlobalContext(pageContextInit, requestId) {
-    const pageContext = createPageContext(pageContextInit, false, requestId);
+/** Use this as last resort — prefer passing richer `pageContext` objects to the runtime logger */
+function createPageContextServerWithoutGlobalContext(pageContextInit, requestId) {
+    const pageContext = createPageContextBase(pageContextInit, false, requestId);
     return pageContext;
 }
-function createPageContext(pageContextInit, isPrerendering, requestId) {
+function createPageContextBase(pageContextInit, isPrerendering, requestId) {
     const pageContext = createPageContextObject();
     objectAssign(pageContext, {
         isClientSide: false,

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

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { resolvePageContextCspNone };
 export { inferNonceAttr };
 export { addCspResponseHeader };

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

@@ -1,8 +1,9 @@
+import '../../assertEnvServer.js';
 export { resolvePageContextCspNone };
 export { inferNonceAttr };
 export { addCspResponseHeader };
 import { import_ } from '@brillout/import';
-import { assert } from '../../utils.js';
+import { assert } from '../../../utils/assert.js';
 async function resolvePageContextCspNone(pageContext) {
     if (pageContext.cspNonce)
         return null; // already set by user e.g. `renderPage({ cspNonce: '123456789' })`

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

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { execHookDataAndOnBeforeRender };
 import { type PageContextExecHookServer } from './execHookServer.js';
 declare function execHookDataAndOnBeforeRender(pageContext: {

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

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { execHookDataAndOnBeforeRender };
 import { assertOnBeforeRenderHookReturn } from '../../../shared-server-client/assertOnBeforeRenderHookReturn.js';
 import { execHookServer } from './execHookServer.js';

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

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

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

@@ -1,7 +1,12 @@
+import '../../assertEnvServer.js';
 export { execHookOnError };
-import { isObject, getGlobalObject } from '../../utils.js';
+import { assert } from '../../../utils/assert.js';
+import { getGlobalObject } from '../../../utils/getGlobalObject.js';
+import { isObject } from '../../../utils/isObject.js';
+import { execHookSingleSync } from '../../../shared-server-client/hooks/execHook.js';
 import { getGlobalContextServerInternalOptional } from '../globalContext.js';
-import { getHookFromPageConfigGlobalCumulative } from '../../../shared-server-client/hooks/getHook.js';
+import { getHooksFromPageConfigGlobalCumulative } from '../../../shared-server-client/hooks/getHook.js';
+import { getPageContextPublicServer } from './getPageContextPublicServer.js';
 const globalObject = getGlobalObject('renderPageServer/execHookOnError.ts', {
     seen: new WeakSet(),
 });
@@ -14,10 +19,11 @@ function execHookOnError(err, pageContext) {
     const globalContext = getGlobalContextServerInternalOptional();
     if (!globalContext)
         return;
-    const hooks = getHookFromPageConfigGlobalCumulative(globalContext._pageConfigGlobal, 'onError');
+    assert(pageContext === null || '_globalContext' in pageContext);
+    const hooks = getHooksFromPageConfigGlobalCumulative(globalContext._pageConfigGlobal, 'onError');
     for (const hook of hooks) {
         try {
-            hook.hookFn(err, pageContext);
+            execHookSingleSync(hook, globalContext, pageContext, getPageContextPublicServer, () => hook.hookFn(err, pageContext));
         }
         catch (hookErr) {
             console.error(hookErr);

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

@@ -1,19 +1,20 @@
+import '../../assertEnvServer.js';
 export { execHookOnRenderHtml };
 export type { RenderHook };
 import { type HtmlRender } from './html/renderHtml.js';
 import { type Hook } from '../../../shared-server-client/hooks/getHook.js';
 import type { PageAsset } from './getPageAssets.js';
-import { type PageContextForPublicUsageServer } from './preparePageContextForPublicUsageServer.js';
 import type { PageContextSerialization } from './html/serializeContext.js';
-import type { GlobalContextServerInternal } from '../globalContext.js';
+import { type PageContextExecHook } from '../../../shared-server-client/hooks/execHook.js';
+import type { PageContextConfig } from '../../../shared-server-client/getPageFiles.js';
+import type { PageContextInternalServer } from '../../../types/PageContext.js';
 type GetPageAssets = () => Promise<PageAsset[]>;
 type RenderHook = Hook & {
     hookName: HookName;
 };
 type HookName = 'onRenderHtml' | 'render';
-declare function execHookOnRenderHtml(pageContext: PageContextForPublicUsageServer & PageContextSerialization & {
+declare function execHookOnRenderHtml(pageContext: PageContextConfig & PageContextExecHook & PageContextInternalServer & PageContextSerialization & {
     pageId: string;
-    _globalContext: GlobalContextServerInternal;
     __getPageAssets: GetPageAssets;
     _isHtmlOnly: boolean;
     _baseServer: string;

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

@@ -1,18 +1,23 @@
+import '../../assertEnvServer.js';
 export { execHookOnRenderHtml };
 import { isDocumentHtml, renderDocumentHtml, dangerouslySkipEscape, } from './html/renderHtml.js';
 import { getHookFromPageContext } from '../../../shared-server-client/hooks/getHook.js';
-import { assert, assertUsage, assertWarning, isObject, objectAssign, isPromise, isCallable } from '../../utils.js';
+import { isPromise } from '../../../utils/isPromise.js';
+import { isCallable } from '../../../utils/isCallable.js';
+import { assert, assertUsage, assertWarning } from '../../../utils/assert.js';
+import { isObject } from '../../../utils/isObject.js';
+import { objectAssign } from '../../../utils/objectAssign.js';
 import { isStream } from './html/stream.js';
 import { assertPageContextProvidedByUser } from '../../../shared-server-client/assertPageContextProvidedByUser.js';
-import { preparePageContextForPublicUsageServer, } from './preparePageContextForPublicUsageServer.js';
+import { getPageContextPublicServer } from './getPageContextPublicServer.js';
 import { assertHookReturnedObject } from '../../../shared-server-client/assertHookReturnedObject.js';
 import { logRuntimeError } from '../loggerRuntime.js';
 import pc from '@brillout/picocolors';
-import { execHookDirectSingleWithReturn } from '../../../shared-server-client/hooks/execHook.js';
+import { execHookSingleWithReturn } from '../../../shared-server-client/hooks/execHook.js';
 async function execHookOnRenderHtml(pageContext) {
     const hook = getRenderHook(pageContext);
     objectAssign(pageContext, { _renderHook: hook });
-    const { hookReturn } = await execHookDirectSingleWithReturn(hook, pageContext, preparePageContextForPublicUsageServer);
+    const { hookReturn } = await execHookSingleWithReturn(hook, pageContext, getPageContextPublicServer);
     const { documentHtml, pageContextProvidedByRenderHook, pageContextPromise, injectFilter } = processHookReturnValue(hookReturn, hook);
     Object.assign(pageContext, pageContextProvidedByRenderHook);
     objectAssign(pageContext, { _pageContextPromise: pageContextPromise });

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

@@ -1,11 +1,14 @@
+import '../../assertEnvServer.js';
 export { execHookServer };
 export type { PageContextExecHookServer };
-import { type PageContextForPublicUsageServer } from './preparePageContextForPublicUsageServer.js';
+import { PageContextExecHook } from '../../../shared-server-client/hooks/execHook.js';
 import type { PageContextConfig } from '../../../shared-server-client/getPageFiles.js';
 import type { HookName } from '../../../types/Config.js';
-type PageContextExecHookServer = PageContextConfig & PageContextForPublicUsageServer;
+type PageContextExecHookServer = PageContextConfig & PageContextExecHook & {
+    isClientSideNavigation: boolean;
+};
 declare function execHookServer(hookName: HookName, pageContext: PageContextExecHookServer): Promise<(import("../../../shared-server-client/hooks/getHook.js").HookLoc & {
-    hookFn: (arg: import("../../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum, ...rest: unknown[]) => unknown;
+    hookFn: (arg: import("../../../shared-server-client/createPageContextShared.js").PageContextCreated, ...rest: unknown[]) => unknown;
     hookTimeout: import("../../../shared-server-client/hooks/getHook.js").HookTimeout;
 } & {
     hookReturn: unknown;

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

@@ -1,13 +1,14 @@
+import '../../assertEnvServer.js';
 export { execHookServer };
-import { execHookDirect } from '../../../shared-server-client/hooks/execHook.js';
-import { preparePageContextForPublicUsageServer, } from './preparePageContextForPublicUsageServer.js';
-import { getHookFromPageContextNew } from '../../../shared-server-client/hooks/getHook.js';
+import { execHookList } from '../../../shared-server-client/hooks/execHook.js';
+import { getPageContextPublicServer } from './getPageContextPublicServer.js';
+import { getHooksFromPageContextNew } from '../../../shared-server-client/hooks/getHook.js';
 import { getFileSuffixes } from '../../../shared-server-node/getFileSuffixes.js';
 async function execHookServer(hookName, pageContext) {
-    const allHooks = getHookFromPageContextNew(hookName, pageContext);
+    const allHooks = getHooksFromPageContextNew(hookName, pageContext);
     const hooks = !pageContext.isClientSideNavigation
         ? allHooks
         : // Don't execute `.ssr.js` hooks upon client-side navigation
             allHooks.filter((hook) => !getFileSuffixes(hook.hookFilePath).includes('ssr'));
-    return await execHookDirect(hooks, pageContext, preparePageContextForPublicUsageServer);
+    return await execHookList(hooks, pageContext, getPageContextPublicServer);
 }

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

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { getCacheControl };
 export { cacheControlDisable };
 import type { PageConfigRuntime } from '../../../types/PageConfig.js';

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

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { getCacheControl };
 export { cacheControlDisable };
 import { getPageConfig } from '../../../shared-server-client/page-configs/helpers.js';

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

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { getEarlyHints };
 export type { EarlyHint };
 import type { PageAsset } from './getPageAssets.js';

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

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { getEarlyHints };
 import { isFontFallback } from './isFontFallback.js';
 import { inferEarlyHintLink } from './html/injectAssets/inferHtmlTags.js';

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

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { getHttpResponseBody };
 export { getHttpResponseBodyStreamHandlers };
 export type { HttpResponseBody };

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

@@ -1,7 +1,8 @@
+import '../../assertEnvServer.js';
 export { getHttpResponseBody };
 export { getHttpResponseBodyStreamHandlers };
 import { isStream, getStreamName, inferStreamName, isStreamWritableWeb, isStreamWritableNode, isStreamReadableWeb, isStreamReadableNode, isStreamPipeWeb, isStreamPipeNode, getStreamReadableNode, getStreamReadableWeb, pipeToStreamWritableWeb, pipeToStreamWritableNode, } from './html/stream.js';
-import { assert, assertUsage, assertWarning } from '../../utils.js';
+import { assert, assertUsage, assertWarning } from '../../../utils/assert.js';
 import { getHtmlString } from './html/renderHtml.js';
 import pc from '@brillout/picocolors';
 const streamDocs = 'See https://vike.dev/streaming for more information.';

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

@@ -1,3 +1,4 @@
+import '../../../assertEnvServer.js';
 export { getManifestEntry };
 import type { ViteManifest, ViteManifestEntry } from '../../../../types/ViteManifest.js';
 declare function getManifestEntry(id: string, assetsManifest: ViteManifest): {

package/dist/server/runtime/renderPageServer/getPageAssets/getManifestEntry.js

@@ -1,5 +1,8 @@
+import '../../../assertEnvServer.js';
 export { getManifestEntry };
-import { assert, slice, assertIsImportPathNpmPackage } from '../../../utils.js';
+import { slice } from '../../../../utils/slice.js';
+import { assertIsImportPathNpmPackage } from '../../../../utils/parseNpmPackage.js';
+import { assert } from '../../../../utils/assert.js';
 import { parseVirtualFileId } from '../../../../shared-server-node/virtualFileId.js';
 import { prependEntriesDir } from '../../../../shared-server-node/prependEntriesDir.js';
 function getManifestEntry(id, assetsManifest) {

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

@@ -1,3 +1,4 @@
+import '../../../assertEnvServer.js';
 export { retrievePageAssetsDev };
 export { setGetClientEntrySrcDev };
 import type { ViteDevServer } from 'vite';

package/dist/server/runtime/renderPageServer/getPageAssets/retrievePageAssetsDev.js

@@ -1,6 +1,9 @@
+import '../../../assertEnvServer.js';
 export { retrievePageAssetsDev };
 export { setGetClientEntrySrcDev };
-import { assert, getGlobalObject, styleFileRE } from '../../../utils.js';
+import { styleFileRE } from '../../../../utils/styleFileRE.js';
+import { assert } from '../../../../utils/assert.js';
+import { getGlobalObject } from '../../../../utils/getGlobalObject.js';
 import { parseVirtualFileId } from '../../../../shared-server-node/virtualFileId.js';
 const globalObject = getGlobalObject('getPageAssets/retrievePageAssetsDev.ts', {
     // We cannot define getClientEntrySrcDev() in this file because it depends on utils/requireResolve.ts which isn't available in production

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

@@ -1,3 +1,4 @@
+import '../../../assertEnvServer.js';
 export { retrievePageAssetsProd };
 export { resolveIncludeAssetsImportedByServer };
 import type { ViteManifest } from '../../../../types/ViteManifest.js';

package/dist/server/runtime/renderPageServer/getPageAssets/retrievePageAssetsProd.js

@@ -1,6 +1,8 @@
+import '../../../assertEnvServer.js';
 export { retrievePageAssetsProd };
 export { resolveIncludeAssetsImportedByServer };
-import { assert, isImportPathNpmPackage } from '../../../utils.js';
+import { isImportPathNpmPackage } from '../../../../utils/parseNpmPackage.js';
+import { assert } from '../../../../utils/assert.js';
 import { getManifestEntry } from './getManifestEntry.js';
 import { extractAssetsAddQuery } from '../../../../shared-server-node/extractAssetsQuery.js';
 function retrievePageAssetsProd(assetsManifest, clientDependencies, clientEntries, config) {

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

@@ -1,3 +1,4 @@
+import '../../../assertEnvServer.js';
 export { sortPageAssetsForEarlyHintsHeader };
 import type { PageAsset } from '../getPageAssets.js';
 declare function sortPageAssetsForEarlyHintsHeader(pageAssets: PageAsset[], isProduction: boolean): Promise<void>;

package/dist/server/runtime/renderPageServer/getPageAssets/sortPageAssetsForEarlyHintsHeader.js

@@ -1,5 +1,6 @@
+import '../../../assertEnvServer.js';
 export { sortPageAssetsForEarlyHintsHeader };
-import { higherFirst } from '../../../utils.js';
+import { higherFirst } from '../../../../utils/sorter.js';
 async function sortPageAssetsForEarlyHintsHeader(pageAssets, isProduction) {
     pageAssets.sort(higherFirst(({ assetType }) => {
         // In dev, we load scripts first in order to parallelize I/O and CPU

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

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { getPageAssets };
 export type { PageAsset };
 export type { GetPageAssets };

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

@@ -1,9 +1,14 @@
+import '../../assertEnvServer.js';
 export { getPageAssets };
 import { retrievePageAssetsProd } from './getPageAssets/retrievePageAssetsProd.js';
 import { retrievePageAssetsDev } from './getPageAssets/retrievePageAssetsDev.js';
 import { inferMediaType } from './inferMediaType.js';
 import { sortPageAssetsForEarlyHintsHeader } from './getPageAssets/sortPageAssetsForEarlyHintsHeader.js';
-import { assert, prependBase, toPosixPath, unique, getViteRPC } from '../../utils.js';
+import { toPosixPath } from '../../../utils/path.js';
+import { unique } from '../../../utils/unique.js';
+import { getViteRPC } from '../../../utils/getViteRPC.js';
+import { assert } from '../../../utils/assert.js';
+import { prependBase } from '../../../utils/parseUrl-extras.js';
 async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const globalContext = pageContext._globalContext;
     const { _isProduction: isProduction } = globalContext;

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

@@ -0,0 +1,11 @@
+import '../../assertEnvServer.js';
+export { getPageContextPublicServer };
+export type { PageContextPublicServer };
+import { type PageContextPublicMinimum } from '../../../shared-server-client/getPageContextPublicShared.js';
+type PageContextPublicServer = ReturnType<typeof getPageContextPublicServer>;
+declare function getPageContextPublicServer<PageContext extends PageContextPublicMinimum>(pageContext: PageContext): PageContext & {
+    _isProxyObject: true;
+    _originalObject: PageContext;
+} & {
+    dangerouslyUseInternals: import("../../../shared-server-client/getPublicProxy.js").DangerouslyUseInternals<PageContext>;
+};

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

@@ -0,0 +1,9 @@
+import '../../assertEnvServer.js';
+export { getPageContextPublicServer };
+import { assertPropertyGetters, getPageContextPublicShared, } from '../../../shared-server-client/getPageContextPublicShared.js';
+function getPageContextPublicServer(pageContext) {
+    // TO-DO/next-major-release: after we remove supportVueReactiviy() we can call this later inside the agnostic getPageContextPublicShared()
+    assertPropertyGetters(pageContext);
+    const pageContextPublic = getPageContextPublicShared(pageContext);
+    return pageContextPublic;
+}

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

@@ -1,12 +1,13 @@
+import '../../assertEnvServer.js';
 export { handleErrorWithoutErrorPage };
 import type { GlobalContextServerInternal } from '../globalContext.js';
-import type { PageContextCreated } from './createPageContextServerSide.js';
-declare function handleErrorWithoutErrorPage<PageContext extends PageContextCreated & {
+import type { PageContextCreatedServer } from './createPageContextServer.js';
+declare function handleErrorWithoutErrorPage<PageContext extends PageContextCreatedServer & {
     errorWhileRendering: null | Error;
     is404: null | boolean;
     pageId: null;
     _globalContext: GlobalContextServerInternal;
     urlOriginal: string;
-}>(pageContext: PageContext): Promise<PageContext & {
+}>(pageContext: PageContext): PageContext & {
     httpResponse: import("./createHttpResponse.js").HttpResponse;
-}>;
+};

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

@@ -1,10 +1,11 @@
+import '../../assertEnvServer.js';
 export { handleErrorWithoutErrorPage };
-import { stringify } from '@brillout/json-serializer/stringify';
-import { assert, assertWarning, objectAssign } from '../../utils.js';
-import { createHttpResponsePage, createHttpResponseErrorFallback } from './createHttpResponse.js';
+import { assert, assertWarning } from '../../../utils/assert.js';
+import { objectAssign } from '../../../utils/objectAssign.js';
+import { createHttpResponseErrorFallback, createHttpResponseErrorFallbackJson } from './createHttpResponse.js';
 import pc from '@brillout/picocolors';
 // When the user hasn't defined _error.page.js
-async function handleErrorWithoutErrorPage(pageContext) {
+function handleErrorWithoutErrorPage(pageContext) {
     assert(pageContext.pageId === null);
     assert(pageContext.errorWhileRendering || pageContext.is404);
     {
@@ -19,7 +20,7 @@ async function handleErrorWithoutErrorPage(pageContext) {
     else {
         const __getPageAssets = async () => [];
         objectAssign(pageContext, { __getPageAssets });
-        const httpResponse = await createHttpResponsePage(stringify({ serverSideError: true }), null, pageContext);
+        const httpResponse = createHttpResponseErrorFallbackJson();
         objectAssign(pageContext, { httpResponse });
         return pageContext;
     }

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

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { handlePageContextRequestUrl };
 declare function handlePageContextRequestUrl(url: string): {
     isPageContextJsonRequest: boolean;

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

@@ -1,7 +1,13 @@
+import '../../assertEnvServer.js';
 export { handlePageContextRequestUrl };
 import { pageContextJsonFileExtension, doNotCreateExtraDirectory, } from '../../../shared-server-client/getPageContextRequestUrl.js';
 import { modifyUrl } from '../../../shared-server-client/modifyUrl.js';
-import { baseServer, parseUrl, assert, slice, isObject, hasProp } from '../../utils.js';
+import { slice } from '../../../utils/slice.js';
+import { baseServer } from '../../../utils/urlToFile.js';
+import { assert } from '../../../utils/assert.js';
+import { hasProp } from '../../../utils/hasProp.js';
+import { isObject } from '../../../utils/isObject.js';
+import { parseUrl } from '../../../utils/parseUrl.js';
 // See also shared/getPageContextRequestUrl.ts
 function handlePageContextRequestUrl(url) {
     const urlParsed = parseUrl(url, baseServer);

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

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { resolveHeadersResponseEarly };
 export { resolveHeadersResponseFinal };
 import { PageContextCspNonce } from './csp.js';

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

@@ -1,7 +1,8 @@
+import '../../assertEnvServer.js';
 export { resolveHeadersResponseEarly };
 export { resolveHeadersResponseFinal };
 import { addCspResponseHeader } from './csp.js';
-import { isCallable } from '../../utils.js';
+import { isCallable } from '../../../utils/isCallable.js';
 import { cacheControlDisable, getCacheControl } from './getCacheControl.js';
 function resolveHeadersResponseFinal(pageContext, statusCode) {
     const headersResponse = pageContext.headersResponse || new Headers();

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

@@ -1,3 +1,4 @@
+import '../../../../assertEnvServer.js';
 export { getHtmlTags };
 export type { HtmlTag };
 export type { PreloadFilter };

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

@@ -1,5 +1,8 @@
+import '../../../../assertEnvServer.js';
 export { getHtmlTags };
-import { assert, assertWarning, assertUsage, isObject, freezePartial } from '../../../../utils.js';
+import { assert, assertWarning, assertUsage } from '../../../../../utils/assert.js';
+import { freezePartial } from '../../../../../utils/freezePartial.js';
+import { isObject } from '../../../../../utils/isObject.js';
 import { getGlobalContextClientSerialized, getPageContextClientSerialized, } from '../serializeContext.js';
 import { sanitizeJson } from './sanitizeJson.js';
 import { inferAssetTag, inferPreloadTag } from './inferHtmlTags.js';

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

@@ -1,3 +1,4 @@
+import '../../../../assertEnvServer.js';
 export { getViteDevScript };
 import type { GlobalContextServerInternal } from '../../../globalContext.js';
 declare function getViteDevScript(pageContext: {

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

@@ -1,5 +1,7 @@
+import '../../../../assertEnvServer.js';
 export { getViteDevScript };
-import { assert, assertUsage, assertWarning, getViteRPC } from '../../../../utils.js';
+import { assert, assertUsage, assertWarning } from '../../../../../utils/assert.js';
+import { getViteRPC } from '../../../../../utils/getViteRPC.js';
 import pc from '@brillout/picocolors';
 const reachOutCTA = 'Create a new GitHub issue to discuss a solution.';
 async function getViteDevScript(pageContext) {

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

@@ -1,3 +1,4 @@
+import '../../../../assertEnvServer.js';
 export { inferAssetTag };
 export { inferPreloadTag };
 export { inferEarlyHintLink };

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

@@ -1,8 +1,9 @@
+import '../../../../assertEnvServer.js';
 export { inferAssetTag };
 export { inferPreloadTag };
 export { inferEarlyHintLink };
 export { scriptCommonAttrs };
-import { assert } from '../../../../utils.js';
+import { assert } from '../../../../../utils/assert.js';
 import { inferNonceAttr } from '../../csp.js';
 // We can't use `defer` here. With `defer`, the entry script won't start before `</body>` has been parsed, preventing progressive hydration during SSR streaming, see https://github.com/vikejs/vike/pull/1271
 const scriptCommonAttrs = 'type="module" async';

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

@@ -1,2 +1,3 @@
+import '../../../../assertEnvServer.js';
 export { injectAssets__public };
 declare function injectAssets__public(htmlString: string, pageContext: Record<string, unknown>): Promise<string>;

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

@@ -1,5 +1,8 @@
+import '../../../../assertEnvServer.js';
 export { injectAssets__public };
-import { assertUsage, assertWarning, castProp, hasProp } from '../../../../utils.js';
+import { assertUsage, assertWarning } from '../../../../../utils/assert.js';
+import { castProp } from '../../../../../utils/cast.js';
+import { hasProp } from '../../../../../utils/hasProp.js';
 import { injectHtmlTagsToString } from '../injectAssets.js';
 // TO-DO/next-major-release: remove
 async function injectAssets__public(htmlString, pageContext) {

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

@@ -1,3 +1,4 @@
+import '../../../../assertEnvServer.js';
 export { injectHtmlTags };
 export { injectHtmlTagsUsingStream };
 export { createHtmlHeadIfMissing };

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

@@ -1,3 +1,4 @@
+import '../../../../assertEnvServer.js';
 // Unit tests at ./injectHtmlTags.spec.ts
 export { injectHtmlTags };
 export { injectHtmlTagsUsingStream };
@@ -6,7 +7,8 @@ export { joinHtmlTags };
 // Only needed for unit tests
 export { injectAtOpeningTag };
 export { injectAtClosingTag };
-import { assert, assertUsage, slice } from '../../../../utils.js';
+import { assert, assertUsage } from '../../../../../utils/assert.js';
+import { slice } from '../../../../../utils/slice.js';
 function injectHtmlTags(htmlString, htmlTags, position) {
     const htmlFragment = joinHtmlTags(htmlTags.filter((h) => h.position === position));
     if (htmlFragment) {

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 };