vike 0.4.218-commit-85af52a → 0.4.218-commit-ea8bb27

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

@@ -4,12 +4,15 @@ 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 () => {
@@ -30,10 +33,10 @@ async function getPageFilesAll(isClientSide, isProduction) {
             await globalObject.pageFilesGetter();
         }
     }
-    const { pageFilesAll, pageConfigs, pageConfigGlobal } = globalObject;
-    assert(pageFilesAll && pageConfigs && pageConfigGlobal);
+    const { pageFilesAll, pageConfigs, pageConfigGlobal, globalConfig } = globalObject;
+    assert(pageFilesAll && pageConfigs && pageConfigGlobal && globalConfig);
     const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
-    return { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal };
+    return { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig };
 }
 function getAllPageIds(allPageFiles, pageConfigs) {
     const fileIds = allPageFiles.filter(({ isDefaultPageFile }) => !isDefaultPageFile).map(({ pageId }) => pageId);

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

@@ -1,11 +1,15 @@
 export type { PageContextConfig };
+export type { ConfigResolved };
 import type { VikePackages } from '../../VikeNamespace.js';
-import type { ConfigBuiltIn, ImportString } from '../Config.js';
+import type { ConfigBuiltIn, ConfigBuiltInResolved, ImportString } from '../Config.js';
 import type { Combine, IsNotEmpty, XOR5 } from './helpers.js';
-type WithoutImportString<T> = {
-    [K in keyof T]: Exclude<T[K], ImportString>;
-};
-type PageContextConfig = ConfigBuiltIn & Vike.ConfigResolved & WithoutImportString<Omit<Vike.Config, keyof Vike.ConfigResolved>> & (ConfigVikePackagesNotEmptyXor extends true ? ConfigVikePackagesIntersection : ConfigVikePackagesCombined);
+type PageContextConfig = ConfigResolved & (ConfigVikePackagesNotEmptyXor extends true ? ConfigVikePackagesIntersection : ConfigVikePackagesCombined);
+type ConfigUnresolved = WithoutImportString<ConfigBuiltIn & Vike.Config>;
+type ConfigResolvedOnly = ConfigBuiltInResolved & Vike.ConfigResolved;
+type ConfigResolved = ConfigResolvedOnly & Omit<ConfigUnresolved, keyof ConfigResolvedOnly>;
 type ConfigVikePackagesIntersection = VikePackages.ConfigVikeReact & VikePackages.ConfigVikeVue & VikePackages.ConfigVikeSolid & VikePackages.ConfigVikeSvelte & VikePackages.ConfigVikeAngular;
 type ConfigVikePackagesCombined = Combine<VikePackages.ConfigVikeReact, Combine<VikePackages.ConfigVikeVue, Combine<VikePackages.ConfigVikeSolid, Combine<VikePackages.ConfigVikeSvelte, VikePackages.ConfigVikeAngular>>>>;
 type ConfigVikePackagesNotEmptyXor = XOR5<IsNotEmpty<VikePackages.ConfigVikeReact>, IsNotEmpty<VikePackages.ConfigVikeVue>, IsNotEmpty<VikePackages.ConfigVikeSolid>, IsNotEmpty<VikePackages.ConfigVikeSvelte>, IsNotEmpty<VikePackages.ConfigVikeAngular>>;
+type WithoutImportString<T> = {
+    [K in keyof T]: Exclude<T[K], ImportString>;
+};

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

@@ -1,6 +1,8 @@
 export type { Config };
 export type { ConfigBuiltIn };
+export type { ConfigBuiltInResolved };
 export type { ConfigNameBuiltIn };
+export type { ConfigNameGlobal };
 export type { ConfigMeta };
 export type { HookName };
 export type { HookNamePage };
@@ -44,7 +46,8 @@ type HookName = HookNamePage | HookNameGlobal | HookNameOldDesign;
 type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data';
 type HookNameGlobal = 'onBeforePrerender' | 'onBeforeRoute' | 'onPrerenderStart';
 type HookNameOldDesign = 'render' | 'prerender';
-type ConfigNameBuiltIn = Exclude<keyof Config, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart' | 'vite'> | 'prerender' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'hooksTimeout' | 'clientHooks' | 'middleware';
+type ConfigNameBuiltIn = Exclude<keyof Config, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart' | 'vite' | 'redirects'> | 'prerender' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'hooksTimeout' | 'clientHooks' | 'middleware';
+type ConfigNameGlobal = 'onPrerenderStart' | 'onBeforeRoute' | 'prerender' | 'disableAutoFullBuild' | 'includeAssetsImportedByServer' | 'baseAssets' | 'baseServer' | 'redirects' | 'trailingSlash' | 'disableUrlNormalization' | 'vite';
 type Config = ConfigBuiltIn & Vike.Config & (VikePackages.ConfigVikeReact | VikePackages.ConfigVikeVue | VikePackages.ConfigVikeSolid | VikePackages.ConfigVikeSvelte | VikePackages.ConfigVikeAngular);
 /** Hook for fetching data.
  *
@@ -350,6 +353,11 @@ type ConfigBuiltIn = {
      * https://vite.dev/config/
      */
     vite?: InlineConfig;
+    /** Permanent redirections (HTTP status code 301)
+     *
+     * https://vike.dev/redirects
+     */
+    redirects?: Record<string, string>;
     /**
      * @experimental DON'T USE: the API *will* have breaking changes upon any minor version release.
      *
@@ -396,5 +404,9 @@ type ConfigBuiltIn = {
      */
     keepScrollPosition?: KeepScrollPosition;
 };
