vike 0.4.152 → 0.4.153-commit-01ab602

package/dist/cjs/node/cli/bin.js

@@ -12,8 +12,8 @@ cli
     assertOptions();
     const { partial, noExtraDir, base, parallel, outDir, configFile } = options;
     const root = options.root && (0, path_1.resolve)(options.root);
-    await (0, runPrerender_js_1.prerenderFromCLI)({ partial, noExtraDir, base, root, parallel, outDir, configFile });
-    (0, runPrerender_js_1.prerenderForceExit)();
+    await (0, runPrerender_js_1.runPrerenderFromCLI)({ partial, noExtraDir, base, root, parallel, outDir, configFile });
+    (0, runPrerender_js_1.runPrerender_forceExit)();
 });
 function assertOptions() {
     // Using process.argv because cac convert names to camelCase

package/dist/cjs/node/plugin/index.js

@@ -27,7 +27,7 @@ const extensionsAssets_js_1 = require("./plugins/extensionsAssets.js");
 const baseUrls_js_1 = require("./plugins/baseUrls.js");
 const envVars_js_1 = require("./plugins/envVars.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const assertFileEnv_js_1 = require("./plugins/assertFileEnv.js");
+const fileEnv_js_1 = require("./plugins/fileEnv.js");
 (0, utils_js_2.markEnvAsVite)();
 // Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
 function plugin(vikeConfig) {
@@ -50,7 +50,7 @@ function plugin(vikeConfig) {
         (0, extensionsAssets_js_1.extensionsAssets)(),
         (0, baseUrls_js_1.baseUrls)(vikeConfig),
         (0, envVars_js_1.envVarsPlugin)(),
-        (0, assertFileEnv_js_1.assertFileEnv)()
+        (0, fileEnv_js_1.fileEnv)()
     ];
     return plugins;
 }

package/dist/cjs/node/plugin/plugins/autoFullBuild.js

@@ -50,7 +50,7 @@ function autoFullBuild() {
                 order: 'post',
                 handler() {
                     if (forceExit) {
-                        (0, runPrerender_js_1.prerenderForceExit)();
+                        (0, runPrerender_js_1.runPrerender_forceExit)();
                     }
                 }
             }
@@ -84,7 +84,7 @@ async function triggerFullBuild(config, configVike, bundle) {
         }
     });
     if (configVike.prerender && !configVike.prerender.disableAutoRun) {
-        await (0, runPrerender_js_1.prerenderFromAutoFullBuild)({ viteConfig: configInline });
+        await (0, runPrerender_js_1.runPrerenderFromAutoFullBuild)({ viteConfig: configInline });
         forceExit = true;
     }
 }

package/dist/cjs/node/plugin/plugins/envVars.js

