vike 0.4.220-commit-a9f46b8 → 0.4.220-commit-5c7810f

package/dist/esm/shared/getPageContextUrlComputed.js

@@ -37,24 +37,29 @@ function getUrlParsed(pageContext) {
     //  6. The value of pageContext.urlPathname is now '/login': the pathname of `pageContext.urlLogical`. (While pageContext.urlOriginal is still '/fr-FR/admin'.)
     // Reproduction: https://github.com/vikejs/vike/discussions/1436#discussioncomment-8142023
     // Determine logical URL
+    // TODO/soon: revert https://github.com/vikejs/vike/issues/2138#issuecomment-2631713411
+    const assertUrlResolved = (src) => assert(urlResolved && typeof urlResolved === 'string', { src, urlResolved });
     let urlResolved;
     let baseToBeRemoved;
     if (pageContext.urlLogical) {
         // Set by onBeforeRoute()
         urlResolved = pageContext.urlLogical;
         baseToBeRemoved = false;
+        assertUrlResolved(1);
     }
     else if (pageContext._urlRewrite) {
         // Set by `throw render()`
         urlResolved = pageContext._urlRewrite;
         baseToBeRemoved = false;
+        assertUrlResolved(2);
     }
     else {
         // Set by renderPage()
         urlResolved = pageContext.urlOriginal;
         baseToBeRemoved = true;
+        assertUrlResolved(3);
     }
-    assert(urlResolved && typeof urlResolved === 'string');
+    assertUrlResolved(4);
     // Remove .pageContext.json
     let urlHandler = pageContext._urlHandler;
     if (!urlHandler)

package/dist/esm/shared/page-configs/Config.d.ts

@@ -37,7 +37,7 @@ import type { PrefetchSetting, PrefetchStaticAssets } from '../../client/client-
 import type { ConfigDefinition } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js';
 import type { DocumentHtml } from '../../node/runtime/html/renderHtml.js';
 import type { InjectFilterEntry } from '../../types/index.js';
-import type { VikeVitePluginOptions } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
+import type { VikeVitePluginOptions } from '../../node/plugin/index.js';
 import type { Vike, VikePackages } from '../VikeNamespace.js';
 import type { HooksTimeoutProvidedByUser } from '../hooks/getHook.js';
 import type { PageContextClient, PageContextServer } from '../types.js';
@@ -246,11 +246,55 @@ type ConfigBuiltIn = {
      */
     guard?: GuardAsync | GuardSync | ImportString;
     /**
-     * Whether to pre-render the page(s).
+     * Pre-render page(s).
      *
      * https://vike.dev/pre-rendering
+     * https://vike.dev/prerender
+     *
+     * @default false
      */
-    prerender?: boolean | ImportString;
+    prerender?: boolean | ImportString | {
+        /**
+         * 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.
+         *
+         * https://vike.dev/prerender#partial
+         *
+         * @default false
+         */
+        partial?: 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`.
+         *
+         * https://vike.dev/prerender#noextradir
+         *
+         * @default false
+         */
+        noExtraDir?: boolean;
+        /**
+         * Number of concurrent pre-render jobs.
+         *
+         * Set to `false` to disable concurrency.
+         *
+         * https://vike.dev/prerender#parallel
+         *
+         * @default os.cpus().length
+         */
+        parallel?: boolean | number;
+        /**
+         * 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/prerender#disableautorun
+         *
+         * @default false
+         */
+        disableAutoRun?: boolean;
+    };
     /**
      * Install Vike extensions.
      *
@@ -358,6 +402,34 @@ type ConfigBuiltIn = {
      * 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;
+    /** @deprecated It's now `true` by default. You can remove this option. */
+    includeAssetsImportedByServer?: 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;
     /**
      * @experimental DON'T USE: the API *will* have breaking changes upon any minor version release.
      *
@@ -407,6 +479,7 @@ type ConfigBuiltIn = {
 type ConfigBuiltInResolved = {
     passToClient?: string[][];
     redirects?: Record<string, string>[];
+    prerender?: Exclude<Config['prerender'], ImportString | undefined>[];
 };
 type ConfigMeta = Record<string, ConfigDefinition>;
 type ImportString = `import:${string}`;

package/dist/esm/shared/page-configs/PageConfig.d.ts

@@ -20,7 +20,8 @@ import type { ConfigValueSerialized } from './serialize/PageConfigSerialized.js'
 import type { LocationId } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/filesystemRouting.js';
 import type { FilePath } from './FilePath.js';
 import type { ConfigDefinitions } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js';
-type PageConfigBase = {
+import type { InterfaceFile, InterfaceFilesByLocationId } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
+type PageConfigCommon = {
     pageId: string;
     isErrorPage?: true;
     routeFilesystem?: {
@@ -28,37 +29,41 @@ type PageConfigBase = {
         definedBy: string;
     };
 };
-/** Page config data structure available at runtime */
-type PageConfigRuntime = PageConfigBase & {
+/** Page config, runtime data structure */
+type PageConfigRuntime = PageConfigCommon & {
     configValues: ConfigValues;
     /** Load config values that are lazily loaded such as config.Page */
-    loadConfigValuesAll: () => {
-        moduleId: string;
-        moduleExports: Promise<{
-            configValuesSerialized: Record<string, ConfigValueSerialized>;
-        }>;
-    };
+    loadConfigValuesAll: LoadConfigValuesAll;
 };
-/** Same as PageConfigRuntime but also contains all lazily loaded config values such as config.Page */
-type PageConfigRuntimeLoaded = PageConfigRuntime & {
-    /** Whether loadConfigValuesAll() was called */
-    isAllLoaded: true;
+/** Global config that applies to all pages, runtime data structure */
+type PageConfigGlobalRuntime = {
+    configValues: ConfigValues;
 };
-/** Page config data structure available at build-time */
-type PageConfigBuildTime = PageConfigBase & {
+/** Page config, build-time data structure */
+type PageConfigBuildTime = PageConfigCommon & {
     configDefinitions: ConfigDefinitions;
+    interfaceFiles: InterfaceFilesByLocationId;
     configValueSources: ConfigValueSources;
     configValuesComputed: ConfigValuesComputed;
 };
-/** Page config that applies to all pages */
-type PageConfigGlobalRuntime = {
-    configValues: ConfigValues;
-};
+/** Global config that applies to all pages, build-time data structure */
 type PageConfigGlobalBuildTime = {
     configValueSources: ConfigValueSources;
+    interfaceFiles: InterfaceFilesByLocationId;
     configDefinitions: ConfigDefinitions;
     configValuesComputed?: undefined;
 };
+/** Same as PageConfigRuntime but also contains all lazily loaded config values such as config.Page */
+type PageConfigRuntimeLoaded = PageConfigRuntime & {
+    /** Whether loadConfigValuesAll() was called */
+    isAllLoaded: true;
+};
+type LoadConfigValuesAll = () => {
+    moduleId: string;
+    moduleExports: Promise<{
+        configValuesSerialized: Record<string, ConfigValueSerialized>;
+    }>;
+};
 /** In what environment(s) the config value is loaded.
  *
  * https://vike.dev/meta
@@ -80,6 +85,7 @@ type ConfigValueSource = {
     value?: unknown;
     configEnv: ConfigEnvInternal;
     definedAtFilePath: DefinedAtFilePath;
+    interfaceFile: InterfaceFile | null;
     locationId: LocationId;
     isOverriden: boolean;
     /** Wether the config value is loaded at runtime, for example config.Page or config.onBeforeRender */

package/dist/esm/shared/page-configs/getPageConfigUserFriendly.d.ts

@@ -33,7 +33,7 @@ type ConfigEntries = Record<string, {
     configDefinedByFile: string | null;
 }[]>;
 type PageConfigUserFriendly = {
-    config: Record<string, unknown>;
+    config: ConfigResolved;
     source: Source;
     sources: Sources;
     from: From;

package/dist/esm/shared/page-configs/getPageConfigUserFriendly.js

@@ -63,11 +63,11 @@ function getPageConfigUserFriendly(pageFiles, pageConfig) {
     assert(!('default' in exports));
     assert(!('default' in exportsAll));
     const pageContextExports = {
+        config: config,
         from,
         source,
         sources,
         // TODO/eventually: deprecate/remove every prop below
-        config,
         configEntries,
         exports,
         exportsAll,
@@ -151,7 +151,7 @@ function getPageConfigUserFriendlyNew(pageConfig) {
         });
     });
     return {
-        config,
+        config: config,
         configEntries,
         exportsAll,
         source,

package/dist/esm/shared/utils.d.ts

@@ -12,7 +12,7 @@ export * from '../utils/isPlainObject.js';
 export * from '../utils/compareString.js';
 export * from '../utils/isNotNullish.js';
 export * from '../utils/stringifyStringArray.js';
-export * from '../utils/filesystemPathHandling.js';
+export * from '../utils/toPosixPath.js';
 export * from '../utils/cast.js';
 export * from '../utils/isPropertyGetter.js';
 export * from '../utils/isPromise.js';

package/dist/esm/shared/utils.js

@@ -16,7 +16,7 @@ export * from '../utils/isPlainObject.js';
 export * from '../utils/compareString.js';
 export * from '../utils/isNotNullish.js';
 export * from '../utils/stringifyStringArray.js';
-export * from '../utils/filesystemPathHandling.js';
+export * from '../utils/toPosixPath.js';
 export * from '../utils/cast.js';
 export * from '../utils/isPropertyGetter.js';
 export * from '../utils/isPromise.js';

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.220-commit-a9f46b8";
+export declare const PROJECT_VERSION: "0.4.220-commit-5c7810f";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.220-commit-a9f46b8';
+export const PROJECT_VERSION = '0.4.220-commit-5c7810f';

package/dist/esm/utils/findFile.js

@@ -2,7 +2,7 @@ export { findFile };
 import path from 'path';
 import fs from 'fs';
 import { isArray } from './isArray.js';
-import { assertPosixPath } from './filesystemPathHandling.js';
+import { assertPosixPath } from './toPosixPath.js';
 function findFile(arg, cwd) {
     assertPosixPath(cwd);
     const filenames = isArray(arg) ? arg : [arg];

package/dist/esm/utils/isDev.js

@@ -2,12 +2,13 @@ export { isDevCheck };
 export { applyDev };
 export { applyPreview };
 import { assert } from './assert.js';
+import { version } from 'vite';
 function isDevCheck(configEnv) {
     const { isPreview, command } = configEnv;
     // Released at vite@5.1.0 which is guaranteed with `assertVersion('Vite', version, '5.1.0')`
     // - Release: https://github.com/vitejs/vite/blob/6f7466e6211027686f40ad7e4ce6ec8477414546/packages/vite/CHANGELOG.md#510-beta4-2024-01-26:~:text=fix(preview)%3A-,set%20isPreview%20true,-(%2315695)%20(93fce55
-    // - Surprisingly, this assert() can fail: https://github.com/vikejs/vike/issues/2120
-    assert(typeof isPreview === 'boolean');
+    // - Surprisingly, this assert() can fail: https://github.com/vikejs/vike/issues/2135
+    assert(typeof isPreview === 'boolean', { isPreview, version });
     return command === 'serve' && !isPreview;
 }
 function applyDev(_, env) {

package/dist/esm/utils/isFilePathAbsoluteFilesystem.js

@@ -2,7 +2,7 @@ export { assertFilePathAbsoluteFilesystem };
 export { isFilePathAbsolute };
 import path from 'path';
 import { assert } from './assert.js';
-import { assertPosixPath } from './filesystemPathHandling.js';
+import { assertPosixPath } from './toPosixPath.js';
 /**
  * Asserts that `filePath` is an absolute file path starting from the filesystem root.
  *

package/dist/esm/utils/projectInfo.d.ts

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.220-commit-a9f46b8";
+    projectVersion: "0.4.220-commit-5c7810f";
 };

package/dist/esm/utils/requireResolve.js

@@ -2,7 +2,7 @@ export { requireResolve };
 import { assert } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 import { assertIsNotProductionRuntime } from './assertSetup.js';
-import { assertPosixPath, toPosixPath } from './filesystemPathHandling.js';
+import { assertPosixPath, toPosixPath } from './toPosixPath.js';
 import { scriptFileExtensionList } from './isScriptFile.js';
 import { createRequire } from 'module';
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.220-commit-a9f46b8",
+  "version": "0.4.220-commit-5c7810f",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {

package/dist/cjs/node/plugin/plugins/buildEntry/getVikeManifest.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVikeManifest = getVikeManifest;
-const utils_js_1 = require("../../utils.js");
-const assertPluginManifest_js_1 = require("../../../shared/assertPluginManifest.js");
-const extractExportNamesPlugin_js_1 = require("../extractExportNamesPlugin.js");
-const globalContext_js_1 = require("../../../runtime/globalContext.js");
-function getVikeManifest(vikeConfigGlobal, viteConfig) {
-    const runtimeManifest = (0, globalContext_js_1.getRuntimeManifest)(vikeConfigGlobal, viteConfig);
-    const manifest = {
-        version: utils_js_1.projectInfo.projectVersion,
-        usesClientRouter: (0, extractExportNamesPlugin_js_1.isUsingClientRouter)(), // TODO/v1-release: remove
-        ...runtimeManifest
-    };
-    (0, assertPluginManifest_js_1.assertPluginManifest)(manifest);
-    return manifest;
-}

package/dist/cjs/node/shared/assertPluginManifest.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertPluginManifest = assertPluginManifest;
-const assertRuntimeManifest_js_1 = require("./assertRuntimeManifest.js");
-const utils_js_1 = require("./utils.js");
-function assertPluginManifest(pluginManifest) {
-    (0, utils_js_1.assert)((0, utils_js_1.isPlainObject)(pluginManifest));
-    (0, utils_js_1.assertUsage)(pluginManifest.version === utils_js_1.projectInfo.projectVersion, `Re-build your app (you're using vike@${utils_js_1.projectInfo.projectVersion} but your app was built with vike@${pluginManifest.version})`);
-    (0, assertRuntimeManifest_js_1.assertRuntimeManifest)(pluginManifest);
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pluginManifest, 'usesClientRouter', 'boolean'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pluginManifest, 'version', 'string'));
-    // Avoid:
-    // ```
-    // Uncaught (in promise) TypeError: Cannot set property manifestKeyMap of #<Object> which has only a getter
-    // ```
-    // We removed manifestKeyMap, maybe this isn't needed anymore.
-    // See https://github.com/vikejs/vike/issues/596
-    const pluginManifestClone = { ...pluginManifest };
-    (0, utils_js_1.checkType)(pluginManifestClone);
-}

package/dist/cjs/node/shared/assertRuntimeManifest.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertRuntimeManifest = assertRuntimeManifest;
-const utils_js_1 = require("./utils.js");
-function assertRuntimeManifest(obj) {
-    (0, utils_js_1.assert)(obj);
-    (0, utils_js_1.assert)((0, utils_js_1.isObject)(obj));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(obj, 'baseServer', 'string'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(obj, 'baseAssets', 'string'));
-    (0, utils_js_1.assert)((0, utils_js_1.isBaseServer)(obj.baseServer));
-    (0, utils_js_1.assert)((0, utils_js_1.isBaseAssets)(obj.baseAssets));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(obj, 'includeAssetsImportedByServer', 'boolean'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(obj, 'trailingSlash', 'boolean'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(obj, 'disableUrlNormalization', 'boolean'));
-    (0, utils_js_1.checkType)(obj);
-}

package/dist/esm/node/plugin/plugins/buildEntry/getVikeManifest.d.ts

@@ -1,5 +0,0 @@
-export { getVikeManifest };
-import { type PluginManifest } from '../../../shared/assertPluginManifest.js';
-import type { VikeConfigGlobal } from '../importUserCode/v1-design/getVikeConfig.js';
-import type { ResolvedConfig } from 'vite';
-declare function getVikeManifest(vikeConfigGlobal: VikeConfigGlobal, viteConfig: ResolvedConfig): PluginManifest;

package/dist/esm/node/plugin/plugins/buildEntry/getVikeManifest.js

@@ -1,15 +0,0 @@
-export { getVikeManifest };
-import { projectInfo } from '../../utils.js';
-import { assertPluginManifest } from '../../../shared/assertPluginManifest.js';
-import { isUsingClientRouter } from '../extractExportNamesPlugin.js';
-import { getRuntimeManifest } from '../../../runtime/globalContext.js';
-function getVikeManifest(vikeConfigGlobal, viteConfig) {
-    const runtimeManifest = getRuntimeManifest(vikeConfigGlobal, viteConfig);
-    const manifest = {
-        version: projectInfo.projectVersion,
-        usesClientRouter: isUsingClientRouter(), // TODO/v1-release: remove
-        ...runtimeManifest
-    };
-    assertPluginManifest(manifest);
-    return manifest;
-}

package/dist/esm/node/shared/assertPluginManifest.d.ts

@@ -1,12 +0,0 @@
-export { assertPluginManifest };
-export type { PluginManifest };
-type PluginManifest = {
-    version: string;
-    baseServer: string;
-    baseAssets: string | null;
-    usesClientRouter: boolean;
-    includeAssetsImportedByServer: boolean;
-    trailingSlash: boolean;
-    disableUrlNormalization: boolean;
-};
-declare function assertPluginManifest(pluginManifest: unknown): asserts pluginManifest is PluginManifest;

package/dist/esm/node/shared/assertPluginManifest.js

@@ -1,18 +0,0 @@
-export { assertPluginManifest };
-import { assertRuntimeManifest } from './assertRuntimeManifest.js';
-import { assert, assertUsage, isPlainObject, projectInfo, checkType, hasProp } from './utils.js';
-function assertPluginManifest(pluginManifest) {
-    assert(isPlainObject(pluginManifest));
-    assertUsage(pluginManifest.version === projectInfo.projectVersion, `Re-build your app (you're using vike@${projectInfo.projectVersion} but your app was built with vike@${pluginManifest.version})`);
-    assertRuntimeManifest(pluginManifest);
-    assert(hasProp(pluginManifest, 'usesClientRouter', 'boolean'));
-    assert(hasProp(pluginManifest, 'version', 'string'));
-    // Avoid:
-    // ```
-    // Uncaught (in promise) TypeError: Cannot set property manifestKeyMap of #<Object> which has only a getter
-    // ```
-    // We removed manifestKeyMap, maybe this isn't needed anymore.
-    // See https://github.com/vikejs/vike/issues/596
-    const pluginManifestClone = { ...pluginManifest };
-    checkType(pluginManifestClone);
-}

package/dist/esm/node/shared/assertRuntimeManifest.d.ts

@@ -1,10 +0,0 @@
-export { assertRuntimeManifest };
-export type { RuntimeManifest };
-type RuntimeManifest = {
-    baseServer: string;
-    baseAssets: string;
-    includeAssetsImportedByServer: boolean;
-    trailingSlash: boolean;
-    disableUrlNormalization: boolean;
-};
-declare function assertRuntimeManifest(obj: unknown): asserts obj is RuntimeManifest & Record<string, unknown>;

package/dist/esm/node/shared/assertRuntimeManifest.js

@@ -1,14 +0,0 @@
-export { assertRuntimeManifest };
-import { assert, checkType, hasProp, isBaseAssets, isBaseServer, isObject } from './utils.js';
-function assertRuntimeManifest(obj) {
-    assert(obj);
-    assert(isObject(obj));
-    assert(hasProp(obj, 'baseServer', 'string'));
-    assert(hasProp(obj, 'baseAssets', 'string'));
-    assert(isBaseServer(obj.baseServer));
-    assert(isBaseAssets(obj.baseAssets));
-    assert(hasProp(obj, 'includeAssetsImportedByServer', 'boolean'));
-    assert(hasProp(obj, 'trailingSlash', 'boolean'));
-    assert(hasProp(obj, 'disableUrlNormalization', 'boolean'));
-    checkType(obj);
-}