vike 0.4.156 → 0.4.158

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

@@ -28,7 +28,10 @@ function commonConfig() {
             configResolved: {
                 order: 'post',
                 handler(config) {
-                    setDefaultPort(config);
+                    overrideViteDefaultPort(config);
+                    /* TODO: do this after implementing vike.config.js and new setting transformLinkedDependencies (or probably a better name like transpileLinkedDependencies/bundleLinkedDependencies or something else)
+                    overrideViteDefaultSsrExternal(config)
+                    */
                     workaroundCI(config);
                     (0, buildConfig_js_1.assertRollupInput)(config);
                     (0, assertResolveAlias_js_1.assertResolveAlias)(config);
@@ -39,7 +42,7 @@ function commonConfig() {
     ];
 }
 exports.commonConfig = commonConfig;
-function setDefaultPort(config) {
+function overrideViteDefaultPort(config) {
     var _a, _b;
     // @ts-ignore
     config.server ?? (config.server = {});
@@ -48,6 +51,22 @@ function setDefaultPort(config) {
     config.preview ?? (config.preview = {});
     (_b = config.preview).port ?? (_b.port = 3000);
 }
+/*
+function overrideViteDefaultSsrExternal(config: ResolvedConfig) {
+  if (!isViteVersionWithSsrExternalTrue()) return
+  // @ts-ignore Not released yet: https://github.com/vitejs/vite/pull/10939/files#diff-5a3d42620df2c6b17e25f440ffdb67683dee7ef57317674d19f41d5f30502310L5
+  config.ssr.external ??= true
+}
+import { version } from 'vite'
+function isViteVersionWithSsrExternalTrue(): boolean {
+  const versionParts = version.split('.').map((s) => parseInt(s, 10)) as [number, number, number]
+  assert(versionParts.length === 3)
+  if (versionParts[0] > 5) return true
+  if (versionParts[1] > 0) return true
+  if (versionParts[2] >= 12) return true
+  return false
+}
+*/
 // Workaround GitHub Action failing to access the server
 function workaroundCI(config) {
     var _a, _b;

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

@@ -18,13 +18,13 @@ function distFileNames() {
             const rollupOutputs = getRollupOutputs(config);
             // We need to support multiple outputs: @vite/plugin-legacy adds an ouput, see https://github.com/vikejs/vike/issues/477#issuecomment-1406434802
             rollupOutputs.forEach((rollupOutput) => {
-                if (!rollupOutput.entryFileNames) {
+                if (!('entryFileNames' in rollupOutput)) {
                     rollupOutput.entryFileNames = (chunkInfo) => getEntryFileName(chunkInfo, config, true);
                 }
-                if (!rollupOutput.chunkFileNames) {
+                if (!('chunkFileNames' in rollupOutput)) {
                     rollupOutput.chunkFileNames = (chunkInfo) => getChunkFileName(chunkInfo, config);
                 }
-                if (!rollupOutput.assetFileNames) {
+                if (!('assertUsage' in rollupOutput)) {
                     rollupOutput.assetFileNames = (chunkInfo) => getAssetFileName(chunkInfo, config);
                 }
             });

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

@@ -33,7 +33,7 @@ function importBuild() {
                 await replace_ASSETS_MAP(options, bundle);
             }
         },
-        (0, plugin_js_1.serverEntryPlugin)({
+        ...(0, plugin_js_1.serverEntryPlugin)({
             getImporterCode: () => {
                 return getEntryCode(config, configVike);
             },

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

@@ -145,6 +145,8 @@ async function isGitMissing(userRootDir) {
 }
 async function runCmd(cmd, cwd) {
     const res = await execA(cmd, { cwd });
-    (0, utils_js_1.assert)(res.stderr === '');
+    /* Not always true: https://github.com/vikejs/vike/issues/1440#issuecomment-1892831303
+    assert(res.stderr === '')
+    */
     return res.stdout.toString().split('\n').filter(Boolean);
 }

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

@@ -841,6 +841,7 @@ function getConfigName(filePath) {
     }
     else {
         const configName = basename.slice(1);
+        (0, utils_js_1.assertUsage)(configName !== '', `${filePath} Invalid filename ${fileName}`);
         return configName;
     }
 }
@@ -1033,6 +1034,7 @@ function resolveImportPath(importData, importerFilePath) {
     const importerFilePathAbsolute = importerFilePath.filePathAbsoluteFilesystem;
     (0, utils_js_1.assertPosixPath)(importerFilePathAbsolute);
     const cwd = path_1.default.posix.dirname(importerFilePathAbsolute);
+    // We can't use import.meta.resolve() as of Junary 2023 (and probably for a lot longer): https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment137174954_62272600:~:text=But%20the%20argument%20parent%20(aka%20cwd)%20still%20requires%20a%20flag
     // filePathAbsoluteFilesystem is expected to be null when importData.importPath is a Vite path alias
     const filePathAbsoluteFilesystem = (0, utils_js_1.requireResolve)(importData.importPath, cwd);
     return filePathAbsoluteFilesystem;

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

@@ -52,6 +52,8 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
             (0, utils_js_1.assert)(configValueSource);
             if (!configValueSource.configEnv.eager)
                 return;
+            if (!(0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configValueSource.configEnv, { isForClientSide, isClientRouting, isEager: true }))
+                return;
             lines.push(...(0, serializeConfigValue_js_1.serializeConfigValueImported)(configValueSource, configName, whitespace, varCounterContainer, importStatements));
         });
         lines.push(`${whitespace}],`);

package/dist/cjs/node/plugin/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errMdx.js

@@ -15,7 +15,7 @@ exports.errMdx = {
     ruleId: 'unexpected-closing-slash',
     plugin: '@mdx-js/rollup',
     id: '/home/rom/code/vike/docs/pages/dynamic-import.page.server.mdx',
-    pluginCode: 'import { Link, Note } from \'@brillout/docpress\'\n\nPage moved to <Link href="/client-only-components" />.\n\n   </Note>\n\n\nexport const headings = [];\n',
+    pluginCode: 'import { Link, Note } from \'@brillout/docpress\'\n\nPage moved to <Link href="/ClientOnly" />.\n\n   </Note>\n\n\nexport const headings = [];\n',
     loc: {
         file: '/home/rom/code/vike/docs/pages/dynamic-import.page.server.mdx',
         start: { line: 5, column: 5, offset: 109, _index: 6, _bufferIndex: 4 },

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

@@ -54,6 +54,8 @@ const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/g
 const logHintForCjsEsmError_js_1 = require("../runtime/renderPage/logHintForCjsEsmError.js");
 async function runPrerenderFromAPI(options = {}) {
     await runPrerender(options, 'prerender()');
+    // - We purposely propagate the error to the user land, so that the error interrupts the user land. It's also, I guess, a nice-to-have that the user has control over the error.
+    // - We don't use logHintForCjsEsmError() because we don't have control over what happens with the error. For example, if the user land purposely swallows the error then the hint shouldn't be logged. Also, it's best if the hint is shown to the user *after* the error, but we cannot do/guarentee that.
 }
 exports.runPrerenderFromAPI = runPrerenderFromAPI;
 async function runPrerenderFromCLI(options) {

package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js

@@ -90,12 +90,12 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
     // See https://github.com/vikejs/vike/pull/1271
     const positionJavaScriptEntry = (() => {
         if (pageContext._pageContextPromise) {
-            (0, utils_js_1.assertWarning)(!injectToStream, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time as partial hydration won't work", { onlyOnce: true });
+            (0, utils_js_1.assertWarning)(!injectToStream, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time as progressive hydration won't work", { onlyOnce: true });
             // If there is a pageContext._pageContextPromise (which is resolved after the stream has ended) then the pageContext JSON data needs to await for it: https://vike.dev/stream#initial-data-after-stream-end
             return 'HTML_END';
         }
         if (injectToStream) {
-            // If there is a stream then, in order to support partial hydration, inject the JavaScript during the stream after React(/Vue/Solid/...) resolved the first suspense boundary
+            // If there is a stream then, in order to support progressive hydration, inject the JavaScript during the stream after React(/Vue/Solid/...) resolved the first suspense boundary
             return 'STREAM';
         }
         else {

package/dist/cjs/node/runtime/html/injectAssets/inferHtmlTags.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scriptAttrs = exports.inferEarlyHintLink = exports.inferPreloadTag = exports.inferAssetTag = void 0;
 const utils_js_1 = require("../../utils.js");
-// We can't use `defer` here. With `defer`, the entry script won't start before `</body>` has been parsed, preventing partial hydration during SSR streaming, see https://github.com/vikejs/vike/pull/1271
+// We can't use `defer` here. With `defer`, the entry script won't start before `</body>` has been parsed, preventing progressive hydration during SSR streaming, see https://github.com/vikejs/vike/pull/1271
 const scriptAttrs = 'type="module" async';
 exports.scriptAttrs = scriptAttrs;
 function inferPreloadTag(pageAsset) {

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

@@ -11,7 +11,7 @@ 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 isServerSideError_js_1 = require("../../../shared/misc/isServerSideError.js");
 const PASS_TO_CLIENT = [
     'abortReason',
     '_urlRewrite',
@@ -25,7 +25,7 @@ const PASS_TO_CLIENT = [
     '_pageId',
     'data' // for data() hook
 ];
-const PASS_TO_CLIENT_ERROR_PAGE = ['pageProps', 'is404', isRenderFailure_js_1.isRenderFailure];
+const PASS_TO_CLIENT_ERROR_PAGE = ['pageProps', 'is404', isServerSideError_js_1.isServerSideError];
 function serializePageContextClientSide(pageContext) {
     const passToClient = getPassToClient(pageContext);
     const pageContextClient = {};

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

@@ -25,7 +25,7 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
         },
         // TODO/v1-release: remove
         async getNodeStream() {
-            (0, utils_js_1.assertWarning)(false, '`pageContext.httpResponse.getNodeStream()` is outdated, use `pageContext.httpResponse.pipe()` instead. ' +
+            (0, utils_js_1.assertWarning)(false, '`pageContext.httpResponse.getNodeStream()` is outdated, use `pageContext.httpResponse.getReadableNodeStream()` instead. ' +
                 streamDocs, { onlyOnce: true, showStackTrace: true });
             const nodeStream = await (0, stream_js_1.getStreamReadableNode)(htmlRender);
             if (nodeStream === null) {
@@ -43,6 +43,13 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             }
             return webStream;
         },
+        async getReadableNodeStream() {
+            const nodeStream = await (0, stream_js_1.getStreamReadableNode)(htmlRender);
+            if (nodeStream === null) {
+                (0, utils_js_1.assertUsage)(false, getErrMsg(htmlRender, renderHook, 'getReadableNodeStream()', getFixMsg('readable', 'node')));
+            }
+            return nodeStream;
+        },
         getReadableWebStream() {
             const webStream = (0, stream_js_1.getStreamReadableWeb)(htmlRender);
             if (webStream === null) {

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

@@ -7,7 +7,9 @@ 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.isSameErrorMessage)(errNominalPage, errErrorPage) || !hasAlreadyLogged(errNominalPage);
+    return (!(0, utils_js_1.isSameErrorMessage)(errNominalPage, errErrorPage) ||
+        // Isn't this redudant/superfluous? I think we can remove this entire file and only use isSameErrorMessage() instead.
+        !hasAlreadyLogged(errNominalPage));
 }
 exports.isNewError = isNewError;
 function hasAlreadyLogged(err) {

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

@@ -22,7 +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");
+const isServerSideError_js_1 = require("../../../shared/misc/isServerSideError.js");
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext._pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -49,7 +49,7 @@ async function renderPageAlreadyRouted(pageContext) {
     }
     if (pageContext.isClientSideNavigation) {
         if (isError) {
-            (0, utils_js_1.objectAssign)(pageContext, { [isRenderFailure_js_1.isRenderFailure]: true });
+            (0, utils_js_1.objectAssign)(pageContext, { [isServerSideError_js_1.isServerSideError]: true });
         }
         const pageContextSerialized = (0, serializePageContextClientSide_js_1.serializePageContextClientSide)(pageContext);
         const httpResponse = await (0, createHttpResponseObject_js_1.createHttpResponsePageContextJson)(pageContextSerialized);
@@ -187,5 +187,5 @@ function assertV1Design(pageFilesAll, pageConfigs) {
             ...pageFilesAll.map((p) => indent + p.filePath)
         ].join('\n'));
     }
-    (0, utils_js_1.assertWarning)(!isDesignOld, 'You are using the old deprecated design, update to the new V1 design, see https://vike.dev/migration/v1-design', { onlyOnce: true });
+    (0, utils_js_1.assertWarning)(!isDesignOld, "You are using Vike's deprecated design. Update to the new V1 design, see https://vike.dev/migration/v1-design for how to migrate.", { onlyOnce: true });
 }

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

@@ -151,6 +151,7 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderC
         (0, utils_js_1.assert)(pageContextNominalPageInit);
         (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextNominalPageInit, 'urlOriginal', 'string'));
         const pageContextErrorPageInit = await getPageContextErrorPageInit(pageContextInit, errNominalPage, pageContextNominalPageInit, renderContext, httpRequestId);
+        // Handle `throw redirect()` and `throw render()` while rendering nominal page
         if ((0, abort_js_1.isAbortError)(errNominalPage)) {
             const handled = await handleAbortError(errNominalPage, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageInit);
             if (handled.pageContextReturn) {
@@ -179,6 +180,7 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderC
             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, pageContextInit, pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageInit);
                 // throw render(abortStatusCode)
@@ -289,7 +291,7 @@ async function getPageContextErrorPageInit(pageContextInit, errNominalPage, page
     return pageContext;
 }
 function getPageContextInitEnhancedSSR(pageContextInit, renderContext, urlRewrite, httpRequestId) {
-    const { isClientSideNavigation, _urlHandler } = handleUrl(pageContextInit.urlOriginal, urlRewrite);
+    const { isClientSideNavigation, _urlHandler } = handlePageContextUrl(pageContextInit.urlOriginal);
     const pageContextInitEnhanced = (0, renderPageAlreadyRouted_js_1.getPageContextInitEnhanced)(pageContextInit, renderContext, {
         ssr: {
             urlRewrite,
@@ -300,18 +302,12 @@ function getPageContextInitEnhancedSSR(pageContextInit, renderContext, urlRewrit
     (0, utils_js_1.objectAssign)(pageContextInitEnhanced, { _httpRequestId: httpRequestId });
     return pageContextInitEnhanced;
 }
-function handleUrl(urlOriginal, urlRewrite) {
-    (0, utils_js_1.assert)(isUrlValid(urlOriginal));
-    (0, utils_js_1.assert)(urlRewrite === null || isUrlValid(urlRewrite));
+function handlePageContextUrl(urlOriginal) {
     const { isPageContextRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
-    const pageContextAddendum = {
+    return {
         isClientSideNavigation: isPageContextRequest,
         _urlHandler: (url) => (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(url).urlWithoutPageContextRequestSuffix
     };
-    return pageContextAddendum;
-}
-function isUrlValid(url) {
-    return url.startsWith('/') || url.startsWith('http');
 }
 function getRequestId() {
     const httpRequestId = ++globalObject.httpRequestsCount;
@@ -374,7 +370,9 @@ function getPermanentRedirect(pageContextInit, httpRequestId) {
     const pageContextHttpResponse = { ...pageContextInit, httpResponse };
     return pageContextHttpResponse;
 }
-async function handleAbortError(errAbort, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageInit) {
+async function handleAbortError(errAbort, pageContextsFromRewrite, pageContextInit, 
+// handleAbortError() creates a new pageContext object and we don't merge pageContextNominalPageInit to it: we only use some pageContextNominalPageInit information.
+pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageInit) {
     (0, abort_js_1.logAbortErrorHandled)(errAbort, (0, globalContext_js_1.getGlobalContext)().isProduction, pageContextNominalPageInit);
     const pageContextAbort = errAbort._pageContextAbort;
     let pageContextSerialized;

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

@@ -6,16 +6,17 @@ const utils_js_1 = require("./utils.js");
 const query = 'extractAssets';
 function extractAssetsAddQuery(id) {
     const fileExtension = (0, utils_js_1.getFileExtension)(id);
-    (0, utils_js_1.assert)(fileExtension || id.includes('virtual:vike:'));
-    if (!fileExtension)
+    if (!fileExtension || id.includes('virtual:vike:')) {
         return `${id}?${query}`;
-    if (id.includes('?')) {
-        id = id.replace('?', `?${query}&`);
     }
     else {
-        id = `${id}?${query}&lang.${fileExtension}`;
+        if (!id.includes('?')) {
+            return `${id}?${query}&lang.${fileExtension}`;
+        }
+        else {
+            return id.replace('?', `?${query}&`);
+        }
     }
-    return id;
 }
 exports.extractAssetsAddQuery = extractAssetsAddQuery;
 function extractAssetsRemoveQuery(id) {

package/dist/cjs/shared/addUrlComputedProps.js

@@ -7,7 +7,7 @@ function addUrlComputedProps(pageContext, enumerable = true) {
     (0, utils_js_1.assert)(pageContext.urlOriginal);
     if ('urlPathname' in pageContext) {
         (0, utils_js_1.assert)(typeof pageContext.urlPathname === 'string');
-        /* If this assert() fails then it's most likely because Object.assign() was used instead of objectAssign(), i.e.:
+        /* If the following assert() fails then it's most likely because Object.assign() was used instead of objectAssign(), i.e.:
            ```js
            // Add property getters such as pageContext.urlPathname to pageContext
            addUrlComputedProps(pageContext)
@@ -49,8 +49,28 @@ function getUrlParsed(pageContext) {
     if (!urlHandler) {
         urlHandler = (url) => url;
     }
-    let urlResolved = pageContext._urlRewrite ?? pageContext.urlLogical ?? pageContext.urlOriginal;
+    // Example of i18n app using `throw render()`:
+    //  1. User goes to '/fr-FR/admin'.
+    //  2. The first onBeforeRoute() call accesses pageContext.urlPathname (its value is '/fr-FR/admin': the pathname of pageContext.urlOriginal, since both pageContext.urlLogical and pageContext._urlRewrite are undefined) and sets pageContext.urlLogical to '/admin'.
+    //  3. A guard() hooks accesses pageContext.urlPathname (its value is '/admin': the pathname of pageContext.urlLogical) and calls `throw render('/fr-FR/login')`
+    //  4. Vike create a new pageContext object (pageContext.urlLogical is erased) and sets pageContext._urlRewrite to '/fr-FR/login'. (While pageContext.urlOriginal is still '/fr-FR/admin'.)
+    //  5. The second onBeforeRoute() call accesses pageContext.urlPathname (its value is '/fr-FR/login': the pathname of pageContext._urlRewrite, since pageContext.urlLogical is undefined) and sets pageContext.urlLogical to '/login'.
+    //  6. The value of pageContext.urlPathname is now '/login': the pathname of `pageContext.urlLogical`. (While pageContext.urlOriginal is still '/fr-FR/admin'.)
+    // Reproduction: https://github.com/vikejs/vike/discussions/1436#discussioncomment-8142023
+    let urlResolved = 
+    // Set by onBeforeRoute()
+    pageContext.urlLogical ??
+        // Set by `throw render()`
+        pageContext._urlRewrite ??
+        // Set by renderPage()
+        pageContext.urlOriginal;
     urlResolved = urlHandler(urlResolved);
+    /*
+    console.log('pageContext.urlLogical', pageContext.urlLogical)
+    console.log('pageContext._urlRewrite', pageContext._urlRewrite)
+    console.log('pageContext.urlOriginal', pageContext.urlOriginal)
+    console.log()
+    //*/
     const baseServer = pageContext._baseServer;
     (0, utils_js_1.assert)(urlResolved && typeof urlResolved === 'string');
     (0, utils_js_1.assert)(baseServer.startsWith('/'));

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

@@ -6,7 +6,7 @@ const getGlobalObject_js_1 = require("../../utils/getGlobalObject.js");
 const humanizeTime_js_1 = require("../../utils/humanizeTime.js");
 const isObject_js_1 = require("../../utils/isObject.js");
 const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('utils/executeHook.ts', {
-    userHookErrors: new Map()
+    userHookErrors: new WeakMap()
 });
 function isUserHookError(err) {
     if (!(0, isObject_js_1.isObject)(err))

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

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

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

@@ -16,6 +16,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
  */
 function redirect(url, statusCode) {
     const abortCaller = 'throw redirect()';
+    assertUrl(url, abortCaller, true);
     const args = [JSON.stringify(url)];
     if (!statusCode) {
         statusCode = 302;
@@ -36,16 +37,16 @@ function redirect(url, statusCode) {
     return AbortRender(pageContextAbort);
 }
 exports.redirect = redirect;
-function render(value, abortReason) {
-    const args = [typeof value === 'number' ? String(value) : JSON.stringify(value)];
+function render(urlOrStatusCode, abortReason) {
+    const args = [typeof urlOrStatusCode === 'number' ? String(urlOrStatusCode) : JSON.stringify(urlOrStatusCode)];
     if (abortReason !== undefined)
         args.push((0, utils_js_1.truncateString)(JSON.stringify(abortReason), 30));
     const abortCaller = 'throw render()';
     const abortCall = `render(${args.join(', ')})`;
-    return render_(value, abortReason, abortCall, abortCaller);
+    return render_(urlOrStatusCode, abortReason, abortCall, abortCaller);
 }
 exports.render = render;
-function render_(value, abortReason, abortCall, abortCaller, pageContextAddendum) {
+function render_(urlOrStatusCode, abortReason, abortCall, abortCaller, pageContextAddendum) {
     const pageContextAbort = {
         abortReason,
         _abortCaller: abortCaller,
@@ -55,16 +56,17 @@ function render_(value, abortReason, abortCall, abortCaller, pageContextAddendum
         (0, utils_js_1.assert)(pageContextAddendum._isLegacyRenderErrorPage === true);
         (0, utils_js_1.objectAssign)(pageContextAbort, pageContextAddendum);
     }
-    if (typeof value === 'string') {
-        const url = value;
+    if (typeof urlOrStatusCode === 'string') {
+        const url = urlOrStatusCode;
+        assertUrl(url, abortCaller);
         (0, utils_js_1.objectAssign)(pageContextAbort, {
             _urlRewrite: url
         });
         return AbortRender(pageContextAbort);
     }
     else {
-        const abortStatusCode = value;
-        assertStatusCode(value, [401, 403, 404, 410, 429, 500, 503], 'render');
+        const abortStatusCode = urlOrStatusCode;
+        assertStatusCode(urlOrStatusCode, [401, 403, 404, 410, 429, 500, 503], 'render');
         (0, utils_js_1.objectAssign)(pageContextAbort, {
             abortStatusCode,
             is404: abortStatusCode === 404
@@ -170,3 +172,12 @@ function assertNoInfiniteAbortLoop(rewriteCount, redirectCount) {
     (0, utils_js_1.assertUsage)(rewriteCount + redirectCount <= 7, `Maximum chain length of 7 ${abortCalls} exceeded. Did you define an infinite loop of ${abortCalls}?`);
 }
 exports.assertNoInfiniteAbortLoop = assertNoInfiniteAbortLoop;
+function assertUrl(url, abortCaller, allowAbsoluteUrl) {
+    (0, utils_js_1.assertUsage)(url.startsWith('/') || (allowAbsoluteUrl && (0, utils_js_1.isUriWithProtocol)(url)), [
+        `Invalid URL ${picocolors_1.default.cyan(url)} passed to ${picocolors_1.default.cyan(abortCaller)}:`,
+        `the URL should start with ${picocolors_1.default.cyan('/')}`,
+        allowAbsoluteUrl && `or a valid protocol (${picocolors_1.default.cyan('https:')}, ${picocolors_1.default.cyan('ipfs:')}, ...)`
+    ]
+        .filter(Boolean)
+        .join(' '));
+}

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

@@ -86,9 +86,11 @@ async function route(pageContextForRoute) {
         (0, utils_js_1.assert)(false);
     }));
     (0, resolvePrecedence_js_1.resolvePrecendence)(routeMatches);
-    const winner = routeMatches[0];
+    const winner = routeMatches[0] ?? null;
     (0, debug_js_1.debug)(`Route matches for URL ${picocolors_1.default.cyan(urlPathname)} (in precedence order):`, routeMatches);
     (0, utils_js_1.objectAssign)(pageContextFromRoute, { _debugRouteMatches: routeMatches });
+    // For vite-plugin-vercel https://github.com/magne4000/vite-plugin-vercel/blob/main/packages/vike-integration/vike.ts#L173
+    (0, utils_js_1.objectAssign)(pageContextFromRoute, { _routeMatch: winner });
     if (!winner) {
         (0, utils_js_1.objectAssign)(pageContextFromRoute, {
             _pageId: null,

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

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveRouteStringRedirect = exports.resolveRedirects = void 0;
 const assertIsNotBrowser_js_1 = require("../../utils/assertIsNotBrowser.js");
-const parseUrl_extras_js_1 = require("../../utils/parseUrl-extras.js");
 const utils_js_1 = require("../utils.js");
 const resolveUrlPathname_js_1 = require("./resolveUrlPathname.js");
 const resolveRouteString_js_1 = require("./resolveRouteString.js");
@@ -26,7 +25,7 @@ function resolveRouteStringRedirect(urlSource, urlTarget, urlPathname) {
     (0, resolveRouteString_js_1.assertRouteString)(urlSource, `${configSrc} Invalid`);
     (0, utils_js_1.assertUsage)(urlTarget.startsWith('/') ||
         // Is allowing any protocol a safety issue? https://github.com/vikejs/vike/pull/1292#issuecomment-1828043917
-        (0, parseUrl_extras_js_1.isUriWithProtocol)(urlTarget) ||
+        (0, utils_js_1.isUriWithProtocol)(urlTarget) ||
         urlTarget === '*', `${configSrc} Invalid redirection target URL ${picocolors_1.default.cyan(urlTarget)}: the target URL should start with ${picocolors_1.default.cyan('/')}, a valid protocol (${picocolors_1.default.cyan('https:')}, ${picocolors_1.default.cyan('http:')}, ${picocolors_1.default.cyan('mailto:')}, ${picocolors_1.default.cyan('ipfs:')}, ${picocolors_1.default.cyan('magnet:')}, ...), or be ${picocolors_1.default.cyan('*')}`);
     assertParams(urlSource, urlTarget);
     const match = (0, resolveRouteString_js_1.resolveRouteString)(urlSource, urlPathname);
@@ -35,7 +34,7 @@ function resolveRouteStringRedirect(urlSource, urlTarget, urlPathname) {
     const urlResolved = (0, resolveUrlPathname_js_1.resolveUrlPathname)(urlTarget, match.routeParams);
     if (urlResolved === urlPathname)
         return null;
-    (0, utils_js_1.assert)(urlResolved.startsWith('/') || (0, parseUrl_extras_js_1.isUriWithProtocol)(urlResolved));
+    (0, utils_js_1.assert)(urlResolved.startsWith('/') || (0, utils_js_1.isUriWithProtocol)(urlResolved));
     return urlResolved;
 }
 exports.resolveRouteStringRedirect = resolveRouteStringRedirect;

package/dist/cjs/utils/assert.js

@@ -38,7 +38,7 @@ function assert(condition, debugInfo) {
     const link = `${projectInfo_js_1.projectInfo.githubRepository}/issues/new`;
     let errMsg = [
         `You stumbled upon a bug in ${projectInfo_js_1.projectInfo.projectName}'s source code.`,
-        `Go to ${picocolors_1.default.blue(link)} and copy-paste this error; a maintainer will fix the bug (usually under 24 hours).`,
+        `Go to ${picocolors_1.default.blue(link)} and copy-paste this error. A maintainer will fix the bug (usually under 24 hours).`,
         debugStr
     ]
         .filter(Boolean)

package/dist/cjs/utils/debug.js

@@ -58,7 +58,8 @@ function isDebugEnabled(flag) {
         DEBUG = process.env.DEBUG;
     }
     catch { }
-    return DEBUG?.includes(flag) ?? false;
+    const isEnabled = DEBUG?.includes(flag) ?? false;
+    return isEnabled;
 }
 exports.isDebugEnabled = isDebugEnabled;
 function formatMsg(info, options, padding, position) {

package/dist/cjs/utils/parseUrl-extras.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isUriWithProtocol = exports.addUrlOrigin = exports.removeUrlOrigin = exports.modifyUrlPathname = exports.removeBaseServer = exports.normalizeUrlPathname = exports.isBaseAssets = exports.prependBase = void 0;
+exports.addUrlOrigin = exports.removeUrlOrigin = exports.modifyUrlPathname = exports.removeBaseServer = exports.normalizeUrlPathname = exports.isBaseAssets = exports.prependBase = void 0;
 const parseUrl_js_1 = require("./parseUrl.js");
 const assert_js_1 = require("./assert.js");
 const slice_js_1 = require("./slice.js");
@@ -103,8 +103,3 @@ function addUrlOrigin(url, origin) {
     return urlModified;
 }
 exports.addUrlOrigin = addUrlOrigin;
-function isUriWithProtocol(uri) {
-    // https://en.wikipedia.org/wiki/List_of_URI_schemes
-    return /^[a-z0-9][a-z0-9\.\+\-]*:/i.test(uri);
-}
-exports.isUriWithProtocol = isUriWithProtocol;

package/dist/cjs/utils/parseUrl.js

@@ -6,7 +6,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createUrlFromComponents = exports.assertUrlComponents = exports.isBaseServer = exports.assertUsageUrl = exports.isParsable = exports.parseUrl = void 0;
+exports.isUriWithProtocol = exports.createUrlFromComponents = exports.assertUrlComponents = exports.isBaseServer = exports.assertUsageUrl = exports.isParsable = exports.parseUrl = void 0;
 const slice_js_1 = require("./slice.js");
 const assert_js_1 = require("./assert.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
@@ -232,3 +232,8 @@ function createUrlFromComponents(origin, pathname, searchOriginal, hashOriginal)
     return urlRecreated;
 }
 exports.createUrlFromComponents = createUrlFromComponents;
+function isUriWithProtocol(uri) {
+    // https://en.wikipedia.org/wiki/List_of_URI_schemes
+    return /^[a-z0-9][a-z0-9\.\+\-]*:/i.test(uri);
+}
+exports.isUriWithProtocol = isUriWithProtocol;

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.156';
+const PROJECT_VERSION = '0.4.158';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -1,7 +1,6 @@
 export { getPageContextFromHooks_isHydration };
 export { getPageContextFromHooks_isNotHydration };
 export { getPageContextFromHooks_serialized };
-export { isServerSideRouted };
 import type { PageContextExports, PageFile } from '../../shared/getPageFiles.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type PageContext = {
@@ -22,13 +21,15 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
 }>;
 declare function getPageContextFromHooks_isNotHydration(pageContext: {
     _pageId: string;
-} & PageContext & PageContextExports, isErrorPage: boolean): Promise<(Record<string, unknown> & Record<"_pageId", string> & Record<"is404", boolean> & Record<"pageProps", Record<string, unknown>> & {
-    _hasPageContextFromServer: true;
-    _hasPageContextFromClient: false;
-}) | ({
-    isHydration: false;
-    _hasPageContextFromClient: boolean;
-} & {
-    _hasPageContextFromServer: boolean;
-})>;
-declare function isServerSideRouted(err: unknown): boolean;
+} & PageContext & PageContextExports, isErrorPage: boolean): Promise<{
+    is404ServerSideRouted: boolean;
+    pageContextFromHooks?: undefined;
+} | {
+    pageContextFromHooks: {
+        isHydration: false;
+        _hasPageContextFromClient: boolean;
+    } & {
+        _hasPageContextFromServer: boolean;
+    };
+    is404ServerSideRouted?: undefined;
+}>;