vike 0.4.223-commit-6adb186 → 0.4.223-commit-e239e2b

package/dist/cjs/node/api/build.js

@@ -20,7 +20,7 @@ async function build(options = {}) {
     // Pass it to pluginAutoFullBuild()
     if (viteConfigEnhanced)
         viteConfigEnhanced._viteConfigEnhanced = viteConfigEnhanced;
-    if (vikeConfig.global.config.viteEnvironmentAPI) {
+    if (vikeConfig.global.config.vite6BuilderApp) {
         (0, utils_js_1.assertVersion)('Vite', vite_1.version, '6.0.0');
         const builder = await (0, vite_1.createBuilder)(viteConfigEnhanced);
         // See Vite plugin vike:build:pluginBuildApp

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

@@ -40,7 +40,6 @@ exports.prepareViteApiCall = prepareViteApiCall;
 exports.getViteRoot = getViteRoot;
 exports.assertViteRoot = assertViteRoot;
 exports.normalizeViteRoot = normalizeViteRoot;
-// TODO: enable Vike extensions to add Vite plugins
 const vite_1 = require("vite");
 const context_js_1 = require("./context.js");
 const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/getVikeConfig.js");

package/dist/cjs/node/plugin/plugins/build/handleAssetsManifest.js

@@ -294,7 +294,7 @@ function handleAssetsManifest_getBuildConfig(config) {
         // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
         cssMinify: isFixEnabled ? 'esbuild' : undefined,
         manifest: pluginBuildConfig_js_1.manifestTempFile,
-        copyPublicDir: vike.config.viteEnvironmentAPI
+        copyPublicDir: vike.config.vite6BuilderApp
             ? // Already set by vike:build:pluginBuildApp
                 undefined
             : !(0, isViteServerBuild_js_1.isViteServerBuild)(config)

package/dist/cjs/node/plugin/plugins/build/pluginAutoFullBuild.js

@@ -55,7 +55,7 @@ function pluginAutoFullBuild() {
                     (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssTarget)(config);
                     if (forceExit &&
                         // Let vike:build:pluginBuildApp force exit
-                        !vikeConfig.global.config.viteEnvironmentAPI) {
+                        !vikeConfig.global.config.vite6BuilderApp) {
                         (0, runPrerender_js_1.runPrerender_forceExit)();
                         (0, utils_js_1.assert)(false);
                     }
@@ -66,7 +66,7 @@ function pluginAutoFullBuild() {
 }
 async function triggerFullBuild(config, vikeConfig, viteEnv, bundle) {
     // Whether builder.buildApp() is being used, see plugin:build:pluginBuildApp
-    const isBuilderApp = vikeConfig.global.config.viteEnvironmentAPI;
+    const isBuilderApp = vikeConfig.global.config.vite6BuilderApp;
     // If builder.buildApp() => trigger at end of `this.environment.name === 'ssr'`.
     // Else => trigger at end of client-side build.
     if (isBuilderApp ? !(0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv) : !(0, isViteServerBuild_js_1.isViteClientBuild)(config, viteEnv))

package/dist/cjs/node/plugin/plugins/build/pluginBuildApp.js

@@ -13,7 +13,7 @@ function pluginBuildApp() {
             apply: 'build',
             config(config) {
                 const vike = (0, commonConfig_js_1.getVikeConfigPublic)(config);
-                if (!vike.config.viteEnvironmentAPI)
+                if (!vike.config.vite6BuilderApp)
                     return;
                 return {
                     builder: {

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

@@ -164,7 +164,7 @@ const configDefinitionsBuiltIn = {
             'string'
         ]
     },
-    viteEnvironmentAPI: {
+    vite6BuilderApp: {
         env: { config: true },
         global: true,
         type: 'boolean'

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

@@ -206,6 +206,7 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
             return;
         pageConfigGlobal.configValueSources[configName] = sources;
     });
+    applyEffectsAll(pageConfigGlobal.configValueSources, configDefinitionsResolved.configDefinitionsGlobal);
     assertPageConfigGlobal(pageConfigGlobal, plusFilesAll);
     const pageConfigs = (0, utils_js_1.objectEntries)(configDefinitionsResolved.configDefinitionsLocal)
         .filter(([_locationId, { plusFiles }]) => isDefiningPage(plusFiles))
@@ -679,7 +680,7 @@ function applyEffectsAll(configValueSources, configDefinitions) {
         if (!source)
             return;
         // The config value is eagerly loaded since `configDef.env === 'config-only``
-        (0, utils_js_1.assert)('value' in source);
+        (0, utils_js_1.assert)('value' in source); // TODO/now: refactor all `'value' in`
         // Call effect
         const configModFromEffect = configDef.effect({
             configValue: source.value,
@@ -687,12 +688,11 @@ function applyEffectsAll(configValueSources, configDefinitions) {
         });
         if (!configModFromEffect)
             return;
-        (0, utils_js_1.assert)((0, utils_js_1.hasProp)(source, 'value')); // We need to assume that the config value is loaded at build-time
-        applyEffect(configModFromEffect, configValueSources, configDef);
+        applyEffect(configModFromEffect, source, configValueSources, configName, configDef, configDefinitions);
     });
 }
-function applyEffect(configModFromEffect, configValueSources, configDefEffect) {
-    const notSupported = `Effects currently only supports modifying the the ${picocolors_1.default.cyan('env')} of a config.`;
+function applyEffect(configModFromEffect, source, configValueSources, configNameEffect, configDefEffect, configDefinitions) {
+    const notSupported = `${picocolors_1.default.cyan('meta.effect')} currently only supports setting the value of a config, or modifying the ${picocolors_1.default.cyan('meta.env')} of a config.`;
     (0, utils_js_1.objectEntries)(configModFromEffect).forEach(([configName, configValue]) => {
         if (configName === 'meta') {
             let configDefinedAt;
@@ -718,14 +718,23 @@ function applyEffect(configModFromEffect, configValueSources, configDefEffect) {
             });
         }
         else {
-            (0, utils_js_1.assertUsage)(false, notSupported);
-            /* To implement being able to set a config value in an effect:
-             * - Copy and append definedAtFile.fileExportPathToShowToUser with ['meta', configName, 'effect']
-             *   - Copying the definedAtFile of the config that defines the effect
-             * - Same precedence as the config that sets the value triggering the effect (not the config defining the effect)
-             *   - Apply sortConfigValueSources() again?
-            configValueSources.push()
-            */
+            const configDef = configDefinitions[configName];
+            (0, utils_js_1.assert)(configDef);
+            (0, utils_js_1.assert)(configDefEffect._userEffectDefinedAtFilePath);
+            const configValueSource = {
+                definedAtFilePath: configDefEffect._userEffectDefinedAtFilePath,
+                plusFile: source.plusFile,
+                locationId: source.locationId,
+                configEnv: configDef.env,
+                isOverriden: false, // TODO/now check
+                valueIsLoadedWithImport: false,
+                valueIsDefinedByPlusValueFile: false,
+                valueIsLoaded: true,
+                value: configValue
+            };
+            (0, utils_js_1.assertUsage)(!!configDef.global === !!configDefEffect.global, `The configuration ${picocolors_1.default.cyan(configNameEffect)} has a ${picocolors_1.default.cyan('meta.effect')} that changes the configuration ${picocolors_1.default.cyan(configName)} and, consequently, both ${picocolors_1.default.cyan(configNameEffect)} and ${picocolors_1.default.cyan(configName)} must have the same ${picocolors_1.default.cyan('meta.global')} value.`);
+            configValueSources[configName] ?? (configValueSources[configName] = []);
+            configValueSources[configName].push(configValueSource);
         }
     });
 }

package/dist/cjs/node/prerender/runPrerender.js

@@ -816,7 +816,8 @@ prerenderConfig) {
 }
 function makePublic(prerenderContext) {
     const prerenderContextPublic = (0, utils_js_1.makePublicCopy)(prerenderContext, 'prerenderContext', [
-        'pageContexts'
+        'pageContexts',
+        'output'
     ]);
     return prerenderContextPublic;
 }

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

@@ -66,7 +66,9 @@ function parseConfigValuesSerialized_tmp(configValuesSerialized) {
             const { valueSerialized, ...common } = configValueSeriliazed;
             const { value, sideExports } = parseValueSerialized(valueSerialized, configName, () => {
                 (0, utils_js_1.assert)(configValueSeriliazed.type !== 'computed');
-                return configValueSeriliazed.definedAtData;
+                const { definedAtData } = configValueSeriliazed;
+                const definedAtFile = Array.isArray(definedAtData) ? definedAtData[0] : definedAtData;
+                return definedAtFile;
             });
             addSideExports(sideExports);
             configValue = { value, ...common };

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.223-commit-6adb186';
+exports.PROJECT_VERSION = '0.4.223-commit-e239e2b';

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

@@ -15,7 +15,7 @@ async function build(options = {}) {
     // Pass it to pluginAutoFullBuild()
     if (viteConfigEnhanced)
         viteConfigEnhanced._viteConfigEnhanced = viteConfigEnhanced;
-    if (vikeConfig.global.config.viteEnvironmentAPI) {
+    if (vikeConfig.global.config.vite6BuilderApp) {
         assertVersion('Vite', version, '6.0.0');
         const builder = await createBuilder(viteConfigEnhanced);
         // See Vite plugin vike:build:pluginBuildApp

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

@@ -2,7 +2,6 @@ export { prepareViteApiCall };
 export { getViteRoot };
 export { assertViteRoot };
 export { normalizeViteRoot };
-// TODO: enable Vike extensions to add Vite plugins
 import { loadConfigFromFile, mergeConfig, resolveConfig } from 'vite';
 import { clearContextApiOperation, setContextApiOperation } from './context.js';
 import { getVikeConfig2 } from '../plugin/plugins/importUserCode/v1-design/getVikeConfig.js';

package/dist/esm/node/plugin/plugins/build/handleAssetsManifest.js

@@ -289,7 +289,7 @@ function handleAssetsManifest_getBuildConfig(config) {
         // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
         cssMinify: isFixEnabled ? 'esbuild' : undefined,
         manifest: manifestTempFile,
-        copyPublicDir: vike.config.viteEnvironmentAPI
+        copyPublicDir: vike.config.vite6BuilderApp
             ? // Already set by vike:build:pluginBuildApp
                 undefined
             : !isViteServerBuild(config)

package/dist/esm/node/plugin/plugins/build/pluginAutoFullBuild.js

@@ -50,7 +50,7 @@ function pluginAutoFullBuild() {
                     handleAssetsManifest_assertUsageCssTarget(config);
                     if (forceExit &&
                         // Let vike:build:pluginBuildApp force exit
-                        !vikeConfig.global.config.viteEnvironmentAPI) {
+                        !vikeConfig.global.config.vite6BuilderApp) {
                         runPrerender_forceExit();
                         assert(false);
                     }
@@ -61,7 +61,7 @@ function pluginAutoFullBuild() {
 }
 async function triggerFullBuild(config, vikeConfig, viteEnv, bundle) {
     // Whether builder.buildApp() is being used, see plugin:build:pluginBuildApp
-    const isBuilderApp = vikeConfig.global.config.viteEnvironmentAPI;
+    const isBuilderApp = vikeConfig.global.config.vite6BuilderApp;
     // If builder.buildApp() => trigger at end of `this.environment.name === 'ssr'`.
     // Else => trigger at end of client-side build.
     if (isBuilderApp ? !isViteServerBuild_onlySsrEnv(config, viteEnv) : !isViteClientBuild(config, viteEnv))

package/dist/esm/node/plugin/plugins/build/pluginBuildApp.js

@@ -11,7 +11,7 @@ function pluginBuildApp() {
             apply: 'build',
             config(config) {
                 const vike = getVikeConfigPublic(config);
-                if (!vike.config.viteEnvironmentAPI)
+                if (!vike.config.vite6BuilderApp)
                     return;
                 return {
                     builder: {

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

@@ -162,7 +162,7 @@ const configDefinitionsBuiltIn = {
             'string'
         ]
     },
-    viteEnvironmentAPI: {
+    vite6BuilderApp: {
         env: { config: true },
         global: true,
         type: 'boolean'

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

@@ -200,6 +200,7 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
             return;
         pageConfigGlobal.configValueSources[configName] = sources;
     });
+    applyEffectsAll(pageConfigGlobal.configValueSources, configDefinitionsResolved.configDefinitionsGlobal);
     assertPageConfigGlobal(pageConfigGlobal, plusFilesAll);
     const pageConfigs = objectEntries(configDefinitionsResolved.configDefinitionsLocal)
         .filter(([_locationId, { plusFiles }]) => isDefiningPage(plusFiles))
@@ -673,7 +674,7 @@ function applyEffectsAll(configValueSources, configDefinitions) {
         if (!source)
             return;
         // The config value is eagerly loaded since `configDef.env === 'config-only``
-        assert('value' in source);
+        assert('value' in source); // TODO/now: refactor all `'value' in`
         // Call effect
         const configModFromEffect = configDef.effect({
             configValue: source.value,
@@ -681,12 +682,11 @@ function applyEffectsAll(configValueSources, configDefinitions) {
         });
         if (!configModFromEffect)
             return;
-        assert(hasProp(source, 'value')); // We need to assume that the config value is loaded at build-time
-        applyEffect(configModFromEffect, configValueSources, configDef);
+        applyEffect(configModFromEffect, source, configValueSources, configName, configDef, configDefinitions);
     });
 }
-function applyEffect(configModFromEffect, configValueSources, configDefEffect) {
-    const notSupported = `Effects currently only supports modifying the the ${pc.cyan('env')} of a config.`;
+function applyEffect(configModFromEffect, source, configValueSources, configNameEffect, configDefEffect, configDefinitions) {
+    const notSupported = `${pc.cyan('meta.effect')} currently only supports setting the value of a config, or modifying the ${pc.cyan('meta.env')} of a config.`;
     objectEntries(configModFromEffect).forEach(([configName, configValue]) => {
         if (configName === 'meta') {
             let configDefinedAt;
@@ -712,14 +712,23 @@ function applyEffect(configModFromEffect, configValueSources, configDefEffect) {
             });
         }
         else {
-            assertUsage(false, notSupported);
-            /* To implement being able to set a config value in an effect:
-             * - Copy and append definedAtFile.fileExportPathToShowToUser with ['meta', configName, 'effect']
-             *   - Copying the definedAtFile of the config that defines the effect
-             * - Same precedence as the config that sets the value triggering the effect (not the config defining the effect)
-             *   - Apply sortConfigValueSources() again?
-            configValueSources.push()
-            */
+            const configDef = configDefinitions[configName];
+            assert(configDef);
+            assert(configDefEffect._userEffectDefinedAtFilePath);
+            const configValueSource = {
+                definedAtFilePath: configDefEffect._userEffectDefinedAtFilePath,
+                plusFile: source.plusFile,
+                locationId: source.locationId,
+                configEnv: configDef.env,
+                isOverriden: false, // TODO/now check
+                valueIsLoadedWithImport: false,
+                valueIsDefinedByPlusValueFile: false,
+                valueIsLoaded: true,
+                value: configValue
+            };
+            assertUsage(!!configDef.global === !!configDefEffect.global, `The configuration ${pc.cyan(configNameEffect)} has a ${pc.cyan('meta.effect')} that changes the configuration ${pc.cyan(configName)} and, consequently, both ${pc.cyan(configNameEffect)} and ${pc.cyan(configName)} must have the same ${pc.cyan('meta.global')} value.`);
+            configValueSources[configName] ?? (configValueSources[configName] = []);
+            configValueSources[configName].push(configValueSource);
         }
     });
 }

package/dist/esm/node/prerender/runPrerender.js

@@ -778,7 +778,8 @@ prerenderConfig) {
 }
 function makePublic(prerenderContext) {
     const prerenderContextPublic = makePublicCopy(prerenderContext, 'prerenderContext', [
-        'pageContexts'
+        'pageContexts',
+        'output'
     ]);
     return prerenderContextPublic;
 }

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

@@ -422,10 +422,12 @@ type ConfigBuiltIn = {
     includeAssetsImportedByServer?: boolean;
     /** @deprecated See https://vike.dev/disableAutoFullBuild */
     disableAutoFullBuild?: boolean | 'prerender';
-    /** Use Vite Environment API to orchestrate the build process.
+    /**
+     * Use builder.buildApp() to orchestrate the build process.
+     *
      * @experimental
      */
-    viteEnvironmentAPI?: boolean;
+    vite6BuilderApp?: boolean;
     /** The Base URL of your server.
      *
      * https://vike.dev/base-url

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

@@ -64,7 +64,9 @@ function parseConfigValuesSerialized_tmp(configValuesSerialized) {
             const { valueSerialized, ...common } = configValueSeriliazed;
             const { value, sideExports } = parseValueSerialized(valueSerialized, configName, () => {
                 assert(configValueSeriliazed.type !== 'computed');
-                return configValueSeriliazed.definedAtData;
+                const { definedAtData } = configValueSeriliazed;
+                const definedAtFile = Array.isArray(definedAtData) ? definedAtData[0] : definedAtData;
+                return definedAtFile;
             });
             addSideExports(sideExports);
             configValue = { value, ...common };

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.223-commit-6adb186";
+export declare const PROJECT_VERSION: "0.4.223-commit-e239e2b";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.223-commit-6adb186';
+export const PROJECT_VERSION = '0.4.223-commit-e239e2b';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.223-commit-6adb186";
+    projectVersion: "0.4.223-commit-e239e2b";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.223-commit-6adb186",
+  "version": "0.4.223-commit-e239e2b",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -252,7 +252,7 @@
     "react-streaming": "^0.3.47",
     "rimraf": "^5.0.5",
     "typescript": "^5.7.3",
-    "vite": "^6.0.5"
+    "vite": "^6.2.0"
   },
   "scripts": {
     "dev": "tsc --watch",