vike 0.4.223-commit-33cc798 → 0.4.223-commit-59f3966

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/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

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginAutoFullBuild = pluginAutoFullBuild;
 exports.isPrerenderForceExit = isPrerenderForceExit;
-const getFullBuildInlineConfig_js_1 = require("../../shared/getFullBuildInlineConfig.js");
 const vite_1 = require("vite");
 const utils_js_1 = require("../../utils.js");
 const runPrerender_js_1 = require("../../../prerender/runPrerender.js");
@@ -52,9 +51,11 @@ function pluginAutoFullBuild() {
                 sequential: true,
                 order: 'post',
                 handler() {
+                    (0, utils_js_1.onSetupBuild)();
+                    (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);
                     }
@@ -64,10 +65,10 @@ 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;
-    // if builder.buildApp() => trigger at end of `this.environment.name === 'ssr'`.
-    // else => trigger at end of client-side build.
+    // Whether builder.buildApp() is being used, see plugin:build:pluginBuildApp
+    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))
         return;
     if (isEntirelyDisabled(vikeConfig))
@@ -78,10 +79,8 @@ async function triggerFullBuild(config, vikeConfig, viteEnv, bundle) {
     //  - Issue & reproduction: https://github.com/vikejs/vike/issues/1154#issuecomment-1965954636
     if (!bundle[pluginBuildConfig_js_1.manifestTempFile])
         return;
-    const configInline = (0, getFullBuildInlineConfig_js_1.getFullBuildInlineConfig)(config);
-    if (
-    // Already chained by builder.buildApp()
-    !isBuilderApp) {
+    const configInline = getFullBuildInlineConfig(config);
+    if (!isBuilderApp) {
         try {
             await (0, vite_1.build)(setSSR(configInline));
         }
@@ -92,6 +91,9 @@ async function triggerFullBuild(config, vikeConfig, viteEnv, bundle) {
             process.exit(1);
         }
     }
+    else {
+        // The server bulid is already called by builder.buildApp()
+    }
     if ((0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig)) {
         const res = await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline, config);
         forceExit = res.forceExit;
@@ -125,3 +127,19 @@ function isEntirelyDisabled(vikeConfig) {
 function isPrerenderForceExit() {
     return forceExit;
 }
+function getFullBuildInlineConfig(config) {
+    const configFromCli = !(0, isViteCliCall_js_1.isViteCliCall)() ? null : (0, isViteCliCall_js_1.getViteConfigFromCli)();
+    if (config._viteConfigEnhanced) {
+        return config._viteConfigEnhanced;
+    }
+    else {
+        return {
+            ...configFromCli,
+            configFile: configFromCli?.configFile || config.configFile,
+            root: config.root,
+            build: {
+                ...configFromCli?.build
+            }
+        };
+    }
+}

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/build/pluginBuildConfig.js

@@ -55,10 +55,6 @@ function pluginBuildConfig() {
             },
             buildStart() {
                 (0, utils_js_1.onSetupBuild)();
-            },
-            closeBundle() {
-                (0, utils_js_1.onSetupBuild)();
-                (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssTarget)(config);
             }
         }
     ];

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

@@ -73,6 +73,7 @@ async function handleReloadSideEffects() {
         }
     }
 }
