vike 0.4.220 → 0.4.221-commit-8577456

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

@@ -1,28 +1,29 @@
 // TODO/v1-release: remove this file
+import { getFullBuildInlineConfig } from '../shared/getFullBuildInlineConfig.js';
 export { autoFullBuild };
 import { build } from 'vite';
-import { assertWarning } from '../utils.js';
+import { assert, assertWarning } from '../utils.js';
 import { runPrerenderFromAutoRun, runPrerender_forceExit } from '../../prerender/runPrerender.js';
-import { isPrerenderAutoRunEnabled } from '../../prerender/isPrerenderAutoRunEnabled.js';
+import { isPrerenderAutoRunEnabled } from '../../prerender/context.js';
 import { isViteCliCall, getViteConfigFromCli } from '../shared/isViteCliCall.js';
 import pc from '@brillout/picocolors';
 import { logErrorHint } from '../../runtime/renderPage/logErrorHint.js';
 import { manifestTempFile } from './buildConfig.js';
 import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
+import { isVikeCliOrApi } from '../../api/context.js';
 let forceExit = false;
 function autoFullBuild() {
     let config;
-    let vikeConfigGlobal;
+    let vikeConfig;
     return [
         {
             name: 'vike:autoFullBuild',
             apply: 'build',
             enforce: 'pre',
             async configResolved(config_) {
-                const vikeConfig = await getVikeConfig(config_);
-                vikeConfigGlobal = vikeConfig.vikeConfigGlobal;
+                vikeConfig = await getVikeConfig(config_);
                 config = config_;
-                abortViteBuildSsr(vikeConfigGlobal);
+                abortViteBuildSsr(vikeConfig);
             },
             writeBundle: {
                 /* We can't use this because it breaks Vite's logging. TODO: try again with latest Vite version.
@@ -31,7 +32,7 @@ function autoFullBuild() {
                 */
                 async handler(_options, bundle) {
                     try {
-                        await triggerFullBuild(config, vikeConfigGlobal, bundle);
+                        await triggerFullBuild(config, vikeConfig, bundle);
                     }
                     catch (err) {
                         // Avoid Rollup prefixing the error with [vike:autoFullBuild], for example see https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
@@ -51,16 +52,17 @@ function autoFullBuild() {
                 handler() {
                     if (forceExit) {
                         runPrerender_forceExit();
+                        assert(false);
                     }
                 }
             }
         }
     ];
 }
-async function triggerFullBuild(config, vikeConfigGlobal, bundle) {
+async function triggerFullBuild(config, vikeConfig, bundle) {
     if (config.build.ssr)
         return; // already triggered
-    if (isDisabled(vikeConfigGlobal))
+    if (isDisabled(vikeConfig))
         return;
     // Workaround for @vitejs/plugin-legacy
     //  - The legacy plugin triggers its own Rollup build for the client-side.
@@ -68,44 +70,43 @@ async function triggerFullBuild(config, vikeConfigGlobal, bundle) {
     //  - Issue & reproduction: https://github.com/vikejs/vike/issues/1154#issuecomment-1965954636
     if (!bundle[manifestTempFile])
         return;
-    const configFromCli = !isViteCliCall() ? null : getViteConfigFromCli();
-    const configInline = {
-        ...configFromCli,
-        configFile: configFromCli?.configFile || config.configFile,
-        root: config.root,
-        build: {
-            ...configFromCli?.build
-        }
-    };
+    const configInline = getFullBuildInlineConfig(config);
     try {
-        await build({
-            ...configInline,
-            build: {
-                ...configInline.build,
-                ssr: true
-            }
-        });
+        await build(setSSR(configInline));
     }
     catch (err) {
         console.error(err);
         logErrorHint(err);
         process.exit(1);
     }
-    if (isPrerenderAutoRunEnabled(vikeConfigGlobal)) {
-        await runPrerenderFromAutoRun(configInline);
-        forceExit = true;
+    if (isPrerenderAutoRunEnabled(vikeConfig)) {
+        const res = await runPrerenderFromAutoRun(configInline, config);
+        forceExit = res.forceExit;
     }
 }
-function abortViteBuildSsr(vikeConfigGlobal) {
-    if (vikeConfigGlobal.disableAutoFullBuild !== true && isViteCliCall() && getViteConfigFromCli()?.build.ssr) {
+function setSSR(configInline) {
+    return {
+        ...configInline,
+        build: {
+            ...configInline.build,
+            ssr: true
+        }
+    };
+}
+function abortViteBuildSsr(vikeConfig) {
+    if (vikeConfig.global.config.disableAutoFullBuild !== true && isViteCliCall() && getViteConfigFromCli()?.build.ssr) {
         assertWarning(false, `The CLI call ${pc.cyan('$ vite build --ssr')} is superfluous since ${pc.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 ${pc.cyan('build()')} API.`, { onlyOnce: true });
         process.exit(0);
     }
 }
-function isDisabled(vikeConfigGlobal) {
-    const { disableAutoFullBuild } = vikeConfigGlobal;
-    if (disableAutoFullBuild === null || disableAutoFullBuild === 'prerender') {
-        return !isViteCliCall();
+function isDisabled(vikeConfig) {
+    const { disableAutoFullBuild, viteEnvironmentAPI } = vikeConfig.global.config;
+    if (viteEnvironmentAPI) {
+        return true;
+    }
+    if (disableAutoFullBuild === undefined || disableAutoFullBuild === 'prerender') {
+        const isViteApi = !isViteCliCall() && !isVikeCliOrApi();
+        return isViteApi;
     }
     else {
         return disableAutoFullBuild;

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

@@ -11,7 +11,7 @@ function baseUrls() {
             const isDev = config._isDev;
             assert(typeof isDev === 'boolean');
             const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
-            basesResolved = resolveBase(baseViteOriginal, config.vike.vikeConfigGlobal.baseServer, config.vike.vikeConfigGlobal.baseAssets);
+            basesResolved = resolveBase(baseViteOriginal, config.vike.config.baseServer ?? null, config.vike.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;
@@ -27,7 +27,7 @@ function baseUrls() {
         },
         async configResolved(config) {
             const vikeConfig = await getVikeConfig(config);
-            const basesResolved2 = resolveBaseFromResolvedConfig(vikeConfig.vikeConfigGlobal.baseServer, vikeConfig.vikeConfigGlobal.baseAssets, config);
+            const basesResolved2 = resolveBaseFromResolvedConfig(vikeConfig.global.config.baseServer ?? null, vikeConfig.global.config.baseAssets ?? null, config);
             assert(basesResolved2.baseServer === basesResolved.baseServer);
             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/)

package/dist/esm/node/plugin/plugins/buildApp.d.ts

@@ -0,0 +1,3 @@
+export { buildApp };
+import type { Plugin } from 'vite';
+declare function buildApp(): Plugin[];

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

@@ -0,0 +1,70 @@
+import { runPrerender_forceExit, runPrerenderFromAutoRun } from '../../prerender/runPrerender.js';
+export { buildApp };
+import { isPrerenderAutoRunEnabled } from '../../prerender/context.js';
+import { resolveOutDir } from '../shared/getOutDirs.js';
+import { assert } from '../utils.js';
+import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
+import { getFullBuildInlineConfig } from '../shared/getFullBuildInlineConfig.js';
+function buildApp() {
+    let config;
+    return [
+        {
+            name: 'vike:buildApp',
+            apply: 'build',
+            config(config) {
+                if (!config.vike.config.viteEnvironmentAPI)
+                    return;
+                return {
+                    builder: {
+                        buildApp: async (builder) => {
+                            assert(builder.environments.client);
+                            assert(builder.environments.ssr);
+                            await builder.build(builder.environments.client);
+                            await builder.build(builder.environments.ssr);
+                        }
+                    },
+                    environments: {
+                        ssr: {
+                            consumer: 'server',
+                            build: {
+                                outDir: resolveOutDir(config, true),
+                                ssr: true
+                            }
+                        },
+                        client: {
+                            consumer: 'client',
+                            build: {
+                                copyPublicDir: true,
+                                ssr: false
+                            }
+                        }
+                    }
+                };
+            }
+        },
+        {
+            name: 'vike:buildApp:prerender',
+            apply: 'build',
+            enforce: 'pre',
+            applyToEnvironment(env) {
+                return env.name === 'ssr';
+            },
+            configResolved(_config) {
+                config = _config;
+            },
+            async writeBundle() {
+                if (!config.vike.config.viteEnvironmentAPI)
+                    return;
+                const vikeConfig = await getVikeConfig(config);
+                if (!isPrerenderAutoRunEnabled(vikeConfig))
+                    return;
+                const configInline = getFullBuildInlineConfig(config);
+                const { forceExit } = await runPrerenderFromAutoRun(configInline, config);
+                if (forceExit) {
+                    runPrerender_forceExit();
+                    assert(false);
+                }
+            }
+        }
+    ];
+}

package/dist/esm/node/plugin/plugins/buildConfig/fixServerAssets.d.ts

@@ -2,7 +2,6 @@ export { fixServerAssets };
 export { fixServerAssets_isEnabled };
 export { fixServerAssets_assertCssCodeSplit };
 export { fixServerAssets_assertCssTarget };
-export { fixServerAssets_assertCssTarget_populate };
 import { ViteManifest } from '../../../shared/ViteManifest.js';
 import { ResolvedConfig } from 'vite';
 /**
@@ -18,5 +17,4 @@ declare function fixServerAssets(config: ResolvedConfig): Promise<{
     serverManifestMod: ViteManifest;
 }>;
 declare function fixServerAssets_assertCssCodeSplit(config: ResolvedConfig): void;
-declare function fixServerAssets_assertCssTarget_populate(config: ResolvedConfig): void;
 declare function fixServerAssets_assertCssTarget(config: ResolvedConfig): Promise<void>;

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

@@ -2,17 +2,18 @@ export { fixServerAssets };
 export { fixServerAssets_isEnabled };
 export { fixServerAssets_assertCssCodeSplit };
 export { fixServerAssets_assertCssTarget };
-export { fixServerAssets_assertCssTarget_populate };
 import fs from 'fs/promises';
 import fs_sync from 'fs';
 import path from 'path';
 import { existsSync } from 'fs';
-import { assert, assertWarning, getOutDirs, isEqualStringList, pLimit, unique, viteIsSSR } from '../../utils.js';
+import { assert, assertWarning, isEqualStringList, pLimit, unique } from '../../utils.js';
 import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { manifestTempFile } from '../buildConfig.js';
 import { getAssetsDir } from '../../shared/getAssetsDir.js';
 import pc from '@brillout/picocolors';
 import { isV1Design } from '../importUserCode/v1-design/getVikeConfig.js';
+import { getOutDirs } from '../../shared/getOutDirs.js';
+import { viteIsSSR } from '../../shared/viteIsSSR.js';
 /**
  * true  => use workaround config.build.ssrEmitAssets
  * false => use workaround extractAssets plugin
@@ -193,17 +194,15 @@ function fixServerAssets_assertCssCodeSplit(config) {
     assertWarning(config.build.cssCodeSplit, `${pc.cyan('build.cssCodeSplit')} shouldn't be set to ${pc.cyan('false')} (https://github.com/vikejs/vike/issues/1993)`, { onlyOnce: true });
 }
 const targets = [];
-function fixServerAssets_assertCssTarget_populate(config) {
-    const isServerSide = viteIsSSR(config);
-    assert(typeof isServerSide === 'boolean');
-    assert(config.build.target !== undefined);
-    targets.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
-}
 async function fixServerAssets_assertCssTarget(config) {
     if (!fixServerAssets_isEnabled())
         return;
     if (!(await isV1Design(config)))
         return;
+    const isServerSide = viteIsSSR(config);
+    assert(typeof isServerSide === 'boolean');
+    assert(config.build.target !== undefined);
+    targets.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
     const targetsServer = targets.filter((t) => t.isServerSide);
     const targetsClient = targets.filter((t) => !t.isServerSide);
     targetsClient.forEach((targetClient) => {
@@ -211,9 +210,10 @@ async function fixServerAssets_assertCssTarget(config) {
         targetsServer.forEach((targetServer) => {
             const targetCssResolvedServer = resolveCssTarget(targetServer);
             assertWarning(isEqualStringList(targetCssResolvedClient, targetCssResolvedServer), [
-                'The CSS browser target should be the same for both client-side and server-side (https://github.com/vikejs/vike/issues/1815#issuecomment-2507002979) but we got:',
-                `Client-side: ${pc.cyan(JSON.stringify(targetCssResolvedClient))}`,
-                `Server-side: ${pc.cyan(JSON.stringify(targetCssResolvedServer))}`
+                'The CSS browser target should be the same for both client and server, but we got:',
+                `Client: ${pc.cyan(JSON.stringify(targetCssResolvedClient))}`,
+                `Server: ${pc.cyan(JSON.stringify(targetCssResolvedServer))}`,
+                `Different targets leads to CSS duplication, see ${pc.underline('https://github.com/vikejs/vike/issues/1815#issuecomment-2507002979')} for more information.`
             ].join('\n'), {
                 showStackTrace: true,
                 onlyOnce: 'different-css-target'

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

@@ -2,7 +2,7 @@ export { buildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
 export { manifestTempFile };
-import { assert, resolveOutDir, viteIsSSR, addOnBeforeLogHook, removeFileExtention, unique, assertUsage, injectRollupInputs, normalizeRollupInput, getOutDirs, onSetupBuild, assertIsNpmPackageImport } from '../utils.js';
+import { assert, addOnBeforeLogHook, removeFileExtention, unique, assertUsage, injectRollupInputs, normalizeRollupInput, onSetupBuild, assertIsNpmPackageImport } from '../utils.js';
 import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { findPageFiles } from '../shared/findPageFiles.js';
 import { getVirtualFileIdPageConfigValuesAll } from '../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
@@ -10,18 +10,19 @@ import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
 import { createRequire } from 'module';
 import fs from 'fs/promises';
 import path from 'path';
-import { fixServerAssets, fixServerAssets_assertCssCodeSplit, fixServerAssets_assertCssTarget, fixServerAssets_assertCssTarget_populate, fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
-import { set_ASSETS_MAP } from './buildEntry/index.js';
+import { fixServerAssets, fixServerAssets_assertCssCodeSplit, fixServerAssets_assertCssTarget, fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
+import { set_ASSETS_MANIFEST } from './buildEntry/index.js';
 import { prependEntriesDir } from '../../shared/prependEntriesDir.js';
 import { getFilePathResolved } from '../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../shared/page-configs/getConfigValueBuildTime.js';
+import { getOutDirs, resolveOutDir } from '../shared/getOutDirs.js';
+import { viteIsSSR } from '../shared/viteIsSSR.js';
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 const manifestTempFile = '_temp_manifest.json';
 function buildConfig() {
     let isServerAssetsFixEnabled;
-    let isSsrBuild;
     let outDirs;
     let config;
     return [
@@ -47,7 +48,6 @@ function buildConfig() {
                             config.build.ssrEmitAssets = true;
                             // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
                             config.build.cssMinify = 'esbuild';
-                            fixServerAssets_assertCssTarget_populate(config);
                             fixServerAssets_assertCssCodeSplit(config);
                         }
                     }
@@ -57,12 +57,14 @@ function buildConfig() {
                 order: 'post',
                 handler(config) {
                     onSetupBuild();
-                    isSsrBuild = viteIsSSR(config);
                     return {
                         build: {
                             outDir: resolveOutDir(config),
                             manifest: manifestTempFile,
-                            copyPublicDir: !isSsrBuild
+                            copyPublicDir: config.vike.config.viteEnvironmentAPI
+                                ? // Already set by buildApp() plugin
+                                    undefined
+                                : !viteIsSSR(config)
                         }
                     };
                 }
@@ -79,14 +81,14 @@ function buildConfig() {
             name: 'vike:buildConfig:pre',
             apply: 'build',
             // Make sure other writeBundle() hooks are called after this writeBundle() hook.
-            //  - set_ASSETS_MAP() needs to be called before dist/server/ code is executed.
+            //  - set_ASSETS_MANIFEST() needs to be called before dist/server/ code is executed.
             //    - For example, the writeBundle() hook of vite-plugin-vercel needs to be called after this writeBundle() hook, otherwise: https://github.com/vikejs/vike/issues/1527
             enforce: 'pre',
             writeBundle: {
                 order: 'pre',
                 sequential: true,
                 async handler(options, bundle) {
-                    if (isSsrBuild) {
+                    if (viteIsSSR(config)) {
                         // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
                         //  - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
                         //  - We'll able to do so once we replace `$ vite build` with `$ vike build`
@@ -102,7 +104,7 @@ function buildConfig() {
                         }
                         await fs.rm(clientManifestFilePath);
                         await fs.rm(serverManifestFilePath);
-                        await set_ASSETS_MAP(options, bundle);
+                        await set_ASSETS_MANIFEST(options, bundle);
                     }
                 }
             }
@@ -112,7 +114,10 @@ function buildConfig() {
 async function getEntries(config) {
     const vikeConfig = await getVikeConfig(config);
     const { pageConfigs } = vikeConfig;
-    const pageFileEntries = await getPageFileEntries(config, vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer); // TODO/v1-release: remove
+    // TODO/v1-release: remove
+    const pageFileEntries = await getPageFileEntries(config, 
+    // TODO/now: add meta.default
+    vikeConfig.global.config.includeAssetsImportedByServer ?? true);
     assertUsage(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
     if (viteIsSSR(config)) {
         const pageEntries = getPageEntries(pageConfigs);

package/dist/esm/node/plugin/plugins/buildEntry/index.d.ts

@@ -1,8 +1,8 @@
 export { buildEntry };
-export { set_ASSETS_MAP };
+export { set_ASSETS_MANIFEST };
 import type { Plugin, Rollup } from 'vite';
 type Bundle = Rollup.OutputBundle;
 type Options = Rollup.NormalizedOutputOptions;
 declare function buildEntry(): Plugin[];
-/** Set the value of the ASSETS_MAP constant inside dist/server/entry.js (or dist/server/index.js) */
-declare function set_ASSETS_MAP(options: Options, bundle: Bundle): Promise<void>;
+/** Set the value of the ASSETS_MANIFEST constant inside dist/server/entry.js (or dist/server/index.js) */
+declare function set_ASSETS_MANIFEST(options: Options, bundle: Bundle): Promise<void>;

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

@@ -1,79 +1,83 @@
 export { buildEntry };
-export { set_ASSETS_MAP };
+export { set_ASSETS_MANIFEST };
 import { serverProductionEntryPlugin } from '@brillout/vite-plugin-server-entry/plugin';
 import { virtualFileIdImportUserCodeServer } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
-import { getVikeManifest } from './getVikeManifest.js';
-import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
-import { assert, getOutDirs, toPosixPath } from '../../utils.js';
+import { assert, projectInfo, toPosixPath } from '../../utils.js';
 import fs from 'fs/promises';
 import path from 'path';
 import { createRequire } from 'module';
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
-const ASSETS_MAP = '__VITE_ASSETS_MAP__';
+import { isUsingClientRouter } from '../extractExportNamesPlugin.js';
+import { assertBuildInfo, getViteConfigRuntime } from '../../../runtime/globalContext.js';
+import { getOutDirs } from '../../shared/getOutDirs.js';
+const ASSETS_MANIFEST = '__VITE_ASSETS_MANIFEST__';
 function buildEntry() {
     let config;
-    let vikeConfigGlobal;
     return [
         {
             name: 'vike:buildEntry',
             enforce: 'post',
             async configResolved(config_) {
                 config = config_;
-                const vikeConfig = await getVikeConfig(config);
-                vikeConfigGlobal = vikeConfig.vikeConfigGlobal;
             }
         },
         ...serverProductionEntryPlugin({
             getServerProductionEntry: () => {
-                return getServerProductionEntryCode(config, vikeConfigGlobal);
+                return getServerProductionEntryCode(config);
             },
             libraryName: 'Vike'
         })
     ];
 }
-function getServerProductionEntryCode(config, vikeConfigGlobal) {
+function getServerProductionEntryCode(config) {
     const importPath = getImportPath(config);
-    const vikeManifest = getVikeManifest(vikeConfigGlobal, config);
-    // Let's eventually simplify and move everything to a single virtual module
+    const buildInfo = {
+        versionAtBuildTime: projectInfo.projectVersion,
+        usesClientRouter: isUsingClientRouter(), // TODO/v1-release: remove
+        viteConfigRuntime: getViteConfigRuntime(config)
+    };
+    assertBuildInfo(buildInfo);
+    // After the old design is removed, let's maybe simplify and move everything into a single virtual module
     const importerCode = [
         `  import { setGlobalContext_buildEntry } from '${importPath}';`,
-        `  import * as pageFiles from '${virtualFileIdImportUserCodeServer}';`,
+        `  import * as virtualFileExports from '${virtualFileIdImportUserCodeServer}';`,
         `  {`,
-        // We first set the values to a variable because of a Rollup bug, and this workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d
-        `    const assetsManifest = ${ASSETS_MAP};`,
-        `    const pluginManifest = ${JSON.stringify(vikeManifest, null, 2)};`,
+        // Because of a Rollup bug, we have to assign ASSETS_MANIFEST to a variable before passing it to setGlobalContext_buildEntry()
+        // - This workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d
+        `    const assetsManifest = ${ASSETS_MANIFEST};`,
+        `    const buildInfo = ${JSON.stringify(buildInfo, null, 2)};`,
         '    setGlobalContext_buildEntry({',
-        `      pageFiles,`,
+        `      virtualFileExports,`,
         `      assetsManifest,`,
-        `      pluginManifest,`,
+        `      buildInfo,`,
         '    });',
         `  }`,
         ''
     ].join('\n');
     return importerCode;
 }
-/** Set the value of the ASSETS_MAP constant inside dist/server/entry.js (or dist/server/index.js) */
-async function set_ASSETS_MAP(options, bundle) {
+/** Set the value of the ASSETS_MANIFEST constant inside dist/server/entry.js (or dist/server/index.js) */
+async function set_ASSETS_MANIFEST(options, bundle) {
     const { dir } = options;
     assert(dir);
-    const chunkPath = find_ASSETS_MAP(bundle);
+    const chunkPath = find_ASSETS_MANIFEST(bundle);
     const chunkFilePath = path.join(dir, chunkPath);
     const assetsJsonFilePath = path.join(dir, '..', 'assets.json');
     const [assetsJsonString, chunkFileContent] = await Promise.all([
         await fs.readFile(assetsJsonFilePath, 'utf8'),
         await fs.readFile(chunkFilePath, 'utf8')
     ]);
-    const serverEntryFileContentPatched = chunkFileContent.replace(ASSETS_MAP, assetsJsonString);
+    const serverEntryFileContentPatched = chunkFileContent.replace(ASSETS_MANIFEST, assetsJsonString);
     assert(serverEntryFileContentPatched !== chunkFileContent);
     await fs.writeFile(chunkFilePath, serverEntryFileContentPatched);
 }
-function find_ASSETS_MAP(bundle) {
+function find_ASSETS_MANIFEST(bundle) {
     let chunkPath;
     for (const filePath in bundle) {
         const chunk = bundle[filePath];
-        if ('code' in chunk && chunk.code.includes(ASSETS_MAP)) {
+        if ('code' in chunk && chunk.code.includes(ASSETS_MANIFEST)) {
             assert(!chunkPath);
             chunkPath = filePath;
         }

package/dist/esm/node/plugin/plugins/commonConfig.d.ts

@@ -1,12 +1,18 @@
 export { commonConfig };
-import { type Plugin } from 'vite';
+import { type InlineConfig, type Plugin } from 'vite';
 import { type VikeConfigObject } from './importUserCode/v1-design/getVikeConfig.js';
+import type { PrerenderContextPublic } from '../../prerender/runPrerender.js';
 declare module 'vite' {
     interface UserConfig {
         _isDev?: boolean;
         _vikeVitePluginOptions?: unknown;
         _root?: string;
-        vike?: VikeConfigObject;
+        _baseViteOriginal?: string;
+        _viteConfigEnhanced?: InlineConfig;
+        vike?: {
+            config: VikeConfigObject['global']['config'];
+            prerenderContext?: PrerenderContextPublic;
+        };
     }
 }
 declare function commonConfig(vikeVitePluginOptions: unknown): Plugin[];

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

@@ -11,7 +11,7 @@ import { isViteCliCall } from '../shared/isViteCliCall.js';
 import { isVikeCliOrApi } from '../../api/context.js';
 import { getVikeConfig2 } from './importUserCode/v1-design/getVikeConfig.js';
 import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/prepareViteApiCall.js';
-import { temp_disablePrerenderAutoRun } from '../../prerender/isPrerenderAutoRunEnabled.js';
+import { isPrerenderEnabled, temp_disablePrerenderAutoRun } from '../../prerender/context.js';
 const pluginName = 'vike:commonConfig';
 function commonConfig(vikeVitePluginOptions) {
     return [
@@ -30,9 +30,11 @@ function commonConfig(vikeVitePluginOptions) {
                         _isDev: isDev,
                         _root: root,
                         _vikeVitePluginOptions: vikeVitePluginOptions,
-                        vike: vikeConfig,
-                        // TODO/v1-release: remove
-                        configVikePromise: Promise.resolve(vikeConfig.vikeConfigGlobal)
+                        vike: { config: vikeConfig.global.config },
+                        // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
+                        configVikePromise: Promise.resolve({
+                            prerender: isPrerenderEnabled(vikeConfig)
+                        })
                     };
                 }
             }
@@ -142,7 +144,7 @@ function assertVikeCliOrApi(config) {
         onlyOnce: true
     });
 }
-// TODO/v1-release: remove
+// TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
 function temp_supportOldInterface(config) {
     if (!('vitePluginSsr' in config))
         return;

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

@@ -6,7 +6,7 @@
 //  - This appraoch supports import path aliases `vite.config.js#resolve.alias` https://vitejs.dev/config/#resolve-alias
 export { extractAssetsPlugin };
 export { extractAssetsRE };
-import { viteIsSSR_options, assert, assertPosixPath, styleFileRE, createDebugger, isScriptFile, assertUsage } from '../utils.js';
+import { assert, assertPosixPath, styleFileRE, createDebugger, isScriptFile, assertUsage } from '../utils.js';
 import { resolveVirtualFileId, isVirtualFileId, getVirtualFileId } from '../../shared/virtual-files.js';
 import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
 import { isAsset } from '../shared/isAsset.js';
@@ -17,6 +17,7 @@ import { fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
 import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { assertV1Design } from '../../shared/assertV1Design.js';
 import { normalizeId } from '../shared/normalizeId.js';
+import { viteIsSSR_options } from '../shared/viteIsSSR.js';
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
@@ -43,7 +44,8 @@ function extractAssetsPlugin() {
                     assertV1Design(vikeConfig.pageConfigs, true);
                     assert(false);
                 }
-                assert(vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer);
+                // TODO/now: add meta.default
+                assert(vikeConfig.global.config.includeAssetsImportedByServer ?? true);
                 assert(!viteIsSSR_options(options));
                 const importStatements = await getImportStatements(src);
                 const moduleNames = getImportedModules(importStatements);
@@ -76,7 +78,8 @@ function extractAssetsPlugin() {
                 if (!extractAssetsRE.test(importer)) {
                     return;
                 }
-                assert(vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer);
+                // TODO/now: add meta.default
+                assert(vikeConfig.global.config.includeAssetsImportedByServer ?? true);
                 let resolution = null;
                 try {
                     resolution = await this.resolve(source, importer, { skipSelf: true, ...options });

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

@@ -1,10 +1,11 @@
 export { extractExportNamesPlugin };
 export { isUsingClientRouter };
 export { extractExportNamesRE };
-import { assert, getFileExtension, viteIsSSR_options, createDebugger, getGlobalObject, assertUsage } from '../utils.js';
+import { assert, getFileExtension, createDebugger, getGlobalObject, assertUsage } from '../utils.js';
 import { getExportNames } from '../shared/parseEsModule.js';
 import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 import { normalizeId } from '../shared/normalizeId.js';
+import { viteIsSSR_options } from '../shared/viteIsSSR.js';
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 const debug = createDebugger('vike:extractExportNames');
 const globalObject = getGlobalObject('extractExportNamesPlugin.ts', {});

package/dist/esm/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.d.ts

@@ -1,6 +1,6 @@
 export { getVirtualFileImportUserCode };
 import type { ResolvedConfig } from 'vite';
-import type { VikeConfigGlobal } from './v1-design/getVikeConfig.js';
+import type { VikeConfigObject } from './v1-design/getVikeConfig.js';
 declare function getVirtualFileImportUserCode(id: string, options: {
     ssr?: boolean;
-} | undefined, vikeConfigGlobal: VikeConfigGlobal, config: ResolvedConfig, isDev: boolean): Promise<string>;
+} | undefined, vikeConfig: VikeConfigObject, config: ResolvedConfig, isDev: boolean): Promise<string>;