vike 0.4.250 → 0.4.251-commit-9c5fb90

package/dist/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js

@@ -1,7 +1,9 @@
+import '../../assertEnvVite.js';
 export { configDefinitionsBuiltIn };
-import { assert, assertUsage } from '../../utils.js';
+import { assert, assertUsage } from '../../../../utils/assert.js';
 import { getConfigDefinedAt, } from '../../../../shared-server-client/page-configs/getConfigDefinedAt.js';
 import { getConfigValueSourceRelevantAnyEnv, getConfigValueSourcesRelevant, isConfigSourceValueNull, } from '../../plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js';
+import { getFileSuffixes } from '../../../../shared-server-node/getFileSuffixes.js';
 const configDefinitionsBuiltIn = {
     onRenderHtml: {
         env: { server: true },
@@ -32,12 +34,14 @@ const configDefinitionsBuiltIn = {
         global: true,
         cumulative: true,
     },
+    onHookCall: {
+        env: { server: true, client: true },
+        global: true,
+        cumulative: true,
+    },
     onBeforeRender: {
         env: { server: true },
     },
-    onBeforePrerenderStart: {
-        env: { server: true, production: true },
-    },
     Page: {
         env: { server: true, client: true },
     },
@@ -117,7 +121,7 @@ const configDefinitionsBuiltIn = {
                 // Exclude `.ssr.js` hooks (they don't require pageContext.json requests)
                 .filter((source) => {
                 const { definedAt } = source;
-                if ('filePathAbsoluteVite' in definedAt && definedAt.filePathAbsoluteVite.includes('.ssr.')) {
+                if ('fileName' in definedAt && getFileSuffixes(definedAt.fileName).includes('ssr')) {
                     return false;
                 }
                 return true;
@@ -183,18 +187,22 @@ const configDefinitionsBuiltIn = {
     host: {
         env: { config: true },
         global: true,
+        vite: true,
     },
     port: {
         env: { config: true },
         global: true,
+        vite: true,
     },
     mode: {
         env: { config: true },
         global: true,
+        vite: true,
     },
     force: {
         env: { config: true },
         global: true,
+        vite: true,
     },
     csp: {
         env: { server: true },
@@ -216,22 +224,31 @@ const configDefinitionsBuiltIn = {
         env: { config: true },
         global: true,
     },
-    onPrerenderStart: {
-        env: { server: true, production: true },
-        eager: true,
-        global: true,
-    },
     onBeforeRoute: {
         env: { server: true, client: 'if-client-routing' },
         eager: true,
         global: true,
     },
+    // TODO: align all meta configs
     prerender: {
         env: { config: true },
         global: (value, { isGlobalLocation }) => typeof value === 'object' || isGlobalLocation,
         cumulative: true,
     },
-    vite: { env: { config: true }, global: true, cumulative: true },
+    onPrerenderStart: {
+        env: { server: true, production: true },
+        eager: true,
+        global: true,
+    },
+    onBeforePrerenderStart: {
+        env: { server: true, production: true },
+    },
+    vite: {
+        env: { config: true },
+        cumulative: true,
+        global: true,
+        vite: true,
+    },
     disableAutoFullBuild: {
         env: { config: true },
         global: true,
@@ -240,18 +257,22 @@ const configDefinitionsBuiltIn = {
     vite6BuilderApp: {
         env: { config: true },
         global: true,
+        vite: true,
     },
     includeAssetsImportedByServer: {
         env: { config: true },
         global: true,
+        vite: true,
     },
     baseAssets: {
         env: { config: true, server: true },
         global: true,
+        vite: true,
     },
     baseServer: {
         env: { config: true, server: true },
         global: true,
+        vite: true,
     },
     redirects: {
         env: { server: true },
@@ -274,9 +295,7 @@ const configDefinitionsBuiltIn = {
         env: { config: true },
         cumulative: true,
         global: true,
-        /* TODO
         vite: true,
-        */
     },
 };
 function getConfigEnv(pageConfig, configName) {

package/dist/node/vite/shared/resolveVikeConfigInternal/crawlPlusFilePaths/ignorePatternsBuiltIn.d.ts

@@ -1 +1,2 @@
+import '../../../assertEnvVite.js';
 export declare const ignorePatternsBuiltIn: readonly ["**/node_modules/**", "**/ejected/**", "**/*.telefunc.*", "**/.history/**", "**/*.generated.*"];

package/dist/node/vite/shared/resolveVikeConfigInternal/crawlPlusFilePaths/ignorePatternsBuiltIn.js

@@ -1,3 +1,4 @@
+import '../../../assertEnvVite.js';
 export const ignorePatternsBuiltIn = [
     '**/node_modules/**',
     // Ejected Vike extensions, see https://github.com/snake-py/eject

package/dist/node/vite/shared/resolveVikeConfigInternal/crawlPlusFilePaths.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { crawlPlusFilePaths };
 export { isPlusFile };
 export { getPlusFileValueConfigName };

package/dist/node/vite/shared/resolveVikeConfigInternal/crawlPlusFilePaths.js

@@ -1,7 +1,18 @@
+import '../../assertEnvVite.js';
 export { crawlPlusFilePaths };
 export { isPlusFile };
 export { getPlusFileValueConfigName };
-import { assertPosixPath, assert, scriptFileExtensionPattern, assertIsNotProductionRuntime, isVersionMatch, isScriptFile, scriptFileExtensionList, createDebug, deepEqual, assertUsage, assertFilePathAbsoluteFilesystem, assertWarning, hasProp, isNotNullish, getGlobalObject, } from '../../utils.js';
+import { assert, assertUsage, assertWarning } from '../../../../utils/assert.js';
+import { assertIsNotProductionRuntime } from '../../../../utils/assertSetup.js';
+import { isVersionMatch } from '../../../../utils/assertVersion.js';
+import { createDebug } from '../../../../utils/debug.js';
+import { deepEqual } from '../../../../utils/deepEqual.js';
+import { getGlobalObject } from '../../../../utils/getGlobalObject.js';
+import { hasProp } from '../../../../utils/hasProp.js';
+import { assertFilePathAbsoluteFilesystem } from '../../../../utils/isFilePathAbsoluteFilesystem.js';
+import { isNotNullish } from '../../../../utils/isNullish.js';
+import { scriptFileExtensionPattern, isScriptFile, scriptFileExtensionList } from '../../../../utils/isScriptFile.js';
+import { assertPosixPath } from '../../../../utils/path.js';
 import path from 'node:path';
 import { glob } from 'tinyglobby';
 import { exec } from 'node:child_process';

package/dist/node/vite/shared/resolveVikeConfigInternal/filesystemRouting.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { getFilesystemRouteString };
 export { getFilesystemRouteDefinedBy };
 export { isInherited };

package/dist/node/vite/shared/resolveVikeConfigInternal/filesystemRouting.js

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { getFilesystemRouteString };
 export { getFilesystemRouteDefinedBy };
 export { isInherited };
@@ -7,7 +8,10 @@ export { applyFilesystemRoutingRootEffect };
 // For ./filesystemRouting.spec.ts
 export { getLogicalPath };
 import pc from '@brillout/picocolors';
-import { assert, assertIsNotProductionRuntime, assertPosixPath, assertWarning, higherFirst } from '../../utils.js';
+import { assert, assertWarning } from '../../../../utils/assert.js';
+import { assertIsNotProductionRuntime } from '../../../../utils/assertSetup.js';
+import { assertPosixPath } from '../../../../utils/path.js';
+import { higherFirst } from '../../../../utils/sorter.js';
 assertIsNotProductionRuntime();
 /**
  * `getLocationId('/pages/some-page/+Page.js')` => `'/pages/some-page'`

package/dist/node/vite/shared/resolveVikeConfigInternal/getConfigFileExport.d.ts

@@ -1,2 +1,3 @@
+import '../../assertEnvVite.js';
 export { getConfigFileExport };
 declare function getConfigFileExport(fileExports: Record<string, unknown>, filePathToShowToUser: string): Record<string, unknown>;

package/dist/node/vite/shared/resolveVikeConfigInternal/getConfigFileExport.js

@@ -1,7 +1,9 @@
+import '../../assertEnvVite.js';
 export { getConfigFileExport };
 import pc from '@brillout/picocolors';
 import { assertPlusFileExport } from '../../../../shared-server-client/page-configs/assertPlusFileExport.js';
-import { assertUsage, isObject } from '../../utils.js';
+import { assertUsage } from '../../../../utils/assert.js';
+import { isObject } from '../../../../utils/isObject.js';
 function getConfigFileExport(fileExports, filePathToShowToUser) {
     assertPlusFileExport(fileExports, filePathToShowToUser, 'config');
     const usesNamedExport = !!fileExports.config;

package/dist/node/vite/shared/resolveVikeConfigInternal/getPlusFilesByLocationId.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { getPlusFilesByLocationId };
 export type { PlusFileValue };
 export type { PlusFile };

package/dist/node/vite/shared/resolveVikeConfigInternal/getPlusFilesByLocationId.js

@@ -1,5 +1,6 @@
+import '../../assertEnvVite.js';
 export { getPlusFilesByLocationId };
-import { assert } from '../../utils.js';
+import { assert } from '../../../../utils/assert.js';
 import { configDefinitionsBuiltIn } from './configDefinitionsBuiltIn.js';
 import { getLocationId } from './filesystemRouting.js';
 import { crawlPlusFilePaths, getPlusFileValueConfigName } from './crawlPlusFilePaths.js';

package/dist/node/vite/shared/resolveVikeConfigInternal/loadFileAtConfigTime.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { loadPointerImport };
 export { loadValueFile };
 export { loadConfigFile };

package/dist/node/vite/shared/resolveVikeConfigInternal/loadFileAtConfigTime.js

@@ -1,8 +1,12 @@
+import '../../assertEnvVite.js';
 // Files loaded at config time:
 export { loadPointerImport };
 export { loadValueFile };
 export { loadConfigFile };
-import { assert, assertUsage, assertIsNotProductionRuntime, isArrayOfStrings, isObject } from '../../utils.js';
+import { assert, assertUsage } from '../../../../utils/assert.js';
+import { assertIsNotProductionRuntime } from '../../../../utils/assertSetup.js';
+import { isArrayOfStrings } from '../../../../utils/isArrayOfStrings.js';
+import { isObject } from '../../../../utils/isObject.js';
 import { transpileAndExecuteFile } from './transpileAndExecuteFile.js';
 import { getConfigDefinitionOptional } from '../resolveVikeConfigInternal.js';
 import { assertPlusFileExport } from '../../../../shared-server-client/page-configs/assertPlusFileExport.js';

package/dist/node/vite/shared/resolveVikeConfigInternal/pointerImports.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { transformPointerImports };
 export { parsePointerImportData };
 export { isPointerImportData };

package/dist/node/vite/shared/resolveVikeConfigInternal/pointerImports.js

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { transformPointerImports };
 export { parsePointerImportData };
 export { isPointerImportData };
@@ -19,7 +20,10 @@ export { assertPointerImportPath };
 //   - Esbuild removes comments: https://github.com/evanw/esbuild/issues/1439#issuecomment-877656182
 //   - Using source maps to track these magic comments is brittle (source maps can easily break)
 import { parseSync } from '@babel/core';
-import { assert, assertUsage, assertWarning, isFilePathAbsolute, isImportPath, styleFileRE } from '../../utils.js';
+import { assert, assertUsage, assertWarning } from '../../../../utils/assert.js';
+import { isFilePathAbsolute } from '../../../../utils/isFilePathAbsoluteFilesystem.js';
+import { isImportPath } from '../../../../utils/isImportPath.js';
+import { styleFileRE } from '../../../../utils/styleFileRE.js';
 import pc from '@brillout/picocolors';
 import { parseImportString, isImportString, serializeImportString } from '../importString.js';
 function transformPointerImports(code, filePathToShowToUser2, pointerImports, 

package/dist/node/vite/shared/resolveVikeConfigInternal/resolvePointerImport.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { resolvePointerImport };
 export { resolvePointerImportData };
 export type { PointerImport };

package/dist/node/vite/shared/resolveVikeConfigInternal/resolvePointerImport.js

@@ -1,7 +1,13 @@
+import '../../assertEnvVite.js';
 export { resolvePointerImport };
 export { resolvePointerImportData };
 import pc from '@brillout/picocolors';
-import { assert, assertPosixPath, assertUsage, isFilePathAbsolute, isImportPathRelative, isImportPathNpmPackageOrPathAlias, requireResolveOptional, } from '../../utils.js';
+import { assert, assertUsage } from '../../../../utils/assert.js';
+import { isFilePathAbsolute } from '../../../../utils/isFilePathAbsoluteFilesystem.js';
+import { isImportPathRelative } from '../../../../utils/isImportPath.js';
+import { isImportPathNpmPackageOrPathAlias } from '../../../../utils/parseNpmPackage.js';
+import { assertPosixPath } from '../../../../utils/path.js';
+import { requireResolveOptional } from '../../../../utils/requireResolve.js';
 import { assertPointerImportPath, parsePointerImportData } from './pointerImports.js';
 import { getFilePathAbsoluteUserRootDir, getFilePathResolved, getFilePathUnresolved } from '../getFilePath.js';
 function resolvePointerImport(configValue, importerFilePath, userRootDir, configName) {

package/dist/node/vite/shared/resolveVikeConfigInternal/transpileAndExecuteFile.d.ts

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { transpileAndExecuteFile };
 export { getConfigBuildErrorFormatted };
 export { getConfigExecutionErrorIntroMsg };

package/dist/node/vite/shared/resolveVikeConfigInternal/transpileAndExecuteFile.js

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { transpileAndExecuteFile };
 export { getConfigBuildErrorFormatted };
 export { getConfigExecutionErrorIntroMsg };
@@ -5,9 +6,21 @@ export { isTemporaryBuildFile };
 import { build, formatMessages, version, } from 'esbuild';
 import fs from 'node:fs';
 import path from 'node:path';
+import crypto from 'node:crypto';
 import pc from '@brillout/picocolors';
 import { import_ } from '@brillout/import';
-import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, assertWarning, isObject, toPosixPath, assertUsage, isPlainScriptFile, createDebug, assertFilePathAbsoluteFilesystem, assertIsImportPathNpmPackage, genPromise, isVitest, isImportPathNpmPackageOrPathAlias, isImportPathRelative, requireResolveOptionalDir, } from '../../utils.js';
+import { assert, assertWarning, assertUsage } from '../../../../utils/assert.js';
+import { assertIsNotProductionRuntime } from '../../../../utils/assertSetup.js';
+import { createDebug } from '../../../../utils/debug.js';
+import { genPromise } from '../../../../utils/genPromise.js';
+import { assertFilePathAbsoluteFilesystem } from '../../../../utils/isFilePathAbsoluteFilesystem.js';
+import { isImportPathRelative } from '../../../../utils/isImportPath.js';
+import { isObject } from '../../../../utils/isObject.js';
+import { isPlainScriptFile } from '../../../../utils/isScriptFile.js';
+import { isVitest } from '../../../../utils/isVitest.js';
+import { assertIsImportPathNpmPackage, isImportPathNpmPackageOrPathAlias } from '../../../../utils/parseNpmPackage.js';
+import { assertPosixPath, toPosixPath } from '../../../../utils/path.js';
+import { requireResolveOptionalDir } from '../../../../utils/requireResolve.js';
 import { transformPointerImports } from './pointerImports.js';
 import sourceMapSupport from 'source-map-support';
 import { getFilePathAbsoluteUserRootDir } from '../getFilePath.js';
@@ -285,7 +298,7 @@ async function executeTranspiledFile(filePath, code) {
     const { filePathAbsoluteFilesystem } = filePath;
     // Alternative to using a temporary file: https://github.com/vitejs/vite/pull/13269
     //  - But seems to break source maps, so I don't think it's worth it
-    const filePathTmp = getTemporaryBuildFilePath(filePathAbsoluteFilesystem);
+    const filePathTmp = getTemporaryBuildFilePath(filePathAbsoluteFilesystem, code);
     fs.writeFileSync(filePathTmp, code);
     const clean = () => fs.unlinkSync(filePathTmp);
     let fileExports = {};
@@ -300,6 +313,8 @@ async function executeTranspiledFile(filePath, code) {
 async function executeFile(filePathToExecuteAbsoluteFilesystem, filePathSourceFile) {
     let fileExports = {};
     try {
+        // `import(filePath)` is cached: if `filePath` doesn't change => the file isn't re-executed. The import() cache is required for the +meta.vite implementation to work correctly, see hasViteConfigChanged()
+        // https://github.com/vikejs/vike/blob/0a4f54ff3eea128cbd886c0ac88972e44a74cf99/packages/vike/src/node/vite/shared/resolveVikeConfigInternal.ts#L305
         fileExports = await import_(filePathToExecuteAbsoluteFilesystem);
     }
     catch (err) {
@@ -344,12 +359,14 @@ function getConfigExecutionErrorIntroMsg(err) {
     const errIntroMsg = execErrIntroMsg.get(err);
     return errIntroMsg ?? null;
 }
-function getTemporaryBuildFilePath(filePathAbsoluteFilesystem) {
+function getTemporaryBuildFilePath(filePathAbsoluteFilesystem, code) {
     assertPosixPath(filePathAbsoluteFilesystem);
-    const dirname = path.posix.dirname(filePathAbsoluteFilesystem);
+    const fileDir = path.posix.dirname(filePathAbsoluteFilesystem);
     const filename = path.posix.basename(filePathAbsoluteFilesystem);
+    // Using content hash in file path, so that the cache of dynamic `import()` behaves as we want.
+    const fileHash = crypto.createHash('md5').update(code).digest('hex').slice(0, 12);
     // Syntax with semicolon `build:${/*...*/}` doesn't work on Windows: https://github.com/vikejs/vike/issues/800#issuecomment-1517329455
-    const filePathTmp = path.posix.join(dirname, `${filename}.build-${getRandomId()}.mjs`);
+    const filePathTmp = path.posix.join(fileDir, `${filename}.build-${fileHash}.mjs`);
     assert(isTemporaryBuildFile(filePathTmp));
     return filePathTmp;
 }

package/dist/node/vite/shared/resolveVikeConfigInternal.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvVite.js';
 export { getVikeConfig };
 export type { VikeConfig };
 export { getVikeConfigInternal };
@@ -17,7 +18,7 @@ import { type GlobalConfigPublic } from '../../../shared-server-client/page-conf
 import { type PlusFile } from './resolveVikeConfigInternal/getPlusFilesByLocationId.js';
 import type { PrerenderContextPublic } from '../../prerender/runPrerender.js';
 import type { ResolvedConfig, UserConfig } from 'vite';
-import { type DangerouslyUseInternals } from '../../../shared-server-client/getProxyForPublicUsage.js';
+import { type DangerouslyUseInternals } from '../../../shared-server-client/getPublicProxy.js';
 type VikeConfigContext = {
     userRootDir: string;
     isDev: boolean;

package/dist/node/vite/shared/resolveVikeConfigInternal.js

@@ -1,3 +1,4 @@
+import '../assertEnvVite.js';
 // Public usage
 export { getVikeConfig };
 // Internal usage
@@ -10,7 +11,27 @@ export { isV1Design };
 export { getConfVal };
 export { getConfigDefinitionOptional };
 export { getVikeConfigFromCliOrEnv };
-import { assertPosixPath, assert, isObject, assertUsage, assertWarning, objectEntries, hasProp, includes, assertIsNotProductionRuntime, getMostSimilar, joinEnglish, assertKeys, objectKeys, objectFromEntries, unique, isCallable, makeFirst, lowerFirst, makeLast, genPromise, checkType, objectAssign, getGlobalObject, } from '../utils.js';
+import { deepEqual } from '../../../utils/deepEqual.js';
+import { assertKeys } from '../../../utils/assertKeys.js';
+import { assertIsNotProductionRuntime } from '../../../utils/assertSetup.js';
+import { getMostSimilar } from '../../../utils/getMostSimilar.js';
+import { includes } from '../../../utils/includes.js';
+import { objectEntries } from '../../../utils/objectEntries.js';
+import { objectFromEntries } from '../../../utils/objectFromEntries.js';
+import { objectKeys } from '../../../utils/objectKeys.js';
+import { makeLast } from '../../../utils/sorter.js';
+import { assert, assertUsage, assertWarning } from '../../../utils/assert.js';
+import { checkType } from '../../../utils/checkType.js';
+import { genPromise } from '../../../utils/genPromise.js';
+import { getGlobalObject } from '../../../utils/getGlobalObject.js';
+import { hasProp } from '../../../utils/hasProp.js';
+import { isCallable } from '../../../utils/isCallable.js';
+import { isObject } from '../../../utils/isObject.js';
+import { joinEnglish } from '../../../utils/joinEnglish.js';
+import { objectAssign } from '../../../utils/objectAssign.js';
+import { makeFirst, lowerFirst } from '../../../utils/sorter.js';
+import { unique } from '../../../utils/unique.js';
+import { assertPosixPath } from '../../../utils/path.js';
 import { configDefinitionsBuiltIn, } from './resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
 import { getFileSuffixes } from '../../../shared-server-node/getFileSuffixes.js';
 import { getLocationId, getFilesystemRouteString, getFilesystemRouteDefinedBy, isInherited, sortAfterInheritanceOrder, applyFilesystemRoutingRootEffect, } from './resolveVikeConfigInternal/filesystemRouting.js';
@@ -30,11 +51,11 @@ import { getEnvVarObject } from './getEnvVarObject.js';
 import { getVikeApiOperation } from '../../../shared-server-node/api-context.js';
 import { getCliOptions } from '../../cli/context.js';
 import { resolvePrerenderConfigGlobal } from '../../prerender/resolvePrerenderConfig.js';
-import { getProxyForPublicUsage, } from '../../../shared-server-client/getProxyForPublicUsage.js';
+import { getPublicProxy } from '../../../shared-server-client/getPublicProxy.js';
 import { setVikeConfigError } from '../../../shared-server-node/getVikeConfigError.js';
 assertIsNotProductionRuntime();
 const globalObject = getGlobalObject('vite/shared/resolveVikeConfigInternal.ts', {
-    restartVite: false,
+    restartViteBecauseOfError: false,
     vikeConfigHasBuildError: null,
     isV1Design_: null,
     vikeConfigPromise: null,
@@ -70,7 +91,7 @@ function getVikeConfig(
 // TO-DO/next-major-release: remove
 /** @deprecated the `config` argument isn't needed anymore — remove it (it doesn't have any effect) */
 _config) {
-    /* TO-DO/eventualy: add deprecation warning. We don't do it yet because of vike-server and vike-cloudflare which are using getVikeConfig() with the argument.
+    /* TO-DO/eventually: add deprecation warning. We don't do it yet because of vike-server and vike-cloudflare which are using getVikeConfig() with the argument.
     assertWarning(
       config === undefined,
       `getVikeConfig() doesn't accept any argument anymore — remove the argument (it doesn't have any effect)`,
@@ -80,7 +101,7 @@ _config) {
     assert(globalObject.vikeConfigSync);
     const vikeConfig = globalObject.vikeConfigSync;
     assertUsage(vikeConfig, 'getVikeConfig() can only be used when Vite is loaded (i.e. during development or build) — Vite is never loaded in production.');
-    const vikeConfigPublic = getProxyForPublicUsage(vikeConfig, 'vikeConfig');
+    const vikeConfigPublic = getPublicProxy(vikeConfig, 'vikeConfig');
     return vikeConfigPublic;
 }
 function setVikeConfigContext(vikeConfigCtx_) {
@@ -115,6 +136,7 @@ async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, v
         transpileCache: {},
         vikeConfigDependencies: new Set(),
     };
+    const vikeConfigOld = globalObject.vikeConfigSync;
     let hasError = false;
     let ret;
     let err;
@@ -143,13 +165,18 @@ async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, v
         const hadError = globalObject.vikeConfigHasBuildError;
         globalObject.vikeConfigHasBuildError = false;
         setVikeConfigError({ errorBuild: false });
+        let viteRestarted = false;
         if (hadError) {
             logConfigInfo(vikeConfigErrorRecoverMsg, 'error-resolve');
-            if (globalObject.restartVite) {
-                globalObject.restartVite = false;
+            if (globalObject.restartViteBecauseOfError) {
+                globalObject.restartViteBecauseOfError = false;
                 restartViteDevServer();
+                viteRestarted = true;
             }
         }
+        if (!viteRestarted && isDev && hasViteConfigChanged(vikeConfigOld, ret)) {
+            restartViteDevServer();
+        }
         resolve(ret);
     }
     else {
@@ -158,16 +185,34 @@ async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, v
         globalObject.vikeConfigHasBuildError = true;
         setVikeConfigError({ errorBuild: { err } });
         if (!doNotRestartViteOnError)
-            globalObject.restartVite = true;
+            globalObject.restartViteBecauseOfError = true;
         if (!isDev) {
             reject(err);
         }
         else {
             logErrorServerDev(err, null);
-            resolve(getVikeConfigDummy(esbuildCache));
+            resolve(await getVikeConfigDummy(esbuildCache));
         }
     }
 }
+// `+meta.vite: true` => restart Vite if config changes
+function hasViteConfigChanged(vikeConfigOld, vikeConfigNew) {
+    if (!vikeConfigOld)
+        return false;
+    const configDefinitions = vikeConfigNew._pageConfigGlobal.configDefinitions;
+    const viteConfigNames = Object.keys(configDefinitions).filter((configName) => configDefinitions[configName].vite);
+    const configValuesOld = getConfigValues(vikeConfigOld._pageConfigGlobal, true);
+    const configValuesNew = getConfigValues(vikeConfigNew._pageConfigGlobal, true);
+    for (const configName of viteConfigNames) {
+        const valOld = configValuesOld[configName]?.value;
+        const valNew = configValuesNew[configName]?.value;
+        // Works thanks to the import() cache, see executeFile()
+        // https://github.com/vikejs/vike/blob/0a4f54ff3eea128cbd886c0ac88972e44a74cf99/packages/vike/src/node/vite/shared/resolveVikeConfigInternal/transpileAndExecuteFile.ts#L386
+        if (!deepEqual(valOld, valNew))
+            return true;
+    }
+    return false;
+}
 async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esbuildCache) {
     const plusFilesByLocationId = await getPlusFilesByLocationId(userRootDir, esbuildCache);
     const configDefinitionsResolved = await resolveConfigDefinitions(plusFilesByLocationId, userRootDir, esbuildCache);
@@ -178,7 +223,7 @@ async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esb
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
     setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved);
     const globalConfigPublic = resolveGlobalConfig(pageConfigGlobal, pageConfigs);
-    const prerenderContext = resolvePrerenderContext({
+    const prerenderContext = await resolvePrerenderContext({
         config: globalConfigPublic.config,
         _from: globalConfigPublic._from,
         _pageConfigs: pageConfigs,
@@ -202,7 +247,7 @@ async function resolveConfigDefinitions(plusFilesByLocationId, userRootDir, esbu
         .flat()
         .sort((plusFile1, plusFile2) => sortAfterInheritanceOrderGlobal(plusFile1, plusFile2, plusFilesByLocationId, null));
     const configDefinitionsGlobal = getConfigDefinitions(
-    // We use `plusFilesByLocationId` in order to allow local Vike extensions to create global configs, and to set the value of global configs such as `+vite` (enabling Vike extensions to add Vite plugins).
+    // We use `plusFilesByLocationId` in order to allow non-global Vike extensions to create global configs, and to set the value of global configs such as `+vite` (enabling Vike extensions to add Vite plugins).
     plusFilesByLocationIdOrdered, (configDef) => !!configDef.global);
     await loadCustomConfigBuildTimeFiles(plusFilesByLocationId, configDefinitionsGlobal, userRootDir, esbuildCache);
     const configDefinitionsAll = getConfigDefinitions(Object.values(plusFilesByLocationId).flat());
@@ -259,7 +304,7 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesByLocationI
     };
     objectEntries(configDefinitionsResolved.configDefinitionsGlobal).forEach(([configName, configDef]) => {
         const sources = resolveConfigValueSources(configName, configDef, 
-        // We use `plusFilesByLocationId` in order to allow local Vike extensions to create global configs, and to set the value of global configs such as `+vite` (enabling Vike extensions to add Vite plugins).
+        // We use `plusFilesByLocationId` in order to allow non-global Vike extensions to create global configs, and to set the value of global configs such as `+vite` (enabling Vike extensions to add Vite plugins).
         Object.values(plusFilesByLocationId).flat(), userRootDir, true, plusFilesByLocationId);
         if (sources.length === 0)
             return;
@@ -322,7 +367,7 @@ function assertGlobalConfigLocation(configName, sources, plusFilesByLocationId,
         // It's `null` when the config is defined by `vike(options)` in vite.config.js
         assert(plusFile);
         const { filePathAbsoluteUserRootDir } = plusFile.filePath;
-        // Allow local Vike extensions to set global configs (`filePathAbsoluteUserRootDir===null` for Vike extension)
+        // Allow non-global Vike extensions to set global configs (`filePathAbsoluteUserRootDir===null` for Vike extension)
         if (!filePathAbsoluteUserRootDir)
             return;
         assert(!plusFile.isExtensionConfig);
@@ -330,7 +375,7 @@ function assertGlobalConfigLocation(configName, sources, plusFilesByLocationId,
             const configDef = configDefinitionsGlobal[configName];
             assert(configDef);
             const isConditionallyGlobal = isCallable(configDef.global);
-            const errBeg = `${filePathAbsoluteUserRootDir} (which is a local config file) sets the config ${pc.cyan(configName)}`;
+            const errBeg = `${filePathAbsoluteUserRootDir} (which is a non-global config file) sets the config ${pc.cyan(configName)}`;
             const errMid = !isConditionallyGlobal
                 ? "but it's a global config"
                 : 'to a value that is global';
@@ -801,6 +846,13 @@ function assertMetaUsage(metaVal, metaConfigDefinedAt) {
                 assertUsage(false, `${metaConfigDefinedAt} sets ${pc.cyan(`meta.${configName}.effect`)} but it's only supported if meta.${configName}.env has ${pc.cyan('{ config: true }')} (but it's ${pc.cyan(JSON.stringify(configEnv))} instead)`);
             }
         }
+        // Validate if `vite: true` then `global` and `env.config`
+        if (def.vite) {
+            assert(metaConfigDefinedAt);
+            const errMsgBegin = `${metaConfigDefinedAt} sets ${pc.cyan(`meta.${configName}.vite`)} to ${pc.cyan('true')} which requires`;
+            assertUsage(def.global, `${errMsgBegin} ${pc.cyan(`meta.${configName}.global`)} to be ${pc.cyan('true')}`);
+            assertUsage(configEnv.config, `${errMsgBegin} ${pc.cyan(`meta.${configName}.env.config`)} to be ${pc.cyan('true')}`);
+        }
     });
 }
 // Test: https://github.com/vikejs/vike/blob/871a111a77d637bbd156b07be5ae728c3d595501/test/playground/pages/config-meta/effect/e2e-test.ts
@@ -1092,8 +1144,8 @@ function isGlobalLocation(locationId, plusFilesByLocationId) {
         .map(([locationId]) => locationId);
     return locationIdsPage.every((locId) => isInherited(locationId, locId));
 }
-function resolvePrerenderContext(vikeConfig) {
-    const { isPrerenderingEnabled, isPrerenderingEnabledForAllPages } = resolvePrerenderConfigGlobal(vikeConfig);
+async function resolvePrerenderContext(vikeConfig) {
+    const { isPrerenderingEnabled, isPrerenderingEnabledForAllPages } = await resolvePrerenderConfigGlobal(vikeConfig);
     globalObject.prerenderContext ?? (globalObject.prerenderContext = {
         isPrerenderingEnabled: false,
         isPrerenderingEnabledForAllPages: false,
@@ -1112,7 +1164,7 @@ function restartViteDevServer() {
     swallowViteLogForceOptimization_enable();
     (async () => {
         try {
-            await viteDevServer.restart(true);
+            await viteDevServer.restart();
         }
         catch (err) {
             console.error('Vite restart error:');
@@ -1121,14 +1173,14 @@ function restartViteDevServer() {
     })();
     swallowViteLogForceOptimization_disable();
 }
-function getVikeConfigDummy(esbuildCache) {
+async function getVikeConfigDummy(esbuildCache) {
     const pageConfigsDummy = [];
     const pageConfigGlobalDummy = {
         configValueSources: {},
         configDefinitions: {},
     };
     const globalConfigPublicDummy = resolveGlobalConfig(pageConfigGlobalDummy, pageConfigsDummy);
-    const prerenderContextDummy = resolvePrerenderContext({
+    const prerenderContextDummy = await resolvePrerenderContext({
         config: globalConfigPublicDummy.config,
         _from: globalConfigPublicDummy._from,
         _pageConfigs: pageConfigsDummy,

package/dist/node/vite/shared/rollupIsEsm.d.ts

@@ -1,3 +1,5 @@
-export declare function rollupIsEsm(rollupOptions: {
+import '../assertEnvVite.js';
+export { rollupIsEsm };
+declare function rollupIsEsm(rollupOptions: {
     format: string;
 }): boolean;

package/dist/node/vite/shared/rollupIsEsm.js

@@ -1,5 +1,7 @@
-import { assert } from '../utils.js';
-export function rollupIsEsm(rollupOptions) {
+import '../assertEnvVite.js';
+export { rollupIsEsm };
+import { assert } from '../../../utils/assert.js';
+function rollupIsEsm(rollupOptions) {
     const { format } = rollupOptions;
     assert(typeof format === 'string');
     assert(format === 'amd' ||

package/dist/server/__internal/index.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvServer.js';
 export { setGlobalContext_prodBuildEntry } from '../runtime/globalContext.js';
 export { route, getPagesAndRoutes };
 export type { PageRoutes, PageFile, PageConfigRuntime as PageConfig };

package/dist/server/__internal/index.js

@@ -1,3 +1,4 @@
+import '../assertEnvServer.js';
 // Used by vike:build:pluginProdBuildEntry
 export { setGlobalContext_prodBuildEntry } from '../runtime/globalContext.js';
 // Used by vite-plugin-vercel

package/dist/server/__internal/vite.d.ts

@@ -1 +1,2 @@
+import '../assertEnvServer.js';
 export { startupLog } from '../../node/api/dev.js';