vike 0.4.191-commit-a91fd40 → 0.4.191-commit-7e0cd43

package/dist/cjs/__internal/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPagesAndRoutes = exports.route = void 0;
+exports.getPageFilesAllSafe = exports.getPagesAndRoutes = exports.route = void 0;
 const index_js_1 = require("../shared/route/index.js");
+const getPageFiles_js_1 = require("../shared/getPageFiles.js");
 const globalContext_js_1 = require("../node/runtime/globalContext.js");
 const assertNodeEnv_js_1 = require("../utils/assertNodeEnv.js");
 const assert_js_1 = require("../utils/assert.js");
@@ -27,6 +28,15 @@ async function getPagesAndRoutes() {
     };
 }
 exports.getPagesAndRoutes = getPagesAndRoutes;
+// TODO: make it cleaner once the internal refactoring about global configs is done
+async function getPageFilesAllSafe() {
+    await (0, globalContext_js_1.initGlobalContext)(false);
+    await (0, globalContext_js_1.getGlobalContextAsync)();
+    const globalContext = (0, globalContext_js_1.getGlobalContext)();
+    const pageFilesAll = await (0, getPageFiles_js_1.getPageFilesAll)(false, globalContext.isProduction);
+    return pageFilesAll;
+}
+exports.getPageFilesAllSafe = getPageFilesAllSafe;
 async function route(pageContext) {
     const pageContextFromRoute = await (0, index_js_1.route)(pageContext);
     // Old interface

package/dist/cjs/node/plugin/plugins/autoFullBuild.js

@@ -95,7 +95,6 @@ async function triggerFullBuild(config, configVike, bundle) {
         process.exit(1);
     }
     if (configVike.prerender && !configVike.prerender.disableAutoRun) {
-        return;
         await (0, runPrerender_js_1.runPrerenderFromAutoFullBuild)({ viteConfig: configInline });
         forceExit = true;
     }

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

@@ -33,7 +33,8 @@ const configDefinitionsBuiltIn = {
         cumulative: true
     },
     route: {
-        env: { server: true, client: 'if-client-routing', eager: true }
+        env: { server: true, client: 'if-client-routing' },
+        eager: true
     },
     guard: {
         env: { server: true, client: 'if-client-routing' }
@@ -42,7 +43,8 @@ const configDefinitionsBuiltIn = {
         env: { server: true }
     },
     iKnowThePerformanceRisksOfAsyncRouteFunctions: {
-        env: { server: true, client: 'if-client-routing', eager: true }
+        env: { server: true, client: 'if-client-routing' },
+        eager: true
     },
     filesystemRoutingRoot: {
         env: { config: true }
@@ -54,7 +56,8 @@ const configDefinitionsBuiltIn = {
     },
     clientRouting: {
         // We could make it { client: false } but we don't yet because of some legacy V0.4 design code
-        env: { server: true, client: true, config: true, eager: true }
+        env: { server: true, client: true, config: true },
+        eager: true
     },
     clientHooks: {
         env: { config: true }
@@ -75,7 +78,8 @@ const configDefinitionsBuiltIn = {
         env: { config: true }
     },
     clientEntryLoaded: {
-        env: { server: true, client: true, eager: true },
+        env: { server: true, client: true },
+        eager: true,
         _computed: (configValueSources) => {
             {
                 const source = getConfigValueSource(configValueSources, 'clientHooks');
@@ -118,10 +122,12 @@ const configDefinitionsBuiltIn = {
 exports.configDefinitionsBuiltIn = configDefinitionsBuiltIn;
 const configDefinitionsBuiltInGlobal = {
     onPrerenderStart: {
-        env: { server: true, production: true, eager: true }
+        env: { server: true, production: true },
+        eager: true
     },
     onBeforeRoute: {
-        env: { server: true, client: 'if-client-routing', eager: true }
+        env: { server: true, client: 'if-client-routing' },
+        eager: true
     },
     prerender: {
         env: { config: true }

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigValuesAll.js

@@ -35,7 +35,7 @@ function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAsse
     const importStatements = [];
     const isClientRouting = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
     lines.push('export const configValuesSerialized = {');
-    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isEager: false, isDev }), ''));
+    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), { isEager: false }, ''));
     lines.push('};');
     if (!(0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && includeAssetsImportedByServer && isForClientSide && !isDev) {
         importStatements.push(`import '${(0, extractAssetsQuery_js_1.extractAssetsAddQuery)((0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageId, false))}'`);

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigs.js

@@ -35,7 +35,7 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
         lines.push(`    routeFilesystem: ${JSON.stringify(routeFilesystem)},`);
         lines.push(`    loadConfigValuesAll: () => import(${JSON.stringify(virtualFileIdPageConfigValuesAll)}),`);
         lines.push(`    configValuesSerialized: {`);
-        lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isEager: true, isDev }), '    '));
+        lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), { isEager: true }, '    '));
         lines.push(`    },`);
         lines.push(`  },`);
     });
