vike 0.4.227-commit-ff6dcd9 → 0.4.227-commit-d082773

package/dist/cjs/node/plugin/plugins/build/pluginModuleBanner.js

@@ -5,55 +5,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginModuleBanner = pluginModuleBanner;
 const magic_string_1 = __importDefault(require("magic-string"));
-const utils_js_1 = require("../../utils.js");
 const virtual_files_js_1 = require("../../../shared/virtual-files.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 // Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
 // But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
-const vikeModuleBannerPlaceholder = 'vikeModuleBannerPlaceholder';
 function pluginModuleBanner() {
     let config;
-    let disabled = false;
     return {
         name: 'vike:pluginModuleBanner',
         enforce: 'post',
         apply: 'build',
         configResolved(config_) {
             config = config_;
-            if (config.build.minify && config.build.minify !== 'esbuild') {
-                // Doesn't work upon `config.build.minify === 'terser'`
-                // https://github.com/vikejs/vike/issues/2315
-                disabled = true;
-            }
-        },
-        generateBundle: {
-            order: 'post',
-            handler(_options, bundle) {
-                if (disabled)
-                    return;
-                for (const module of Object.values(bundle)) {
-                    if (module.type === 'chunk') {
-                        if ((0, isViteServerBuild_js_1.isViteServerBuild)(config)) {
-                            const codeOld = module.code;
-                            const codeNew = codeOld.replace(/vikeModuleBannerPlaceholder\("([^"]*)"\);/g, '/* $1 [vike:pluginModuleBanner] */');
-                            if (codeNew.includes(vikeModuleBannerPlaceholder)) {
-                                console.log('codeNew', codeNew);
-                                (0, utils_js_1.assert)(false);
-                            }
-                            module.code = codeNew;
-                        }
-                        else {
-                            (0, utils_js_1.assert)(!module.code.includes(vikeModuleBannerPlaceholder));
-                        }
-                    }
-                }
-            }
         },
         transform: {
             order: 'post',
             handler(code, id, options) {
-                if (disabled)
-                    return;
                 if (!(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options))
                     return;
                 if (id.startsWith('\0'))
@@ -62,8 +29,10 @@ function pluginModuleBanner() {
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
                 const s = new magic_string_1.default(code);
-                // No need to insert a new line; Rollup formats the code and will insert a new line.
-                s.prepend(`${vikeModuleBannerPlaceholder}(${JSON.stringify(id)}); `);
+                // Use legal comment so that esbuild doesn't remove it.
+                // - Terser still removes the comment, but I guess users use terser to minify JavaScript so I guess it's a good thing that comment is removed.
+                // - https://esbuild.github.io/api/#legal-comments
+                s.prepend(`/*! ${id} [vike:pluginModuleBanner] */\n`);
                 return {
                     code: s.toString(),
                     map: s.generateMap({ hires: true, source: id })

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

@@ -38,8 +38,7 @@ function commonConfig(vikeVitePluginOptions) {
                         isPrerenderingEnabled,
                         isPrerenderingEnabledForAllPages,
                         output: null,
-                        pageContexts: null,
-                        pageContexts404: null
+                        pageContexts: null
                     });
                     (0, utils_js_1.assert)(prerenderContext.isPrerenderingEnabled === isPrerenderingEnabled);
                     (0, utils_js_1.assert)(prerenderContext.isPrerenderingEnabledForAllPages === isPrerenderingEnabledForAllPages);

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

@@ -111,8 +111,6 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                 build.onResolve({ filter: /.*/ }, async (args) => {
                     if (args.kind !== 'import-statement')
                         return;
-                    if (debugEsbuildResolve.isActivated)
-                        debugEsbuildResolve('args', args);
                     // Avoid infinite loop: https://github.com/evanw/esbuild/issues/3095#issuecomment-1546916366
                     const useEsbuildResolver = 'useEsbuildResolver';
                     if (args.pluginData?.[useEsbuildResolver])
@@ -120,6 +118,8 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                     const { path, ...opts } = args;
                     opts.pluginData = { [useEsbuildResolver]: true };
                     let resolved = await build.resolve(path, opts);
+                    if (debugEsbuildResolve.isActivated)
+                        debugEsbuildResolve('args', args);
                     if (debugEsbuildResolve.isActivated)
                         debugEsbuildResolve('resolved', resolved);
                     // Temporary workaround for https://github.com/evanw/esbuild/issues/3973
@@ -160,11 +160,25 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                         //      - vike@0.4.162 started soft-requiring Vike extensions to set the name config.
                         //    - In practice, it seems like it requires some (non-trivial?) refactoring.
                         isVikeExtensionImport;
-                    // Externalize npm package imports
                     (0, utils_js_1.assertPosixPath)(importPathResolved);
-                    const isNpmPkgImport = importPathResolved.includes('/node_modules/') ||
+                    // `isNpmPkgImport` => `importPathOriginal` is most likely an npm package import, but it can also be a path alias that a) looks like an npm package import and b) resolves outside of `userRootDir`.
+                    const isNpmPkgImport = (() => {
+                        if (importPathResolved.includes('/node_modules/')) {
+                            // So far I can't think of a use case where this assertion would fail, but let's eventually remove it to avoid artificially restricting the user.
+                            (0, utils_js_1.assert)((0, utils_js_1.isNpmPackageImport_unreliable)(importPathOriginal));
+                            return true;
+                        }
                         // Linked npm packages
-                        !importPathResolved.startsWith(userRootDir);
+                        if (
+                        // Assuming path aliases usually resolve inside `userRootDir`.
+                        // - This isn't always the case: https://github.com/vikejs/vike/issues/2326
+                        !importPathResolved.startsWith(userRootDir) &&
+                            // False positive if `importPathOriginal` is a path alias that a) looks like an npm package import and b) resolves outside of `userRootDir` => we then we wrongfully assume that `importPathOriginal` is an npm package import.
+                            (0, utils_js_1.isNpmPackageImport_unreliable)(importPathOriginal)) {
+                            return true;
+                        }
+                        return false;
+                    })();
                     const isExternal = isPointerImport ||
                         // Performance: npm package imports can be externalized. (We could as well let esbuild transpile /node_modules/ code but it's useless as /node_modules/ code is already built. It would unnecessarily slow down transpilation.)
                         isNpmPkgImport;
@@ -188,19 +202,19 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                             filePathAbsoluteFilesystem: importPathResolved,
                             userRootDir
                         });
-                        // We assuming that path aliases always resolve inside `userRootDir`.
                         if (filePathAbsoluteUserRootDir && !isNpmPkgImport) {
-                            // `importPathOriginal` is a path alias.
+                            // `importPathOriginal` is most likely a path alias.
                             // - We have to use esbuild's path alias resolution, because:
                             //   - Vike doesn't resolve path aliases at all.
                             //   - Node.js doesn't support `tsconfig.js#compilerOptions.paths`.
-                            // - Esbuild path alias resolution seems to be reliable, e.g. it supports `tsconfig.js#compilerOptions.paths`.
+                            // - Esbuild path alias resolution seems reliable, e.g. it supports `tsconfig.js#compilerOptions.paths`.
+                            (0, utils_js_1.assert)(!(0, utils_js_1.isNpmPackageImport_unreliable)(importPathOriginal));
                             importPathTranspiled = importPathResolved;
                         }
                         else {
-                            // `importPathOriginal` is an npm package import.
+                            // `importPathOriginal` is most likely an npm package import.
                             (0, utils_js_1.assertIsNpmPackageImport)(importPathOriginal);
-                            // For less confusing error messages, let the resolution be handled by Vike or Node.js.
+                            // For improved error messages, let the resolution be handled by Vike or Node.js.
                             importPathTranspiled = importPathOriginal;
                         }
                     }

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

@@ -11,7 +11,7 @@ function resolvePrerenderConfigGlobal(vikeConfig) {
     const prerenderSettings = prerenderConfigs.filter(isObject2);
     const prerenderConfigGlobal = {
         partial: pickFirst(prerenderSettings.map((c) => c.partial)) ?? false,
-        noExtraDir: pickFirst(prerenderSettings.map((c) => c.noExtraDir)) ?? false,
+        noExtraDir: pickFirst(prerenderSettings.map((c) => c.noExtraDir)) ?? null,
         keepDistServer: pickFirst(prerenderSettings.map((c) => c.keepDistServer)) ?? false,
         parallel: pickFirst(prerenderSettings.map((c) => c.parallel)) ?? true,
         disableAutoRun: pickFirst(prerenderSettings.map((c) => c.disableAutoRun)) ?? false

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

@@ -119,7 +119,6 @@ async function runPrerender(options = {}, standaloneTrigger) {
     const { outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(viteConfig);
     const { root } = viteConfig;
     const prerenderConfigGlobal = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig);
-    validatePrerenderConfig(prerenderConfigGlobal);
     const { partial, noExtraDir, parallel, defaultLocalValue, isPrerenderingEnabled } = prerenderConfigGlobal;
     if (!isPrerenderingEnabled) {
         (0, utils_js_1.assert)(standaloneTrigger);
@@ -130,9 +129,8 @@ async function runPrerender(options = {}, standaloneTrigger) {
     const globalContext = await (0, globalContext_js_1.getGlobalContextInternal)();
     globalContext.pageFilesAll.forEach(assertExportNames);
     const prerenderContext = {
-        noExtraDir: noExtraDir ?? false,
+        noExtraDir,
         pageContexts: [],
-        pageContexts404: [],
         pageContextInit: options.pageContextInit ?? null,
         prerenderedPageContexts: {},
         output: []
@@ -162,7 +160,6 @@ async function runPrerender(options = {}, standaloneTrigger) {
     };
     await prerenderPages(prerenderContext, concurrencyLimit, onComplete);
     warnContradictoryNoPrerenderList(prerenderContext.prerenderedPageContexts, doNotPrerenderList);
-    await prerenderPages404(prerenderContext, onComplete, concurrencyLimit);
     if (logLevel === 'info') {
         console.log(`${picocolors_1.default.green(`✓`)} ${prerenderedCount} HTML documents pre-rendered.`);
     }
@@ -342,16 +339,11 @@ function getUrlList404(globalContext) {
 async function createPageContextsForOnPrerenderStartHook(urlList, prerenderContext, globalContext, concurrencyLimit, is404) {
     await Promise.all(urlList.map(({ urlOriginal, pageId }) => concurrencyLimit(async () => {
         // Already included in a onBeforePrerenderStart() hook
-        if ([...prerenderContext.pageContexts, ...prerenderContext.pageContexts404].find((pageContext) => isSameUrl(pageContext.urlOriginal, urlOriginal))) {
+        if (prerenderContext.pageContexts.find((pageContext) => isSameUrl(pageContext.urlOriginal, urlOriginal))) {
             return;
         }
         const pageContext = await createPageContext(urlOriginal, prerenderContext, globalContext, is404, pageId, null);
-        if (is404) {
-            prerenderContext.pageContexts404.push(pageContext);
-        }
-        else {
-            prerenderContext.pageContexts.push(pageContext);
-        }
+        prerenderContext.pageContexts.push(pageContext);
     })));
 }
 async function createPageContext(urlOriginal, prerenderContext, globalContext, is404, pageId, providedByHook) {
@@ -563,13 +555,13 @@ async function callOnPrerenderStartHook(prerenderContext, globalContext, concurr
     });
     // Assert URL modified by user
     await Promise.all(prerenderContext.pageContexts.map((pageContext) => concurrencyLimit(async () => {
-        if (pageContext.urlOriginal !== pageContext._urlOriginalBeforeHook) {
+        if (pageContext.urlOriginal !== pageContext._urlOriginalBeforeHook && !pageContext.is404) {
             pageContext._urlOriginalModifiedByHook = {
                 hookFilePath,
                 hookName
             };
             const pageContextFromRoute = await (0, index_js_1.route)(pageContext, 
-            // Avoid calling onBeforeRoute() twice, otherwise user's onBeforeRoute() will wrongfully believe URL doesn't have locale when onBeforeRoute() removes the local from the URL
+            // Avoid calling onBeforeRoute() twice, otherwise onBeforeRoute() will wrongfully believe URL doesn't have locale after onBeforeRoute() already removed the local from the URL when called the first time.
             true);
             assertRouteMatch(pageContextFromRoute, pageContext);
         }
@@ -585,12 +577,13 @@ async function prerenderPages(prerenderContext, concurrencyLimit, onComplete) {
             assertIsNotAbort(err, picocolors_1.default.cyan(pageContextBeforeRender.urlOriginal));
             throw err;
         }
-        const { documentHtml, pageContextSerialized, pageContext } = res;
+        const { documentHtml, pageContext } = res;
+        const pageContextSerialized = pageContext.is404 ? null : res.pageContextSerialized;
         await onComplete({
             pageContext,
             htmlString: documentHtml,
             pageContextSerialized,
-            doNotCreateExtraDirectory: prerenderContext.noExtraDir
+            doNotCreateExtraDirectory: prerenderContext.noExtraDir ?? pageContext.is404
         });
     })));
 }
@@ -622,25 +615,6 @@ async function warnMissingPages(prerenderedPageContexts, globalContext, doNotPre
         (0, utils_js_1.assertWarning)(partial, `Cannot pre-render page ${pageAt} because it has a non-static route, while no ${hookName}() hook returned any URL matching the page's route. You need to use a ${hookName}() hook (https://vike.dev/${hookName}) providing a list of URLs for ${pageAt} that should be pre-rendered. If you don't want to pre-render ${pageAt} then use the option prerender.partial (https://vike.dev/prerender#partial) to suppress this warning.`, { onlyOnce: true });
     });
 }
-async function prerenderPages404(prerenderContext, onComplete, concurrencyLimit) {
-    await Promise.all(prerenderContext.pageContexts404.map((pageContextBeforeRender) => concurrencyLimit(async () => {
-        let result;
-        try {
-            result = await (0, renderPageAlreadyRouted_js_1.prerenderPage)(pageContextBeforeRender);
-        }
-        catch (err) {
-            assertIsNotAbort(err, 'the 404 page');
-            throw err;
-        }
-        const { documentHtml, pageContext } = result;
-        await onComplete({
-            pageContext,
-            htmlString: documentHtml,
-            pageContextSerialized: null,
-            doNotCreateExtraDirectory: true
-        });
-    })));
-}
 async function writeFiles({ pageContext, htmlString, pageContextSerialized, doNotCreateExtraDirectory }, root, outDirClient, onPagePrerender, output, logLevel) {
     const { urlOriginal } = pageContext;
     (0, utils_js_1.assert)(urlOriginal.startsWith('/'));
@@ -774,7 +748,7 @@ function runPrerender_forceExit() {
     assertInfo(false, "Pre-rendering was forced exit. (Didn't gracefully exit because the event queue isn't empty. This is usally fine, see ...", { onlyOnce: false })
     */
 }
-function assertIsNotAbort(err, urlOr404) {
+function assertIsNotAbort(err, urlOriginal) {
     if (!(0, abort_js_1.isAbortError)(err))
         return;
     const pageContextAbort = err._pageContextAbort;
@@ -785,48 +759,12 @@ function assertIsNotAbort(err, urlOr404) {
     (0, utils_js_1.assert)(abortCaller);
     const abortCall = pageContextAbort._abortCall;
     (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 validatePrerenderConfig(
-// Guaranteed by configDef.type to be either an object or boolean
-prerenderConfig) {
-    if (!prerenderConfig || typeof prerenderConfig === 'boolean')
-        return;
-    (0, utils_js_1.assert)((0, utils_js_1.isObject)(prerenderConfig));
-    const wrongValue = (() => {
-        {
-            const p = 'partial';
-            if (!(0, utils_js_1.hasProp)(prerenderConfig, p, 'boolean') && !(0, utils_js_1.hasProp)(prerenderConfig, p, 'undefined'))
-                return { prop: p, errMsg: 'should be a boolean' };
-        }
-        {
-            const p = 'noExtraDir';
-            if (!(0, utils_js_1.hasProp)(prerenderConfig, p, 'boolean') && !(0, utils_js_1.hasProp)(prerenderConfig, p, 'undefined'))
-                return { prop: p, errMsg: 'should be a boolean' };
-        }
-        {
-            const p = 'disableAutoRun';
-            if (!(0, utils_js_1.hasProp)(prerenderConfig, p, 'boolean') && !(0, utils_js_1.hasProp)(prerenderConfig, p, 'undefined'))
-                return { prop: p, errMsg: 'should be a boolean' };
-        }
-        {
-            const p = 'parallel';
-            if (!(0, utils_js_1.hasProp)(prerenderConfig, p, 'boolean') &&
-                !(0, utils_js_1.hasProp)(prerenderConfig, p, 'number') &&
-                !(0, utils_js_1.hasProp)(prerenderConfig, p, 'undefined'))
-                return { prop: p, errMsg: 'should be a boolean or a number' };
-        }
-    })();
-    if (wrongValue) {
-        const { prop, errMsg } = wrongValue;
-        (0, utils_js_1.assertUsage)(false, `Setting ${picocolors_1.default.cyan(`prerender.${prop}`)} ${errMsg}`);
-    }
+    (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.cyan(abortCall)} thrown${thrownBy} while pre-rendering ${urlOriginal} but ${picocolors_1.default.cyan(abortCaller)} isn't supported for pre-rendered pages`);
 }
 function makePublic(prerenderContext) {
     const prerenderContextPublic = (0, utils_js_1.makePublicCopy)(prerenderContext, 'prerenderContext', [
         'output', // vite-plugin-vercel
-        'pageContexts', // https://vike.dev/i18n#pre-rendering
-        'pageContexts404' // https://vike.dev/i18n#pre-rendering
+        'pageContexts' // https://vike.dev/i18n#pre-rendering
     ]);
     return prerenderContextPublic;
 }

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.227-commit-ff6dcd9';
+exports.PROJECT_VERSION = '0.4.227-commit-d082773';

package/dist/cjs/utils/isFilePathAbsoluteFilesystem.js

@@ -24,8 +24,8 @@ function assertFilePathAbsoluteFilesystem(filePath) {
     // - For Linux users assertFilePathAbsoluteFilesystem() will erroneously succeed if `p` is a path absolute from the user root dir.
     //   - But that's okay because the assertion will eventually fail for Windows users.
     //   - On Linux there doesn't seem to be a way to distinguish between an absolute path starting from the filesystem root or starting from the user root directory, see comment at isFilePathAbsoluteFilesystem()
-    (0, assert_js_1.assert)(isFilePathAbsoluteFilesystem(filePath));
     (0, path_js_1.assertPosixPath)(filePath);
+    (0, assert_js_1.assert)(isFilePathAbsoluteFilesystem(filePath));
 }
 /**
  * Whether `filePath` is an absolute file path starting from the filesystem root.

package/dist/cjs/utils/isNpmPackage.js

@@ -10,10 +10,10 @@ const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 function isNpmPackageImport(str, { cannotBePathAlias }) {
-    // We cannot distinguish path alises that look like npm package imports
     (0, assert_js_1.assert)(cannotBePathAlias);
     return isNpmPackageImport_unreliable(str);
 }
+// We cannot distinguish path aliases that look like npm package imports
 function isNpmPackageImport_unreliable(str) {
     const res = parse(str);
     return res !== null;

package/dist/esm/node/plugin/plugins/build/pluginModuleBanner.js

@@ -1,54 +1,21 @@
 export { pluginModuleBanner };
 import MagicString from 'magic-string';
-import { assert } from '../../utils.js';
 import { removeVirtualIdTag } from '../../../shared/virtual-files.js';
-import { isViteServerBuild, isViteServerBuild_safe } from '../../shared/isViteServerBuild.js';
+import { isViteServerBuild_safe } from '../../shared/isViteServerBuild.js';
 // Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
 // But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
-const vikeModuleBannerPlaceholder = 'vikeModuleBannerPlaceholder';
 function pluginModuleBanner() {
     let config;
-    let disabled = false;
     return {
         name: 'vike:pluginModuleBanner',
         enforce: 'post',
         apply: 'build',
         configResolved(config_) {
             config = config_;
-            if (config.build.minify && config.build.minify !== 'esbuild') {
-                // Doesn't work upon `config.build.minify === 'terser'`
-                // https://github.com/vikejs/vike/issues/2315
-                disabled = true;
-            }
-        },
-        generateBundle: {
-            order: 'post',
-            handler(_options, bundle) {
-                if (disabled)
-                    return;
-                for (const module of Object.values(bundle)) {
-                    if (module.type === 'chunk') {
-                        if (isViteServerBuild(config)) {
-                            const codeOld = module.code;
-                            const codeNew = codeOld.replace(/vikeModuleBannerPlaceholder\("([^"]*)"\);/g, '/* $1 [vike:pluginModuleBanner] */');
-                            if (codeNew.includes(vikeModuleBannerPlaceholder)) {
-                                console.log('codeNew', codeNew);
-                                assert(false);
-                            }
-                            module.code = codeNew;
-                        }
-                        else {
-                            assert(!module.code.includes(vikeModuleBannerPlaceholder));
-                        }
-                    }
-                }
-            }
         },
         transform: {
             order: 'post',
             handler(code, id, options) {
-                if (disabled)
-                    return;
                 if (!isViteServerBuild_safe(config, options))
                     return;
                 if (id.startsWith('\0'))
@@ -57,8 +24,10 @@ function pluginModuleBanner() {
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
                 const s = new MagicString(code);
-                // No need to insert a new line; Rollup formats the code and will insert a new line.
-                s.prepend(`${vikeModuleBannerPlaceholder}(${JSON.stringify(id)}); `);
+                // Use legal comment so that esbuild doesn't remove it.
+                // - Terser still removes the comment, but I guess users use terser to minify JavaScript so I guess it's a good thing that comment is removed.
+                // - https://esbuild.github.io/api/#legal-comments
+                s.prepend(`/*! ${id} [vike:pluginModuleBanner] */\n`);
                 return {
                     code: s.toString(),
                     map: s.generateMap({ hires: true, source: id })

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

@@ -33,8 +33,7 @@ function commonConfig(vikeVitePluginOptions) {
                         isPrerenderingEnabled,
                         isPrerenderingEnabledForAllPages,
                         output: null,
-                        pageContexts: null,
-                        pageContexts404: null
+                        pageContexts: null
                     });
                     assert(prerenderContext.isPrerenderingEnabled === isPrerenderingEnabled);
                     assert(prerenderContext.isPrerenderingEnabledForAllPages === isPrerenderingEnabledForAllPages);

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

@@ -7,7 +7,7 @@ import fs from 'fs';
 import path from 'path';
 import pc from '@brillout/picocolors';
 import { import_ } from '@brillout/import';
-import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, assertWarning, isObject, toPosixPath, assertUsage, isPlainJavaScriptFile, createDebugger, assertFilePathAbsoluteFilesystem, assertIsNpmPackageImport, genPromise, isVitest, requireResolveOptional } from '../../../../utils.js';
+import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, assertWarning, isObject, toPosixPath, assertUsage, isPlainJavaScriptFile, createDebugger, assertFilePathAbsoluteFilesystem, assertIsNpmPackageImport, genPromise, isVitest, requireResolveOptional, isNpmPackageImport_unreliable } from '../../../../utils.js';
 import { transformPointerImports } from './transformPointerImports.js';
 import sourceMapSupport from 'source-map-support';
 import { getFilePathAbsoluteUserRootDir } from '../../../../shared/getFilePath.js';
@@ -106,8 +106,6 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                 build.onResolve({ filter: /.*/ }, async (args) => {
                     if (args.kind !== 'import-statement')
                         return;
-                    if (debugEsbuildResolve.isActivated)
-                        debugEsbuildResolve('args', args);
                     // Avoid infinite loop: https://github.com/evanw/esbuild/issues/3095#issuecomment-1546916366
                     const useEsbuildResolver = 'useEsbuildResolver';
                     if (args.pluginData?.[useEsbuildResolver])
@@ -115,6 +113,8 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                     const { path, ...opts } = args;
                     opts.pluginData = { [useEsbuildResolver]: true };
                     let resolved = await build.resolve(path, opts);
+                    if (debugEsbuildResolve.isActivated)
+                        debugEsbuildResolve('args', args);
                     if (debugEsbuildResolve.isActivated)
                         debugEsbuildResolve('resolved', resolved);
                     // Temporary workaround for https://github.com/evanw/esbuild/issues/3973
@@ -155,11 +155,25 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                         //      - vike@0.4.162 started soft-requiring Vike extensions to set the name config.
                         //    - In practice, it seems like it requires some (non-trivial?) refactoring.
                         isVikeExtensionImport;
-                    // Externalize npm package imports
                     assertPosixPath(importPathResolved);
-                    const isNpmPkgImport = importPathResolved.includes('/node_modules/') ||
+                    // `isNpmPkgImport` => `importPathOriginal` is most likely an npm package import, but it can also be a path alias that a) looks like an npm package import and b) resolves outside of `userRootDir`.
+                    const isNpmPkgImport = (() => {
+                        if (importPathResolved.includes('/node_modules/')) {
+                            // So far I can't think of a use case where this assertion would fail, but let's eventually remove it to avoid artificially restricting the user.
+                            assert(isNpmPackageImport_unreliable(importPathOriginal));
+                            return true;
+                        }
                         // Linked npm packages
-                        !importPathResolved.startsWith(userRootDir);
+                        if (
+                        // Assuming path aliases usually resolve inside `userRootDir`.
+                        // - This isn't always the case: https://github.com/vikejs/vike/issues/2326
+                        !importPathResolved.startsWith(userRootDir) &&
+                            // False positive if `importPathOriginal` is a path alias that a) looks like an npm package import and b) resolves outside of `userRootDir` => we then we wrongfully assume that `importPathOriginal` is an npm package import.
+                            isNpmPackageImport_unreliable(importPathOriginal)) {
+                            return true;
+                        }
+                        return false;
+                    })();
                     const isExternal = isPointerImport ||
                         // Performance: npm package imports can be externalized. (We could as well let esbuild transpile /node_modules/ code but it's useless as /node_modules/ code is already built. It would unnecessarily slow down transpilation.)
                         isNpmPkgImport;
@@ -183,19 +197,19 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                             filePathAbsoluteFilesystem: importPathResolved,
                             userRootDir
                         });
-                        // We assuming that path aliases always resolve inside `userRootDir`.
                         if (filePathAbsoluteUserRootDir && !isNpmPkgImport) {
-                            // `importPathOriginal` is a path alias.
+                            // `importPathOriginal` is most likely a path alias.
                             // - We have to use esbuild's path alias resolution, because:
                             //   - Vike doesn't resolve path aliases at all.
                             //   - Node.js doesn't support `tsconfig.js#compilerOptions.paths`.
-                            // - Esbuild path alias resolution seems to be reliable, e.g. it supports `tsconfig.js#compilerOptions.paths`.
+                            // - Esbuild path alias resolution seems reliable, e.g. it supports `tsconfig.js#compilerOptions.paths`.
+                            assert(!isNpmPackageImport_unreliable(importPathOriginal));
                             importPathTranspiled = importPathResolved;
                         }
                         else {
-                            // `importPathOriginal` is an npm package import.
+                            // `importPathOriginal` is most likely an npm package import.
                             assertIsNpmPackageImport(importPathOriginal);
-                            // For less confusing error messages, let the resolution be handled by Vike or Node.js.
+                            // For improved error messages, let the resolution be handled by Vike or Node.js.
                             importPathTranspiled = importPathOriginal;
                         }
                     }

package/dist/esm/node/prerender/resolvePrerenderConfig.d.ts

@@ -4,7 +4,7 @@ import { VikeConfigObject } from '../plugin/plugins/importUserCode/v1-design/get
 import type { PageConfigBuildTime } from '../../shared/page-configs/PageConfig.js';
 declare function resolvePrerenderConfigGlobal(vikeConfig: VikeConfigObject): {
     partial: boolean;
-    noExtraDir: boolean;
+    noExtraDir: boolean | null;
     keepDistServer: boolean;
     parallel: number | boolean;
     disableAutoRun: boolean;

package/dist/esm/node/prerender/resolvePrerenderConfig.js

@@ -9,7 +9,7 @@ function resolvePrerenderConfigGlobal(vikeConfig) {
     const prerenderSettings = prerenderConfigs.filter(isObject2);
     const prerenderConfigGlobal = {
         partial: pickFirst(prerenderSettings.map((c) => c.partial)) ?? false,
-        noExtraDir: pickFirst(prerenderSettings.map((c) => c.noExtraDir)) ?? false,
+        noExtraDir: pickFirst(prerenderSettings.map((c) => c.noExtraDir)) ?? null,
         keepDistServer: pickFirst(prerenderSettings.map((c) => c.keepDistServer)) ?? false,
         parallel: pickFirst(prerenderSettings.map((c) => c.parallel)) ?? true,
         disableAutoRun: pickFirst(prerenderSettings.map((c) => c.disableAutoRun)) ?? false

package/dist/esm/node/prerender/runPrerender.d.ts

@@ -54,5 +54,4 @@ declare function runPrerender_forceExit(): void;
 type PrerenderContextPublic = {
     output: Output<PageContextServer>;
     pageContexts: PageContextServer[];
-    pageContexts404: PageContextServer;
 };

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

@@ -4,7 +4,7 @@ export { runPrerenderFromAutoRun };
 export { runPrerender_forceExit };
 import path from 'path';
 import { route } from '../../shared/route/index.js';
-import { assert, assertUsage, assertWarning, hasProp, objectAssign, isObjectWithKeys, isCallable, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, pLimit, isArray, onSetupPrerender, isObject, makePublicCopy, PROJECT_VERSION, preservePropertyGetters } from './utils.js';
+import { assert, assertUsage, assertWarning, hasProp, objectAssign, isObjectWithKeys, isCallable, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, pLimit, isArray, onSetupPrerender, makePublicCopy, PROJECT_VERSION, preservePropertyGetters } from './utils.js';
 import { prerenderPage, getPageContextInitEnhanced } from '../runtime/renderPage/renderPageAlreadyRouted.js';
 import pc from '@brillout/picocolors';
 import { cpus } from 'os';
@@ -81,7 +81,6 @@ async function runPrerender(options = {}, standaloneTrigger) {
     const { outDirClient, outDirServer } = getOutDirs(viteConfig);
     const { root } = viteConfig;
     const prerenderConfigGlobal = resolvePrerenderConfigGlobal(vikeConfig);
-    validatePrerenderConfig(prerenderConfigGlobal);
     const { partial, noExtraDir, parallel, defaultLocalValue, isPrerenderingEnabled } = prerenderConfigGlobal;
     if (!isPrerenderingEnabled) {
         assert(standaloneTrigger);
@@ -92,9 +91,8 @@ async function runPrerender(options = {}, standaloneTrigger) {
     const globalContext = await getGlobalContextInternal();
     globalContext.pageFilesAll.forEach(assertExportNames);
     const prerenderContext = {
-        noExtraDir: noExtraDir ?? false,
+        noExtraDir,
         pageContexts: [],
-        pageContexts404: [],
         pageContextInit: options.pageContextInit ?? null,
         prerenderedPageContexts: {},
         output: []
@@ -124,7 +122,6 @@ async function runPrerender(options = {}, standaloneTrigger) {
     };
     await prerenderPages(prerenderContext, concurrencyLimit, onComplete);
     warnContradictoryNoPrerenderList(prerenderContext.prerenderedPageContexts, doNotPrerenderList);
-    await prerenderPages404(prerenderContext, onComplete, concurrencyLimit);
     if (logLevel === 'info') {
         console.log(`${pc.green(`✓`)} ${prerenderedCount} HTML documents pre-rendered.`);
     }
@@ -304,16 +301,11 @@ function getUrlList404(globalContext) {
 async function createPageContextsForOnPrerenderStartHook(urlList, prerenderContext, globalContext, concurrencyLimit, is404) {
     await Promise.all(urlList.map(({ urlOriginal, pageId }) => concurrencyLimit(async () => {
         // Already included in a onBeforePrerenderStart() hook
-        if ([...prerenderContext.pageContexts, ...prerenderContext.pageContexts404].find((pageContext) => isSameUrl(pageContext.urlOriginal, urlOriginal))) {
+        if (prerenderContext.pageContexts.find((pageContext) => isSameUrl(pageContext.urlOriginal, urlOriginal))) {
             return;
         }
         const pageContext = await createPageContext(urlOriginal, prerenderContext, globalContext, is404, pageId, null);
-        if (is404) {
-            prerenderContext.pageContexts404.push(pageContext);
-        }
-        else {
-            prerenderContext.pageContexts.push(pageContext);
-        }
+        prerenderContext.pageContexts.push(pageContext);
     })));
 }
 async function createPageContext(urlOriginal, prerenderContext, globalContext, is404, pageId, providedByHook) {
@@ -525,13 +517,13 @@ async function callOnPrerenderStartHook(prerenderContext, globalContext, concurr
     });
     // Assert URL modified by user
     await Promise.all(prerenderContext.pageContexts.map((pageContext) => concurrencyLimit(async () => {
-        if (pageContext.urlOriginal !== pageContext._urlOriginalBeforeHook) {
+        if (pageContext.urlOriginal !== pageContext._urlOriginalBeforeHook && !pageContext.is404) {
             pageContext._urlOriginalModifiedByHook = {
                 hookFilePath,
                 hookName
             };
             const pageContextFromRoute = await route(pageContext, 
-            // Avoid calling onBeforeRoute() twice, otherwise user's onBeforeRoute() will wrongfully believe URL doesn't have locale when onBeforeRoute() removes the local from the URL
+            // Avoid calling onBeforeRoute() twice, otherwise onBeforeRoute() will wrongfully believe URL doesn't have locale after onBeforeRoute() already removed the local from the URL when called the first time.
             true);
             assertRouteMatch(pageContextFromRoute, pageContext);
         }
@@ -547,12 +539,13 @@ async function prerenderPages(prerenderContext, concurrencyLimit, onComplete) {
             assertIsNotAbort(err, pc.cyan(pageContextBeforeRender.urlOriginal));
             throw err;
         }
-        const { documentHtml, pageContextSerialized, pageContext } = res;
+        const { documentHtml, pageContext } = res;
+        const pageContextSerialized = pageContext.is404 ? null : res.pageContextSerialized;
         await onComplete({
             pageContext,
             htmlString: documentHtml,
             pageContextSerialized,
-            doNotCreateExtraDirectory: prerenderContext.noExtraDir
+            doNotCreateExtraDirectory: prerenderContext.noExtraDir ?? pageContext.is404
         });
     })));
 }
@@ -584,25 +577,6 @@ async function warnMissingPages(prerenderedPageContexts, globalContext, doNotPre
         assertWarning(partial, `Cannot pre-render page ${pageAt} because it has a non-static route, while no ${hookName}() hook returned any URL matching the page's route. You need to use a ${hookName}() hook (https://vike.dev/${hookName}) providing a list of URLs for ${pageAt} that should be pre-rendered. If you don't want to pre-render ${pageAt} then use the option prerender.partial (https://vike.dev/prerender#partial) to suppress this warning.`, { onlyOnce: true });
     });
 }
-async function prerenderPages404(prerenderContext, onComplete, concurrencyLimit) {
-    await Promise.all(prerenderContext.pageContexts404.map((pageContextBeforeRender) => concurrencyLimit(async () => {
-        let result;
-        try {
-            result = await prerenderPage(pageContextBeforeRender);
-        }
-        catch (err) {
-            assertIsNotAbort(err, 'the 404 page');
-            throw err;
-        }
-        const { documentHtml, pageContext } = result;
-        await onComplete({
-            pageContext,
-            htmlString: documentHtml,
-            pageContextSerialized: null,
-            doNotCreateExtraDirectory: true
-        });
-    })));
-}
 async function writeFiles({ pageContext, htmlString, pageContextSerialized, doNotCreateExtraDirectory }, root, outDirClient, onPagePrerender, output, logLevel) {
     const { urlOriginal } = pageContext;
     assert(urlOriginal.startsWith('/'));
@@ -736,7 +710,7 @@ function runPrerender_forceExit() {
     assertInfo(false, "Pre-rendering was forced exit. (Didn't gracefully exit because the event queue isn't empty. This is usally fine, see ...", { onlyOnce: false })
     */
 }
-function assertIsNotAbort(err, urlOr404) {
+function assertIsNotAbort(err, urlOriginal) {
     if (!isAbortError(err))
         return;
     const pageContextAbort = err._pageContextAbort;
@@ -747,48 +721,12 @@ function assertIsNotAbort(err, urlOr404) {
     assert(abortCaller);
     const abortCall = pageContextAbort._abortCall;
     assert(abortCall);
-    assertUsage(false, `${pc.cyan(abortCall)} thrown${thrownBy} while pre-rendering ${urlOr404} but ${pc.cyan(abortCaller)} isn't supported for pre-rendered pages`);
-}
-function validatePrerenderConfig(
-// Guaranteed by configDef.type to be either an object or boolean
-prerenderConfig) {
-    if (!prerenderConfig || typeof prerenderConfig === 'boolean')
-        return;
-    assert(isObject(prerenderConfig));
-    const wrongValue = (() => {
-        {
-            const p = 'partial';
-            if (!hasProp(prerenderConfig, p, 'boolean') && !hasProp(prerenderConfig, p, 'undefined'))
-                return { prop: p, errMsg: 'should be a boolean' };
-        }
-        {
-            const p = 'noExtraDir';
-            if (!hasProp(prerenderConfig, p, 'boolean') && !hasProp(prerenderConfig, p, 'undefined'))
-                return { prop: p, errMsg: 'should be a boolean' };
-        }
-        {
-            const p = 'disableAutoRun';
-            if (!hasProp(prerenderConfig, p, 'boolean') && !hasProp(prerenderConfig, p, 'undefined'))
-                return { prop: p, errMsg: 'should be a boolean' };
-        }
-        {
-            const p = 'parallel';
-            if (!hasProp(prerenderConfig, p, 'boolean') &&
-                !hasProp(prerenderConfig, p, 'number') &&
-                !hasProp(prerenderConfig, p, 'undefined'))
-                return { prop: p, errMsg: 'should be a boolean or a number' };
-        }
-    })();
-    if (wrongValue) {
-        const { prop, errMsg } = wrongValue;
-        assertUsage(false, `Setting ${pc.cyan(`prerender.${prop}`)} ${errMsg}`);
-    }
+    assertUsage(false, `${pc.cyan(abortCall)} thrown${thrownBy} while pre-rendering ${urlOriginal} but ${pc.cyan(abortCaller)} isn't supported for pre-rendered pages`);
 }
 function makePublic(prerenderContext) {
     const prerenderContextPublic = makePublicCopy(prerenderContext, 'prerenderContext', [
         'output', // vite-plugin-vercel
-        'pageContexts', // https://vike.dev/i18n#pre-rendering
-        'pageContexts404' // https://vike.dev/i18n#pre-rendering
+        'pageContexts' // https://vike.dev/i18n#pre-rendering
     ]);
     return prerenderContextPublic;
 }

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts

@@ -27,7 +27,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
     _httpRequestId: number | null;
     _usesClientRouter: boolean;
     _pageContextAlreadyProvidedByOnPrerenderHook?: true;
-    is404: null | boolean;
+    is404: boolean;
 }): Promise<{
     documentHtml: string;
     pageContextSerialized: null;
@@ -113,7 +113,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _httpRequestId: number | null;
         _usesClientRouter: boolean;
         _pageContextAlreadyProvidedByOnPrerenderHook?: true;
-        is404: null | boolean;
+        is404: boolean;
     } & {
         isClientSideNavigation: boolean;
         _urlHandler: null;
@@ -203,7 +203,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _httpRequestId: number | null;
         _usesClientRouter: boolean;
         _pageContextAlreadyProvidedByOnPrerenderHook?: true;
-        is404: null | boolean;
+        is404: boolean;
     } & {
         isClientSideNavigation: boolean;
         _urlHandler: null;

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.227-commit-ff6dcd9";
+export declare const PROJECT_VERSION: "0.4.227-commit-d082773";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.227-commit-ff6dcd9';
+export const PROJECT_VERSION = '0.4.227-commit-d082773';

package/dist/esm/utils/isFilePathAbsoluteFilesystem.js

@@ -19,8 +19,8 @@ function assertFilePathAbsoluteFilesystem(filePath) {
     // - For Linux users assertFilePathAbsoluteFilesystem() will erroneously succeed if `p` is a path absolute from the user root dir.
     //   - But that's okay because the assertion will eventually fail for Windows users.
     //   - On Linux there doesn't seem to be a way to distinguish between an absolute path starting from the filesystem root or starting from the user root directory, see comment at isFilePathAbsoluteFilesystem()
-    assert(isFilePathAbsoluteFilesystem(filePath));
     assertPosixPath(filePath);
+    assert(isFilePathAbsoluteFilesystem(filePath));
 }
 /**
  * Whether `filePath` is an absolute file path starting from the filesystem root.

package/dist/esm/utils/isNpmPackage.js

@@ -14,10 +14,10 @@ import { assert } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 assertIsNotBrowser();
 function isNpmPackageImport(str, { cannotBePathAlias }) {
-    // We cannot distinguish path alises that look like npm package imports
     assert(cannotBePathAlias);
     return isNpmPackageImport_unreliable(str);
 }
+// We cannot distinguish path aliases that look like npm package imports
 function isNpmPackageImport_unreliable(str) {
     const res = parse(str);
     return res !== null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.227-commit-ff6dcd9",
+  "version": "0.4.227-commit-d082773",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -123,7 +123,7 @@
     "@brillout/json-serializer": "^0.5.15",
     "@brillout/picocolors": "^1.0.26",
     "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-server-entry": "^0.7.1",
+    "@brillout/vite-plugin-server-entry": "^0.7.5",
     "acorn": "^8.0.0",
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",