vike 0.4.156-commit-e46716d → 0.4.156-commit-d8d55d2

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)
@@ -374,7 +376,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/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/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/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-commit-e46716d';
+const PROJECT_VERSION = '0.4.156-commit-d8d55d2';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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)
@@ -368,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) {
     logAbortErrorHandled(errAbort, getGlobalContext().isProduction, pageContextNominalPageInit);
     const pageContextAbort = errAbort._pageContextAbort;
     let pageContextSerialized;

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/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/projectInfo.d.ts

@@ -1,13 +1,13 @@
 export { projectInfo };
 export type { ProjectTag };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.156-commit-e46716d";
+declare const PROJECT_VERSION: "0.4.156-commit-d8d55d2";
 type PackageName = typeof projectInfo.npmPackageName;
 type ProjectVersion = typeof projectInfo.projectVersion;
 type ProjectTag = `[${PackageName}]` | `[${PackageName}@${ProjectVersion}]`;
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.156-commit-e46716d";
+    projectVersion: "0.4.156-commit-d8d55d2";
     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-commit-e46716d';
+const PROJECT_VERSION = '0.4.156-commit-d8d55d2';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.156-commit-e46716d",
+  "version": "0.4.156-commit-d8d55d2",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",