vike 0.4.227-commit-c9cc081 → 0.4.227-commit-25aa0f8

package/dist/cjs/{node/plugin/shared → utils}/rollupSourceMap.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sourceMapRemove = sourceMapRemove;
-exports.sourceMapPassthrough = sourceMapPassthrough;
+exports.rollupSourceMapRemove = rollupSourceMapRemove;
+exports.rollupSourceMapPassthrough = rollupSourceMapPassthrough;
 // https://rollupjs.org/guide/en/#source-code-transformations
 /** Remove entire source mapping, to save KBs. */
-function sourceMapRemove(code) {
+function rollupSourceMapRemove(code) {
     return {
         code,
         map: { mappings: '' }
     };
 }
 /** Don't provide any source map, pass through current source map instead. */
-function sourceMapPassthrough(code) {
+function rollupSourceMapPassthrough(code) {
     return {
         code,
         map: null

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

@@ -1,4 +1,3 @@
-import { getResolvedConfig } from '../../shared/getResolvedConfig.js';
 export { pluginAutoFullBuild };
 export { isPrerenderForceExit };
 import { build } from 'vite';
@@ -16,7 +15,7 @@ import { isViteClientBuild, isViteServerBuild_onlySsrEnv } from '../../shared/is
 assertIsSingleModuleInstance('build/pluginAutoFullBuild.ts');
 let forceExit = false;
 function pluginAutoFullBuild() {
-    let vite5Config;
+    let config;
     let vikeConfig;
     return [
         {
@@ -25,7 +24,7 @@ function pluginAutoFullBuild() {
             enforce: 'pre',
             async configResolved(config_) {
                 vikeConfig = await getVikeConfig(config_);
-                vite5Config = config_;
+                config = config_;
                 abortViteBuildSsr(vikeConfig);
             },
             writeBundle: {
@@ -34,7 +33,6 @@ function pluginAutoFullBuild() {
                 order: 'pre',
                 */
                 async handler(options, bundle) {
-                    const config = getResolvedConfig(this.environment?.config, vite5Config);
                     await handleAssetsManifest(config, this.environment, options, bundle);
                     await triggerFullBuild(config, vikeConfig, this.environment, bundle);
                 }
@@ -48,7 +46,6 @@ function pluginAutoFullBuild() {
                 sequential: true,
                 order: 'post',
                 handler() {
-                    const config = getResolvedConfig(this.environment?.config, vite5Config);
                     onSetupBuild();
                     handleAssetsManifest_assertUsageCssTarget(config);
                     if (forceExit &&

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

@@ -7,20 +7,18 @@
  * Reproduction: https://github.com/brillout/vite-plugin-ssr-server-import-syntax
  */
 // TODO/refactor: prefix all other plugins with `plugin` as well?
-import { getResolvedConfig } from '../../shared/getResolvedConfig.js';
 export { pluginDistPackageJsonFile };
 import { rollupIsEsm } from '../../shared/rollupIsEsm.js';
 import { isViteServerBuild } from '../../shared/isViteServerBuild.js';
 function pluginDistPackageJsonFile() {
-    let vite5Config;
+    let config;
     return {
         name: 'vike:build:pluginDistPackageJsonFile',
         apply: 'build',
         configResolved(config_) {
-            vite5Config = config_;
+            config = config_;
         },
         generateBundle(options, bundle) {
-            const config = getResolvedConfig(this.environment?.config, vite5Config);
             if (!isViteServerBuild(config))
                 return;
             const isEsm = rollupIsEsm(options);

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

@@ -1,4 +1,3 @@
-import { getResolvedConfig } from '../../shared/getResolvedConfig.js';
 export { pluginModuleBanner };
 import MagicString from 'magic-string';
 import { assert } from '../../utils.js';
@@ -8,24 +7,34 @@ import { isViteServerBuild, isViteServerBuild_safe } from '../../shared/isViteSe
 // 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 vite5Config;
+    let config;
+    let disabled = false;
     return {
         name: 'vike:pluginModuleBanner',
         enforce: 'post',
         apply: 'build',
         configResolved(config_) {
-            vite5Config = 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) {
-                const config = getResolvedConfig(this.environment?.config, vite5Config);
+                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] */');
-                            assert(!codeNew.includes(vikeModuleBannerPlaceholder));
+                            if (codeNew.includes(vikeModuleBannerPlaceholder)) {
+                                console.log('codeNew', codeNew);
+                                assert(false);
+                            }
                             module.code = codeNew;
                         }
                         else {
@@ -38,7 +47,8 @@ function pluginModuleBanner() {
         transform: {
             order: 'post',
             handler(code, id, options) {
-                const config = getResolvedConfig(this.environment?.config, vite5Config);
+                if (disabled)
+                    return;
                 if (!isViteServerBuild_safe(config, options))
                     return;
                 if (id.startsWith('\0'))

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

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

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

@@ -1,4 +1,3 @@
-import { getResolvedConfig } from '../../shared/getResolvedConfig.js';
 export { devConfig };
 export { logDockerHint };
 import { determineOptimizeDeps } from './determineOptimizeDeps.js';
@@ -13,7 +12,7 @@ if (isErrorDebug()) {
     Error.stackTraceLimit = Infinity;
 }
 function devConfig() {
-    let vite5Config;
+    let config;
     return [
         {
             name: 'vike:devConfig',
@@ -58,14 +57,14 @@ function devConfig() {
                 };
             },
             async configResolved(config_) {
-                vite5Config = config_;
-                await determineOptimizeDeps(vite5Config);
-                await determineFsAllowList(vite5Config);
+                config = config_;
+                await determineOptimizeDeps(config);
+                await determineFsAllowList(config);
                 if (!isErrorDebug()) {
                     await installHttpRequestAsyncStore();
-                    improveViteLogs(vite5Config);
+                    improveViteLogs(config);
                 }
-                logDockerHint(vite5Config.server.host);
+                logDockerHint(config.server.host);
             }
         },
         {
@@ -76,7 +75,6 @@ function devConfig() {
             configureServer: {
                 order: 'post',
                 handler(server) {
-                    const config = getResolvedConfig(server?.config, vite5Config);
                     const hasHonoViteDevServer = !!config.plugins.find((p) => p.name === '@hono/vite-dev-server');
                     if (config.server.middlewareMode || hasHonoViteDevServer)
                         return;

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

@@ -1,34 +1,32 @@
-import MagicString from 'magic-string';
 export { envVarsPlugin };
+import MagicString from 'magic-string';
 import { loadEnv } from 'vite';
 import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, isArray, lowerFirst } from '../utils.js';
 import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerBuild_safe } from '../shared/isViteServerBuild.js';
-import { getResolvedConfig } from '../shared/getResolvedConfig.js';
 // TODO/enventually: (after we implemented vike.config.js)
 // - Make import.meta.env work inside +config.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'
 ];
 function envVarsPlugin() {
     let envsAll;
-    let vite5Config;
+    let config;
     return {
         name: 'vike:envVars',
         enforce: 'post',
         configResolved(config_) {
-            vite5Config = config_;
-            vite5Config.command;
-            envsAll = loadEnv(vite5Config.mode, vite5Config.envDir || vite5Config.root, '');
-            vite5Config.plugins.sort(lowerFirst((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
+            config = config_;
+            config.command;
+            envsAll = loadEnv(config.mode, config.envDir || config.root, '');
+            config.plugins.sort(lowerFirst((plugin) => (plugin.name === 'vite:define' ? 1 : 0)));
         },
         transform(code, id, options) {
-            const config = getResolvedConfig(this.environment?.config, vite5Config);
             id = normalizeId(id);
             assertPosixPath(id);
             if (id.includes('/node_modules/'))
@@ -52,7 +50,7 @@ function envVarsPlugin() {
                 const envStatementRegExStr = 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 (!new RegExp(envStatementRegExStr).test(code))
                             return;

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

@@ -4,15 +4,13 @@
 //  - This is needed for HTML-only pages, and React Server Components.
 //  - We recommend using the debug flag to get an idea of how this plugin works: `$ DEBUG=vike:extractAssets pnpm exec vike build`. Then have a look at `dist/client/manifest.json` and see how `.page.server.js` entries have zero JavaScript but only CSS.
 //  - This appraoch supports import path aliases `vite.config.js#resolve.alias` https://vitejs.dev/config/#resolve-alias
-import { getResolvedConfig } from '../shared/getResolvedConfig.js';
 export { extractAssetsPlugin };
 export { extractAssetsRE };
-import { assert, assertPosixPath, styleFileRE, createDebugger, isScriptFile, assertUsage } from '../utils.js';
+import { assert, assertPosixPath, styleFileRE, createDebugger, isScriptFile, assertUsage, rollupSourceMapRemove } from '../utils.js';
 import { resolveVirtualFileId, isVirtualFileId, getVirtualFileId } from '../../shared/virtual-files.js';
 import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
 import { isAsset } from '../shared/isAsset.js';
 import { getImportStatements } from '../shared/parseEsModule.js';
-import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 import pc from '@brillout/picocolors';
 import { handleAssetsManifest_isFixEnabled } from './build/handleAssetsManifest.js';
 import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
@@ -25,7 +23,7 @@ const urlRE = /(\?|&)url(?:&|$)/;
 const EMPTY_MODULE_ID = 'virtual:vike:empty-module';
 const debug = createDebugger('vike:extractAssets');
 function extractAssetsPlugin() {
-    let vite5Config;
+    let config;
     let vikeConfig;
     let isFixEnabled;
     return [
@@ -36,7 +34,6 @@ function extractAssetsPlugin() {
             apply: 'build',
             enforce: 'post',
             async transform(src, id, options) {
-                const config = getResolvedConfig(this.environment?.config, vite5Config);
                 id = normalizeId(id);
                 if (!extractAssetsRE.test(id)) {
                     return;
@@ -53,7 +50,7 @@ function extractAssetsPlugin() {
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
                 debugTransformResult(id, code, importStatements);
-                return sourceMapRemove(code);
+                return rollupSourceMapRemove(code);
             }
         },
         // This plugin appends `?extractAssets` to module IDs
@@ -65,7 +62,6 @@ function extractAssetsPlugin() {
             //  - Vite's `vite:resolve` plugin; https://github.com/vitejs/vite/blob/d649daba7682791178b711d9a3e44a6b5d00990c/packages/vite/src/node/plugins/resolve.ts#L105
             enforce: 'pre',
             async resolveId(source, importer, options) {
-                const config = getResolvedConfig(this.environment?.config, vite5Config);
                 if (isViteServerBuild_safe(config, options)) {
                     // When building for the server, there should never be a `?extractAssets` query
                     assert(!extractAssetsRE.test(source));
@@ -141,12 +137,12 @@ function extractAssetsPlugin() {
         {
             name: 'vike:extractAssets-4',
             async configResolved(config_) {
-                vite5Config = config_;
-                vikeConfig = await getVikeConfig(vite5Config);
-                isFixEnabled = handleAssetsManifest_isFixEnabled(vite5Config);
+                config = config_;
+                vikeConfig = await getVikeConfig(config);
+                isFixEnabled = handleAssetsManifest_isFixEnabled(config);
                 if (!isFixEnabled) {
                     // https://github.com/vikejs/vike/issues/1060
-                    assertUsage(!vite5Config.plugins.find((p) => p.name === 'vite-tsconfig-paths'), 'vite-tsconfig-paths not supported, remove it and use vite.config.js#resolve.alias instead');
+                    assertUsage(!config.plugins.find((p) => p.name === 'vite-tsconfig-paths'), 'vite-tsconfig-paths not supported, remove it and use vite.config.js#resolve.alias instead');
                 }
             }
         }

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

@@ -1,9 +1,8 @@
 export { extractExportNamesPlugin };
 export { isUsingClientRouter };
 export { extractExportNamesRE };
-import { assert, getFileExtension, createDebugger, getGlobalObject, assertUsage } from '../utils.js';
+import { assert, getFileExtension, createDebugger, getGlobalObject, assertUsage, rollupSourceMapRemove } from '../utils.js';
 import { getExportNames } from '../shared/parseEsModule.js';
-import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerBuild_options } from '../shared/isViteServerBuild.js';
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
@@ -39,7 +38,7 @@ async function getExtractExportNamesCode(src, isClientSide, isProduction, id) {
         globalObject.usesClientRouter = true;
     }
     const code = getCode(exportNames, wildcardReExports, isClientSide, isProduction, id);
-    return sourceMapRemove(code);
+    return rollupSourceMapRemove(code);
 }
 function getCode(exportNames, wildcardReExports, isClientSide, isProduction, id) {
     let code = '';

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

@@ -1,27 +1,24 @@
-import { getResolvedConfig } from '../shared/getResolvedConfig.js';
 export { fileEnv };
-import { assert, assertUsage, assertWarning, capitalizeFirstLetter, joinEnglish } from '../utils.js';
+import { assert, assertUsage, assertWarning, capitalizeFirstLetter, joinEnglish, rollupSourceMapRemove } from '../utils.js';
 import { extractAssetsRE } from './extractAssetsPlugin.js';
 import { extractExportNamesRE } from './extractExportNamesPlugin.js';
 import pc from '@brillout/picocolors';
 import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
-import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 import { getExportNames } from '../shared/parseEsModule.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 function fileEnv() {
-    let vite5Config;
+    let config;
     let viteDevServer;
     return {
         name: 'vike:fileEnv',
         load(id, options) {
-            const config = getResolvedConfig(this.environment?.config, vite5Config);
             // In build, we use generateBundle() instead of the load() hook. Using load() works for dynamic imports in dev thanks to Vite's lazy transpiling, but it doesn't work in build because Rollup transpiles any dynamically imported module even if it's never actually imported.
             if (!viteDevServer)
                 return;
             if (!isV1Design(config))
                 return;
-            if (skip(config, id))
+            if (skip(id))
                 return;
             // For `.vue` files: https://github.com/vikejs/vike/issues/1912#issuecomment-2394981475
             if (id.endsWith('?direct'))
@@ -31,36 +28,34 @@ function fileEnv() {
             const importers = Array.from(moduleInfo.importers)
                 .map((m) => m.id)
                 .filter((id) => id !== null);
-            assertFileEnv(config, id, !!options?.ssr, importers, 
+            assertFileEnv(id, !!options?.ssr, importers, 
             // In dev, we only show a warning because we don't want to disrupt when the user plays with settings such as [ssr](https://vike.dev/ssr).
             true);
         },
         // In production, we have to use transform() to replace modules with a runtime error because generateBundle() doesn't work for dynamic imports. In production, dynamic imports can only be verified at runtime.
         async transform(code, id, options) {
-            const config = getResolvedConfig(this.environment?.config, vite5Config);
             id = normalizeId(id);
             // In dev, only using load() is enough as it also works for dynamic imports (see sibling comment).
             if (viteDevServer)
                 return;
-            if (skip(config, id))
+            if (skip(id))
                 return;
             const isServerSide = !!options?.ssr;
             if (!isWrongEnv(id, isServerSide))
                 return;
             const { importers } = this.getModuleInfo(id);
             // Throwing a verbose error doesn't waste client-side KBs as dynamic imports are code splitted.
-            const errMsg = getErrorMessage(config, id, isServerSide, importers, false, true);
+            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 getExportNames(code);
-            return sourceMapRemove([
+            return rollupSourceMapRemove([
                 `throw new Error(${JSON.stringify(errMsg)});`,
                 ...exportNames.map((name) => name === 'default' ? 'export default undefined;' : `export const ${name} = undefined;`)
             ].join('\n'));
         },
         generateBundle() {
-            const config = getResolvedConfig(this.environment?.config, vite5Config);
             Array.from(this.getModuleIds())
-                .filter((id) => !skip(config, id))
+                .filter((id) => !skip(id))
                 .forEach((moduleId) => {
                 const mod = this.getModuleInfo(moduleId);
                 const { importers } = mod;
@@ -71,20 +66,20 @@ function fileEnv() {
                     */
                     return;
                 }
-                assertFileEnv(config, moduleId, !!config.build.ssr, importers, false);
+                assertFileEnv(moduleId, !!config.build.ssr, importers, false);
             });
         },
         configResolved(config_) {
-            vite5Config = config_;
+            config = config_;
         },
         configureServer(viteDevServer_) {
             viteDevServer = viteDevServer_;
         }
     };
-    function assertFileEnv(config, moduleId, isServerSide, importers, onlyWarn) {
+    function assertFileEnv(moduleId, isServerSide, importers, onlyWarn) {
         if (!isWrongEnv(moduleId, isServerSide))
             return;
-        const errMsg = getErrorMessage(config, moduleId, isServerSide, importers, onlyWarn, false);
+        const errMsg = getErrorMessage(moduleId, isServerSide, importers, onlyWarn, false);
         if (onlyWarn) {
             assertWarning(false, errMsg, { onlyOnce: true });
         }
@@ -92,7 +87,7 @@ function fileEnv() {
             assertUsage(false, errMsg);
         }
     }
-    function getErrorMessage(config, moduleId, isServerSide, importers, onlyWarn, noColor) {
+    function getErrorMessage(moduleId, isServerSide, importers, onlyWarn, noColor) {
         const modulePath = getModulePath(moduleId);
         const envActual = isServerSide ? 'server' : 'client';
         const envExpect = isServerSide ? 'client' : 'server';
@@ -117,7 +112,7 @@ function fileEnv() {
         const suffixWrong = getSuffix(isServerSide ? 'client' : 'server');
         return modulePath.includes(suffixWrong);
     }
-    function skip(config, id) {
+    function skip(id) {
         // TODO/v1-release: remove
         if (extractAssetsRE.test(id) || extractExportNamesRE.test(id))
             return true;

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

@@ -1,4 +1,3 @@
-import { getResolvedConfig } from '../../shared/getResolvedConfig.js';
 export { importUserCode };
 import { normalizePath } from 'vite';
 import { getVirtualFilePageConfigValuesAll } from './v1-design/virtual-files/getVirtualFilePageConfigValuesAll.js';
@@ -14,16 +13,16 @@ import { getModuleFilePathAbsolute } from '../../shared/getFilePath.js';
 import { updateUserFiles } from '../../../runtime/globalContext.js';
 import { isPlusFile } from './v1-design/getVikeConfig/crawlPlusFiles.js';
 function importUserCode() {
-    let vite5Config;
+    let config;
     let vikeConfig;
     return {
         name: 'vike:importUserCode',
         async configResolved(config_) {
             vikeConfig = await getVikeConfig(config_);
-            vite5Config = config_;
+            config = config_;
             // TODO/v1-release: remove
-            if (!isV1Design(vite5Config))
-                vite5Config.experimental.importGlobRestoreExtension = true;
+            if (!isV1Design(config))
+                config.experimental.importGlobRestoreExtension = true;
         },
         resolveId(id) {
             if (isVirtualFileId(id)) {
@@ -32,7 +31,7 @@ function importUserCode() {
         },
         async handleHotUpdate(ctx) {
             try {
-                return await handleHotUpdate(ctx, vite5Config);
+                return await handleHotUpdate(ctx, config);
             }
             catch (err) {
                 // Vite swallows errors thrown by handleHotUpdate()
@@ -41,7 +40,6 @@ function importUserCode() {
             }
         },
         async load(id, options) {
-            const config = getResolvedConfig(this.environment?.config, vite5Config);
             if (!isVirtualFileId(id))
                 return undefined;
             id = getVirtualFileId(id);
@@ -57,7 +55,7 @@ function importUserCode() {
             }
         },
         configureServer(server) {
-            handleFileAddRemove(server, vite5Config);
+            handleFileAddRemove(server, config);
         }
     };
 }

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

@@ -568,6 +568,7 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
             // Defined over pointer import
             assert(confVal.valueIsLoaded);
             const pointerImport = resolvePointerImport(confVal.value, plusFile.filePath, userRootDir, configName);
+            console.log('pointerImport', pointerImport);
             const configDefinedAt = getConfigDefinedAt('Config', configName, definedAtFilePath_);
             assertUsage(pointerImport, `${configDefinedAt} should be an import`);
             valueFilePath = pointerImport.fileExportPath.filePathAbsoluteVite;

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

@@ -3,7 +3,6 @@ import { assert, assertPosixPath, toPosixPath, pathJoin, assertIsNpmPackageImpor
 import { createRequire } from 'module';
 // @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
-const require_ = createRequire(importMetaUrl);
 assertIsNotProductionRuntime();
 async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     let root = viteDevServer.config.root;
@@ -26,6 +25,7 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     }
     else {
         if (clientEntry.startsWith('@@vike/')) {
+            const require_ = createRequire(importMetaUrl);
             assert(clientEntry.endsWith('.js'));
             try {
                 // For Vitest (which doesn't resolve vike to its dist but to its source files)
@@ -39,6 +39,7 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
             }
         }
         else {
+            const require_ = createRequire(root);
             assertIsNpmPackageImport(clientEntry);
             filePath = require_.resolve(clientEntry);
         }

package/dist/esm/node/plugin/utils.d.ts

@@ -23,3 +23,4 @@ export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/isEqualStringList.js';
 export * from '../../utils/isDocker.js';
 export * from '../../utils/isVitest.js';
+export * from '../../utils/rollupSourceMap.js';

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

@@ -29,3 +29,4 @@ export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/isEqualStringList.js';
 export * from '../../utils/isDocker.js';
 export * from '../../utils/isVitest.js';
+export * from '../../utils/rollupSourceMap.js';

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

@@ -14,6 +14,7 @@ type ProvidedByHook = null | {
 type PageContextPrerendered = {
     urlOriginal: string;
     _providedByHook?: ProvidedByHook;
+    pageId: string;
 };
 type Output<PageContext = PageContextPrerendered> = {
     filePath: string;
@@ -53,4 +54,5 @@ declare function runPrerender_forceExit(): void;
 type PrerenderContextPublic = {
     output: Output<PageContextServer>;
     pageContexts: PageContextServer[];
+    pageContexts404: PageContextServer;
 };