vike 0.4.217 → 0.4.218-commit-ed9b3d4

package/dist/esm/node/plugin/plugins/{importBuild → buildEntry}/index.d.ts

@@ -1,8 +1,8 @@
-export { importBuild };
+export { buildEntry };
 export { set_ASSETS_MAP };
 import type { Plugin, Rollup } from 'vite';
 type Bundle = Rollup.OutputBundle;
 type Options = Rollup.NormalizedOutputOptions;
-declare function importBuild(): Plugin[];
+declare function buildEntry(): Plugin[];
 /** Set the value of the ASSETS_MAP constant inside dist/server/entry.js (or dist/server/index.js) */
 declare function set_ASSETS_MAP(options: Options, bundle: Bundle): Promise<void>;

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

@@ -1,23 +1,23 @@
-export { importBuild };
+export { buildEntry };
 export { set_ASSETS_MAP };
 import { serverProductionEntryPlugin } from '@brillout/vite-plugin-server-entry/plugin';
+import { virtualFileIdImportUserCodeServer } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
+import { getVikeManifest } from './getVikeManifest.js';
+import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
 import { assert, getOutDirs, toPosixPath } from '../../utils.js';
+import fs from 'fs/promises';
 import path from 'path';
 import { createRequire } from 'module';
-import { getVikeManifest } from './getVikeManifest.js';
-import fs from 'fs/promises';
-import { virtualFileIdImportUserCodeServer } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
-import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 const ASSETS_MAP = '__VITE_ASSETS_MAP__';
-function importBuild() {
+function buildEntry() {
     let config;
     let vikeConfigGlobal;
     return [
         {
-            name: 'vike:importBuild:config',
+            name: 'vike:buildEntry',
             enforce: 'post',
             async configResolved(config_) {
                 config = config_;
@@ -38,17 +38,16 @@ function getServerProductionEntryCode(config, vikeConfigGlobal) {
     const vikeManifest = getVikeManifest(vikeConfigGlobal, config);
     // Let's eventually simplify and move everything to a single virtual module
     const importerCode = [
-        `  import { setImportBuildGetters } from '${importPath}';`,
+        `  import { setGlobalContext_buildEntry } from '${importPath}';`,
         `  import * as pageFiles from '${virtualFileIdImportUserCodeServer}';`,
         `  {`,
         // We first set the values to a variable because of a Rollup bug, and this workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d
         `    const assetsManifest = ${ASSETS_MAP};`,
         `    const pluginManifest = ${JSON.stringify(vikeManifest, null, 2)};`,
-        '    setImportBuildGetters({',
-        `      pageFiles: () => pageFiles,`,
-        `      getAssetsManifest: () => assetsManifest,`,
-        // TODO: rename pluginManifest -> vikeManifest
-        `      pluginManifest: () => pluginManifest,`,
+        '    setGlobalContext_buildEntry({',
+        `      pageFiles,`,
+        `      assetsManifest,`,
+        `      pluginManifest,`,
         '    });',
         `  }`,
         ''
@@ -85,12 +84,12 @@ function find_ASSETS_MAP(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/importBuild/index.js
-    require_.resolve(`../../../../../../dist/esm/node/runtime/globalContext/loadImportBuild.js`));
+    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/buildEntry/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/loadImportBuild' (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)
+    // 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)
     true) {
-        return 'vike/__internal/loadImportBuild';
+        return 'vike/__internal';
     }
     else {
         const { outDirServer } = getOutDirs(config);

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

@@ -1,3 +1,9 @@
 export { commonConfig };
 import { type Plugin } from 'vite';
-declare function commonConfig(vikeVitePluginOptions?: unknown): Plugin[];
+declare module 'vite' {
+    interface UserConfig {
+        _isDev?: boolean;
+        _vikeVitePluginOptions?: unknown;
+    }
+}
+declare function commonConfig(vikeVitePluginOptions: unknown): Plugin[];

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

@@ -6,11 +6,11 @@ import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
 import pc from '@brillout/picocolors';
 import path from 'path';
 import { assertResolveAlias } from './commonConfig/assertResolveAlias.js';
-import { pluginName } from './commonConfig/pluginName.js';
 import { getEnvVarObject } from '../shared/getEnvVarObject.js';
 import { isViteCliCall } from '../shared/isViteCliCall.js';
 import { isVikeCliOrApi } from '../../api/context.js';
-function commonConfig(vikeVitePluginOptions = {}) {
+const pluginName = 'vike:commonConfig';
+function commonConfig(vikeVitePluginOptions) {
     return [
         {
             name: `${pluginName}:pre`,

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

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

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

@@ -76,5 +76,5 @@ type ConfigDefinitions = Record<string, // configName
 ConfigDefinitionInternal>;
 type ConfigDefinitionsBuiltIn = Record<ConfigNameBuiltIn, ConfigDefinitionInternal>;
 declare const configDefinitionsBuiltIn: ConfigDefinitionsBuiltIn;
-type ConfigNameGlobal = 'onPrerenderStart' | 'onBeforeRoute' | 'prerender' | 'disableAutoFullBuild' | 'includeAssetsImportedByServer' | 'baseAssets' | 'baseServer' | 'redirects' | 'trailingSlash' | 'disableUrlNormalization';
+type ConfigNameGlobal = 'onPrerenderStart' | 'onBeforeRoute' | 'prerender' | 'disableAutoFullBuild' | 'includeAssetsImportedByServer' | 'baseAssets' | 'baseServer' | 'redirects' | 'trailingSlash' | 'disableUrlNormalization' | 'vite';
 declare const configDefinitionsBuiltInGlobal: Record<ConfigNameGlobal, ConfigDefinitionInternal>;

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

@@ -143,9 +143,8 @@ const configDefinitionsBuiltInGlobal = {
         env: { server: true, client: 'if-client-routing' },
         eager: true
     },
-    prerender: {
-        env: { config: true }
-    },
+    prerender: { env: { config: true } },
+    vite: { env: { config: true }, cumulative: true },
     disableAutoFullBuild: { env: { config: true } },
     includeAssetsImportedByServer: { env: { config: true } },
     baseAssets: { env: { config: true } },

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

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

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

@@ -1,17 +1,16 @@
 export { crawlPlusFiles };
-import { assertPosixPath, assert, scriptFileExtensions, assertIsSingleModuleInstance, assertIsNotProductionRuntime, isVersionOrAbove, isScriptFile } from '../../../../utils.js';
+import { assertPosixPath, assert, scriptFileExtensions, assertIsSingleModuleInstance, assertIsNotProductionRuntime, isVersionOrAbove, isScriptFile, scriptFileExtensionList } from '../../../../utils.js';
 import path from 'path';
-import fs from 'fs/promises';
 import glob from 'fast-glob';
 import { exec } from 'child_process';
 import { promisify } from 'util';
 import { isTemporaryBuildFile } from './transpileAndExecuteFile.js';
+import { getEnvVarObject } from '../../../../shared/getEnvVarObject.js';
 const execA = promisify(exec);
-const TOO_MANY_UNTRACKED_FILES = 5;
 assertIsNotProductionRuntime();
 assertIsSingleModuleInstance('crawlPlusFiles.ts');
 let gitIsNotUsable = false;
-async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, crawlWithGit) {
+async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
     assertPosixPath(userRootDir);
     //*/
     const outDirRelativeFromUserRootDir = null;
@@ -31,14 +30,13 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, crawlWithGi
             //
             !outDirRelativeFromUserRootDir.startsWith('../')));
     // Crawl
-    let files = [];
-    const res = crawlWithGit !== false && (await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir));
+    let files;
+    const res = !isGitCrawlDisabled() && (await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir));
     if (res &&
         // Fallback to fast-glob for users that dynamically generate plus files. (Assuming that no plus file is found because of the user's .gitignore list.)
-        res.files.length > 0) {
-        files = res.files;
+        res.length > 0) {
+        files = res;
         // We cannot find files inside symlink directories with `$ git ls-files` => we use fast-glob
-        files.push(...(await crawlSymlinkDirs(res.symlinkDirs, userRootDir, outDirRelativeFromUserRootDir)));
     }
     else {
         files = await fastGlob(userRootDir, outDirRelativeFromUserRootDir);
@@ -70,24 +68,21 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
         'git',
         preserveUTF8,
         'ls-files',
-        // We don't filter because:
-        //  - It would skip symlink directories
-        //  - Performance gain seems negligible: https://github.com/vikejs/vike/pull/1688#issuecomment-2166206648
-        // ...scriptFileExtensionList.map((ext) => `"**/+*.${ext}"`),
+        // Performance gain seems negligible: https://github.com/vikejs/vike/pull/1688#issuecomment-2166206648
+        ...scriptFileExtensionList.map((ext) => `"**/+*.${ext}"`),
         // Performance gain is non-negligible.
         //  - https://github.com/vikejs/vike/pull/1688#issuecomment-2166206648
         //  - When node_modules/ is untracked the performance gain could be significant?
         ...ignoreAsPatterns.map((pattern) => `--exclude="${pattern}"`),
         // --others --exclude-standard => list untracked files (--others) while using .gitignore (--exclude-standard)
         // --cached => list tracked files
-        // --stage => get file modes which we use to find symlink directories
-        '--others --exclude-standard --cached --stage'
+        '--others --exclude-standard --cached'
     ].join(' ');
-    let resultLines;
+    let filesAll;
     let filesDeleted;
     try {
         ;
-        [resultLines, filesDeleted] = await Promise.all([
+        [filesAll, filesDeleted] = await Promise.all([
             // Main command
             runCmd1(cmd, userRootDir),
             // Get tracked but deleted files
@@ -101,40 +96,23 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
         }
         throw err;
     }
-    const filePaths = resultLines.map(parseGitLsResultLine);
-    // If there are too many files without mode we fallback to fast-glob
-    if (filePaths.filter((f) => !f.mode).length > TOO_MANY_UNTRACKED_FILES)
-        return null;
-    const symlinkDirs = [];
     const files = [];
-    for (const { filePath, mode } of filePaths) {
-        // Deleted?
-        if (filesDeleted.includes(filePath))
+    for (const filePath of filesAll) {
+        // + file?
+        if (!path.posix.basename(filePath).startsWith('+'))
             continue;
         // We have to repeat the same exclusion logic here because the option --exclude of `$ git ls-files` only applies to untracked files. (We use --exclude only to speed up the `$ git ls-files` command.)
         if (!ignoreAsFilterFn(filePath))
             continue;
-        // Symlink directory?
-        {
-            const isSymlinkDir = await isSymlinkDirectory(mode, filePath, userRootDir);
-            if (isSymlinkDir) {
-                symlinkDirs.push(filePath);
-                continue;
-            }
-            // Skip deleted files and non-symlink directories
-            if (isSymlinkDir === null) {
-                continue;
-            }
-        }
-        // + file?
-        if (!path.posix.basename(filePath).startsWith('+'))
-            continue;
         // JavaScript file?
         if (!isScriptFile(filePath))
             continue;
+        // Deleted?
+        if (filesDeleted.includes(filePath))
+            continue;
         files.push(filePath);
     }
-    return { files, symlinkDirs };
+    return files;
 }
 // Same as gitLsFiles() but using fast-glob
 async function fastGlob(userRootDir, outDirRelativeFromUserRootDir) {
@@ -204,77 +182,6 @@ async function isGitNotUsable(userRootDir) {
         return false;
     }
 }
-async function crawlSymlinkDirs(symlinkDirs, userRootDir, outDirRelativeFromUserRootDir) {
-    const filesInSymlinkDirs = (await Promise.all(symlinkDirs.map(async (symlinkDir) => (await fastGlob(path.posix.join(userRootDir, symlinkDir), outDirRelativeFromUserRootDir)).map((filePath) => path.posix.join(symlinkDir, filePath))))).flat();
-    return filesInSymlinkDirs;
-}
-// Parse:
-// ```
-// some/not/tracked/path
-// 100644 f6928073402b241b468b199893ff6f4aed0b7195 0\tpages/index/+Page.tsx
-// ```
-function parseGitLsResultLine(resultLine) {
-    const [part1, part2, ...rest] = resultLine.split('\t');
-    assert(part1);
-    assert(rest.length === 0);
-    // Git doesn't provide the mode for untracked paths.
-    // `resultLine` is:
-    // ```
-    // some/not/tracked/path
-    // ```
-    if (part2 === undefined) {
-        return { filePath: part1, mode: null };
-    }
-    assert(part2);
-    // `resultLine` is:
-    // ```
-    // 100644 f6928073402b241b468b199893ff6f4aed0b7195 0\tpages/index/+Page.tsx
-    // ```
-    const [mode, _, __, ...rest2] = part1.split(' ');
-    assert(mode && _ && __ && rest2.length === 0);
-    return { filePath: part2, mode };
-}
-async function isSymlinkDirectory(mode, filePath, userRootDir) {
-    const filePathAbsolute = path.posix.join(userRootDir, filePath);
-    let stats = null;
-    let isSymlink = false;
-    if (mode === '120000') {
-        isSymlink = true;
-    }
-    else if (mode === null) {
-        // `$ git ls-files` doesn't provide the mode when Git doesn't track the path
-        stats = await getFileStats(filePathAbsolute);
-        if (stats === null)
-            return null;
-        isSymlink = stats.isSymbolicLink();
-        if (!isSymlink && stats.isDirectory())
-            return null;
-    }
-    else {
-        assert(mode);
-    }
-    if (!isSymlink)
-        return false;
-    if (!stats)
-        stats = await getFileStats(filePathAbsolute);
-    if (stats === null)
-        return null;
-    const isDirectory = stats.isDirectory();
-    return isDirectory;
-}
-async function getFileStats(filePathAbsolute) {
-    let stats;
-    try {
-        stats = await fs.lstat(filePathAbsolute);
-    }
-    catch (err) {
-        // File was deleted, usually a temporary file such as +config.js.build-j95xb988fpln.mjs
-        // ENOENT: no such file or directory
-        assert(err.code === 'ENOENT');
-        return null;
-    }
-    return stats;
-}
 async function runCmd1(cmd, cwd) {
     const { stdout } = await execA(cmd, {
         cwd,
@@ -299,3 +206,7 @@ async function runCmd2(cmd, cwd) {
     stderr = stderr.toString().trim();
     return { stdout, stderr };
 }
+function isGitCrawlDisabled() {
+    const crawSettings = getEnvVarObject('VIKE_CRAWL');
+    return crawSettings?.git === false;
+}

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

@@ -8,11 +8,13 @@ export { getConfigValueInterfaceFile };
 export type { VikeConfigObject };
 export type { InterfaceValueFile };
 export type { InterfaceFile };
+export type { VikeConfigGlobal };
+export type { VikeVitePluginOptions };
 import type { PageConfigGlobalBuildTime, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
 import { type LocationId } from './getVikeConfig/filesystemRouting.js';
 import type { ResolvedConfig } from 'vite';
 import type { FilePathResolved } from '../../../../../shared/page-configs/FilePath.js';
-import type { VikeConfigGlobal } from './getVikeConfig/resolveVikeConfigGlobal.js';
+import { getPageConfigUserFriendlyNew } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
 type InterfaceFile = InterfaceConfigFile | InterfaceValueFile;
 type InterfaceFileCommons = {
     locationId: LocationId;
@@ -37,6 +39,9 @@ type VikeConfigObject = {
     pageConfigs: PageConfigBuildTime[];
     pageConfigGlobal: PageConfigGlobalBuildTime;
     vikeConfigGlobal: VikeConfigGlobal;
+    vikeConfigNew: {
+        global: ReturnType<typeof getPageConfigUserFriendlyNew>;
+    };
 };
 declare const vikeConfigDependencies: Set<string>;
 declare function reloadVikeConfig(config: ResolvedConfig): void;
@@ -47,3 +52,96 @@ declare function getVikeConfig2(userRootDir: string, isDev: boolean, vikeVitePlu
 declare function isV1Design(config: ResolvedConfig): Promise<boolean>;
 declare function isVikeConfigFile(filePath: string): boolean;
 declare function getConfigValueInterfaceFile(interfaceFile: InterfaceFile, configName: string): unknown;
+type VikeConfigGlobal = {
+    prerender: false | {
+        noExtraDir: boolean;
+        parallel: boolean | number;
+        partial: boolean;
+        disableAutoRun: boolean;
+    };
+    disableAutoFullBuild: boolean | 'prerender' | null;
+    includeAssetsImportedByServer: boolean;
+    baseAssets: string | null;
+    baseServer: string | null;
+    redirects: Record<string, string>;
+    trailingSlash: boolean;
+    disableUrlNormalization: boolean;
+};
+type VikeVitePluginOptions = {
+    /**
+     * Enable pre-rendering.
+     *
+     * https://vike.dev/pre-rendering
+     *
+     * @default false
+     */
+    prerender?: boolean | {
+        /**
+         * Don't create a new directory for each HTML file.
+         *
+         * For example, generate `dist/client/about.html` instead of `dist/client/about/index.html`.
+         *
+         * @default false
+         */
+        noExtraDir?: boolean;
+        /**
+         * Number of concurrent pre-render jobs.
+         *
+         * Set to `false` to disable concurrency.
+         *
+         * @default os.cpus().length
+         */
+        parallel?: boolean | number;
+        /**
+     * Allow only some of your pages to be pre-rendered.
+     *
+     * This setting doesn't affect the pre-rendering process: it merely suppresses the warnings when some of your pages cannot be pre-rendered.
+ 
+     * @default false
+     */
+        partial?: boolean;
+        /**
+         * Disable the automatic initiation of the pre-rendering process when running `$ vike build`.
+         *
+         * Use this if you want to programmatically initiate the pre-rendering process instead.
+         *
+         * https://vike.dev/api#prerender
+         *
+         * @default false
+         */
+        disableAutoRun?: boolean;
+    };
+    /** @deprecated See https://vike.dev/disableAutoFullBuild */
+    disableAutoFullBuild?: boolean | 'prerender';
+    /** The Base URL of your server.
+     *
+     * https://vike.dev/base-url
+     */
+    baseServer?: string;
+    /** The Base URL of your static assets.
+     *
+     * https://vike.dev/base-url
+     */
+    baseAssets?: string;
+    /** @deprecated It's now `true` by default. You can remove this option. */
+    includeAssetsImportedByServer?: boolean;
+    /** Permanent redirections (HTTP status code 301)
+     *
+     * https://vike.dev/redirects
+     */
+    redirects?: Record<string, string>;
+    /** Whether URLs should end with a trailing slash.
+     *
+     * https://vike.dev/url-normalization
+     *
+     * @default false
+     */
+    trailingSlash?: boolean;
+    /** Disable automatic URL normalization.
+     *
+     * https://vike.dev/url-normalization
+     *
+     * @default false
+     */
+    disableUrlNormalization?: boolean;
+};