@@ -7,7 +7,7 @@ function envVarsPlugin() {
     let envsAll;
     let config;
     return {
-        name: 'vike:env',
+        name: 'vike:envVars',
         enforce: 'post',
         configResolved(config_) {
             config = config_;

package/dist/cjs/node/plugin/plugins/{assertFileEnv.js → fileEnv.js}

@@ -3,16 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertFileEnv = void 0;
+exports.fileEnv = void 0;
 const utils_js_1 = require("../utils.js");
 const extractAssetsPlugin_js_1 = require("./extractAssetsPlugin.js");
 const extractExportNamesPlugin_js_1 = require("./extractExportNamesPlugin.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function assertFileEnv() {
+function fileEnv() {
     let config;
     let isDev = false;
     return {
-        name: 'vike:assertFileEnv',
+        name: 'vike:fileEnv',
         // - We need to set `enforce: 'pre'` because, otherwise, the resolvedId() hook of Vite's internal plugin `vite:resolve` is called before and it doesn't seem to call `this.resolve()` which means that the resolveId() hook below is never called.
         //   - Vite's `vite:resolve` plugin: https://github.com/vitejs/vite/blob/d649daba7682791178b711d9a3e44a6b5d00990c/packages/vite/src/node/plugins/resolve.ts#L105
         // - It's actually a good thing if the resolveId() hook below is the first one to be called because it doesn't actually resolve any ID, so all other resolveId() hooks will be called as normal. And with `this.resolve()` we get the information we want from all other resolvedId() hooks.
@@ -104,4 +104,4 @@ function assertFileEnv() {
         }
     };
 }
-exports.assertFileEnv = assertFileEnv;
+exports.fileEnv = fileEnv;

package/dist/cjs/node/plugin/plugins/importBuild/index.js

@@ -51,7 +51,7 @@ function getEntryCode(config, configVike) {
         '  setImportBuildGetters({',
         `    pageFiles: () => pageFiles,`,
         // TODO: rename clientManifest -> assetManifest
-        `    clientManifest: () => { return ${ASSETS_MAP} },`,
+        `    clientManifest: () => (${ASSETS_MAP}),`,
         // TODO: rename pluginManifest -> vikeManifest
         `    pluginManifest: () => (${JSON.stringify(vikeManifest, null, 2)}),`,
         '  });',

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js

@@ -834,7 +834,7 @@ function getConfigName(filePath) {
     if ((0, transpileAndExecuteFile_js_1.isTmpFile)(filePath))
         return null;
     const fileName = path_1.default.posix.basename(filePath);
-    assertNoUnexpectedPlusSign(filePath, fileName);
+    // assertNoUnexpectedPlusSign(filePath, fileName)
     const basename = fileName.split('.')[0];
     if (!basename.startsWith('+')) {
         return null;
@@ -844,14 +844,6 @@ function getConfigName(filePath) {
         return configName;
     }
 }
-function assertNoUnexpectedPlusSign(filePath, fileName) {
-    const dirs = path_1.default.posix.dirname(filePath).split('/');
-    dirs.forEach((dir, i) => {
-        const dirPath = dirs.slice(0, i + 1).join('/');
-        (0, utils_js_1.assertUsage)(!dir.includes('+'), `Character '+' is a reserved character: remove '+' from the directory name ${dirPath}/`);
-    });
-    (0, utils_js_1.assertUsage)(!fileName.slice(1).includes('+'), `Character '+' is only allowed at the beginning of filenames: make sure ${filePath} doesn't contain any '+' in its filename other than its first letter`);
-}
 async function loadConfigFile(configFilePath, userRootDir, visited) {
     const { filePathAbsoluteFilesystem } = configFilePath;
     assertNoInfiniteLoop(visited, filePathAbsoluteFilesystem);

package/dist/cjs/node/prerender/index.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prerender = void 0;
 var runPrerender_js_1 = require("./runPrerender.js");
-Object.defineProperty(exports, "prerender", { enumerable: true, get: function () { return runPrerender_js_1.prerenderFromAPI; } });
+Object.defineProperty(exports, "prerender", { enumerable: true, get: function () { return runPrerender_js_1.runPrerenderFromAPI; } });

package/dist/cjs/node/prerender/runPrerender.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prerenderForceExit = exports.prerenderFromAutoFullBuild = exports.prerenderFromCLI = exports.prerenderFromAPI = void 0;
+exports.runPrerender_forceExit = exports.runPrerenderFromAutoFullBuild = exports.runPrerenderFromCLI = exports.runPrerenderFromAPI = void 0;
 require("../runtime/page-files/setup.js");
 const path_1 = __importDefault(require("path"));
 const index_js_1 = require("../../shared/route/index.js");
@@ -47,24 +47,25 @@ const error_page_js_1 = require("../../shared/error-page.js");
 const addUrlComputedProps_js_1 = require("../../shared/addUrlComputedProps.js");
 const assertPathIsFilesystemAbsolute_js_1 = require("../../utils/assertPathIsFilesystemAbsolute.js");
 const abort_js_1 = require("../../shared/route/abort.js");
-const loadPageFilesServerSide_js_1 = require("../runtime/renderPage/loadPageFilesServerSide.js");
+const loadUserFilesServerSide_js_1 = require("../runtime/renderPage/loadUserFilesServerSide.js");
 const getHook_js_1 = require("../../shared/hooks/getHook.js");
 const noRouteMatch_js_1 = require("../../shared/route/noRouteMatch.js");
 const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
-async function prerenderFromAPI(options = {}) {
+async function runPrerenderFromAPI(options = {}) {
     await runPrerender(options, 'prerender()');
 }
-exports.prerenderFromAPI = prerenderFromAPI;
-async function prerenderFromCLI(options) {
+exports.runPrerenderFromAPI = runPrerenderFromAPI;
+async function runPrerenderFromCLI(options) {
     await runPrerender(options, '$ vike prerender');
 }
-exports.prerenderFromCLI = prerenderFromCLI;
-async function prerenderFromAutoFullBuild(options) {
+exports.runPrerenderFromCLI = runPrerenderFromCLI;
+async function runPrerenderFromAutoFullBuild(options) {
     await runPrerender(options, null);
 }
-exports.prerenderFromAutoFullBuild = prerenderFromAutoFullBuild;
+exports.runPrerenderFromAutoFullBuild = runPrerenderFromAutoFullBuild;
 async function runPrerender(options, manuallyTriggered) {
     checkOutdatedOptions(options);
+    (0, getHook_js_1.setIsPrerenderering)();
     const logLevel = !!options.onPagePrerender ? 'warn' : 'info';
     if (logLevel === 'info') {
         console.log(`${picocolors_1.default.cyan(`vike v${utils_js_1.projectInfo.projectVersion}`)} ${picocolors_1.default.green('pre-rendering HTML...')}`);
@@ -297,7 +298,7 @@ async function handlePagesWithStaticRoutes(prerenderContext, renderContext, doNo
                 }
             ]
         });
-        (0, utils_js_1.objectAssign)(pageContext, await (0, loadPageFilesServerSide_js_1.loadPageFilesServerSide)(pageContext));
+        (0, utils_js_1.objectAssign)(pageContext, await (0, loadUserFilesServerSide_js_1.loadUserFilesServerSide)(pageContext));
         prerenderContext.pageContexts.push(pageContext);
     })));
 }
@@ -477,7 +478,7 @@ async function routeAndPrerender(prerenderContext, concurrencyLimit, onComplete)
         (0, utils_js_1.assert)(pageContextFromRoute._pageId);
         (0, utils_js_1.objectAssign)(pageContext, pageContextFromRoute);
         const { _pageId: pageId } = pageContext;
-        (0, utils_js_1.objectAssign)(pageContext, await (0, loadPageFilesServerSide_js_1.loadPageFilesServerSide)(pageContext));
+        (0, utils_js_1.objectAssign)(pageContext, await (0, loadUserFilesServerSide_js_1.loadUserFilesServerSide)(pageContext));
         let usesClientRouter;
         {
             if (pageContext._pageConfigs.length > 0) {
@@ -700,7 +701,7 @@ function isSameUrl(url1, url2) {
 function normalizeUrl(url) {
     return '/' + url.split('/').filter(Boolean).join('/');
 }
-function prerenderForceExit() {
+function runPrerender_forceExit() {
     // Force exit; known situations where pre-rendering is hanging:
     //  - https://github.com/vikejs/vike/discussions/774#discussioncomment-5584551
     //  - https://github.com/vikejs/vike/issues/807#issuecomment-1519010902
@@ -710,10 +711,17 @@ function prerenderForceExit() {
     assertInfo(false, "Pre-rendering was forced exit. (Didn't gracefully exit because the event queue isn't empty. This is usally fine, see ...", { onlyOnce: false })
     */
 }
-exports.prerenderForceExit = prerenderForceExit;
+exports.runPrerender_forceExit = runPrerender_forceExit;
 function assertIsNotAbort(err, urlOr404) {
     if (!(0, abort_js_1.isAbortError)(err))
         return;
     const pageContextAbort = err._pageContextAbort;
-    (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.cyan(pageContextAbort._abortCall)} intercepted while pre-rendering ${urlOr404} but ${picocolors_1.default.cyan(pageContextAbort._abortCaller)} isn't supported for pre-rendered pages`);
+    const hookLoc = (0, utils_js_1.isUserHookError)(err);
+    (0, utils_js_1.assert)(hookLoc);
+    const thrownBy = ` by ${picocolors_1.default.cyan(`${hookLoc.hookName}()`)} hook defined at ${hookLoc.hookFilePath}`;
+    const abortCaller = pageContextAbort._abortCaller;
+    (0, utils_js_1.assert)(abortCaller);
+    const abortCall = pageContextAbort._abortCall;
+    (0, utils_js_1.assert)(abortCall);
+    (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.cyan(abortCall)} thrown${thrownBy} while pre-rendering ${urlOr404} but ${picocolors_1.default.cyan(abortCaller)} isn't supported for pre-rendered pages`);
 }

package/dist/cjs/node/runtime/html/serializePageContextClientSide.js

@@ -10,6 +10,8 @@ const error_page_js_1 = require("../../../shared/error-page.js");
 const addIs404ToPageProps_js_1 = require("../../../shared/addIs404ToPageProps.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const notSerializable_js_1 = require("../../../shared/notSerializable.js");
+const pageContextInitIsPassedToClient_js_1 = require("../../../shared/misc/pageContextInitIsPassedToClient.js");
+const isRenderFailure_js_1 = require("../../../shared/misc/isRenderFailure.js");
 const PASS_TO_CLIENT = [
     'abortReason',
     '_urlRewrite',
@@ -19,11 +21,11 @@ const PASS_TO_CLIENT = [
     /* Not needed on the client-side
     '_abortCaller',
     */
-    '_pageContextInitHasClientData',
+    pageContextInitIsPassedToClient_js_1.pageContextInitIsPassedToClient,
     '_pageId',
     'data' // for data() hook
 ];
-const PASS_TO_CLIENT_ERROR_PAGE = ['pageProps', 'is404', '_isError'];
+const PASS_TO_CLIENT_ERROR_PAGE = ['pageProps', 'is404', isRenderFailure_js_1.isRenderFailure];
 function serializePageContextClientSide(pageContext) {
     const passToClient = getPassToClient(pageContext);
     const pageContextClient = {};
@@ -32,7 +34,7 @@ function serializePageContextClientSide(pageContext) {
         pageContextClient[prop] = pageContext[prop];
     });
     if (Object.keys(pageContext._pageContextInit).some((p) => passToClient.includes(p))) {
-        pageContextClient._pageContextInitHasClientData = true;
+        pageContextClient._pageContextInitIsPassedToClient = true;
     }
     let pageContextSerialized;
     try {

package/dist/cjs/node/runtime/html/stream.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isStreamWritableNode = exports.isStreamWritableWeb = exports.streamPipeNodeToString = exports.streamReadableWebToString = exports.inferStreamName = exports.getStreamName = exports.isStreamReadableNode = exports.isStreamReadableWeb = exports.isStreamPipeNode = exports.isStreamPipeWeb = exports.isStream = exports.pipeToStreamWritableWeb = exports.pipeToStreamWritableNode = exports.getStreamReadableWeb = exports.getStreamReadableNode = exports.pipeNodeStream = exports.pipeWebStream = exports.pipeStream = exports.stampPipe = exports.streamToString = exports.processStream = void 0;
 const utils_js_1 = require("../utils.js");
 const react_streaming_js_1 = require("./stream/react-streaming.js");
+const import_1 = require("@brillout/import");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const debug = (0, utils_js_1.createDebugger)('vike:stream');
 function isStreamReadableWeb(thing) {
@@ -757,7 +758,7 @@ function encodeForWebStream(thing) {
 }
 // Because of Cloudflare Workers, we cannot statically import the `stream` module, instead we dynamically import it.
 async function loadStreamNodeModule() {
-    const streamModule = await (0, utils_js_1.dynamicImport)('stream');
+    const streamModule = (await (0, import_1.import_)('stream')).default;
     const { Readable, Writable } = streamModule;
     return { Readable, Writable };
 }

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

@@ -46,7 +46,8 @@ function collectCss(mod, styleUrls, visitedModules, importer) {
             //    - I believe some Vite plugins don't respect the \0 virtual module convention. What should we do then?
             //  - https://github.com/vikejs/vike/issues/1327
             //  - https://github.com/vikejs/vike/commit/3f7b9916dddc84e29e2c20d2b0df7211b6f1acbd
-            styleUrls.add(`/@id/${mod.url.substring(1)}`);
+            //  - https://github.com/vikejs/vike/issues/479#issuecomment-1870043943
+            styleUrls.add(`/@id/__x00__${mod.url.substring(1)}`);
         }
         else {
             // Is this useful? Maybe for virtual modules that don't respect the \0 virtual module convention?

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

@@ -7,7 +7,7 @@ const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage/isNewEr
 });
 function isNewError(errErrorPage, errNominalPage) {
     (0, utils_js_1.warnIfErrorIsNotObject)(errErrorPage);
-    return !(0, utils_js_1.isEquivalentError)(errNominalPage, errErrorPage) || !hasAlreadyLogged(errNominalPage);
+    return !(0, utils_js_1.isSameErrorMessage)(errNominalPage, errErrorPage) || !hasAlreadyLogged(errNominalPage);
 }
 exports.isNewError = isNewError;
 function hasAlreadyLogged(err) {

package/dist/cjs/node/runtime/renderPage/{loadPageFilesServerSide.js → loadUserFilesServerSide.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadPageFilesServerSide = void 0;
+exports.loadUserFilesServerSide = void 0;
 const getPageFiles_js_1 = require("../../../shared/getPageFiles.js");
 const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyzePageClientSide.js");
 const utils_js_1 = require("../utils.js");
@@ -10,10 +10,10 @@ const findPageConfig_js_1 = require("../../../shared/page-configs/findPageConfig
 const analyzePage_js_1 = require("./analyzePage.js");
 const globalContext_js_1 = require("../globalContext.js");
 const loadConfigValues_js_1 = require("../../../shared/page-configs/loadConfigValues.js");
-async function loadPageFilesServerSide(pageContext) {
+async function loadUserFilesServerSide(pageContext) {
     const pageConfig = (0, findPageConfig_js_1.findPageConfig)(pageContext._pageConfigs, pageContext._pageId); // Make pageConfig globally available as pageContext._pageConfig?
     const [{ config, configEntries, exports, exportsAll, pageExports, pageFilesLoaded, pageConfigLoaded }] = await Promise.all([
-        loadPageFiles(pageContext._pageFilesAll, pageConfig, pageContext._pageId, !(0, globalContext_js_1.getGlobalContext)().isProduction),
+        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext._pageId, !(0, globalContext_js_1.getGlobalContext)().isProduction),
         (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._pageFilesAll, pageContext._pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
     const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = (0, analyzePage_js_1.analyzePage)(pageContext._pageFilesAll, pageConfig, pageContext._pageId);
@@ -82,8 +82,8 @@ async function loadPageFilesServerSide(pageContext) {
     }
     return pageContextAddendum;
 }
-exports.loadPageFilesServerSide = loadPageFilesServerSide;
-async function loadPageFiles(pageFilesAll, pageConfig, pageId, isDev) {
+exports.loadUserFilesServerSide = loadUserFilesServerSide;
+async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
     const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await (0, loadConfigValues_js_1.loadConfigValues)(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));

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

@@ -12,7 +12,7 @@ const serializePageContextClientSide_js_1 = require("../html/serializePageContex
 const addUrlComputedProps_js_1 = require("../../../shared/addUrlComputedProps.js");
 const globalContext_js_1 = require("../globalContext.js");
 const createHttpResponseObject_js_1 = require("./createHttpResponseObject.js");
-const loadPageFilesServerSide_js_1 = require("./loadPageFilesServerSide.js");
+const loadUserFilesServerSide_js_1 = require("./loadUserFilesServerSide.js");
 const executeOnRenderHtmlHook_js_1 = require("./executeOnRenderHtmlHook.js");
 const executeOnBeforeRenderAndDataHooks_js_1 = require("./executeOnBeforeRenderAndDataHooks.js");
 const loggerRuntime_js_1 = require("./loggerRuntime.js");
@@ -22,6 +22,7 @@ const executeGuardHook_js_1 = require("../../../shared/route/executeGuardHook.js
 const loadPageRoutes_js_1 = require("../../../shared/route/loadPageRoutes.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const helpers_js_1 = require("../../../shared/page-configs/helpers.js");
+const isRenderFailure_js_1 = require("../../../shared/misc/isRenderFailure.js");
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext._pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -29,7 +30,7 @@ async function renderPageAlreadyRouted(pageContext) {
     (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, loadPageFilesServerSide_js_1.loadPageFilesServerSide)(pageContext));
+    (0, utils_js_1.objectAssign)(pageContext, await (0, loadUserFilesServerSide_js_1.loadUserFilesServerSide)(pageContext));
     if (!isError) {
         await (0, executeGuardHook_js_1.executeGuardHook)(pageContext, (pageContext) => (0, preparePageContextForUserConsumptionServerSide_js_1.preparePageContextForUserConsumptionServerSide)(pageContext));
     }
@@ -48,7 +49,7 @@ async function renderPageAlreadyRouted(pageContext) {
     }
     if (pageContext.isClientSideNavigation) {
         if (isError) {
-            (0, utils_js_1.objectAssign)(pageContext, { _isError: true });
+            (0, utils_js_1.objectAssign)(pageContext, { [isRenderFailure_js_1.isRenderFailure]: true });
         }
         const pageContextSerialized = (0, serializePageContextClientSide_js_1.serializePageContextClientSide)(pageContext);
         const httpResponse = await (0, createHttpResponseObject_js_1.createHttpResponsePageContextJson)(pageContextSerialized);
@@ -115,7 +116,7 @@ async function prerender404Page(renderContext, pageContextInit_) {
         const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit, renderContext);
         (0, utils_js_1.objectAssign)(pageContext, pageContextInitEnhanced);
     }
-    (0, utils_js_1.objectAssign)(pageContext, await (0, loadPageFilesServerSide_js_1.loadPageFilesServerSide)(pageContext));
+    (0, utils_js_1.objectAssign)(pageContext, await (0, loadUserFilesServerSide_js_1.loadUserFilesServerSide)(pageContext));
     return prerenderPage(pageContext);
 }
 exports.prerender404Page = prerender404Page;

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

@@ -20,7 +20,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const serializePageContextClientSide_js_1 = require("./html/serializePageContextClientSide.js");
 const error_page_js_1 = require("../../shared/error-page.js");
 const handleErrorWithoutErrorPage_js_1 = require("./renderPage/handleErrorWithoutErrorPage.js");
-const loadPageFilesServerSide_js_1 = require("./renderPage/loadPageFilesServerSide.js");
+const loadUserFilesServerSide_js_1 = require("./renderPage/loadUserFilesServerSide.js");
 const resolveRedirects_js_1 = require("../../shared/route/resolveRedirects.js");
 const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage.ts', {
     httpRequestsCount: 0,
@@ -390,7 +390,7 @@ async function handleAbortError(errAbort, pageContextsFromRewrite, pageContextIn
                 ...pageContextErrorPageInit,
                 ...renderContext
             };
-            (0, utils_js_1.objectAssign)(pageContext, await (0, loadPageFilesServerSide_js_1.loadPageFilesServerSide)(pageContext));
+            (0, utils_js_1.objectAssign)(pageContext, await (0, loadUserFilesServerSide_js_1.loadUserFilesServerSide)(pageContext));
             // We include pageContextInit: we don't only serialize pageContextAbort because the error page may need to access pageContextInit
             pageContextSerialized = (0, serializePageContextClientSide_js_1.serializePageContextClientSide)(pageContext);
         }

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

@@ -42,7 +42,7 @@ __exportStar(require("../../utils/filesystemPathHandling.js"), exports);
 __exportStar(require("../../utils/getOutDirs.js"), exports);
 __exportStar(require("../../utils/capitalizeFirstLetter.js"), exports);
 __exportStar(require("../../utils/debugGlob.js"), exports);
-__exportStar(require("../../utils/isEquivalentError.js"), exports);
+__exportStar(require("../../utils/isSameErrorMessage.js"), exports);
 __exportStar(require("../../utils/styleFileRE.js"), exports);
 __exportStar(require("../../utils/isPropertyGetter.js"), exports);
 __exportStar(require("../../utils/debug.js"), exports);
@@ -64,7 +64,6 @@ __exportStar(require("../../utils/path-shim.js"), exports);
 __exportStar(require("../../utils/nodeEnv.js"), exports);
 __exportStar(require("../../utils/isHtml.js"), exports);
 __exportStar(require("../../utils/warnIfErrorIsNotObject.js"), exports);
-__exportStar(require("../../utils/dynamicImport.js"), exports);
 __exportStar(require("../../utils/stripAnsi.js"), exports);
 __exportStar(require("../../utils/getTerminWidth.js"), exports);
 __exportStar(require("../../utils/truncateString.js"), exports);

package/dist/cjs/shared/hooks/getHook.js

@@ -3,10 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHookTimeoutDefault = exports.assertHook = exports.getHookFromPageConfigGlobal = exports.getHookFromPageConfig = exports.getHook = void 0;
+exports.getHookTimeoutDefault = exports.setIsPrerenderering = exports.assertHook = exports.getHookFromPageConfigGlobal = exports.getHookFromPageConfig = exports.getHook = void 0;
+const getGlobalObject_js_1 = require("../../utils/getGlobalObject.js");
 const helpers_js_1 = require("../page-configs/helpers.js");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('getHook.ts', {
+    isPrerendering: false
+});
 function getHook(pageContext, hookName) {
     if (!(hookName in pageContext.exports)) {
         return null;
@@ -113,20 +117,22 @@ function getHookTimeoutDefault(hookName) {
             warning: 1 * 1000
         };
     }
-    if (hookName === 'onPrerenderStart' ||
-        hookName === 'onBeforePrerenderStart' ||
-        // TODO/v1-release: remove
-        // Old V0.4 design hooks (https://vike.dev/migration/v1-design#renamed-hooks)
-        hookName === 'onBeforePrerender' ||
-        hookName === 'prerender') {
+    if (globalObject.isPrerendering) {
         return {
-            error: 10 * 60 * 1000,
+            error: 2 * 60 * 1000,
             warning: 30 * 1000
         };
     }
+    else {
+        (0, utils_js_1.assert)(!hookName.toLowerCase().includes('prerender'));
+    }
     return {
         error: 30 * 1000,
         warning: 4 * 1000
     };
 }
 exports.getHookTimeoutDefault = getHookTimeoutDefault;
+function setIsPrerenderering() {
+    globalObject.isPrerendering = true;
+}
+exports.setIsPrerenderering = setIsPrerenderering;

package/dist/cjs/shared/misc/isRenderFailure.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isRenderFailure = void 0;
+exports.isRenderFailure = '_isRenderFailure';

package/dist/cjs/shared/misc/pageContextInitIsPassedToClient.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pageContextInitIsPassedToClient = void 0;
+exports.pageContextInitIsPassedToClient = '_pageContextInitIsPassedToClient';

package/dist/cjs/shared/route/abort.js

@@ -27,7 +27,7 @@ function redirect(url, statusCode) {
     const pageContextAbort = {};
     (0, utils_js_1.objectAssign)(pageContextAbort, {
         _abortCaller: abortCaller,
-        _abortCall: `throw redirect(${args.join(', ')})`,
+        _abortCall: `redirect(${args.join(', ')})`,
         _urlRedirect: {
             url,
             statusCode
@@ -41,7 +41,7 @@ function render(value, abortReason) {
     if (abortReason !== undefined)
         args.push((0, utils_js_1.truncateString)(JSON.stringify(abortReason), 30));
     const abortCaller = 'throw render()';
-    const abortCall = `throw render(${args.join(', ')})`;
+    const abortCall = `render(${args.join(', ')})`;
     return render_(value, abortReason, abortCall, abortCaller);
 }
 exports.render = render;
@@ -92,7 +92,7 @@ function RenderErrorPage({ pageContext = {} } = {}) {
         abortReason = 'Something went wrong';
     }
     (0, utils_js_1.objectAssign)(pageContext, { _isLegacyRenderErrorPage: true });
-    return render_(abortStatusCode, abortReason, 'throw RenderErrorPage()', 'throw RenderErrorPage()', pageContext);
+    return render_(abortStatusCode, abortReason, 'RenderErrorPage()', 'throw RenderErrorPage()', pageContext);
 }
 exports.RenderErrorPage = RenderErrorPage;
 const stamp = '_isAbortError';
@@ -118,7 +118,18 @@ function logAbortErrorHandled(err, isProduction, pageContext) {
     const urlCurrent = pageContext._urlRewrite ?? pageContext.urlOriginal;
     (0, utils_js_1.assert)(urlCurrent);
     const abortCall = err._pageContextAbort._abortCall;
-    (0, utils_js_1.assertInfo)(false, `${picocolors_1.default.cyan(abortCall)} intercepted while rendering ${picocolors_1.default.cyan(urlCurrent)}`, { onlyOnce: false });
+    (0, utils_js_1.assert)(abortCall);
+    const hookLoc = (0, utils_js_1.isUserHookError)(err);
+    let thrownBy = '';
+    if (hookLoc) {
+        thrownBy = ` by ${picocolors_1.default.cyan(`${hookLoc.hookName}()`)} hook defined at ${hookLoc.hookFilePath}`;
+    }
+    else {
+        // hookLoc is missing when serializing abort errors from server to client
+    }
+    (0, utils_js_1.assertInfo)(false, `${picocolors_1.default.cyan(abortCall)} thrown${thrownBy} while rendering ${picocolors_1.default.cyan(urlCurrent)}`, {
+        onlyOnce: false
+    });
 }
 exports.logAbortErrorHandled = logAbortErrorHandled;
 function assertStatusCode(statusCode, expected, caller) {

package/dist/cjs/shared/route/loadPageRoutes.js

@@ -19,7 +19,6 @@ pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds) {
 exports.loadPageRoutes = loadPageRoutes;
 function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
     const pageRoutes = [];
-    let pageIds = [...allPageIds];
     // V1 Design
     if (pageConfigs.length > 0) {
         (0, utils_js_1.assert)(filesystemRoots === null);
@@ -28,7 +27,6 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
             .filter((p) => !p.isErrorPage)
             .forEach((pageConfig) => {
             const pageId = pageConfig.pageId;
-            pageIds = removePageId(pageIds, pageId);
             let pageRoute = null;
             {
                 const configName = 'route';
@@ -82,7 +80,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
     if (pageConfigs.length === 0) {
         (0, utils_js_1.assert)(filesystemRoots);
         const comesFromV1PageConfig = false;
-        pageIds
+        allPageIds
             .filter((pageId) => !(0, error_page_js_1.isErrorPageId)(pageId, false))
             .forEach((pageId) => {
             const pageRouteFile = pageFilesAll.find((p) => p.pageId === pageId && p.fileType === '.page.route');
@@ -182,9 +180,3 @@ function dirname(filePath) {
     (0, utils_js_1.assert)(!dirPath.endsWith('/') || dirPath === '/');
     return dirPath;
 }
-function removePageId(pageIds, pageId) {
-    const { length } = pageIds;
-    pageIds = pageIds.filter((id) => id !== pageId);
-    (0, utils_js_1.assert)(pageIds.length === length - 1);
-    return pageIds;
-}

package/dist/cjs/utils/isSameErrorMessage.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSameErrorMessage = void 0;
+const isObject_js_1 = require("./isObject.js");
+function isSameErrorMessage(err1, err2) {
+    if (!(0, isObject_js_1.isObject)(err1) || !(0, isObject_js_1.isObject)(err2))
+        return false;
+    return err1.message === err2.message;
+}
+exports.isSameErrorMessage = isSameErrorMessage;

package/dist/cjs/utils/projectInfo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
 const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
-const PROJECT_VERSION = '0.4.152';
+const PROJECT_VERSION = '0.4.153-commit-01ab602';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/client/client-routing-runtime/createPageContext.d.ts

@@ -5,7 +5,6 @@ declare function createPageContext(urlOriginal: string): Promise<{
     _urlHandler: null;
     _urlRewrite: null;
     _baseServer: string;
-    _isProduction: boolean;
     _pageFilesAll: import("../../shared/getPageFiles/getPageFileObject.js").PageFile[];
     _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
     _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;

package/dist/esm/client/client-routing-runtime/createPageContext.js

@@ -13,15 +13,12 @@ async function createPageContext(urlOriginal) {
     const { pageRoutes, onBeforeRouteHook } = await loadPageRoutes(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
     const baseServer = getBaseServer();
     assert(isBaseServer(baseServer));
-    // @ts-ignore Since dist/cjs/client/ is never used, we can ignore this error.
-    const isProd = import.meta.env.PROD;
     const pageContext = {
         urlOriginal,
         _objectCreatedByVike: true,
         _urlHandler: null,
         _urlRewrite: null,
         _baseServer: baseServer,
-        _isProduction: isProd,
         _pageFilesAll: pageFilesAll,
         _pageConfigs: pageConfigs,
         _pageConfigGlobal: pageConfigGlobal,