vike 0.4.223 → 0.4.224-commit-00ed9fe

package/dist/esm/node/plugin/plugins/build/pluginBuildEntry.d.ts

@@ -0,0 +1,7 @@
+export { pluginBuildEntry };
+export { set_macro_ASSETS_MANIFEST };
+import type { Plugin, Rollup } from 'vite';
+type Bundle = Rollup.OutputBundle;
+type Options = Rollup.NormalizedOutputOptions;
+declare function pluginBuildEntry(): Plugin[];
+declare function set_macro_ASSETS_MANIFEST(options: Options, bundle: Bundle, assetsJsonFilePath: string): Promise<void>;

package/dist/esm/node/plugin/plugins/{buildEntry/index.js → build/pluginBuildEntry.js}

@@ -1,23 +1,24 @@
-export { buildEntry };
-export { set_ASSETS_MANIFEST };
+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 { assert, projectInfo, toPosixPath } from '../../utils.js';
 import fs from 'fs/promises';
 import path from 'path';
 import { createRequire } from 'module';
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+// @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 import { isUsingClientRouter } from '../extractExportNamesPlugin.js';
 import { assertBuildInfo, getViteConfigRuntime } from '../../../runtime/globalContext.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
 const ASSETS_MANIFEST = '__VITE_ASSETS_MANIFEST__';