+type ConfigBuiltInResolved = {
+    passToClient?: string[][];
+    redirects?: Record<string, string>[];
+};
 type ConfigMeta = Record<string, ConfigDefinition>;
 type ImportString = `import:${string}`;

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

@@ -1,5 +1,6 @@
 export { getPageConfigUserFriendly };
 export { getPageConfigUserFriendlyNew };
+export type { ConfigUserFriendly };
 export type { PageConfigUserFriendly };
 export type { Source };
 export type { Sources };
@@ -10,6 +11,7 @@ import type { FileType } from '../getPageFiles/fileTypes.js';
 import type { PageFile } from '../getPageFiles/getPageFileObject.js';
 import type { ConfigValues, PageConfigRuntimeLoaded } from './PageConfig.js';
 import { type ConfigDefinedAtOptional } from './getConfigDefinedAt.js';
+import type { ConfigResolved } from './Config/PageContextConfig.js';
 type ExportsAll = Record<string, {
     exportValue: unknown;
     exportSource: string;
@@ -72,13 +74,14 @@ type SourceConfigsComputed = {
     value: unknown;
 };
 declare function getPageConfigUserFriendly(pageFiles: PageFile[], pageConfig: PageConfigRuntimeLoaded | null): PageConfigUserFriendly;
-declare function getPageConfigUserFriendlyNew(pageConfig: {
-    configValues: ConfigValues;
-}): {
-    config: Record<string, unknown>;
+type ConfigUserFriendly = {
+    config: ConfigResolved;
     configEntries: ConfigEntries;
     exportsAll: ExportsAll;
     source: Source;
     sources: Sources;
     from: From;
 };
+declare function getPageConfigUserFriendlyNew(pageConfig: {
+    configValues: ConfigValues;
+}): ConfigUserFriendly;

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

@@ -78,8 +78,8 @@ function getPageConfigUserFriendly(pageFiles, pageConfig) {
 // V1 design
 function getPageConfigUserFriendlyNew(pageConfig) {
     const config = {};
-    const configEntries = {}; // TODO/v1-release: remove
-    const exportsAll = {}; // TODO/v1-release: remove
+    const configEntries = {};
+    const exportsAll = {};
     const source = {};
     const sources = {};
     const from = {

package/dist/esm/shared/page-configs/serialize/serializeConfigValues.d.ts

@@ -1,12 +1,8 @@
 export { serializeConfigValues };
 export { getConfigValuesBase };
 import type { ConfigEnvInternal, ConfigValueSource, DefinedAtFile, PageConfigBuildTime, PageConfigGlobalBuildTime } from '../PageConfig.js';
-declare function serializeConfigValues(pageConfig: PageConfigBuildTime | PageConfigGlobalBuildTime, importStatements: string[], isEnvMatch: (configEnv: ConfigEnvInternal) => boolean, { isEager }: {
-    isEager: boolean;
-}, tabspace: string): string[];
-declare function getConfigValuesBase(pageConfig: PageConfigBuildTime | PageConfigGlobalBuildTime, isEnvMatch: (configEnv: ConfigEnvInternal) => boolean, { isEager }?: {
-    isEager?: boolean;
-}): ConfigValuesBase;
+declare function serializeConfigValues(pageConfig: PageConfigBuildTime | PageConfigGlobalBuildTime, importStatements: string[], isEnvMatch: (configEnv: ConfigEnvInternal) => boolean, tabspace: string, isEager: boolean | null): string[];
+declare function getConfigValuesBase(pageConfig: PageConfigBuildTime | PageConfigGlobalBuildTime, isEnvMatch: (configEnv: ConfigEnvInternal) => boolean, isEager: boolean | null): ConfigValuesBase;
 type ConfigValuesBase = ({
     configValueBase: {
         type: 'computed';

package/dist/esm/shared/page-configs/serialize/serializeConfigValues.js

@@ -13,10 +13,10 @@ const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
 // - vike/shared/page-configs/serialize/parsePageConfigs.ts
 // - parsePageConfigs() is loaded on both the client- and server-side.
 assertIsNotProductionRuntime();
-function serializeConfigValues(pageConfig, importStatements, isEnvMatch, { isEager }, tabspace) {
+function serializeConfigValues(pageConfig, importStatements, isEnvMatch, tabspace, isEager) {
     const lines = [];
     tabspace += '  ';
-    getConfigValuesBase(pageConfig, isEnvMatch, { isEager }).forEach((entry) => {
+    getConfigValuesBase(pageConfig, isEnvMatch, isEager).forEach((entry) => {
         if (entry.configValueBase.type === 'computed') {
             assert('value' in entry); // Help TS
             const { configValueBase, value, configName } = entry;
@@ -165,7 +165,7 @@ function logJsonSerializeError(err, configName, definedAtData) {
     assert(configValueFilePathToShowToUser);
     assertUsage(false, `${pc.cyan(configName)} defined by ${configValueFilePathToShowToUser} must be defined over a so-called "pointer import", see https://vike.dev/config#pointer-imports`);
 }
-function getConfigValuesBase(pageConfig, isEnvMatch, { isEager } = {}) {
+function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
     const fromComputed = Object.entries(pageConfig.configValuesComputed ?? {}).map(([configName, valueInfo]) => {
         if (!isEnvMatch(valueInfo.configEnv))
             return 'SKIP';
@@ -181,7 +181,7 @@ function getConfigValuesBase(pageConfig, isEnvMatch, { isEager } = {}) {
     const fromSources = Object.entries(pageConfig.configValueSources).map(([configName, sources]) => {
         const configDef = pageConfig.configDefinitions[configName];
         assert(configDef);
-        if (isEager !== undefined && isEager !== !!configDef.eager)
+        if (isEager !== null && isEager !== !!configDef.eager)
             return 'SKIP';
         if (!configDef.cumulative) {
             const source = sources[0];

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.218-commit-85af52a";
+export declare const PROJECT_VERSION: "0.4.218-commit-ea8bb27";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.218-commit-85af52a';
+export const PROJECT_VERSION = '0.4.218-commit-ea8bb27';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.218-commit-85af52a";
+    projectVersion: "0.4.218-commit-ea8bb27";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.218-commit-85af52a",
+  "version": "0.4.218-commit-ea8bb27",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {