vike 0.4.250-commit-6161324 → 0.4.250-commit-0d50da9

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

@@ -1 +1,2 @@
+import '../../../assertEnvServer.js';
 export declare const error_cannot_use_import_outside_of_module = "\nimport{useRunner as e}from\"react-runner\";export*from\"react-runner\";import t,{useState as r,useEffect as n,Fragment as a,useCallback as l,useRef as o,useMemo as c,createContext as s,useContext as i}from\"react\";import p from\"react-simple-code-editor\";import m,{Prism as u}from\"prism-react-renderer\";function g(){return g=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(e[n]=r[n])}return e},g.apply(this,arguments)}function y(e,t){if(null==e)return{};var r,n,a={},l=Object.keys(e);for(n=0;n<l.length;n++)t.indexOf(r=l[n])>=0||(a[r]=e[r]);return a}const d=[\"initialCode\",\"transformCode\"],h=t=>{let{initialCode:a=\"\",transformCode:l}=t,o=y(t,d);const[c,s]=r(a),{element:i,error:p}=e(g({code:l?l(c):c},o));return n(()=>{s(a)},[a]),{element:i,error:p,code:c,onChange:s}},f={plain:{color:\"#ffffff\",backgroundColor:\"#282c34\"},styles:[{types:[\"comment\",\"block-comment\",\"prolog\",\"doctype\",\"cdata\"],style:{color:\"#b2b2b2\"}},{types:[\"property\",\"number\",\"function-name\",\"constant\",\"symbol\",\"deleted\"],style:{color:\"#5a9bcf\"}},{types:[\"boolean\"],style:{color:\"#ff8b50\"}},{types:[\"tag\"],style:{color:\"#fc929e\"}},{types:[\"string\",\"attr-value\"],style:{color:\"#8dc891\"}},{types:[\"punctuation\"],style:{color:\"#88c6Be\"}},{types:[\"selector\",\"char\",\"builtin\",\"inserted\"],style:{color:\"#d8dee9\"}},{types:[\"function\"],style:{color:\"#79b6f2\"}},{types:[\"operator\",\"entity\",\"url\",\"variable\"],style:{color:\"#d7deea\"}},{types:[\"keyword\"],style:{color:\"#c5a5c5\"}},{types:[\"atrule\",\"class-name\"],style:{color:\"#fac863\"}},{types:[\"important\"],style:{fontWeight:\"400\"}},{types:[\"bold\"],style:{fontWeight:\"700\"}},{types:[\"italic\"],style:{fontStyle:\"italic\"}},{types:[\"entity\"],style:{cursor:\"help\"}},{types:[\"namespace\"],style:{opacity:.7}}]},b=[\"children\",\"language\",\"theme\",\"Prism\",\"padding\",\"noWrapper\",\"noWrap\",\"className\",\"style\"],C=e=>{let{children:r,language:n=\"jsx\",theme:l=f,Prism:o=u,padding:c=10,noWrapper:s,noWrap:i,className:p,style:d}=e,h=y(e,b);/*#__PURE__*/return t.createElement(m,{code:r||\"\",language:n,Prism:o,theme:l},({className:e,style:r,tokens:n,getLineProps:l,getTokenProps:o})=>{const m=n.map((e,r)=>/*#__PURE__*/t.createElement(a,{key:r},/*#__PURE__*/t.createElement(\"span\",l({line:e}),e.map((e,r)=>/*#__PURE__*/t.createElement(\"span\",o({token:e,key:r})))),\"\\n\"));return s?m:/*#__PURE__*/t.createElement(\"pre\",g({className:p?:e,style:g({},r,{margin:0,padding:c,whiteSpace:i?\"pre\":\"pre-wrap\"},d)},h),m)})},v=[\"defaultValue\",\"value\",\"language\",\"theme\",\"Prism\",\"highlight\",\"padding\",\"onChange\"],E=e=>{let{defaultValue:n,value:a,language:s=\"jsx\",theme:i=f,Prism:m,highlight:u,padding:d=10,onChange:h}=e,b=y(e,v);const[E,P]=r(n||\"\"),k=void 0!==a,W=l(e=>/*#__PURE__*/t.createElement(C,{language:s,theme:i,Prism:m,noWrapper:!0},e),[s,i,m]),j=o(h);j.current=h;const x=l(e=>{k||P(e),null==j.current||j.current(e)},[k]),O=c(()=>g({},i.plain,b.style),[i.plain,b.style]);/*#__PURE__*/return t.createElement(p,g({},b,{highlight:u||W,padding:d,value:k?a:E,onValueChange:x,style:O}))},P=s({}),k=()=>i(P),W=[\"children\",\"code\",\"language\",\"theme\"],j=e=>{let{children:r,code:n=\"\",language:a=\"jsx\",theme:l=f}=e,o=y(e,W);const{element:c,error:s,code:i,onChange:p}=h(g({initialCode:n},o));/*#__PURE__*/return t.createElement(P.Provider,{value:{element:c,error:s,code:i,onChange:p,language:a,theme:l}},r)},x=e=>{const{code:r,language:n,theme:a,onChange:l}=k();/*#__PURE__*/return t.createElement(E,g({value:r,language:n,theme:a,onChange:l},e))},O=[\"Component\"],w=e=>{let{Component:r=\"div\"}=e,n=y(e,O);const{element:a}=k();/*#__PURE__*/return t.createElement(r,n,a)},N=e=>{const{error:r}=k();return r?/*#__PURE__*/t.createElement(\"pre\",e,r):/*#__PURE__*/t.createElement(t.Fragment,null)};export{C as CodeBlock,E as CodeEditor,P as LiveContext,x as LiveEditor,N as LiveError,w as LivePreview,j as LiveProvider,f as defaultTheme,k as useLiveContext,h as useLiveRunner};\n^^^^^^\n\n    SyntaxError: Cannot use import statement outside a module\n        at Object.compileFunction (node:vm:360:18)\n        at wrapSafe (node:internal/modules/cjs/loader:1084:15)\n        at Module._compile (node:internal/modules/cjs/loader:1119:27)\n        at Object.Module._extensions..js (node:internal/modules/cjs/loader:1209:10)\n        at Module.load (node:internal/modules/cjs/loader:1033:32)\n        at Function.Module._load (node:internal/modules/cjs/loader:868:12)\n        at ModuleWrap.<anonymous> (node:internal/modules/esm/translators:169:29)\n        at ModuleJob.run (node:internal/modules/esm/module_job:193:25)\n        at processTicksAndRejections (node:internal/process/task_queues:96:5)\n        at async Promise.all (index 0)\n";