-function buildEntry() {
+function pluginBuildEntry() {
     let config;
     return [
         {
-            name: 'vike:buildEntry',
+            name: 'vike:build:pluginBuildEntry',
+            apply: 'build',
             enforce: 'post',
             async configResolved(config_) {
                 config = config_;
@@ -58,13 +59,12 @@ function getServerProductionEntryCode(config) {
     ].join('\n');
     return importerCode;
 }
-/** Set the value of the ASSETS_MANIFEST constant inside dist/server/entry.js (or dist/server/index.js) */
-async function set_ASSETS_MANIFEST(options, bundle) {
+// Set the value of the ASSETS_MANIFEST constant inside dist/server/entry.js (or dist/server/index.js)
+async function set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath) {
     const { dir } = options;
     assert(dir);
     const chunkPath = find_ASSETS_MANIFEST(bundle);
     const chunkFilePath = path.join(dir, chunkPath);
-    const assetsJsonFilePath = path.join(dir, '..', 'assets.json');
     const [assetsJsonString, chunkFileContent] = await Promise.all([
         await fs.readFile(assetsJsonFilePath, 'utf8'),
         await fs.readFile(chunkFilePath, 'utf8')
@@ -88,7 +88,7 @@ function find_ASSETS_MANIFEST(bundle) {
 function getImportPath(config) {
     // We resolve filePathAbsolute even if we don't use it: we use require.resolve() as an assertion that the relative path is correct
     const filePathAbsolute = toPosixPath(
-    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/buildEntry/index.js
+    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/pluginBuildEntry/index.js
     require_.resolve(`../../../../../../dist/esm/__internal/index.js`));
     if (
     // Let's implement a new config if a user needs the import to be a relative path instead of 'vike/__internal' (AFAIK a relative path is needed only if a framework has npm package 'vike' as direct dependency instead of a peer dependency and if the user of that framework uses pnpm)

package/dist/esm/node/plugin/plugins/build/pluginDistFileNames.d.ts

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

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

@@ -1,15 +1,15 @@
-export { distFileNames };
+export { pluginDistFileNames };
 // Attempt to preserve file structure of `.page.js` files:
 //  - https://github.com/vikejs/vike/commit/11a4c49e5403aa7c37c8020c462b499425b41854
 //  - Blocker: https://github.com/rollup/rollup/issues/4724
-import { assertPosixPath, assert, assertUsage, isArray, isCallable } from '../utils.js';
+import { assertPosixPath, assert, assertUsage, isArray, isCallable } from '../../utils.js';
 import path from 'path';
 import crypto from 'crypto';
-import { getAssetsDir } from '../shared/getAssetsDir.js';
-import { assertModuleId, getModuleFilePathAbsolute } from '../shared/getFilePath.js';
-function distFileNames() {
+import { getAssetsDir } from '../../shared/getAssetsDir.js';
+import { assertModuleId, getModuleFilePathAbsolute } from '../../shared/getFilePath.js';
+function pluginDistFileNames() {
     return {
-        name: 'vike:distFileNames',
+        name: 'vike:build:pluginDistFileNames',
         apply: 'build',
         enforce: 'post',
         configResolved(config) {
@@ -28,7 +28,7 @@ function distFileNames() {
                 else {
                     // If a user needs this:
                     //  - assertUsage() that the naming provided by the user ends with `.[hash][extname]`
-                    //    - It's needed for getHash() of fixServerAssets()
+                    //    - It's needed for getHash() of handleAssetsManifest()
                     //    - Asset URLs should always contain a hash: it's paramount for caching assets.
                     //    - If rollupOutput.assetFileNames is a function then use a wrapper function to apply the assertUsage()
                     assertUsage(false, "Setting Vite's configuration build.rollupOptions.output.assetFileNames is currently forbidden. Reach out if you need to use.");

package/dist/esm/node/plugin/plugins/build/pluginDistPackageJsonFile.d.ts

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

package/dist/esm/node/plugin/plugins/{packageJsonFile.js → build/pluginDistPackageJsonFile.js}

@@ -6,19 +6,20 @@
  *   require() of dist/server/pageFiles.js from node_modules/vike/dist/esm/node/runtime/page-files/setup.js is an ES module file as it is a .js file whose nearest parent package.json contains "type": "module" which defines all .js files in that package scope as ES modules.
  * Reproduction: https://github.com/brillout/vite-plugin-ssr-server-import-syntax
  */
-export { packageJsonFile };
-import { rollupIsEsm } from '../shared/rollupIsEsm.js';
-import { viteIsSSR } from '../shared/viteIsSSR.js';
-function packageJsonFile() {
+// TODO/refactor: prefix all other plugins with `plugin` as well?
+export { pluginDistPackageJsonFile };
+import { rollupIsEsm } from '../../shared/rollupIsEsm.js';
+import { isViteServerBuild } from '../../shared/isViteServerBuild.js';
+function pluginDistPackageJsonFile() {
     let config;
     return {
-        name: 'vike:packageJsonFile',
+        name: 'vike:build:pluginDistPackageJsonFile',
         apply: 'build',
         configResolved(config_) {
             config = config_;
         },
         generateBundle(options, bundle) {
-            if (!viteIsSSR(config))
+            if (!isViteServerBuild(config))
                 return;
             const isEsm = rollupIsEsm(options);
             const fileName = 'package.json';

package/dist/esm/node/plugin/plugins/build/pluginSuppressRollupWarning.d.ts

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

package/dist/esm/node/plugin/plugins/{suppressRollupWarning.js → build/pluginSuppressRollupWarning.js}

@@ -1,8 +1,8 @@
 // Suppress Rollup warnings `Generated an empty chunk: "index.page.server"`
-export { suppressRollupWarning };
-function suppressRollupWarning() {
+export { pluginSuppressRollupWarning };
+function pluginSuppressRollupWarning() {
     return {
-        name: 'vike:suppressRollupWarning',
+        name: 'vike:build:pluginSuppressRollupWarning',
         apply: 'build',
         enforce: 'post',
         async configResolved(config) {

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

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

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

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

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

@@ -1,5 +1,7 @@
 export { commonConfig };
-import { type InlineConfig, type Plugin } from 'vite';
+export { getVikeConfigPublic };
+export type { VikeConfigPublic };
+import { type InlineConfig, type Plugin, type ResolvedConfig, type UserConfig } from 'vite';
 import { type VikeConfigObject } from './importUserCode/v1-design/getVikeConfig.js';
 import type { PrerenderContextPublic } from '../../prerender/runPrerender.js';
 declare module 'vite' {
@@ -9,11 +11,19 @@ declare module 'vite' {
         _root?: string;
         _baseViteOriginal?: string;
         _viteConfigEnhanced?: InlineConfig;
-        vike?: {
-            config: VikeConfigObject['global']['config'];
-            pages: VikeConfigObject['pages'];
-            prerenderContext?: PrerenderContextPublic;
-        };
+        _vike?: VikeConfigPublic;
+        _vikeConfigObject?: VikeConfigObject;
     }
 }
+type VikeConfigPublic = {
+    config: VikeConfigObject['global']['config'];
+    pages: VikeConfigObject['pages'];
+    prerenderContext?: PrerenderContextPublic;
+};
 declare function commonConfig(vikeVitePluginOptions: unknown): Plugin[];
+/**
+ * Get all the information Vike knows about the app in your Vite plugin.
+ *
+ * https://vike.dev/getVikeConfig
+ */
+declare function getVikeConfigPublic(config: ResolvedConfig | UserConfig): VikeConfigPublic;

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

@@ -1,7 +1,8 @@
 export { commonConfig };
+export { getVikeConfigPublic };
 import { mergeConfig } from 'vite';
 import { assert, assertUsage, assertWarning, findPackageJson, hasProp, isDevCheck, isDocker, isObject } from '../utils.js';
-import { assertRollupInput } from './buildConfig.js';
+import { assertRollupInput } from './build/pluginBuildConfig.js';
 import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
 import pc from '@brillout/picocolors';
 import path from 'path';
@@ -11,7 +12,8 @@ import { isViteCliCall } from '../shared/isViteCliCall.js';
 import { isVikeCliOrApi } from '../../api/context.js';
 import { getVikeConfig2 } from './importUserCode/v1-design/getVikeConfig.js';
 import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/prepareViteApiCall.js';
-import { isPrerenderEnabled, temp_disablePrerenderAutoRun } from '../../prerender/context.js';
+import { temp_disablePrerenderAutoRun } from '../../prerender/context.js';
+import { resolvePrerenderConfigGlobal } from '../../prerender/resolvePrerenderConfig.js';
 const pluginName = 'vike:commonConfig';
 function commonConfig(vikeVitePluginOptions) {
     return [
@@ -30,13 +32,14 @@ function commonConfig(vikeVitePluginOptions) {
                         _isDev: isDev,
                         _root: root,
                         _vikeVitePluginOptions: vikeVitePluginOptions,
-                        vike: {
+                        _vikeConfigObject: vikeConfig,
+                        _vike: {
                             pages: vikeConfig.pages,
                             config: vikeConfig.global.config
                         },
                         // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
                         configVikePromise: Promise.resolve({
-                            prerender: isPrerenderEnabled(vikeConfig)
+                            prerender: resolvePrerenderConfigGlobal(vikeConfig).isPrerenderingEnabled
                         })
                     };
                 }
@@ -168,3 +171,18 @@ function temp_supportOldInterface(config) {
     }
     assert(false);
 }
+// TODO/soon rename:
+// - `getVikeConfig()` => `resolveVikeConfig()` ?
+// - `getVikeConfigPublic()` => `getVikeConfig()`
+// - `VikeConfigPublic` => `VikeConfig` ?
+// - `VikeConfigObject` => `VikeConfigInternal` ?
+/**
+ * Get all the information Vike knows about the app in your Vite plugin.
+ *
+ * https://vike.dev/getVikeConfig
+ */
+function getVikeConfigPublic(config) {
+    const vikeConfig = config._vike;
+    assert(vikeConfig);
+    return vikeConfig;
+}

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

@@ -5,7 +5,7 @@ import { assert } from '../../utils.js';
 import { createRequire } from 'module';
 import { dirname } from 'path';
 import { fileURLToPath } from 'url';
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+// @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 const __dirname_ = dirname(fileURLToPath(importMetaUrl));

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

@@ -1,8 +1,8 @@
 export { determineOptimizeDeps };
 import { findPageFiles } from '../../shared/findPageFiles.js';
 import { assert, assertIsNpmPackageImport, createDebugger, isArray, unique } from '../../utils.js';
-import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
-import { analyzeClientEntries } from '../buildConfig.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 { getFilePathResolved } from '../../shared/getFilePath.js';
 const debug = createDebugger('vike:optimizeDeps');
@@ -44,11 +44,11 @@ async function getPageDeps(config, pageConfigs) {
     // V1 design
     {
         pageConfigs.forEach((pageConfig) => {
-            Object.values(pageConfig.configValueSources).forEach((sources) => {
+            Object.entries(pageConfig.configValueSources).forEach(([configName, sources]) => {
                 sources
-                    .filter((c) => !c.isOverriden)
+                    .filter((source) => !isOverriden(source, configName, pageConfig))
                     .forEach((configValueSource) => {
-                    if (!configValueSource.valueIsImportedAtRuntime)
+                    if (!configValueSource.valueIsLoadedWithImport && !configValueSource.valueIsFilePath)
                         return;
                     const { definedAtFilePath, configEnv } = configValueSource;
                     if (!configEnv.client)

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

@@ -79,7 +79,7 @@ function devConfig() {
                     if (config.server.middlewareMode || hasHonoViteDevServer)
                         return;
                     return () => {
-                        addSsrMiddleware(server.middlewares, config, false);
+                        addSsrMiddleware(server.middlewares, config, false, null);
                     };
                 }
             },

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

@@ -4,7 +4,7 @@ import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, isArr
 import { sourceMapPassthrough } from '../shared/rollupSourceMap.js';
 import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
 import { normalizeId } from '../shared/normalizeId.js';
-import { viteIsSSR_safe } from '../shared/viteIsSSR.js';
+import { isViteServerBuild_safe } from '../shared/isViteServerBuild.js';
 // TODO/enventually: (after we implemented vike.config.js)
 // - Make import.meta.env work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
@@ -37,7 +37,7 @@ function envVarsPlugin() {
             if (!code.includes('import.meta.env.'))
                 return;
             const isBuild = config.command === 'build';
-            const isClientSide = !viteIsSSR_safe(config, options);
+            const isClientSide = !isViteServerBuild_safe(config, options);
             Object.entries(envsAll)
                 .filter(([key]) => {
                 // Already handled by Vite

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

@@ -13,11 +13,11 @@ import { isAsset } from '../shared/isAsset.js';
 import { getImportStatements } from '../shared/parseEsModule.js';
 import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 import pc from '@brillout/picocolors';
-import { fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
-import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
+import { handleAssetsManifest_isFixEnabled } from './build/handleAssetsManifest.js';
+import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
 import { assertV1Design } from '../../shared/assertV1Design.js';
 import { normalizeId } from '../shared/normalizeId.js';
-import { viteIsSSR_safe } from '../shared/viteIsSSR.js';
+import { isViteServerBuild_safe } from '../shared/isViteServerBuild.js';
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
@@ -26,7 +26,7 @@ const debug = createDebugger('vike:extractAssets');
 function extractAssetsPlugin() {
     let config;
     let vikeConfig;
-    let isServerAssetsFixEnabled;
+    let isFixEnabled;
     return [
         // This plugin removes all JavaScript from server-side only code, so that only CSS imports remains. (And also satic files imports e.g. `import logoURL from './logo.svg.js'`).
         {
@@ -39,14 +39,14 @@ function extractAssetsPlugin() {
                 if (!extractAssetsRE.test(id)) {
                     return;
                 }
-                if (isServerAssetsFixEnabled) {
-                    // I'm guessing isServerAssetsFixEnabled can only be true when mixing both designs: https://github.com/vikejs/vike/issues/1480
+                if (isFixEnabled) {
+                    // I'm guessing isFixEnabled can only be true when mixing both designs: https://github.com/vikejs/vike/issues/1480
                     assertV1Design(vikeConfig.pageConfigs, true);
                     assert(false);
                 }
                 // TODO/now: add meta.default
                 assert(vikeConfig.global.config.includeAssetsImportedByServer ?? true);
-                assert(!viteIsSSR_safe(config, options));
+                assert(!isViteServerBuild_safe(config, options));
                 const importStatements = await getImportStatements(src);
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
@@ -63,7 +63,7 @@ function extractAssetsPlugin() {
             //  - Vite's `vite:resolve` plugin; https://github.com/vitejs/vite/blob/d649daba7682791178b711d9a3e44a6b5d00990c/packages/vite/src/node/plugins/resolve.ts#L105
             enforce: 'pre',
             async resolveId(source, importer, options) {
-                if (viteIsSSR_safe(config, options)) {
+                if (isViteServerBuild_safe(config, options)) {
                     // When building for the server, there should never be a `?extractAssets` query
                     assert(!extractAssetsRE.test(source));
                     assert(importer === undefined || !extractAssetsRE.test(importer));
@@ -140,8 +140,8 @@ function extractAssetsPlugin() {
             async configResolved(config_) {
                 config = config_;
                 vikeConfig = await getVikeConfig(config);
-                isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (await isV1Design(config));
-                if (!isServerAssetsFixEnabled) {
+                isFixEnabled = handleAssetsManifest_isFixEnabled(config);
+                if (!isFixEnabled) {
                     // 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/extractExportNamesPlugin.js

@@ -5,7 +5,7 @@ import { assert, getFileExtension, createDebugger, getGlobalObject, assertUsage
 import { getExportNames } from '../shared/parseEsModule.js';
 import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 import { normalizeId } from '../shared/normalizeId.js';
-import { viteIsSSR_options } from '../shared/viteIsSSR.js';
+import { isViteServerBuild_options } from '../shared/isViteServerBuild.js';
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 const debug = createDebugger('vike:extractExportNames');
 const globalObject = getGlobalObject('plugins/extractExportNamesPlugin.ts', {});
@@ -16,7 +16,7 @@ function extractExportNamesPlugin() {
         enforce: 'post',
         async transform(src, id, options) {
             id = normalizeId(id);
-            const isClientSide = !viteIsSSR_options(options);
+            const isClientSide = !isViteServerBuild_options(options);
             if (extractExportNamesRE.test(id)) {
                 const code = await getExtractExportNamesCode(src, isClientSide, !isDev, id);
                 debug('id ' + id, ['result:\n' + code.code.trim(), 'src:\n' + src.trim()]);

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

@@ -55,10 +55,13 @@ function fileEnv() {
             Array.from(this.getModuleIds())
                 .filter((id) => !skip(id))
                 .forEach((moduleId) => {
-                const { importers, dynamicImporters } = this.getModuleInfo(moduleId);
+                const mod = this.getModuleInfo(moduleId);
+                const { importers } = mod;
                 if (importers.length === 0) {
                     // Dynamic imports can only be verified at runtime
-                    assert(dynamicImporters.length > 0);
+                    /* This assertion can fail: https://github.com/vikejs/vike/issues/2227
+                    assert(dynamicImporters.length > 0)
+                    */
                     return;
                 }
                 assertFileEnv(moduleId, !!config.build.ssr, importers, false);

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

@@ -7,12 +7,12 @@ import path from 'path';
 import { getVirtualFilePageConfigs } from './v1-design/virtual-files/getVirtualFilePageConfigs.js';
 import { isV1Design as isV1Design_ } from './v1-design/getVikeConfig.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
-import { viteIsSSR_options } from '../../shared/viteIsSSR.js';
+import { isViteServerBuild_options } from '../../shared/isViteServerBuild.js';
 async function getVirtualFileImportUserCode(id, options, vikeConfig, config, isDev) {
     const idParsed = isVirtualFileIdImportUserCode(id);
     assert(idParsed);
     const { isForClientSide, isClientRouting } = idParsed;
-    assert(isForClientSide === !viteIsSSR_options(options));
+    assert(isForClientSide === !isViteServerBuild_options(options));
     const code = await getCode(config, vikeConfig, isForClientSide, isClientRouting, isDev, id);
     return code;
 }
@@ -69,7 +69,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);
+    const isV1Design = isV1Design_(config);
     // Old design => no + files => only to enable pre-rendering is setting `vike({prerender})` in vite.config.js
     const isPrerendering = !!vikeConfig.global.config.prerender;
     fileTypes

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

@@ -21,11 +21,8 @@ function importUserCode() {
             vikeConfig = await getVikeConfig(config_);
             config = config_;
             // TODO/v1-release: remove
-            {
-                const isV1 = await isV1Design(config);
-                if (!isV1)
-                    config.experimental.importGlobRestoreExtension = true;
-            }
+            if (!isV1Design(config))
+                config.experimental.importGlobRestoreExtension = true;
         },
         resolveId(id) {
             if (isVirtualFileId(id)) {

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/assertExtensions.js

@@ -29,7 +29,7 @@ function assertExtensionName(plusFile) {
     assertUsage(name, `Vike extension name missing: the config ${filePathToShowToUser} must define the setting ${pc.cyan('name')}`);
 }
 function assertExtensionsRequire(pageConfig) {
-    const plusFilesRelevantList = Object.values(pageConfig.plusFiles).flat(1);
+    const plusFilesRelevantList = pageConfig.plusFiles;
     // Collect extensions
     const extensions = {};
     plusFilesRelevantList.forEach((plusFile) => {
@@ -63,8 +63,8 @@ function getConfigRequireValue(plusFile) {
     const confVal = getConfVal(plusFile, 'require');
     if (!confVal)
         return null;
-    assert(confVal.configValueLoaded);
-    const require = confVal.configValue;
+    assert(confVal.valueIsLoaded);
+    const require = confVal.value;
     const { filePathToShowToUserResolved } = plusFile.filePath;
     assert(filePathToShowToUserResolved);
     assertUsage(isObjectOfStrings(require), `The setting ${pc.bold('require')} defined at ${filePathToShowToUserResolved} should be an object with string values (${pc.bold('Record<string, string>')}).`);
@@ -74,8 +74,8 @@ function getNameValue(plusFile) {
     const confVal = getConfVal(plusFile, 'name');
     if (!confVal)
         return null;
-    assert(confVal.configValueLoaded);
-    const name = confVal.configValue;
+    assert(confVal.valueIsLoaded);
+    const name = confVal.value;
     const filePathToShowToUser = getFilePathToShowToUser(plusFile);
     assertUsage(typeof name === 'string', `The setting ${pc.bold('name')} defined at ${filePathToShowToUser} should be a string.`);
     return name;

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js

@@ -31,7 +31,12 @@ const configDefinitionsBuiltIn = {
         cumulative: true
     },
     route: {
-        env: { server: true, client: 'if-client-routing' },
+        env: {
+            server: true,
+            client: 'if-client-routing',
+            // For vite-plugin-vercel
+            config: true
+        },
         eager: true
     },
     guard: {
@@ -157,7 +162,7 @@ const configDefinitionsBuiltIn = {
             'string'
         ]
     },
-    viteEnvironmentAPI: {
+    vite6BuilderApp: {
         env: { config: true },
         global: true,
         type: 'boolean'

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

@@ -0,0 +1 @@
+export declare const ignorePatternsBuiltIn: readonly ["**/node_modules/**", "**/ejected/**", "**/*.telefunc.*", "**/*.generated.*"];

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/crawlPlusFiles/ignorePatternsBuiltIn.js

@@ -0,0 +1,13 @@
+export const ignorePatternsBuiltIn = [
+    '**/node_modules/**',
+    // Ejected Vike extensions, see https://github.com/snake-py/eject
+    '**/ejected/**',
+    // Allow:
+    // ```bash
+    // +Page.js
+    // +Page.telefunc.js
+    // ```
+    '**/*.telefunc.*',
+    // https://github.com/vikejs/vike/discussions/2222
+    '**/*.generated.*'
+];

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

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