@@ -45,7 +45,7 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
 function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements) {
     const lines = [];
     lines.push(`  configValuesSerialized: {`);
-    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfigGlobal, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isEager: true, isDev }), '    '));
+    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfigGlobal, importStatements, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), { isEager: true }, '    '));
     lines.push(`  },`);
     const code = lines.join('\n');
     return code;

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/isRuntimeEnvMatch.js

@@ -13,9 +13,6 @@ function isRuntimeEnvMatch(configEnv, runtime) {
         if (configEnv.client === 'if-client-routing' && !runtime.isClientRouting)
             return false;
     }
-    // Eager
-    if (runtime.isEager !== !!configEnv.eager)
-        return false;
     // Production/development
     if (
     //

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

@@ -17,7 +17,7 @@ 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, assertIsNotProductionRuntime_js_1.assertIsNotProductionRuntime)();
-function serializeConfigValues(pageConfig, importStatements, isEnvMatch, tabspace) {
+function serializeConfigValues(pageConfig, importStatements, isEnvMatch, { isEager }, tabspace) {
     const lines = [];
     tabspace += '  ';
     Object.entries(pageConfig.configValuesComputed ?? {}).forEach(([configName, configValuesComputed]) => {
@@ -36,6 +36,8 @@ function serializeConfigValues(pageConfig, importStatements, isEnvMatch, tabspac
     Object.entries(pageConfig.configValueSources).forEach(([configName, sources]) => {
         const configDef = pageConfig.configDefinitions[configName];
         (0, utils_js_1.assert)(configDef);
+        if (isEager !== !!configDef.eager)
+            return;
         if (!configDef.cumulative) {
             const configValueSource = sources[0];
             (0, utils_js_1.assert)(configValueSource);

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.191-commit-a91fd40';
+exports.PROJECT_VERSION = '0.4.191-commit-7e0cd43';

package/dist/esm/__internal/index.d.ts

@@ -1,5 +1,6 @@
 export { route, getPagesAndRoutes };
 export type { PageRoutes, PageFile, PageConfigRuntime as PageConfig };
+export { getPageFilesAllSafe };
 import { route as routeInternal, type PageRoutes } from '../shared/route/index.js';
 import { type PageFile } from '../shared/getPageFiles.js';
 import { PageConfigRuntime } from '../shared/page-configs/PageConfig.js';
@@ -15,6 +16,12 @@ declare function getPagesAndRoutes(): Promise<{
     pageConfigs: PageConfigRuntime[];
     allPageIds: string[];
 }>;
+declare function getPageFilesAllSafe(): Promise<{
+    pageFilesAll: PageFile[];
+    allPageIds: string[];
+    pageConfigs: PageConfigRuntime[];
+    pageConfigGlobal: import("../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
+}>;
 declare function route(pageContext: Parameters<typeof routeInternal>[0]): Promise<{
     pageContextAddendum: import("../shared/route/index.js").PageContextFromRoute;
 }>;

package/dist/esm/__internal/index.js

@@ -1,7 +1,10 @@
 // Internals needed by vite-plugin-vercel
 export { route, getPagesAndRoutes };
+// Internals needed by nitedani's experimental implementation of vike-telefunc
+export { getPageFilesAllSafe };
 import { route as routeInternal } from '../shared/route/index.js';
-import { getGlobalContext, initGlobalContext } from '../node/runtime/globalContext.js';
+import { getPageFilesAll } from '../shared/getPageFiles.js';
+import { getGlobalContext, getGlobalContextAsync, initGlobalContext } from '../node/runtime/globalContext.js';
 import { handleNodeEnv_vitePluginVercel } from '../utils/assertNodeEnv.js';
 import { assert } from '../utils/assert.js';
 import { getRenderContext } from '../node/runtime/renderPage/renderPageAlreadyRouted.js';
@@ -25,6 +28,14 @@ async function getPagesAndRoutes() {
         allPageIds
     };
 }
+// TODO: make it cleaner once the internal refactoring about global configs is done
+async function getPageFilesAllSafe() {
+    await initGlobalContext(false);
+    await getGlobalContextAsync();
+    const globalContext = getGlobalContext();
+    const pageFilesAll = await getPageFilesAll(false, globalContext.isProduction);
+    return pageFilesAll;
+}
 async function route(pageContext) {
     const pageContextFromRoute = await routeInternal(pageContext);
     // Old interface

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

@@ -89,7 +89,6 @@ async function triggerFullBuild(config, configVike, bundle) {
         process.exit(1);
     }
     if (configVike.prerender && !configVike.prerender.disableAutoRun) {
-        return;
         await runPrerenderFromAutoFullBuild({ viteConfig: configInline });
         forceExit = true;
     }

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

@@ -31,6 +31,14 @@ type ConfigDefinition = {
      * https://vike.dev/meta
      */
     effect?: ConfigEffect;
+    /**
+     * Always load the configuration value, and as soon as possible.
+     *
+     * @default false
+     *
+     * https://vike.dev/meta
+     */
+    eager?: boolean;
     /**
      * Whether the configuration always applies to all pages (no config inheritance).
      *

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

@@ -32,7 +32,8 @@ const configDefinitionsBuiltIn = {
         cumulative: true
     },
     route: {
-        env: { server: true, client: 'if-client-routing', eager: true }
+        env: { server: true, client: 'if-client-routing' },
+        eager: true
     },
     guard: {
         env: { server: true, client: 'if-client-routing' }
@@ -41,7 +42,8 @@ const configDefinitionsBuiltIn = {
         env: { server: true }
     },
     iKnowThePerformanceRisksOfAsyncRouteFunctions: {
-        env: { server: true, client: 'if-client-routing', eager: true }
+        env: { server: true, client: 'if-client-routing' },
+        eager: true
     },
     filesystemRoutingRoot: {
         env: { config: true }
@@ -53,7 +55,8 @@ const configDefinitionsBuiltIn = {
     },
     clientRouting: {
         // We could make it { client: false } but we don't yet because of some legacy V0.4 design code
-        env: { server: true, client: true, config: true, eager: true }
+        env: { server: true, client: true, config: true },
+        eager: true
     },
     clientHooks: {
         env: { config: true }
@@ -74,7 +77,8 @@ const configDefinitionsBuiltIn = {
         env: { config: true }
     },
     clientEntryLoaded: {
-        env: { server: true, client: true, eager: true },
+        env: { server: true, client: true },
+        eager: true,
         _computed: (configValueSources) => {
             {
                 const source = getConfigValueSource(configValueSources, 'clientHooks');
@@ -116,10 +120,12 @@ const configDefinitionsBuiltIn = {
 };
 const configDefinitionsBuiltInGlobal = {
     onPrerenderStart: {
-        env: { server: true, production: true, eager: true }
+        env: { server: true, production: true },
+        eager: true
     },
     onBeforeRoute: {
-        env: { server: true, client: 'if-client-routing', eager: true }
+        env: { server: true, client: 'if-client-routing' },
+        eager: true
     },
     prerender: {
         env: { config: true }

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

@@ -32,7 +32,7 @@ function getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, includeAsse
     const importStatements = [];
     const isClientRouting = getConfigValueBuildTime(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
     lines.push('export const configValuesSerialized = {');
-    lines.push(...serializeConfigValues(pageConfig, importStatements, (configEnv) => isRuntimeEnvMatch(configEnv, { isForClientSide, isClientRouting, isEager: false, isDev }), ''));
+    lines.push(...serializeConfigValues(pageConfig, importStatements, (configEnv) => isRuntimeEnvMatch(configEnv, { isForClientSide, isClientRouting, isDev }), { isEager: false }, ''));
     lines.push('};');
     if (!fixServerAssets_isEnabled() && includeAssetsImportedByServer && isForClientSide && !isDev) {
         importStatements.push(`import '${extractAssetsAddQuery(getVirtualFileIdPageConfigValuesAll(pageId, false))}'`);

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

@@ -32,7 +32,7 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
         lines.push(`    routeFilesystem: ${JSON.stringify(routeFilesystem)},`);
         lines.push(`    loadConfigValuesAll: () => import(${JSON.stringify(virtualFileIdPageConfigValuesAll)}),`);
         lines.push(`    configValuesSerialized: {`);
-        lines.push(...serializeConfigValues(pageConfig, importStatements, (configEnv) => isRuntimeEnvMatch(configEnv, { isForClientSide, isClientRouting, isEager: true, isDev }), '    '));
+        lines.push(...serializeConfigValues(pageConfig, importStatements, (configEnv) => isRuntimeEnvMatch(configEnv, { isForClientSide, isClientRouting, isDev }), { isEager: true }, '    '));
         lines.push(`    },`);
         lines.push(`  },`);
     });
@@ -42,7 +42,7 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
 function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements) {
     const lines = [];
     lines.push(`  configValuesSerialized: {`);
-    lines.push(...serializeConfigValues(pageConfigGlobal, importStatements, (configEnv) => isRuntimeEnvMatch(configEnv, { isForClientSide, isClientRouting, isEager: true, isDev }), '    '));
+    lines.push(...serializeConfigValues(pageConfigGlobal, importStatements, (configEnv) => isRuntimeEnvMatch(configEnv, { isForClientSide, isClientRouting, isDev }), { isEager: true }, '    '));
     lines.push(`  },`);
     const code = lines.join('\n');
     return code;

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

@@ -3,6 +3,5 @@ import type { ConfigEnvInternal } from '../../../../../shared/page-configs/PageC
 declare function isRuntimeEnvMatch(configEnv: ConfigEnvInternal, runtime: {
     isForClientSide: boolean;
     isClientRouting: boolean;
-    isEager: boolean;
     isDev: boolean;
 }): boolean;

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

@@ -11,9 +11,6 @@ function isRuntimeEnvMatch(configEnv, runtime) {
         if (configEnv.client === 'if-client-routing' && !runtime.isClientRouting)
             return false;
     }
-    // Eager
-    if (runtime.isEager !== !!configEnv.eager)
-        return false;
     // Production/development
     if (
     //

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

@@ -67,8 +67,6 @@ type ConfigEnv = {
 /** For Vike internal use */
 type ConfigEnvInternal = Omit<ConfigEnv, 'client'> & {
     client?: boolean | 'if-client-routing';
-    /** Always load value, no matter which page is loaded. */
-    eager?: true;
     /** Load value only in production, or only in development. */
     production?: boolean;
 };

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

@@ -2,4 +2,6 @@ export { serializeConfigValues };
 import type { ConfigEnvInternal, PageConfigBuildTime, PageConfigGlobalBuildTime } from '../PageConfig.js';
 declare function serializeConfigValues(pageConfig: PageConfigBuildTime | (PageConfigGlobalBuildTime & {
     configValuesComputed?: undefined;
-}), importStatements: string[], isEnvMatch: (configEnv: ConfigEnvInternal) => boolean, tabspace: string): string[];
+}), importStatements: string[], isEnvMatch: (configEnv: ConfigEnvInternal) => boolean, { isEager }: {
+    isEager: boolean;
+}, tabspace: string): string[];

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

@@ -12,7 +12,7 @@ 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, tabspace) {
+function serializeConfigValues(pageConfig, importStatements, isEnvMatch, { isEager }, tabspace) {
     const lines = [];
     tabspace += '  ';
     Object.entries(pageConfig.configValuesComputed ?? {}).forEach(([configName, configValuesComputed]) => {
@@ -31,6 +31,8 @@ function serializeConfigValues(pageConfig, importStatements, isEnvMatch, tabspac
     Object.entries(pageConfig.configValueSources).forEach(([configName, sources]) => {
         const configDef = pageConfig.configDefinitions[configName];
         assert(configDef);
+        if (isEager !== !!configDef.eager)
+            return;
         if (!configDef.cumulative) {
             const configValueSource = sources[0];
             assert(configValueSource);

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.191-commit-a91fd40";
+export declare const PROJECT_VERSION: "0.4.191-commit-7e0cd43";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.191-commit-a91fd40';
+export const PROJECT_VERSION = '0.4.191-commit-7e0cd43';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.191-commit-a91fd40";
+    projectVersion: "0.4.191-commit-7e0cd43";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.191-commit-a91fd40",
+  "version": "0.4.191-commit-7e0cd43",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",