vike 0.4.231 → 0.4.232-commit-134207d

package/dist/cjs/node/{plugin/plugins/baseUrls.js → vite/plugins/pluginBaseUrls.js}

@@ -1,21 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.baseUrls = baseUrls;
+exports.pluginBaseUrls = pluginBaseUrls;
 const resolveBase_js_1 = require("../../shared/resolveBase.js");
 const utils_js_1 = require("../utils.js");
-const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
-const commonConfig_js_1 = require("./commonConfig.js");
-function baseUrls() {
+const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
+function pluginBaseUrls() {
     let basesResolved;
     return {
-        name: 'vike:baseUrls',
+        name: 'vike:pluginBaseUrls',
         enforce: 'post',
         async config(config) {
             const isDev = config._isDev;
             (0, utils_js_1.assert)(typeof isDev === 'boolean');
             const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
-            const vike = (0, commonConfig_js_1.getVikeConfigInternal)(config);
-            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, vike.config.baseServer ?? null, vike.config.baseAssets ?? null);
+            const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, vikeConfig.config.baseServer ?? null, vikeConfig.config.baseAssets ?? null);
             // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
             process.env.BASE_SERVER = basesResolved.baseServer;
             process.env.BASE_ASSETS = basesResolved.baseAssets;
@@ -23,15 +22,15 @@ function baseUrls() {
                 envPrefix: [
                     'VITE_', // Vite doesn't seem to merge in its default, see https://github.com/vikejs/vike/issues/554
                     'BASE_SERVER',
-                    'BASE_ASSETS'
+                    'BASE_ASSETS',
                 ],
                 base: basesResolved.baseAssets, // Make Vite inject baseAssets to imports e.g. `import logoUrl from './logo.svg.js'`
-                _baseViteOriginal: baseViteOriginal
+                _baseViteOriginal: baseViteOriginal,
             };
         },
         async configResolved(config) {
-            const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
-            const basesResolved2 = resolveBaseFromResolvedConfig(vikeConfig.global.config.baseServer ?? null, vikeConfig.global.config.baseAssets ?? null, config);
+            const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+            const basesResolved2 = resolveBaseFromResolvedConfig(vikeConfig.config.baseServer ?? null, vikeConfig.config.baseAssets ?? null, config);
             (0, utils_js_1.assert)(basesResolved2.baseServer === basesResolved.baseServer);
             (0, utils_js_1.assert)(basesResolved2.baseAssets === basesResolved.baseAssets);
             /* In dev, Vite seems buggy around setting vite.config.js#base to an absolute URL (e.g. http://localhost:8080/cdn/)
@@ -39,7 +38,7 @@ function baseUrls() {
              *  - Instead of having an internal Vike assertion fail, we let the user discover Vite's buggy behavior.
             assert(config.base === baseAssets)
             */
-        }
+        },
     };
 }
 function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {

package/dist/cjs/node/{plugin/plugins/build → vite/plugins/pluginBuild}/handleAssetsManifest.js

@@ -8,19 +8,18 @@ exports.handleAssetsManifest_getBuildConfig = handleAssetsManifest_getBuildConfi
 exports.handleAssetsManifest_isFixEnabled = handleAssetsManifest_isFixEnabled;
 exports.handleAssetsManifest_assertUsageCssCodeSplit = handleAssetsManifest_assertUsageCssCodeSplit;
 exports.handleAssetsManifest_assertUsageCssTarget = handleAssetsManifest_assertUsageCssTarget;
-const promises_1 = __importDefault(require("fs/promises"));
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const fs_2 = require("fs");
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const node_fs_2 = require("node:fs");
 const utils_js_1 = require("../../utils.js");
-const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
+const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
 const pluginBuildConfig_js_1 = require("./pluginBuildConfig.js");
 const getAssetsDir_js_1 = require("../../shared/getAssetsDir.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
+const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
-const commonConfig_js_1 = require("../commonConfig.js");
 const pluginBuildEntry_js_1 = require("./pluginBuildEntry.js");
 (0, utils_js_1.assertIsSingleModuleInstance)('build/handleAssetsManifest.ts');
 let assetsJsonFilePath;
@@ -28,7 +27,7 @@ let assetsJsonFilePath;
 // false => use workaround extractAssets plugin
 function handleAssetsManifest_isFixEnabled(config) {
     // Allow user to toggle between the two workarounds? E.g. based on https://vike.dev/includeAssetsImportedByServer.
-    return (0, getVikeConfig_js_1.isV1Design)(config);
+    return (0, resolveVikeConfigInternal_js_1.isV1Design)();
 }
 /** https://github.com/vikejs/vike/issues/1339 */
 async function fixServerAssets(config) {
@@ -42,22 +41,22 @@ async function fixServerAssets(config) {
 async function copyAssets(filesToMove, filesToRemove, config) {
     const { outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
     const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
-    const assetsDirServer = path_1.default.posix.join(outDirServer, assetsDir);
-    if (!filesToMove.length && !filesToRemove.length && !(0, fs_2.existsSync)(assetsDirServer))
+    const assetsDirServer = node_path_1.default.posix.join(outDirServer, assetsDir);
+    if (!filesToMove.length && !filesToRemove.length && !(0, node_fs_2.existsSync)(assetsDirServer))
         return;
-    (0, utils_js_1.assert)((0, fs_2.existsSync)(assetsDirServer));
+    (0, utils_js_1.assert)((0, node_fs_2.existsSync)(assetsDirServer));
     const concurrencyLimit = (0, utils_js_1.pLimit)(10);
     await Promise.all(filesToMove.map((file) => concurrencyLimit(async () => {
-        const source = path_1.default.posix.join(outDirServer, file);
-        const target = path_1.default.posix.join(outDirClient, file);
-        await promises_1.default.mkdir(path_1.default.posix.dirname(target), { recursive: true });
+        const source = node_path_1.default.posix.join(outDirServer, file);
+        const target = node_path_1.default.posix.join(outDirClient, file);
+        await promises_1.default.mkdir(node_path_1.default.posix.dirname(target), { recursive: true });
         await promises_1.default.rename(source, target);
     })));
     filesToRemove.forEach((file) => {
-        const filePath = path_1.default.posix.join(outDirServer, file);
-        fs_1.default.unlinkSync(filePath);
+        const filePath = node_path_1.default.posix.join(outDirServer, file);
+        node_fs_1.default.unlinkSync(filePath);
     });
-    /* We cannot do that because, with some edge case Rollup settings (outputing JavaScript chunks and static assets to the same directoy), this removes JavaScript chunks, see https://github.com/vikejs/vike/issues/1154#issuecomment-1975762404
+    /* We cannot do that because, with some edge case Rollup settings (outputting JavaScript chunks and static assets to the same directory), this removes JavaScript chunks, see https://github.com/vikejs/vike/issues/1154#issuecomment-1975762404
     await fs.rm(assetsDirServer, { recursive: true })
     */
     removeEmptyDirectories(assetsDirServer);
@@ -159,7 +158,7 @@ function addServerAssets(clientManifest, serverManifest) {
                     css,
                     assets,
                     dynamicImports: undefined,
-                    imports: undefined
+                    imports: undefined,
                 };
             }
         }
@@ -172,12 +171,12 @@ function addServerAssets(clientManifest, serverManifest) {
 }
 function getPageId(key) {
     // Normalize from:
-    //   ../../virtual:vike:pageConfigValuesAll:client:/pages/index
+    //   ../../virtual:vike:pageConfigLazy:client:/pages/index
     // to:
-    //   virtual:vike:pageConfigValuesAll:client:/pages/index
+    //   virtual:vike:pageConfigLazy:client:/pages/index
     // (This seems to be needed only for vitest tests that use Vite's build() API with an inline config.)
     key = key.substring(key.indexOf('virtual:vike'));
-    const result = (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(key);
+    const result = (0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(key);
     return result && result.pageId;
 }
 function collectResources(entryRoot, manifest) {
@@ -211,7 +210,7 @@ function collectResources(entryRoot, manifest) {
 // </head>
 // ```
 function getHash(src) {
-    // src is guarenteed to end with `.[hash][extname]`, see pluginDistFileNames.ts
+    // src is guaranteed to end with `.[hash][extname]`, see pluginDistFileNames.ts
     const hash = src.split('.').at(-2);
     (0, utils_js_1.assert)(hash);
     return hash;
@@ -240,10 +239,10 @@ function handleAssetsManifest_assertUsageCssTarget(config) {
                 'The CSS browser target should be the same for both client and server, but we got:',
                 `Client: ${picocolors_1.default.cyan(JSON.stringify(targetCssResolvedClient))}`,
                 `Server: ${picocolors_1.default.cyan(JSON.stringify(targetCssResolvedServer))}`,
-                `Different targets lead to CSS duplication, see ${picocolors_1.default.underline('https://github.com/vikejs/vike/issues/1815#issuecomment-2507002979')} for more information.`
+                `Different targets lead to CSS duplication, see ${picocolors_1.default.underline('https://github.com/vikejs/vike/issues/1815#issuecomment-2507002979')} for more information.`,
             ].join('\n'), {
                 showStackTrace: true,
-                onlyOnce: 'different-css-target'
+                onlyOnce: 'different-css-target',
             });
         });
     });
@@ -256,23 +255,23 @@ function resolveCssTarget(target) {
  */
 function removeEmptyDirectories(dirPath) {
     // Read the directory contents
-    const files = fs_1.default.readdirSync(dirPath);
+    const files = node_fs_1.default.readdirSync(dirPath);
     // Iterate through the files and subdirectories
     for (const file of files) {
-        const fullPath = path_1.default.join(dirPath, file);
+        const fullPath = node_path_1.default.join(dirPath, file);
         // Check if it's a directory
-        if (fs_1.default.statSync(fullPath).isDirectory()) {
+        if (node_fs_1.default.statSync(fullPath).isDirectory()) {
             // Recursively clean up the subdirectory
             removeEmptyDirectories(fullPath);
         }
     }
     // Re-check the directory; remove it if it's now empty
-    if (fs_1.default.readdirSync(dirPath).length === 0) {
-        fs_1.default.rmdirSync(dirPath);
+    if (node_fs_1.default.readdirSync(dirPath).length === 0) {
+        node_fs_1.default.rmdirSync(dirPath);
     }
 }
 async function readManifestFile(outDir) {
-    const manifestFilePath = path_1.default.posix.join(outDir, pluginBuildConfig_js_1.manifestTempFile);
+    const manifestFilePath = node_path_1.default.posix.join(outDir, pluginBuildConfig_js_1.manifestTempFile);
     const manifestFileContent = await promises_1.default.readFile(manifestFilePath, 'utf-8');
     (0, utils_js_1.assert)(manifestFileContent);
     const manifest = JSON.parse(manifestFileContent);
@@ -285,8 +284,8 @@ async function writeManifestFile(manifest, manifestFilePath) {
     const manifestFileContent = JSON.stringify(manifest, null, 2);
     await promises_1.default.writeFile(manifestFilePath, manifestFileContent, 'utf-8');
 }
-function handleAssetsManifest_getBuildConfig(config) {
-    const vike = (0, commonConfig_js_1.getVikeConfigInternal)(config);
+async function handleAssetsManifest_getBuildConfig(config) {
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
     const isFixEnabled = handleAssetsManifest_isFixEnabled(config);
     return {
         // https://github.com/vikejs/vike/issues/1339
@@ -294,10 +293,10 @@ function handleAssetsManifest_getBuildConfig(config) {
         // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
         cssMinify: isFixEnabled ? 'esbuild' : undefined,
         manifest: pluginBuildConfig_js_1.manifestTempFile,
-        copyPublicDir: vike.config.vite6BuilderApp
+        copyPublicDir: vikeConfig.config.vite6BuilderApp
             ? // Already set by vike:build:pluginBuildApp
                 undefined
-            : !(0, isViteServerBuild_js_1.isViteServerBuild)(config)
+            : !(0, isViteServerBuild_js_1.isViteServerBuild)(config),
     };
 }
 async function handleAssetsManifest(config, viteEnv, options, bundle) {
@@ -305,23 +304,25 @@ async function handleAssetsManifest(config, viteEnv, options, bundle) {
     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');
+        assetsJsonFilePath = node_path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
         await writeAssetsManifestFile(outDirs, assetsJsonFilePath, config);
     }
     if ((0, isViteServerBuild_js_1.isViteServerBuild)(config, viteEnv)) {
+        const outDir = options.dir;
+        (0, utils_js_1.assert)(outDir);
         // 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);
+        const noop = await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(assetsJsonFilePath, bundle, outDir);
         if (isSsREnv)
             (0, utils_js_1.assert)(!noop); // dist/server should always contain __VITE_ASSETS_MANIFEST__
     }
 }
 async function writeAssetsManifestFile(outDirs, assetsJsonFilePath, config) {
     const isFixEnabled = handleAssetsManifest_isFixEnabled(config);
-    const clientManifestFilePath = path_1.default.posix.join(outDirs.outDirClient, pluginBuildConfig_js_1.manifestTempFile);
-    const serverManifestFilePath = path_1.default.posix.join(outDirs.outDirServer, pluginBuildConfig_js_1.manifestTempFile);
+    const clientManifestFilePath = node_path_1.default.posix.join(outDirs.outDirClient, pluginBuildConfig_js_1.manifestTempFile);
+    const serverManifestFilePath = node_path_1.default.posix.join(outDirs.outDirServer, pluginBuildConfig_js_1.manifestTempFile);
     if (!isFixEnabled) {
         await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
     }

package/dist/cjs/node/{plugin/plugins/build → vite/plugins/pluginBuild}/pluginAutoFullBuild.js

@@ -7,66 +7,76 @@ exports.pluginAutoFullBuild = pluginAutoFullBuild;
 exports.isPrerenderForceExit = isPrerenderForceExit;
 const vite_1 = require("vite");
 const utils_js_1 = require("../../utils.js");
-const runPrerender_js_1 = require("../../../prerender/runPrerender.js");
 const context_js_1 = require("../../../prerender/context.js");
 const isViteCliCall_js_1 = require("../../shared/isViteCliCall.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const logErrorHint_js_1 = require("../../../runtime/renderPage/logErrorHint.js");
 const pluginBuildConfig_js_1 = require("./pluginBuildConfig.js");
-const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
+const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const context_js_2 = require("../../../api/context.js");
 const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
+const runPrerenderEntry_js_1 = require("../../../prerender/runPrerenderEntry.js");
 (0, utils_js_1.assertIsSingleModuleInstance)('build/pluginAutoFullBuild.ts');
 let forceExit = false;
 function pluginAutoFullBuild() {
     let config;
-    let vikeConfig;
     return [
         {
             name: 'vike:build:pluginAutoFullBuild',
             apply: 'build',
             enforce: 'pre',
             async configResolved(config_) {
-                vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config_);
                 config = config_;
-                abortViteBuildSsr(vikeConfig);
+                await abortViteBuildSsr();
             },
             writeBundle: {
-                /* We can't use this because it breaks Vite's logging. TODO/eventually: try again with latest Vite version.
+                /* We can't use this because it breaks Vite's logging. TO-DO/eventually: try again with latest Vite version.
                 sequential: true,
                 order: 'pre',
                 */
                 async handler(options, bundle) {
-                    await (0, handleAssetsManifest_js_1.handleAssetsManifest)(config, this.environment, options, bundle);
-                    await triggerFullBuild(config, vikeConfig, this.environment, bundle);
-                }
-            }
+                    try {
+                        await (0, handleAssetsManifest_js_1.handleAssetsManifest)(config, this.environment, options, bundle);
+                        await triggerFullBuild(config, this.environment, bundle);
+                    }
+                    catch (err) {
+                        // We use try-catch also because:
+                        // - Vite/Rollup swallows errors thrown inside the writeBundle() hook. (It doesn't swallow errors thrown inside the first writeBundle() hook while building the client-side, but it does swallow errors thrown inside the second writeBundle() while building the server-side triggered after Vike calls Vite's `build()` API.)
+                        // - Avoid Rollup prefixing the error with [vike:build:pluginAutoFullBuild], see for example https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
+                        console.error(err);
+                        (0, logErrorHint_js_1.logErrorHint)(err);
+                        process.exit(1);
+                    }
+                },
+            },
         },
         {
-            name: 'vike:build:pluginAutoFullBuild:forceExit',
+            name: 'vike:build:pluginAutoFullBuild:post',
             apply: 'build',
             enforce: 'post',
             closeBundle: {
                 sequential: true,
                 order: 'post',
-                handler() {
+                async handler() {
                     (0, utils_js_1.onSetupBuild)();
                     (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssTarget)(config);
+                    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
                     if (forceExit &&
                         // Let vike:build:pluginBuildApp force exit
-                        !vikeConfig.global.config.vite6BuilderApp) {
-                        (0, runPrerender_js_1.runPrerender_forceExit)();
+                        !vikeConfig.config.vite6BuilderApp) {
+                        (0, runPrerenderEntry_js_1.runPrerender_forceExit)();
                         (0, utils_js_1.assert)(false);
                     }
-                }
-            }
-        }
+                },
+            },
+        },
     ];
 }
-async function triggerFullBuild(config, vikeConfig, viteEnv, bundle) {
+async function triggerFullBuild(config, viteEnv, bundle) {
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
     // Whether builder.buildApp() is being used, see plugin:build:pluginBuildApp
-    const isBuilderApp = vikeConfig.global.config.vite6BuilderApp;
+    const isBuilderApp = vikeConfig.config.vite6BuilderApp;
     // If builder.buildApp() => trigger at end of `this.environment.name === 'ssr'`.
     // Else => trigger at end of client-side build.
     if (isBuilderApp ? !(0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv) : !(0, isViteServerBuild_js_1.isViteClientBuild)(config, viteEnv))
@@ -81,22 +91,15 @@ async function triggerFullBuild(config, vikeConfig, viteEnv, bundle) {
         return;
     const configInline = getFullBuildInlineConfig(config);
     if (!isBuilderApp) {
-        try {
-            await (0, vite_1.build)(setSSR(configInline));
-        }
-        catch (err) {
-            // Avoid Rollup prefixing the error with [vike:build:pluginAutoFullBuild], see for example https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
-            console.error(err);
-            (0, logErrorHint_js_1.logErrorHint)(err);
-            process.exit(1);
-        }
+        await (0, vite_1.build)(setSSR(configInline));
     }
     else {
-        // The server bulid is already called by builder.buildApp()
+        // The server build is already called by builder.buildApp()
     }
     if ((0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig)) {
-        const res = await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline);
+        const res = await (0, runPrerenderEntry_js_1.runPrerenderFromAutoRun)(configInline);
         forceExit = res.forceExit;
+        (0, utils_js_1.assert)((0, context_js_1.wasPrerenderRun)());
     }
 }
 function setSSR(configInline) {
@@ -104,18 +107,19 @@ function setSSR(configInline) {
         ...configInline,
         build: {
             ...configInline.build,
-            ssr: true
-        }
+            ssr: true,
+        },
     };
 }
-function abortViteBuildSsr(vikeConfig) {
-    if (vikeConfig.global.config.disableAutoFullBuild !== true && (0, isViteCliCall_js_1.isViteCliCall)() && (0, isViteCliCall_js_1.getViteConfigFromCli)()?.build.ssr) {
+async function abortViteBuildSsr() {
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+    if (vikeConfig.config.disableAutoFullBuild !== true && (0, isViteCliCall_js_1.isViteCliCall)() && (0, isViteCliCall_js_1.getViteConfigFromCli)()?.build.ssr) {
         (0, utils_js_1.assertWarning)(false, `The CLI call ${picocolors_1.default.cyan('$ vite build --ssr')} is superfluous since ${picocolors_1.default.cyan('$ vite build')} also builds the server-side. If you want two separate build steps then use https://vike.dev/disableAutoFullBuild or use Vite's ${picocolors_1.default.cyan('build()')} API.`, { onlyOnce: true });
         process.exit(0);
     }
 }
 function isEntirelyDisabled(vikeConfig) {
-    const { disableAutoFullBuild } = vikeConfig.global.config;
+    const { disableAutoFullBuild } = vikeConfig.config;
     if (disableAutoFullBuild === undefined || disableAutoFullBuild === 'prerender') {
         const isUserUsingViteApi = !(0, isViteCliCall_js_1.isViteCliCall)() && !(0, context_js_2.isVikeCliOrApi)();
         return isUserUsingViteApi;
@@ -138,8 +142,8 @@ function getFullBuildInlineConfig(config) {
             configFile: configFromCli?.configFile || config.configFile,
             root: config.root,
             build: {
-                ...configFromCli?.build
-            }
+                ...configFromCli?.build,
+            },
         };
     }
 }

package/dist/cjs/node/{plugin/plugins/build → vite/plugins/pluginBuild}/pluginBuildApp.js

@@ -1,52 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginBuildApp = pluginBuildApp;
-const runPrerender_js_1 = require("../../../prerender/runPrerender.js");
+const runPrerenderEntry_js_1 = require("../../../prerender/runPrerenderEntry.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const utils_js_1 = require("../../utils.js");
-const commonConfig_js_1 = require("../commonConfig.js");
 const pluginAutoFullBuild_js_1 = require("./pluginAutoFullBuild.js");
+const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 function pluginBuildApp() {
     return [
         {
             name: 'vike:build:pluginBuildApp',
             apply: 'build',
-            config(config) {
-                const vike = (0, commonConfig_js_1.getVikeConfigInternal)(config);
-                if (!vike.config.vite6BuilderApp)
+            async config(config) {
+                const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+                if (!vikeConfig.config.vite6BuilderApp)
                     return;
                 return {
                     builder: {
-                        // Can be overriden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
+                        // Can be overridden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
                         async buildApp(builder) {
                             (0, utils_js_1.assert)(builder.environments.client);
                             (0, utils_js_1.assert)(builder.environments.ssr);
                             await builder.build(builder.environments.client);
                             await builder.build(builder.environments.ssr);
                             if ((0, pluginAutoFullBuild_js_1.isPrerenderForceExit)()) {
-                                (0, runPrerender_js_1.runPrerender_forceExit)();
+                                (0, runPrerenderEntry_js_1.runPrerender_forceExit)();
                                 (0, utils_js_1.assert)(false);
                             }
-                        }
+                        },
                     },
                     environments: {
                         ssr: {
                             consumer: 'server',
                             build: {
                                 outDir: (0, getOutDirs_js_1.resolveOutDir)(config, true),
-                                ssr: true
-                            }
+                                ssr: true,
+                            },
                         },
                         client: {
                             consumer: 'client',
                             build: {
                                 copyPublicDir: true,
-                                ssr: false
-                            }
-                        }
-                    }
+                                ssr: false,
+                            },
+                        },
+                    },
                 };
-            }
-        }
+            },
+        },
     ];
 }

package/dist/cjs/node/{plugin/plugins/build → vite/plugins/pluginBuild}/pluginBuildConfig.js

@@ -5,9 +5,9 @@ exports.pluginBuildConfig = pluginBuildConfig;
 exports.assertRollupInput = assertRollupInput;
 exports.analyzeClientEntries = analyzeClientEntries;
 const utils_js_1 = require("../../utils.js");
-const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
+const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const findPageFiles_js_1 = require("../../shared/findPageFiles.js");
-const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
+const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
 const extractAssetsQuery_js_1 = require("../../../shared/extractAssetsQuery.js");
 const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
@@ -15,6 +15,7 @@ const getConfigValueBuildTime_js_1 = require("../../../../shared/page-configs/ge
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
+const getPageAssets_js_1 = require("../../../runtime/renderPage/getPageAssets.js");
 const manifestTempFile = '_temp_manifest.json';
 exports.manifestTempFile = manifestTempFile;
 function pluginBuildConfig() {
@@ -35,40 +36,38 @@ function pluginBuildConfig() {
                     config.build.rollupOptions.input = (0, utils_js_1.injectRollupInputs)(entries, config);
                     addLogHook();
                     (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssCodeSplit)(config);
-                }
+                },
             },
             config: {
                 order: 'post',
-                handler(config) {
+                async handler(config) {
                     (0, utils_js_1.onSetupBuild)();
                     return {
                         build: {
                             outDir: (0, getOutDirs_js_1.resolveOutDir)(config),
-                            ...(0, handleAssetsManifest_js_1.handleAssetsManifest_getBuildConfig)(config)
-                        }
+                            ...(await (0, handleAssetsManifest_js_1.handleAssetsManifest_getBuildConfig)(config)),
+                        },
                     };
-                }
+                },
             },
             buildStart() {
                 (0, utils_js_1.onSetupBuild)();
-            }
-        }
+            },
+        },
     ];
 }
 async function getEntries(config) {
-    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
-    const { pageConfigs } = vikeConfig;
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+    const { _pageConfigs: pageConfigs } = vikeConfig;
     // TODO/v1-release: remove
-    const pageFileEntries = await getPageFileEntries(config, 
-    // TODO/now: add meta.default
-    vikeConfig.global.config.includeAssetsImportedByServer ?? true);
+    const pageFileEntries = await getPageFileEntries(config, (0, getPageAssets_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config));
     (0, utils_js_1.assertUsage)(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
     if ((0, isViteServerBuild_js_1.isViteServerBuild)(config)) {
         const pageEntries = getPageEntries(pageConfigs);
         const entries = {
             ...pageFileEntries,
             // Ensure Rollup generates a bundle per page: https://github.com/vikejs/vike/issues/349#issuecomment-1166247275
-            ...pageEntries
+            ...pageEntries,
         };
         return entries;
     }
@@ -80,10 +79,10 @@ async function getEntries(config) {
         }
         const entries = {
             ...clientEntries,
-            ...pageFileEntries
+            ...pageFileEntries,
         };
-        const clientRoutingEntry = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/client/client-routing-runtime/entry.js');
-        const serverRoutingEntry = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/client/server-routing-runtime/entry.js');
+        const clientRoutingEntry = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/client/runtime-client-routing/entry.js');
+        const serverRoutingEntry = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/client/runtime-server-routing/entry.js');
         if (hasClientRouting) {
             entries['entries/entry-client-routing'] = clientRoutingEntry;
         }
@@ -166,7 +165,7 @@ function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
     (0, utils_js_1.assert)(filePathAbsoluteUserRootDir.startsWith('/'));
     const filePath = (0, getFilePath_js_1.getFilePathResolved)({
         filePathAbsoluteUserRootDir,
-        userRootDir: config.root
+        userRootDir: config.root,
     });
     let entryTarget = filePath.filePathAbsoluteFilesystem;
     if (addExtractAssetsQuery)
@@ -174,13 +173,13 @@ function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
     let entryName = filePathAbsoluteUserRootDir;
     if (addExtractAssetsQuery)
         entryName = (0, extractAssetsQuery_js_1.extractAssetsAddQuery)(entryName);
-    entryName = (0, utils_js_1.removeFileExtention)(entryName);
+    entryName = (0, utils_js_1.removeFileExtension)(entryName);
     entryName = (0, prependEntriesDir_js_1.prependEntriesDir)(entryName);
     return { entryName, entryTarget };
 }
 function getEntryFromPageConfig(pageConfig, isForClientSide) {
     let { pageId } = pageConfig;
-    const entryTarget = (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageId, isForClientSide);
+    const entryTarget = (0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageId, isForClientSide);
     let entryName = pageId;
     // Avoid:
     // ```