vike 0.4.223-commit-586dbfb → 0.4.223-commit-f1089b4

package/dist/cjs/node/plugin/plugins/{distFileNames.js → build/pluginDistFileNames.js}

@@ -3,18 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.distFileNames = distFileNames;
+exports.pluginDistFileNames = pluginDistFileNames;
 // Attempt to preserve file structure of `.page.js` files:
 //  - https://github.com/vikejs/vike/commit/11a4c49e5403aa7c37c8020c462b499425b41854
 //  - Blocker: https://github.com/rollup/rollup/issues/4724
-const utils_js_1 = require("../utils.js");
+const utils_js_1 = require("../../utils.js");
 const path_1 = __importDefault(require("path"));
 const crypto_1 = __importDefault(require("crypto"));
-const getAssetsDir_js_1 = require("../shared/getAssetsDir.js");
-const getFilePath_js_1 = require("../shared/getFilePath.js");
-function distFileNames() {
+const getAssetsDir_js_1 = require("../../shared/getAssetsDir.js");
+const getFilePath_js_1 = require("../../shared/getFilePath.js");
+function pluginDistFileNames() {
     return {
-        name: 'vike:distFileNames',
+        name: 'vike:build:pluginDistFileNames',
         apply: 'build',
         enforce: 'post',
         configResolved(config) {

package/dist/cjs/node/plugin/plugins/{packageJsonFile.js → build/pluginDistPackageJsonFile.js}

@@ -8,13 +8,13 @@
  * Reproduction: https://github.com/brillout/vite-plugin-ssr-server-import-syntax
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.packageJsonFile = packageJsonFile;
-const rollupIsEsm_js_1 = require("../shared/rollupIsEsm.js");
-const viteIsSSR_js_1 = require("../shared/viteIsSSR.js");
-function packageJsonFile() {
+exports.pluginDistPackageJsonFile = pluginDistPackageJsonFile;
+const rollupIsEsm_js_1 = require("../../shared/rollupIsEsm.js");
+const viteIsSSR_js_1 = require("../../shared/viteIsSSR.js");
+function pluginDistPackageJsonFile() {
     let config;
     return {
-        name: 'vike:packageJsonFile',
+        name: 'vike:build:pluginDistPackageJsonFile',
         apply: 'build',
         configResolved(config_) {
             config = config_;

package/dist/cjs/node/plugin/plugins/{suppressRollupWarning.js → build/pluginSuppressRollupWarning.js}

@@ -1,10 +1,10 @@
 "use strict";
 // Suppress Rollup warnings `Generated an empty chunk: "index.page.server"`
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.suppressRollupWarning = suppressRollupWarning;
-function suppressRollupWarning() {
+exports.pluginSuppressRollupWarning = pluginSuppressRollupWarning;
+function pluginSuppressRollupWarning() {
     return {
-        name: 'vike:suppressRollupWarning',
+        name: 'vike:build:pluginSuppressRollupWarning',
         apply: 'build',
         enforce: 'post',
         async configResolved(config) {

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

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

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

@@ -7,7 +7,7 @@ exports.commonConfig = commonConfig;
 exports.getVikeConfigPublic = getVikeConfigPublic;
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
-const buildConfig_js_1 = require("./buildConfig.js");
+const pluginBuildConfig_js_1 = require("./build/pluginBuildConfig.js");
 const require_shim_1 = require("@brillout/require-shim");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const path_1 = __importDefault(require("path"));
@@ -36,6 +36,7 @@ function commonConfig(vikeVitePluginOptions) {
                         _isDev: isDev,
                         _root: root,
                         _vikeVitePluginOptions: vikeVitePluginOptions,
+                        _vikeConfigObject: vikeConfig,
                         _vike: {
                             pages: vikeConfig.pages,
                             config: vikeConfig.global.config
@@ -66,7 +67,7 @@ function commonConfig(vikeVitePluginOptions) {
                     overrideViteDefaultSsrExternal(config)
                     //*/
                     workaroundCI(config);
-                    (0, buildConfig_js_1.assertRollupInput)(config);
+                    (0, pluginBuildConfig_js_1.assertRollupInput)(config);
                     (0, assertResolveAlias_js_1.assertResolveAlias)(config);
                     assertEsm(config.root);
                     assertVikeCliOrApi(config);

package/dist/cjs/node/plugin/plugins/devConfig/determineFsAllowList.js

@@ -10,7 +10,7 @@ const utils_js_1 = require("../../utils.js");
 const module_1 = require("module");
 const path_2 = require("path");
 const url_1 = require("url");
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+// @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);
 const __dirname_ = (0, path_2.dirname)((0, url_1.fileURLToPath)(importMetaUrl));

package/dist/cjs/node/plugin/plugins/devConfig/determineOptimizeDeps.js

@@ -4,7 +4,7 @@ exports.determineOptimizeDeps = determineOptimizeDeps;
 const findPageFiles_js_1 = require("../../shared/findPageFiles.js");
 const utils_js_1 = require("../../utils.js");
 const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
-const buildConfig_js_1 = require("../buildConfig.js");
+const pluginBuildConfig_js_1 = require("../build/pluginBuildConfig.js");
 const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
 const debug = (0, utils_js_1.createDebugger)('vike:optimizeDeps');
@@ -82,7 +82,7 @@ async function getPageDeps(config, pageConfigs) {
     return { entries, include };
 }
 function getVirtualFiles(config, pageConfigs) {
-    const { hasClientRouting, hasServerRouting, clientEntries } = (0, buildConfig_js_1.analyzeClientEntries)(pageConfigs, config);
+    const { hasClientRouting, hasServerRouting, clientEntries } = (0, pluginBuildConfig_js_1.analyzeClientEntries)(pageConfigs, config);
     const entriesVirtualFiles = Object.values(clientEntries);
     if (hasClientRouting)
         entriesVirtualFiles.push(virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeClientCR);

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

@@ -14,7 +14,7 @@ const isAsset_js_1 = require("../shared/isAsset.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.js");
+const fixServerAssets_js_1 = require("./build/pluginAssetsManifest/fixServerAssets.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 const assertV1Design_js_1 = require("../../shared/assertV1Design.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");

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

@@ -18,7 +18,7 @@ const getVikeConfig_js_1 = require("../getVikeConfig.js");
 require("source-map-support/register.js");
 const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
 const module_1 = require("module");
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+// @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);
 (0, utils_js_1.assertIsNotProductionRuntime)();

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/plugins/importUserCode/v1-design/virtual-files/getVirtualFilePageConfigValuesAll.js

@@ -8,7 +8,7 @@ const extractAssetsQuery_js_1 = require("../../../../../shared/extractAssetsQuer
 const debug_js_1 = require("./debug.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValues_js_1 = require("../../../../../../shared/page-configs/serialize/serializeConfigValues.js");
-const fixServerAssets_js_1 = require("../../../buildConfig/fixServerAssets.js");
+const fixServerAssets_js_1 = require("../../../build/pluginAssetsManifest/fixServerAssets.js");
 const getConfigValueBuildTime_js_1 = require("../../../../../../shared/page-configs/getConfigValueBuildTime.js");
 async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     const result = (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id);

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/resolveClientEntriesDev.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveClientEntriesDev = resolveClientEntriesDev;
 const utils_js_1 = require("../utils.js");
 const module_1 = require("module");
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+// @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);
 (0, utils_js_1.assertIsNotProductionRuntime)();

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

package/dist/cjs/utils/findPackageJson.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findPackageJson = findPackageJson;
 const findFile_js_1 = require("./findFile.js");
 const module_1 = require("module");
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+// @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);
 function findPackageJson(cwd) {

package/dist/cjs/utils/requireResolve.js

@@ -7,7 +7,7 @@ const assertSetup_js_1 = require("./assertSetup.js");
 const path_js_1 = require("./path.js");
 const isScriptFile_js_1 = require("./isScriptFile.js");
 const module_1 = require("module");
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+// @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);
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
@@ -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/api/build.js

@@ -1,6 +1,6 @@
 export { build };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
-import { build as buildVite, version } from 'vite';
+import { build as buildVite, version, createBuilder } from 'vite';
 import assert from 'assert';
 import { isVikeCli } from '../cli/context.js';
 import { isPrerendering } from '../prerender/context.js';
@@ -12,13 +12,13 @@ import { assertVersion } from './utils.js';
  */
 async function build(options = {}) {
     const { viteConfigEnhanced, vikeConfig } = await prepareViteApiCall(options.viteConfig, 'build');
-    // Pass it to autoFullBuild()
+    // Pass it to pluginAutoFullBuild()
     if (viteConfigEnhanced)
         viteConfigEnhanced._viteConfigEnhanced = viteConfigEnhanced;
     if (vikeConfig.global.config.viteEnvironmentAPI) {
         assertVersion('Vite', version, '6.0.0');
-        const { createBuilder } = await import('vite');
         const builder = await createBuilder(viteConfigEnhanced);
+        // See Vite plugin vike:build:pluginBuildApp
         await builder.buildApp();
     }
     else {

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

@@ -5,19 +5,13 @@ export { plugin as ssr };
 export { getVikeConfigPublic as getVikeConfig } from './plugins/commonConfig.js';
 export { PROJECT_VERSION as version } from './utils.js';
 import { assertUsage } from './utils.js';
-import { buildConfig } from './plugins/buildConfig.js';
+import { build } from './plugins/build.js';
 import { previewConfig } from './plugins/previewConfig.js';
-import { autoFullBuild } from './plugins/autoFullBuild.js';
 import { devConfig } from './plugins/devConfig/index.js';
-import { packageJsonFile } from './plugins/packageJsonFile.js';
-import { removeRequireHookPlugin } from './plugins/removeRequireHookPlugin.js';
 import { importUserCode } from './plugins/importUserCode/index.js';
-import { distFileNames } from './plugins/distFileNames.js';
 import { extractAssetsPlugin } from './plugins/extractAssetsPlugin.js';
 import { extractExportNamesPlugin } from './plugins/extractExportNamesPlugin.js';
-import { suppressRollupWarning } from './plugins/suppressRollupWarning.js';
 import { setGlobalContext } from './plugins/setGlobalContext.js';
-import { buildEntry } from './plugins/buildEntry/index.js';
 import { commonConfig } from './plugins/commonConfig.js';
 import { baseUrls } from './plugins/baseUrls.js';
 import { envVarsPlugin } from './plugins/envVars.js';
@@ -27,7 +21,6 @@ import { setResolveClientEntriesDev } from '../runtime/renderPage/getPageAssets.
 import { resolveClientEntriesDev } from './shared/resolveClientEntriesDev.js';
 import { workaroundCssModuleHmr } from './plugins/workaroundCssModuleHmr.js';
 import { workaroundVite6HmrRegression } from './plugins/workaroundVite6HmrRegression.js';
-import { buildApp } from './plugins/buildApp.js';
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 setResolveClientEntriesDev(resolveClientEntriesDev);
 // Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
@@ -36,18 +29,11 @@ function plugin(vikeVitePluginOptions = {}) {
         ...commonConfig(vikeVitePluginOptions),
         importUserCode(),
         ...devConfig(),
-        ...buildConfig(),
-        ...buildApp(),
+        ...build(),
         previewConfig(),
-        ...autoFullBuild(),
-        packageJsonFile(),
-        removeRequireHookPlugin(),
-        distFileNames(),
         ...extractAssetsPlugin(),
         extractExportNamesPlugin(),
-        suppressRollupWarning(),
         ...setGlobalContext(),
-        ...buildEntry(),
         baseUrls(),
         envVarsPlugin(),
         fileEnv(),
@@ -64,7 +50,7 @@ Object.defineProperty(plugin, 'apply', {
         assertUsage(false, `Add ${pc.cyan('vike()')} instead of ${pc.cyan('vike')} to vite.config.js#plugins (i.e. call the function and add the return value instead of adding the function itself)`, { showStackTrace: true });
     }
 });
-// Ensures following works: `const vike = require('vike/plugin')` / `import vike from 'vike/plugin'`
+// CJS default export `const vike = require('vike/plugin')`
 //  - It needs to live at the end of this file, in order to ensure we do it after all assignments to `exports`.
 try {
     module.exports = Object.assign(exports.default, exports);

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

@@ -0,0 +1,27 @@
+export { handleAssetsManifest };
+export { fixServerAssets_getBuildConfig };
+export { fixServerAssets_isEnabled };
+export { fixServerAssets_assertUsageCssCodeSplit };
+export { fixServerAssets_assertUsageCssTarget };
+export { writeManifestFile };
+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
+ *
+ * Only used by V1 design.
+ */
+declare function fixServerAssets_isEnabled(): boolean;
+declare function fixServerAssets_assertUsageCssCodeSplit(config: ResolvedConfig): 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/{buildConfig → build/pluginAssetsManifest}/fixServerAssets.js

@@ -1,19 +1,28 @@
-export { fixServerAssets };
+// TODO/now: move this file
+// TODO/now: rename_full fixServerAssets handleAssetsManifest
+export { handleAssetsManifest };
+export { fixServerAssets_getBuildConfig };
 export { fixServerAssets_isEnabled };
-export { fixServerAssets_assertCssCodeSplit };
-export { fixServerAssets_assertCssTarget };
+export { fixServerAssets_assertUsageCssCodeSplit };
+export { fixServerAssets_assertUsageCssTarget };
+export { writeManifestFile };
 import fs from 'fs/promises';
 import fs_sync from 'fs';
 import path from 'path';
 import { existsSync } from 'fs';
-import { assert, assertWarning, isEqualStringList, pLimit, unique } from '../../utils.js';
-import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
-import { manifestTempFile } from '../buildConfig.js';
-import { getAssetsDir } from '../../shared/getAssetsDir.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 { isV1Design } from '../../importUserCode/v1-design/getVikeConfig.js';
+import { getOutDirs } from '../../../shared/getOutDirs.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
@@ -28,20 +37,12 @@ function fixServerAssets_isEnabled() {
 /** https://github.com/vikejs/vike/issues/1339 */
 async function fixServerAssets(config) {
     const outDirs = getOutDirs(config);
-    const clientManifest = await loadManifest(outDirs.outDirClient);
-    const serverManifest = await loadManifest(outDirs.outDirServer);
+    const clientManifest = await readManifestFile(outDirs.outDirClient);
+    const serverManifest = await readManifestFile(outDirs.outDirServer);
     const { clientManifestMod, serverManifestMod, filesToMove, filesToRemove } = addServerAssets(clientManifest, serverManifest);
     await copyAssets(filesToMove, filesToRemove, config);
     return { clientManifestMod, serverManifestMod };
 }
-async function loadManifest(outDir) {
-    const manifestFilePath = path.posix.join(outDir, manifestTempFile);
-    const manifestFileContent = await fs.readFile(manifestFilePath, 'utf-8');
-    assert(manifestFileContent);
-    const manifest = JSON.parse(manifestFileContent);
-    assert(manifest);
-    return manifest;
-}
 async function copyAssets(filesToMove, filesToRemove, config) {
     const { outDirClient, outDirServer } = getOutDirs(config);
     const assetsDir = getAssetsDir(config);
@@ -214,20 +215,23 @@ function collectResources(entryRoot, manifest) {
 // </head>
 // ```
 function getHash(src) {
-    // src is guarenteed to end with `.[hash][extname]`, see distFileNames.ts
+    // src is guarenteed to end with `.[hash][extname]`, see pluginDistFileNames.ts
     const hash = src.split('.').at(-2);
     assert(hash);
     return hash;
 }
 // https://github.com/vikejs/vike/issues/1993
-function fixServerAssets_assertCssCodeSplit(config) {
+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_assertCssTarget(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');
@@ -274,3 +278,59 @@ function removeEmptyDirectories(dirPath) {
         fs_sync.rmdirSync(dirPath);
     }
 }
+async function readManifestFile(outDir) {
+    const manifestFilePath = path.posix.join(outDir, manifestTempFile);
+    const manifestFileContent = await fs.readFile(manifestFilePath, 'utf-8');
+    assert(manifestFileContent);
+    const manifest = JSON.parse(manifestFileContent);
+    assert(manifest);
+    assert(isObject(manifest));
+    return manifest;
+}
+async function writeManifestFile(manifest, manifestFilePath) {
+    assert(isObject(manifest));
+    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.d.ts

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

package/dist/esm/node/plugin/plugins/{autoFullBuild.js → build/pluginAutoFullBuild.js}

@@ -1,23 +1,23 @@
-// TODO/v1-release: remove this file
-import { getFullBuildInlineConfig } from '../shared/getFullBuildInlineConfig.js';
-export { autoFullBuild };
+export { pluginAutoFullBuild };
+import { getFullBuildInlineConfig } from '../../shared/getFullBuildInlineConfig.js';
 import { build } from 'vite';
-import { assert, assertWarning } from '../utils.js';
-import { runPrerenderFromAutoRun, runPrerender_forceExit } from '../../prerender/runPrerender.js';
-import { isPrerenderAutoRunEnabled } from '../../prerender/context.js';
-import { isViteCliCall, getViteConfigFromCli } from '../shared/isViteCliCall.js';
+import { assert, assertWarning } from '../../utils.js';
+import { runPrerenderFromAutoRun, runPrerender_forceExit } from '../../../prerender/runPrerender.js';
+import { isPrerenderAutoRunEnabled } from '../../../prerender/context.js';
+import { isViteCliCall, getViteConfigFromCli } from '../../shared/isViteCliCall.js';
 import pc from '@brillout/picocolors';
-import { logErrorHint } from '../../runtime/renderPage/logErrorHint.js';
-import { manifestTempFile } from './buildConfig.js';
-import { getVikeConfig } from './importUserCode/v1-design/getVikeConfig.js';
-import { isVikeCliOrApi } from '../../api/context.js';
+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 autoFullBuild() {
+function pluginAutoFullBuild() {
     let config;
     let vikeConfig;
     return [
         {
-            name: 'vike:autoFullBuild',
+            name: 'vike:build:pluginAutoFullBuild',
             apply: 'build',
             enforce: 'pre',
             async configResolved(config_) {
@@ -26,24 +26,18 @@ function autoFullBuild() {
                 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:autoFullBuild], 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);
                 }
             }
         },
         {
-            name: 'vike:autoFullBuild:forceExit',
+            name: 'vike:build:pluginAutoFullBuild:forceExit',
             apply: 'build',
             enforce: 'post',
             closeBundle: {
@@ -75,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.d.ts

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