vike 0.4.259 → 0.4.260-commit-2e7fb2a

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

@@ -9,6 +9,7 @@ import { removeEmptyLines } from '../../../utils/removeEmptyLines.js';
 import { trimWithAnsi, trimWithAnsiTrailOnly } from '../../../utils/trimWithAnsi.js';
 import { assert } from '../../../utils/assert.js';
 import { getGlobalObject } from '../../../utils/getGlobalObject.js';
+import { setTimeoutUnref } from '../../../utils/setTimeoutUnref.js';
 import { getRequestId_withAsyncHook } from '../../../server/runtime/asyncHook.js';
 import { logErrorServerDev, logVite } from './loggerDev.js';
 import '../assertEnvVite.js';
@@ -28,7 +29,7 @@ function interceptViteLogs(config) {
 }
 function intercept(loggerType, config) {
     let isBeginning = true;
-    setTimeout(() => (isBeginning = false), 10 * 1000);
+    setTimeoutUnref(() => (isBeginning = false), 10 * 1000);
     config.logger[loggerType] = (msg, options = {}) => {
         assert(!isDebugError());
         if (swallowViteLogForceOptimization(msg))
@@ -132,7 +133,7 @@ function swallowViteLogConnected() {
     globalObject.swallowViteLogConnected_originalConsoleLog = console.log;
     // The message `[vite] connected.` doesn't go through Vite's logger thus we must monkey patch console.log()
     console.log = swallowViteLogConnected_logPatch;
-    setTimeout(swallowViteLogConnected_clean, 3000);
+    setTimeoutUnref(swallowViteLogConnected_clean, 3000);
 }
 // Remove console.log() monkey patch
 function swallowViteLogConnected_clean() {

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

@@ -1,6 +1,8 @@
 export { assertExtensionsConventions };
 export { assertExtensionsRequire };
-import type { PlusFile } from './getPlusFilesByLocationId.js';
+export { getExtensionName };
+import type { PlusFile } from './getPlusFiles.js';
 import '../../assertEnvVite.js';
 declare function assertExtensionsConventions(plusFile: PlusFile): void;
 declare function assertExtensionsRequire(plusFiles: PlusFile[]): void;
+declare function getExtensionName(plusFile: PlusFile): null | string;

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

@@ -1,5 +1,6 @@
 export { assertExtensionsConventions };
 export { assertExtensionsRequire };
+export { getExtensionName };
 import pc from '@brillout/picocolors';
 import { PROJECT_VERSION } from '../../../../utils/PROJECT_VERSION.js';
 import { assert, assertUsage, assertWarning } from '../../../../utils/assert.js';
@@ -21,14 +22,14 @@ function assertConfigExportPath(plusFile) {
         assert(!p.includes('node_modules'));
         return;
     }
-    const name = getNameValue(plusFile);
+    const name = getExtensionName(plusFile);
     assert(name); // already asserted in assertExtensionName()
     const importPathAbsoluteExpected = `${name}/config`;
     assertWarning(importPathAbsolute === importPathAbsoluteExpected, `The Vike configuration of ${pc.bold(name)} is exported at ${pc.bold(importPathAbsolute)}, but it should be exported at ${pc.bold(importPathAbsoluteExpected)} instead.`, { onlyOnce: true });
 }
 function assertExtensionName(plusFile) {
     const filePathToShowToUser = getFilePathToShowToUser(plusFile);
-    const name = getNameValue(plusFile);
+    const name = getExtensionName(plusFile);
     assertUsage(name, `Vike extension name missing: the config ${filePathToShowToUser} must define the setting ${pc.cyan('name')}`);
 }
 function assertExtensionsRequire(plusFiles) {
@@ -36,7 +37,7 @@ function assertExtensionsRequire(plusFiles) {
     // Collect extensions
     const extensions = {};
     plusFilesRelevantList.forEach((plusFile) => {
-        const name = getNameValue(plusFile);
+        const name = getExtensionName(plusFile);
         if (name) {
             const version = getExtensionVersion(name, plusFile);
             extensions[name] = version;
@@ -47,7 +48,7 @@ function assertExtensionsRequire(plusFiles) {
         const require = resolveRequireSetting(plusFile);
         if (!require)
             return;
-        const name = getNameValue(plusFile);
+        const name = getExtensionName(plusFile);
         const filePathToShowToUser = getFilePathToShowToUser(plusFile);
         assertUsage(name, `Setting ${pc.bold('name')} is required for being able to use setting ${pc.bold('require')} in ${filePathToShowToUser}.`);
         Object.entries(require).forEach(([reqName, req]) => {
@@ -96,7 +97,7 @@ function resolveRequireSetting(plusFile) {
     });
     return requireSetting;
 }
-function getNameValue(plusFile) {
+function getExtensionName(plusFile) {
     const confVal = getConfVal(plusFile, 'name');
     if (!confVal)
         return null;

package/dist/node/vite/shared/resolveVikeConfigInternal/{crawlPlusFilePaths.d.ts → crawlPlusFiles.d.ts}

@@ -1,8 +1,8 @@
-export { crawlPlusFilePaths };
+export { crawlPlusFiles };
 export { isPlusFile };
 export { getPlusFileValueConfigName };
 import '../../assertEnvVite.js';
-declare function crawlPlusFilePaths(userRootDir: string): Promise<{
+declare function crawlPlusFiles(userRootDir: string): Promise<{
     filePathAbsoluteUserRootDir: string;
 }[]>;
 declare function isPlusFile(filePath: string): boolean;

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

@@ -0,0 +1,71 @@
+export { crawlPlusFiles };
+export { isPlusFile };
+export { getPlusFileValueConfigName };
+import { assert, assertUsage } from '../../../../utils/assert.js';
+import { assertFilePathAbsoluteFilesystem } from '../../../../utils/isFilePathAbsoluteFilesystem.js';
+import { assertPosixPath } from '../../../../utils/path.js';
+import path from 'node:path';
+import { isTemporaryBuildFile } from './transpileAndExecuteFile.js';
+import '../../assertEnvVite.js';
+import { crawlFiles } from '../../../../utils/crawlFiles.js';
+import { scriptFileExtensionList } from '../../../../utils/isScriptFile.js';
+import { assertIsNotProductionRuntime } from '../../../../utils/assertSetup.js';
+assertIsNotProductionRuntime();
+async function crawlPlusFiles(userRootDir) {
+    assertPosixPath(userRootDir);
+    assertFilePathAbsoluteFilesystem(userRootDir);
+    let files = await crawlFiles({
+        filePattern: '**/+*',
+        fileExtension: scriptFileExtensionList,
+        cwd: userRootDir,
+        dot: false,
+        // Fallback to tinyglobby for users that dynamically generate plus files (and `.gitignore`s them)
+        globFallback: true,
+    });
+    // Filter build files
+    files = files.filter((filePath) => !isTemporaryBuildFile(filePath));
+    // Normalize
+    const plusFiles = files.map((filePath) => {
+        // Both `$ git-ls files` and tinyglobby return posix paths
+        assertPosixPath(filePath);
+        assert(!filePath.startsWith(userRootDir));
+        const filePathAbsoluteUserRootDir = path.posix.join('/', filePath);
+        assert(isPlusFile(filePathAbsoluteUserRootDir));
+        return { filePathAbsoluteUserRootDir };
+    });
+    return plusFiles;
+}
+function isPlusFile(filePath) {
+    assertPosixPath(filePath);
+    if (isTemporaryBuildFile(filePath))
+        return false;
+    const fileName = filePath.split('/').pop();
+    return fileName.startsWith('+');
+}
+function getPlusFileValueConfigName(filePath) {
+    if (!isPlusFile(filePath))
+        return null;
+    const fileName = path.posix.basename(filePath);
+    // assertNoUnexpectedPlusSign(filePath, fileName)
+    const basename = fileName.split('.')[0];
+    assert(basename.startsWith('+'));
+    const configName = basename.slice(1);
+    assertUsage(configName !== '', `${filePath} Invalid filename ${fileName}`);
+    return configName;
+}
+/* https://github.com/vikejs/vike/issues/1407
+function assertNoUnexpectedPlusSign(filePath: string, fileName: string) {
+  const dirs = path.posix.dirname(filePath).split('/')
+  dirs.forEach((dir, i) => {
+    const dirPath = dirs.slice(0, i + 1).join('/')
+    assertUsage(
+      !dir.includes('+'),
+      `Character '+' is a reserved character: remove '+' from the directory name ${dirPath}/`
+    )
+  })
+  assertUsage(
+    !fileName.slice(1).includes('+'),
+    `Character '+' is only allowed at the beginning of filenames: make sure ${filePath} doesn't contain any '+' in its filename other than its first letter`
+  )
+}
+*/

package/dist/node/vite/shared/resolveVikeConfigInternal/{getPlusFilesByLocationId.d.ts → getPlusFiles.d.ts}

@@ -1,10 +1,11 @@
-export { getPlusFilesByLocationId };
+export { getPlusFiles };
+export { getPlusFileFromConfigFile };
 export type { PlusFileValue };
 export type { PlusFile };
 export type { PlusFilesByLocationId };
 import { type LocationId } from './filesystemRouting.js';
 import { type EsbuildCache } from './transpileAndExecuteFile.js';
-import { PointerImportLoaded } from './loadFileAtConfigTime.js';
+import { type ConfigFile, PointerImportLoaded } from './loadFileAtConfigTime.js';
 import type { FilePathResolved } from '../../../../types/FilePath.js';
 import '../../assertEnvVite.js';
 type PlusFile = PlusFileConfig | PlusFileValue;
@@ -39,4 +40,5 @@ type PlusFileValue = PlusFileCommon & {
     isExtensionConfig?: undefined;
 };
 type PlusFilesByLocationId = Record<LocationId, PlusFile[]>;
-declare function getPlusFilesByLocationId(userRootDir: string, esbuildCache: EsbuildCache): Promise<PlusFilesByLocationId>;
+declare function getPlusFiles(userRootDir: string, esbuildCache: EsbuildCache): Promise<PlusFilesByLocationId>;
+declare function getPlusFileFromConfigFile(configFile: ConfigFile, isExtensionConfig: boolean, locationId: LocationId, userRootDir: string): PlusFileConfig;

package/dist/node/vite/shared/resolveVikeConfigInternal/{getPlusFilesByLocationId.js → getPlusFiles.js}

@@ -1,16 +1,17 @@
-export { getPlusFilesByLocationId };
+export { getPlusFiles };
+export { getPlusFileFromConfigFile };
 import { assert } from '../../../../utils/assert.js';
 import { metaBuiltIn } from './metaBuiltIn.js';
 import { getLocationId } from './filesystemRouting.js';
-import { crawlPlusFilePaths, getPlusFileValueConfigName } from './crawlPlusFilePaths.js';
+import { crawlPlusFiles, getPlusFileValueConfigName } from './crawlPlusFiles.js';
 import { getConfigFileExport } from './getConfigFileExport.js';
 import { loadConfigFile, loadValueFile } from './loadFileAtConfigTime.js';
 import { resolvePointerImport } from './resolvePointerImport.js';
 import { getFilePathResolved } from '../getFilePath.js';
 import { assertExtensionsConventions, assertExtensionsRequire } from './assertExtensions.js';
 import '../../assertEnvVite.js';
-async function getPlusFilesByLocationId(userRootDir, esbuildCache) {
-    const plusFilePaths = (await crawlPlusFilePaths(userRootDir)).map(({ filePathAbsoluteUserRootDir }) => getFilePathResolved({ filePathAbsoluteUserRootDir, userRootDir }));
+async function getPlusFiles(userRootDir, esbuildCache) {
+    const plusFilePaths = (await crawlPlusFiles(userRootDir)).map(({ filePathAbsoluteUserRootDir }) => getFilePathResolved({ filePathAbsoluteUserRootDir, userRootDir }));
     const plusFilesByLocationId = {};
     await Promise.all(plusFilePaths.map(async (filePath) => {
         if (getPlusFileValueConfigName(filePath.filePathAbsoluteFilesystem) === 'config') {
@@ -25,21 +26,21 @@ async function getPlusFilesByLocationId(userRootDir, esbuildCache) {
             plusFilesByLocationId[locationId].push(plusFile);
             extendsConfigs.forEach((extendsConfig) => {
                 /* We purposely use the same locationId because the Vike extension's config should only apply to where it's being extended from, for example:
-              ```js
-              // /pages/admin/+config.js
+                ```js
+                // /pages/admin/+config.js
       
-              import vikeVue from 'vike-vue/config'
-              // Should only apply to /pages/admin/**
-              export default { extends: [vikeVue] }
-              ```
-              ```js
-              // /pages/marketing/+config.js
+                import vikeVue from 'vike-vue/config'
+                // Should only apply to /pages/admin/**
+                export default { extends: [vikeVue] }
+                ```
+                ```js
+                // /pages/marketing/+config.js
       
-              import vikeReact from 'vike-react/config'
-              // Should only apply to /pages/marketing/**
-              export default { extends: [vikeReact] }
-              ```
-              */
+                import vikeReact from 'vike-react/config'
+                // Should only apply to /pages/marketing/**
+                export default { extends: [vikeReact] }
+                ```
+                */
                 const plusFile = getPlusFileFromConfigFile(extendsConfig, true, locationId, userRootDir);
                 assertExtensionsConventions(plusFile);
                 plusFilesByLocationId[locationId].push(plusFile);

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

@@ -5,7 +5,7 @@ export type { ConfigFile };
 export type { PointerImportLoaded };
 import type { FilePathResolved } from '../../../../types/FilePath.js';
 import { type EsbuildCache } from './transpileAndExecuteFile.js';
-import type { PlusFileValue } from './getPlusFilesByLocationId.js';
+import type { PlusFileValue } from './getPlusFiles.js';
 import { PointerImport } from './resolvePointerImport.js';
 import type { ConfigDefinitionsInternal } from './metaBuiltIn.js';
 import '../../assertEnvVite.js';

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

@@ -4,8 +4,8 @@ export type { ConfigDefinitions };
 export type { ConfigDefinitionsInternal };
 export type { ConfigDefinitionInternal };
 export type { ConfigEffect };
-import type { ConfigEnvInternal, ConfigEnv, DefinedAtFilePath } from '../../../../types/PageConfig.js';
-import type { Config, ConfigNameBuiltIn, ConfigNameGlobal } from '../../../../types/Config.js';
+import type { ConfigEnv, DefinedAtFilePath } from '../../../../types/PageConfig.js';
+import type { Config, ConfigNameBuiltIn, ConfigNameBuiltInGlobal } from '../../../../types/Config.js';
 import { type ConfigDefinedAt } from '../../../../shared-server-client/page-configs/getConfigDefinedAt.js';
 import type { PageConfigBuildTimeBeforeComputed } from '../resolveVikeConfigInternal.js';
 import '../../assertEnvVite.js';
@@ -13,8 +13,7 @@ import '../../assertEnvVite.js';
  *
  * https://vike.dev/meta
  */
-type ConfigDefinition = ConfigDefinition_ | ConfigDefinitionDefinedByPeerDependency;
-type ConfigDefinition_ = {
+type ConfigDefinition = {
     /** In what environment(s) the config value is loaded.
      *
      * https://vike.dev/meta
@@ -57,7 +56,14 @@ type ConfigDefinition_ = {
     }) => boolean);
     /** Whether changes to the configuration should trigger a Vite restart. */
     vite?: boolean;
-};
+    /** @experimental */
+    _computed?: (pageConfig: PageConfigBuildTimeBeforeComputed) => unknown;
+    /** @experimental */
+    _valueIsFilePath?: true;
+    /** @experimental */
+    _userEffectDefinedAtFilePath?: DefinedAtFilePath;
+    isDefinedByPeerDependency?: undefined;
+} | ConfigDefinitionDefinedByPeerDependency;
 type ConfigDefinitionDefinedByPeerDependency = {
     /**
      * Omit the "unknown config" error without defining the config — useful for optional peer dependencies: for example, vike-server sets +stream.require which is defined by vike-{react,vue,solid} but some users don't use vike-{react,vue,solid}
@@ -70,27 +76,21 @@ type ConfigDefinitionDefinedByPeerDependency = {
  * https://vike.dev/meta
  */
 type ConfigEffect = (config: {
-    /** The config value.
+    /** The config's value.
      *
      * https://vike.dev/meta
      */
     configValue: unknown;
-    /** Where the config value is defined.
+    /** Where the config's value is defined.
      *
      * https://vike.dev/meta
      */
     configDefinedAt: ConfigDefinedAt;
 }) => Config | undefined;
-/** For Vike internal use */
-type ConfigDefinitionInternal = Omit<ConfigDefinition_, 'env'> & {
-    _computed?: (pageConfig: PageConfigBuildTimeBeforeComputed) => unknown;
-    _valueIsFilePath?: true;
-    _userEffectDefinedAtFilePath?: DefinedAtFilePath;
-    env: ConfigEnvInternal;
-};
+type ConfigDefinitionInternal = Exclude<ConfigDefinition, ConfigDefinitionDefinedByPeerDependency>;
 type ConfigDefinitions = Record<string, // configName
 ConfigDefinition>;
 type ConfigDefinitionsInternal = Record<string, // configName
 ConfigDefinitionInternal>;
-type ConfigDefinitionsBuiltIn = Record<ConfigNameBuiltIn | ConfigNameGlobal, ConfigDefinitionInternal>;
+type ConfigDefinitionsBuiltIn = Record<ConfigNameBuiltIn | ConfigNameBuiltInGlobal, ConfigDefinitionInternal>;
 declare const metaBuiltIn: ConfigDefinitionsBuiltIn;

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

@@ -4,6 +4,7 @@ import { getConfigDefinedAt, } from '../../../../shared-server-client/page-confi
 import { getConfigValueSourceRelevantAnyEnv, getConfigValueSourcesRelevant, isConfigSourceValueNull, } from '../../plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js';
 import { getFileSuffixes } from '../../../../shared-server-node/getFileSuffixes.js';
 import '../../assertEnvVite.js';
+// @AI (CRITICAL FOR AI AGENTS): the values below (e.g. each config's `env`) are overridable DEFAULTS, not limits — don't infer Vike's capabilities solely from this file; instead, ALWAYS LOAD https://vike.dev/llms.txt (Vike documentation index) in your context when using Vike.
 const metaBuiltIn = {
     onRenderHtml: {
         env: { server: true },
@@ -102,6 +103,11 @@ const metaBuiltIn = {
     extends: {
         env: { config: true },
     },
+    pages: {
+        env: { config: true },
+        global: true,
+        cumulative: true,
+    },
     meta: {
         env: { config: true },
     },
@@ -197,13 +203,22 @@ const metaBuiltIn = {
     mode: {
         env: { config: true },
         global: true,
+        /* +mode can't be set in +config.js => a +config.js change never affects it — no Vite restart needed
         vite: true,
+        */
     },
     force: {
         env: { config: true },
         global: true,
         vite: true,
     },
+    root: {
+        env: { config: true },
+        global: true,
+        /* +root can't be set in +config.js => a +config.js change never affects it — no Vite restart needed
+        vite: true,
+        */
+    },
     csp: {
         env: { server: true },
     },
@@ -312,6 +327,10 @@ const metaBuiltIn = {
     vercel: {
         env: { config: true },
     },
+    ai: {
+        env: { config: true },
+        global: true,
+    },
 };
 function getConfigEnv(pageConfig, configName) {
     const source = getConfigValueSourceRelevantAnyEnv(configName, pageConfig);

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

@@ -9,12 +9,13 @@ export { isV1Design };
 export { getConfVal };
 export { getConfigDefinitionOptional };
 export { getVikeConfigFromCliOrEnv };
+export { EARLY_SETTINGS };
 export type { VikeConfigInternal };
 export type { PageConfigBuildTimeBeforeComputed };
-import type { PageConfigGlobalBuildTime, PageConfigBuildTime } from '../../../types/PageConfig.js';
-import { type ConfigDefinitionsInternal, type ConfigDefinitionInternal } from './resolveVikeConfigInternal/metaBuiltIn.js';
+import type { PageConfigGlobalBuildTime, ConfigEnv, PageConfigBuildTime, DefinedAtFilePath } from '../../../types/PageConfig.js';
+import { type ConfigDefinitionsInternal } from './resolveVikeConfigInternal/metaBuiltIn.js';
 import { type GlobalConfigPublic } from '../../../shared-server-client/page-configs/resolveVikeConfigPublic.js';
-import { type PlusFile } from './resolveVikeConfigInternal/getPlusFilesByLocationId.js';
+import { type PlusFile } from './resolveVikeConfigInternal/getPlusFiles.js';
 import type { PrerenderContextPublic } from '../../prerender/runPrerender.js';
 import type { ResolvedConfig, UserConfig } from 'vite';
 import { type DangerouslyUseInternals } from '../../../shared-server-client/getPublicProxy.js';
@@ -62,8 +63,22 @@ declare function getVikeConfigFromCliOrEnv(): {
     configFromCliOptions: import("../../cli/parseCli.js").CliOptions | null;
     configFromEnvVar: Record<string, unknown> | null;
 };
+declare const EARLY_SETTINGS: readonly ["root", "mode"];
 type PageConfigBuildTimeBeforeComputed = Omit<PageConfigBuildTime, 'configValuesComputed'>;
-declare function getConfigDefinitionOptional(configDefinitions: ConfigDefinitionsInternal, configName: string): ConfigDefinitionInternal | null;
+declare function getConfigDefinitionOptional(configDefinitions: ConfigDefinitionsInternal, configName: string): {
+    env: ConfigEnv;
+    cumulative?: boolean;
+    effect?: import("./resolveVikeConfigInternal/metaBuiltIn.js").ConfigEffect;
+    eager?: boolean;
+    global?: boolean | ((value: unknown, moreInfo: {
+        isGlobalLocation: boolean;
+    }) => boolean);
+    vite?: boolean;
+    _computed?: (pageConfig: PageConfigBuildTimeBeforeComputed) => unknown;
+    _valueIsFilePath?: true;
+    _userEffectDefinedAtFilePath?: DefinedAtFilePath;
+    isDefinedByPeerDependency?: undefined;
+} | null;
 declare function getConfVal(plusFile: PlusFile, configName: string): null | {
     value: unknown;
     valueIsLoaded: true;