vike 0.4.253 → 0.4.255-commit-05a7b95

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

@@ -1,4 +1,3 @@
-import '../assertEnvServer.js';
 export { getGlobalContext };
 export { getGlobalContextSync };
 export { getGlobalContextAsync };
@@ -28,24 +27,14 @@ import type { ViteConfigRuntime } from '../../node/vite/shared/getViteConfigRunt
 import type { GlobalContext } from '../../types/GlobalContext.js';
 import type { HookInternal } from '../../shared-server-client/hooks/getHook.js';
 import type { PrerenderContext } from '../../types/index.js';
+import '../assertEnvServer.js';
 declare const vikeConfigErrorRecoverMsg: "Vike config loaded";
 type GlobalContextServerInternal = Awaited<ReturnType<typeof createGlobalContext>>;
 declare function getGlobalContextServerInternal(): Promise<{
     globalContext: (Record<string, unknown> & {
         _globalConfigPublic: {
             pages: {
-                [k: string]: {
-                    config: import("../../types/index.js").ConfigResolved;
-                    _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                    _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                    _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-                } & ({
-                    route: import("../../types/Config.js").Route;
-                    isErrorPage?: undefined;
-                } | {
-                    route?: undefined;
-                    isErrorPage: true;
-                });
+                [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
             };
             config: import("../../types/index.js").ConfigResolved;
             _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -53,18 +42,7 @@ declare function getGlobalContextServerInternal(): Promise<{
             _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         };
         pages: {
-            [k: string]: {
-                config: import("../../types/index.js").ConfigResolved;
-                _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-            } & ({
-                route: import("../../types/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
         };
         config: import("../../types/index.js").ConfigResolved;
         _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -104,18 +82,7 @@ declare function getGlobalContextServerInternal(): Promise<{
     }) | (Record<string, unknown> & {
         _globalConfigPublic: {
             pages: {
-                [k: string]: {
-                    config: import("../../types/index.js").ConfigResolved;
-                    _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                    _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                    _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-                } & ({
-                    route: import("../../types/Config.js").Route;
-                    isErrorPage?: undefined;
-                } | {
-                    route?: undefined;
-                    isErrorPage: true;
-                });
+                [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
             };
             config: import("../../types/index.js").ConfigResolved;
             _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -123,18 +90,7 @@ declare function getGlobalContextServerInternal(): Promise<{
             _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         };
         pages: {
-            [k: string]: {
-                config: import("../../types/index.js").ConfigResolved;
-                _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-            } & ({
-                route: import("../../types/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
         };
         config: import("../../types/index.js").ConfigResolved;
         _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -175,18 +131,7 @@ declare function getGlobalContextServerInternal(): Promise<{
     }) | (Record<string, unknown> & {
         _globalConfigPublic: {
             pages: {
-                [k: string]: {
-                    config: import("../../types/index.js").ConfigResolved;
-                    _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                    _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                    _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-                } & ({
-                    route: import("../../types/Config.js").Route;
-                    isErrorPage?: undefined;
-                } | {
-                    route?: undefined;
-                    isErrorPage: true;
-                });
+                [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
             };
             config: import("../../types/index.js").ConfigResolved;
             _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -194,18 +139,7 @@ declare function getGlobalContextServerInternal(): Promise<{
             _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         };
         pages: {
-            [k: string]: {
-                config: import("../../types/index.js").ConfigResolved;
-                _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-            } & ({
-                route: import("../../types/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
         };
         config: import("../../types/index.js").ConfigResolved;
         _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -248,18 +182,7 @@ declare function getGlobalContextServerInternal(): Promise<{
 declare function getGlobalContextServerInternalOptional(): (Record<string, unknown> & (({
     _globalConfigPublic: {
         pages: {
-            [k: string]: {
-                config: import("../../types/index.js").ConfigResolved;
-                _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-            } & ({
-                route: import("../../types/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
         };
         config: import("../../types/index.js").ConfigResolved;
         _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -267,18 +190,7 @@ declare function getGlobalContextServerInternalOptional(): (Record<string, unkno
         _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     };
     pages: {
-        [k: string]: {
-            config: import("../../types/index.js").ConfigResolved;
-            _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-            _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-            _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-        } & ({
-            route: import("../../types/Config.js").Route;
-            isErrorPage?: undefined;
-        } | {
-            route?: undefined;
-            isErrorPage: true;
-        });
+        [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
     };
     config: import("../../types/index.js").ConfigResolved;
     _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -377,18 +289,7 @@ declare function updateUserFiles(): Promise<{
 declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Promise<({
     _globalConfigPublic: {
         pages: {
-            [k: string]: {
-                config: import("../../types/index.js").ConfigResolved;
-                _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-            } & ({
-                route: import("../../types/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
         };
         config: import("../../types/index.js").ConfigResolved;
         _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -396,18 +297,7 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
         _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     };
     pages: {
-        [k: string]: {
-            config: import("../../types/index.js").ConfigResolved;
-            _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-            _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-            _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-        } & ({
-            route: import("../../types/Config.js").Route;
-            isErrorPage?: undefined;
-        } | {
-            route?: undefined;
-            isErrorPage: true;
-        });
+        [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
     };
     config: import("../../types/index.js").ConfigResolved;
     _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;

package/dist/server/runtime/globalContext.js

@@ -1,4 +1,3 @@
-import '../assertEnvServer.js';
 // Public use
 export { getGlobalContext };
 export { getGlobalContextSync };
@@ -31,7 +30,6 @@ export { vikeConfigErrorRecoverMsg };
 //   - globalObject.viteDevServer is used by updateUserFiles() which then sets virtualFileExportsGlobalEntry
 import { PROJECT_VERSION } from '../../utils/PROJECT_VERSION.js';
 import { assert, assertUsage, assertWarning } from '../../utils/assert.js';
-import { assertIsNotBrowser } from '../../utils/assertIsNotBrowser.js';
 import { isPlainObject } from '../../utils/isPlainObject.js';
 import { objectReplace } from '../../utils/objectReplace.js';
 import { genPromise } from '../../utils/genPromise.js';
@@ -57,13 +55,13 @@ import { logRuntimeError, logRuntimeInfo } from './loggerRuntime.js';
 import { debugFileChange, getVikeConfigErrorBuild, setVikeConfigError, } from '../../shared-server-node/getVikeConfigError.js';
 import { getVikeApiOperation } from '../../shared-server-node/api-context.js';
 import { hasAlreadyLogged } from './logErrorServer.js';
+import '../assertEnvServer.js';
 const debug = createDebug('vike:globalContext');
 const globalObject = getGlobalObject('runtime/globalContext.ts', getInitialGlobalObject());
 // Trick to break down TypeScript circular dependency
 // https://chat.deepseek.com/a/chat/s/d7e9f90a-c7f3-4108-9cd5-4ad6caed3539
 const globalObjectTyped = globalObject;
 const vikeConfigErrorRecoverMsg = pc.bold(pc.green('Vike config loaded'));
-assertIsNotBrowser();
 async function getGlobalContextServerInternal() {
     // getGlobalContextServerInternal() should always be called after initGlobalContext()
     assert(globalObject.isInitialized);

package/dist/server/runtime/index-deprecated.d.ts

@@ -1,2 +1,2 @@
-import '../assertEnvServer.js';
 export * from './index.js';
+import '../assertEnvServer.js';

package/dist/server/runtime/index-deprecated.js

@@ -1,9 +1,9 @@
-import '../assertEnvServer.js';
 // TO-DO/eventually: point package.json#exports['./server'] to this file.
 // - Write migration guide, see comment below.
 export * from './index.js';
 import { assertWarning } from '../../utils/assert.js';
 import pc from '@brillout/picocolors';
+import '../assertEnvServer.js';
 assertWarning(false, [
     'You have outdated imports:',
     pc.bold(pc.red("  import { something } from 'vike/server'")),

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

@@ -1,4 +1,3 @@
-import '../assertEnvServer.js';
 export { renderPageServer as renderPage } from './renderPageServer.js';
 export { escapeInject, dangerouslySkipEscape } from './renderPageServer/html/renderHtml.js';
 export { pipeWebStream, pipeNodeStream, pipeStream, stampPipe } from './renderPageServer/html/stream.js';
@@ -9,6 +8,7 @@ export * from '../../types/index-dreprecated.js';
 export { injectAssets__public as _injectAssets } from './renderPageServer/html/injectAssets/injectAssets__public.js';
 export { createPageRenderer } from '../createPageRenderer.js';
 import { RenderErrorPage as RenderErrorPage_ } from '../../shared-server-client/route/abort.js';
+import '../assertEnvServer.js';
 /** @deprecated
  * Replace:
  *   ```

package/dist/server/runtime/index.js

@@ -1,4 +1,3 @@
-import '../assertEnvServer.js';
 export { renderPageServer as renderPage } from './renderPageServer.js';
 export { escapeInject, dangerouslySkipEscape } from './renderPageServer/html/renderHtml.js';
 export { pipeWebStream, pipeNodeStream, pipeStream, stampPipe } from './renderPageServer/html/stream.js';
@@ -13,6 +12,7 @@ export { createPageRenderer } from '../createPageRenderer.js';
 import { assertWarning } from '../../utils/assert.js';
 import pc from '@brillout/picocolors';
 import { RenderErrorPage as RenderErrorPage_ } from '../../shared-server-client/route/abort.js';
+import '../assertEnvServer.js';
 /** @deprecated
  * Replace:
  *   ```

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

@@ -1,6 +1,6 @@
-import '../assertEnvServer.js';
 export { logErrorServer };
 export { hasAlreadyLogged };
 import type { PageContextCreatedServer, PageContextCreatedServerWithoutGlobalContext } from './renderPageServer/createPageContextServer.js';
+import '../assertEnvServer.js';
 declare function logErrorServer(err: unknown, pageContext: null | PageContextCreatedServer | PageContextCreatedServerWithoutGlobalContext): void;
 declare function hasAlreadyLogged(err: unknown): boolean;

package/dist/server/runtime/logErrorServer.js

@@ -1,9 +1,7 @@
-import '../assertEnvServer.js';
 export { logErrorServer };
 export { hasAlreadyLogged };
 import pc from '@brillout/picocolors';
 import { assertWarning } from '../../utils/assert.js';
-import { assertIsNotBrowser } from '../../utils/assertIsNotBrowser.js';
 import { hasRed } from '../../utils/colorsServer.js';
 import { isDebugError } from '../../utils/debug.js';
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
@@ -11,7 +9,7 @@ import { isObject } from '../../utils/isObject.js';
 import { execHookOnError } from './renderPageServer/execHookOnError.js';
 import { addErrorHint } from './renderPageServer/addErrorHint.js';
 import { isAbortError } from '../../shared-server-client/route/abort.js';
-assertIsNotBrowser();
+import '../assertEnvServer.js';
 const globalObject = getGlobalObject('server/runtime/logErrorServer.ts', {
     wasAlreadyLogged: new WeakSet(),
 });

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

@@ -1,4 +1,3 @@
-import '../assertEnvServer.js';
 export declare let logRuntimeError: LogRuntimeError;
 export declare let logRuntimeInfo: LogRuntimeInfo | null | LogRuntimeInfo;
 export { setLogRuntimeDev };
@@ -6,6 +5,7 @@ export { assertPageContext_logRuntime };
 export type { PageContext_logRuntime };
 import type { LogType } from '../../node/vite/shared/loggerDev.js';
 import type { PageContextCreatedServer, PageContextCreatedServerWithoutGlobalContext } from './renderPageServer/createPageContextServer.js';
+import '../assertEnvServer.js';
 type LogRuntimeInfo = (msg: string, pageContext: PageContext_logRuntime, logType: LogType) => void;
 type LogRuntimeError = (err: unknown, pageContext: PageContext_logRuntime) => void;
 type PageContext_logRuntime = null | ((PageContextCreatedServer | PageContextCreatedServerWithoutGlobalContext) & {

package/dist/server/runtime/loggerRuntime.js

@@ -1,4 +1,3 @@
-import '../assertEnvServer.js';
 // Logger used by the the server runtime. (Also during pre-rendering since it uses the sever runtime.)
 export let logRuntimeError;
 export let logRuntimeInfo = null; // is `null` in production
@@ -6,6 +5,7 @@ export { setLogRuntimeDev };
 export { assertPageContext_logRuntime };
 import { loggRuntimeErrorProd } from './renderPageServer/loggerProd.js';
 import { assert } from '../../utils/assert.js';
+import '../assertEnvServer.js';
 // Set production logger (which is overwritten by loggerDev.ts in non-production environments such as development and during pre-rendering)
 logRuntimeError =
     // @ts-expect-error

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

@@ -1,5 +1,5 @@
-import '../../../assertEnvServer.js';
 // https://github.com/vikejs/vike/discussions/571#discussioncomment-6137618
+import '../../../assertEnvServer.js';
 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,5 +1,5 @@
-import '../../assertEnvServer.js';
 export { addErrorHint };
 export { getErrorHint };
+import '../../assertEnvServer.js';
 declare function addErrorHint(error: unknown): unknown;
 declare function getErrorHint(error: unknown): "The error could be a CJS/ESM issue, see https://vike.dev/broken-npm-package" | `To fix this error, see ${string}` | null;

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

@@ -1,4 +1,3 @@
-import '../../assertEnvServer.js';
 export { addErrorHint };
 // For ./addErrorHint/getErrorHint.spec.ts
 export { getErrorHint };
@@ -7,6 +6,7 @@ import { formatHintLog } from '../../../utils/formatHintLog.js';
 import { getBetterError } from '../../../utils/getBetterError.js';
 import { isObject } from '../../../utils/isObject.js';
 import pc from '@brillout/picocolors';
+import '../../assertEnvServer.js';
 const hintDefault = 'The error could be a CJS/ESM issue, see https://vike.dev/broken-npm-package';
 const hintLinkPrefix = 'To fix this error, see ';
 const errorsMisc = [
@@ -91,7 +91,8 @@ function addErrorHint(error) {
     const hint = getErrorHint(error);
     if (!hint)
         return error;
-    const append = `\n${pc.bold(formatHintLog(hint))}`;
+    const color = hint === hintDefault ? pc.gray : pc.bold;
+    const append = `\n${color(formatHintLog(hint))}`;
     return getBetterError(error, { message: { append } });
 }
 function getErrorHint(error) {

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

@@ -1,8 +1,8 @@
-import '../../assertEnvServer.js';
 export { analyzePage };
 import type { PageConfigRuntime } from '../../../types/PageConfig.js';
 import { type AnalysisResult } from '../../../shared-server-client/getPageFiles/analyzePageClientSide.js';
 import type { PageContext_loadPageConfigsLazyServerSide } from './loadPageConfigsLazyServerSide.js';
+import '../../assertEnvServer.js';
 declare function analyzePage(pageContext: PageContext_loadPageConfigsLazyServerSide & {
     _pageConfig: null | PageConfigRuntime;
 }): AnalysisResult;

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

@@ -1,10 +1,10 @@
-import '../../assertEnvServer.js';
 export { analyzePage };
 import { getVikeClientEntry } from '../../../shared-server-client/getPageFiles/analyzePageClientSide/determineClientEntry.js';
 import { analyzePageClientSide, } from '../../../shared-server-client/getPageFiles/analyzePageClientSide.js';
 import { generateVirtualFileId } from '../../../shared-server-node/virtualFileId.js';
 import { analyzeClientSide } from '../../../shared-server-client/getPageFiles/analyzeClientSide.js';
 import { getConfigValueRuntime } from '../../../shared-server-client/page-configs/getConfigValueRuntime.js';
+import '../../assertEnvServer.js';
 function analyzePage(pageContext) {
     const { pageId, _pageConfig: pageConfig, _globalContext: globalContext } = pageContext;
     const { _pageFilesAll: pageFilesAll } = globalContext;

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

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

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

@@ -1,9 +1,9 @@
-import '../../assertEnvServer.js';
 export { assertArguments };
 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';
+import '../../assertEnvServer.js';
 function assertArguments(...args) {
     const prefix = `${pc.code('renderPage(pageContextInit)')} (https://vike.dev/renderPage)`;
     const pageContextInit = args[0];

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

@@ -1,5 +1,5 @@
-import '../../../assertEnvServer.js';
 export { assertNoInfiniteHttpRedirect };
+import '../../../assertEnvServer.js';
 declare function assertNoInfiniteHttpRedirect(urlRedirectTarget: string, pageContextInit: {
     urlOriginal: string;
 }): "DISABLED" | undefined;

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

@@ -1,9 +1,9 @@
-import '../../../assertEnvServer.js';
 export { assertNoInfiniteHttpRedirect };
 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';
+import '../../../assertEnvServer.js';
 const globalObject = getGlobalObject('createHttpResponse/assertNoInfiniteHttpRedirect.ts', {
     redirectGraph: {},
 });

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

@@ -1,4 +1,3 @@
-import '../../assertEnvServer.js';
 export { createHttpResponsePage };
 export { createHttpResponsePageJson };
 export { createHttpResponseErrorFallback };
@@ -7,21 +6,23 @@ export { createHttpResponseErrorFallbackJson };
 export { createHttpResponseRedirect };
 export { createHttpResponse404 };
 export { createHttpResponseBaseIsMissing };
+export { createHttpResponseFromUniversalMiddleware };
 export type { HttpResponse };
 import type { GetPageAssets } from './getPageAssets.js';
 import type { HtmlRender } from './html/renderHtml.js';
 import type { RenderHook } from './execHookOnRenderHtml.js';
-import type { RedirectStatusCode, AbortStatusCode, UrlRedirect } from '../../../shared-server-client/route/abort.js';
+import type { AbortStatusCode, UrlRedirect } from '../../../shared-server-client/route/abort.js';
 import { HttpResponseBody } from './getHttpResponseBody.js';
 import { type EarlyHint } from './getEarlyHints.js';
 import type { PageContextBegin } from '../renderPageServer.js';
 import type { GlobalContextServerInternal } from '../globalContext.js';
+import '../../assertEnvServer.js';
 type HttpResponse = {
-    statusCode: 200 | 404 | 500 | RedirectStatusCode | AbortStatusCode;
+    statusCode: number;
     headers: [string, string][];
     earlyHints: EarlyHint[];
     /** **Deprecated**: use `headers` instead, see https://vike.dev/migration/0.4.134 */
-    contentType: 'application/json' | 'text/html;charset=utf-8';
+    contentType: string | undefined;
 } & HttpResponseBody;
 declare function createHttpResponsePage(htmlRender: HtmlRender, renderHook: null | RenderHook, pageContext: {
     pageId: null | string;
@@ -41,3 +42,4 @@ declare function createHttpResponseErrorFallback_noGlobalContext(): HttpResponse
 declare function createHttpResponseErrorFallbackJson(): HttpResponse;
 declare function createHttpResponsePageJson(pageContextSerialized: string): Promise<HttpResponse>;
 declare function createHttpResponseRedirect({ url, statusCode }: UrlRedirect, pageContextInit: PageContextBegin): HttpResponse;
+declare function createHttpResponseFromUniversalMiddleware(response: Response, earlyHints?: EarlyHint[]): HttpResponse;

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

@@ -1,4 +1,3 @@
-import '../../assertEnvServer.js';
 export { createHttpResponsePage };
 export { createHttpResponsePageJson };
 export { createHttpResponseErrorFallback };
@@ -7,6 +6,7 @@ export { createHttpResponseErrorFallbackJson };
 export { createHttpResponseRedirect };
 export { createHttpResponse404 };
 export { createHttpResponseBaseIsMissing };
+export { createHttpResponseFromUniversalMiddleware };
 import { escapeHtml } from '../../../utils/escapeHtml.js';
 import { assert, assertWarning } from '../../../utils/assert.js';
 import { getErrorPageId, isErrorPage } from '../../../shared-server-client/error-page.js';
@@ -15,6 +15,7 @@ import { getEarlyHints } from './getEarlyHints.js';
 import { assertNoInfiniteHttpRedirect } from './createHttpResponse/assertNoInfiniteHttpRedirect.js';
 import { resolveHeadersResponseFinal } from './headersResponse.js';
 import { stringify } from '@brillout/json-serializer/stringify';
+import '../../assertEnvServer.js';
 const contentTypeJson = 'application/json';
 const contentTypeHtml = 'text/html;charset=utf-8';
 async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
@@ -102,9 +103,20 @@ function createHttpResponseRedirect({ url, statusCode }, pageContextInit) {
     // For users: showing a blank page is probably better than a flickering text.
     `<p style="display: none">Redirecting to ${escapeHtml(url)}</p><script>console.log('This HTML was generated by Vike.')</script>`);
 }
-function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyHints = [], renderHook = null) {
+function createHttpResponseFromUniversalMiddleware(response, earlyHints) {
+    // @brillout TODO/after-PR-merge: dedupe such HTML responses generated by Vike
+    const body = response.body ??
+        `<p style="display: none">No HTTP response body.</p><script>console.log('This HTML was generated by Vike.')</script>`;
+    const httpResponse = createHttpResponseCommon(response.status, Array.from(response.headers.entries()), body, earlyHints);
+    return httpResponse;
+}
+function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyHints, renderHook) {
     headers.push(['Content-Type', contentType]);
     assert(renderHook || typeof htmlRender === 'string');
+    return createHttpResponseCommon(statusCode, headers, htmlRender, earlyHints, renderHook);
+}
+function createHttpResponseCommon(statusCode, headers, htmlRender, earlyHints = [], renderHook = null) {
+    const contentType = headers.find(([k]) => k.toLowerCase() === 'content-type')?.[1];
     return {
         statusCode,
         headers,

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

@@ -1,12 +1,14 @@
-import '../../assertEnvServer.js';
 export { createPageContextServer };
 export { createPageContextServerWithoutGlobalContext };
 export type { PageContextCreatedServer };
 export type { PageContextCreatedServerWithoutGlobalContext };
 import type { GlobalContextServerInternal } from '../globalContext.js';
-import type { PageContextInit } from '../renderPageServer.js';
+import type { PageContextInit, PageContextInternalInit } from '../renderPageServer.js';
+import '../../assertEnvServer.js';
 type PageContextCreatedServer = Awaited<ReturnType<typeof createPageContextServer>>;
-declare function createPageContextServer(pageContextInit: PageContextInit, globalContext: GlobalContextServerInternal, args: {
+declare function createPageContextServer(pageContextInit: PageContextInternalInit & {
+    headers?: Record<string, unknown>;
+}, globalContext: GlobalContextServerInternal, args: {
     requestId: number;
 } & ({
     isPrerendering: true;
@@ -22,21 +24,13 @@ declare function createPageContextServer(pageContextInit: PageContextInit, globa
     isPrerendering: boolean;
     _requestId: number;
 } & PageContextInit & {
+    _reqDev?: import("http").IncomingMessage;
+    _reqWeb?: Request;
+} & {
     _globalContext: ({
         _globalConfigPublic: {
             pages: {
-                [k: string]: {
-                    config: import("../../../types/index.js").ConfigResolved;
-                    _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                    _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                    _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-                } & ({
-                    route: import("../../../types/Config.js").Route;
-                    isErrorPage?: undefined;
-                } | {
-                    route?: undefined;
-                    isErrorPage: true;
-                });
+                [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
             };
             config: import("../../../types/index.js").ConfigResolved;
             _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -44,18 +38,7 @@ declare function createPageContextServer(pageContextInit: PageContextInit, globa
             _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         };
         pages: {
-            [k: string]: {
-                config: import("../../../types/index.js").ConfigResolved;
-                _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-                _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-                _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-            } & ({
-                route: import("../../../types/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
         };
         config: import("../../../types/index.js").ConfigResolved;
         _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -116,23 +99,17 @@ declare function createPageContextServer(pageContextInit: PageContextInit, globa
     _pageFilesAll: import("../../__internal/index.js").PageFile[];
     _baseServer: string;
     _baseAssets: string;
-    _pageContextInit: PageContextInit;
+    _pageContextInit: PageContextInit & {
+        _reqDev?: import("http").IncomingMessage;
+        _reqWeb?: Request;
+    } & {
+        headers?: Record<string, unknown>;
+    };
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {
     pages: {
-        [k: string]: {
-            config: import("../../../types/index.js").ConfigResolved;
-            _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-            _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-            _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
-        } & ({
-            route: import("../../../types/Config.js").Route;
-            isErrorPage?: undefined;
-        } | {
-            route?: undefined;
-            isErrorPage: true;
-        });
+        [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
     };
     config: import("../../../types/index.js").ConfigResolved;
     _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -154,4 +131,7 @@ declare function createPageContextServerWithoutGlobalContext(pageContextInit: Pa
     isClientSide: false;
     isPrerendering: boolean;
     _requestId: number;
-} & PageContextInit;
+} & PageContextInit & {
+    _reqDev?: import("http").IncomingMessage;
+    _reqWeb?: Request;
+};