vike 0.4.215 → 0.4.217

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

@@ -1,8 +1,13 @@
 export { dev };
-import { prepareApiCall } from './prepareApiCall.js';
+import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { createServer } from 'vite';
+/**
+ * Programmatically trigger `$ vike dev`
+ *
+ * https://vike.dev/api#dev
+ */
 async function dev(options = {}) {
-    const { viteConfigEnhanced } = await prepareApiCall(options.viteConfig, 'dev');
+    const { viteConfigEnhanced } = await prepareViteApiCall(options.viteConfig, 'dev');
     const server = await createServer(viteConfigEnhanced);
     return {
         viteServer: server,

package/dist/esm/node/api/prepareViteApiCall.d.ts

@@ -0,0 +1,7 @@
+export { prepareViteApiCall };
+import type { InlineConfig } from 'vite';
+import type { Operation } from './types.js';
+declare function prepareViteApiCall(viteConfig: InlineConfig | undefined, operation: Operation): Promise<{
+    viteConfigEnhanced: InlineConfig;
+    vikeConfigGlobal: import("../plugin/plugins/importUserCode/v1-design/getVikeConfig/resolveVikeConfigGlobal.js").VikeConfigGlobal;
+}>;

package/dist/esm/node/api/{prepareApiCall.js → prepareViteApiCall.js}

@@ -1,9 +1,9 @@
-export { prepareApiCall };
+export { prepareViteApiCall };
 import { resolveConfig } from 'vite';
-import { getConfigVike } from '../shared/getConfigVike.js';
 import { pluginName } from '../plugin/plugins/commonConfig/pluginName.js';
 import { setOperation } from './context.js';
-async function prepareApiCall(viteConfig = {}, operation) {
+import { getVikeConfig2 } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
+async function prepareViteApiCall(viteConfig = {}, operation) {
     setOperation(operation);
     return enhanceViteConfig(viteConfig, operation);
 }
@@ -20,13 +20,23 @@ async function enhanceViteConfig(viteConfig = {}, operation) {
         };
         viteConfigResolved = await resolveViteConfig(viteConfigEnhanced, operation);
     }
-    const configVike = await getConfigVike(viteConfigResolved);
+    // TODO: use loadConfigFromFile() instead of viteConfigResolved
+    const { vikeConfigGlobal } = await getVikeConfig2(viteConfigResolved.root, operation === 'dev', viteConfigResolved._vikeVitePluginOptions);
     // TODO: enable Vike extensions to add Vite plugins
     return {
         viteConfigEnhanced,
-        configVike
+        vikeConfigGlobal
     };
 }
 async function resolveViteConfig(viteConfig, operation) {
-    return await resolveConfig(viteConfig, operation === 'build' || operation === 'prerender' ? 'build' : 'serve', 'custom', operation === 'dev' ? 'development' : 'production', operation === 'preview');
+    const args = getResolveConfigArgs(viteConfig, operation);
+    return await resolveConfig(...args);
+}
+function getResolveConfigArgs(viteConfig, operation) {
+    const inlineConfig = viteConfig;
+    const command = operation === 'build' || operation === 'prerender' ? 'build' : 'serve';
+    const defaultMode = operation === 'dev' ? 'development' : 'production';
+    const defaultNodeEnv = defaultMode;
+    const isPreview = operation === 'preview';
+    return [inlineConfig, command, defaultMode, defaultNodeEnv, isPreview];
 }

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

@@ -1,6 +1,11 @@
 export { prerender };
 import { type PrerenderOptions } from '../prerender/runPrerender.js';
 import type { ResolvedConfig } from 'vite';
+/**
+ * Programmatically trigger `$ vike prerender`
+ *
+ * https://vike.dev/api#prerender
+ */
 declare function prerender(options?: PrerenderOptions): Promise<{
     viteConfig: ResolvedConfig;
 }>;

package/dist/esm/node/api/prerender.js

@@ -1,8 +1,13 @@
 export { prerender };
 import { runPrerenderFromAPI } from '../prerender/runPrerender.js';
-import { prepareApiCall } from './prepareApiCall.js';
+import { prepareViteApiCall } from './prepareViteApiCall.js';
+/**
+ * Programmatically trigger `$ vike prerender`
+ *
+ * https://vike.dev/api#prerender
+ */
 async function prerender(options = {}) {
-    const { viteConfigEnhanced } = await prepareApiCall(options.viteConfig, 'prerender');
+    const { viteConfigEnhanced } = await prepareViteApiCall(options.viteConfig, 'prerender');
     options.viteConfig = viteConfigEnhanced;
     const { viteConfig } = await runPrerenderFromAPI(options);
     return {

package/dist/esm/node/api/preview.d.ts

@@ -1,6 +1,11 @@
 export { preview };
 import { type ResolvedConfig, type PreviewServer } from 'vite';
 import type { APIOptions } from './types.js';
+/**
+ * Programmatically trigger `$ vike preview`
+ *
+ * https://vike.dev/api#preview
+ */
 declare function preview(options?: APIOptions): Promise<{
     viteServer: PreviewServer;
     viteConfig: ResolvedConfig;

package/dist/esm/node/api/preview.js

@@ -1,8 +1,13 @@
 export { preview };
-import { prepareApiCall } from './prepareApiCall.js';
+import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { preview as previewVite } from 'vite';
+/**
+ * Programmatically trigger `$ vike preview`
+ *
+ * https://vike.dev/api#preview
+ */
 async function preview(options = {}) {
-    const { viteConfigEnhanced } = await prepareApiCall(options.viteConfig, 'preview');
+    const { viteConfigEnhanced } = await prepareViteApiCall(options.viteConfig, 'preview');
     const server = await previewVite(viteConfigEnhanced);
     return {
         viteServer: server,

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

@@ -1 +1,2 @@
 export * from '../../utils/assert.js';
+export * from '../../utils/getGlobalObject.js';

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

@@ -3,3 +3,4 @@
 import { onLoad } from './onLoad.js';
 onLoad();
 export * from '../../utils/assert.js';
+export * from '../../utils/getGlobalObject.js';

package/dist/esm/node/cli/parseCli.d.ts

@@ -1,4 +1,4 @@
 export { parseCli };
 declare function parseCli(): {
-    command: "build" | "dev" | "preview" | "prerender";
+    command: "dev" | "build" | "preview" | "prerender";
 };

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

@@ -1,7 +1,7 @@
 export default plugin;
 export { plugin };
 export { plugin as ssr };
-export type { ConfigVikeUserProvided as UserConfig };
+export type { VikeVitePluginOptions as UserConfig };
 export { PROJECT_VERSION as version } from './utils.js';
-import type { ConfigVikeUserProvided } from '../../shared/ConfigVike.js';
-declare function plugin(vikeConfig?: ConfigVikeUserProvided): any;
+import type { VikeVitePluginOptions } from './plugins/importUserCode/v1-design/getVikeConfig/resolveVikeConfigGlobal.js';
+declare function plugin(vikeVitePluginOptions?: VikeVitePluginOptions): any;

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

@@ -4,7 +4,7 @@ export { plugin };
 export { plugin as ssr };
 export { PROJECT_VERSION as version } from './utils.js';
 import { version } from 'vite';
-import { assertNodeEnv_onVikePluginLoad, assertUsage, assertVersion, markEnvAsVikePluginLoaded } from './utils.js';
+import { assertUsage, assertVersion, markSetup_vikeVitePlugin } from './utils.js';
 import { buildConfig } from './plugins/buildConfig.js';
 import { previewConfig } from './plugins/previewConfig.js';
 import { autoFullBuild } from './plugins/autoFullBuild.js';
@@ -12,7 +12,6 @@ import { devConfig } from './plugins/devConfig/index.js';
 import { packageJsonFile } from './plugins/packageJsonFile.js';
 import { removeRequireHookPlugin } from './plugins/removeRequireHookPlugin.js';
 import { importUserCode } from './plugins/importUserCode/index.js';
-import { resolveVikeConfig } from './plugins/config/index.js';
 import { distFileNames } from './plugins/distFileNames.js';
 import { extractAssetsPlugin } from './plugins/extractAssetsPlugin.js';
 import { extractExportNamesPlugin } from './plugins/extractExportNamesPlugin.js';
@@ -28,15 +27,13 @@ import { setResolveClientEntriesDev } from '../runtime/renderPage/getPageAssets.
 import { resolveClientEntriesDev } from './resolveClientEntriesDev.js';
 import { workaroundCssModuleHmr } from './plugins/workaroundCssModuleHmr.js';
 import { vite6HmrRegressionWorkaround } from './plugins/vite6HmrRegressionWorkaround.js';
-assertNodeEnv_onVikePluginLoad();
-markEnvAsVikePluginLoaded();
+markSetup_vikeVitePlugin();
 assertViteVersion();
 setResolveClientEntriesDev(resolveClientEntriesDev);
 // Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
-function plugin(vikeConfig) {
+function plugin(vikeVitePluginOptions) {
     const plugins = [
-        resolveVikeConfig(vikeConfig), // The configResolved() hook of resolveVikeConfig() should be the first called
-        ...commonConfig(),
+        ...commonConfig(vikeVitePluginOptions),
         importUserCode(),
         ...devConfig(),
         ...buildConfig(),
@@ -48,9 +45,9 @@ function plugin(vikeConfig) {
         ...extractAssetsPlugin(),
         extractExportNamesPlugin(),
         suppressRollupWarning(),
-        setGlobalContext(),
+        ...setGlobalContext(),
         ...importBuild(),
-        baseUrls(vikeConfig),
+        baseUrls(vikeVitePluginOptions),
         envVarsPlugin(),
         fileEnv(),
         workaroundCssModuleHmr(),

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

@@ -1,6 +1,6 @@
 export { onLoad };
 import { assertIsNotBrowser } from '../../utils/assertIsNotBrowser.js';
-import { assertIsNotProductionRuntime } from '../../utils/assertIsNotProductionRuntime.js';
+import { assertIsNotProductionRuntime } from '../../utils/assertSetup.js';
 import { assertNodeVersion } from '../../utils/assertNodeVersion.js';
 function onLoad() {
     assertIsNotBrowser();

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

@@ -3,24 +3,25 @@ export { autoFullBuild };
 import { build } from 'vite';
 import { assertWarning } from '../utils.js';
 import { runPrerenderFromAutoRun, runPrerender_forceExit } from '../../prerender/runPrerender.js';
-import { getConfigVike } from '../../shared/getConfigVike.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';
 let forceExit = false;
 function autoFullBuild() {
     let config;
-    let configVike;
+    let vikeConfigGlobal;
     return [
         {
             name: 'vike:autoFullBuild',
             apply: 'build',
             enforce: 'pre',
             async configResolved(config_) {
-                configVike = await getConfigVike(config_);
+                const vikeConfig = await getVikeConfig(config_);
+                vikeConfigGlobal = vikeConfig.vikeConfigGlobal;
                 config = config_;
-                abortViteBuildSsr(configVike);
+                abortViteBuildSsr(vikeConfigGlobal);
             },
             writeBundle: {
                 /* We can't use this because it breaks Vite's logging. TODO: try again with latest Vite version.
@@ -29,7 +30,7 @@ function autoFullBuild() {
                 */
                 async handler(_options, bundle) {
                     try {
-                        await triggerFullBuild(config, configVike, bundle);
+                        await triggerFullBuild(config, vikeConfigGlobal, bundle);
                     }
                     catch (err) {
                         // Avoid Rollup prefixing the error with [vike:autoFullBuild], for example see https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
@@ -55,10 +56,10 @@ function autoFullBuild() {
         }
     ];
 }
-async function triggerFullBuild(config, configVike, bundle) {
+async function triggerFullBuild(config, vikeConfigGlobal, bundle) {
     if (config.build.ssr)
         return; // already triggered
-    if (isDisabled(configVike))
+    if (isDisabled(vikeConfigGlobal))
         return;
     // Workaround for @vitejs/plugin-legacy
     //  - The legacy plugin triggers its own Rollup build for the client-side.
@@ -89,19 +90,21 @@ async function triggerFullBuild(config, configVike, bundle) {
         logErrorHint(err);
         process.exit(1);
     }
-    if (configVike.prerender && !configVike.prerender.disableAutoRun && configVike.disableAutoFullBuild !== 'prerender') {
+    if (vikeConfigGlobal.prerender &&
+        !vikeConfigGlobal.prerender.disableAutoRun &&
+        vikeConfigGlobal.disableAutoFullBuild !== 'prerender') {
         await runPrerenderFromAutoRun(configInline, false);
         forceExit = true;
     }
 }
-function abortViteBuildSsr(configVike) {
-    if (configVike.disableAutoFullBuild !== true && isViteCliCall() && getViteConfigFromCli()?.build.ssr) {
+function abortViteBuildSsr(vikeConfigGlobal) {
+    if (vikeConfigGlobal.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(configVike) {
-    const { disableAutoFullBuild } = configVike;
+function isDisabled(vikeConfigGlobal) {
+    const { disableAutoFullBuild } = vikeConfigGlobal;
     if (disableAutoFullBuild === null || disableAutoFullBuild === 'prerender') {
         return !isViteCliCall();
     }

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

@@ -1,4 +1,4 @@
 export { baseUrls };
 import type { Plugin } from 'vite';
-import type { ConfigVikeUserProvided } from '../../../shared/ConfigVike.js';
-declare function baseUrls(configVike?: ConfigVikeUserProvided): Plugin;
+import type { VikeVitePluginOptions } from './importUserCode/v1-design/getVikeConfig/resolveVikeConfigGlobal.js';
+declare function baseUrls(vikeVitePluginOptions?: VikeVitePluginOptions): Plugin;

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

@@ -1,17 +1,16 @@
 export { baseUrls };
-import { resolveBaseFromUserConfig } from '../plugins/config/resolveBase.js';
+import { resolveBase, resolveBaseFromResolvedConfig } from '../../shared/resolveBase.js';
 import { assert } from '../utils.js';
-import { getConfigVike } from '../../shared/getConfigVike.js';
-function baseUrls(configVike) {
-    let baseServer;
-    let baseAssets;
+import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
+function baseUrls(vikeVitePluginOptions) {
+    let bases;
     return {
         name: 'vike:baseUrls',
         enforce: 'post',
         async config(config) {
-            const bases = resolveBaseFromUserConfig(config, configVike);
-            baseServer = bases.baseServer;
-            baseAssets = bases.baseAssets;
+            // TODO: fix bug: use getVikeConfig2() and udpate check below
+            bases = resolveBaseFromUserConfig(config, vikeVitePluginOptions);
+            const { baseServer, baseAssets } = bases;
             // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
             process.env.BASE_SERVER = baseServer;
             process.env.BASE_ASSETS = baseAssets;
@@ -22,14 +21,16 @@ function baseUrls(configVike) {
                     'BASE_ASSETS'
                 ],
                 base: baseAssets, // Make Vite inject baseAssets to imports e.g. `import logoUrl from './logo.svg.js'`
-                _baseOriginal: config.base ?? '/__UNSET__' // Vite resolves `_baseOriginal: null` to `undefined`
+                _baseViteOriginal: config.base ?? '/__UNSET__' // Vite resolves `_baseViteOriginal: null` to `undefined`
             };
         },
         async configResolved(config) {
-            const configVike = await getConfigVike(config);
+            const vikeConfig = await getVikeConfig(config);
+            const { baseServer, baseAssets } = vikeConfig.vikeConfigGlobal;
+            const basesResolved = resolveBaseFromResolvedConfig(baseServer, baseAssets, config);
             // Ensure that the premature base URL resolving we did in config() isn't erroneous
-            assert(configVike.baseServer === baseServer);
-            assert(configVike.baseAssets === baseAssets);
+            assert(basesResolved.baseServer === bases.baseServer);
+            assert(basesResolved.baseAssets === bases.baseAssets);
             /* In dev, Vite seems buggy around setting vite.config.js#base to an absolute URL (e.g. http://localhost:8080/cdn/)
              *  - In dev, Vite removes the URL origin. (I.e. it resolves the user config `vite.config.js#base: 'http://localhost:8080/cdn/'` to resolved config `config.base === '/cdn/'`.)
              *  - Instead of having an internal Vike assertion fail, we let the user discover Vite's buggy behavior.
@@ -38,3 +39,7 @@ function baseUrls(configVike) {
         }
     };
 }
+function resolveBaseFromUserConfig(config, vikeVitePluginOptions) {
+    const baseViteOriginal = config.base ?? null;
+    return resolveBase(baseViteOriginal, vikeVitePluginOptions?.baseServer ?? null, vikeVitePluginOptions?.baseAssets ?? null);
+}

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

@@ -202,7 +202,7 @@ function fixServerAssets_assertCssTarget_populate(config) {
 async function fixServerAssets_assertCssTarget(config) {
     if (!fixServerAssets_isEnabled())
         return;
-    if (!(await isV1Design(config, false)))
+    if (!(await isV1Design(config)))
         return;
     const targetsServer = targets.filter((t) => t.isServerSide);
     const targetsClient = targets.filter((t) => !t.isServerSide);

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

@@ -2,10 +2,9 @@ export { buildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
 export { manifestTempFile };
-import { assert, resolveOutDir, viteIsSSR, addOnBeforeLogHook, removeFileExtention, unique, assertUsage, injectRollupInputs, normalizeRollupInput, getOutDirs, assertNodeEnv_build, assertIsNpmPackageImport } from '../utils.js';
+import { assert, resolveOutDir, viteIsSSR, addOnBeforeLogHook, removeFileExtention, unique, assertUsage, injectRollupInputs, normalizeRollupInput, getOutDirs, onSetupBuild, assertIsNpmPackageImport } from '../utils.js';
 import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { findPageFiles } from '../shared/findPageFiles.js';
-import { getConfigVike } from '../../shared/getConfigVike.js';
 import { getVirtualFileIdPageConfigValuesAll } from '../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
 import { createRequire } from 'module';
@@ -27,14 +26,14 @@ function buildConfig() {
     let config;
     return [
         {
-            name: 'vike:buildConfig:configResolved',
+            name: 'vike:buildConfig:post',
             apply: 'build',
             enforce: 'post',
             configResolved: {
                 order: 'post',
                 async handler(config_) {
                     config = config_;
-                    assertNodeEnv_build();
+                    onSetupBuild();
                     assertRollupInput(config);
                     const entries = await getEntries(config);
                     assert(Object.keys(entries).length > 0);
@@ -42,7 +41,7 @@ function buildConfig() {
                     addLogHook();
                     outDirs = getOutDirs(config);
                     {
-                        isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (await isV1Design(config, false));
+                        isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (await isV1Design(config));
                         if (isServerAssetsFixEnabled) {
                             // https://github.com/vikejs/vike/issues/1339
                             config.build.ssrEmitAssets = true;
@@ -57,7 +56,7 @@ function buildConfig() {
             config: {
                 order: 'post',
                 handler(config) {
-                    assertNodeEnv_build();
+                    onSetupBuild();
                     isSsrBuild = viteIsSSR(config);
                     return {
                         build: {
@@ -69,14 +68,15 @@ function buildConfig() {
                 }
             },
             buildStart() {
-                assertNodeEnv_build();
+                onSetupBuild();
             },
             async closeBundle() {
+                onSetupBuild();
                 await fixServerAssets_assertCssTarget(config);
             }
         },
         {
-            name: 'vike:buildConfig:writeBundle',
+            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.
@@ -110,9 +110,9 @@ function buildConfig() {
     ];
 }
 async function getEntries(config) {
-    const configVike = await getConfigVike(config);
-    const pageFileEntries = await getPageFileEntries(config, configVike.includeAssetsImportedByServer); // TODO/v1-release: remove
-    const { pageConfigs } = await getVikeConfig(config, false);
+    const vikeConfig = await getVikeConfig(config);
+    const { pageConfigs } = vikeConfig;
+    const pageFileEntries = await getPageFileEntries(config, vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer); // TODO/v1-release: remove
     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/commonConfig.d.ts

@@ -1,3 +1,3 @@
 export { commonConfig };
 import { type Plugin } from 'vite';
-declare function commonConfig(): Plugin[];
+declare function commonConfig(vikeVitePluginOptions?: unknown): Plugin[];

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

@@ -1,6 +1,6 @@
 export { commonConfig };
 import { mergeConfig } from 'vite';
-import { assert, assertUsage, assertWarning, findPackageJson, isDocker } from '../utils.js';
+import { assert, assertUsage, assertWarning, findPackageJson, isDevCheck, isDocker } from '../utils.js';
 import { assertRollupInput } from './buildConfig.js';
 import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
 import pc from '@brillout/picocolors';
@@ -9,11 +9,22 @@ import { assertResolveAlias } from './commonConfig/assertResolveAlias.js';
 import { pluginName } from './commonConfig/pluginName.js';
 import { getEnvVarObject } from '../shared/getEnvVarObject.js';
 import { isViteCliCall } from '../shared/isViteCliCall.js';
-assertWarning(!isViteCliCall(), `Vite's CLI is deprecated ${pc.underline('https://vike.dev/migration/cli')}`, {
-    onlyOnce: true
-});
-function commonConfig() {
+import { isVikeCliOrApi } from '../../api/context.js';
+function commonConfig(vikeVitePluginOptions = {}) {
     return [
+        {
+            name: `${pluginName}:pre`,
+            enforce: 'pre',
+            config: {
+                order: 'pre',
+                handler(_config, env) {
+                    return {
+                        _isDev: isDevCheck(env),
+                        _vikeVitePluginOptions: vikeVitePluginOptions
+                    };
+                }
+            }
+        },
         {
             name: pluginName,
             configResolved(config) {
@@ -34,6 +45,7 @@ function commonConfig() {
                     assertRollupInput(config);
                     assertResolveAlias(config);
                     assertEsm(config.root);
+                    assertVikeCliOrApi(config);
                 }
             },
             config: {
@@ -97,3 +109,22 @@ function assertSingleInstance(config) {
     const numberOfInstances = config.plugins.filter((o) => o.name === pluginName).length;
     assertUsage(numberOfInstances === 1, `Vike's Vite plugin (${pc.cyan("import vike from 'vike/plugin'")}) is being added ${numberOfInstances} times to the list of Vite plugins. Make sure to add it only once instead.`);
 }
+function assertVikeCliOrApi(config) {
+    if (isVikeCliOrApi())
+        return;
+    if (isViteCliCall()) {
+        assertWarning(false, `Vite's CLI is deprecated ${pc.underline('https://vike.dev/migration/cli')}`, {
+            onlyOnce: true
+        });
+        return;
+    }
+    if (config.server.middlewareMode) {
+        assertWarning(false, `${pc.cyan('vite.createServer()')} is deprecated ${pc.underline('https://vike.dev/migration/cli#api')}`, {
+            onlyOnce: true
+        });
+        return;
+    }
+    assertWarning(false, `Vite's JavaScript API is deprecated ${pc.underline('https://vike.dev/migration/cli#api')}`, {
+        onlyOnce: true
+    });
+}

package/dist/esm/node/plugin/plugins/devConfig/determineOptimizeDeps.d.ts

@@ -1,3 +1,3 @@
 export { determineOptimizeDeps };
 import type { ResolvedConfig } from 'vite';
-declare function determineOptimizeDeps(config: ResolvedConfig, isDev: true): Promise<void>;
+declare function determineOptimizeDeps(config: ResolvedConfig): Promise<void>;

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

@@ -6,9 +6,9 @@ import { analyzeClientEntries } from '../buildConfig.js';
 import { virtualFileIdImportUserCodeClientCR, virtualFileIdImportUserCodeClientSR } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
 import { getFilePathResolved } from '../../shared/getFilePath.js';
 const debug = createDebugger('vike:optimizeDeps');
-async function determineOptimizeDeps(config, isDev) {
-    const { pageConfigs } = await getVikeConfig(config, isDev);
-    const { entries, include } = await getPageDeps(config, pageConfigs, isDev);
+async function determineOptimizeDeps(config) {
+    const { pageConfigs } = await getVikeConfig(config);
+    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.
         //  - Should we make it work? E.g. by creating a temporary file at node_modules/.vike/virtualFiles.js
@@ -28,7 +28,7 @@ async function determineOptimizeDeps(config, isDev) {
             'config.optimizeDeps.include': config.optimizeDeps.include
         });
 }
-async function getPageDeps(config, pageConfigs, isDev) {
+async function getPageDeps(config, pageConfigs) {
     let entries = [];
     let include = [];
     const addEntry = (e) => {
@@ -67,7 +67,7 @@ async function getPageDeps(config, pageConfigs, isDev) {
     }
     // V0.4 design
     {
-        const pageFiles = await findPageFiles(config, ['.page', '.page.client'], isDev);
+        const pageFiles = await findPageFiles(config, ['.page', '.page.client'], true);
         const userRootDir = config.root;
         pageFiles.forEach((filePathAbsoluteUserRootDir) => {
             const entry = getFilePathResolved({ filePathAbsoluteUserRootDir, userRootDir });

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

@@ -3,7 +3,7 @@ export { logDockerHint };
 import { determineOptimizeDeps } from './determineOptimizeDeps.js';
 import { determineFsAllowList } from './determineFsAllowList.js';
 import { addSsrMiddleware } from '../../shared/addSsrMiddleware.js';
-import { applyDev, assertWarning, isDocker, markEnvAsViteDev } from '../../utils.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';
@@ -58,16 +58,13 @@ function devConfig() {
             },
             async configResolved(config_) {
                 config = config_;
-                await determineOptimizeDeps(config, true);
+                await determineOptimizeDeps(config);
                 await determineFsAllowList(config);
                 if (!isErrorDebug()) {
                     await installHttpRequestAsyncStore();
                     improveViteLogs(config);
                 }
                 logDockerHint(config.server.host);
-            },
-            configureServer() {
-                markEnvAsViteDev();
             }
         },
         {

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

@@ -9,7 +9,6 @@ export { extractAssetsRE };
 import { viteIsSSR_options, 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 { getConfigVike } from '../../shared/getConfigVike.js';
 import { isAsset } from '../shared/isAsset.js';
 import { getImportStatements } from '../shared/parseEsModule.js';
 import { sourceMapRemove } from '../shared/rollupSourceMap.js';
@@ -25,7 +24,6 @@ const EMPTY_MODULE_ID = 'virtual:vike:empty-module';
 const debug = createDebugger('vike:extractAssets');
 function extractAssetsPlugin() {
     let config;
-    let configVike;
     let vikeConfig;
     let isServerAssetsFixEnabled;
     return [
@@ -45,7 +43,7 @@ function extractAssetsPlugin() {
                     assertV1Design(vikeConfig.pageConfigs, true);
                     assert(false);
                 }
-                assert(configVike.includeAssetsImportedByServer);
+                assert(vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer);
                 assert(!viteIsSSR_options(options));
                 const importStatements = await getImportStatements(src);
                 const moduleNames = getImportedModules(importStatements);
@@ -78,7 +76,7 @@ function extractAssetsPlugin() {
                 if (!extractAssetsRE.test(importer)) {
                     return;
                 }
-                assert(configVike.includeAssetsImportedByServer);
+                assert(vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer);
                 let resolution = null;
                 try {
                     resolution = await this.resolve(source, importer, { skipSelf: true, ...options });
@@ -137,10 +135,9 @@ function extractAssetsPlugin() {
         {
             name: 'vike:extractAssets-4',
             async configResolved(config_) {
-                configVike = await getConfigVike(config_);
                 config = config_;
-                vikeConfig = await getVikeConfig(config, false);
-                isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (await isV1Design(config, false));
+                vikeConfig = await getVikeConfig(config);
+                isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (await isV1Design(config));
                 if (!isServerAssetsFixEnabled) {
                     // https://github.com/vikejs/vike/issues/1060
                     assertUsage(!config.plugins.find((p) => p.name === 'vite-tsconfig-paths'), 'vite-tsconfig-paths not supported, remove it and use vite.config.js#resolve.alias instead');

package/dist/esm/node/plugin/plugins/importBuild/getVikeManifest.d.ts

@@ -1,4 +1,5 @@
 export { getVikeManifest };
 import { type PluginManifest } from '../../../shared/assertPluginManifest.js';
-import type { ConfigVikeResolved } from '../../../../shared/ConfigVike.js';
-declare function getVikeManifest(configVike: ConfigVikeResolved): PluginManifest;
+import type { VikeConfigGlobal } from '../importUserCode/v1-design/getVikeConfig/resolveVikeConfigGlobal.js';
+import type { ResolvedConfig } from 'vite';
+declare function getVikeManifest(vikeConfigGlobal: VikeConfigGlobal, viteConfig: ResolvedConfig): PluginManifest;