vike 0.4.231 → 0.4.232-commit-ec54a7e

package/dist/cjs/node/runtime/renderPage/logErrorHint/errors.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.errror_cannot_use_import_outside_of_module = void 0;
+exports.error_cannot_use_import_outside_of_module = void 0;
 // https://github.com/vikejs/vike/discussions/571#discussioncomment-6137618
-exports.errror_cannot_use_import_outside_of_module = `
+exports.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/cjs/node/runtime/renderPage/logErrorHint.js

@@ -13,12 +13,12 @@ const errorsMisc = [
     {
         errMsg: 'window is not defined',
         link: 'https://vike.dev/hints#window-is-not-defined',
-        mustMentionNodeModules: false
+        mustMentionNodeModules: false,
     },
     {
         errMsg: 'jsxDEV is not a function',
         link: 'https://github.com/vikejs/vike/issues/1469#issuecomment-1919518096',
-        mustMentionNodeModules: false
+        mustMentionNodeModules: false,
     },
     {
         // ```
@@ -26,12 +26,12 @@ const errorsMisc = [
         // ```
         errMsg: 'assets.json',
         link: 'https://vike.dev/getGlobalContext',
-        mustMentionNodeModules: false
+        mustMentionNodeModules: false,
     },
     {
         errMsg: 'ERR_UNKNOWN_FILE_EXTENSION',
-        link: 'https://vike.dev/broken-npm-package#err-unknown-file-extension'
-    }
+        link: 'https://vike.dev/broken-npm-package#err-unknown-file-extension',
+    },
 ];
 const reactInvalidEelement = 'https://vike.dev/broken-npm-package#react-invalid-component';
 const errorsReact = [
@@ -39,17 +39,17 @@ const errorsReact = [
         errMsg: 'Element type is invalid: expected a string (for built-in components) or a class/function (for composite components)',
         link: reactInvalidEelement,
         // The stack trace can be user-land while the import is coming from node_modules
-        mustMentionNodeModules: false
+        mustMentionNodeModules: false,
     },
     {
         errMsg: 'Objects are not valid as a React child',
         link: reactInvalidEelement,
-        mustMentionNodeModules: false
+        mustMentionNodeModules: false,
     },
     {
         // React's "Invalid hook call.", see https://github.com/vikejs/vike/discussions/1637#discussioncomment-9424712
-        errMsg: "Cannot read properties of null (reading 'useContext')"
-    }
+        errMsg: "Cannot read properties of null (reading 'useContext')",
+    },
 ];
 const errorsCjsEsm_withPreciseLink = [
     {
@@ -57,8 +57,8 @@ const errorsCjsEsm_withPreciseLink = [
         errMsg: /Named export.*not found/i,
         link: 'https://vike.dev/broken-npm-package#named-export-not-found',
         // It seems that this always points to an npm package import.
-        mustMentionNodeModules: false
-    }
+        mustMentionNodeModules: false,
+    },
 ];
 const errorsCjsEsm = [
     { errMsg: 'ERR_UNSUPPORTED_DIR_IMPORT' },
@@ -71,7 +71,7 @@ const errorsCjsEsm = [
     {
         errMsg: 'Cannot use import statement',
         // Since user code is always ESM, this error must always originate from an npm package.
-        mustMentionNodeModules: false
+        mustMentionNodeModules: false,
     },
     { errMsg: 'is not exported' },
     { errMsg: 'Cannot read properties of undefined' },
@@ -82,7 +82,7 @@ const errorsCjsEsm = [
     { errMsg: 'module is not defined' },
     { errMsg: 'not defined in ES' },
     { errMsg: "Unexpected token 'export'" },
-    { errMsg: 'Failed to resolve entry for package' }
+    { errMsg: 'Failed to resolve entry for package' },
 ];
 function logErrorHint(error) {
     /* Collect errors for ./logErrorHint.spec.ts
@@ -118,11 +118,11 @@ function isKnownError(error) {
         ...errorsMisc,
         ...errorsReact,
         ...errorsCjsEsm_withPreciseLink,
-        ...errorsCjsEsm
-    ].find((knownErorr) => {
-        if (!includesLowercase(anywhere, knownErorr.errMsg))
+        ...errorsCjsEsm,
+    ].find((knownError) => {
+        if (!includesLowercase(anywhere, knownError.errMsg))
             return false;
-        if (knownErorr.mustMentionNodeModules !== false && !includesLowercase(anywhere, 'node_modules'))
+        if (knownError.mustMentionNodeModules !== false && !includesLowercase(anywhere, 'node_modules'))
             return false;
         return true;
     });
@@ -183,12 +183,12 @@ function collectError(err) {
         `  message: ${JSON.stringify(err.message)},`,
         `  code: ${JSON.stringify(err.code)},`,
         '  stack: `\n' + err.stack + '\n`',
-        '}'
+        '}',
     ].join('\n'));
     /* For reproductions using older vite-plugin-ssr versions, do one of the following.
         - If upon pre-rendering:https: //github.com/brillout/repro_node-syntax-error#error-catched-by-vite-plugin-ssr
         - Inject the logger inside `catch` in node_modules/vite-plugin-ssr/dist/esm/node/runtime/renderPage.js
-        - Inject the following inside `configResolved(config_)` at node_modules/vite-plugin-ssr/dist/cjs/node/plugin/plugins/devConfig/index.js
+        - Inject the following inside `configResolved(config_)` at node_modules/vite-plugin-ssr/dist/cjs/node/vite/plugins/pluginDev/index.js
           ```js
           config_.logger.error = (msg, options) => {
             const { error } = options;

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

@@ -1,6 +1,6 @@
 "use strict";
 // Logger used for the production server.
-// Any other environement (dev, preview, build, and pre-rendering) uses loggerNotProd.ts instead.
+// Any other environment (dev, preview, build, and pre-rendering) uses loggerNotProd.ts instead.
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -12,7 +12,7 @@ const isNewError_js_1 = require("./isNewError.js");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const logErrorHint_js_1 = require("./logErrorHint.js");
-function logErrorProd(err, _httpRquestId) {
+function logErrorProd(err, _httpRequestId) {
     (0, utils_js_1.warnIfErrorIsNotObject)(err);
     (0, isNewError_js_1.setAlreadyLogged)(err);
     if ((0, abort_js_1.isAbortError)(err)) {
@@ -27,7 +27,7 @@ function logErrorProd(err, _httpRquestId) {
 // Every server-side runtime error is expected to go through `onRuntimeError()`.
 //  - onRuntimeError(err) should always be called after `console.error(err)`.
 //    - Because the error hint of logErrorHint(err) should be shown *after* the error.
-//  - In principle, any runtime error is (or at least should) be catched by Vike, otherwise Vike couldn't render the error page.
+//  - In principle, any runtime error is (or at least should) be caught by Vike, otherwise Vike couldn't render the error page.
 function onRuntimeError(err) {
     // The more runtime errors we pass to logErrorHint() the better.
     (0, logErrorHint_js_1.logErrorHint)(err);

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

@@ -13,7 +13,7 @@ const createHttpResponse_js_1 = require("./createHttpResponse.js");
 const loadPageConfigsLazyServerSide_js_1 = require("./loadPageConfigsLazyServerSide.js");
 const executeOnRenderHtmlHook_js_1 = require("./executeOnRenderHtmlHook.js");
 const executeOnBeforeRenderAndDataHooks_js_1 = require("./executeOnBeforeRenderAndDataHooks.js");
-const loggerRuntime_js_1 = require("./loggerRuntime.js");
+const loggerRuntime_js_1 = require("../loggerRuntime.js");
 const isNewError_js_1 = require("./isNewError.js");
 const preparePageContextForPublicUsageServer_js_1 = require("./preparePageContextForPublicUsageServer.js");
 const executeGuardHook_js_1 = require("../../../shared/route/executeGuardHook.js");
@@ -25,8 +25,10 @@ async function renderPageAlreadyRouted(pageContext) {
     //  - ID of the error page `_error.page.js`.
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContext, 'pageId', 'string'));
     const isError = pageContext.is404 || !!pageContext.errorWhileRendering;
-    (0, utils_js_1.assert)(isError === (pageContext.pageId === (0, error_page_js_1.getErrorPageId)(pageContext._pageFilesAll, pageContext._pageConfigs)));
-    (0, utils_js_1.objectAssign)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSide)(pageContext));
+    (0, utils_js_1.assert)(isError ===
+        (pageContext.pageId ===
+            (0, error_page_js_1.getErrorPageId)(pageContext._globalContext._pageFilesAll, pageContext._globalContext._pageConfigs)));
+    (0, utils_js_1.augmentType)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSide)(pageContext));
     if (!isError) {
         await (0, executeGuardHook_js_1.executeGuardHook)(pageContext, (pageContext) => (0, preparePageContextForPublicUsageServer_js_1.preparePageContextForPublicUsageServer)(pageContext));
     }
@@ -61,7 +63,7 @@ async function renderPageAlreadyRouted(pageContext) {
 async function prerenderPage(pageContext) {
     (0, utils_js_1.objectAssign)(pageContext, {
         isClientSideNavigation: false,
-        _urlHandler: null
+        _urlHandler: null,
     });
     /* Should we execute the guard() hook upon pre-rendering? Is there a use case for this?
      *  - It isn't trivial to implement, as it requires to duplicate / factor out the isAbortError() handling

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

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveRedirects = resolveRedirects;
+exports.getStaticRedirectsForPrerender = getStaticRedirectsForPrerender;
 exports.resolveRouteStringRedirect = resolveRouteStringRedirect;
 const assertIsNotBrowser_js_1 = require("../../../utils/assertIsNotBrowser.js");
 const utils_js_1 = require("../../../shared/utils.js");
@@ -21,11 +22,22 @@ function resolveRedirects(redirectsAll, urlPathname) {
     }
     return null;
 }
+function getStaticRedirectsForPrerender(redirectsAll, showWarningUponDynamicRedirects) {
+    const redirects = merge(redirectsAll);
+    const redirectsStatic = {};
+    for (const [urlSource, urlTarget] of Object.entries(redirects)) {
+        assertRedirect(urlSource, urlTarget);
+        if ((0, resolveRouteString_js_1.isStaticRouteString)(urlSource)) {
+            redirectsStatic[urlSource] = urlTarget;
+        }
+        else if (showWarningUponDynamicRedirects) {
+            (0, utils_js_1.assertWarning)(false, `Dynamic redirect ${picocolors_1.default.cyan(urlSource)} -> ${picocolors_1.default.cyan(urlTarget)} cannot be pre-rendered. You can remove this warning by setting +prerender.partial to true (https://vike.dev/prerender#partial).`, { onlyOnce: true });
+        }
+    }
+    return redirectsStatic;
+}
 function resolveRouteStringRedirect(urlSource, urlTarget, urlPathname) {
-    (0, resolveRouteString_js_1.assertRouteString)(urlSource, `${redirectsErrPrefix} Invalid`);
-    // Is allowing any protocol a safety issue? https://github.com/vikejs/vike/pull/1292#issuecomment-1828043917
-    (0, utils_js_1.assertUsageUrlRedirectTarget)(urlTarget, `${redirectsErrPrefix} The URL redirection target`, true);
-    assertParams(urlSource, urlTarget);
+    assertRedirect(urlSource, urlTarget);
     const match = (0, resolveRouteString_js_1.resolveRouteString)(urlSource, urlPathname);
     if (!match)
         return null;
@@ -35,6 +47,12 @@ function resolveRouteStringRedirect(urlSource, urlTarget, urlPathname) {
     (0, utils_js_1.assert)((0, utils_js_1.isUrlRedirectTarget)(urlResolved));
     return urlResolved;
 }
+function assertRedirect(urlSource, urlTarget) {
+    (0, resolveRouteString_js_1.assertRouteString)(urlSource, `${redirectsErrPrefix} Invalid`);
+    // Is allowing any protocol a safety issue? https://github.com/vikejs/vike/pull/1292#issuecomment-1828043917
+    (0, utils_js_1.assertUsageUrlRedirectTarget)(urlTarget, `${redirectsErrPrefix} The URL redirection target`, true);
+    assertParams(urlSource, urlTarget);
+}
 function assertParams(urlSource, urlTarget) {
     const routeSegments = urlTarget.split('/');
     routeSegments.forEach((routeSegment) => {

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

@@ -13,20 +13,18 @@ const abort_js_1 = require("../../shared/route/abort.js");
 const globalContext_js_1 = require("./globalContext.js");
 const handlePageContextRequestUrl_js_1 = require("./renderPage/handlePageContextRequestUrl.js");
 const createHttpResponse_js_1 = require("./renderPage/createHttpResponse.js");
-const loggerRuntime_js_1 = require("./renderPage/loggerRuntime.js");
+const loggerRuntime_js_1 = require("./loggerRuntime.js");
 const isNewError_js_1 = require("./renderPage/isNewError.js");
 const assertArguments_js_1 = require("./renderPage/assertArguments.js");
 const index_js_2 = require("./renderPage/log404/index.js");
-const isVikeConfigInvalid_js_1 = require("./renderPage/isVikeConfigInvalid.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const serializeContext_js_1 = require("./html/serializeContext.js");
 const error_page_js_1 = require("../../shared/error-page.js");
 const handleErrorWithoutErrorPage_js_1 = require("./renderPage/handleErrorWithoutErrorPage.js");
 const loadPageConfigsLazyServerSide_js_1 = require("./renderPage/loadPageConfigsLazyServerSide.js");
 const resolveRedirects_js_1 = require("./renderPage/resolveRedirects.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage.ts', {
-    httpRequestsCount: 0
-});
+const getVikeConfigError_js_1 = require("../shared/getVikeConfigError.js");
+const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage.ts', { httpRequestsCount: 0 });
 // `renderPage()` calls `renderPageNominal()` while ensuring that errors are `console.error(err)` instead of `throw err`, so that Vike never triggers a server shut down. (Throwing an error in an Express.js middleware shuts down the whole Express.js server.)
 async function renderPage(pageContextInit) {
     (0, assertArguments_js_1.assertArguments)(...arguments);
@@ -47,7 +45,7 @@ async function renderPage(pageContextInit) {
 }
 // Fallback wrapper if node:async_hooks isn't available
 let asyncHookWrapper = async (_httpRequestId, ret) => ({
-    pageContextReturn: await ret()
+    pageContextReturn: await ret(),
 });
 // Add node:async_hooks wrapper
 function renderPage_addAsyncHookwrapper(wrapper) {
@@ -55,10 +53,11 @@ function renderPage_addAsyncHookwrapper(wrapper) {
 }
 async function renderPagePrepare(pageContextInit, httpRequestId) {
     // Invalid config
-    if (isVikeConfigInvalid_js_1.isVikeConfigInvalid &&
-        true // Make TS happy
-    ) {
-        return getPageContextInvalidVikeConfig(isVikeConfigInvalid_js_1.isVikeConfigInvalid.err, pageContextInit, httpRequestId);
+    {
+        const vikeConfigError = (0, getVikeConfigError_js_1.getVikeConfigError)();
+        if (vikeConfigError) {
+            return getPageContextInvalidVikeConfig(vikeConfigError.err, pageContextInit, httpRequestId);
+        }
     }
     // Prepare context
     try {
@@ -69,17 +68,20 @@ async function renderPagePrepare(pageContextInit, httpRequestId) {
         // ```bash
         // Re-build your app (you're using 1.2.3 but your app was built with 1.2.2)
         // ```
-        // initGlobalContext_renderPage() doens't call any user hook => err isn't thrown from user code.
+        // initGlobalContext_renderPage() doesn't call any user hook => err isn't thrown from user code.
         (0, utils_js_1.assert)(!(0, abort_js_1.isAbortError)(err));
         (0, loggerRuntime_js_1.logRuntimeError)(err, httpRequestId);
         const pageContextWithError = getPageContextHttpResponseErrorWithoutGlobalContext(err, pageContextInit);
         return pageContextWithError;
     }
-    if (isVikeConfigInvalid_js_1.isVikeConfigInvalid) {
-        return getPageContextInvalidVikeConfig(isVikeConfigInvalid_js_1.isVikeConfigInvalid.err, pageContextInit, httpRequestId);
-    }
-    else {
-        // `globalContext` now contains the entire Vike config and getVikeConfig() isn't called anymore for this request.
+    {
+        const vikeConfigError = (0, getVikeConfigError_js_1.getVikeConfigError)();
+        if (vikeConfigError) {
+            return getPageContextInvalidVikeConfig(vikeConfigError.err, pageContextInit, httpRequestId);
+        }
+        else {
+            // `globalContext` now contains the entire Vike config and getVikeConfig() isn't called anymore for this request.
+        }
     }
     const { globalContext } = await (0, globalContext_js_1.getGlobalContextServerInternal)();
     const pageContextBegin = await getPageContextBegin(pageContextInit, globalContext, httpRequestId);
@@ -141,59 +143,66 @@ async function renderPageAlreadyPrepared(pageContextBegin, globalContext, httpRe
     else {
         (0, utils_js_1.assert)(errNominalPage);
         (0, utils_js_1.assert)(pageContextNominalPageSuccess === undefined);
-        (0, utils_js_1.assert)(pageContextNominalPageBegin);
-        (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextNominalPageBegin, 'urlOriginal', 'string'));
-        const pageContextErrorPageInit = await getPageContextErrorPageInit(pageContextBegin, errNominalPage, pageContextNominalPageBegin);
-        // Handle `throw redirect()` and `throw render()` while rendering nominal page
-        if ((0, abort_js_1.isAbortError)(errNominalPage)) {
-            const handled = await handleAbortError(errNominalPage, pageContextsFromRewrite, pageContextBegin, pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalContext);
-            if (handled.pageContextReturn) {
-                // - throw redirect()
-                // - throw render(url)
-                // - throw render(abortStatusCode) if .pageContext.json request
-                return handled.pageContextReturn;
-            }
-            else {
-                // - throw render(abortStatusCode) if not .pageContext.json request
-            }
-            Object.assign(pageContextErrorPageInit, handled.pageContextAbort);
+        return await renderPageOnError(errNominalPage, pageContextBegin, pageContextNominalPageBegin, globalContext, httpRequestId, pageContextsFromRewrite);
+    }
+}
+// When the normal page threw an error
+// - Can be a URL rewrite upon `throw render('/some-url')`
+// - Can be rendering the error page
+// - Can be rendering Vike's generic error page (if no error page is defined, or if the error page throws an error)
+async function renderPageOnError(errNominalPage, pageContextBegin, pageContextNominalPageBegin, globalContext, httpRequestId, pageContextsFromRewrite) {
+    (0, utils_js_1.assert)(pageContextNominalPageBegin);
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextNominalPageBegin, 'urlOriginal', 'string'));
+    const pageContextErrorPageInit = await getPageContextErrorPageInit(pageContextBegin, errNominalPage, pageContextNominalPageBegin);
+    // Handle `throw redirect()` and `throw render()` while rendering nominal page
+    if ((0, abort_js_1.isAbortError)(errNominalPage)) {
+        const handled = await handleAbortError(errNominalPage, pageContextsFromRewrite, pageContextBegin, pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalContext);
+        if (handled.pageContextReturn) {
+            // - throw redirect()
+            // - throw render(url)
+            // - throw render(abortStatusCode) if .pageContext.json request
+            return handled.pageContextReturn;
         }
-        {
-            const errorPageId = (0, error_page_js_1.getErrorPageId)(globalContext._pageFilesAll, globalContext._pageConfigs);
-            if (!errorPageId) {
-                (0, utils_js_1.objectAssign)(pageContextErrorPageInit, { pageId: null });
-                return (0, handleErrorWithoutErrorPage_js_1.handleErrorWithoutErrorPage)(pageContextErrorPageInit);
-            }
-            else {
-                (0, utils_js_1.objectAssign)(pageContextErrorPageInit, { pageId: errorPageId });
-            }
+        else {
+            // - throw render(abortStatusCode) if not .pageContext.json request
         }
-        let pageContextErrorPage;
-        try {
-            pageContextErrorPage = await (0, renderPageAlreadyRouted_js_1.renderPageAlreadyRouted)(pageContextErrorPageInit);
+        Object.assign(pageContextErrorPageInit, handled.pageContextAbort);
+    }
+    {
+        const errorPageId = (0, error_page_js_1.getErrorPageId)(globalContext._pageFilesAll, globalContext._pageConfigs);
+        if (!errorPageId) {
+            (0, utils_js_1.objectAssign)(pageContextErrorPageInit, { pageId: null });
+            return (0, handleErrorWithoutErrorPage_js_1.handleErrorWithoutErrorPage)(pageContextErrorPageInit);
         }
-        catch (errErrorPage) {
-            // Handle `throw redirect()` and `throw render()` while rendering error page
-            if ((0, abort_js_1.isAbortError)(errErrorPage)) {
-                const handled = await handleAbortError(errErrorPage, pageContextsFromRewrite, pageContextBegin, pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalContext);
-                // throw render(abortStatusCode)
-                if (!handled.pageContextReturn) {
-                    const pageContextAbort = errErrorPage._pageContextAbort;
-                    (0, utils_js_1.assertWarning)(false, `Failed to render error page because ${picocolors_1.default.cyan(pageContextAbort._abortCall)} was called: make sure ${picocolors_1.default.cyan(pageContextAbort._abortCaller)} doesn't occur while the error page is being rendered.`, { onlyOnce: false });
-                    const pageContextHttpWithError = getPageContextHttpResponseError(errNominalPage, pageContextBegin);
-                    return pageContextHttpWithError;
-                }
-                // `throw redirect()` / `throw render(url)`
-                return handled.pageContextReturn;
-            }
-            if ((0, isNewError_js_1.isNewError)(errErrorPage, errNominalPage)) {
-                (0, loggerRuntime_js_1.logRuntimeError)(errErrorPage, httpRequestId);
+        else {
+            (0, utils_js_1.objectAssign)(pageContextErrorPageInit, { pageId: errorPageId });
+        }
+    }
+    let pageContextErrorPage;
+    try {
+        pageContextErrorPage = await (0, renderPageAlreadyRouted_js_1.renderPageAlreadyRouted)(pageContextErrorPageInit);
+    }
+    catch (errErrorPage) {
+        // Handle `throw redirect()` and `throw render()` while rendering error page
+        if ((0, abort_js_1.isAbortError)(errErrorPage)) {
+            const handled = await handleAbortError(errErrorPage, pageContextsFromRewrite, pageContextBegin, pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalContext);
+            // throw render(abortStatusCode)
+            if (!handled.pageContextReturn) {
+                const pageContextAbort = errErrorPage._pageContextAbort;
+                (0, utils_js_1.assertWarning)(false, `Failed to render error page because ${picocolors_1.default.cyan(pageContextAbort._abortCall)} was called: make sure ${picocolors_1.default.cyan(pageContextAbort._abortCaller)} doesn't occur while the error page is being rendered.`, { onlyOnce: false });
+                const pageContextHttpWithError = getPageContextHttpResponseError(errNominalPage, pageContextBegin);
+                return pageContextHttpWithError;
             }
-            const pageContextWithError = getPageContextHttpResponseError(errNominalPage, pageContextBegin);
-            return pageContextWithError;
+            // `throw redirect()` / `throw render(url)`
+            return handled.pageContextReturn;
         }
-        return pageContextErrorPage;
+        if ((0, isNewError_js_1.isNewError)(errErrorPage, errNominalPage)) {
+            (0, loggerRuntime_js_1.logRuntimeError)(errErrorPage, httpRequestId);
+        }
+        const pageContextWithError = getPageContextHttpResponseError(errNominalPage, pageContextBegin);
+        return pageContextWithError;
     }
+    return pageContextErrorPage;
 }
 function logHttpRequest(urlOriginal, httpRequestId) {
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(getRequestInfoMessage(urlOriginal), httpRequestId, 'info');
@@ -216,7 +225,7 @@ function logHttpResponse(urlOriginalPretty, httpRequestId, pageContextReturn) {
             //   - Maybe we can/should make the error available at pageContext.errorWhileRendering
             (0, utils_js_1.assert)(errorWhileRendering === null || errorWhileRendering === undefined);
             msg = `HTTP response ${prettyUrl(urlOriginalPretty)} ${picocolors_1.default.dim('null')}`;
-            // Erroneous value (it shoud sometimes be `false`) but it's fine as it doesn't seem to have much of an impact.
+            // Erroneous value (it should sometimes be `false`) but it's fine as it doesn't seem to have much of an impact.
             isNominal = true;
         }
         else {
@@ -254,7 +263,7 @@ function getPageContextHttpResponseError(err, pageContextBegin) {
     const httpResponse = (0, createHttpResponse_js_1.createHttpResponseError)(pageContextBegin);
     (0, utils_js_1.objectAssign)(pageContextWithError, {
         httpResponse,
-        errorWhileRendering: err
+        errorWhileRendering: err,
     });
     return pageContextWithError;
 }
@@ -263,7 +272,7 @@ function getPageContextHttpResponseErrorWithoutGlobalContext(err, pageContextIni
     const httpResponse = (0, createHttpResponse_js_1.createHttpResponseErrorWithoutGlobalContext)();
     (0, utils_js_1.objectAssign)(pageContextWithError, {
         httpResponse,
-        errorWhileRendering: err
+        errorWhileRendering: err,
     });
     return pageContextWithError;
 }
@@ -275,7 +284,7 @@ async function renderPageNominal(pageContext) {
         (0, utils_js_1.objectAssign)(pageContext, pageContextFromRoute);
         (0, utils_js_1.objectAssign)(pageContext, { is404: pageContext.pageId ? null : true });
         if (pageContext.pageId === null) {
-            const errorPageId = (0, error_page_js_1.getErrorPageId)(pageContext._pageFilesAll, pageContext._pageConfigs);
+            const errorPageId = (0, error_page_js_1.getErrorPageId)(pageContext._globalContext._pageFilesAll, pageContext._globalContext._pageConfigs);
             if (!errorPageId) {
                 (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContext, 'pageId', 'null'));
                 return (0, handleErrorWithoutErrorPage_js_1.handleErrorWithoutErrorPage)(pageContext);
@@ -296,10 +305,10 @@ async function getPageContextErrorPageInit(pageContextBegin, errNominalPage, pag
     (0, utils_js_1.objectAssign)(pageContext, {
         is404: false,
         errorWhileRendering: errNominalPage,
-        routeParams: {}
+        routeParams: {},
     });
     (0, utils_js_1.objectAssign)(pageContext, {
-        _debugRouteMatches: pageContextNominalPagePartial._debugRouteMatches || 'ROUTING_ERROR'
+        _debugRouteMatches: pageContextNominalPagePartial._debugRouteMatches || 'ROUTING_ERROR',
     });
     (0, utils_js_1.assert)(pageContext.errorWhileRendering);
     return pageContext;
@@ -310,8 +319,8 @@ async function getPageContextBegin(pageContextInit, globalContext, httpRequestId
         isPrerendering: false,
         ssr: {
             urlHandler: _urlHandler,
-            isClientSideNavigation
-        }
+            isClientSideNavigation,
+        },
     });
     (0, utils_js_1.objectAssign)(pageContextBegin, { _httpRequestId: httpRequestId });
     return pageContextBegin;
@@ -320,7 +329,7 @@ function handlePageContextUrl(urlOriginal) {
     const { isPageContextRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
     return {
         isClientSideNavigation: isPageContextRequest,
-        _urlHandler: (url) => (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(url).urlWithoutPageContextRequestSuffix
+        _urlHandler: (url) => (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(url).urlWithoutPageContextRequestSuffix,
     };
 }
 function getRequestId() {
@@ -415,7 +424,7 @@ pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalCont
             (0, utils_js_1.objectAssign)(pageContext, { pageId: errorPageId });
             (0, utils_js_1.objectAssign)(pageContext, pageContextAbort);
             (0, utils_js_1.objectAssign)(pageContext, pageContextErrorPageInit, true);
-            (0, utils_js_1.objectAssign)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSide)(pageContext));
+            (0, utils_js_1.augmentType)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSide)(pageContext));
             // We include pageContextInit: we don't only serialize pageContextAbort because the error page may need to access pageContextInit
             pageContextSerialized = (0, serializeContext_js_1.getPageContextClientSerialized)(pageContext);
         }
@@ -429,7 +438,7 @@ pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalCont
     if (pageContextAbort._urlRewrite) {
         const pageContextReturn = await renderPageAlreadyPrepared(pageContextBegin, globalContext, httpRequestId, [
             ...pageContextsFromRewrite,
-            pageContextAbort
+            pageContextAbort,
         ]);
         Object.assign(pageContextReturn, pageContextAbort);
         return { pageContextReturn };
@@ -454,7 +463,7 @@ async function checkBaseUrl(pageContextBegin, globalContext) {
     const httpResponse = (0, createHttpResponse_js_1.createHttpResponseBaseIsMissing)(urlOriginal, baseServer);
     (0, utils_js_1.objectAssign)(pageContext, {
         httpResponse,
-        isBaseMissing: true
+        isBaseMissing: true,
     });
     (0, utils_js_1.checkType)(pageContext);
     return pageContext;
@@ -469,7 +478,7 @@ function getPageContextSkipRequest(pageContextInit) {
     if (urlPathnameWithBase.endsWith('.well-known/appspecific/com.chrome.devtools.json')) {
         // https://chromium.googlesource.com/devtools/devtools-frontend/+/main/docs/ecosystem/automatic_workspace_folders.md
         // https://www.reddit.com/r/node/comments/1kcr0wh/odd_request_coming_into_my_localhost_server_from/
-        errMsg404 = 'Not spported';
+        errMsg404 = 'Not supported';
     }
     if (!errMsg404)
         return;
@@ -480,7 +489,7 @@ function getPageContextSkipRequest(pageContextInit) {
     return pageContext;
 }
 function getPageContextInvalidVikeConfig(err, pageContextInit, httpRequestId) {
-    (0, loggerRuntime_js_1.logRuntimeInfo)?.(picocolors_1.default.bold(picocolors_1.default.red('Error while loading a Vike config file, see error above.')), httpRequestId, 'error');
+    (0, loggerRuntime_js_1.logRuntimeInfo)?.(picocolors_1.default.bold(picocolors_1.default.red('Error loading Vike config — see error above')), httpRequestId, 'error');
     const pageContextWithError = getPageContextHttpResponseErrorWithoutGlobalContext(err, pageContextInit);
     return pageContextWithError;
 }

package/dist/cjs/node/runtime/universal-middleware.js

@@ -8,13 +8,13 @@ async function universalVikeHandler(request, context, runtime) {
         ...runtime,
         runtime,
         urlOriginal: request.url,
-        headersOriginal: request.headers
+        headersOriginal: request.headers,
     };
     const pageContext = await (0, index_js_1.renderPage)(pageContextInit);
     const response = pageContext.httpResponse;
     const readable = response.getReadableWebStream();
     return new Response(readable, {
         status: response.statusCode,
-        headers: response.headers
+        headers: response.headers,
     });
 }

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

@@ -53,7 +53,7 @@ __exportStar(require("../../utils/freezePartial.js"), exports);
 __exportStar(require("../../utils/parseNpmPackage.js"), exports);
 __exportStar(require("../../utils/isNullish.js"), exports);
 __exportStar(require("../../utils/isScriptFile.js"), exports);
-__exportStar(require("../../utils/removeFileExtention.js"), exports);
+__exportStar(require("../../utils/removeFileExtension.js"), exports);
 __exportStar(require("../../utils/objectKeys.js"), exports);
 __exportStar(require("../../utils/objectEntries.js"), exports);
 __exportStar(require("../../utils/objectFromEntries.js"), exports);

package/dist/cjs/node/runtime-dev/createDevMiddleware.js

@@ -18,9 +18,9 @@ async function createDevMiddleware(options = {}) {
             root: options.root ?? options.viteConfig?.root,
             server: {
                 ...options.viteConfig?.server,
-                middlewareMode: options.viteConfig?.server?.middlewareMode ?? true
-            }
-        }
+                middlewareMode: options.viteConfig?.server?.middlewareMode ?? true,
+            },
+        },
     };
     const { viteConfigFromUserEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(optionsMod, 'dev');
     const server = await (0, vite_1.createServer)(viteConfigFromUserEnhanced);

package/dist/cjs/node/shared/extractAssetsQuery.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractAssetsAddQuery = extractAssetsAddQuery;
 exports.extractAssetsRemoveQuery = extractAssetsRemoveQuery;
-// We import from node/utils.ts insead of node/plugin/utils.ts because this file is loaded by the server runtime
+// We import from node/utils.ts instead of node/vite/utils.ts because this file is loaded by the server runtime
 const utils_js_1 = require("./utils.js");
 const query = 'extractAssets';
 function extractAssetsAddQuery(id) {

package/dist/cjs/node/shared/getVikeConfigError.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVikeConfigError = getVikeConfigError;
+exports.getVikeConfigErrorBuild = getVikeConfigErrorBuild;
+exports.setVikeConfigError = setVikeConfigError;
+const utils_js_1 = require("./utils.js");
+const globalObject = (0, utils_js_1.getGlobalObject)('node/shared/getVikeConfigError.ts', {
+    errorRuntime: false,
+    errorBuild: false,
+});
+function setVikeConfigError(val) {
+    if ('errorRuntime' in val)
+        globalObject.errorRuntime = val.errorRuntime;
+    if ('errorBuild' in val)
+        globalObject.errorBuild = val.errorBuild;
+}
+function getVikeConfigError() {
+    return globalObject.errorBuild || globalObject.errorRuntime;
+}
+function getVikeConfigErrorBuild() {
+    return globalObject.errorBuild;
+}

package/dist/cjs/node/shared/resolveBase.js

@@ -30,6 +30,6 @@ function resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolve
     (0, utils_js_1.assert)((0, utils_js_1.isBaseServer)(baseServer));
     return {
         baseServer,
-        baseAssets
+        baseAssets,
     };
 }

package/dist/cjs/node/shared/utils.js

@@ -18,6 +18,7 @@ const assertIsNotBrowser_js_1 = require("../../utils/assertIsNotBrowser.js");
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 __exportStar(require("../../utils/assert.js"), exports);
 __exportStar(require("../../utils/getFileExtension.js"), exports);
+__exportStar(require("../../utils/getGlobalObject.js"), exports);
 __exportStar(require("../../utils/isPlainObject.js"), exports);
 __exportStar(require("../../utils/checkType.js"), exports);
 __exportStar(require("../../utils/hasProp.js"), exports);