vike 0.4.223-commit-62ca594 → 0.4.223-commit-f1089b4

package/dist/cjs/node/plugin/plugins/build/pluginAssetsManifest/fixServerAssets.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fixServerAssets = fixServerAssets;
+exports.handleAssetsManifest = handleAssetsManifest;
+exports.fixServerAssets_getBuildConfig = fixServerAssets_getBuildConfig;
 exports.fixServerAssets_isEnabled = fixServerAssets_isEnabled;
 exports.fixServerAssets_assertUsageCssCodeSplit = fixServerAssets_assertUsageCssCodeSplit;
 exports.fixServerAssets_assertUsageCssTarget = fixServerAssets_assertUsageCssTarget;
@@ -20,6 +21,11 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const getVikeConfig_js_1 = require("../../importUserCode/v1-design/getVikeConfig.js");
 const getOutDirs_js_1 = require("../../../shared/getOutDirs.js");
 const viteIsSSR_js_1 = require("../../../shared/viteIsSSR.js");
+const commonConfig_js_1 = require("../../commonConfig.js");
+const pluginBuildEntry_js_1 = require("../pluginBuildEntry.js");
+(0, utils_js_1.assertIsSingleModuleInstance)('build/handleAssetsManifest.ts');
+let assetsJsonFilePath;
+// TODO/now move isV1Design() inside fixServerAssets_isEnabled()
 /**
  * true  => use workaround config.build.ssrEmitAssets
  * false => use workaround extractAssets plugin
@@ -219,13 +225,16 @@ function getHash(src) {
 }
 // https://github.com/vikejs/vike/issues/1993
 function fixServerAssets_assertUsageCssCodeSplit(config) {
+    const isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (0, getVikeConfig_js_1.isV1Design)(config);
+    if (!isServerAssetsFixEnabled)
+        return;
     (0, utils_js_1.assertWarning)(config.build.cssCodeSplit, `${picocolors_1.default.cyan('build.cssCodeSplit')} shouldn't be set to ${picocolors_1.default.cyan('false')} (https://github.com/vikejs/vike/issues/1993)`, { onlyOnce: true });
 }
 const targets = [];
-async function fixServerAssets_assertUsageCssTarget(config) {
+function fixServerAssets_assertUsageCssTarget(config) {
     if (!fixServerAssets_isEnabled())
         return;
-    if (!(await (0, getVikeConfig_js_1.isV1Design)(config)))
+    if (!(0, getVikeConfig_js_1.isV1Design)(config))
         return;
     const isServerSide = (0, viteIsSSR_js_1.viteIsSSR)(config);
     (0, utils_js_1.assert)(typeof isServerSide === 'boolean');
@@ -286,3 +295,45 @@ async function writeManifestFile(manifest, manifestFilePath) {
     const manifestFileContent = JSON.stringify(manifest, null, 2);
     await promises_1.default.writeFile(manifestFilePath, manifestFileContent, 'utf-8');
 }
+function fixServerAssets_getBuildConfig(config) {
+    const vike = (0, commonConfig_js_1.getVikeConfigPublic)(config);
+    const isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (0, getVikeConfig_js_1.isV1Design)(config);
+    return {
+        // https://github.com/vikejs/vike/issues/1339
+        ssrEmitAssets: isServerAssetsFixEnabled ? true : undefined,
+        // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
+        cssMinify: isServerAssetsFixEnabled ? 'esbuild' : undefined,
+        manifest: pluginBuildConfig_js_1.manifestTempFile,
+        copyPublicDir: vike.config.viteEnvironmentAPI
+            ? // Already set by vike:build:pluginBuildApp
+                undefined
+            : !(0, viteIsSSR_js_1.viteIsSSR)(config)
+    };
+}
+async function handleAssetsManifest(config, viteEnv, options, bundle) {
+    if ((0, viteIsSSR_js_1.viteIsSSR)(config, viteEnv)) {
+        (0, utils_js_1.assert)(!assetsJsonFilePath);
+        const outDirs = (0, getOutDirs_js_1.getOutDirs)(config, viteEnv);
+        assetsJsonFilePath = path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
+        await writeAssetsManifestFile(outDirs, assetsJsonFilePath, config);
+    }
+    if ((0, viteIsSSR_js_1.viteIsServerBuildEnvAny)(config, viteEnv)) {
+        (0, utils_js_1.assert)(assetsJsonFilePath);
+        // Replace __VITE_ASSETS_MANIFEST__ in all server-side bundles
+        await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(options, bundle, assetsJsonFilePath);
+    }
+}
+async function writeAssetsManifestFile(outDirs, assetsJsonFilePath, config) {
+    const isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (0, getVikeConfig_js_1.isV1Design)(config);
+    const clientManifestFilePath = path_1.default.posix.join(outDirs.outDirClient, pluginBuildConfig_js_1.manifestTempFile);
+    const serverManifestFilePath = path_1.default.posix.join(outDirs.outDirServer, pluginBuildConfig_js_1.manifestTempFile);
+    if (!isServerAssetsFixEnabled) {
+        await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
+    }
+    else {
+        const { clientManifestMod } = await fixServerAssets(config);
+        await writeManifestFile(clientManifestMod, assetsJsonFilePath);
+    }
+    await promises_1.default.rm(clientManifestFilePath);
+    await promises_1.default.rm(serverManifestFilePath);
+}

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

@@ -15,6 +15,7 @@ const logErrorHint_js_1 = require("../../../runtime/renderPage/logErrorHint.js")
 const pluginBuildConfig_js_1 = require("./pluginBuildConfig.js");
 const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
 const context_js_2 = require("../../../api/context.js");
+const fixServerAssets_js_1 = require("./pluginAssetsManifest/fixServerAssets.js");
 let forceExit = false;
 function pluginAutoFullBuild() {
     let config;
@@ -30,19 +31,13 @@ function pluginAutoFullBuild() {
                 abortViteBuildSsr(vikeConfig);
             },
             writeBundle: {
-                /* We can't use this because it breaks Vite's logging. TODO: try again with latest Vite version.
+                /* We can't use this because it breaks Vite's logging. TODO/eventually: try again with latest Vite version.
                 sequential: true,
                 order: 'pre',
                 */