package/dist/server/runtime/renderPageServer/addErrorHint/errors.js

@@ -1,3 +1,4 @@
+import '../../../assertEnvServer.js';
 // https://github.com/vikejs/vike/discussions/571#discussioncomment-6137618
 export const error_cannot_use_import_outside_of_module = `
 import{useRunner as e}from"react-runner";export*from"react-runner";import t,{useState as r,useEffect as n,Fragment as a,useCallback as l,useRef as o,useMemo as c,createContext as s,useContext as i}from"react";import p from"react-simple-code-editor";import m,{Prism as u}from"prism-react-renderer";function g(){return g=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(e[n]=r[n])}return e},g.apply(this,arguments)}function y(e,t){if(null==e)return{};var r,n,a={},l=Object.keys(e);for(n=0;n<l.length;n++)t.indexOf(r=l[n])>=0||(a[r]=e[r]);return a}const d=["initialCode","transformCode"],h=t=>{let{initialCode:a="",transformCode:l}=t,o=y(t,d);const[c,s]=r(a),{element:i,error:p}=e(g({code:l?l(c):c},o));return n(()=>{s(a)},[a]),{element:i,error:p,code:c,onChange:s}},f={plain:{color:"#ffffff",backgroundColor:"#282c34"},styles:[{types:["comment","block-comment","prolog","doctype","cdata"],style:{color:"#b2b2b2"}},{types:["property","number","function-name","constant","symbol","deleted"],style:{color:"#5a9bcf"}},{types:["boolean"],style:{color:"#ff8b50"}},{types:["tag"],style:{color:"#fc929e"}},{types:["string","attr-value"],style:{color:"#8dc891"}},{types:["punctuation"],style:{color:"#88c6Be"}},{types:["selector","char","builtin","inserted"],style:{color:"#d8dee9"}},{types:["function"],style:{color:"#79b6f2"}},{types:["operator","entity","url","variable"],style:{color:"#d7deea"}},{types:["keyword"],style:{color:"#c5a5c5"}},{types:["atrule","class-name"],style:{color:"#fac863"}},{types:["important"],style:{fontWeight:"400"}},{types:["bold"],style:{fontWeight:"700"}},{types:["italic"],style:{fontStyle:"italic"}},{types:["entity"],style:{cursor:"help"}},{types:["namespace"],style:{opacity:.7}}]},b=["children","language","theme","Prism","padding","noWrapper","noWrap","className","style"],C=e=>{let{children:r,language:n="jsx",theme:l=f,Prism:o=u,padding:c=10,noWrapper:s,noWrap:i,className:p,style:d}=e,h=y(e,b);/*#__PURE__*/return t.createElement(m,{code:r||"",language:n,Prism:o,theme:l},({className:e,style:r,tokens:n,getLineProps:l,getTokenProps:o})=>{const m=n.map((e,r)=>/*#__PURE__*/t.createElement(a,{key:r},/*#__PURE__*/t.createElement("span",l({line:e}),e.map((e,r)=>/*#__PURE__*/t.createElement("span",o({token:e,key:r})))),"\\n"));return s?m:/*#__PURE__*/t.createElement("pre",g({className:p?:e,style:g({},r,{margin:0,padding:c,whiteSpace:i?"pre":"pre-wrap"},d)},h),m)})},v=["defaultValue","value","language","theme","Prism","highlight","padding","onChange"],E=e=>{let{defaultValue:n,value:a,language:s="jsx",theme:i=f,Prism:m,highlight:u,padding:d=10,onChange:h}=e,b=y(e,v);const[E,P]=r(n||""),k=void 0!==a,W=l(e=>/*#__PURE__*/t.createElement(C,{language:s,theme:i,Prism:m,noWrapper:!0},e),[s,i,m]),j=o(h);j.current=h;const x=l(e=>{k||P(e),null==j.current||j.current(e)},[k]),O=c(()=>g({},i.plain,b.style),[i.plain,b.style]);/*#__PURE__*/return t.createElement(p,g({},b,{highlight:u||W,padding:d,value:k?a:E,onValueChange:x,style:O}))},P=s({}),k=()=>i(P),W=["children","code","language","theme"],j=e=>{let{children:r,code:n="",language:a="jsx",theme:l=f}=e,o=y(e,W);const{element:c,error:s,code:i,onChange:p}=h(g({initialCode:n},o));/*#__PURE__*/return t.createElement(P.Provider,{value:{element:c,error:s,code:i,onChange:p,language:a,theme:l}},r)},x=e=>{const{code:r,language:n,theme:a,onChange:l}=k();/*#__PURE__*/return t.createElement(E,g({value:r,language:n,theme:a,onChange:l},e))},O=["Component"],w=e=>{let{Component:r="div"}=e,n=y(e,O);const{element:a}=k();/*#__PURE__*/return t.createElement(r,n,a)},N=e=>{const{error:r}=k();return r?/*#__PURE__*/t.createElement("pre",e,r):/*#__PURE__*/t.createElement(t.Fragment,null)};export{C as CodeBlock,E as CodeEditor,P as LiveContext,x as LiveEditor,N as LiveError,w as LivePreview,j as LiveProvider,f as defaultTheme,k as useLiveContext,h as useLiveRunner};

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

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { addErrorHint };
 export { getErrorHint };
 declare function addErrorHint(error: unknown): unknown;

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

@@ -1,7 +1,11 @@
+import '../../assertEnvServer.js';
 export { addErrorHint };
 // For ./addErrorHint/getErrorHint.spec.ts
 export { getErrorHint };
-import { assert, formatHintLog, getBetterError, isObject } from '../../utils.js';
+import { assert } from '../../../utils/assert.js';
+import { formatHintLog } from '../../../utils/formatHintLog.js';
+import { getBetterError } from '../../../utils/getBetterError.js';
+import { isObject } from '../../../utils/isObject.js';
 import pc from '@brillout/picocolors';
 const hintDefault = 'The error could be a CJS/ESM issue, see https://vike.dev/broken-npm-package';
 const hintLinkPrefix = 'To fix this error, see ';

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

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { analyzePage };
 import type { PageConfigRuntime } from '../../../types/PageConfig.js';
 import { type AnalysisResult } from '../../../shared-server-client/getPageFiles/analyzePageClientSide.js';

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

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { analyzePage };
 import { getVikeClientEntry } from '../../../shared-server-client/getPageFiles/analyzePageClientSide/determineClientEntry.js';
 import { analyzePageClientSide, } from '../../../shared-server-client/getPageFiles/analyzePageClientSide.js';

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

@@ -1,2 +1,3 @@
+import '../../assertEnvServer.js';
 export { assertArguments };
 declare function assertArguments(...args: unknown[]): void;

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

@@ -1,5 +1,8 @@
+import '../../assertEnvServer.js';
 export { assertArguments };
-import { assert, assertUsage, assertWarning, hasProp, isObject } from '../../utils.js';
+import { assert, assertUsage, assertWarning } from '../../../utils/assert.js';
+import { hasProp } from '../../../utils/hasProp.js';
+import { isObject } from '../../../utils/isObject.js';
 import pc from '@brillout/picocolors';
 function assertArguments(...args) {
     const prefix = `${pc.code('renderPage(pageContextInit)')} (https://vike.dev/renderPage)`;

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

@@ -1,3 +1,4 @@
+import '../../../assertEnvServer.js';
 export { assertNoInfiniteHttpRedirect };
 declare function assertNoInfiniteHttpRedirect(urlRedirectTarget: string, pageContextInit: {
     urlOriginal: string;

package/dist/server/runtime/renderPageServer/createHttpResponse/assertNoInfiniteHttpRedirect.js

@@ -1,5 +1,8 @@
+import '../../../assertEnvServer.js';
 export { assertNoInfiniteHttpRedirect };
-import { assert, assertUsage, getGlobalObject, removeUrlOrigin } from '../../../utils.js';
+import { assert, assertUsage } from '../../../../utils/assert.js';
+import { getGlobalObject } from '../../../../utils/getGlobalObject.js';
+import { removeUrlOrigin } from '../../../../utils/parseUrl-extras.js';
 import pc from '@brillout/picocolors';
 const globalObject = getGlobalObject('createHttpResponse/assertNoInfiniteHttpRedirect.ts', {
     redirectGraph: {},

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

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { createHttpResponsePage };
 export { createHttpResponsePageJson };
 export { createHttpResponseErrorFallback };

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

@@ -1,3 +1,4 @@
+import '../../assertEnvServer.js';
 export { createHttpResponsePage };
 export { createHttpResponsePageJson };
 export { createHttpResponseErrorFallback };
@@ -6,7 +7,8 @@ export { createHttpResponseErrorFallbackJson };
 export { createHttpResponseRedirect };
 export { createHttpResponse404 };
 export { createHttpResponseBaseIsMissing };
-import { assert, assertWarning, escapeHtml } from '../../utils.js';
+import { escapeHtml } from '../../../utils/escapeHtml.js';
+import { assert, assertWarning } from '../../../utils/assert.js';
 import { getErrorPageId, isErrorPage } from '../../../shared-server-client/error-page.js';
 import { getHttpResponseBody, getHttpResponseBodyStreamHandlers } from './getHttpResponseBody.js';
 import { getEarlyHints } from './getEarlyHints.js';

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

@@ -1,12 +1,12 @@
-export { createPageContextServerSide };
-export { createPageContextServerSideWithoutGlobalContext };
+import '../../assertEnvServer.js';
+export { createPageContextServer };
+export { createPageContextServerWithoutGlobalContext };
 export type { PageContextCreatedServer };
-export type { PageContextCreatedServerBase };
+export type { PageContextCreatedServerWithoutGlobalContext };
 import type { GlobalContextServerInternal } from '../globalContext.js';
 import type { PageContextInit } from '../renderPageServer.js';
-type PageContextCreatedServerBase = ReturnType<typeof createPageContextBase>;
-type PageContextCreatedServer = Awaited<ReturnType<typeof createPageContextServerSide>>;
-declare function createPageContextServerSide(pageContextInit: PageContextInit, globalContext: GlobalContextServerInternal, args: {
+type PageContextCreatedServer = Awaited<ReturnType<typeof createPageContextServer>>;
+declare function createPageContextServer(pageContextInit: PageContextInit, globalContext: GlobalContextServerInternal, args: {
     requestId: number;
 } & ({
     isPrerendering: true;
@@ -139,22 +139,15 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
     _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;
 } & {
     headers: Record<string, string> | null;
 };
+type PageContextCreatedServerWithoutGlobalContext = ReturnType<typeof createPageContextServerWithoutGlobalContext>;
 /** Use this as last resort — prefer passing richer `pageContext` objects to the runtime logger */
-declare function createPageContextServerSideWithoutGlobalContext(pageContextInit: PageContextInit, requestId: number): {
-    _isOriginalObject: true;
-    isPageContext: true;
-} & {
-    isClientSide: false;
-    isPrerendering: boolean;
-    _requestId: number;
-} & PageContextInit;
-declare function createPageContextBase(pageContextInit: PageContextInit | null, isPrerendering: boolean, requestId: number): {
+declare function createPageContextServerWithoutGlobalContext(pageContextInit: PageContextInit, requestId: number): {
     _isOriginalObject: true;
     isPageContext: true;
 } & {

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

@@ -1,9 +1,13 @@
-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 pageContext = createPageContextBase(pageContextInit, args.isPrerendering, args.requestId);
     objectAssign(pageContext, {
@@ -42,7 +46,7 @@ function createPageContextServerSide(pageContextInit, globalContext, args) {
     return pageContext;
 }
 /** Use this as last resort — prefer passing richer `pageContext` objects to the runtime logger */
-function createPageContextServerSideWithoutGlobalContext(pageContextInit, requestId) {
+function createPageContextServerWithoutGlobalContext(pageContextInit, requestId) {
     const pageContext = createPageContextBase(pageContextInit, false, requestId);
     return pageContext;
 }

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 { PageContextCreatedServerBase } from './createPageContextServerSide.js';
-declare function execHookOnError(err: unknown, pageContext: PageContextCreatedServerBase | null): 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,8 +1,12 @@
+import '../../assertEnvServer.js';
 export { execHookOnError };
-import { isObject, getGlobalObject } from '../../utils.js';
-import { execHookBase } from '../../../shared-server-client/hooks/execHook.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(),
 });
@@ -15,11 +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 {
-            // TODO/refactor: stop using any
-            execHookBase(() => hook.hookFn(err, pageContext), hook, globalContext, 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,6 +1,7 @@
+import '../../assertEnvServer.js';
 export { handleErrorWithoutErrorPage };
 import type { GlobalContextServerInternal } from '../globalContext.js';
-import type { PageContextCreatedServer } from './createPageContextServerSide.js';
+import type { PageContextCreatedServer } from './createPageContextServer.js';
 declare function handleErrorWithoutErrorPage<PageContext extends PageContextCreatedServer & {
     errorWhileRendering: null | Error;
     is404: null | boolean;

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

@@ -1,5 +1,7 @@
+import '../../assertEnvServer.js';
 export { handleErrorWithoutErrorPage };
-import { assert, assertWarning, objectAssign } from '../../utils.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

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