vike 0.4.218-commit-ed9b3d4 → 0.4.218-commit-ea8bb27

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

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

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

@@ -83,8 +83,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/cjs/shared/page-configs/serialize/serializeConfigValues.js

@@ -18,10 +18,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.
 (0, assertSetup_js_1.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') {
             (0, utils_js_1.assert)('value' in entry); // Help TS
             const { configValueBase, value, configName } = entry;
@@ -170,7 +170,7 @@ function logJsonSerializeError(err, configName, definedAtData) {
     (0, utils_js_1.assert)(configValueFilePathToShowToUser);
     (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.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';
@@ -186,7 +186,7 @@ function getConfigValuesBase(pageConfig, isEnvMatch, { isEager } = {}) {
     const fromSources = Object.entries(pageConfig.configValueSources).map(([configName, sources]) => {
         const configDef = pageConfig.configDefinitions[configName];
         (0, utils_js_1.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/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.218-commit-ed9b3d4';
+exports.PROJECT_VERSION = '0.4.218-commit-ea8bb27';

package/dist/esm/__internal/index.js

@@ -8,16 +8,15 @@ import { route as routeInternal } from '../shared/route/index.js';
 import { getPageFilesAll } from '../shared/getPageFiles/getPageFiles.js';
 import { getGlobalContext, initGlobalContext_getGlobalContextAsync } from '../node/runtime/globalContext.js';
 import { setNodeEnvProduction } from '../utils/assertSetup.js';
-import { getRenderContext } from '../node/runtime/renderPage/renderPageAlreadyRouted.js';
 /**
  * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel} to compute some rewrite rules and extract { isr } configs.
  */
 async function getPagesAndRoutes() {
     setNodeEnvProduction();
-    const renderContext = await getRenderContext();
+    const globalContext = getGlobalContext();
     const { 
     //
-    pageRoutes, pageFilesAll, pageConfigs, allPageIds } = renderContext;
+    pageRoutes, pageFilesAll, pageConfigs, allPageIds } = globalContext;
     return {
         pageRoutes,
         pageFilesAll,

package/dist/esm/client/client-routing-runtime/createPageContext.js

@@ -7,7 +7,7 @@ import { assert, isBaseServer, getGlobalObject, objectAssign } from './utils.js'
 // @ts-ignore
 import * as pageFilesExports from 'virtual:vike:importUserCode:client:client-routing';
 const globalObject = getGlobalObject('createPageContext.ts', {});
-initDevEntry();
+setPageFiles(pageFilesExports);
 async function createPageContext(urlOriginal) {
     if (!globalObject.pageFilesData) {
         globalObject.pageFilesData = await getPageFilesAll(true);
@@ -34,6 +34,3 @@ async function createPageContext(urlOriginal) {
     objectAssign(pageContext, pageContextUrlComputed);
     return pageContext;
 }
-function initDevEntry() {
-    setPageFiles(pageFilesExports);
-}

package/dist/esm/client/server-routing-runtime/getPageContext.js

@@ -7,7 +7,7 @@ import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 // @ts-ignore
 import * as pageFilesExports from 'virtual:vike:importUserCode:client:server-routing';
 const urlFirst = getCurrentUrl({ withoutHash: true });
-initDevEntry();
+setPageFiles(pageFilesExports);
 async function getPageContext() {
     const pageContext = getPageContextSerializedInHtml();
     objectAssign(pageContext, {
@@ -39,6 +39,3 @@ async function loadPageUserFiles(pageId) {
     });
     return pageContextAddendum;
 }
-function initDevEntry() {
-    setPageFiles(pageFilesExports);
-}

package/dist/esm/node/api/prepareViteApiCall.js

@@ -32,8 +32,7 @@ async function enhanceViteConfig(viteConfig, operation) {
     };
 }
 function addViteSettingsSetByUser(viteConfigEnhanced, vikeConfig) {
-    const { global } = vikeConfig.vikeConfigNew;
-    const viteConfigs = global.from.configsCumulative.vite;
+    const viteConfigs = vikeConfig.global.from.configsCumulative.vite;
     if (!viteConfigs)
         return viteConfigEnhanced;
     viteConfigs.values.forEach((v) => {

package/dist/esm/node/plugin/index.js

@@ -47,7 +47,7 @@ function plugin(vikeVitePluginOptions = {}) {
         suppressRollupWarning(),
         ...setGlobalContext(),
         ...buildEntry(),
-        baseUrls(vikeVitePluginOptions),
+        baseUrls(),
         envVarsPlugin(),
         fileEnv(),
         workaroundCssModuleHmr(),

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

@@ -1,3 +1,3 @@
 export { baseUrls };
 import type { Plugin } from 'vite';
-declare function baseUrls(vikeVitePluginOptions: unknown): Plugin;
+declare function baseUrls(): Plugin;

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

@@ -1,23 +1,17 @@
 export { baseUrls };
 import { resolveBase, resolveBaseFromResolvedConfig } from '../../shared/resolveBase.js';
 import { assert } from '../utils.js';
-import { getVikeConfig, getVikeConfig2 } from './importUserCode/v1-design/getVikeConfig.js';
-import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/prepareViteApiCall.js';
-function baseUrls(vikeVitePluginOptions) {
+import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
+function baseUrls() {
     let basesResolved;
-    let root;
     return {
         name: 'vike:baseUrls',
         enforce: 'post',
-        async config(config, env) {
+        async config(config) {
             const isDev = config._isDev;
             assert(typeof isDev === 'boolean');
-            const operation = env.command === 'build' ? 'build' : env.isPreview ? 'preview' : 'dev';
-            root = config.root ? normalizeViteRoot(config.root) : await getViteRoot(operation);
-            assert(root);
             const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
-            const vikeConfig = await getVikeConfig2(root, isDev, vikeVitePluginOptions);
-            basesResolved = resolveBase(baseViteOriginal, vikeConfig.vikeConfigGlobal.baseServer, vikeConfig.vikeConfigGlobal.baseAssets);
+            basesResolved = resolveBase(baseViteOriginal, config.vike.vikeConfigGlobal.baseServer, config.vike.vikeConfigGlobal.baseAssets);
             // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
             process.env.BASE_SERVER = basesResolved.baseServer;
             process.env.BASE_ASSETS = basesResolved.baseAssets;
@@ -32,7 +26,6 @@ function baseUrls(vikeVitePluginOptions) {
             };
         },
         async configResolved(config) {
-            assertViteRoot(root, config);
             const vikeConfig = await getVikeConfig(config);
             const basesResolved2 = resolveBaseFromResolvedConfig(vikeConfig.vikeConfigGlobal.baseServer, vikeConfig.vikeConfigGlobal.baseAssets, config);
             assert(basesResolved2.baseServer === basesResolved.baseServer);

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

@@ -1,9 +1,12 @@
 export { commonConfig };
 import { type Plugin } from 'vite';
+import { type VikeConfigObject } from './importUserCode/v1-design/getVikeConfig.js';
 declare module 'vite' {
     interface UserConfig {
         _isDev?: boolean;
         _vikeVitePluginOptions?: unknown;
+        _root?: string;
+        vike?: VikeConfigObject;
     }
 }
 declare function commonConfig(vikeVitePluginOptions: unknown): Plugin[];

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

@@ -9,6 +9,8 @@ import { assertResolveAlias } from './commonConfig/assertResolveAlias.js';
 import { getEnvVarObject } from '../shared/getEnvVarObject.js';
 import { isViteCliCall } from '../shared/isViteCliCall.js';
 import { isVikeCliOrApi } from '../../api/context.js';
+import { getVikeConfig2 } from './importUserCode/v1-design/getVikeConfig.js';
+import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/prepareViteApiCall.js';
 const pluginName = 'vike:commonConfig';
 function commonConfig(vikeVitePluginOptions) {
     return [
@@ -17,10 +19,18 @@ function commonConfig(vikeVitePluginOptions) {
             enforce: 'pre',
             config: {
                 order: 'pre',
-                handler(_config, env) {
+                async handler(configFromUser, env) {
+                    const isDev = isDevCheck(env);
+                    const operation = env.command === 'build' ? 'build' : env.isPreview ? 'preview' : 'dev';
+                    const root = configFromUser.root ? normalizeViteRoot(configFromUser.root) : await getViteRoot(operation);
+                    assert(root);
+                    const vikeConfig = await getVikeConfig2(root, isDev, vikeVitePluginOptions);
                     return {
-                        _isDev: isDevCheck(env),
-                        _vikeVitePluginOptions: vikeVitePluginOptions
+                        _isDev: isDev,
+                        _root: root,
+                        _vikeVitePluginOptions: vikeVitePluginOptions,
+                        vike: vikeConfig,
+                        vikeTmp: vikeConfig
                     };
                 }
             }
@@ -28,6 +38,7 @@ function commonConfig(vikeVitePluginOptions) {
         {
             name: pluginName,
             configResolved(config) {
+                assertViteRoot(config._root, config);
                 assertSingleInstance(config);
                 installRequireShim_setUserRootDir(config.root);
             }

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

@@ -1,12 +1,10 @@
-export { configDefinitionsBuiltIn };
-export { configDefinitionsBuiltInGlobal };
+export { configDefinitionsBuiltInAll };
 export type { ConfigDefinition };
 export type { ConfigDefinitions };
 export type { ConfigDefinitionInternal };
-export type { ConfigNameGlobal };
 export type { ConfigEffect };
 import type { ConfigEnvInternal, ConfigEnv, ConfigValueSources, DefinedAtFilePath } from '../../../../../../shared/page-configs/PageConfig.js';
-import type { Config, ConfigNameBuiltIn } from '../../../../../../shared/page-configs/Config.js';
+import type { Config, ConfigNameBuiltIn, ConfigNameGlobal } from '../../../../../../shared/page-configs/Config.js';
 import { type ConfigDefinedAt } from '../../../../../../shared/page-configs/getConfigDefinedAt.js';
 /** The meta definition of a config.
  *
@@ -46,7 +44,8 @@ type ConfigDefinition = {
      *
      * https://vike.dev/extends#inheritance
      */
-    global?: boolean;
+    global?: boolean | ((value: unknown) => boolean);
+    type?: string | string[];
 };
 /**
  * Function called when the config value is defined.
@@ -74,7 +73,5 @@ type ConfigDefinitionInternal = Omit<ConfigDefinition, 'env'> & {
 };
 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' | 'vite';
-declare const configDefinitionsBuiltInGlobal: Record<ConfigNameGlobal, ConfigDefinitionInternal>;
+type ConfigDefinitionsBuiltIn = Record<ConfigNameBuiltIn | ConfigNameGlobal, ConfigDefinitionInternal>;
+declare const configDefinitionsBuiltInAll: ConfigDefinitionsBuiltIn;

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

@@ -1,8 +1,7 @@
-export { configDefinitionsBuiltIn };
-export { configDefinitionsBuiltInGlobal };
+export { configDefinitionsBuiltInAll };
 import { assert, assertUsage } from '../../../../utils.js';
 import { getConfigDefinedAt } from '../../../../../../shared/page-configs/getConfigDefinedAt.js';
-const configDefinitionsBuiltIn = {
+const configDefinitionsBuiltInAll = {
     onRenderHtml: {
         env: { server: true }
     },
@@ -61,9 +60,6 @@ const configDefinitionsBuiltIn = {
     clientHooks: {
         env: { config: true }
     },
-    prerender: {
-        env: { config: true }
-    },
     hydrationCanBeAborted: {
         env: { client: true }
     },
@@ -132,26 +128,34 @@ const configDefinitionsBuiltIn = {
         env: { client: true }
     },
     // TODO/eventually: define it as a global config.
-    middleware: { env: { server: true }, cumulative: true, eager: true }
-};
-const configDefinitionsBuiltInGlobal = {
+    middleware: { env: { server: true }, cumulative: true, eager: true },
     onPrerenderStart: {
         env: { server: true, production: true },
-        eager: true
+        eager: true,
+        global: true
     },
     onBeforeRoute: {
         env: { server: true, client: 'if-client-routing' },
-        eager: true
-    },
-    prerender: { env: { config: true } },
-    vite: { env: { config: true }, cumulative: true },
-    disableAutoFullBuild: { env: { config: true } },
-    includeAssetsImportedByServer: { env: { config: true } },
-    baseAssets: { env: { config: true } },
-    baseServer: { env: { config: true } },
-    redirects: { env: { server: true } },
-    trailingSlash: { env: { server: true } },
-    disableUrlNormalization: { env: { server: true } }
+        eager: true,
+        global: true
+    },
+    prerender: { env: { config: true }, global: (value) => typeof value !== 'object', type: ['boolean', 'object'] },
+    vite: { env: { config: true }, global: true, cumulative: true, type: 'object' },
+    disableAutoFullBuild: {
+        env: { config: true },
+        global: true,
+        type: [
+            'boolean',
+            // Can be 'prerender'
+            'string'
+        ]
+    },
+    includeAssetsImportedByServer: { env: { config: true }, global: true, type: 'boolean' },
+    baseAssets: { env: { config: true }, global: true, type: 'string' },
+    baseServer: { env: { config: true }, global: true, type: 'string' },
+    redirects: { env: { server: true }, global: true, type: 'string{}', cumulative: true },
+    trailingSlash: { env: { server: true }, global: true, type: 'boolean' },
+    disableUrlNormalization: { env: { server: true }, global: true, type: 'boolean' }
 };
 function getConfigEnv(configValueSources, configName) {
     const configValueSource = getConfigValueSource(configValueSources, configName);

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

@@ -39,9 +39,7 @@ type VikeConfigObject = {
     pageConfigs: PageConfigBuildTime[];
     pageConfigGlobal: PageConfigGlobalBuildTime;
     vikeConfigGlobal: VikeConfigGlobal;
-    vikeConfigNew: {
-        global: ReturnType<typeof getPageConfigUserFriendlyNew>;
-    };
+    global: ReturnType<typeof getPageConfigUserFriendlyNew>;
 };
 declare const vikeConfigDependencies: Set<string>;
 declare function reloadVikeConfig(config: ResolvedConfig): void;
@@ -63,7 +61,6 @@ type VikeConfigGlobal = {
     includeAssetsImportedByServer: boolean;
     baseAssets: string | null;
     baseServer: string | null;
-    redirects: Record<string, string>;
     trailingSlash: boolean;
     disableUrlNormalization: boolean;
 };