vike 0.4.215 → 0.4.217-commit-99ea561

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,9 @@
 export { commonConfig };
 import { type Plugin } from 'vite';
-declare function commonConfig(): Plugin[];
+declare module 'vite' {
+    interface UserConfig {
+        _isDev?: boolean;
+        _vikeVitePluginOptions?: unknown;
+    }
+}
+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;

package/dist/esm/node/plugin/plugins/importBuild/getVikeManifest.js

@@ -3,8 +3,8 @@ import { projectInfo } from '../../utils.js';
 import { assertPluginManifest } from '../../../shared/assertPluginManifest.js';
 import { isUsingClientRouter } from '../extractExportNamesPlugin.js';
 import { getRuntimeManifest } from '../../../runtime/globalContext.js';
-function getVikeManifest(configVike) {
-    const runtimeManifest = getRuntimeManifest(configVike);
+function getVikeManifest(vikeConfigGlobal, viteConfig) {
+    const runtimeManifest = getRuntimeManifest(vikeConfigGlobal, viteConfig);
     const manifest = {
         version: projectInfo.projectVersion,
         usesClientRouter: isUsingClientRouter(), // TODO/v1-release: remove

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

@@ -4,37 +4,39 @@ import { serverProductionEntryPlugin } from '@brillout/vite-plugin-server-entry/
 import { assert, getOutDirs, toPosixPath } from '../../utils.js';
 import path from 'path';
 import { createRequire } from 'module';
-import { getConfigVike } from '../../../shared/getConfigVike.js';
 import { getVikeManifest } from './getVikeManifest.js';
 import fs from 'fs/promises';
 import { virtualFileIdImportUserCodeServer } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
+import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
 // @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__';
 function importBuild() {
     let config;
-    let configVike;
+    let vikeConfigGlobal;
     return [
         {
             name: 'vike:importBuild:config',
             enforce: 'post',
             async configResolved(config_) {
                 config = config_;
-                configVike = await getConfigVike(config);
+                const vikeConfig = await getVikeConfig(config);
+                vikeConfigGlobal = vikeConfig.vikeConfigGlobal;
             }
         },
         ...serverProductionEntryPlugin({
             getServerProductionEntry: () => {
-                return getServerProductionEntryCode(config, configVike);
+                return getServerProductionEntryCode(config, vikeConfigGlobal);
             },
             libraryName: 'Vike'
         })
     ];
 }
-function getServerProductionEntryCode(config, configVike) {
+function getServerProductionEntryCode(config, vikeConfigGlobal) {
     const importPath = getImportPath(config);
-    const vikeManifest = getVikeManifest(configVike);
+    const vikeManifest = getVikeManifest(vikeConfigGlobal, config);
+    // Let's eventually simplify and move everything to a single virtual module
     const importerCode = [
         `  import { setImportBuildGetters } from '${importPath}';`,
         `  import * as pageFiles from '${virtualFileIdImportUserCodeServer}';`,

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

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

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

@@ -6,16 +6,16 @@ import { fileTypes } from '../../../../shared/getPageFiles/fileTypes.js';
 import path from 'path';
 import { getVirtualFilePageConfigs } from './v1-design/getVirtualFilePageConfigs.js';
 import { isV1Design as isV1Design_ } from './v1-design/getVikeConfig.js';
-async function getVirtualFileImportUserCode(id, options, configVike, config, isDev) {
+async function getVirtualFileImportUserCode(id, options, vikeConfigGlobal, config, isDev) {
     const idParsed = isVirtualFileIdImportUserCode(id);
     assert(idParsed);
     const { isForClientSide, isClientRouting } = idParsed;
     assert(isForClientSide === !viteIsSSR_options(options));
-    const isPrerendering = !!configVike.prerender;
-    const code = await getCode(config, configVike, isForClientSide, isClientRouting, isPrerendering, isDev, id);
+    const isPrerendering = !!vikeConfigGlobal.prerender;
+    const code = await getCode(config, vikeConfigGlobal, isForClientSide, isClientRouting, isPrerendering, isDev, id);
     return code;
 }
-async function getCode(config, configVike, isForClientSide, isClientRouting, isPrerendering, isDev, id) {
+async function getCode(config, vikeConfigGlobal, isForClientSide, isClientRouting, isPrerendering, isDev, id) {
     const { command } = config;
     assert(command === 'serve' || command === 'build');
     const isBuild = command === 'build';
@@ -24,7 +24,7 @@ async function getCode(config, configVike, isForClientSide, isClientRouting, isP
     {
         const globRoots = getGlobRoots(config);
         debugGlob('Glob roots: ', globRoots);
-        content += await generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, configVike, isPrerendering, config, isDev, id);
+        content += await generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, vikeConfigGlobal, isPrerendering, config, isDev, id);
     }
     debugGlob(`Glob imports for ${isForClientSide ? 'client' : 'server'}:\n`, content);
     return content;
@@ -54,7 +54,7 @@ function determineInjection({ fileType, isForClientSide, isClientRouting, isPrer
         }
     }
 }
-async function generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, configVike, isPrerendering, config, isDev, id) {
+async function generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, vikeConfigGlobal, isPrerendering, config, isDev, id) {
     let fileContent = `// Generated by https://github.com/vikejs/vike/blob/main/vike/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.ts
 
 export const pageFilesLazy = {};
@@ -68,7 +68,7 @@ ${await getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRouting, c
 
 `;
     // We still use import.meta.glob() when using th V1 design in order to not break the V1 design deprecation warning
-    const isV1Design = await isV1Design_(config, isDev);
+    const isV1Design = await isV1Design_(config);
     fileTypes
         .filter((fileType) => fileType !== '.css')
         .forEach((fileType) => {
@@ -86,7 +86,7 @@ ${await getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRouting, c
             fileContent += getGlobs(globRoots, isBuild, fileType, 'extractExportNames', isV1Design);
         }
     });
-    if (configVike.includeAssetsImportedByServer && isForClientSide) {
+    if (vikeConfigGlobal.includeAssetsImportedByServer && isForClientSide) {
         fileContent += getGlobs(globRoots, isBuild, '.page.server', 'extractAssets', isV1Design);
     }
     return fileContent;

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

@@ -1,32 +1,27 @@
 export { importUserCode };
 import { normalizePath } from 'vite';
-import { getConfigVike } from '../../../shared/getConfigVike.js';
 import { getVirtualFilePageConfigValuesAll } from './v1-design/getVirtualFilePageConfigValuesAll.js';
 import { getVirtualFileImportUserCode } from './getVirtualFileImportUserCode.js';
-import { assert, assertPosixPath, getOutDirs, isDevCheck } from '../../utils.js';
+import { assert, assertPosixPath } from '../../utils.js';
 import { resolveVirtualFileId, isVirtualFileId, getVirtualFileId } from '../../../shared/virtual-files.js';
 import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { isVirtualFileIdImportUserCode } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
-import { vikeConfigDependencies, reloadVikeConfig, isVikeConfigFile, isV1Design } from './v1-design/getVikeConfig.js';
+import { vikeConfigDependencies, reloadVikeConfig, isVikeConfigFile, isV1Design, getVikeConfig } from './v1-design/getVikeConfig.js';
 import pc from '@brillout/picocolors';
 import { logConfigInfo } from '../../shared/loggerNotProd.js';
 import { getModuleFilePathAbsolute } from '../../shared/getFilePath.js';
 function importUserCode() {
     let config;
-    let configVike;
-    let isDev;
+    let vikeConfigGlobal;
     return {
         name: 'vike:importUserCode',
-        config(_, env) {
-            isDev = isDevCheck(env);
-        },
         async configResolved(config_) {
-            configVike = await getConfigVike(config_);
+            const vikeConfig = await getVikeConfig(config_);
+            vikeConfigGlobal = vikeConfig.vikeConfigGlobal;
             config = config_;
             // TODO/v1-release: remove
             {
-                assert(isDev !== undefined);
-                const isV1 = await isV1Design(config, isDev);
+                const isV1 = await isV1Design(config);
                 if (!isV1)
                     config.experimental.importGlobRestoreExtension = true;
             }
@@ -50,13 +45,14 @@ function importUserCode() {
             if (!isVirtualFileId(id))
                 return undefined;
             id = getVirtualFileId(id);
+            const isDev = config._isDev;
             assert(typeof isDev === 'boolean');
             if (isVirtualFileIdPageConfigValuesAll(id)) {
                 const code = await getVirtualFilePageConfigValuesAll(id, isDev, config);
                 return code;
             }
             if (isVirtualFileIdImportUserCode(id)) {
-                const code = await getVirtualFileImportUserCode(id, options, configVike, config, isDev);
+                const code = await getVirtualFileImportUserCode(id, options, vikeConfigGlobal, config, isDev);
                 return code;
             }
         },
@@ -83,8 +79,6 @@ function handleFileAddRemove(server, config) {
 }
 function handleHotUpdate(ctx, config) {
     const { file, server } = ctx;
-    assertPosixPath(file);
-    vikeConfigDependencies.forEach((f) => assertPosixPath(f));
     const isVikeConfig = isVikeConfigModule(file);
     const isViteModule = ctx.modules.length > 0;
     /* Should we show this?
@@ -114,6 +108,8 @@ function handleHotUpdate(ctx, config) {
     }
 }
 function isVikeConfigModule(filePathAbsoluteFilesystem) {
+    assertPosixPath(filePathAbsoluteFilesystem);
+    vikeConfigDependencies.forEach((f) => assertPosixPath(f));
     return vikeConfigDependencies.has(filePathAbsoluteFilesystem);
 }
 function reloadConfig(filePath, config, op) {
@@ -122,7 +118,7 @@ function reloadConfig(filePath, config, op) {
         const msg = `${op} ${pc.dim(filePathToShowToUserResolved)}`;
         logConfigInfo(msg, 'info');
     }
-    reloadVikeConfig(config.root, getOutDirs(config).outDirRoot);
+    reloadVikeConfig(config);
 }
 function getVirtualModules(server) {
     const virtualModules = Array.from(server.moduleGraph.urlToModuleMap.keys())

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/crawlPlusFiles.d.ts

@@ -1,4 +1,4 @@
 export { crawlPlusFiles };
-declare function crawlPlusFiles(userRootDir: string, outDirAbsoluteFilesystem: string, crawlWithGit: null | boolean): Promise<{
+declare function crawlPlusFiles(userRootDir: string, outDirAbsoluteFilesystem: null | string): Promise<{
     filePathAbsoluteUserRootDir: string;
 }[]>;