vike 0.4.220-commit-af5c91f → 0.4.221-commit-8577456

package/dist/esm/shared/getPageFiles/parseGlobResults.d.ts

@@ -2,7 +2,7 @@ export { parseGlobResults };
 import { type PageFile } from './getPageFileObject.js';
 import type { PageConfigRuntime, PageConfigGlobalRuntime } from '../page-configs/PageConfig.js';
 declare function parseGlobResults(pageFilesExports: unknown): {
-    pageFiles: PageFile[];
+    pageFilesAll: PageFile[];
     pageConfigs: PageConfigRuntime[];
     pageConfigGlobal: PageConfigGlobalRuntime;
 };

package/dist/esm/shared/getPageFiles/parseGlobResults.js

@@ -5,6 +5,7 @@ import { assertExportValues } from './assert_exports_old_design.js';
 import { getPageFileObject } from './getPageFileObject.js';
 import { fileTypes } from './fileTypes.js';
 import { parsePageConfigs } from '../page-configs/serialize/parsePageConfigs.js';
+// TODO/now: rename
 function parseGlobResults(pageFilesExports) {
     assert(hasProp(pageFilesExports, 'pageFilesLazy', 'object'));
     assert(hasProp(pageFilesExports, 'pageFilesEager', 'object'));
@@ -60,11 +61,11 @@ function parseGlobResults(pageFilesExports) {
     pageFilesExports.pageFilesList.forEach((filePath) => {
         pageFilesMap[filePath] = pageFilesMap[filePath] ?? getPageFileObject(filePath);
     });
-    const pageFiles = Object.values(pageFilesMap);
-    pageFiles.forEach(({ filePath }) => {
+    const pageFilesAll = Object.values(pageFilesMap);
+    pageFilesAll.forEach(({ filePath }) => {
         assert(!filePath.includes('\\'));
     });
-    return { pageFiles, pageConfigs, pageConfigGlobal };
+    return { pageFilesAll, pageConfigs, pageConfigGlobal };
 }
 function parseGlobResult(globObject) {
     const ret = [];

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

@@ -2,4 +2,3 @@ export type { PageFile } from './getPageFiles/getPageFileObject.js';
 export type { ExportsAll, PageConfigUserFriendly } from './page-configs/getPageConfigUserFriendly.js';
 export { getPageFilesClientSide } from './getPageFiles/getAllPageIdFiles.js';
 export { getPageFilesServerSide } from './getPageFiles/getAllPageIdFiles.js';
-export { getPageConfigUserFriendly } from './page-configs/getPageConfigUserFriendly.js';

package/dist/esm/shared/getPageFiles.js

@@ -1,3 +1,2 @@
 export { getPageFilesClientSide } from './getPageFiles/getAllPageIdFiles.js';
 export { getPageFilesServerSide } from './getPageFiles/getAllPageIdFiles.js';
-export { getPageConfigUserFriendly } from './page-configs/getPageConfigUserFriendly.js';

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

@@ -420,6 +420,10 @@ type ConfigBuiltIn = {
     includeAssetsImportedByServer?: boolean;
     /** @deprecated See https://vike.dev/disableAutoFullBuild */
     disableAutoFullBuild?: boolean | 'prerender';
+    /** Use Vite Environment API to orchestrate the build process.
+     * @experimental
+     */
+    viteEnvironmentAPI?: boolean;
     /** The Base URL of your server.
      *
      * https://vike.dev/base-url
@@ -475,11 +479,14 @@ type ConfigBuiltIn = {
      * https://vike.dev/keepScrollPosition
      */
     keepScrollPosition?: KeepScrollPosition;
+    /** @experimental */
+    middleware?: Function;
 };
 type ConfigBuiltInResolved = {
     passToClient?: string[][];
     redirects?: Record<string, string>[];
     prerender?: Exclude<Config['prerender'], ImportString | undefined>[];
+    middleware?: Function[];
 };
 type ConfigMeta = Record<string, ConfigDefinition>;
 type ImportString = `import:${string}`;

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

@@ -20,7 +20,7 @@ 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';
-import type { InterfaceFile, InterfaceFilesByLocationId } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js';
+import type { PlusFile, PlusFilesByLocationId } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/getPlusFilesAll.js';
 type PageConfigCommon = {
     pageId: string;
     isErrorPage?: true;
@@ -42,7 +42,7 @@ type PageConfigGlobalRuntime = {
 /** Page config, build-time data structure */
 type PageConfigBuildTime = PageConfigCommon & {
     configDefinitions: ConfigDefinitions;
-    interfaceFiles: InterfaceFilesByLocationId;
+    plusFiles: PlusFilesByLocationId;
     configValueSources: ConfigValueSources;
     configValuesComputed: ConfigValuesComputed;
 };
@@ -81,10 +81,9 @@ type ConfigEnvInternal = Omit<ConfigEnv, 'client'> & {
 type ConfigValueSources = Record<string, // configName
 ConfigValueSource[]>;
 type ConfigValueSource = {
-    value?: unknown;
     configEnv: ConfigEnvInternal;
     definedAtFilePath: DefinedAtFilePath;
-    interfaceFile: InterfaceFile | null;
+    plusFile: PlusFile | null;
     locationId: LocationId;
     isOverriden: boolean;
     /** Wether the config value is loaded at runtime, for example config.Page or config.onBeforeRender */
@@ -92,7 +91,12 @@ type ConfigValueSource = {
     /** Whether the config value is a file path, for example config.client */
     valueIsFilePath?: true;
     valueIsDefinedByPlusFile: boolean;
-};
+} & ({
+    valueIsLoaded: false;
+} | {
+    valueIsLoaded: true;
+    value: unknown;
+});
 type DefinedAtFilePath = DefinedAtFile & FilePath & {
     fileExportName?: string;
 };

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

@@ -1,4 +1,4 @@
-export { getPageConfigUserFriendly };
+export { getPageConfigUserFriendlyOld };
 export { getPageConfigUserFriendlyNew };
 export type { ConfigUserFriendly };
 export type { PageConfigUserFriendly };
@@ -73,15 +73,13 @@ type SourceConfigsComputed = {
     type: 'configsComputed';
     value: unknown;
 };
-declare function getPageConfigUserFriendly(pageFiles: PageFile[], pageConfig: PageConfigRuntimeLoaded | null): PageConfigUserFriendly;
 type ConfigUserFriendly = {
     config: ConfigResolved;
-    configEntries: ConfigEntries;
-    exportsAll: ExportsAll;
-    source: Source;
-    sources: Sources;
-    from: From;
+    _source: Source;
+    _sources: Sources;
+    _from: From;
 };
 declare function getPageConfigUserFriendlyNew(pageConfig: {
     configValues: ConfigValues;
 }): ConfigUserFriendly;
+declare function getPageConfigUserFriendlyOld(pageFiles: PageFile[], pageConfig: PageConfigRuntimeLoaded | null): PageConfigUserFriendly;

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

@@ -1,11 +1,20 @@
-export { getPageConfigUserFriendly };
+export { getPageConfigUserFriendlyOld };
 export { getPageConfigUserFriendlyNew };
 import { assertDefaultExports, forbiddenDefaultExports } from '../getPageFiles/assert_exports_old_design.js';
 import { getConfigDefinedAtOptional, getDefinedAtString } from './getConfigDefinedAt.js';
 import { getConfigValueFilePathToShowToUser } from './helpers.js';
 import { assert, isObject, assertWarning, assertUsage, makeLast, isBrowser, isScriptFile, isTemplateFile } from '../utils.js';
 import pc from '@brillout/picocolors';
-function getPageConfigUserFriendly(pageFiles, pageConfig) {
+function getPageConfigUserFriendlyNew(pageConfig) {
+    const res = getPageConfigUserFriendlyV1Desin(pageConfig);
+    return {
+        config: res.config,
+        _source: res.source,
+        _sources: res.sources,
+        _from: res.from
+    };
+}
+function getPageConfigUserFriendlyOld(pageFiles, pageConfig) {
     const config = {};
     const configEntries = {}; // TODO/v1-release: remove
     const exportsAll = {}; // TODO/v1-release: remove
@@ -30,7 +39,7 @@ function getPageConfigUserFriendly(pageFiles, pageConfig) {
     let sources;
     let from;
     if (pageConfig) {
-        const res = getPageConfigUserFriendlyNew(pageConfig);
+        const res = getPageConfigUserFriendlyV1Desin(pageConfig);
         source = res.source;
         sources = res.sources;
         from = res.from;
@@ -76,7 +85,7 @@ function getPageConfigUserFriendly(pageFiles, pageConfig) {
     return pageContextExports;
 }
 // V1 design
-function getPageConfigUserFriendlyNew(pageConfig) {
+function getPageConfigUserFriendlyV1Desin(pageConfig) {
     const config = {};
     const configEntries = {};
     const exportsAll = {};

package/dist/esm/shared/route/loadPageRoutes.js

@@ -10,6 +10,7 @@ import { getHookFromPageConfigGlobal, getHookTimeoutDefault } from '../hooks/get
 async function loadPageRoutes(
 // Remove all arguments and use GlobalContext instead?
 pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds) {
+    // TODO/next-major: remove & make this function sync
     await Promise.all(pageFilesAll.filter((p) => p.fileType === '.page.route').map((p) => p.loadFile?.()));
     const { onBeforeRouteHook, filesystemRoots } = getGlobalHooks(pageFilesAll, pageConfigs, pageConfigGlobal);
     const pageRoutes = getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds);

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.220-commit-af5c91f";
+export declare const PROJECT_VERSION: "0.4.221-commit-8577456";

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-af5c91f';
+export const PROJECT_VERSION = '0.4.221-commit-8577456';

package/dist/esm/utils/assertSetup.js

@@ -32,7 +32,7 @@ function onSetupRuntime() {
     if (!isViteLoaded()) {
         // TODO: make it assertUsage() again once https://github.com/vikejs/vike/issues/1528 is implemented.
         assertWarning(!isNodeEnvDev(), `The ${getEnvDescription()}, which is contradictory because the environment seems to be a production environment (Vite isn't loaded), see https://vike.dev/NODE_ENV`, { onlyOnce: true });
-        assertUsage(!setup.vikeVitePlugin, "Loading Vike's Vite plugin (the vike/plugin module) is prohibited in production.");
+        assertUsage(!setup.vikeVitePlugin, `Loading Vike's Vite plugin (the ${pc.cyan('vike/plugin')} module) is prohibited in production.`);
         // This assert() one of the main goal of this file: it ensures assertIsNotProductionRuntime()
         assert(!setup.shouldNotBeProduction);
     }

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

@@ -1,7 +1,7 @@
 export { createDebugger };
 export { isDebugActivated };
 export type { Debug };
-declare const flags: readonly ["vike:error", "vike:extractAssets", "vike:extractExportNames", "vike:glob", "vike:globalContext", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:routing", "vike:setup", "vike:stream", "vike:virtual-files", "vike:esbuild-resolve"];
+declare const flags: readonly ["vike:error", "vike:esbuild-resolve", "vike:extractAssets", "vike:extractExportNames", "vike:glob", "vike:globalContext", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:routing", "vike:setup", "vike:stream", "vike:virtual-files"];
 type Flag = (typeof flags)[number];
 type Debug = ReturnType<typeof createDebugger>;
 type Options = {

package/dist/esm/utils/debug.js

@@ -13,6 +13,7 @@ assert(!isBrowser());
 globalThis.__brillout_debug_createDebugger = createDebugger;
 const flags = [
     'vike:error',
+    'vike:esbuild-resolve',
     'vike:extractAssets',
     'vike:extractExportNames',
     'vike:glob',
@@ -25,9 +26,9 @@ const flags = [
     'vike:routing',
     'vike:setup',
     'vike:stream',
-    'vike:virtual-files',
-    'vike:esbuild-resolve'
+    'vike:virtual-files'
 ];
+const flagsSkipWildcard = ['vike:log'];
 const flagRegex = /\bvike:[a-zA-Z-]+/g;
 assertFlagsActivated();
 function createDebugger(flag, optionsGlobal) {
@@ -72,8 +73,8 @@ function debug_(flag, options, ...msgs) {
 function isDebugActivated(flag) {
     checkType(flag);
     assert(flags.includes(flag));
-    const flagsActivated = getFlagsActivated();
-    const isActivated = flagsActivated.includes(flag);
+    const { flagsActivated, all } = getFlagsActivated();
+    const isActivated = flagsActivated.includes(flag) || (all && !flagsSkipWildcard.includes(flag));
     return isActivated;
 }
 function formatMsg(info, options, padding, position) {
@@ -137,7 +138,7 @@ function replaceFunctionSerializer(_key, value) {
     return value;
 }
 function assertFlagsActivated() {
-    const flagsActivated = getFlagsActivated();
+    const { flagsActivated } = getFlagsActivated();
     flagsActivated.forEach((flag) => {
         assertUsage(flags.includes(flag), `Unknown DEBUG flag ${pc.cyan(flag)}. Valid flags:\n${flags.map((f) => `  ${pc.cyan(f)}`).join('\n')}`);
     });
@@ -145,7 +146,8 @@ function assertFlagsActivated() {
 function getFlagsActivated() {
     const DEBUG = getDEBUG() ?? '';
     const flagsActivated = DEBUG.match(flagRegex) ?? [];
-    return flagsActivated;
+    const all = DEBUG.includes('vike:*');
+    return { flagsActivated, all };
 }
 function getDEBUG() {
     let DEBUG;

package/dist/esm/utils/findFile.js

@@ -3,6 +3,7 @@ import path from 'path';
 import fs from 'fs';
 import { isArray } from './isArray.js';
 import { assertPosixPath } from './path.js';
+// We need to be able to crawl the filesystem, regardless of Vike's `$ git ls-files` command call, because we need to fallback if the user didn't setup Git (e.g. we cannot remove the fast-glob fallback).
 function findFile(arg, cwd) {
     assertPosixPath(cwd);
     const filenames = isArray(arg) ? arg : [arg];

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

@@ -0,0 +1 @@
+export declare function objectAssignSafe<Obj extends Record<string, unknown>, ObjNewVals extends Partial<Obj>>(obj: Obj, objNewVals: ObjNewVals): void;

package/dist/esm/utils/objectAssignSafe.js

@@ -0,0 +1,4 @@
+// Same as `Object.assign(obj, objNewVals)` but ensure that `objNewVals` properties alreay exist on `obj`
+export function objectAssignSafe(obj, objNewVals) {
+    Object.assign(obj, objNewVals);
+}

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.220-commit-af5c91f";
+    projectVersion: "0.4.221-commit-8577456";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.220-commit-af5c91f",
+  "version": "0.4.221-commit-8577456",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -123,7 +123,7 @@
     "@brillout/json-serializer": "^0.5.15",
     "@brillout/picocolors": "^1.0.15",
     "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-server-entry": "^0.5.8",
+    "@brillout/vite-plugin-server-entry": "^0.6.0",
     "acorn": "^8.0.0",
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",

package/dist/cjs/shared/getPageFiles/getPageFiles.js

@@ -1,48 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPageFilesAll = getPageFilesAll;
-exports.setPageFiles = setPageFiles;
-exports.setPageFilesAsync = setPageFilesAsync;
-const utils_js_1 = require("../utils.js");
-const parseGlobResults_js_1 = require("./parseGlobResults.js");
-const getGlobalObject_js_1 = require("../../utils/getGlobalObject.js");
-const getPageConfigUserFriendly_js_1 = require("../page-configs/getPageConfigUserFriendly.js");
-const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('setPageFiles.ts', {});
-function setPageFiles(pageFilesExports) {
-    const { pageFiles, pageConfigs, pageConfigGlobal } = (0, parseGlobResults_js_1.parseGlobResults)(pageFilesExports);
-    globalObject.pageFilesAll = pageFiles;
-    globalObject.pageConfigs = pageConfigs;
-    globalObject.pageConfigGlobal = pageConfigGlobal;
-    // TODO/now: re-use this call, instead of calling it twice
-    globalObject.globalConfig = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)(pageConfigGlobal);
-}
-function setPageFilesAsync(getPageFilesExports) {
-    globalObject.pageFilesGetter = async () => {
-        setPageFiles(await getPageFilesExports());
-    };
-}
-async function getPageFilesAll(isClientSide, isProduction) {
-    if (isClientSide) {
-        (0, utils_js_1.assert)(!globalObject.pageFilesGetter);
-        (0, utils_js_1.assert)(isProduction === undefined);
-    }
-    else {
-        (0, utils_js_1.assert)(typeof isProduction === 'boolean');
-        if (!globalObject.pageFilesAll ||
-            // We reload all glob imports in dev to make auto-reload work
-            !isProduction) {
-            (0, utils_js_1.assert)(globalObject.pageFilesGetter);
-            await globalObject.pageFilesGetter();
-        }
-    }
-    const { pageFilesAll, pageConfigs, pageConfigGlobal, globalConfig } = globalObject;
-    (0, utils_js_1.assert)(pageFilesAll && pageConfigs && pageConfigGlobal && globalConfig);
-    const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
-    return { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig };
-}
-function getAllPageIds(allPageFiles, pageConfigs) {
-    const fileIds = allPageFiles.filter(({ isDefaultPageFile }) => !isDefaultPageFile).map(({ pageId }) => pageId);
-    const allPageIds = (0, utils_js_1.unique)(fileIds);
-    const allPageIds2 = pageConfigs.map((p) => p.pageId);
-    return [...allPageIds, ...allPageIds2];
-}

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

@@ -1,6 +0,0 @@
-export { assertExtensionsConventions };
-export { assertExtensionsRequire };
-import { type InterfaceFile } from './getVikeConfig.js';
-import { PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
-declare function assertExtensionsConventions(interfaceFile: InterfaceFile): void;
-declare function assertExtensionsRequire(pageConfig: PageConfigBuildTime): void;

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

@@ -1,15 +0,0 @@
-export { getPageFilesAll };
-export { setPageFiles };
-export { setPageFilesAsync };
-import type { PageFile } from './getPageFileObject.js';
-import type { PageConfigRuntime, PageConfigGlobalRuntime } from '../page-configs/PageConfig.js';
-import { type ConfigUserFriendly } from '../page-configs/getPageConfigUserFriendly.js';
-declare function setPageFiles(pageFilesExports: unknown): void;
-declare function setPageFilesAsync(getPageFilesExports: () => Promise<unknown>): void;
-declare function getPageFilesAll(isClientSide: boolean, isProduction?: boolean): Promise<{
-    pageFilesAll: PageFile[];
-    allPageIds: string[];
-    pageConfigs: PageConfigRuntime[];
-    pageConfigGlobal: PageConfigGlobalRuntime;
-    globalConfig: ConfigUserFriendly;
-}>;

package/dist/esm/shared/getPageFiles/getPageFiles.js

@@ -1,46 +0,0 @@
-export { getPageFilesAll };
-export { setPageFiles };
-export { setPageFilesAsync };
-import { assert, unique } from '../utils.js';
-import { parseGlobResults } from './parseGlobResults.js';
-import { getGlobalObject } from '../../utils/getGlobalObject.js';
-import { getPageConfigUserFriendlyNew } from '../page-configs/getPageConfigUserFriendly.js';
-const globalObject = getGlobalObject('setPageFiles.ts', {});
-function setPageFiles(pageFilesExports) {
-    const { pageFiles, pageConfigs, pageConfigGlobal } = parseGlobResults(pageFilesExports);
-    globalObject.pageFilesAll = pageFiles;
-    globalObject.pageConfigs = pageConfigs;
-    globalObject.pageConfigGlobal = pageConfigGlobal;
-    // TODO/now: re-use this call, instead of calling it twice
-    globalObject.globalConfig = getPageConfigUserFriendlyNew(pageConfigGlobal);
-}
-function setPageFilesAsync(getPageFilesExports) {
-    globalObject.pageFilesGetter = async () => {
-        setPageFiles(await getPageFilesExports());
-    };
-}
-async function getPageFilesAll(isClientSide, isProduction) {
-    if (isClientSide) {
-        assert(!globalObject.pageFilesGetter);
-        assert(isProduction === undefined);
-    }
-    else {
-        assert(typeof isProduction === 'boolean');
-        if (!globalObject.pageFilesAll ||
-            // We reload all glob imports in dev to make auto-reload work
-            !isProduction) {
-            assert(globalObject.pageFilesGetter);
-            await globalObject.pageFilesGetter();
-        }
-    }
-    const { pageFilesAll, pageConfigs, pageConfigGlobal, globalConfig } = globalObject;
-    assert(pageFilesAll && pageConfigs && pageConfigGlobal && globalConfig);
-    const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
-    return { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig };
-}
-function getAllPageIds(allPageFiles, pageConfigs) {
-    const fileIds = allPageFiles.filter(({ isDefaultPageFile }) => !isDefaultPageFile).map(({ pageId }) => pageId);
-    const allPageIds = unique(fileIds);
-    const allPageIds2 = pageConfigs.map((p) => p.pageId);
-    return [...allPageIds, ...allPageIds2];
-}