vike 0.4.163 → 0.4.165-commit-74b18b0

package/dist/cjs/utils/assertNodeEnv.js

@@ -1,29 +1,84 @@
 "use strict";
-// Utils to manage process.env.NODE_ENV and, most notably, to assert correct usage, which is crucial:
-//  - https://github.com/vikejs/vike/issues/1469#issuecomment-1919518096
-//  - https://github.com/vitejs/vite/blob/76f30ae23b92f9af910ec02d98e2baaefa12141f/packages/vite/src/node/config.ts#L567
+// This file serves the following three purposes:
+//   1. Upon building the app, we ensure the right NODE_ENV value is set.
+//      - Both Vue and React use NODE_ENV for enabling production-specific features:
+//        - Vue: https://github.com/vuejs/core/blob/f66a75ea75c8aece065b61e2126b4c5b2338aa6e/packages/vue/index.js
+//        - React: https://github.com/facebook/react/blob/01ab35a9a731dec69995fbd28f3ac7eaad11e183/packages/react/npm/index.js
+//      - Setting NODE_ENV to 'production' doesn't seem to make any sense in development.
+//      - With React upon building the app, setting NODE_ENV to a value other than 'production' triggers an error: https://github.com/vikejs/vike/issues/1469#issuecomment-1969301797
+//      - With Vue upon building the app, NODE_ENV can be set to a value other than 'production', e.g. 'development'.
+//   2. Ensure Vite isn't loaded in production.
+//      - We currently only check whether Vite's development middleware is instantiated (i.e. whether Vite's `createServer()` was called). Is there a way to detect whether Vite's code is loaded?
+//   3. Ensure NODE_ENV isn't mistakenly set to a wrong value.
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertNodeEnvIsNotDev = exports.getNodeEnvDesc = exports.isNodeEnvDev = exports.setNodeEnvToProduction = exports.getNodeEnv = void 0;
+exports.handleNodeEnv_vitePluginVercel = exports.handleNodeEnv_prerender = exports.assertNodeEnv_onVikePluginLoad = exports.assertNodeEnv_runtime = exports.assertNodeEnv_build = void 0;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
 const assert_js_1 = require("./assert.js");
+const assertIsNotProductionRuntime_js_1 = require("./assertIsNotProductionRuntime.js");
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
+function assertNodeEnv_build() {
+    assertNodeEnvIsNotDev('building');
+}
+exports.assertNodeEnv_build = assertNodeEnv_build;
+function assertNodeEnv_runtime(viteDevServerExists) {
+    const nodeEnv = getNodeEnv();
+    if (nodeEnv === null || nodeEnv === 'test')
+        return;
+    const isDev = isNodeEnvDev();
+    // Calling Vite's createServer() is enough for hasViteDevServer to be true, even without actually adding Vite's development middleware to the server: https://github.com/vikejs/vike/issues/792#issuecomment-1516830759
+    if (viteDevServerExists === isDev)
+        return;
+    const nodeEnvDesc = getNodeEnvDesc();
+    // TODO: make it assertUsage() again once #1528 is implemented.
+    (0, assert_js_1.assertWarning)(false, `Vite's development server was${viteDevServerExists ? '' : "n't"} instantiated while the ${nodeEnvDesc} which is contradictory, see https://vike.dev/NODE_ENV`, { onlyOnce: true });
+}
+exports.assertNodeEnv_runtime = assertNodeEnv_runtime;
+function assertNodeEnv_onVikePluginLoad() {
+    const nodeEnv = getNodeEnv();
+    if (nodeEnv === 'test')
+        return;
+    // TODO: make it assertUsage() again once #1528 is implemented.
+    (0, assert_js_1.assertWarning)(
+    /* We can enable this assertion after Vike's CLI is implemented and using Vite's CLI is deprecated (we can then check whether the context is a `$ vike build`).
+    isNodeEnvDev() || isVikeCliBuild(),
+    /*/
+    isNodeEnvDev() || true, 
+    ///*/
+    [
+        picocolors_1.default.cyan(`process.env.NODE_ENV === ${JSON.stringify(nodeEnv)}`),
+        '(which Vike interprets as a non-development environment https://vike.dev/NODE_ENV)',
+        'while the vike/plugin module is loaded.',
+        assertIsNotProductionRuntime_js_1.vikeVitePluginLoadedInProductionError
+    ].join(' '), { onlyOnce: true });
+}
+exports.assertNodeEnv_onVikePluginLoad = assertNodeEnv_onVikePluginLoad;
+function handleNodeEnv_prerender() {
+    const assertNodeEnv = () => assertNodeEnvIsNotDev('pre-rendering');
+    if (getNodeEnv())
+        assertNodeEnv();
+    setNodeEnvToProduction();
+    assertNodeEnv();
+}
+exports.handleNodeEnv_prerender = handleNodeEnv_prerender;
+function handleNodeEnv_vitePluginVercel() {
+    setNodeEnvToProduction();
+}
+exports.handleNodeEnv_vitePluginVercel = handleNodeEnv_vitePluginVercel;
 function getNodeEnv() {
     if (typeof process === 'undefined')
         return null;
     return process.env.NODE_ENV;
 }
