vike 0.4.230 → 0.4.231-commit-a0ca5e4

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

@@ -8,14 +8,13 @@ import fs_sync from 'fs';
 import path from 'path';
 import { existsSync } from 'fs';
 import { assert, assertIsSingleModuleInstance, assertWarning, isEqualStringList, isObject, pLimit, unique } from '../../utils.js';
-import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
+import { isVirtualFileIdPageConfigLazy } from '../../../shared/virtualFiles/virtualFilePageConfigLazy.js';
 import { manifestTempFile } from './pluginBuildConfig.js';
 import { getAssetsDir } from '../../shared/getAssetsDir.js';
 import pc from '@brillout/picocolors';
-import { isV1Design } from '../importUserCode/v1-design/getVikeConfig.js';
+import { getVikeConfigInternal, isV1Design } from '../../shared/resolveVikeConfigInternal.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
 import { isViteServerBuild_onlySsrEnv, isViteServerBuild } from '../../shared/isViteServerBuild.js';
-import { getVikeConfigInternal } from '../commonConfig.js';
 import { set_macro_ASSETS_MANIFEST } from './pluginBuildEntry.js';
 assertIsSingleModuleInstance('build/handleAssetsManifest.ts');
 let assetsJsonFilePath;
@@ -23,7 +22,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 isV1Design(config);
+    return isV1Design();
 }
 /** https://github.com/vikejs/vike/issues/1339 */
 async function fixServerAssets(config) {
@@ -167,12 +166,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 = isVirtualFileIdPageConfigValuesAll(key);
+    const result = isVirtualFileIdPageConfigLazy(key);
     return result && result.pageId;
 }
 function collectResources(entryRoot, manifest) {
@@ -280,8 +279,8 @@ async function writeManifestFile(manifest, manifestFilePath) {
     const manifestFileContent = JSON.stringify(manifest, null, 2);
     await fs.writeFile(manifestFilePath, manifestFileContent, 'utf-8');
 }
-function handleAssetsManifest_getBuildConfig(config) {
-    const vike = getVikeConfigInternal(config);
+async function handleAssetsManifest_getBuildConfig(config) {
+    const vikeConfig = await getVikeConfigInternal();
     const isFixEnabled = handleAssetsManifest_isFixEnabled(config);
     return {
         // https://github.com/vikejs/vike/issues/1339
@@ -289,7 +288,7 @@ function handleAssetsManifest_getBuildConfig(config) {
         // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
         cssMinify: isFixEnabled ? 'esbuild' : undefined,
         manifest: manifestTempFile,
-        copyPublicDir: vike.config.vite6BuilderApp
+        copyPublicDir: vikeConfig.config.vite6BuilderApp
             ? // Already set by vike:build:pluginBuildApp
                 undefined
             : !isViteServerBuild(config)

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

@@ -3,12 +3,12 @@ export { isPrerenderForceExit };
 import { build } from 'vite';
 import { assert, assertIsSingleModuleInstance, assertWarning, onSetupBuild } from '../../utils.js';
 import { runPrerenderFromAutoRun, runPrerender_forceExit } from '../../../prerender/runPrerender.js';
-import { isPrerenderAutoRunEnabled } from '../../../prerender/context.js';
+import { isPrerenderAutoRunEnabled, isPrerendering } 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 './pluginBuildConfig.js';
-import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
+import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 import { isVikeCliOrApi } from '../../../api/context.js';
 import { handleAssetsManifest, handleAssetsManifest_assertUsageCssTarget } from './handleAssetsManifest.js';
 import { isViteClientBuild, isViteServerBuild_onlySsrEnv } from '../../shared/isViteServerBuild.js';
@@ -16,16 +16,14 @@ 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 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.
@@ -34,7 +32,7 @@ function pluginAutoFullBuild() {
                 */
                 async handler(options, bundle) {
                     await handleAssetsManifest(config, this.environment, options, bundle);
-                    await triggerFullBuild(config, vikeConfig, this.environment, bundle);
+                    await triggerFullBuild(config, this.environment, bundle);
                 }
             }
         },
@@ -45,12 +43,13 @@ function pluginAutoFullBuild() {
             closeBundle: {
                 sequential: true,
                 order: 'post',
-                handler() {
+                async handler() {
                     onSetupBuild();
                     handleAssetsManifest_assertUsageCssTarget(config);
+                    const vikeConfig = await getVikeConfigInternal();
                     if (forceExit &&
                         // Let vike:build:pluginBuildApp force exit
-                        !vikeConfig.global.config.vite6BuilderApp) {
+                        !vikeConfig.config.vite6BuilderApp) {
                         runPrerender_forceExit();
                         assert(false);
                     }
@@ -59,9 +58,10 @@ function pluginAutoFullBuild() {
         }
     ];
 }
-async function triggerFullBuild(config, vikeConfig, viteEnv, bundle) {
+async function triggerFullBuild(config, viteEnv, bundle) {
+    const vikeConfig = await 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 ? !isViteServerBuild_onlySsrEnv(config, viteEnv) : !isViteClientBuild(config, viteEnv))
@@ -90,6 +90,7 @@ async function triggerFullBuild(config, vikeConfig, viteEnv, bundle) {
         // The server bulid is already called by builder.buildApp()
     }
     if (isPrerenderAutoRunEnabled(vikeConfig)) {
+        assert(isPrerendering());
         const res = await runPrerenderFromAutoRun(configInline);
         forceExit = res.forceExit;
     }
@@ -103,14 +104,15 @@ function setSSR(configInline) {
         }
     };
 }
-function abortViteBuildSsr(vikeConfig) {
-    if (vikeConfig.global.config.disableAutoFullBuild !== true && isViteCliCall() && getViteConfigFromCli()?.build.ssr) {
+async function abortViteBuildSsr() {
+    const vikeConfig = await getVikeConfigInternal();
+    if (vikeConfig.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 isEntirelyDisabled(vikeConfig) {
-    const { disableAutoFullBuild } = vikeConfig.global.config;
+    const { disableAutoFullBuild } = vikeConfig.config;
     if (disableAutoFullBuild === undefined || disableAutoFullBuild === 'prerender') {
         const isUserUsingViteApi = !isViteCliCall() && !isVikeCliOrApi();
         return isUserUsingViteApi;

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

@@ -2,16 +2,16 @@ export { pluginBuildApp };
 import { runPrerender_forceExit } from '../../../prerender/runPrerender.js';
 import { resolveOutDir } from '../../shared/getOutDirs.js';
 import { assert } from '../../utils.js';
-import { getVikeConfigInternal } from '../commonConfig.js';
 import { isPrerenderForceExit } from './pluginAutoFullBuild.js';
+import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 function pluginBuildApp() {
     return [
         {
             name: 'vike:build:pluginBuildApp',
             apply: 'build',
-            config(config) {
-                const vike = getVikeConfigInternal(config);
-                if (!vike.config.vite6BuilderApp)
+            async config(config) {
+                const vikeConfig = await getVikeConfigInternal();
+                if (!vikeConfig.config.vite6BuilderApp)
                     return;
                 return {
                     builder: {

package/dist/esm/node/{plugin/plugins/build → vite/plugins/pluginBuild}/pluginBuildConfig.d.ts

@@ -3,7 +3,7 @@ export { assertRollupInput };
 export { analyzeClientEntries };
 export { manifestTempFile };
 import type { ResolvedConfig, Plugin } from 'vite';
-import type { PageConfigBuildTime } from '../../../../shared/page-configs/PageConfig.js';
+import type { PageConfigBuildTime } from '../../../../types/PageConfig.js';
 declare const manifestTempFile = "_temp_manifest.json";
 declare function pluginBuildConfig(): Plugin[];
 declare function analyzeClientEntries(pageConfigs: PageConfigBuildTime[], config: ResolvedConfig): {

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

@@ -3,9 +3,9 @@ export { assertRollupInput };
 export { analyzeClientEntries };
 export { manifestTempFile };
 import { assert, addOnBeforeLogHook, removeFileExtention, unique, assertUsage, injectRollupInputs, normalizeRollupInput, onSetupBuild, assertIsImportPathNpmPackage, requireResolveVikeDistFile } from '../../utils.js';
-import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
+import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
 import { findPageFiles } from '../../shared/findPageFiles.js';
-import { getVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
+import { getVirtualFileIdPageConfigLazy } from '../../../shared/virtualFiles/virtualFilePageConfigLazy.js';
 import { extractAssetsAddQuery } from '../../../shared/extractAssetsQuery.js';
 import { prependEntriesDir } from '../../../shared/prependEntriesDir.js';
 import { getFilePathResolved } from '../../shared/getFilePath.js';
@@ -13,6 +13,7 @@ import { getConfigValueBuildTime } from '../../../../shared/page-configs/getConf
 import { isViteServerBuild } from '../../shared/isViteServerBuild.js';
 import { resolveOutDir } from '../../shared/getOutDirs.js';
 import { handleAssetsManifest_assertUsageCssCodeSplit, handleAssetsManifest_getBuildConfig } from './handleAssetsManifest.js';
+import { resolveIncludeAssetsImportedByServer } from '../../../runtime/renderPage/getPageAssets.js';
 const manifestTempFile = '_temp_manifest.json';
 function pluginBuildConfig() {
     let config;
@@ -36,12 +37,12 @@ function pluginBuildConfig() {
             },
             config: {
                 order: 'post',
-                handler(config) {
+                async handler(config) {
                     onSetupBuild();
                     return {
                         build: {
                             outDir: resolveOutDir(config),
-                            ...handleAssetsManifest_getBuildConfig(config)
+                            ...(await handleAssetsManifest_getBuildConfig(config))
                         }
                     };
                 }
@@ -53,12 +54,10 @@ function pluginBuildConfig() {
     ];
 }
 async function getEntries(config) {
-    const vikeConfig = await getVikeConfig(config);
-    const { pageConfigs } = vikeConfig;
+    const vikeConfig = await 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, resolveIncludeAssetsImportedByServer(vikeConfig.config));
     assertUsage(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
     if (isViteServerBuild(config)) {
         const pageEntries = getPageEntries(pageConfigs);
@@ -79,8 +78,8 @@ async function getEntries(config) {
             ...clientEntries,
             ...pageFileEntries
         };
-        const clientRoutingEntry = requireResolveVikeDistFile('dist/esm/client/client-routing-runtime/entry.js');
-        const serverRoutingEntry = requireResolveVikeDistFile('dist/esm/client/server-routing-runtime/entry.js');
+        const clientRoutingEntry = requireResolveVikeDistFile('dist/esm/client/runtime-client-routing/entry.js');
+        const serverRoutingEntry = requireResolveVikeDistFile('dist/esm/client/runtime-server-routing/entry.js');
         if (hasClientRouting) {
             entries['entries/entry-client-routing'] = clientRoutingEntry;
         }
@@ -177,7 +176,7 @@ function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
 }
 function getEntryFromPageConfig(pageConfig, isForClientSide) {
     let { pageId } = pageConfig;
-    const entryTarget = getVirtualFileIdPageConfigValuesAll(pageId, isForClientSide);
+    const entryTarget = getVirtualFileIdPageConfigLazy(pageId, isForClientSide);
     let entryName = pageId;
     // Avoid:
     // ```

package/dist/esm/node/{plugin/plugins/build → vite/plugins/pluginBuild}/pluginBuildEntry.js

@@ -1,11 +1,11 @@
 export { pluginBuildEntry };
 export { set_macro_ASSETS_MANIFEST };
 import { serverProductionEntryPlugin } from '@brillout/vite-plugin-server-entry/plugin';
-import { virtualFileIdImportUserCodeServer } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
+import { virtualFileIdEntryServer } from '../../../shared/virtualFiles/virtualFileEntry.js';
 import { assert, PROJECT_VERSION, requireResolveVikeDistFile } from '../../utils.js';
 import fs from 'fs/promises';
 import path from 'path';
-import { isUsingClientRouter } from '../extractExportNamesPlugin.js';
+import { isUsingClientRouter } from '../pluginExtractExportNames.js';
 import { assertBuildInfo } from '../../../runtime/globalContext.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
 import { getViteConfigRuntime } from '../../shared/getViteConfigRuntime.js';
@@ -40,7 +40,7 @@ function getServerProductionEntryCode(config) {
     // 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 virtualFileExports from '${virtualFileIdImportUserCodeServer}';`,
+        `  import * as virtualFileExports from '${virtualFileIdEntryServer}';`,
         `  {`,
         // 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

package/dist/esm/node/{plugin/plugins/build → vite/plugins/pluginBuild}/pluginDistFileNames.js

@@ -47,6 +47,7 @@ function pluginDistFileNames() {
                             }
                         }
                         // Disable CSS bundling to workaround https://github.com/vikejs/vike/issues/1815
+                        // TO-DO/eventually: let's bundle CSS again once Rolldown replaces Rollup
                         if (id.endsWith('.css')) {
                             const userRootDir = config.root;
                             if (id.startsWith(userRootDir)) {

package/dist/esm/node/{plugin/plugins/build → vite/plugins/pluginBuild}/pluginModuleBanner.js

@@ -1,13 +1,13 @@
 export { pluginModuleBanner };
 import MagicString from 'magic-string';
-import { removeVirtualIdTag } from '../../../shared/virtual-files.js';
+import { removeVirtualIdTag } from '../../../shared/virtualFiles.js';
 import { isViteServerBuild_safe } from '../../shared/isViteServerBuild.js';
 // Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
 // But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
 function pluginModuleBanner() {
     let config;
     return {
-        name: 'vike:pluginModuleBanner',
+        name: 'vike:build:pluginModuleBanner',
         enforce: 'post',
         apply: 'build',
         configResolved(config_) {

package/dist/esm/node/vite/plugins/pluginBuild.d.ts

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

package/dist/esm/node/vite/plugins/pluginBuild.js

@@ -0,0 +1,21 @@
+export { pluginBuild };
+import { pluginBuildApp } from './pluginBuild/pluginBuildApp.js';
+import { pluginDistPackageJsonFile } from './pluginBuild/pluginDistPackageJsonFile.js';
+import { pluginSuppressRollupWarning } from './pluginBuild/pluginSuppressRollupWarning.js';
+import { pluginDistFileNames } from './pluginBuild/pluginDistFileNames.js';
+import { pluginAutoFullBuild } from './pluginBuild/pluginAutoFullBuild.js';
+import { pluginBuildEntry } from './pluginBuild/pluginBuildEntry.js';
+import { pluginBuildConfig } from './pluginBuild/pluginBuildConfig.js';
+import { pluginModuleBanner } from './pluginBuild/pluginModuleBanner.js';
+function pluginBuild() {
+    return [
+        ...pluginBuildConfig(),
+        ...pluginBuildApp(),
+        ...pluginAutoFullBuild(),
+        ...pluginBuildEntry(),
+        pluginDistPackageJsonFile(),
+        pluginSuppressRollupWarning(),
+        pluginDistFileNames(),
+        pluginModuleBanner()
+    ];
+}

package/dist/esm/node/vite/plugins/pluginCommon.d.ts

@@ -0,0 +1,13 @@
+export { pluginCommon };
+import { type InlineConfig, type Plugin } from 'vite';
+import type { VitePluginServerEntryOptions } from '@brillout/vite-plugin-server-entry/plugin';
+declare module 'vite' {
+    interface UserConfig {
+        vitePluginServerEntry?: VitePluginServerEntryOptions;
+        _isDev?: boolean;
+        _rootResolvedEarly?: string;
+        _baseViteOriginal?: string;
+        _viteConfigFromUserEnhanced?: InlineConfig;
+    }
+}
+declare function pluginCommon(vikeVitePluginOptions: unknown): Plugin[];

package/dist/esm/node/{plugin/plugins/commonConfig.js → vite/plugins/pluginCommon.js}

@@ -1,22 +1,17 @@
-export { commonConfig };
-export { getVikeConfigPublic };
-export { getVikeConfigInternal };
+export { pluginCommon };
 import { assert, assertUsage, assertWarning, findPackageJson, hasProp, isDevCheck, isDocker, isObject, isVitest } from '../utils.js';
-import { assertRollupInput } from './build/pluginBuildConfig.js';
+import { assertRollupInput } from './pluginBuild/pluginBuildConfig.js';
 import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
 import pc from '@brillout/picocolors';
 import path from 'path';
-import { assertResolveAlias } from './commonConfig/assertResolveAlias.js';
+import { assertResolveAlias } from './pluginCommon/assertResolveAlias.js';
 import { isViteCliCall } from '../shared/isViteCliCall.js';
 import { isVikeCliOrApi } from '../../api/context.js';
-import { getVikeConfig2 } from './importUserCode/v1-design/getVikeConfig.js';
+import { getVikeConfigInternal, setVikeConfigContext } from '../shared/resolveVikeConfigInternal.js';
 import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/prepareViteApiCall.js';
 import { temp_disablePrerenderAutoRun } from '../../prerender/context.js';
-import { resolvePrerenderConfigGlobal } from '../../prerender/resolvePrerenderConfig.js';
-const pluginName = 'vike:commonConfig';
-function commonConfig(vikeVitePluginOptions) {
-    // We cache it => makes sure we only generate one object => we can mutate it at runPrerender()
-    let prerenderContext;
+const pluginName = 'vike:pluginCommon';
+function pluginCommon(vikeVitePluginOptions) {
     return [
         {
             name: `${pluginName}:pre`,
@@ -26,31 +21,19 @@ function commonConfig(vikeVitePluginOptions) {
                 async handler(configFromUser, env) {
                     const isDev = isDevCheck(env);
                     const operation = env.command === 'build' ? 'build' : env.isPreview ? 'preview' : 'dev';
-                    const root = configFromUser.root ? normalizeViteRoot(configFromUser.root) : await getViteRoot(operation);
-                    assert(root);
-                    const vikeConfig = await getVikeConfig2(root, isDev, vikeVitePluginOptions);
-                    const { isPrerenderingEnabled, isPrerenderingEnabledForAllPages } = resolvePrerenderConfigGlobal(vikeConfig);
-                    prerenderContext ?? (prerenderContext = {
-                        isPrerenderingEnabled,
-                        isPrerenderingEnabledForAllPages,
-                        output: null,
-                        pageContexts: null
-                    });
-                    assert(prerenderContext.isPrerenderingEnabled === isPrerenderingEnabled);
-                    assert(prerenderContext.isPrerenderingEnabledForAllPages === isPrerenderingEnabledForAllPages);
+                    const rootResolvedEarly = configFromUser.root
+                        ? normalizeViteRoot(configFromUser.root)
+                        : await getViteRoot(operation);
+                    assert(rootResolvedEarly);
+                    // TODO/v1-release: we can remove setVikeConfigContext() call here since with Vike's CLI it's already called at vike/node/api/prepareViteApiCall.ts
+                    setVikeConfigContext({ userRootDir: rootResolvedEarly, isDev, vikeVitePluginOptions });
+                    const vikeConfig = await getVikeConfigInternal();
                     return {
                         _isDev: isDev,
-                        _root: root,
-                        _vikeVitePluginOptions: vikeVitePluginOptions,
-                        _vikeConfigObject: vikeConfig,
-                        _vike: {
-                            pages: vikeConfig.pages,
-                            config: vikeConfig.global.config,
-                            prerenderContext
-                        },
+                        _rootResolvedEarly: rootResolvedEarly,
                         // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
                         configVikePromise: Promise.resolve({
-                            prerender: isPrerenderingEnabled
+                            prerender: vikeConfig.prerenderContext.isPrerenderingEnabled
                         })
                     };
                 }
@@ -59,7 +42,7 @@ function commonConfig(vikeVitePluginOptions) {
         {
             name: pluginName,
             configResolved(config) {
-                assertViteRoot(config._root, config);
+                assertViteRoot(config._rootResolvedEarly, config);
                 assertSingleInstance(config);
                 installRequireShim_setUserRootDir(config.root);
             }
@@ -69,7 +52,7 @@ function commonConfig(vikeVitePluginOptions) {
             enforce: 'post',
             configResolved: {
                 order: 'post',
-                handler(config) {
+                async handler(config) {
                     /* TODO: do this after implementing vike.config.js and new setting transformLinkedDependencies (or probably a better name like transpileLinkedDependencies/bundleLinkedDependencies or something else)
                     overrideViteDefaultSsrExternal(config)
                     //*/
@@ -79,25 +62,25 @@ function commonConfig(vikeVitePluginOptions) {
                     assertEsm(config.root);
                     assertVikeCliOrApi(config);
                     temp_supportOldInterface(config);
-                    emitServerEntryOnlyIfNeeded(config);
+                    await emitServerEntryOnlyIfNeeded(config);
                 }
             },
             config: {
                 order: 'post',
-                handler(configFromUser) {
+                async handler(configFromUser) {
                     let configFromVike = { server: {}, preview: {} };
-                    const vike = getVikeConfigInternal(configFromUser);
-                    if (vike.config.port !== undefined) {
+                    const vikeConfig = await getVikeConfigInternal();
+                    if (vikeConfig.config.port !== undefined) {
                         // https://vike.dev/port
-                        setDefault('port', vike.config.port, configFromUser, configFromVike);
+                        setDefault('port', vikeConfig.config.port, configFromUser, configFromVike);
                     }
                     else {
                         // Change Vite's default port
                         setDefault('port', 3000, configFromUser, configFromVike);
                     }
-                    if (vike.config.host) {
+                    if (vikeConfig.config.host) {
                         // https://vike.dev/host
-                        setDefault('host', vike.config.host, configFromUser, configFromVike);
+                        setDefault('host', vikeConfig.config.host, configFromUser, configFromVike);
                     }
                     else if (isDocker()) {
                         // Set `--host` for Docker/Podman
@@ -195,30 +178,10 @@ function temp_supportOldInterface(config) {
     }
     assert(false);
 }
-// TODO/soon rename:
-// - `getVikeConfig()` => `resolveVikeConfig()` ?
-// - `getVikeConfigInternal()` => `getVikeConfig()`
-// - `VikeConfigPublic` => `VikeConfig` ?
-// - `VikeConfigObject` => `VikeConfigInternal` ?
-/**
- * Get all the information Vike knows about the app in your Vite plugin.
- *
- * https://vike.dev/getVikeConfig
- */
-function getVikeConfigInternal(config) {
-    const vikeConfig = config._vike;
-    assert(vikeConfig);
-    return vikeConfig;
-}
-function getVikeConfigPublic(config) {
-    const vikeConfig = config._vike;
-    assertUsage(vikeConfig, "getVikeConfig() can only be used when Vite is running with Vike's Vite plugin");
-    return vikeConfig;
-}
 // Only emit dist/server/entry.mjs if necessary
-function emitServerEntryOnlyIfNeeded(config) {
-    if (config.vitePluginServerEntry?.inject &&
-        !resolvePrerenderConfigGlobal(config._vikeConfigObject).isPrerenderingEnabled) {
+async function emitServerEntryOnlyIfNeeded(config) {
+    const vikeConfig = await getVikeConfigInternal();
+    if (config.vitePluginServerEntry?.inject && !vikeConfig.prerenderContext.isPrerenderingEnabled) {
         config.vitePluginServerEntry.disableServerEntryEmit = true;
     }
 }

package/dist/esm/node/{plugin/plugins/devConfig → vite/plugins/pluginDev}/determineOptimizeDeps.js

@@ -1,13 +1,14 @@
 export { determineOptimizeDeps };
 import { findPageFiles } from '../../shared/findPageFiles.js';
 import { assert, assertIsImportPathNpmPackage, createDebugger, getNpmPackageName, isArray, unique } from '../../utils.js';
-import { getVikeConfig, isOverriden } from '../importUserCode/v1-design/getVikeConfig.js';
-import { analyzeClientEntries } from '../build/pluginBuildConfig.js';
-import { virtualFileIdImportUserCodeClientCR, virtualFileIdImportUserCodeClientSR } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
+import { getVikeConfigInternal, isOverriden } from '../../shared/resolveVikeConfigInternal.js';
+import { analyzeClientEntries } from '../pluginBuild/pluginBuildConfig.js';
+import { virtualFileIdEntryClientCR, virtualFileIdEntryClientSR } from '../../../shared/virtualFiles/virtualFileEntry.js';
 import { getFilePathResolved } from '../../shared/getFilePath.js';
 const debug = createDebugger('vike:optimizeDeps');
 async function determineOptimizeDeps(config) {
-    const { pageConfigs } = await getVikeConfig(config);
+    const vikeConfig = await getVikeConfigInternal();
+    const { _pageConfigs: pageConfigs } = vikeConfig;
     const { entries, include } = await getPageDeps(config, pageConfigs);
     {
         // This actually doesn't work: Vite's dep optimizer doesn't seem to be able to crawl virtual files.
@@ -90,9 +91,9 @@ function getVirtualFiles(config, pageConfigs) {
     const { hasClientRouting, hasServerRouting, clientEntries } = analyzeClientEntries(pageConfigs, config);
     const entriesVirtualFiles = Object.values(clientEntries);
     if (hasClientRouting)
-        entriesVirtualFiles.push(virtualFileIdImportUserCodeClientCR);
+        entriesVirtualFiles.push(virtualFileIdEntryClientCR);
     if (hasServerRouting)
-        entriesVirtualFiles.push(virtualFileIdImportUserCodeClientSR);
+        entriesVirtualFiles.push(virtualFileIdEntryClientSR);
     return entriesVirtualFiles;
 }
 function normalizeEntries(entries) {

package/dist/esm/node/{plugin/plugins/devConfig/index.d.ts → vite/plugins/pluginDev.d.ts}

@@ -1,5 +1,5 @@
-export { devConfig };
+export { pluginDev };
 export { logDockerHint };
 import type { Plugin, ResolvedConfig } from 'vite';
-declare function devConfig(): Plugin[];
+declare function pluginDev(): Plugin[];
 declare function logDockerHint(configHost: ResolvedConfig['server']['host']): void;

package/dist/esm/node/{plugin/plugins/devConfig/index.js → vite/plugins/pluginDev.js}

@@ -1,21 +1,21 @@
-export { devConfig };
+export { pluginDev };
 export { logDockerHint };
-import { determineOptimizeDeps } from './determineOptimizeDeps.js';
-import { determineFsAllowList } from './determineFsAllowList.js';
-import { addSsrMiddleware } from '../../shared/addSsrMiddleware.js';
-import { applyDev, assertWarning, isDocker } from '../../utils.js';
-import { improveViteLogs } from '../../shared/loggerVite.js';
-import { isErrorDebug } from '../../../shared/isErrorDebug.js';
-import { installHttpRequestAsyncStore } from '../../shared/getHttpRequestAsyncStore.js';
+import { determineOptimizeDeps } from './pluginDev/determineOptimizeDeps.js';
+import { determineFsAllowList } from './pluginDev/determineFsAllowList.js';
+import { addSsrMiddleware } from '../shared/addSsrMiddleware.js';
+import { applyDev, assertWarning, isDocker } from '../utils.js';
+import { improveViteLogs } from '../shared/loggerVite.js';
+import { isErrorDebug } from '../../shared/isErrorDebug.js';
+import { installHttpRequestAsyncStore } from '../shared/getHttpRequestAsyncStore.js';
 import pc from '@brillout/picocolors';
 if (isErrorDebug()) {
     Error.stackTraceLimit = Infinity;
 }
-function devConfig() {
+function pluginDev() {
     let config;
     return [
         {
-            name: 'vike:devConfig',
+            name: 'vike:pluginDev',
             apply: applyDev,
             config() {
                 return {
@@ -68,7 +68,7 @@ function devConfig() {
             }
         },
         {
-            name: 'vike:devConfig:addSsrMiddleware',
+            name: 'vike:pluginDev:addSsrMiddleware',
             apply: applyDev,
             // The SSR middleware should be last middleware
             enforce: 'post',

package/dist/esm/node/vite/plugins/pluginEnvVars.d.ts

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

package/dist/esm/node/{plugin/plugins/envVars.js → vite/plugins/pluginEnvVars.js}

@@ -1,4 +1,4 @@
-export { envVarsPlugin };
+export { pluginEnvVars };
 import MagicString from 'magic-string';
 import { loadEnv } from 'vite';
 import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, isArray, isNotNullish, lowerFirst } from '../utils.js';
@@ -15,11 +15,11 @@ const PUBLIC_ENV_ALLOWLIST = [
     // https://github.com/vikejs/vike/issues/1724
     'STORYBOOK'
 ];
-function envVarsPlugin() {
+function pluginEnvVars() {
     let envsAll;
     let config;
     return {
-        name: 'vike:envVars',
+        name: 'vike:pluginEnvVars',
         enforce: 'post',
         configResolved(config_) {
             config = config_;

package/dist/esm/node/{plugin/plugins/extractAssetsPlugin.d.ts → vite/plugins/pluginExtractAssets.d.ts}

@@ -1,5 +1,5 @@
-export { extractAssetsPlugin };
+export { pluginExtractAssets };
 export { extractAssetsRE };
 import type { Plugin } from 'vite';
 declare const extractAssetsRE: RegExp;
-declare function extractAssetsPlugin(): Plugin[];
+declare function pluginExtractAssets(): Plugin[];