+// TODO/soon: predominantly use getVikeConfigPublic() instead of getVikeConfig() then maybe refector?
 async function getVikeConfig(config, { doNotRestartViteOnError } = {}) {
     const userRootDir = config.root;
     const vikeVitePluginOptions = config._vikeVitePluginOptions;

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/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-33cc798';
+exports.PROJECT_VERSION = '0.4.223-commit-59f3966';

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/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

@@ -1,8 +1,7 @@
 export { pluginAutoFullBuild };
 export { isPrerenderForceExit };
-import { getFullBuildInlineConfig } from '../../shared/getFullBuildInlineConfig.js';
 import { build } from 'vite';
-import { assert, assertIsSingleModuleInstance, assertWarning } from '../../utils.js';
+import { assert, assertIsSingleModuleInstance, assertWarning, onSetupBuild } from '../../utils.js';
 import { runPrerenderFromAutoRun, runPrerender_forceExit } from '../../../prerender/runPrerender.js';
 import { isPrerenderAutoRunEnabled } from '../../../prerender/context.js';
 import { isViteCliCall, getViteConfigFromCli } from '../../shared/isViteCliCall.js';
@@ -11,7 +10,7 @@ import { logErrorHint } from '../../../runtime/renderPage/logErrorHint.js';
 import { manifestTempFile } from './pluginBuildConfig.js';
 import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
 import { isVikeCliOrApi } from '../../../api/context.js';
-import { handleAssetsManifest } from './handleAssetsManifest.js';
+import { handleAssetsManifest, handleAssetsManifest_assertUsageCssTarget } from './handleAssetsManifest.js';
 import { isViteClientBuild, isViteServerBuild_onlySsrEnv } from '../../shared/isViteServerBuild.js';
 assertIsSingleModuleInstance('build/pluginAutoFullBuild.ts');
 let forceExit = false;
@@ -47,9 +46,11 @@ function pluginAutoFullBuild() {
                 sequential: true,
                 order: 'post',
                 handler() {
+                    onSetupBuild();
+                    handleAssetsManifest_assertUsageCssTarget(config);
                     if (forceExit &&
                         // Let vike:build:pluginBuildApp force exit
-                        !vikeConfig.global.config.viteEnvironmentAPI) {
+                        !vikeConfig.global.config.vite6BuilderApp) {
                         runPrerender_forceExit();
                         assert(false);
                     }
@@ -59,10 +60,10 @@ 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;
-    // if builder.buildApp() => trigger at end of `this.environment.name === 'ssr'`.
-    // else => trigger at end of client-side build.
+    // Whether builder.buildApp() is being used, see plugin:build:pluginBuildApp
+    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))
         return;
     if (isEntirelyDisabled(vikeConfig))
@@ -74,9 +75,7 @@ async function triggerFullBuild(config, vikeConfig, viteEnv, bundle) {
     if (!bundle[manifestTempFile])
         return;
     const configInline = getFullBuildInlineConfig(config);
-    if (
-    // Already chained by builder.buildApp()
-    !isBuilderApp) {
+    if (!isBuilderApp) {
         try {
             await build(setSSR(configInline));
         }
@@ -87,6 +86,9 @@ async function triggerFullBuild(config, vikeConfig, viteEnv, bundle) {
             process.exit(1);
         }
     }
+    else {
+        // The server bulid is already called by builder.buildApp()
+    }
     if (isPrerenderAutoRunEnabled(vikeConfig)) {
         const res = await runPrerenderFromAutoRun(configInline, config);
         forceExit = res.forceExit;
@@ -120,3 +122,19 @@ function isEntirelyDisabled(vikeConfig) {
 function isPrerenderForceExit() {
     return forceExit;
 }
+function getFullBuildInlineConfig(config) {
+    const configFromCli = !isViteCliCall() ? null : getViteConfigFromCli();
+    if (config._viteConfigEnhanced) {
+        return config._viteConfigEnhanced;
+    }
+    else {
+        return {
+            ...configFromCli,
+            configFile: configFromCli?.configFile || config.configFile,
+            root: config.root,
+            build: {
+                ...configFromCli?.build
+            }
+        };
+    }
+}

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/build/pluginBuildConfig.js

@@ -13,7 +13,7 @@ import { getFilePathResolved } from '../../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../../shared/page-configs/getConfigValueBuildTime.js';
 import { isViteServerBuild } from '../../shared/isViteServerBuild.js';
 import { resolveOutDir } from '../../shared/getOutDirs.js';
-import { handleAssetsManifest_assertUsageCssCodeSplit, handleAssetsManifest_assertUsageCssTarget, handleAssetsManifest_getBuildConfig } from './handleAssetsManifest.js';
+import { handleAssetsManifest_assertUsageCssCodeSplit, handleAssetsManifest_getBuildConfig } from './handleAssetsManifest.js';
 // @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
@@ -52,10 +52,6 @@ function pluginBuildConfig() {
             },
             buildStart() {
                 onSetupBuild();
-            },
-            closeBundle() {
-                onSetupBuild();
-                handleAssetsManifest_assertUsageCssTarget(config);
             }
         }
     ];

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

@@ -67,6 +67,7 @@ async function handleReloadSideEffects() {
         }
     }
 }
+// TODO/soon: predominantly use getVikeConfigPublic() instead of getVikeConfig() then maybe refector?
 async function getVikeConfig(config, { doNotRestartViteOnError } = {}) {
     const userRootDir = config.root;
     const vikeVitePluginOptions = config._vikeVitePluginOptions;

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/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.223-commit-33cc798";
+export declare const PROJECT_VERSION: "0.4.223-commit-59f3966";

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-33cc798';
+export const PROJECT_VERSION = '0.4.223-commit-59f3966';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.223-commit-33cc798";
+    projectVersion: "0.4.223-commit-59f3966";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.223-commit-33cc798",
+  "version": "0.4.223-commit-59f3966",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {

package/dist/cjs/node/plugin/shared/getFullBuildInlineConfig.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFullBuildInlineConfig = getFullBuildInlineConfig;
-const isViteCliCall_js_1 = require("./isViteCliCall.js");
-// TODO/now: move
-function getFullBuildInlineConfig(config) {
-    const configFromCli = !(0, isViteCliCall_js_1.isViteCliCall)() ? null : (0, isViteCliCall_js_1.getViteConfigFromCli)();
-    if (config._viteConfigEnhanced) {
-        return config._viteConfigEnhanced;
-    }
-    else {
-        return {
-            ...configFromCli,
-            configFile: configFromCli?.configFile || config.configFile,
-            root: config.root,
-            build: {
-                ...configFromCli?.build
-            }
-        };
-    }
-}

package/dist/esm/node/plugin/shared/getFullBuildInlineConfig.d.ts

@@ -1,2 +0,0 @@
-import type { InlineConfig, ResolvedConfig } from 'vite';
-export declare function getFullBuildInlineConfig(config: ResolvedConfig): InlineConfig;

package/dist/esm/node/plugin/shared/getFullBuildInlineConfig.js

@@ -1,18 +0,0 @@
-import { getViteConfigFromCli, isViteCliCall } from './isViteCliCall.js';
-// TODO/now: move
-export function getFullBuildInlineConfig(config) {
-    const configFromCli = !isViteCliCall() ? null : getViteConfigFromCli();
-    if (config._viteConfigEnhanced) {
-        return config._viteConfigEnhanced;
-    }
-    else {
-        return {
-            ...configFromCli,
-            configFile: configFromCli?.configFile || config.configFile,
-            root: config.root,
-            build: {
-                ...configFromCli?.build
-            }
-        };
-    }
-}