vike 0.4.227 → 0.4.228-commit-1553dee

package/dist/cjs/node/api/dev.js

@@ -3,12 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.dev = dev;
 const prepareViteApiCall_js_1 = require("./prepareViteApiCall.js");
 const vite_1 = require("vite");
+const globalContext_js_1 = require("../runtime/globalContext.js");
 /**
  * Programmatically trigger `$ vike dev`
  *
  * https://vike.dev/api#dev
  */
 async function dev(options = {}) {
+    (0, globalContext_js_1.setGlobalContext_isProduction)(false);
     const { viteConfigFromUserEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options, 'dev');
     const server = await (0, vite_1.createServer)(viteConfigFromUserEnhanced);
     return {

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

@@ -301,16 +301,21 @@ function handleAssetsManifest_getBuildConfig(config) {
     };
 }
 async function handleAssetsManifest(config, viteEnv, options, bundle) {
-    if ((0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv)) {
+    const isSsREnv = (0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv);
+    if (isSsREnv) {
         (0, utils_js_1.assert)(!assetsJsonFilePath);
         const outDirs = (0, getOutDirs_js_1.getOutDirs)(config, viteEnv);
         assetsJsonFilePath = path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
         await writeAssetsManifestFile(outDirs, assetsJsonFilePath, config);
     }
     if ((0, isViteServerBuild_js_1.isViteServerBuild)(config, viteEnv)) {
-        (0, utils_js_1.assert)(assetsJsonFilePath);
-        // Replace __VITE_ASSETS_MANIFEST__ in all server-side bundles
-        await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(options, bundle, assetsJsonFilePath);
+        // Replace __VITE_ASSETS_MANIFEST__ in server builds
+        // - Always replace it in dist/server/
+        // - Also in some other server builds such as dist/vercel/ from vike-vercel
+        // - Don't replace it in dist/rsc/ from vike-react-rsc since __VITE_ASSETS_MANIFEST__ doesn't exist there
+        const noop = await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(options, bundle, assetsJsonFilePath);
+        if (isSsREnv)
+            (0, utils_js_1.assert)(!noop); // dist/server should always contain __VITE_ASSETS_MANIFEST__
     }
 }
 async function writeAssetsManifestFile(outDirs, assetsJsonFilePath, config) {

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

@@ -9,16 +9,14 @@ const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js
 const findPageFiles_js_1 = require("../../shared/findPageFiles.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const extractAssetsQuery_js_1 = require("../../../shared/extractAssetsQuery.js");
-const module_1 = require("module");
 const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
 const getConfigValueBuildTime_js_1 = require("../../../../shared/page-configs/getConfigValueBuildTime.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
-// @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = `file://${__filename}`;
-const require_ = (0, module_1.createRequire)(importMetaUrl);
+// @ts-ignore `file:///${__filename.split('\\').join('/')}` is shimmed at dist/cjs by dist-cjs-fixup.js.
+const importMetaUrl = `file:///${__filename.split('\\').join('/')}`;
 const manifestTempFile = '_temp_manifest.json';
 exports.manifestTempFile = manifestTempFile;
 function pluginBuildConfig() {
@@ -200,7 +198,7 @@ function getEntryFromPageConfig(pageConfig, isForClientSide) {
 function resolve(filePath) {
     (0, utils_js_1.assert)(filePath.startsWith('dist/'));
     // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/build/
-    return require_.resolve(`../../../../../../${filePath}`);
+    return (0, utils_js_1.requireResolveNonUserFile)(`../../../../../../${filePath}`, importMetaUrl);
 }
 function addLogHook() {
     const tty = process.stdout.isTTY && !process.env.CI; // Equals https://github.com/vitejs/vite/blob/193d55c7b9cbfec5b79ebfca276d4a721e7de14d/packages/vite/src/node/plugins/reporter.ts#L27

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

@@ -10,13 +10,12 @@ const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/vi
 const utils_js_1 = require("../../utils.js");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
-const module_1 = require("module");
-// @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = `file://${__filename}`;
-const require_ = (0, module_1.createRequire)(importMetaUrl);
+// @ts-ignore `file:///${__filename.split('\\').join('/')}` is shimmed at dist/cjs by dist-cjs-fixup.js.
+const importMetaUrl = `file:///${__filename.split('\\').join('/')}`;
 const extractExportNamesPlugin_js_1 = require("../extractExportNamesPlugin.js");
 const globalContext_js_1 = require("../../../runtime/globalContext.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
+const getViteConfigRuntime_js_1 = require("../../shared/getViteConfigRuntime.js");
 const ASSETS_MANIFEST = '__VITE_ASSETS_MANIFEST__';
 function pluginBuildEntry() {
     let config;
@@ -42,7 +41,7 @@ function getServerProductionEntryCode(config) {
     const buildInfo = {
         versionAtBuildTime: utils_js_1.PROJECT_VERSION,
         usesClientRouter: (0, extractExportNamesPlugin_js_1.isUsingClientRouter)(), // TODO/v1-release: remove
-        viteConfigRuntime: (0, globalContext_js_1.getViteConfigRuntime)(config)
+        viteConfigRuntime: (0, getViteConfigRuntime_js_1.getViteConfigRuntime)(config)
     };
     (0, globalContext_js_1.assertBuildInfo)(buildInfo);
     // After the old design is removed, let's maybe simplify and move everything into a single virtual module
@@ -69,6 +68,12 @@ async function set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath) {
     const { dir } = options;
     (0, utils_js_1.assert)(dir);
     const chunkPath = find_ASSETS_MANIFEST(bundle);
+    // Some server builds don't contain __VITE_ASSETS_MANIFEST__ such as dist/rsc/ from vike-react-rsc
+    if (!chunkPath) {
+        const noop = true; // no operation
+        return noop;
+    }
+    (0, utils_js_1.assert)(assetsJsonFilePath);
     const chunkFilePath = path_1.default.join(dir, chunkPath);
     const [assetsJsonString, chunkFileContent] = await Promise.all([
         await promises_1.default.readFile(assetsJsonFilePath, 'utf8'),
@@ -77,6 +82,8 @@ async function set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath) {
     const serverEntryFileContentPatched = chunkFileContent.replace(ASSETS_MANIFEST, assetsJsonString);
     (0, utils_js_1.assert)(serverEntryFileContentPatched !== chunkFileContent);
     await promises_1.default.writeFile(chunkFilePath, serverEntryFileContentPatched);
+    const noop = false;
+    return noop;
 }
 function find_ASSETS_MANIFEST(bundle) {
     let chunkPath;
@@ -87,14 +94,12 @@ function find_ASSETS_MANIFEST(bundle) {
             chunkPath = filePath;
         }
     }
-    (0, utils_js_1.assert)(chunkPath);
     return chunkPath;
 }
 function getImportPath(config) {
     // We resolve filePathAbsolute even if we don't use it: we use require.resolve() as an assertion that the relative path is correct
-    const filePathAbsolute = (0, utils_js_1.toPosixPath)(
     // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/pluginBuildEntry/index.js
-    require_.resolve(`../../../../../../dist/esm/__internal/index.js`));
+    const filePathAbsolute = (0, utils_js_1.requireResolveNonUserFile)(`../../../../../../dist/esm/__internal/index.js`, importMetaUrl);
     if (
     // Let's implement a new config if a user needs the import to be a relative path instead of 'vike/__internal' (AFAIK a relative path is needed only if a framework has npm package 'vike' as direct dependency instead of a peer dependency and if the user of that framework uses pnpm)
     true) {

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

@@ -1,12 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginModuleBanner = pluginModuleBanner;
-const utils_js_1 = require("../../utils.js");
+const magic_string_1 = __importDefault(require("magic-string"));
 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;
     return {
@@ -16,24 +18,6 @@ function pluginModuleBanner() {
         configResolved(config_) {
             config = config_;
         },
-        generateBundle: {
-            order: 'post',
-            handler(_options, bundle) {
-                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] */');
-                            (0, utils_js_1.assert)(!codeNew.includes(vikeModuleBannerPlaceholder));
-                            module.code = codeNew;
-                        }
-                        else {
-                            (0, utils_js_1.assert)(!module.code.includes(vikeModuleBannerPlaceholder));
-                        }
-                    }
-                }
-            }
-        },
         transform: {
             order: 'post',
             handler(code, id, options) {
@@ -44,7 +28,15 @@ function pluginModuleBanner() {
                 id = (0, virtual_files_js_1.removeVirtualIdTag)(id);
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
-                return `${vikeModuleBannerPlaceholder}(${JSON.stringify(id)}); ${code}`;
+                const s = new magic_string_1.default(code);
+                // 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/devConfig/determineFsAllowList.js

@@ -5,15 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineFsAllowList = determineFsAllowList;
 const vite_1 = require("vite");
-const path_1 = __importDefault(require("path"));
+const node_path_1 = __importDefault(require("node:path"));
 const utils_js_1 = require("../../utils.js");
-const module_1 = require("module");
-const path_2 = require("path");
 const url_1 = require("url");
-// @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = `file://${__filename}`;
-const require_ = (0, module_1.createRequire)(importMetaUrl);
-const __dirname_ = (0, path_2.dirname)((0, url_1.fileURLToPath)(importMetaUrl));
+// @ts-ignore `file:///${__filename.split('\\').join('/')}` is shimmed at dist/cjs by dist-cjs-fixup.js.
+const importMetaUrl = `file:///${__filename.split('\\').join('/')}`;
+(0, utils_js_1.assertPosixPath)(importMetaUrl);
+const __dirname_ = node_path_1.default.posix.dirname((0, url_1.fileURLToPath)(importMetaUrl));
+(0, utils_js_1.assertPosixPath)(__dirname_);
 async function determineFsAllowList(config) {
     const fsAllow = config.server.fs.allow;
     // fsAllow should already contain searchForWorkspaceRoot()
@@ -26,9 +25,9 @@ async function determineFsAllowList(config) {
     // Add node_modules/vike/
     {
         // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/config/
-        const vikeRoot = path_1.default.join(__dirname_, '../../../../../../');
+        const vikeRoot = node_path_1.default.posix.join(__dirname_, '../../../../../../');
         // Assert that `vikeRoot` is indeed pointing to `node_modules/vike/`
-        require_.resolve(`${vikeRoot}/dist/esm/node/plugin/plugins/devConfig/index.js`);
+        (0, utils_js_1.requireResolveNonUserFile)(`${vikeRoot}/dist/esm/node/plugin/plugins/devConfig/index.js`, importMetaUrl);
         fsAllow.push(vikeRoot);
     }
 }

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

@@ -1,9 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.envVarsPlugin = envVarsPlugin;
+const magic_string_1 = __importDefault(require("magic-string"));
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
-const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const getFilePath_js_1 = require("../shared/getFilePath.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
@@ -12,7 +15,7 @@ const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
 //   - Or stop using Vite's `mode` implemention and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)
 const PUBLIC_ENV_PREFIX = 'PUBLIC_ENV__';
-const PUBLIC_ENV_WHITELIST = [
+const PUBLIC_ENV_ALLOWLIST = [
     // https://github.com/vikejs/vike/issues/1724
     'STORYBOOK'
 ];
@@ -40,6 +43,7 @@ function envVarsPlugin() {
                 return;
             const isBuild = config.command === 'build';
             const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options);
+            const s = new magic_string_1.default(code);
             Object.entries(envsAll)
                 .filter(([key]) => {
                 // Already handled by Vite
@@ -48,12 +52,12 @@ function envVarsPlugin() {
             })
                 .forEach(([envName, envVal]) => {
                 const envStatement = `import.meta.env.${envName}`;
-                const envStatementRegEx = new RegExp((0, utils_js_1.escapeRegex)(envStatement) + '\\b', 'g');
+                const envStatementRegExStr = (0, utils_js_1.escapeRegex)(envStatement) + '\\b';
                 // Security check
                 {
-                    const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_WHITELIST.includes(envName);
+                    const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_ALLOWLIST.includes(envName);
                     if (isPrivate && isClientSide) {
-                        if (!envStatementRegEx.test(code))
+                        if (!new RegExp(envStatementRegExStr).test(code))
                             return;
                         const modulePath = (0, getFilePath_js_1.getModuleFilePathAbsolute)(id, config);
                         const errMsgAddendum = isBuild ? '' : ' (Vike will prevent your app from building for production)';
@@ -72,16 +76,21 @@ function envVarsPlugin() {
                     (0, utils_js_1.assert)(!(isPrivate && isClientSide) || !isBuild);
                 }
                 // Apply
-                code = applyEnvVar(envStatementRegEx, envVal, code);
+                applyEnvVar(s, envStatementRegExStr, envVal);
             });
-            // Line numbers didn't change.
-            //  - We only break the column number of a couple of lines, wich is acceptable.
-            //  - Anyways, I'm not even sure Vite supports high-resolution column number source mapping.
-            const ret = (0, rollupSourceMap_js_1.sourceMapPassthrough)(code);
-            return ret;
+            if (!s.hasChanged())
+                return null;
+            return {
+                code: s.toString(),
+                map: s.generateMap({ hires: true, source: id })
+            };
         }
     };
 }
-function applyEnvVar(envStatementRegEx, envVal, code) {
-    return code.replace(envStatementRegEx, JSON.stringify(envVal));
+function applyEnvVar(s, envStatementRegExStr, envVal) {
+    const envStatementRegEx = new RegExp(envStatementRegExStr, 'g');
+    let match;
+    while ((match = envStatementRegEx.exec(s.original))) {
+        s.overwrite(match.index, match.index + match[0].length, JSON.stringify(envVal));
+    }
 }

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

@@ -12,7 +12,6 @@ const virtual_files_js_1 = require("../../shared/virtual-files.js");
 const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
 const isAsset_js_1 = require("../shared/isAsset.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
-const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const handleAssetsManifest_js_1 = require("./build/handleAssetsManifest.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
@@ -53,7 +52,7 @@ function extractAssetsPlugin() {
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
                 debugTransformResult(id, code, importStatements);
-                return (0, rollupSourceMap_js_1.sourceMapRemove)(code);
+                return (0, utils_js_1.rollupSourceMapRemove)(code);
             }
         },
         // This plugin appends `?extractAssets` to module IDs

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

@@ -5,7 +5,6 @@ exports.extractExportNamesPlugin = extractExportNamesPlugin;
 exports.isUsingClientRouter = isUsingClientRouter;
 const utils_js_1 = require("../utils.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
-const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
@@ -42,7 +41,7 @@ async function getExtractExportNamesCode(src, isClientSide, isProduction, id) {
         globalObject.usesClientRouter = true;
     }
     const code = getCode(exportNames, wildcardReExports, isClientSide, isProduction, id);
-    return (0, rollupSourceMap_js_1.sourceMapRemove)(code);
+    return (0, utils_js_1.rollupSourceMapRemove)(code);
 }
 function getCode(exportNames, wildcardReExports, isClientSide, isProduction, id) {
     let code = '';

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

@@ -9,7 +9,6 @@ const extractAssetsPlugin_js_1 = require("./extractAssetsPlugin.js");
 const extractExportNamesPlugin_js_1 = require("./extractExportNamesPlugin.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getFilePath_js_1 = require("../shared/getFilePath.js");
-const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
@@ -54,7 +53,7 @@ function fileEnv() {
             const errMsg = getErrorMessage(id, isServerSide, importers, false, true);
             // We have to inject empty exports to avoid Rollup complaining about missing exports, see https://gist.github.com/brillout/5ea45776e65bd65100a52ecd7bfda3ff
             const { exportNames } = await (0, parseEsModule_js_1.getExportNames)(code);
-            return (0, rollupSourceMap_js_1.sourceMapRemove)([
+            return (0, utils_js_1.rollupSourceMapRemove)([
                 `throw new Error(${JSON.stringify(errMsg)});`,
                 ...exportNames.map((name) => name === 'default' ? 'export default undefined;' : `export const ${name} = undefined;`)
             ].join('\n'));

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

@@ -77,10 +77,8 @@ function resolveImportPathWithNode(pointerImportData, importerFilePath) {
     const importerFilePathAbsolute = importerFilePath.filePathAbsoluteFilesystem;
     (0, utils_js_1.assertPosixPath)(importerFilePathAbsolute);
     const cwd = path_1.default.posix.dirname(importerFilePathAbsolute);
-    // We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
-    // - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
     // filePathAbsoluteFilesystem is expected to be null when pointerImportData.importPath is a Vite path alias
-    const filePathAbsoluteFilesystem = (0, utils_js_1.requireResolve)(pointerImportData.importPath, cwd);
+    const filePathAbsoluteFilesystem = (0, utils_js_1.requireResolveOptional)(pointerImportData.importPath, cwd);
     return filePathAbsoluteFilesystem;
 }
 function assertUsageResolutionSuccess(filePathAbsoluteFilesystem, pointerImportData, importerFilePath) {

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

@@ -16,10 +16,6 @@ const utils_js_1 = require("../../../../utils.js");
 const transformPointerImports_js_1 = require("./transformPointerImports.js");
 const source_map_support_1 = __importDefault(require("source-map-support"));
 const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
-const module_1 = require("module");
-// @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = `file://${__filename}`;
-const require_ = (0, module_1.createRequire)(importMetaUrl);
 (0, utils_js_1.assertIsNotProductionRuntime)();
 installSourceMapSupport();
 const debug = (0, utils_js_1.createDebugger)('vike:pointer-imports');
@@ -115,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])
@@ -124,17 +118,15 @@ 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
                     // - Sitll required for esbuild@0.24.0 (November 2024).
                     // - Let's try to remove this workaround again later.
                     if (resolved.errors.length > 0) {
-                        let resolvedWithNode;
-                        try {
-                            resolvedWithNode = require_.resolve(path, { paths: [args.resolveDir] });
-                        }
-                        catch { }
+                        const resolvedWithNode = (0, utils_js_1.requireResolveOptional)(path, args.resolveDir);
                         if (debugEsbuildResolve.isActivated)
                             debugEsbuildResolve('resolvedWithNode', resolvedWithNode);
                         if (resolvedWithNode)
@@ -168,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;
@@ -196,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/plugin/plugins/importUserCode/v1-design/getVikeConfig.js

@@ -410,7 +410,7 @@ function setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved) {
         Object.entries(configValues).forEach(([configName, value]) => {
             var _a;
             const sourceName = `The ${(0, getConfigDefinedAt_js_1.getDefinedByString)(definedBy, configName)}`;
-            assertKnownConfig(configName, configDefinitionsResolved.configNamesKnownGlobal, configDefinitionsResolved, '/', sourceName, exitOnError);
+            assertKnownConfig(configName, configDefinitionsResolved.configNamesKnownGlobal, configDefinitionsResolved, '/', false, sourceName, exitOnError);
             const sources = ((_a = pageConfigGlobal.configValueSources)[configName] ?? (_a[configName] = []));
             sources.unshift(getSourceNonConfigFile(configName, value, definedBy));
         });
@@ -885,12 +885,12 @@ function assertKnownConfigs(configDefinitionsResolved) {
             configNames.forEach((configName) => {
                 const { locationId } = plusFile;
                 const sourceName = plusFile.filePath.filePathToShowToUser;
-                assertKnownConfig(configName, configNamesKnownLocal, configDefinitionsResolved, locationId, sourceName, false);
+                assertKnownConfig(configName, configNamesKnownLocal, configDefinitionsResolved, locationId, true, sourceName, false);
             });
         });
     });
 }
-function assertKnownConfig(configName, configNamesKnownRelevant, configDefinitionsResolved, locationId, sourceName, exitOnError) {
+function assertKnownConfig(configName, configNamesKnownRelevant, configDefinitionsResolved, locationId, isPlusFile, sourceName, exitOnError) {
     const { configNamesKnownAll } = configDefinitionsResolved;
     if (configNamesKnownRelevant.includes(configName)) {
         (0, utils_js_1.assert)(configNamesKnownAll.includes(configName));
@@ -901,7 +901,10 @@ function assertKnownConfig(configName, configNamesKnownRelevant, configDefinitio
     if (configNamesKnownAll.includes(configName)) {
         (0, utils_js_1.assertUsage)(false, `${sourceName} sets the value of the config ${configNameColored} which is a custom config that is defined with ${picocolors_1.default.underline('https://vike.dev/meta')} at a path that doesn't apply to ${locationId} — see ${picocolors_1.default.underline('https://vike.dev/config#inheritance')}`, { exitOnError });
     }
-    const errMsg = `${sourceName} sets an unknown config ${configNameColored}`;
+    const errMsg = isPlusFile
+        ? `${sourceName} sets an unknown config ${configNameColored}`
+        : `${sourceName} sets an unknown Vike config, see ${picocolors_1.default.underline('https://vike.dev/cli')} for the list of CLI options`;
+    (0, utils_js_1.assert)(errMsg.includes(configName));
     // Missing vike-{react,vue,solid} installation
     {
         const ui = ['vike-react', 'vike-vue', 'vike-solid'];

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setGlobalContext = setGlobalContext;
 const globalContext_js_1 = require("../../runtime/globalContext.js");
 const utils_js_1 = require("../utils.js");
-const getOutDirs_js_1 = require("../shared/getOutDirs.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
+const getViteConfigRuntime_js_1 = require("../shared/getViteConfigRuntime.js");
 function setGlobalContext() {
     let isServerReload = false;
     let config;
@@ -43,9 +43,8 @@ function setGlobalContext() {
                 order: 'post',
                 async handler(config_) {
                     config = config_;
-                    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config);
-                    (0, utils_js_1.assertFilePathAbsoluteFilesystem)(outDirRoot); // Needed for `importServerProductionEntry({ outDir })` of @brillout/vite-plugin-server-entry
-                    (0, globalContext_js_1.setGlobalContext_viteConfig)(config, outDirRoot);
+                    const viteConfigRuntime = (0, getViteConfigRuntime_js_1.getViteConfigRuntime)(config);
+                    (0, globalContext_js_1.setGlobalContext_viteConfig)(config, viteConfigRuntime);
                 }
             }
         }

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

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getViteConfigRuntime = getViteConfigRuntime;
+const utils_js_1 = require("../utils.js");
+const getOutDirs_js_1 = require("./getOutDirs.js");
+function getViteConfigRuntime(config) {
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(config, '_baseViteOriginal', 'string'));
+    const { outDirRoot } = (0, getOutDirs_js_1.getOutDirs)(config);
+    (0, utils_js_1.assertFilePathAbsoluteFilesystem)(outDirRoot);
+    const viteConfigRuntime = {
+        root: config.root,
+        build: {
+            outDir: outDirRoot
+        },
+        _baseViteOriginal: config._baseViteOriginal,
+        vitePluginServerEntry: {
+            inject: config.vitePluginServerEntry?.inject
+        }
+    };
+    return viteConfigRuntime;
+}

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

@@ -2,10 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveClientEntriesDev = resolveClientEntriesDev;
 const utils_js_1 = require("../utils.js");
-const module_1 = require("module");
-// @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
-const importMetaUrl = `file://${__filename}`;
-const require_ = (0, module_1.createRequire)(importMetaUrl);
+// @ts-ignore `file:///${__filename.split('\\').join('/')}` is shimmed at dist/cjs by dist-cjs-fixup.js.
+const importMetaUrl = `file:///${__filename.split('\\').join('/')}`;
 (0, utils_js_1.assertIsNotProductionRuntime)();
 async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     let root = viteDevServer.config.root;
@@ -29,20 +27,21 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     else {
         if (clientEntry.startsWith('@@vike/')) {
             (0, utils_js_1.assert)(clientEntry.endsWith('.js'));
-            try {
-                // For Vitest (which doesn't resolve vike to its dist but to its source files)
-                // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/plugin/shared/resolveClientEntriesDev.js
-                filePath = (0, utils_js_1.toPosixPath)(require_.resolve(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts')));
-            }
-            catch {
+            let filePath_;
+            // For Vitest (which doesn't resolve vike to its dist but to its source files)
+            // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/node/plugin/shared/resolveClientEntriesDev.js
+            filePath_ = (0, utils_js_1.requireResolveOptionalNonUserFile)(clientEntry.replace('@@vike/dist/esm/client/', '../../../client/').replace('.js', '.ts'), importMetaUrl);
+            if (!filePath_) {
                 // For users
                 // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/shared/resolveClientEntriesDev.js
-                filePath = (0, utils_js_1.toPosixPath)(require_.resolve(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
+                filePath_ = (0, utils_js_1.requireResolveOptionalNonUserFile)(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/'), importMetaUrl);
             }
+            (0, utils_js_1.assert)(filePath_);
+            filePath = filePath_;
         }
         else {
             (0, utils_js_1.assertIsNpmPackageImport)(clientEntry);
-            filePath = require_.resolve(clientEntry);
+            filePath = (0, utils_js_1.requireResolve)(clientEntry, root);
         }
     }
     if (!filePath.startsWith('/')) {

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

@@ -45,3 +45,4 @@ __exportStar(require("../../utils/PROJECT_VERSION.js"), exports);
 __exportStar(require("../../utils/isEqualStringList.js"), exports);
 __exportStar(require("../../utils/isDocker.js"), exports);
 __exportStar(require("../../utils/isVitest.js"), exports);
+__exportStar(require("../../utils/rollupSourceMap.js"), exports);

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