vike 0.4.163 → 0.4.165-commit-74b18b0

package/dist/cjs/__internal/index.js

@@ -13,7 +13,7 @@ const renderPageAlreadyRouted_js_1 = require("../node/runtime/renderPage/renderP
  * @param config
  */
 async function getPagesAndRoutes() {
-    (0, assertNodeEnv_js_1.setNodeEnvToProduction)();
+    (0, assertNodeEnv_js_1.handleNodeEnv_vitePluginVercel)();
     await (0, globalContext_js_1.initGlobalContext)(true);
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
     (0, assert_js_1.assert)(globalContext.isProduction === true);

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

@@ -7,6 +7,7 @@ exports.version = exports.ssr = exports.plugin = void 0;
 exports.default = plugin;
 var utils_js_1 = require("./utils.js");
 Object.defineProperty(exports, "version", { enumerable: true, get: function () { return utils_js_1.PROJECT_VERSION; } });
+const vite_1 = require("vite");
 const utils_js_2 = require("./utils.js");
 const buildConfig_js_1 = require("./plugins/buildConfig.js");
 const previewConfig_js_1 = require("./plugins/previewConfig.js");
@@ -27,8 +28,9 @@ const baseUrls_js_1 = require("./plugins/baseUrls.js");
 const envVars_js_1 = require("./plugins/envVars.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const fileEnv_js_1 = require("./plugins/fileEnv.js");
-assertNodeEnv();
+(0, utils_js_2.assertNodeEnv_onVikePluginLoad)();
 (0, utils_js_2.markEnvAsVikePluginLoaded)();
+assertViteVersion();
 // Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
 function plugin(vikeConfig) {
     const plugins = [
@@ -69,21 +71,7 @@ Object.defineProperty(plugin, 'apply', {
         (0, utils_js_2.assertUsage)(false, `Add ${picocolors_1.default.cyan('vike()')} instead of ${picocolors_1.default.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 = (0, utils_js_2.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).
-    (0, utils_js_2.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(),
-    /*/
-    (0, utils_js_2.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.',
-        utils_js_2.vikeVitePluginLoadedInProductionError
-    ].join(' '));
+// node_modules/vike/package.json#peerDependencies.vite isn't enough as users can ignore it
+function assertViteVersion() {
+    (0, utils_js_2.assertVersion)('Vite', vite_1.version, '4.4.0');
 }

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

@@ -11,6 +11,7 @@ const getConfigVike_js_1 = require("../../shared/getConfigVike.js");
 const isViteCliCall_js_1 = require("../shared/isViteCliCall.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const logErrorHint_js_1 = require("../../runtime/renderPage/logErrorHint.js");
+const buildConfig_js_1 = require("./buildConfig.js");
 let forceExit = false;
 function autoFullBuild() {
     let config;
@@ -64,10 +65,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[buildConfig_js_1.manifestTempFile])
+        return;
     const configFromCli = !(0, isViteCliCall_js_1.isViteCliCall)() ? null : (0, isViteCliCall_js_1.getViteConfigFromCli)();
     const configInline = {
         ...configFromCli,

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

@@ -10,6 +10,7 @@ const fs_1 = require("fs");
 const utils_js_1 = require("../../utils.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const buildConfig_js_1 = require("../buildConfig.js");
+const getAssetsDir_js_1 = require("../../shared/getAssetsDir.js");
 /**
  * true  => use workaround config.build.ssrEmitAssets
  * false => use workaround extractAssets plugin
@@ -23,11 +24,12 @@ function fixServerAssets_isEnabled() {
 }
 exports.fixServerAssets_isEnabled = fixServerAssets_isEnabled;
 /** https://github.com/vikejs/vike/issues/1339 */
-async function fixServerAssets(outDirs) {
+async function fixServerAssets(config) {
+    const outDirs = (0, utils_js_1.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;
 }
 exports.fixServerAssets = fixServerAssets;
@@ -39,8 +41,10 @@ async function loadManifest(outDir) {
     (0, utils_js_1.assert)(manifest);
     return manifest;
 }
-async function copyAssets(filesToCopy, { outDirClient, outDirServer }) {
-    const assetsDirServer = path_1.default.posix.join(outDirServer, 'assets');
+async function copyAssets(filesToCopy, config) {
+    const { outDirClient, outDirServer } = (0, utils_js_1.getOutDirs)(config);
+    const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
+    const assetsDirServer = path_1.default.posix.join(outDirServer, assetsDir);
     if (!filesToCopy.length)
         return;
     (0, utils_js_1.assert)((0, fs_1.existsSync)(assetsDirServer));

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

@@ -27,14 +27,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_;
+                (0, utils_js_1.assertNodeEnv_build)();
                 assertRollupInput(config);
                 const entries = await getEntries(config);
                 (0, utils_js_1.assert)(Object.keys(entries).length > 0);
@@ -53,7 +55,7 @@ function buildConfig() {
             }
         },
         config(config) {
-            assertNodeEnv();
+            (0, utils_js_1.assertNodeEnv_build)();
             isSsrBuild = (0, utils_js_1.viteIsSSR)(config);
             return {
                 build: {
@@ -64,7 +66,7 @@ function buildConfig() {
             };
         },
         buildStart() {
-            assertNodeEnv();
+            (0, utils_js_1.assertNodeEnv_build)();
         },
         writeBundle: {
             order: 'post',
@@ -81,7 +83,7 @@ function buildConfig() {
                         await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
                     }
                     else {
-                        const clientManifestMod = await (0, fixServerAssets_js_1.fixServerAssets)(outDirs);
+                        const clientManifestMod = await (0, fixServerAssets_js_1.fixServerAssets)(config);
                         await promises_1.default.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
                     }
                     await promises_1.default.rm(clientManifestFilePath);
@@ -258,6 +260,3 @@ function assertRollupInput(config) {
     (0, utils_js_1.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`);
 }
 exports.assertRollupInput = assertRollupInput;
-function assertNodeEnv() {
-    (0, utils_js_1.assertNodeEnvIsNotDev)('building');
-}

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

@@ -9,6 +9,7 @@ exports.distFileNames = void 0;
 //  - Blocker: https://github.com/rollup/rollup/issues/4724
 const utils_js_1 = require("../utils.js");
 const path_1 = __importDefault(require("path"));
+const getAssetsDir_js_1 = require("../shared/getAssetsDir.js");
 function distFileNames() {
     return {
         name: 'vike:distFileNames',
@@ -41,7 +42,7 @@ function distFileNames() {
 }
 exports.distFileNames = distFileNames;
 function getAssetFileName(assetInfo, config) {
-    const assetsDir = getAssetsDir(config);
+    const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
     const dir = assetsDir + '/static';
     let { name } = assetInfo;
     if (!name) {
@@ -69,13 +70,13 @@ function getChunkFileName(_chunkInfo, config) {
     const isForClientSide = !config.build.ssr;
     let name = 'chunks/chunk-[hash].js';
     if (isForClientSide) {
-        const assetsDir = getAssetsDir(config);
+        const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
         name = `${assetsDir}/${name}`;
     }
     return name;
 }
 function getEntryFileName(chunkInfo, config, isEntry) {
-    const assetsDir = getAssetsDir(config);
+    const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
     const isForClientSide = !config.build.ssr;
     let { name } = chunkInfo;
     (0, utils_js_1.assertPosixPath)(name);
@@ -169,9 +170,3 @@ function getRollupOutputs(config) {
     }
     return output;
 }
-function getAssetsDir(config) {
-    let { assetsDir } = config.build;
-    (0, utils_js_1.assertUsage)(assetsDir, `${assetsDir} cannot be an empty string`);
-    assetsDir = assetsDir.split(/\/|\\/).filter(Boolean).join('/');
-    return assetsDir;
-}

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

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAssetsDir = void 0;
+const utils_js_1 = require("../utils.js");
+function getAssetsDir(config) {
+    let { assetsDir } = config.build;
+    (0, utils_js_1.assertUsage)(assetsDir, `${assetsDir} cannot be an empty string`);
+    assetsDir = assetsDir.split(/\/|\\/).filter(Boolean).join('/');
+    return assetsDir;
+}
+exports.getAssetsDir = getAssetsDir;

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

@@ -32,6 +32,7 @@ const utils_js_1 = require("../utils.js");
 const transpileAndExecuteFile_js_1 = require("../plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js");
 const loggerNotProd_js_1 = require("./loggerNotProd.js");
 const errorWithCodeSnippet_js_1 = require("./loggerNotProd/errorWithCodeSnippet.js");
+const node_util_1 = require("node:util");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 let asyncLocalStorage = null;
 async function installHttpRequestAsyncStore() {
@@ -61,29 +62,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);
-                    (0, utils_js_1.assert)(false);
-                }
-            });
-        };
         const store = {
             httpRequestId,
             markErrorAsLogged,
-            markErrorMessageAsLogged,
             shouldErrorBeSwallowed,
             errorDebugNoteAlreadyShown: false
         };
         const pageContextReturn = await asyncLocalStorage.run(store, renderPage);
-        return { pageContextReturn, onRequestDone };
+        return { pageContextReturn };
     });
     return;
 }
@@ -109,14 +95,20 @@ function isEquivalent(err1, err2) {
     }
     if ((0, errorWithCodeSnippet_js_1.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 ((0, utils_js_1.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 ((0, node_util_1.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/cjs/node/plugin/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/{errMdx.js → errMdx1.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.errMdx = void 0;
-exports.errMdx = {
+exports.errMdx1 = void 0;
+exports.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/cjs/node/plugin/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errMdx2.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.errMdx2 = void 0;
+exports.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: ''
+};

package/dist/cjs/node/plugin/shared/loggerNotProd.js

@@ -9,7 +9,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearLogs = exports.logErrorDebugNote = exports.logConfigErrorRecover = exports.logConfigError = exports.logConfigInfo = exports.logViteErrorContainingCodeSnippet = exports.logViteAny = void 0;
+exports.clearLogs = exports.logErrorDebugNote = exports.logConfigErrorRecover = exports.logConfigError = exports.logConfigInfo = exports.logViteError = exports.logViteAny = void 0;
 const abort_js_1 = require("../../../shared/route/abort.js");
 const globalContext_js_1 = require("../../runtime/globalContext.js");
 const loggerRuntime_js_1 = require("../../runtime/renderPage/loggerRuntime.js");
@@ -56,15 +56,17 @@ function logConfigErrorRecover() {
 }
 exports.logConfigErrorRecover = logConfigErrorRecover;
 function logRuntimeError(err, 
-/** `httpRequestId` is `null` when pre-rendering */
+// httpRequestId is `null` when pre-rendering
 httpRequestId) {
-    logErr(err, httpRequestId);
+    logErr(err, httpRequestId, false);
 }
-function logViteErrorContainingCodeSnippet(err) {
-    logErr(err);
+function logViteError(err, 
+// httpRequestId is `undefined` if development environment doesn't support async stores
+httpRequestId) {
+    logErr(err, httpRequestId, true);
 }
-exports.logViteErrorContainingCodeSnippet = logViteErrorContainingCodeSnippet;
-function logErr(err, httpRequestId = null) {
+exports.logViteError = logViteError;
+function logErr(err, httpRequestId = null, errorComesFromVite) {
     (0, utils_js_1.warnIfErrorIsNotObject)(err);
     if ((0, abort_js_1.isAbortError)(err) && !(0, isErrorDebug_js_1.isErrorDebug)()) {
         return;
@@ -103,9 +105,10 @@ function logErr(err, httpRequestId = null) {
         (0, log_js_1.logWithVikeTag)(picocolors_1.default.red(`Following error was thrown by the ${hookName}() hook defined at ${hookFilePath}`), 'error', category);
     }
     else if (category) {
-        logFallbackErrIntro(category);
+        logFallbackErrIntro(category, errorComesFromVite);
     }
     (0, log_js_1.logDirectly)(err, 'error');
+    // Needs to be called after logging the error.
     (0, loggerProd_js_1.onRuntimeError)(err);
 }
 function logConfigError(err) {
@@ -140,12 +143,13 @@ function logConfigError(err) {
             return;
     }
     if (category)
-        logFallbackErrIntro(category);
+        logFallbackErrIntro(category, false);
     (0, log_js_1.logDirectly)(err, 'error');
 }
 exports.logConfigError = logConfigError;
-function logFallbackErrIntro(category) {
-    (0, log_js_1.logWithVikeTag)(picocolors_1.default.bold(picocolors_1.default.red('[Error] An error was thrown:')), 'error', category);
+function logFallbackErrIntro(category, errorComesFromVite) {
+    const msg = errorComesFromVite ? 'Transpilation error' : 'An error was thrown';
+    (0, log_js_1.logWithVikeTag)(picocolors_1.default.bold(picocolors_1.default.red(`[Error] ${msg}:`)), 'error', category);
 }
 function getConfigCategory() {
     const category = getCategory() ?? 'config';

package/dist/cjs/node/plugin/shared/loggerVite.js

@@ -3,11 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.improveViteLogs = void 0;
 const utils_js_1 = require("../utils.js");
 const loggerNotProd_js_1 = require("./loggerNotProd.js");
-const errorWithCodeSnippet_js_1 = require("./loggerNotProd/errorWithCodeSnippet.js");
 const getHttpRequestAsyncStore_js_1 = require("./getHttpRequestAsyncStore.js");
 const removeSuperfluousViteLog_js_1 = require("./loggerVite/removeSuperfluousViteLog.js");
 const isErrorDebug_js_1 = require("./isErrorDebug.js");
-const loggerProd_js_1 = require("../../runtime/renderPage/loggerProd.js");
 function improveViteLogs(config) {
     intercept('info', config);
     intercept('warn', config);
@@ -28,29 +26,25 @@ function intercept(logType, config) {
         }
         msg = cleanFirstViteLog(msg);
         const store = (0, getHttpRequestAsyncStore_js_1.getHttpRequestAsyncStore)();
-        // Dedupe Vite error messages
-        if (options.error && store?.shouldErrorBeSwallowed(options.error)) {
+        if (options.error) {
+            // Vite does a poor job of handling errors.
+            //  - It doesn't format error code snippets.
+            //  - It only shows error.message which means that crucial information such as error.id isn't shown to the user.
+            (0, loggerNotProd_js_1.logViteError)(options.error, store?.httpRequestId);
+            // We swallow Vite's message: we didn't see it add any value so far.
+            //  - It can even be confusing, such as the following:
+            //    ```
+            //    Error when evaluating SSR module virtual:vike:pageConfigValuesAll:server:/pages/abort: failed to import "/pages/abort/+Page.mdx"
+            //    ```
+            (0, utils_js_1.assert)(!(0, isErrorDebug_js_1.isErrorDebug)());
             return;
         }
-        // Remove this once https://github.com/vitejs/vite/pull/13495 is released and widely used
-        if (msg.startsWith('Transform failed with ') && store && logType === 'error') {
-            store.markErrorMessageAsLogged(msg);
-            return;
-        }
-        if (options.error && (0, errorWithCodeSnippet_js_1.isErrorWithCodeSnippet)(options.error)) {
-            (0, loggerNotProd_js_1.logViteErrorContainingCodeSnippet)(options.error);
-            return;
-        }
-        // Only allow Vite to clear its first log. All other clearing is controlled by vike.
+        // Only allow Vite to clear for its first log. All other clearing is controlled by vike.
         if (options.clear)
             (0, loggerNotProd_js_1.clearLogs)({ clearIfFirstLog: true });
-        if (options.error)
-            store?.markErrorAsLogged(options.error);
         // Vite's default logger preprends the "[vite]" tag if and only if options.timestamp is true
         const prependViteTag = options.timestamp || !!store?.httpRequestId;
         (0, loggerNotProd_js_1.logViteAny)(msg, logType, store?.httpRequestId ?? null, prependViteTag);
-        if (options.error)
-            (0, loggerProd_js_1.onRuntimeError)(options.error);
     };
 }
 function cleanFirstViteLog(msg) {

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

@@ -41,4 +41,4 @@ __exportStar(require("../../utils/assertKeys.js"), exports);
 __exportStar(require("../../utils/injectRollupInputs.js"), exports);
 __exportStar(require("../../utils/humanizeTime.js"), exports);
 __exportStar(require("../../utils/pLimit.js"), exports);
-__exportStar(require("../../utils/isVersionOrAbove.js"), exports);
+__exportStar(require("../../utils/assertVersion.js"), exports);

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

@@ -87,7 +87,7 @@ async function runPrerender(options, manuallyTriggered) {
     if (logLevel === 'info') {
         console.log(`${picocolors_1.default.cyan(`vike v${utils_js_1.projectInfo.projectVersion}`)} ${picocolors_1.default.green('pre-rendering HTML...')}`);
     }
-    handleNodeEnv();
+    (0, utils_js_1.handleNodeEnv_prerender)();
     await disableReactStreaming();
     const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'vike pre-rendering', 'production');
     (0, globalContext_js_1.setGlobalContext_prerender)(viteConfig);
@@ -743,10 +743,3 @@ function assertIsNotAbort(err, urlOr404) {
     (0, utils_js_1.assert)(abortCall);
     (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.cyan(abortCall)} thrown${thrownBy} while pre-rendering ${urlOr404} but ${picocolors_1.default.cyan(abortCaller)} isn't supported for pre-rendered pages`);
 }
-function handleNodeEnv() {
-    const assertNodeEnv = () => (0, utils_js_1.assertNodeEnvIsNotDev)('pre-rendering');
-    if ((0, utils_js_1.getNodeEnv)())
-        assertNodeEnv();
-    (0, utils_js_1.setNodeEnvToProduction)();
-    assertNodeEnv();
-}

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

@@ -85,7 +85,7 @@ async function initGlobalContext(isPrerendering = false, outDir) {
     if (globalObject.globalContext)
         return;
     const { viteDevServer, viteConfig } = globalObject;
-    assertNodeEnv(!!viteDevServer);
+    (0, utils_js_1.assertNodeEnv_runtime)(!!viteDevServer);
     const isProduction = !viteDevServer;
     if (!isProduction) {
         (0, utils_js_1.assert)(viteConfig);
@@ -183,15 +183,3 @@ function assertViteManifest(manifest) {
       })
     */
 }
-function assertNodeEnv(hasViteDevServer) {
-    const nodeEnv = (0, utils_js_1.getNodeEnv)();
-    if (nodeEnv === null || nodeEnv === 'test')
-        return;
-    const isDev = (0, utils_js_1.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 (hasViteDevServer === isDev)
-        return;
-    const nodeEnvDesc = (0, utils_js_1.getNodeEnvDesc)();
-    // 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)
-    (0, utils_js_1.assertUsage)(false, `Vite's development server was${hasViteDevServer ? '' : "n't"} instantiated while the ${nodeEnvDesc} which is contradictory, see https://vike.dev/NODE_ENV`);
-}

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

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHint = exports.isKnownError = exports.isCjsEsmError = exports.logErrorHint = void 0;
-const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../utils.js");
 const knownErrors = [
     {
@@ -40,15 +36,7 @@ function getHint(error) {
     }
     const res = isCjsEsmError(error);
     if (res) {
-        const packageNames = res === true ? null : res;
-        const hint = [
-            'Error could be a CJS/ESM issue, consider ',
-            !packageNames || packageNames.length === 0
-                ? 'using'
-                : `adding ${(0, utils_js_1.joinEnglish)(packageNames.map((p) => picocolors_1.default.cyan(p)), 'or')} to`,
-            ` ${picocolors_1.default.cyan('ssr.noExternal')}`,
-            ', see https://vike.dev/broken-npm-package'
-        ].join('');
+        const hint = 'The error seems to be a CJS/ESM issue, see https://vike.dev/broken-npm-package';
         return hint;
     }
     return null;
@@ -81,6 +69,7 @@ function isCjsEsmError(error) {
     packageNames.forEach((packageName) => {
         (0, utils_js_1.assert)(!['vite', 'vike'].includes(packageName));
     });
+    // We don't use this anymore: we could return `true` instead. Shall we remove returning a list of npm packages?
     return packageNames;
 }
 exports.isCjsEsmError = isCjsEsmError;

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

@@ -20,10 +20,14 @@ function logErrorProd(err, _httpRquestId) {
     // We ensure we print a string; Cloudflare Workers doesn't seem to properly stringify `Error` objects.
     const errStr = (0, utils_js_1.isObject)(err) && 'stack' in err ? String(err.stack) : String(err);
     console.error(picocolors_1.default.red(errStr));
+    // Needs to be called after logging the error.
     onRuntimeError(err);
 }
 exports.logErrorProd = logErrorProd;
-// Every server-side runtime error is expected to go through onRuntimeError(). (In principle, any runtime error is (or at least should) be catched by Vike, otherwise Vike couldn't render the error page.)
+// Every server-side runtime error is expected to go through `onRuntimeError()`.
+//  - onRuntimeError(err) should always be called after `console.error(err)`.
+//    - Because the error hint of logErrorHint(err) should be shown *after* the error.
+//  - In principle, any runtime error is (or at least should) be catched by Vike, otherwise Vike couldn't render the error page.
 function onRuntimeError(err) {
     // The more runtime errors we pass to logErrorHint() the better.
     (0, logErrorHint_js_1.logErrorHint)(err);

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

@@ -27,8 +27,7 @@ const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage.ts', {
     pendingRequestsCount: 0
 });
 let renderPage_wrapper = async (_httpRequestId, ret) => ({
-    pageContextReturn: await ret(),
-    onRequestDone: () => { }
+    pageContextReturn: await ret()
 });
 const renderPage_addWrapper = (wrapper) => {
     renderPage_wrapper = wrapper;
@@ -48,10 +47,9 @@ async function renderPage(pageContextInit) {
     const { urlOriginal } = pageContextInit;
     logHttpRequest(urlOriginal, httpRequestId);
     globalObject.pendingRequestsCount++;
-    const { pageContextReturn, onRequestDone } = await renderPage_wrapper(httpRequestId, () => renderPageAndPrepare(pageContextInit, httpRequestId));
+    const { pageContextReturn } = await renderPage_wrapper(httpRequestId, () => renderPageAndPrepare(pageContextInit, httpRequestId));
     logHttpResponse(urlOriginal, httpRequestId, pageContextReturn);
     globalObject.pendingRequestsCount--;
-    onRequestDone();
     (0, utils_js_1.checkType)(pageContextReturn);
     return pageContextReturn;
 }

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

@@ -111,7 +111,6 @@ function parseRouteString(routeString) {
 }
 exports.parseRouteString = parseRouteString;
 function getUrlFromRouteString(routeString) {
-    (0, utils_js_2.assert)(routeString.startsWith('/'));
     if (isStaticRouteString(routeString)) {
         const url = routeString;
         return url;