vike 0.4.156 → 0.4.158

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

@@ -145,6 +145,7 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderC
         assert(pageContextNominalPageInit);
         assert(hasProp(pageContextNominalPageInit, 'urlOriginal', 'string'));
         const pageContextErrorPageInit = await getPageContextErrorPageInit(pageContextInit, errNominalPage, pageContextNominalPageInit, renderContext, httpRequestId);
+        // Handle `throw redirect()` and `throw render()` while rendering nominal page
         if (isAbortError(errNominalPage)) {
             const handled = await handleAbortError(errNominalPage, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageInit);
             if (handled.pageContextReturn) {
@@ -173,6 +174,7 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderC
             pageContextErrorPage = await renderPageAlreadyRouted(pageContextErrorPageInit);
         }
         catch (errErrorPage) {
+            // Handle `throw redirect()` and `throw render()` while rendering error page
             if (isAbortError(errErrorPage)) {
                 const handled = await handleAbortError(errErrorPage, pageContextsFromRewrite, pageContextInit, pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageInit);
                 // throw render(abortStatusCode)
@@ -283,7 +285,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 = getPageContextInitEnhanced(pageContextInit, renderContext, {
         ssr: {
             urlRewrite,
@@ -294,18 +296,12 @@ function getPageContextInitEnhancedSSR(pageContextInit, renderContext, urlRewrit
     objectAssign(pageContextInitEnhanced, { _httpRequestId: httpRequestId });
     return pageContextInitEnhanced;
 }
-function handleUrl(urlOriginal, urlRewrite) {
-    assert(isUrlValid(urlOriginal));
-    assert(urlRewrite === null || isUrlValid(urlRewrite));
+function handlePageContextUrl(urlOriginal) {
     const { isPageContextRequest } = handlePageContextRequestUrl(urlOriginal);
-    const pageContextAddendum = {
+    return {
         isClientSideNavigation: isPageContextRequest,
         _urlHandler: (url) => handlePageContextRequestUrl(url).urlWithoutPageContextRequestSuffix
     };
-    return pageContextAddendum;
-}
-function isUrlValid(url) {
-    return url.startsWith('/') || url.startsWith('http');
 }
 function getRequestId() {
     const httpRequestId = ++globalObject.httpRequestsCount;
@@ -368,7 +364,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) {
     logAbortErrorHandled(errAbort, getGlobalContext().isProduction, pageContextNominalPageInit);
     const pageContextAbort = errAbort._pageContextAbort;
     let pageContextSerialized;

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

@@ -5,16 +5,17 @@ import { assert, getFileExtension } from './utils.js';
 const query = 'extractAssets';
 function extractAssetsAddQuery(id) {
     const fileExtension = getFileExtension(id);
-    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;
 }
 function extractAssetsRemoveQuery(id) {
     if (!id.includes('?'))

package/dist/esm/shared/addUrlComputedProps.js

@@ -6,7 +6,7 @@ function addUrlComputedProps(pageContext, enumerable = true) {
     assert(pageContext.urlOriginal);
     if ('urlPathname' in pageContext) {
         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)
@@ -47,8 +47,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;
     assert(urlResolved && typeof urlResolved === 'string');
     assert(baseServer.startsWith('/'));

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

@@ -5,7 +5,7 @@ import { getGlobalObject } from '../../utils/getGlobalObject.js';
 import { humanizeTime } from '../../utils/humanizeTime.js';
 import { isObject } from '../../utils/isObject.js';
 const globalObject = getGlobalObject('utils/executeHook.ts', {
-    userHookErrors: new Map()
+    userHookErrors: new WeakMap()
 });
 function isUserHookError(err) {
     if (!isObject(err))

package/dist/esm/shared/misc/isServerSideError.d.ts

@@ -0,0 +1 @@
+export declare const isServerSideError = "_isServerSideError";

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

@@ -0,0 +1 @@
+export const isServerSideError = '_isServerSideError';

package/dist/esm/shared/page-configs/Config.d.ts

@@ -46,12 +46,12 @@ type Config = ConfigBuiltIn & Vike.Config & (VikePackages.ConfigVikeReact | Vike
  *
  *  https://vike.dev/data
  */
-type DataAsync<Data> = (pageContext: PageContextServer) => Promise<Data>;
+type DataAsync<Data = unknown> = (pageContext: PageContextServer) => Promise<Data>;
 /** Hook for fetching data.
  *
  *  https://vike.dev/data
  */
-type DataSync<Data> = (pageContext: PageContextServer) => Data;
+type DataSync<Data = unknown> = (pageContext: PageContextServer) => Data;
 /** Protect page(s), e.g. forbid unauthorized access.
  *
  *  https://vike.dev/guard

package/dist/esm/shared/route/abort.d.ts

@@ -30,7 +30,7 @@ type AbortReason = Required<({
  * @param url The URL to redirect to.
  * @param statusCode By default a temporary redirection (`302`) is performed. For permanent redirections (`301`), use `config.redirects` https://vike.dev/redirects instead or, alternatively, set the `statusCode` argument to `301`.
  */
-declare function redirect(url: `/${string}` | `https://${string}` | `http://${string}`, statusCode?: 301 | 302): AbortRedirect;
+declare function redirect(url: string, statusCode?: 301 | 302): AbortRedirect;
 /**
  * Abort the rendering of the current page, and render the error page instead.
  *
@@ -58,16 +58,21 @@ declare function render(abortStatusCode: 401 | 403 | 404 | 410 | 429 | 500 | 503
  */
 declare function render(url: `/${string}`, abortReason?: AbortReason): Error;
 type AbortCall = `redirect(${string})` | `render(${string})` | `RenderErrorPage()`;
+type AbortCaller = `throw redirect()` | `throw render()` | `throw RenderErrorPage()`;
 type PageContextAbort = {
     _abortCall: AbortCall;
+    _abortCaller: AbortCaller;
 } & (({
+    _abortCall: `redirect(${string})`;
     _abortCaller: 'throw redirect()';
     _urlRedirect: UrlRedirect;
 } & Omit<AbortUndefined, '_urlRedirect'>) | ({
+    _abortCall: `render(${string})` | `RenderErrorPage()`;
     _abortCaller: 'throw render()' | 'throw RenderErrorPage()';
     abortReason: undefined | unknown;
     _urlRewrite: string;
 } & Omit<AbortUndefined, '_urlRewrite'>) | ({
+    _abortCall: `render(${string})` | `RenderErrorPage()`;
     _abortCaller: 'throw render()' | 'throw RenderErrorPage()';
     abortReason: undefined | unknown;
     abortStatusCode: number;

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

@@ -7,7 +7,7 @@ export { logAbortErrorHandled };
 export { getPageContextFromAllRewrites };
 export { AbortRender };
 export { assertNoInfiniteAbortLoop };
-import { assert, assertInfo, assertUsage, assertWarning, checkType, hasProp, isUserHookError, joinEnglish, objectAssign, projectInfo, truncateString } from './utils.js';
+import { assert, assertInfo, assertUsage, assertWarning, checkType, hasProp, isUriWithProtocol, isUserHookError, joinEnglish, objectAssign, projectInfo, truncateString } from './utils.js';
 import pc from '@brillout/picocolors';
 /**
  * Abort the rendering of the current page, and redirect the user to another URL instead.
@@ -19,6 +19,7 @@ import pc from '@brillout/picocolors';
  */
 function redirect(url, statusCode) {
     const abortCaller = 'throw redirect()';
+    assertUrl(url, abortCaller, true);
     const args = [JSON.stringify(url)];
     if (!statusCode) {
         statusCode = 302;
@@ -38,15 +39,15 @@ function redirect(url, statusCode) {
     });
     return AbortRender(pageContextAbort);
 }
-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(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);
 }
-function render_(value, abortReason, abortCall, abortCaller, pageContextAddendum) {
+function render_(urlOrStatusCode, abortReason, abortCall, abortCaller, pageContextAddendum) {
     const pageContextAbort = {
         abortReason,
         _abortCaller: abortCaller,
@@ -56,16 +57,17 @@ function render_(value, abortReason, abortCall, abortCaller, pageContextAddendum
         assert(pageContextAddendum._isLegacyRenderErrorPage === true);
         objectAssign(pageContextAbort, pageContextAddendum);
     }
-    if (typeof value === 'string') {
-        const url = value;
+    if (typeof urlOrStatusCode === 'string') {
+        const url = urlOrStatusCode;
+        assertUrl(url, abortCaller);
         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');
         objectAssign(pageContextAbort, {
             abortStatusCode,
             is404: abortStatusCode === 404
@@ -164,3 +166,12 @@ function assertNoInfiniteAbortLoop(rewriteCount, redirectCount) {
         .join(' and ');
     assertUsage(rewriteCount + redirectCount <= 7, `Maximum chain length of 7 ${abortCalls} exceeded. Did you define an infinite loop of ${abortCalls}?`);
 }
+function assertUrl(url, abortCaller, allowAbsoluteUrl) {
+    assertUsage(url.startsWith('/') || (allowAbsoluteUrl && isUriWithProtocol(url)), [
+        `Invalid URL ${pc.cyan(url)} passed to ${pc.cyan(abortCaller)}:`,
+        `the URL should start with ${pc.cyan('/')}`,
+        allowAbsoluteUrl && `or a valid protocol (${pc.cyan('https:')}, ${pc.cyan('ipfs:')}, ...)`
+    ]
+        .filter(Boolean)
+        .join(' '));
+}

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

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

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

@@ -2,8 +2,7 @@ export { resolveRedirects };
 // For ./resolveRedirects.spec.ts
 export { resolveRouteStringRedirect };
 import { assertIsNotBrowser } from '../../utils/assertIsNotBrowser.js';
-import { isUriWithProtocol } from '../../utils/parseUrl-extras.js';
-import { assert, assertUsage } from '../utils.js';
+import { assert, assertUsage, isUriWithProtocol } from '../utils.js';
 import { resolveUrlPathname } from './resolveUrlPathname.js';
 import { assertRouteString, resolveRouteString } from './resolveRouteString.js';
 import pc from '@brillout/picocolors';

package/dist/esm/utils/assert.js

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

package/dist/esm/utils/debug.js

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

package/dist/esm/utils/parseUrl-extras.d.ts

@@ -5,7 +5,6 @@ export { removeBaseServer };
 export { modifyUrlPathname };
 export { removeUrlOrigin };
 export { addUrlOrigin };
-export { isUriWithProtocol };
 declare function prependBase(url: string, baseServer: string): string;
 declare function removeBaseServer(url: string, baseServer: string): string;
 declare function isBaseAssets(base: string): boolean;
@@ -16,4 +15,3 @@ declare function removeUrlOrigin(url: string): {
     origin: string | null;
 };
 declare function addUrlOrigin(url: string, origin: string | null): string;
-declare function isUriWithProtocol(uri: string): boolean;

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

@@ -5,7 +5,6 @@ export { removeBaseServer };
 export { modifyUrlPathname };
 export { removeUrlOrigin };
 export { addUrlOrigin };
-export { isUriWithProtocol };
 import { assertUrlComponents, createUrlFromComponents, isBaseServer, parseUrl } from './parseUrl.js';
 import { assert } from './assert.js';
 import { slice } from './slice.js';
@@ -101,7 +100,3 @@ function addUrlOrigin(url, origin) {
     const urlModified = createUrlFromComponents(origin, pathnameOriginal, searchOriginal, hashOriginal);
     return urlModified;
 }
-function isUriWithProtocol(uri) {
-    // https://en.wikipedia.org/wiki/List_of_URI_schemes
-    return /^[a-z0-9][a-z0-9\.\+\-]*:/i.test(uri);
-}

package/dist/esm/utils/parseUrl.d.ts

@@ -4,6 +4,7 @@ export { assertUsageUrl };
 export { isBaseServer };
 export { assertUrlComponents };
 export { createUrlFromComponents };
+export { isUriWithProtocol };
 declare function isParsable(url: string): boolean;
 declare function assertUsageUrl(url: unknown, errPrefix: string): asserts url is string;
 declare function parseUrl(url: string, baseServer: string): {
@@ -20,3 +21,4 @@ declare function parseUrl(url: string, baseServer: string): {
 declare function isBaseServer(baseServer: string): boolean;
 declare function assertUrlComponents(url: string, origin: string | null, pathname: string, searchOriginal: string | null, hashOriginal: string | null): void;
 declare function createUrlFromComponents(origin: string | null, pathname: string, searchOriginal: string | null, hashOriginal: string | null): string;
+declare function isUriWithProtocol(uri: string): boolean;

package/dist/esm/utils/parseUrl.js

@@ -8,6 +8,7 @@ export { assertUsageUrl };
 export { isBaseServer };
 export { assertUrlComponents };
 export { createUrlFromComponents };
+export { isUriWithProtocol };
 import { slice } from './slice.js';
 import { assert, assertUsage } from './assert.js';
 import pc from '@brillout/picocolors';
@@ -227,3 +228,7 @@ function createUrlFromComponents(origin, pathname, searchOriginal, hashOriginal)
     const urlRecreated = `${origin || ''}${pathname}${searchOriginal || ''}${hashOriginal || ''}`;
     return urlRecreated;
 }
+function isUriWithProtocol(uri) {
+    // https://en.wikipedia.org/wiki/List_of_URI_schemes
+    return /^[a-z0-9][a-z0-9\.\+\-]*:/i.test(uri);
+}

package/dist/esm/utils/projectInfo.d.ts

@@ -1,13 +1,13 @@
 export { projectInfo };
 export type { ProjectTag };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.156";
+declare const PROJECT_VERSION: "0.4.158";
 type PackageName = typeof projectInfo.npmPackageName;
 type ProjectVersion = typeof projectInfo.projectVersion;
 type ProjectTag = `[${PackageName}]` | `[${PackageName}@${ProjectVersion}]`;
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.156";
+    projectVersion: "0.4.158";
     npmPackageName: "vike";
     githubRepository: "https://github.com/vikejs/vike";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
 import { onProjectInfo } from './assertSingleInstance.js';
-const PROJECT_VERSION = '0.4.156';
+const PROJECT_VERSION = '0.4.158';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.156",
+  "version": "0.4.158",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -16,7 +16,7 @@
     "@brillout/json-serializer": "^0.5.8",
     "@brillout/picocolors": "^1.0.10",
     "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-server-entry": "^0.4.2",
+    "@brillout/vite-plugin-server-entry": "^0.4.3",
     "acorn": "^8.0.0",
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",

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

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

package/dist/esm/shared/misc/isRenderFailure.d.ts

@@ -1 +0,0 @@
-export declare const isRenderFailure = "_isRenderFailure";

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

@@ -1 +0,0 @@
-export const isRenderFailure = '_isRenderFailure';