vike 0.4.267 → 0.4.268-commit-45c1759

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

@@ -2,22 +2,12 @@ export { findPageFiles };
 import { glob } from 'tinyglobby';
 import { scriptFileExtensionPattern } from '../../../utils/isScriptFile.js';
 import { toPosixPath } from '../../../utils/path.js';
-import { assertWarning } from '../../../utils/assert.js';
-import pc from '@brillout/picocolors';
 import { getOutDirs } from './getOutDirs.js';
 import '../assertEnvVite.js';
-async function findPageFiles(config, fileTypes, isDev) {
+async function findPageFiles(config, fileTypes) {
     const cwd = config.root;
     const { outDirRoot } = getOutDirs(config, undefined);
-    const timeBase = new Date().getTime();
     let pageFiles = await glob(fileTypes.map((fileType) => `**/*${fileType}.${scriptFileExtensionPattern}`), { ignore: ['**/node_modules/**', `${outDirRoot}/**`], cwd, dot: false, expandDirectories: false });
     pageFiles = pageFiles.map((p) => '/' + toPosixPath(p));
-    const time = new Date().getTime() - timeBase;
-    if (isDev) {
-        // We only warn in dev, because while building it's expected to take a long time as tinyglobby is competing for resources with other tasks
-        assertWarning(time < 1.5 * 1000, `Finding your page files ${pc.cyan('**/*.page.*')} took an unexpected long time (${time}ms). Reach out to the vike maintainer.`, {
-            onlyOnce: 'slow-page-files-search',
-        });
-    }
     return pageFiles;
 }

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

@@ -1,4 +1,5 @@
 export { getAssetsDir };
-import type { ResolvedConfig } from 'vite';
 import '../assertEnvVite.js';
-declare function getAssetsDir(config: ResolvedConfig): string;
+declare function getAssetsDir(build: {
+    assetsDir: string;
+}): string;

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

@@ -1,9 +1,9 @@
 export { getAssetsDir };
 import { assertUsage } from '../../../utils/assert.js';
 import '../assertEnvVite.js';
-function getAssetsDir(config) {
-    let { assetsDir } = config.build;
-    assertUsage(assetsDir, `${assetsDir} cannot be an empty string`);
+function getAssetsDir(build) {
+    let { assetsDir } = build;
+    assertUsage(assetsDir, "Vite's build.assetsDir cannot be an empty string");
     assetsDir = assetsDir.split(/\/|\\/).filter(Boolean).join('/');
     return assetsDir;
 }

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

@@ -1,6 +1,6 @@
 export { isViteCli };
 export { getViteCliArgs };
-export { getViteBuildCliArgs };
+export { getViteCliArgsMinimal };
 export { getViteCliCommand };
 import '../assertEnvVite.js';
 declare function isViteCli(): boolean;
@@ -12,8 +12,8 @@ type ConfigFromCli = {
 };
 type ViteCommand = 'dev' | 'build' | 'optimize' | 'preview';
 declare function getViteCliCommand(): ViteCommand | null;
-declare function getViteBuildCliArgs(): null | ConfigFromCli;
-declare function getViteCliArgs(): null | {
+declare function getViteCliArgsMinimal(): null | {
     root: string | undefined;
     configFile: string | undefined;
 };
+declare function getViteCliArgs(): null | ConfigFromCli;

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

@@ -1,7 +1,8 @@
 export { isViteCli };
 export { getViteCliArgs };
-export { getViteBuildCliArgs };
+export { getViteCliArgsMinimal };
 export { getViteCliCommand };
+// Copied from Vite's CLI
 import { assert } from '../../../utils/assert.js';
 import { isObject } from '../../../utils/isObject.js';
 import { isToolCli } from '../../../utils/isToolCli.js';
@@ -11,48 +12,23 @@ const desc = 'vike:vite-cli-simulation';
 function isViteCli() {
     return isToolCli('vite');
 }
-function getViteCliCommand() {
-    if (!isViteCli())
-        return null;
-    let command;
-    const setCommand = (cmd) => {
-        assert(command === undefined);
-        command = cmd;
+function parseViteCli() {
+    let viteCli;
+    const onCommand = (command) => (root, options) => {
+        assert(viteCli === undefined);
+        assert(root === undefined || typeof root === 'string');
+        assert(isObject(options));
+        // Same as Vite: duplicated options => the last value wins
+        for (const [key, value] of Object.entries(options)) {
+            if (Array.isArray(value))
+                options[key] = value[value.length - 1];
+        }
+        assert(options.config === undefined || typeof options.config === 'string');
+        viteCli = { command, root, options };
     };
-    // Copied & adapted from Vite
-    // https://github.com/vitejs/vite/blob/d3e7eeefa91e1992f47694d16fe4dbe708c4d80e/packages/vite/src/node/cli.ts#L186-L188
-    const cli = cac(desc);
-    // dev
-    cli
-        .command('[root]', desc)
-        .alias('serve')
-        .alias('dev')
-        .action(() => {
-        setCommand('dev');
-    });
-    // build
-    cli.command('build [root]', desc).action(() => {
-        setCommand('build');
-    });
-    // optimize
-    cli.command('optimize [root]', desc).action(() => {
-        setCommand('optimize');
-    });
-    // preview
-    cli.command('preview [root]', desc).action(() => {
-        setCommand('preview');
-    });
-    cli.parse();
-    assert(command);
-    return command;
-}
-function getViteBuildCliArgs() {
-    if (!isViteCli())
-        return null;
-    // Copied & adapted from Vite
+    // We need to declare all Vite's options, otherwise cac consumes the next argument as the value of boolean options (e.g. `vite build --emptyOutDir some-root`).
     const cli = cac(desc);
     // Common configs
-    // https://github.com/vitejs/vite/blob/d3e7eeefa91e1992f47694d16fe4dbe708c4d80e/packages/vite/src/node/cli.ts#L169-L182
     cli
         .option('-c, --config <file>', desc)
         .option('--base <path>', desc)
@@ -62,8 +38,22 @@ function getViteBuildCliArgs() {
         .option('-d, --debug [feat]', desc)
         .option('-f, --filter <filter>', desc)
         .option('-m, --mode <mode>', desc);
-    // Build configs
-    // https://github.com/vitejs/vite/blob/d3e7eeefa91e1992f47694d16fe4dbe708c4d80e/packages/vite/src/node/cli.ts#L286-L322
+    // dev
+    cli
+        .command('[root]', desc)
+        .alias('serve')
+        .alias('dev')
+        .option('--host [host]', desc)
+        .option('--port <port>', desc)
+        .option('--open [path]', desc)
+        .option('--cors', desc)
+        .option('--strictPort', desc)
+        .option('--force', desc)
+        .option('--experimentalBundle', desc)
+        // Options that this copy doesn't declare (e.g. added by newer Vite versions) are still validated by Vite's own CLI, which throws `Unknown option` for options Vite doesn't know
+        .allowUnknownOptions()
+        .action(onCommand('dev'));
+    // build
     cli
         .command('build [root]', desc)
         .option('--target <target>', desc)
@@ -71,35 +61,61 @@ function getViteBuildCliArgs() {
         .option('--assetsDir <dir>', desc)
         .option('--assetsInlineLimit <number>', desc)
         .option('--ssr [entry]', desc)
-        .option('--sourcemap', desc)
+        .option('--sourcemap [output]', desc)
         .option('--minify [minifier]', desc)
         .option('--manifest [name]', desc)
         .option('--ssrManifest [name]', desc)
         .option('--emptyOutDir', desc)
         .option('-w, --watch', desc)
         .option('--app', desc)
-        .action((root, options) => {
-        assert(isObject(options));
-        assert(root === undefined || typeof root === 'string');
-        assert(options.config === undefined || typeof options.config === 'string');
-        // https://github.com/vitejs/vite/blob/d3e7eeefa91e1992f47694d16fe4dbe708c4d80e/packages/vite/src/node/cli.ts#L331-L346
-        const buildOptions = cleanGlobalCLIOptions(cleanBuilderCLIOptions(options));
-        configFromCli = {
-            root,
-            base: options.base,
-            mode: options.mode,
-            configFile: options.config,
-            configLoader: options.configLoader,
-            logLevel: options.logLevel,
-            clearScreen: options.clearScreen,
-            build: buildOptions,
-            ...(options.app ? { builder: {} } : {}),
-        };
-    });
-    let configFromCli = null;
+        .allowUnknownOptions()
+        .action(onCommand('build'));
+    // optimize
+    cli.command('optimize [root]', desc).option('--force', desc).allowUnknownOptions().action(onCommand('optimize'));
+    // preview
+    cli
+        .command('preview [root]', desc)
+        .option('--host [host]', desc)
+        .option('--port <port>', desc)
+        .option('--strictPort', desc)
+        .option('--open [path]', desc)
+        .option('--outDir <dir>', desc)
+        .allowUnknownOptions()
+        .action(onCommand('preview'));
     cli.parse();
-    return configFromCli;
-    // https://github.com/vitejs/vite/blob/d3e7eeefa91e1992f47694d16fe4dbe708c4d80e/packages/vite/src/node/cli.ts#L99
+    assert(viteCli);
+    return viteCli;
+}
+function getViteCliCommand() {
+    if (!isViteCli())
+        return null;
+    return parseViteCli().command;
+}
+function getViteCliArgsMinimal() {
+    if (!isViteCli())
+        return null;
+    const { root, options } = parseViteCli();
+    return { root, configFile: options.config };
+}
+function getViteCliArgs() {
+    if (!isViteCli())
+        return null;
+    const { command, root, options } = parseViteCli();
+    if (command !== 'build')
+        return null;
+    // Like Vite: all options except the global ones go to `build`
+    const buildOptions = cleanGlobalCLIOptions(cleanBuilderCLIOptions(options));
+    return {
+        root,
+        base: options.base,
+        mode: options.mode,
+        configFile: options.config,
+        configLoader: options.configLoader,
+        logLevel: options.logLevel,
+        clearScreen: options.clearScreen,
+        build: buildOptions,
+        ...(options.app ? { builder: {} } : {}),
+    };
     function cleanGlobalCLIOptions(options) {
         const ret = { ...options };
         delete ret['--'];
@@ -129,29 +145,9 @@ function getViteBuildCliArgs() {
         }
         return ret;
     }
-    // https://github.com/vitejs/vite/blob/d3e7eeefa91e1992f47694d16fe4dbe708c4d80e/packages/vite/src/node/cli.ts#L141
     function cleanBuilderCLIOptions(options) {
         const ret = { ...options };
         delete ret.app;
         return ret;
     }
 }
-function getViteCliArgs() {
-    if (!isViteCli())
-        return null;
-    const cli = cac(desc);
-    cli.option('-c, --config <file>', desc);
-    let result = null;
-    const setResult = (root, options) => {
-        assert(root === undefined || typeof root === 'string');
-        assert(isObject(options));
-        assert(options.config === undefined || typeof options.config === 'string');
-        result = { root, configFile: options.config };
-    };
-    cli.command('[root]', desc).alias('serve').alias('dev').action(setResult);
-    cli.command('build [root]', desc).action(setResult);
-    cli.command('optimize [root]', desc).action(setResult);
-    cli.command('preview [root]', desc).action(setResult);
-    cli.parse();
-    return result;
-}

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

@@ -4,8 +4,7 @@ export { isViteServerSide_onlySsrEnv };
 export { isViteServerSide_extraSafe };
 export { isViteServerSide_applyToEnvironment };
 export { isViteServerSide_configEnvironment };
-import { viteVersionMin } from '../../../utils/assertViteVersion.js';
-import { assert, assertUsage } from '../../../utils/assert.js';
+import { assert } from '../../../utils/assert.js';
 import '../assertEnvVite.js';
 function isViteServerSide_impl(configGlobal, viteEnv) {
     assert(!('consumer' in configGlobal)); // make sure configGlobal isn't viteEnv.config
@@ -60,11 +59,7 @@ function isViteServerSide_extraSafe(config, viteEnv, options) {
         optionsSsr: options?.ssr ?? null,
     };
     assert(options, debug);
-    /* TO-DO/eventually: use internal assert() instead of assertUsage() once we can use this.meta.viteVersion — see utils/assertViteVersion.ts
-    assert(typeof options.ssr === 'boolean', debug)
-    /*/
-    assertUsage(typeof options.ssr === 'boolean', `You're using an old Vite version — update Vite to ${viteVersionMin} or above.`);
-    //*/
+    assert(typeof options.ssr === 'boolean', debug);
     assert(options.ssr === isServerSide, debug);
     return isServerSide;
 }

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

@@ -56,11 +56,13 @@ type ConfigDefinition = {
     }) => boolean);
     /** Whether changes to the configuration should trigger a Vite restart. */
     vite?: boolean;
-    /** @experimental */
-    _computed?: (pageConfig: PageConfigBuildTimeBeforeComputed) => unknown;
-    /** @experimental */
+    /** @internal */
+    _computed?: (pageConfig: PageConfigBuildTimeBeforeComputed, isDev: boolean) => unknown;
+    /** @internal */
     _valueIsFilePath?: true;
-    /** @experimental */
+    /** @internal */
+    _valueNotLoadedAtRuntime?: true;
+    /** @internal */
     _userEffectDefinedAtFilePath?: DefinedAtFilePath;
     isDefinedByPeerDependency?: undefined;
 } | ConfigDefinitionDefinedByPeerDependency;

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

@@ -53,14 +53,15 @@ const metaBuiltIn = {
     route: {
         env: {
             server: true,
-            client: 'if-client-routing',
+            client: true,
+            clientRoutingOnly: true,
             // For vite-plugin-vercel
             config: true,
         },
         eager: true,
     },
     guard: {
-        env: { server: true, client: 'if-client-routing' },
+        env: { server: true, client: true, clientRoutingOnly: true },
     },
     data: {
         env: { server: true },
@@ -70,7 +71,7 @@ const metaBuiltIn = {
         cumulative: true,
     },
     iKnowThePerformanceRisksOfAsyncRouteFunctions: {
-        env: { server: true, client: 'if-client-routing' },
+        env: { server: true, client: true, clientRoutingOnly: true },
         eager: true,
     },
     filesystemRoutingRoot: {
@@ -114,12 +115,13 @@ const metaBuiltIn = {
     hasServerOnlyHook: {
         env: { client: true },
         eager: true,
-        _computed: (pageConfig) => {
+        _computed: (pageConfig, isDev) => {
             const sources = ['data', 'onBeforeRender', 'onCreatePageContext', 'guard']
                 .map((hookName) => getConfigValueSourcesRelevant(hookName, {
-                isForClientSide: false,
+                environmentName: 'server',
                 // TO-DO/eventually/remove-server-router: let's eventually remove support for Server Routing
                 isClientRouting: true,
+                isDev,
             }, pageConfig))
                 .flat(1)
                 // Server-only
@@ -243,6 +245,15 @@ const metaBuiltIn = {
     server: {
         env: { server: true },
         global: true,
+        // virtual:vike:global-entry:server shouldn't import +server.js
+        // - Otherwise a +server.js calling `await getGlobalContext()` would wait for itself and hang indefinitely
+        _valueNotLoadedAtRuntime: true,
+    },
+    serverEntry: {
+        // The value is merely the file path of the server entry, which becomes dist/server/index.mjs — Vike never loads it as a config value
+        env: { config: true },
+        global: true,
+        _valueIsFilePath: true,
     },
     precompress: {
         env: { config: true },
@@ -253,7 +264,7 @@ const metaBuiltIn = {
         global: true,
     },
     onBeforeRoute: {
-        env: { server: true, client: 'if-client-routing' },
+        env: { server: true, client: true, clientRoutingOnly: true },
         eager: true,
         global: true,
     },

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

@@ -505,12 +505,19 @@ function getConfigExecutionErrorIntroMsg(err) {
     const errIntroMsg = execErrIntroMsg.get(err);
     return errIntroMsg ?? null;
 }
+const processId = crypto.randomUUID();
 function getTemporaryBuildFilePath(filePathAbsoluteFilesystem, code) {
     assertPosixPath(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);
+    const fileHash = crypto
+        .createHash('md5')
+        // Using content hash in file path, so that the cache of dynamic `import()` behaves as we want.
+        .update(code)
+        // Parallel processes shouldn't overwrite each other's temporary file
+        .update(processId)
+        .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(fileDir, `${filename}.build-${fileHash}.mjs`);
     assert(isTemporaryBuildFile(filePathTmp));

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

@@ -3,6 +3,7 @@ export type { VikeConfig };
 export { getVikeConfigInternal };
 export { getVikeConfigInternalOptional };
 export { setVikeConfigContext };
+export { setViteEnvironmentNames };
 export { isVikeConfigContextSet };
 export { reloadVikeConfig };
 export { isV1Design };
@@ -36,6 +37,7 @@ type VikeConfigInternal = GlobalConfigPublic & {
     _pageConfigGlobal: PageConfigGlobalBuildTime;
     _vikeConfigDependencies: Set<string>;
     _extensions: PlusFile[];
+    _additionalEnvironmentNames: string[];
     prerenderContext: PrerenderContext;
 };
 declare function reloadVikeConfig(): void;
@@ -53,6 +55,7 @@ type VikeConfig = Pick<VikeConfigInternal, 'config' | 'pages' | 'prerenderContex
     dangerouslyUseInternals: DangerouslyUseInternals<VikeConfigInternal>;
 };
 declare function setVikeConfigContext(vikeConfigCtx_: VikeConfigContext): void;
+declare function setViteEnvironmentNames(viteEnvironmentNames: string[]): Promise<void>;
 declare function isVikeConfigContextSet(): boolean;
 declare function getVikeConfigInternalOptional(): Promise<null | VikeConfigInternal>;
 declare function isV1Design(): boolean;
@@ -74,8 +77,9 @@ declare function getConfigDefinitionOptional(configDefinitions: ConfigDefinition
         isGlobalLocation: boolean;
     }) => boolean);
     vite?: boolean;
-    _computed?: (pageConfig: PageConfigBuildTimeBeforeComputed) => unknown;
+    _computed?: (pageConfig: PageConfigBuildTimeBeforeComputed, isDev: boolean) => unknown;
     _valueIsFilePath?: true;
+    _valueNotLoadedAtRuntime?: true;
     _userEffectDefinedAtFilePath?: DefinedAtFilePath;
     isDefinedByPeerDependency?: undefined;
 } | null;