-                async handler(_options, bundle) {
-                    try {
-                        await triggerFullBuild(config, vikeConfig, bundle);
-                    }
-                    catch (err) {
-                        // Avoid Rollup prefixing the error with [vike:build:pluginAutoFullBuild], for example see https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
-                        console.error(err);
-                        process.exit(1);
-                    }
+                async handler(options, bundle) {
+                    await (0, fixServerAssets_js_1.handleAssetsManifest)(config, this.environment, options, bundle);
+                    await triggerFullBuild(config, vikeConfig, bundle);
                 }
             }
         },
@@ -79,6 +74,7 @@ async function triggerFullBuild(config, vikeConfig, bundle) {
         await (0, vite_1.build)(setSSR(configInline));
     }
     catch (err) {
+        // Avoid Rollup prefixing the error with [vike:build:pluginAutoFullBuild], see for example https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
         console.error(err);
         (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);

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

@@ -11,7 +11,7 @@ const commonConfig_js_1 = require("../commonConfig.js");
 function pluginBuildApp() {
     let config;
     // `builder.buildApp()` can be overriden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
-    // In that case, we should'nt `forceExit`.
+    // In that case, we shouldn't `forceExit`.
     let forceExit = false;
     return [
         {

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

@@ -15,6 +15,7 @@ const getFilePath_js_1 = require("../../shared/getFilePath.js");
 const getConfigValueBuildTime_js_1 = require("../../../../shared/page-configs/getConfigValueBuildTime.js");
 const viteIsSSR_js_1 = require("../../shared/viteIsSSR.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
+const fixServerAssets_js_1 = require("./pluginAssetsManifest/fixServerAssets.js");
 // @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
@@ -37,6 +38,7 @@ function pluginBuildConfig() {
                     (0, utils_js_1.assert)(Object.keys(entries).length > 0);
                     config.build.rollupOptions.input = (0, utils_js_1.injectRollupInputs)(entries, config);
                     addLogHook();
+                    (0, fixServerAssets_js_1.fixServerAssets_assertUsageCssCodeSplit)(config);
                 }
             },
             config: {
@@ -45,7 +47,8 @@ function pluginBuildConfig() {
                     (0, utils_js_1.onSetupBuild)();
                     return {
                         build: {
-                            outDir: (0, getOutDirs_js_1.resolveOutDir)(config)
+                            outDir: (0, getOutDirs_js_1.resolveOutDir)(config),
+                            ...(0, fixServerAssets_js_1.fixServerAssets_getBuildConfig)(config)
                         }
                     };
                 }
@@ -53,8 +56,9 @@ function pluginBuildConfig() {
             buildStart() {
                 (0, utils_js_1.onSetupBuild)();
             },
-            async closeBundle() {
+            closeBundle() {
                 (0, utils_js_1.onSetupBuild)();
+                (0, fixServerAssets_js_1.fixServerAssets_assertUsageCssTarget)(config);
             }
         }
     ];

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.build = build;
-const pluginAssetsManifest_js_1 = require("./build/pluginAssetsManifest.js");
 const pluginBuildApp_js_1 = require("./build/pluginBuildApp.js");
 const pluginDistPackageJsonFile_js_1 = require("./build/pluginDistPackageJsonFile.js");
 const pluginSuppressRollupWarning_js_1 = require("./build/pluginSuppressRollupWarning.js");
@@ -11,7 +10,6 @@ const pluginBuildEntry_js_1 = require("./build/pluginBuildEntry.js");
 const pluginBuildConfig_js_1 = require("./build/pluginBuildConfig.js");
 function build() {
     return [
-        ...(0, pluginAssetsManifest_js_1.pluginAssetsManifest)(),
         ...(0, pluginBuildConfig_js_1.pluginBuildConfig)(),
         ...(0, pluginBuildApp_js_1.pluginBuildApp)(),
         ...(0, pluginAutoFullBuild_js_1.pluginAutoFullBuild)(),

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

@@ -36,6 +36,7 @@ function commonConfig(vikeVitePluginOptions) {
                         _isDev: isDev,
                         _root: root,
                         _vikeVitePluginOptions: vikeVitePluginOptions,
+                        _vikeConfigObject: vikeConfig,
                         _vike: {
                             pages: vikeConfig.pages,
                             config: vikeConfig.global.config

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

@@ -91,8 +91,10 @@ async function getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, doN
     }
     return await vikeConfigPromise;
 }
-async function isV1Design(config) {
-    const vikeConfig = await getVikeConfig(config);
+// TODO/now update all isV1Design() usage
+function isV1Design(config) {
+    const vikeConfig = config._vikeConfigObject;
+    (0, utils_js_1.assert)(vikeConfig);
     const { pageConfigs } = vikeConfig;
     const isV1Design = pageConfigs.length > 0;
     return isV1Design;

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

@@ -9,12 +9,13 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../utils.js");
 const viteIsSSR_js_1 = require("./viteIsSSR.js");
 const debug = (0, utils_js_1.createDebugger)('vike:outDir');
-function getOutDirs(config) {
+function getOutDirs(configGlobal, viteEnv) {
+    const configEnv = viteEnv?.config ?? configGlobal;
     debug('getOutDirs()', new Error().stack);
-    const outDir = getOutDirFromViteResolvedConfig(config);
+    const outDir = getOutDirFromViteResolvedConfig(configEnv);
     if (!isOutDirRoot(outDir))
-        assertOutDirResolved(outDir, config);
-    const outDirs = getOutDirsAll(outDir, config.root);
+        assertOutDirResolved(outDir, configEnv);
+    const outDirs = getOutDirsAll(outDir, configEnv.root);
     return outDirs;
 }
 /** Appends `client/` or `server/` to `config.build.outDir` */

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

@@ -1,11 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.viteIsSSR = viteIsSSR;
+exports.viteIsServerBuildEnvAny = viteIsServerBuildEnvAny;
 exports.viteIsSSR_options = viteIsSSR_options;
 exports.viteIsSSR_safe = viteIsSSR_safe;
 const assert_js_1 = require("../../../utils/assert.js");
-function viteIsSSR(config) {
-    return !!config?.build?.ssr;
+// TODO/now: rename_full viteIsSSR isViteServerBuildEnvSsr
+function viteIsSSR(configGlobal, viteEnv) {
+    const configEnv = viteEnv?.config ?? configGlobal;
+    return !!configEnv?.build?.ssr;
+}
+// All server-side environments: not only `ssr` but, for example, also `vercel_edge` and `vercel_node`.
+function viteIsServerBuildEnvAny(configGlobal, viteEnv) {
+    return viteEnv ? viteEnv.name === 'ssr' : viteIsSSR(configGlobal);
 }
 function viteIsSSR_options(options) {
     return !!options?.ssr;

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

@@ -95,6 +95,7 @@ async function runPrerenderFromAutoRun(viteConfig, config) {
         prerenderContextPublic = ret.prerenderContextPublic;
     }
     catch (err) {
+        // Avoid Rollup prefixing the error with [vike:build:pluginAutoFullBuild], see for example https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
         console.error(err);
         (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);

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-62ca594';
+exports.PROJECT_VERSION = '0.4.223-commit-f1089b4';

package/dist/cjs/utils/requireResolve.js

@@ -34,6 +34,13 @@ function requireResolve(importPath, cwd) {
     return importedFile;
 }
 function removeFileExtention(importPath) {
+    // Skip for Bun: https://github.com/vikejs/vike/issues/2204
+    //@ts-ignore
+    if (typeof Bun !== 'undefined') {
+        // https://bun.sh/guides/util/detect-bun
+        (0, assert_js_1.assert)(process.versions.bun);
+        return importPath;
+    }
     for (const ext of isScriptFile_js_1.scriptFileExtensionList) {
         const suffix = `.${ext}`;
         if (importPath.endsWith(suffix)) {

package/dist/esm/node/plugin/plugins/build/pluginAssetsManifest/fixServerAssets.d.ts

@@ -1,10 +1,13 @@
-export { fixServerAssets };
+export { handleAssetsManifest };
+export { fixServerAssets_getBuildConfig };
 export { fixServerAssets_isEnabled };
 export { fixServerAssets_assertUsageCssCodeSplit };
 export { fixServerAssets_assertUsageCssTarget };
 export { writeManifestFile };
-import { ViteManifest } from '../../../../shared/ViteManifest.js';
-import { ResolvedConfig } from 'vite';
+import type { ViteManifest } from '../../../../shared/ViteManifest.js';
+import type { Environment, ResolvedConfig, Rollup, UserConfig } from 'vite';
+type Bundle = Rollup.OutputBundle;
+type Options = Rollup.NormalizedOutputOptions;
 /**
  * true  => use workaround config.build.ssrEmitAssets
  * false => use workaround extractAssets plugin
@@ -12,11 +15,13 @@ import { ResolvedConfig } from 'vite';
  * Only used by V1 design.
  */
 declare function fixServerAssets_isEnabled(): boolean;
-/** https://github.com/vikejs/vike/issues/1339 */
-declare function fixServerAssets(config: ResolvedConfig): Promise<{
-    clientManifestMod: ViteManifest;
-    serverManifestMod: ViteManifest;
-}>;
 declare function fixServerAssets_assertUsageCssCodeSplit(config: ResolvedConfig): void;
-declare function fixServerAssets_assertUsageCssTarget(config: ResolvedConfig): Promise<void>;
+declare function fixServerAssets_assertUsageCssTarget(config: ResolvedConfig): void;
 declare function writeManifestFile(manifest: ViteManifest, manifestFilePath: string): Promise<void>;
+declare function fixServerAssets_getBuildConfig(config: UserConfig): {
+    readonly ssrEmitAssets: true | undefined;
+    readonly cssMinify: "esbuild" | undefined;
+    readonly manifest: "_temp_manifest.json";
+    readonly copyPublicDir: boolean | undefined;
+};
+declare function handleAssetsManifest(config: ResolvedConfig, viteEnv: Environment | undefined, options: Options, bundle: Bundle): Promise<void>;

package/dist/esm/node/plugin/plugins/build/pluginAssetsManifest/fixServerAssets.js

@@ -1,4 +1,7 @@
-export { fixServerAssets };
+// TODO/now: move this file
+// TODO/now: rename_full fixServerAssets handleAssetsManifest
+export { handleAssetsManifest };
+export { fixServerAssets_getBuildConfig };
 export { fixServerAssets_isEnabled };
 export { fixServerAssets_assertUsageCssCodeSplit };
 export { fixServerAssets_assertUsageCssTarget };
@@ -7,14 +10,19 @@ import fs from 'fs/promises';
 import fs_sync from 'fs';
 import path from 'path';
 import { existsSync } from 'fs';
-import { assert, assertWarning, isEqualStringList, isObject, pLimit, unique } from '../../../utils.js';
+import { assert, assertIsSingleModuleInstance, assertWarning, isEqualStringList, isObject, pLimit, unique } from '../../../utils.js';
 import { isVirtualFileIdPageConfigValuesAll } from '../../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { manifestTempFile } from '../pluginBuildConfig.js';
 import { getAssetsDir } from '../../../shared/getAssetsDir.js';
 import pc from '@brillout/picocolors';
 import { isV1Design } from '../../importUserCode/v1-design/getVikeConfig.js';
 import { getOutDirs } from '../../../shared/getOutDirs.js';
-import { viteIsSSR } from '../../../shared/viteIsSSR.js';
+import { viteIsServerBuildEnvAny, viteIsSSR } from '../../../shared/viteIsSSR.js';
+import { getVikeConfigPublic } from '../../commonConfig.js';
+import { set_macro_ASSETS_MANIFEST } from '../pluginBuildEntry.js';
+assertIsSingleModuleInstance('build/handleAssetsManifest.ts');
+let assetsJsonFilePath;
+// TODO/now move isV1Design() inside fixServerAssets_isEnabled()
 /**
  * true  => use workaround config.build.ssrEmitAssets
  * false => use workaround extractAssets plugin
@@ -214,13 +222,16 @@ function getHash(src) {
 }
 // https://github.com/vikejs/vike/issues/1993
 function fixServerAssets_assertUsageCssCodeSplit(config) {
+    const isServerAssetsFixEnabled = fixServerAssets_isEnabled() && isV1Design(config);
+    if (!isServerAssetsFixEnabled)
+        return;
     assertWarning(config.build.cssCodeSplit, `${pc.cyan('build.cssCodeSplit')} shouldn't be set to ${pc.cyan('false')} (https://github.com/vikejs/vike/issues/1993)`, { onlyOnce: true });
 }
 const targets = [];
-async function fixServerAssets_assertUsageCssTarget(config) {
+function fixServerAssets_assertUsageCssTarget(config) {
     if (!fixServerAssets_isEnabled())
         return;
-    if (!(await isV1Design(config)))
+    if (!isV1Design(config))
         return;
     const isServerSide = viteIsSSR(config);
     assert(typeof isServerSide === 'boolean');
@@ -281,3 +292,45 @@ async function writeManifestFile(manifest, manifestFilePath) {
     const manifestFileContent = JSON.stringify(manifest, null, 2);
     await fs.writeFile(manifestFilePath, manifestFileContent, 'utf-8');
 }
+function fixServerAssets_getBuildConfig(config) {
+    const vike = getVikeConfigPublic(config);
+    const isServerAssetsFixEnabled = fixServerAssets_isEnabled() && isV1Design(config);
+    return {
+        // https://github.com/vikejs/vike/issues/1339
+        ssrEmitAssets: isServerAssetsFixEnabled ? true : undefined,
+        // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
+        cssMinify: isServerAssetsFixEnabled ? 'esbuild' : undefined,
+        manifest: manifestTempFile,
+        copyPublicDir: vike.config.viteEnvironmentAPI
+            ? // Already set by vike:build:pluginBuildApp
+                undefined
+            : !viteIsSSR(config)
+    };
+}
+async function handleAssetsManifest(config, viteEnv, options, bundle) {
+    if (viteIsSSR(config, viteEnv)) {
+        assert(!assetsJsonFilePath);
+        const outDirs = getOutDirs(config, viteEnv);
+        assetsJsonFilePath = path.posix.join(outDirs.outDirRoot, 'assets.json');
+        await writeAssetsManifestFile(outDirs, assetsJsonFilePath, config);
+    }
+    if (viteIsServerBuildEnvAny(config, viteEnv)) {
+        assert(assetsJsonFilePath);
+        // Replace __VITE_ASSETS_MANIFEST__ in all server-side bundles
+        await set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath);
+    }
+}
+async function writeAssetsManifestFile(outDirs, assetsJsonFilePath, config) {
+    const isServerAssetsFixEnabled = fixServerAssets_isEnabled() && isV1Design(config);
+    const clientManifestFilePath = path.posix.join(outDirs.outDirClient, manifestTempFile);
+    const serverManifestFilePath = path.posix.join(outDirs.outDirServer, manifestTempFile);
+    if (!isServerAssetsFixEnabled) {
+        await fs.copyFile(clientManifestFilePath, assetsJsonFilePath);
+    }
+    else {
+        const { clientManifestMod } = await fixServerAssets(config);
+        await writeManifestFile(clientManifestMod, assetsJsonFilePath);
+    }
+    await fs.rm(clientManifestFilePath);
+    await fs.rm(serverManifestFilePath);
+}

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

@@ -10,6 +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 './pluginAssetsManifest/fixServerAssets.js';
 let forceExit = false;
 function pluginAutoFullBuild() {
     let config;
@@ -25,19 +26,13 @@ function pluginAutoFullBuild() {
                 abortViteBuildSsr(vikeConfig);
             },
             writeBundle: {
-                /* We can't use this because it breaks Vite's logging. TODO: try again with latest Vite version.
+                /* We can't use this because it breaks Vite's logging. TODO/eventually: try again with latest Vite version.
                 sequential: true,
                 order: 'pre',
                 */
-                async handler(_options, bundle) {
-                    try {
-                        await triggerFullBuild(config, vikeConfig, bundle);
-                    }
-                    catch (err) {
-                        // Avoid Rollup prefixing the error with [vike:build:pluginAutoFullBuild], for example see https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
-                        console.error(err);
-                        process.exit(1);
-                    }
+                async handler(options, bundle) {
+                    await handleAssetsManifest(config, this.environment, options, bundle);
+                    await triggerFullBuild(config, vikeConfig, bundle);
                 }
             }
         },
@@ -74,6 +69,7 @@ async function triggerFullBuild(config, vikeConfig, bundle) {
         await build(setSSR(configInline));
     }
     catch (err) {
+        // Avoid Rollup prefixing the error with [vike:build:pluginAutoFullBuild], see for example https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
         console.error(err);
         logErrorHint(err);
         process.exit(1);

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

@@ -9,7 +9,7 @@ import { getVikeConfigPublic } from '../commonConfig.js';
 function pluginBuildApp() {
     let config;
     // `builder.buildApp()` can be overriden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
-    // In that case, we should'nt `forceExit`.
+    // In that case, we shouldn't `forceExit`.
     let forceExit = false;
     return [
         {

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

@@ -13,6 +13,7 @@ import { getFilePathResolved } from '../../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../../shared/page-configs/getConfigValueBuildTime.js';
 import { viteIsSSR } from '../../shared/viteIsSSR.js';
 import { resolveOutDir } from '../../shared/getOutDirs.js';
+import { fixServerAssets_assertUsageCssCodeSplit, fixServerAssets_assertUsageCssTarget, fixServerAssets_getBuildConfig } from './pluginAssetsManifest/fixServerAssets.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);
@@ -34,6 +35,7 @@ function pluginBuildConfig() {
                     assert(Object.keys(entries).length > 0);
                     config.build.rollupOptions.input = injectRollupInputs(entries, config);
                     addLogHook();
+                    fixServerAssets_assertUsageCssCodeSplit(config);
                 }
             },
             config: {
@@ -42,7 +44,8 @@ function pluginBuildConfig() {
                     onSetupBuild();
                     return {
                         build: {
-                            outDir: resolveOutDir(config)
+                            outDir: resolveOutDir(config),
+                            ...fixServerAssets_getBuildConfig(config)
                         }
                     };
                 }
@@ -50,8 +53,9 @@ function pluginBuildConfig() {
             buildStart() {
                 onSetupBuild();
             },
-            async closeBundle() {
+            closeBundle() {
                 onSetupBuild();
+                fixServerAssets_assertUsageCssTarget(config);
             }
         }
     ];

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

@@ -1,5 +1,4 @@
 export { build };
-import { pluginAssetsManifest } from './build/pluginAssetsManifest.js';
 import { pluginBuildApp } from './build/pluginBuildApp.js';
 import { pluginDistPackageJsonFile } from './build/pluginDistPackageJsonFile.js';
 import { pluginSuppressRollupWarning } from './build/pluginSuppressRollupWarning.js';
@@ -9,7 +8,6 @@ import { pluginBuildEntry } from './build/pluginBuildEntry.js';
 import { pluginBuildConfig } from './build/pluginBuildConfig.js';
 function build() {
     return [
-        ...pluginAssetsManifest(),
         ...pluginBuildConfig(),
         ...pluginBuildApp(),
         ...pluginAutoFullBuild(),

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

@@ -11,6 +11,7 @@ declare module 'vite' {
         _baseViteOriginal?: string;
         _viteConfigEnhanced?: InlineConfig;
         _vike?: VikeConfigPublic;
+        _vikeConfigObject?: VikeConfigObject;
     }
 }
 type VikeConfigPublic = {

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

@@ -31,6 +31,7 @@ function commonConfig(vikeVitePluginOptions) {
                         _isDev: isDev,
                         _root: root,
                         _vikeVitePluginOptions: vikeVitePluginOptions,
+                        _vikeConfigObject: vikeConfig,
                         _vike: {
                             pages: vikeConfig.pages,
                             config: vikeConfig.global.config

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

@@ -8,7 +8,7 @@ export { getConfigDefinitionOptional };
 export type { VikeConfigObject };
 import type { PageConfigGlobalBuildTime, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
 import { type ConfigDefinitions, type ConfigDefinitionInternal } from './getVikeConfig/configDefinitionsBuiltIn.js';
-import type { ResolvedConfig } from 'vite';
+import type { ResolvedConfig, UserConfig } from 'vite';
 import { type PageConfigUserFriendly, type PageConfigsUserFriendly } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
 import { type PlusFile } from './getVikeConfig/getPlusFilesAll.js';
 type VikeConfigObject = {
@@ -23,7 +23,7 @@ declare function getVikeConfig(config: ResolvedConfig, { doNotRestartViteOnError
     doNotRestartViteOnError?: true;
 }): Promise<VikeConfigObject>;
 declare function getVikeConfig2(userRootDir: string, isDev: boolean, vikeVitePluginOptions: unknown): Promise<VikeConfigObject>;
-declare function isV1Design(config: ResolvedConfig): Promise<boolean>;
+declare function isV1Design(config: ResolvedConfig | UserConfig): boolean;
 declare function getConfigDefinitionOptional(configDefinitions: ConfigDefinitions, configName: string): ConfigDefinitionInternal | null;
 declare function getConfVal(plusFile: PlusFile, configName: string): null | {
     value: unknown;

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

@@ -85,8 +85,10 @@ async function getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, doN
     }
     return await vikeConfigPromise;
 }
-async function isV1Design(config) {
-    const vikeConfig = await getVikeConfig(config);
+// TODO/now update all isV1Design() usage
+function isV1Design(config) {
+    const vikeConfig = config._vikeConfigObject;
+    assert(vikeConfig);
     const { pageConfigs } = vikeConfig;
     const isV1Design = pageConfigs.length > 0;
     return isV1Design;

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

@@ -1,7 +1,7 @@
 export { getOutDirs };
 export { resolveOutDir };
 export type { OutDirs };
-import type { UserConfig, ResolvedConfig } from 'vite';
+import type { UserConfig, ResolvedConfig, Environment } from 'vite';
 type OutDirs = {
     /** Absolute path to `outDir` */
     outDirRoot: string;
@@ -10,6 +10,6 @@ type OutDirs = {
     /** Absolute path to `${outDir}/server` */
     outDirServer: string;
 };
-declare function getOutDirs(config: ResolvedConfig): OutDirs;
+declare function getOutDirs(configGlobal: ResolvedConfig, viteEnv?: Environment): OutDirs;
 /** Appends `client/` or `server/` to `config.build.outDir` */
 declare function resolveOutDir(config: UserConfig, isSSR?: true): string;

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

@@ -4,12 +4,13 @@ import pc from '@brillout/picocolors';
 import { assert, assertPosixPath, assertUsage, createDebugger, pathJoin, toPosixPath } from '../utils.js';
 import { viteIsSSR } from './viteIsSSR.js';
 const debug = createDebugger('vike:outDir');
-function getOutDirs(config) {
+function getOutDirs(configGlobal, viteEnv) {
+    const configEnv = viteEnv?.config ?? configGlobal;
     debug('getOutDirs()', new Error().stack);
-    const outDir = getOutDirFromViteResolvedConfig(config);
+    const outDir = getOutDirFromViteResolvedConfig(configEnv);
     if (!isOutDirRoot(outDir))
-        assertOutDirResolved(outDir, config);
-    const outDirs = getOutDirsAll(outDir, config.root);
+        assertOutDirResolved(outDir, configEnv);
+    const outDirs = getOutDirsAll(outDir, configEnv.root);
     return outDirs;
 }
 /** Appends `client/` or `server/` to `config.build.outDir` */

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

@@ -1,8 +1,10 @@
 export { viteIsSSR };
+export { viteIsServerBuildEnvAny };
 export { viteIsSSR_options };
 export { viteIsSSR_safe };
-import type { ResolvedConfig, UserConfig } from 'vite';
-declare function viteIsSSR(config: ResolvedConfig | UserConfig): boolean;
+import type { Environment, ResolvedConfig, UserConfig } from 'vite';
+declare function viteIsSSR(configGlobal: ResolvedConfig | UserConfig, viteEnv?: Environment): boolean;
+declare function viteIsServerBuildEnvAny(configGlobal: ResolvedConfig, viteEnv: Environment | undefined): boolean;
 declare function viteIsSSR_options(options: {
     ssr?: boolean;
 } | undefined): boolean;

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

@@ -1,9 +1,16 @@
 export { viteIsSSR };
+export { viteIsServerBuildEnvAny };
 export { viteIsSSR_options };
 export { viteIsSSR_safe };
 import { assert } from '../../../utils/assert.js';
-function viteIsSSR(config) {
-    return !!config?.build?.ssr;
+// TODO/now: rename_full viteIsSSR isViteServerBuildEnvSsr
+function viteIsSSR(configGlobal, viteEnv) {
+    const configEnv = viteEnv?.config ?? configGlobal;
+    return !!configEnv?.build?.ssr;
+}
+// All server-side environments: not only `ssr` but, for example, also `vercel_edge` and `vercel_node`.
+function viteIsServerBuildEnvAny(configGlobal, viteEnv) {
+    return viteEnv ? viteEnv.name === 'ssr' : viteIsSSR(configGlobal);
 }
 function viteIsSSR_options(options) {
     return !!options?.ssr;

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

@@ -57,6 +57,7 @@ async function runPrerenderFromAutoRun(viteConfig, config) {
         prerenderContextPublic = ret.prerenderContextPublic;
     }
     catch (err) {
+        // Avoid Rollup prefixing the error with [vike:build:pluginAutoFullBuild], see for example https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
         console.error(err);
         logErrorHint(err);
         process.exit(1);

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.223-commit-62ca594";
+export declare const PROJECT_VERSION: "0.4.223-commit-f1089b4";

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-62ca594';
+export const PROJECT_VERSION = '0.4.223-commit-f1089b4';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.223-commit-62ca594";
+    projectVersion: "0.4.223-commit-f1089b4";
 };

package/dist/esm/utils/requireResolve.js

@@ -32,6 +32,13 @@ function requireResolve(importPath, cwd) {
     return importedFile;
 }
 function removeFileExtention(importPath) {
+    // Skip for Bun: https://github.com/vikejs/vike/issues/2204
+    //@ts-ignore
+    if (typeof Bun !== 'undefined') {
+        // https://bun.sh/guides/util/detect-bun
+        assert(process.versions.bun);
+        return importPath;
+    }
     for (const ext of scriptFileExtensionList) {
         const suffix = `.${ext}`;
         if (importPath.endsWith(suffix)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.223-commit-62ca594",
+  "version": "0.4.223-commit-f1089b4",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {

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

@@ -1,115 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pluginAssetsManifest = pluginAssetsManifest;
-const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
-const promises_1 = __importDefault(require("fs/promises"));
-const path_1 = __importDefault(require("path"));
-const fixServerAssets_js_1 = require("../build/pluginAssetsManifest/fixServerAssets.js");
-const pluginBuildEntry_js_1 = require("./pluginBuildEntry.js");
-const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
-const viteIsSSR_js_1 = require("../../shared/viteIsSSR.js");
-const commonConfig_js_1 = require("../commonConfig.js");
-const manifestTempFile = '_temp_manifest.json';
-function pluginAssetsManifest() {
-    let isServerAssetsFixEnabled;
-    let config;
-    let assetsJsonFilePath;
-    return [
-        {
-            name: 'vike:build:pluginAssetsManifest:post',
-            apply: 'build',
-            enforce: 'post',
-            configResolved: {
-                order: 'post',
-                async handler(config_) {
-                    config = config_;
-                    isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config));
-                    if (isServerAssetsFixEnabled) {
-                        // https://github.com/vikejs/vike/issues/1339
-                        config.build.ssrEmitAssets = true;
-                        // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
-                        config.build.cssMinify = 'esbuild';
-                        (0, fixServerAssets_js_1.fixServerAssets_assertUsageCssCodeSplit)(config);
-                    }
-                }
-            },
-            config: {
-                order: 'post',
-                handler(config) {
-                    const vike = (0, commonConfig_js_1.getVikeConfigPublic)(config);
-                    return {
-                        build: {
-                            manifest: manifestTempFile,
-                            copyPublicDir: vike.config.viteEnvironmentAPI
-                                ? // Already set by vike:build:pluginBuildApp
-                                    undefined
-                                : !(0, viteIsSSR_js_1.viteIsSSR)(config)
-                        }
-                    };
-                }
-            },
-            async closeBundle() {
-                await (0, fixServerAssets_js_1.fixServerAssets_assertUsageCssTarget)(config);
-            }
-        },
-        {
-            name: 'vike:build:pluginAssetsManifest:pre',
-            apply: 'build',
-            // Compatiblity with Environment API. It replaces `vike:build:pluginAssetsManifest:pre` when compatible
-            // See https://vite.dev/guide/api-environment-plugins.html#per-environment-plugins
-            applyToEnvironment() {
-                return {
-                    name: 'vike:build:pluginAssetsManifest:pre:env-api-compat',
-                    apply: 'build',
-                    enforce: 'pre',
-                    writeBundle: {
-                        order: 'pre',
-                        sequential: true,
-                        async handler(options, bundle) {
-                            if (this.environment.name === 'ssr') {
-                                await writeAssetsManifestFile((0, getOutDirs_js_1.getOutDirs)(this.environment.config));
-                            }
-                            if ((0, viteIsSSR_js_1.viteIsSSR)(this.environment.config)) {
-                                // Replace __VITE_ASSETS_MANIFEST__ in all server-side bundles
-                                await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(options, bundle, assetsJsonFilePath);
-                            }
-                        }
-                    }
-                };
-            },
-            // Ensures that we can reuse `assetsJsonFilePath`
-            sharedDuringBuild: true,
-            // Make sure other writeBundle() hooks are called after this writeBundle() hook.
-            //  - set_macro_ASSETS_MANIFEST() needs to be called before dist/server/ code is executed.
-            //    - For example, the writeBundle() hook of vite-plugin-vercel needs to be called after this writeBundle() hook, otherwise: https://github.com/vikejs/vike/issues/1527
-            enforce: 'pre',
-            writeBundle: {
-                order: 'pre',
-                sequential: true,
-                async handler(options, bundle) {
-                    if ((0, viteIsSSR_js_1.viteIsSSR)(config)) {
-                        await writeAssetsManifestFile((0, getOutDirs_js_1.getOutDirs)(config));
-                        await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(options, bundle, assetsJsonFilePath);
-                    }
-                }
-            }
-        }
-    ];
-    async function writeAssetsManifestFile(outDirs) {
-        assetsJsonFilePath = path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
-        const clientManifestFilePath = path_1.default.posix.join(outDirs.outDirClient, manifestTempFile);
-        const serverManifestFilePath = path_1.default.posix.join(outDirs.outDirServer, manifestTempFile);
-        if (!isServerAssetsFixEnabled) {
-            await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
-        }
-        else {
-            const { clientManifestMod } = await (0, fixServerAssets_js_1.fixServerAssets)(config);
-            await (0, fixServerAssets_js_1.writeManifestFile)(clientManifestMod, assetsJsonFilePath);
-        }
-        await promises_1.default.rm(clientManifestFilePath);
-        await promises_1.default.rm(serverManifestFilePath);
-    }
-}

package/dist/esm/node/plugin/plugins/build/pluginAssetsManifest.d.ts

@@ -1,3 +0,0 @@
-export { pluginAssetsManifest };
-import type { Plugin } from 'vite';
-declare function pluginAssetsManifest(): Plugin[];

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

@@ -1,110 +0,0 @@
-export { pluginAssetsManifest };
-import { isV1Design } from '../importUserCode/v1-design/getVikeConfig.js';
-import fs from 'fs/promises';
-import path from 'path';
-import { fixServerAssets, fixServerAssets_assertUsageCssCodeSplit, fixServerAssets_assertUsageCssTarget, fixServerAssets_isEnabled, writeManifestFile } from '../build/pluginAssetsManifest/fixServerAssets.js';
-import { set_macro_ASSETS_MANIFEST } from './pluginBuildEntry.js';
-import { getOutDirs } from '../../shared/getOutDirs.js';
-import { viteIsSSR } from '../../shared/viteIsSSR.js';
-import { getVikeConfigPublic } from '../commonConfig.js';
-const manifestTempFile = '_temp_manifest.json';
-function pluginAssetsManifest() {
-    let isServerAssetsFixEnabled;
-    let config;
-    let assetsJsonFilePath;
-    return [
-        {
-            name: 'vike:build:pluginAssetsManifest:post',
-            apply: 'build',
-            enforce: 'post',
-            configResolved: {
-                order: 'post',
-                async handler(config_) {
-                    config = config_;
-                    isServerAssetsFixEnabled = fixServerAssets_isEnabled() && (await isV1Design(config));
-                    if (isServerAssetsFixEnabled) {
-                        // https://github.com/vikejs/vike/issues/1339
-                        config.build.ssrEmitAssets = true;
-                        // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
-                        config.build.cssMinify = 'esbuild';
-                        fixServerAssets_assertUsageCssCodeSplit(config);
-                    }
-                }
-            },
-            config: {
-                order: 'post',
-                handler(config) {
-                    const vike = getVikeConfigPublic(config);
-                    return {
-                        build: {
-                            manifest: manifestTempFile,
-                            copyPublicDir: vike.config.viteEnvironmentAPI
-                                ? // Already set by vike:build:pluginBuildApp
-                                    undefined
-                                : !viteIsSSR(config)
-                        }
-                    };
-                }
-            },
-            async closeBundle() {
-                await fixServerAssets_assertUsageCssTarget(config);
-            }
-        },
-        {
-            name: 'vike:build:pluginAssetsManifest:pre',
-            apply: 'build',
-            // Compatiblity with Environment API. It replaces `vike:build:pluginAssetsManifest:pre` when compatible
-            // See https://vite.dev/guide/api-environment-plugins.html#per-environment-plugins
-            applyToEnvironment() {
-                return {
-                    name: 'vike:build:pluginAssetsManifest:pre:env-api-compat',
-                    apply: 'build',
-                    enforce: 'pre',
-                    writeBundle: {
-                        order: 'pre',
-                        sequential: true,
-                        async handler(options, bundle) {
-                            if (this.environment.name === 'ssr') {
-                                await writeAssetsManifestFile(getOutDirs(this.environment.config));
-                            }
-                            if (viteIsSSR(this.environment.config)) {
-                                // Replace __VITE_ASSETS_MANIFEST__ in all server-side bundles
-                                await set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath);
-                            }
-                        }
-                    }
-                };
-            },
-            // Ensures that we can reuse `assetsJsonFilePath`
-            sharedDuringBuild: true,
-            // Make sure other writeBundle() hooks are called after this writeBundle() hook.
-            //  - set_macro_ASSETS_MANIFEST() needs to be called before dist/server/ code is executed.
-            //    - For example, the writeBundle() hook of vite-plugin-vercel needs to be called after this writeBundle() hook, otherwise: https://github.com/vikejs/vike/issues/1527
-            enforce: 'pre',
-            writeBundle: {
-                order: 'pre',
-                sequential: true,
-                async handler(options, bundle) {
-                    if (viteIsSSR(config)) {
-                        await writeAssetsManifestFile(getOutDirs(config));
-                        await set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath);
-                    }
-                }
-            }
-        }
-    ];
-    async function writeAssetsManifestFile(outDirs) {
-        assetsJsonFilePath = path.posix.join(outDirs.outDirRoot, 'assets.json');
-        const clientManifestFilePath = path.posix.join(outDirs.outDirClient, manifestTempFile);
-        const serverManifestFilePath = path.posix.join(outDirs.outDirServer, manifestTempFile);
-        if (!isServerAssetsFixEnabled) {
-            await fs.copyFile(clientManifestFilePath, assetsJsonFilePath);
-        }
-        else {
-            const { clientManifestMod } = await fixServerAssets(config);
-            await writeManifestFile(clientManifestMod, assetsJsonFilePath);
-        }
-        await fs.rm(clientManifestFilePath);
-        await fs.rm(serverManifestFilePath);
-    }
-}