-exports.getNodeEnv = getNodeEnv;
 function setNodeEnvToProduction() {
     // The statement `process.env['NODE_ENV'] = 'production'` chokes webpack v4
     const proc = process;
     const { env } = proc;
     env.NODE_ENV = 'production';
 }
-exports.setNodeEnvToProduction = setNodeEnvToProduction;
 function isNodeEnvDev() {
     const nodeEnv = getNodeEnv();
     if (!nodeEnv)
@@ -33,19 +88,19 @@ function isNodeEnvDev() {
     // That's quite aggressive, let's see if some user complains
     return false;
 }
-exports.isNodeEnvDev = isNodeEnvDev;
 function getNodeEnvDesc() {
     const nodeEnv = getNodeEnv();
     const isDev = isNodeEnvDev();
     const nodeEnvDesc = `environment is set to be a ${(isDev ? 'development' : 'production')} environment by ${picocolors_1.default.cyan(`process.env.NODE_ENV === ${JSON.stringify(nodeEnv)}`)}`;
     return nodeEnvDesc;
 }
-exports.getNodeEnvDesc = getNodeEnvDesc;
 function assertNodeEnvIsNotDev(operation) {
     const isDev = isNodeEnvDev();
     if (!isDev)
         return;
     const nodeEnvDesc = getNodeEnvDesc();
-    (0, assert_js_1.assertUsage)(false, `The ${nodeEnvDesc} which is forbidden upon ${operation}, see https://vike.dev/NODE_ENV`);
+    // TODO: make it assertUsage() again once #1528 is implemented.
+    (0, assert_js_1.assertWarning)(false, `The ${nodeEnvDesc} which is forbidden upon ${operation}, see https://vike.dev/NODE_ENV`, {
+        onlyOnce: true
+    });
 }
-exports.assertNodeEnvIsNotDev = assertNodeEnvIsNotDev;

package/dist/cjs/utils/assertNodeVersion.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertNodeVersion = void 0;
-const assert_js_1 = require("./assert.js");
 const isNodeJS_js_1 = require("./isNodeJS.js");
-const isVersionOrAbove_js_1 = require("./isVersionOrAbove.js");
-// package.json#engines.node isn't enough as users can ignore it
+const assertVersion_js_1 = require("./assertVersion.js");
+// node_modules/vike/package.json#engines.node isn't enough as users can ignore it
 function assertNodeVersion() {
     if (!(0, isNodeJS_js_1.isNodeJS)())
         return;
     const version = process.versions.node;
-    (0, assert_js_1.assertUsage)((0, isVersionOrAbove_js_1.isVersionOrAbove)(version, '16.0.0'), `Node.js ${version} isn't supported, use Node.js >=16.0.0 instead.`);
+    (0, assertVersion_js_1.assertVersion)('Node.js', version, '16.0.0');
 }
 exports.assertNodeVersion = assertNodeVersion;

package/dist/cjs/utils/{isVersionOrAbove.js → assertVersion.js}

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVersionOrAbove = void 0;
+exports.isVersionOrAbove = exports.assertVersion = void 0;
 const assert_js_1 = require("./assert.js");
+function assertVersion(dependencyName, versionActual, versionExpected) {
+    (0, assert_js_1.assertUsage)(isVersionOrAbove(versionActual, versionExpected), `${dependencyName} ${versionActual} isn't supported, use ${dependencyName} >= ${versionExpected} instead.`);
+}
+exports.assertVersion = assertVersion;
 function isVersionOrAbove(versionActual, versionExpected) {
     const p1 = parseVersion(versionActual);
     const p2 = parseVersion(versionExpected);

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.163';
+const PROJECT_VERSION = '0.4.165-commit-74b18b0';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/__internal/index.js

@@ -2,7 +2,7 @@
 export { route, getPagesAndRoutes };
 import { route as routeInternal } from '../shared/route/index.js';
 import { getGlobalContext, initGlobalContext } from '../node/runtime/globalContext.js';
-import { setNodeEnvToProduction } from '../utils/assertNodeEnv.js';
+import { handleNodeEnv_vitePluginVercel } from '../utils/assertNodeEnv.js';
 import { assert } from '../utils/assert.js';
 import { getRenderContext } from '../node/runtime/renderPage/renderPageAlreadyRouted.js';
 /**
@@ -12,7 +12,7 @@ import { getRenderContext } from '../node/runtime/renderPage/renderPageAlreadyRo
  * @param config
  */
 async function getPagesAndRoutes() {
-    setNodeEnvToProduction();
+    handleNodeEnv_vitePluginVercel();
     await initGlobalContext(true);
     const globalContext = getGlobalContext();
     assert(globalContext.isProduction === true);

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

@@ -3,7 +3,8 @@ export { plugin };
 // TODO/v1-release: remove
 export { plugin as ssr };
 export { PROJECT_VERSION as version } from './utils.js';
-import { assertUsage, getNodeEnv, isNodeEnvDev, markEnvAsVikePluginLoaded, vikeVitePluginLoadedInProductionError } from './utils.js';
+import { version } from 'vite';
+import { assertNodeEnv_onVikePluginLoad, assertUsage, assertVersion, markEnvAsVikePluginLoaded } from './utils.js';
 import { buildConfig } from './plugins/buildConfig.js';
 import { previewConfig } from './plugins/previewConfig.js';
 import { autoFullBuild } from './plugins/autoFullBuild.js';
@@ -23,8 +24,9 @@ import { baseUrls } from './plugins/baseUrls.js';
 import { envVarsPlugin } from './plugins/envVars.js';
 import pc from '@brillout/picocolors';
 import { fileEnv } from './plugins/fileEnv.js';
-assertNodeEnv();
+assertNodeEnv_onVikePluginLoad();
 markEnvAsVikePluginLoaded();
+assertViteVersion();
 // Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
 function plugin(vikeConfig) {
     const plugins = [
@@ -63,21 +65,7 @@ Object.defineProperty(plugin, 'apply', {
         assertUsage(false, `Add ${pc.cyan('vike()')} instead of ${pc.cyan('vike')} to vite.config.js#plugins (i.e. call the function and add the return value instead of adding the function itself)`, { showStackTrace: true });
     }
 });
-function assertNodeEnv() {
-    const nodeEnv = getNodeEnv();
-    if (nodeEnv === 'test')
-        return;
-    // We should change this to be a warning if it blocks users (e.g. if a bad-citizen tool sets a wrong process.env.NODE_ENV value).
-    assertUsage(
-    /* We can enable this assertion after Vike's CLI is implemented and using Vite's CLI is deprecated (we can then check whether the context is a `$ vike build`).
-    isNodeEnvDev() || isVikeCliBuild(),
-    /*/
-    isNodeEnvDev() || true, 
-    ///*/
-    [
-        pc.cyan(`process.env.NODE_ENV === ${JSON.stringify(nodeEnv)}`),
-        '(which Vike interprets as a non-development environment https://vike.dev/NODE_ENV)',
-        'while the vike/plugin module is loaded.',
-        vikeVitePluginLoadedInProductionError
-    ].join(' '));
+// node_modules/vike/package.json#peerDependencies.vite isn't enough as users can ignore it
+function assertViteVersion() {
+    assertVersion('Vite', version, '4.4.0');
 }

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

@@ -6,6 +6,7 @@ import { getConfigVike } from '../../shared/getConfigVike.js';
 import { isViteCliCall, getViteConfigFromCli } from '../shared/isViteCliCall.js';
 import pc from '@brillout/picocolors';
 import { logErrorHint } from '../../runtime/renderPage/logErrorHint.js';
+import { manifestTempFile } from './buildConfig.js';
 let forceExit = false;
 function autoFullBuild() {
     let config;
@@ -58,10 +59,12 @@ async function triggerFullBuild(config, configVike, bundle) {
         return; // already triggered
     if (isDisabled(configVike))
         return;
-    /* Is this @vitejs/plugin-legacy workaround still needed? Should we re-implement it?
-    // vike.json missing => it isn't a `$ vite build` call (e.g. @vitejs/plugin-legacy calls Vite's build() API) => skip
-    if (!bundle['vike.json']) return
-    */
+    // Workaround for @vitejs/plugin-legacy
+    //  - The legacy plugin triggers its own Rollup build for the client-side.
+    //  - The legacy plugin doesn't generate a manifest => we can use that to detect the legacy plugin build.
+    //  - Issue & reproduction: https://github.com/vikejs/vike/issues/1154#issuecomment-1965954636
+    if (!bundle[manifestTempFile])
+        return;
     const configFromCli = !isViteCliCall() ? null : getViteConfigFromCli();
     const configInline = {
         ...configFromCli,

package/dist/esm/node/plugin/plugins/buildConfig/fixServerAssets.d.ts

@@ -1,7 +1,7 @@
 export { fixServerAssets };
 export { fixServerAssets_isEnabled };
 import { ViteManifest } from '../../../shared/ViteManifest.js';
-import { OutDirs } from '../../utils.js';
+import { ResolvedConfig } from 'vite';
 /**
  * true  => use workaround config.build.ssrEmitAssets
  * false => use workaround extractAssets plugin
@@ -10,4 +10,4 @@ import { OutDirs } from '../../utils.js';
  */
 declare function fixServerAssets_isEnabled(): boolean;
 /** https://github.com/vikejs/vike/issues/1339 */
-declare function fixServerAssets(outDirs: OutDirs): Promise<ViteManifest>;
+declare function fixServerAssets(config: ResolvedConfig): Promise<ViteManifest>;

package/dist/esm/node/plugin/plugins/buildConfig/fixServerAssets.js

@@ -3,9 +3,10 @@ export { fixServerAssets_isEnabled };
 import fs from 'fs/promises';
 import path from 'path';
 import { existsSync } from 'fs';
-import { assert, pLimit, unique } from '../../utils.js';
+import { assert, getOutDirs, pLimit, unique } from '../../utils.js';
 import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { manifestTempFile } from '../buildConfig.js';
+import { getAssetsDir } from '../../shared/getAssetsDir.js';
 /**
  * true  => use workaround config.build.ssrEmitAssets
  * false => use workaround extractAssets plugin
@@ -18,11 +19,12 @@ function fixServerAssets_isEnabled() {
     return true;
 }
 /** https://github.com/vikejs/vike/issues/1339 */
-async function fixServerAssets(outDirs) {
+async function fixServerAssets(config) {
+    const outDirs = getOutDirs(config);
     const clientManifest = await loadManifest(outDirs.outDirClient);
     const serverManifest = await loadManifest(outDirs.outDirServer);
     const { clientManifestMod, filesToCopy } = addServerAssets(clientManifest, serverManifest);
-    await copyAssets(filesToCopy, outDirs);
+    await copyAssets(filesToCopy, config);
     return clientManifestMod;
 }
 async function loadManifest(outDir) {
@@ -33,8 +35,10 @@ async function loadManifest(outDir) {
     assert(manifest);
     return manifest;
 }
-async function copyAssets(filesToCopy, { outDirClient, outDirServer }) {
-    const assetsDirServer = path.posix.join(outDirServer, 'assets');
+async function copyAssets(filesToCopy, config) {
+    const { outDirClient, outDirServer } = getOutDirs(config);
+    const assetsDir = getAssetsDir(config);
+    const assetsDirServer = path.posix.join(outDirServer, assetsDir);
     if (!filesToCopy.length)
         return;
     assert(existsSync(assetsDirServer));

package/dist/esm/node/plugin/plugins/buildConfig.js

@@ -2,7 +2,7 @@ export { buildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
 export { manifestTempFile };
-import { assert, resolveOutDir, viteIsSSR, getFilePathAbsolute, addOnBeforeLogHook, removeFileExtention, unique, assertPosixPath, assertUsage, injectRollupInputs, normalizeRollupInput, assertNodeEnvIsNotDev, getOutDirs, isNpmPackageImport } from '../utils.js';
+import { assert, resolveOutDir, viteIsSSR, getFilePathAbsolute, addOnBeforeLogHook, removeFileExtention, unique, assertPosixPath, assertUsage, injectRollupInputs, normalizeRollupInput, getOutDirs, isNpmPackageImport, assertNodeEnv_build } from '../utils.js';
 import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { getConfigValue } from '../../../shared/page-configs/helpers.js';
 import { findPageFiles } from '../shared/findPageFiles.js';
@@ -24,14 +24,16 @@ function buildConfig() {
     let isServerAssetsFixEnabled;
     let isSsrBuild;
     let outDirs;
+    let config;
     return {
         name: 'vike:buildConfig',
         apply: 'build',
         enforce: 'post',
         configResolved: {
             order: 'post',
-            async handler(config) {
-                assertNodeEnv();
+            async handler(config_) {
+                config = config_;
+                assertNodeEnv_build();
                 assertRollupInput(config);
                 const entries = await getEntries(config);
                 assert(Object.keys(entries).length > 0);
@@ -50,7 +52,7 @@ function buildConfig() {
             }
         },
         config(config) {
-            assertNodeEnv();
+            assertNodeEnv_build();
             isSsrBuild = viteIsSSR(config);
             return {
                 build: {
@@ -61,7 +63,7 @@ function buildConfig() {
             };
         },
         buildStart() {
-            assertNodeEnv();
+            assertNodeEnv_build();
         },
         writeBundle: {
             order: 'post',
@@ -78,7 +80,7 @@ function buildConfig() {
                         await fs.copyFile(clientManifestFilePath, assetsJsonFilePath);
                     }
                     else {
-                        const clientManifestMod = await fixServerAssets(outDirs);
+                        const clientManifestMod = await fixServerAssets(config);
                         await fs.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
                     }
                     await fs.rm(clientManifestFilePath);
@@ -252,6 +254,3 @@ function assertRollupInput(config) {
     const htmlInput = htmlInputs[0];
     assertUsage(htmlInput === undefined, `The entry ${htmlInput} of config build.rollupOptions.input is an HTML entry which is forbidden when using Vike, instead follow https://vike.dev/add`);
 }
-function assertNodeEnv() {
-    assertNodeEnvIsNotDev('building');
-}

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

@@ -4,6 +4,7 @@ export { distFileNames };
 //  - Blocker: https://github.com/rollup/rollup/issues/4724
 import { assertPosixPath, assert, assertUsage } from '../utils.js';
 import path from 'path';
+import { getAssetsDir } from '../shared/getAssetsDir.js';
 function distFileNames() {
     return {
         name: 'vike:distFileNames',
@@ -163,9 +164,3 @@ function getRollupOutputs(config) {
     }
     return output;
 }
-function getAssetsDir(config) {
-    let { assetsDir } = config.build;
-    assertUsage(assetsDir, `${assetsDir} cannot be an empty string`);
-    assetsDir = assetsDir.split(/\/|\\/).filter(Boolean).join('/');
-    return assetsDir;
-}

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.d.ts

@@ -3,7 +3,7 @@ export { reloadVikeConfig };
 export { vikeConfigDependencies };
 export { isVikeConfigFile };
 export { isV1Design };
-export type { VikeConfig };
+export type { VikeConfigObject };
 export type { InterfaceValueFile };
 import type { PageConfigGlobalBuildTime, PageConfigBuildTime, FilePathResolved } from '../../../../../shared/page-configs/PageConfig.js';
 import { type LocationId } from './getVikeConfig/filesystemRouting.js';
@@ -21,13 +21,13 @@ type InterfaceValueFile = InterfaceFileCommons & {
     configName: string;
 };
 type ConfigName = string;
-type VikeConfig = {
+type VikeConfigObject = {
     pageConfigs: PageConfigBuildTime[];
     pageConfigGlobal: PageConfigGlobalBuildTime;
     globalVikeConfig: Record<string, unknown>;
 };
 declare const vikeConfigDependencies: Set<string>;
 declare function reloadVikeConfig(userRootDir: string, outDirRoot: string): void;
-declare function getVikeConfig(config: ResolvedConfig, isDev: boolean, tolerateInvalidConfig?: boolean): Promise<VikeConfig>;
+declare function getVikeConfig(config: ResolvedConfig, isDev: boolean, tolerateInvalidConfig?: boolean): Promise<VikeConfigObject>;
 declare function isV1Design(config: ResolvedConfig, isDev: boolean): Promise<boolean>;
 declare function isVikeConfigFile(filePath: string): boolean;

package/dist/esm/node/plugin/shared/getAssetsDir.d.ts

@@ -0,0 +1,3 @@
+export { getAssetsDir };
+import type { ResolvedConfig } from 'vite';
+declare function getAssetsDir(config: ResolvedConfig): string;

package/dist/esm/node/plugin/shared/getAssetsDir.js

@@ -0,0 +1,8 @@
+export { getAssetsDir };
+import { assertUsage } from '../utils.js';
+function getAssetsDir(config) {
+    let { assetsDir } = config.build;
+    assertUsage(assetsDir, `${assetsDir} cannot be an empty string`);
+    assetsDir = assetsDir.split(/\/|\\/).filter(Boolean).join('/');
+    return assetsDir;
+}

package/dist/esm/node/plugin/shared/getHttpRequestAsyncStore.d.ts

@@ -4,7 +4,6 @@ type HttpRequestAsyncStore = {
     httpRequestId: number;
     shouldErrorBeSwallowed: (err: unknown) => boolean;
     markErrorAsLogged: (err: unknown) => void;
-    markErrorMessageAsLogged: (errMsg: string) => void;
     errorDebugNoteAlreadyShown: boolean;
 };
 declare function installHttpRequestAsyncStore(): Promise<void>;

package/dist/esm/node/plugin/shared/getHttpRequestAsyncStore.js

@@ -11,10 +11,11 @@
 export { getHttpRequestAsyncStore };
 export { installHttpRequestAsyncStore };
 import { renderPage_addWrapper } from '../../runtime/renderPage.js';
-import { assert, assertIsNotProductionRuntime, isObject } from '../utils.js';
+import { assert, assertIsNotProductionRuntime, isObject, unique } from '../utils.js';
 import { getConfigBuildErrorFormatted } from '../plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js';
 import { logErrorDebugNote } from './loggerNotProd.js';
 import { isEquivalentErrorWithCodeSnippet } from './loggerNotProd/errorWithCodeSnippet.js';
+import { isDeepStrictEqual } from 'node:util';
 assertIsNotProductionRuntime();
 let asyncLocalStorage = null;
 async function installHttpRequestAsyncStore() {
@@ -44,29 +45,14 @@ async function installHttpRequestAsyncStore() {
                 return false;
             }
         };
-        // Remove once https://github.com/vitejs/vite/pull/13495 is released
-        const swallowedErrorMessages = new Set();
-        const markErrorMessageAsLogged = (errMsg) => {
-            swallowedErrorMessages.add(errMsg);
-        };
-        const onRequestDone = () => {
-            swallowedErrorMessages.forEach((errMsg) => {
-                if (!Array.from(loggedErrors).some((err) => String(err).includes(errMsg))) {
-                    console.error('loggedErrors', loggedErrors);
-                    console.error('swallowedErrorMessages', swallowedErrorMessages);
-                    assert(false);
-                }
-            });
-        };
         const store = {
             httpRequestId,
             markErrorAsLogged,
-            markErrorMessageAsLogged,
             shouldErrorBeSwallowed,
             errorDebugNoteAlreadyShown: false
         };
         const pageContextReturn = await asyncLocalStorage.run(store, renderPage);
-        return { pageContextReturn, onRequestDone };
+        return { pageContextReturn };
     });
     return;
 }
@@ -90,14 +76,20 @@ function isEquivalent(err1, err2) {
     }
     if (isEquivalentErrorWithCodeSnippet(err1, err2))
         return true;
-    if (err1.constructor === Error &&
-        Object.keys(err1).length === 0 &&
-        isDefinedAndSame(err1.message, err2.message) &&
-        isDefinedAndSame(err1.stack, err2.stack)) {
+    if (unique([
+        // error.message and error.stack aren't enumerable and therefore not listed by Object.keys()
+        'message',
+        'stack',
+        ...Object.keys(err1),
+        ...Object.keys(err2)
+    ]).every((k) => {
+        // isDeepStrictEqual() need to compare error.position wich is an object.
+        if (isDeepStrictEqual(err1[k], err2[k]))
+            return true;
+        // console.log('diff', k)
+        return false;
+    })) {
         return true;
     }
     return false;
 }
-function isDefinedAndSame(val1, val2) {
-    return val1 && val1 === val2;
-}

package/dist/esm/node/plugin/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/{errMdx.d.ts → errMdx1.d.ts}

@@ -1,4 +1,4 @@
-export declare const errMdx: {
+export declare const errMdx1: {
     name: string;
     message: string;
     reason: string;

package/dist/esm/node/plugin/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/{errMdx.js → errMdx1.js}

@@ -1,4 +1,4 @@
-export const errMdx = {
+export const errMdx1 = {
     name: '5:5-5:6',
     message: 'Unexpected closing slash `/` in tag, expected an open tag first',
     reason: 'Unexpected closing slash `/` in tag, expected an open tag first',

package/dist/esm/node/plugin/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errMdx2.d.ts

@@ -0,0 +1,44 @@
+export declare const errMdx2: {
+    reason: string;
+    line: number;
+    column: number;
+    position: {
+        start: {
+            line: number;
+            column: number;
+            offset: number;
+            _index: number;
+            _bufferIndex: number;
+        };
+        end: {
+            line: number;
+            column: number;
+            offset: number;
+            _index: number;
+            _bufferIndex: number;
+        };
+    };
+    source: string;
+    ruleId: string;
+    plugin: string;
+    id: string;
+    pluginCode: string;
+    loc: {
+        file: string;
+        start: {
+            line: number;
+            column: number;
+            offset: number;
+            _index: number;
+            _bufferIndex: number;
+        };
+        end: {
+            line: number;
+            column: number;
+            offset: number;
+            _index: number;
+            _bufferIndex: number;
+        };
+    };
+    frame: string;
+};

package/dist/esm/node/plugin/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errMdx2.js

@@ -0,0 +1,82 @@
+export const errMdx2 = {
+    reason: 'Unexpected closing slash `/` in tag, expected an open tag first',
+    line: 23,
+    column: 450,
+    position: {
+        start: {
+            line: 23,
+            column: 450,
+            offset: 1967,
+            _index: 0,
+            _bufferIndex: 444
+        },
+        end: {
+            line: 23,
+            column: 451,
+            offset: 1968,
+            _index: 0,
+            _bufferIndex: 445
+        }
+    },
+    source: 'mdast-util-mdx-jsx',
+    ruleId: 'unexpected-closing-slash',
+    plugin: '@mdx-js/rollup',
+    id: '/home/rom/code/vike/docs/pages/abort/+Page.mdx',
+    pluginCode: "import { Link } from '@brillout/docpress'\n" +
+        '\n' +
+        'By using <Link href="/render" text={<code>throw render()</code>}></Link> or <Link href="/redirect" text={<code>throw redirect()</code>}></Link> you abort the rendering of the current page and render something else instead.\n' +
+        '\n' +
+        `<h2 id="throw-redirect-vs-throw-render"><code>{'throw redirect()'}</code>{' VS '}<code>{'throw render()'}</code></h2>\n` +
+        '\n' +
+        'While `throw redirect()` changes the URL, `throw render()` preserves it:\n' +
+        " - If a user goes to `/admin` and `throw redirect('/login')` is called, then the user will see the new URL `/login` in the browser's address bar.\n" +
+        " - If a user goes to `/admin` and `throw render('/login')` is called, then the user keeps seeing the same URL `/admin` in the browser's address bar.\n" +
+        '\n' +
+        "In general, we recommend using `throw render('/login')` instead of `throw redirect('/login')` as it preserves the URL and, therefore, the user's intention. We further explain this techniue at <Link href=\"/auth#login-flow\" />.\n" +
+        '\n' +
+        '\n' +
+        `<h2 id="debug">{'Debug'}</h2>\n` +
+        '\n' +
+        "If `throw redirect()` or `throw render()` doesn't work:\n" +
+        " - **Make sure `throw redirect()` / `throw render()` isn't intercepted.**  \n" +
+        "   In developement, check your server logs for the following log. If this log is missing then it means that Vike didn't catch the `throw redirect()` / `throw render()` exception: some other code is intercepting it preventing Vike from catching it.\n" +
+        '   ```\n' +
+        "   10:00:00 AM [vike][request(42)] throw redirect('/some-url') intercepted while\n" +
+        '   rendering /some-other-url\n' +
+        '   ```\n' +
+        '   > Most notably, using `throw redirect()` / `throw render()` inside a UI component usually doesn\'t work because most <Link href="/ui-framework">UI framework</Link> will intercept the execption and thus Vike won\'t be able to catch it. Instead, consider using `throw redirect()` / `throw render()` in a Vike hook such as <Link href="/guard">guard()</Link> or <Link href="/data">data()</Link>, or consider using <Link href="/navigate" />`navigate()`</Link>.\n' +
+        ' - **Make sure to use `throw redirect()` / `throw render()` within a Vike hook.**  \n' +
+        "   If you use `throw redirect()` / `throw render()` outside of Vike hooks, for example in some server middleware code then Vike won't be able to intercept it.\n" +
+        '\n' +
+        "If `throw redirect()` doesn't work:\n" +
+        ' - **Make sure to add `pageContext.httpResponse.headers` to the HTTP response.**  \n' +
+        '   If you\'ve embedded Vike into your server using <Link text={<code>renderPage()</code>} href="/renderPage" />, then insepct whether `pageContext.httpResponse.headers` contains the `Location` header and double check that you\'re correctly adding all the headers defined by `pageContext.httpResponse.headers` to the HTTP response.\n' +
+        '\n' +
+        '\n' +
+        `<h2 id="see-also">{'See also'}</h2>\n` +
+        '\n' +
+        ' - <Link href="/redirect" />\n' +
+        ' - <Link href="/render" />\n' +
+        ' - <Link href="/navigate" />\n' +
+        '\n' +
+        '\n' +
+        'export const headings = [{"headingId":"throw-redirect-vs-throw-render","headingLevel":2,"title":"`throw redirect()` VS `throw render()`"}, {"headingId":"debug","headingLevel":2,"title":"Debug"}, {"headingId":"see-also","headingLevel":2,"title":"See also"}];\n',
+    loc: {
+        file: '/home/rom/code/vike/docs/pages/abort/+Page.mdx',
+        start: {
+            line: 23,
+            column: 450,
+            offset: 1967,
+            _index: 0,
+            _bufferIndex: 444
+        },
+        end: {
+            line: 23,
+            column: 451,
+            offset: 1968,
+            _index: 0,
+            _bufferIndex: 445
+        }
+    },
+    frame: ''
+};