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

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

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -50,13 +17,13 @@ const utils_js_1 = require("./utils.js");
  */
 async function build(options = {}) {
     const { viteConfigEnhanced, vikeConfig } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options.viteConfig, 'build');
-    // Pass it to autoFullBuild()
+    // Pass it to pluginAutoFullBuild()
     if (viteConfigEnhanced)
         viteConfigEnhanced._viteConfigEnhanced = viteConfigEnhanced;
     if (vikeConfig.global.config.viteEnvironmentAPI) {
         (0, utils_js_1.assertVersion)('Vite', vite_1.version, '6.0.0');
-        const { createBuilder } = await Promise.resolve().then(() => __importStar(require('vite')));
-        const builder = await createBuilder(viteConfigEnhanced);
+        const builder = await (0, vite_1.createBuilder)(viteConfigEnhanced);
+        // See Vite plugin vike:build:pluginBuildApp
         await builder.buildApp();
     }
     else {

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

@@ -12,19 +12,13 @@ Object.defineProperty(exports, "getVikeConfig", { enumerable: true, get: functio
 var utils_js_1 = require("./utils.js");
 Object.defineProperty(exports, "version", { enumerable: true, get: function () { return utils_js_1.PROJECT_VERSION; } });
 const utils_js_2 = require("./utils.js");
-const buildConfig_js_1 = require("./plugins/buildConfig.js");
+const build_js_1 = require("./plugins/build.js");
 const previewConfig_js_1 = require("./plugins/previewConfig.js");
-const autoFullBuild_js_1 = require("./plugins/autoFullBuild.js");
 const index_js_1 = require("./plugins/devConfig/index.js");
-const packageJsonFile_js_1 = require("./plugins/packageJsonFile.js");
-const removeRequireHookPlugin_js_1 = require("./plugins/removeRequireHookPlugin.js");
 const index_js_2 = require("./plugins/importUserCode/index.js");
-const distFileNames_js_1 = require("./plugins/distFileNames.js");
 const extractAssetsPlugin_js_1 = require("./plugins/extractAssetsPlugin.js");
 const extractExportNamesPlugin_js_1 = require("./plugins/extractExportNamesPlugin.js");
-const suppressRollupWarning_js_1 = require("./plugins/suppressRollupWarning.js");
 const setGlobalContext_js_1 = require("./plugins/setGlobalContext.js");
-const index_js_3 = require("./plugins/buildEntry/index.js");
 const commonConfig_js_2 = require("./plugins/commonConfig.js");
 const baseUrls_js_1 = require("./plugins/baseUrls.js");
 const envVars_js_1 = require("./plugins/envVars.js");
@@ -34,7 +28,6 @@ const getPageAssets_js_1 = require("../runtime/renderPage/getPageAssets.js");
 const resolveClientEntriesDev_js_1 = require("./shared/resolveClientEntriesDev.js");
 const workaroundCssModuleHmr_js_1 = require("./plugins/workaroundCssModuleHmr.js");
 const workaroundVite6HmrRegression_js_1 = require("./plugins/workaroundVite6HmrRegression.js");
-const buildApp_js_1 = require("./plugins/buildApp.js");
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 (0, getPageAssets_js_1.setResolveClientEntriesDev)(resolveClientEntriesDev_js_1.resolveClientEntriesDev);
 // Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
@@ -43,18 +36,11 @@ function plugin(vikeVitePluginOptions = {}) {
         ...(0, commonConfig_js_2.commonConfig)(vikeVitePluginOptions),
         (0, index_js_2.importUserCode)(),
         ...(0, index_js_1.devConfig)(),
-        ...(0, buildConfig_js_1.buildConfig)(),
-        ...(0, buildApp_js_1.buildApp)(),
+        ...(0, build_js_1.build)(),
         (0, previewConfig_js_1.previewConfig)(),
-        ...(0, autoFullBuild_js_1.autoFullBuild)(),
-        (0, packageJsonFile_js_1.packageJsonFile)(),
-        (0, removeRequireHookPlugin_js_1.removeRequireHookPlugin)(),
-        (0, distFileNames_js_1.distFileNames)(),
         ...(0, extractAssetsPlugin_js_1.extractAssetsPlugin)(),
         (0, extractExportNamesPlugin_js_1.extractExportNamesPlugin)(),
-        (0, suppressRollupWarning_js_1.suppressRollupWarning)(),
         ...(0, setGlobalContext_js_1.setGlobalContext)(),
-        ...(0, index_js_3.buildEntry)(),
         (0, baseUrls_js_1.baseUrls)(),
         (0, envVars_js_1.envVarsPlugin)(),
         (0, fileEnv_js_1.fileEnv)(),
@@ -71,7 +57,7 @@ Object.defineProperty(plugin, 'apply', {
         (0, utils_js_2.assertUsage)(false, `Add ${picocolors_1.default.cyan('vike()')} instead of ${picocolors_1.default.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/cjs/node/plugin/plugins/{buildConfig → build/pluginAssetsManifest}/fixServerAssets.js

@@ -3,22 +3,29 @@ 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_assertCssCodeSplit = fixServerAssets_assertCssCodeSplit;
-exports.fixServerAssets_assertCssTarget = fixServerAssets_assertCssTarget;
+exports.fixServerAssets_assertUsageCssCodeSplit = fixServerAssets_assertUsageCssCodeSplit;
+exports.fixServerAssets_assertUsageCssTarget = fixServerAssets_assertUsageCssTarget;
+exports.writeManifestFile = writeManifestFile;
 const promises_1 = __importDefault(require("fs/promises"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const fs_2 = require("fs");
-const utils_js_1 = require("../../utils.js");
-const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
-const buildConfig_js_1 = require("../buildConfig.js");
-const getAssetsDir_js_1 = require("../../shared/getAssetsDir.js");
+const utils_js_1 = require("../../../utils.js");
+const virtualFilePageConfigValuesAll_js_1 = require("../../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
+const pluginBuildConfig_js_1 = require("../pluginBuildConfig.js");
+const getAssetsDir_js_1 = require("../../../shared/getAssetsDir.js");
 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 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
@@ -33,20 +40,12 @@ function fixServerAssets_isEnabled() {
 /** https://github.com/vikejs/vike/issues/1339 */
 async function fixServerAssets(config) {
     const outDirs = (0, getOutDirs_js_1.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_1.default.posix.join(outDir, buildConfig_js_1.manifestTempFile);
-    const manifestFileContent = await promises_1.default.readFile(manifestFilePath, 'utf-8');
-    (0, utils_js_1.assert)(manifestFileContent);
-    const manifest = JSON.parse(manifestFileContent);
-    (0, utils_js_1.assert)(manifest);
-    return manifest;
-}
 async function copyAssets(filesToMove, filesToRemove, config) {
     const { outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
     const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
@@ -219,20 +218,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);
     (0, utils_js_1.assert)(hash);
     return hash;
 }
 // https://github.com/vikejs/vike/issues/1993
-function fixServerAssets_assertCssCodeSplit(config) {
+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_assertCssTarget(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');
@@ -279,3 +281,59 @@ function removeEmptyDirectories(dirPath) {
         fs_1.default.rmdirSync(dirPath);
     }
 }
+async function readManifestFile(outDir) {
+    const manifestFilePath = path_1.default.posix.join(outDir, pluginBuildConfig_js_1.manifestTempFile);
+    const manifestFileContent = await promises_1.default.readFile(manifestFilePath, 'utf-8');
+    (0, utils_js_1.assert)(manifestFileContent);
+    const manifest = JSON.parse(manifestFileContent);
+    (0, utils_js_1.assert)(manifest);
+    (0, utils_js_1.assert)((0, utils_js_1.isObject)(manifest));
+    return manifest;
+}
+async function writeManifestFile(manifest, manifestFilePath) {
+    (0, utils_js_1.assert)((0, utils_js_1.isObject)(manifest));
+    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/{autoFullBuild.js → build/pluginAutoFullBuild.js}

@@ -1,28 +1,28 @@
 "use strict";
-// TODO/v1-release: remove this file
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.autoFullBuild = autoFullBuild;
-const getFullBuildInlineConfig_js_1 = require("../shared/getFullBuildInlineConfig.js");
+exports.pluginAutoFullBuild = pluginAutoFullBuild;
+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");
-const context_js_1 = require("../../prerender/context.js");
-const isViteCliCall_js_1 = require("../shared/isViteCliCall.js");
+const utils_js_1 = require("../../utils.js");
+const runPrerender_js_1 = require("../../../prerender/runPrerender.js");
+const context_js_1 = require("../../../prerender/context.js");
+const isViteCliCall_js_1 = require("../../shared/isViteCliCall.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const logErrorHint_js_1 = require("../../runtime/renderPage/logErrorHint.js");
-const buildConfig_js_1 = require("./buildConfig.js");
-const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
-const context_js_2 = require("../../api/context.js");
+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 autoFullBuild() {
+function pluginAutoFullBuild() {
     let config;
     let vikeConfig;
     return [
         {
-            name: 'vike:autoFullBuild',
+            name: 'vike:build:pluginAutoFullBuild',
             apply: 'build',
             enforce: 'pre',
             async configResolved(config_) {
@@ -31,24 +31,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 (0, fixServerAssets_js_1.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: {
@@ -73,13 +67,14 @@ async function triggerFullBuild(config, vikeConfig, bundle) {
     //  - The legacy plugin triggers its own Rollup build for the client-side.
     //  - The legacy plugin doesn't generate a manifest => we can use that to detect the legacy plugin build.
     //  - Issue & reproduction: https://github.com/vikejs/vike/issues/1154#issuecomment-1965954636
-    if (!bundle[buildConfig_js_1.manifestTempFile])
+    if (!bundle[pluginBuildConfig_js_1.manifestTempFile])
         return;
     const configInline = (0, getFullBuildInlineConfig_js_1.getFullBuildInlineConfig)(config);
     try {
         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/{buildApp.js → build/pluginBuildApp.js}

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildApp = buildApp;
-const runPrerender_js_1 = require("../../prerender/runPrerender.js");
-const context_js_1 = require("../../prerender/context.js");
-const getOutDirs_js_1 = require("../shared/getOutDirs.js");
-const utils_js_1 = require("../utils.js");
-const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
-const getFullBuildInlineConfig_js_1 = require("../shared/getFullBuildInlineConfig.js");
-const commonConfig_js_1 = require("./commonConfig.js");
-function buildApp() {
+exports.pluginBuildApp = pluginBuildApp;
+const runPrerender_js_1 = require("../../../prerender/runPrerender.js");
+const context_js_1 = require("../../../prerender/context.js");
+const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
+const utils_js_1 = require("../../utils.js");
+const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
+const getFullBuildInlineConfig_js_1 = require("../../shared/getFullBuildInlineConfig.js");
+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`.
+    // `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 shouldn't `forceExit`.
     let forceExit = false;
     return [
         {
-            name: 'vike:buildApp',
+            name: 'vike:build:pluginBuildApp',
             apply: 'build',
             config(config) {
                 const vike = (0, commonConfig_js_1.getVikeConfigPublic)(config);
@@ -54,7 +54,7 @@ function buildApp() {
             }
         },
         {
-            name: 'vike:buildApp:prerender',
+            name: 'vike:build:pluginBuildApp:prerender',
             apply: 'build',
             enforce: 'pre',
             applyToEnvironment(env) {

package/dist/cjs/node/plugin/plugins/{buildConfig.js → build/pluginBuildConfig.js}

@@ -1,78 +1,54 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.manifestTempFile = void 0;
-exports.buildConfig = buildConfig;
+exports.pluginBuildConfig = pluginBuildConfig;
 exports.assertRollupInput = assertRollupInput;
 exports.analyzeClientEntries = analyzeClientEntries;
-const utils_js_1 = require("../utils.js");
-const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
-const findPageFiles_js_1 = require("../shared/findPageFiles.js");
-const virtualFilePageConfigValuesAll_js_1 = require("../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
-const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
+const utils_js_1 = require("../../utils.js");
+const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
+const findPageFiles_js_1 = require("../../shared/findPageFiles.js");
+const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
+const extractAssetsQuery_js_1 = require("../../../shared/extractAssetsQuery.js");
 const module_1 = require("module");
-const promises_1 = __importDefault(require("fs/promises"));
-const path_1 = __importDefault(require("path"));
-const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.js");
-const index_js_1 = require("./buildEntry/index.js");
-const prependEntriesDir_js_1 = require("../../shared/prependEntriesDir.js");
-const getFilePath_js_1 = require("../shared/getFilePath.js");
-const getConfigValueBuildTime_js_1 = require("../../../shared/page-configs/getConfigValueBuildTime.js");
-const getOutDirs_js_1 = require("../shared/getOutDirs.js");
-const viteIsSSR_js_1 = require("../shared/viteIsSSR.js");
-const commonConfig_js_1 = require("./commonConfig.js");
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
+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);
 const manifestTempFile = '_temp_manifest.json';
 exports.manifestTempFile = manifestTempFile;
-function buildConfig() {
-    let isServerAssetsFixEnabled;
-    let outDirs;
+function pluginBuildConfig() {
     let config;
     return [
         {
-            name: 'vike:buildConfig:post',
+            name: 'vike:build:pluginBuildConfig',
             apply: 'build',
             enforce: 'post',
             configResolved: {
                 order: 'post',
                 async handler(config_) {
-                    config = config_;
                     (0, utils_js_1.onSetupBuild)();
+                    config = config_;
                     assertRollupInput(config);
                     const entries = await getEntries(config);
                     (0, utils_js_1.assert)(Object.keys(entries).length > 0);
                     config.build.rollupOptions.input = (0, utils_js_1.injectRollupInputs)(entries, config);
                     addLogHook();
-                    outDirs = (0, getOutDirs_js_1.getOutDirs)(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_assertCssCodeSplit)(config);
-                        }
-                    }
+                    (0, fixServerAssets_js_1.fixServerAssets_assertUsageCssCodeSplit)(config);
                 }
             },
             config: {
                 order: 'post',
                 handler(config) {
                     (0, utils_js_1.onSetupBuild)();
-                    const vike = (0, commonConfig_js_1.getVikeConfigPublic)(config);
                     return {
                         build: {
                             outDir: (0, getOutDirs_js_1.resolveOutDir)(config),
-                            manifest: manifestTempFile,
-                            copyPublicDir: vike.config.viteEnvironmentAPI
-                                ? // Already set by buildApp() plugin
-                                    undefined
-                                : !(0, viteIsSSR_js_1.viteIsSSR)(config)
+                            ...(0, fixServerAssets_js_1.fixServerAssets_getBuildConfig)(config)
                         }
                     };
                 }
@@ -80,44 +56,9 @@ function buildConfig() {
             buildStart() {
                 (0, utils_js_1.onSetupBuild)();
             },
-            async closeBundle() {
+            closeBundle() {
                 (0, utils_js_1.onSetupBuild)();
-                await (0, fixServerAssets_js_1.fixServerAssets_assertCssTarget)(config);
-            }
-        },
-        {
-            name: 'vike:buildConfig:pre',
-            apply: 'build',
-            applyToEnvironment(env) {
-                return env.name === 'ssr';
-            },
-            // Make sure other writeBundle() hooks are called after this writeBundle() hook.
-            //  - set_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)) {
-                        // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
-                        //  - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
-                        //  - We'll able to do so once we replace `$ vite build` with `$ vike build`
-                        const 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 promises_1.default.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
-                        }
-                        await promises_1.default.rm(clientManifestFilePath);
-                        await promises_1.default.rm(serverManifestFilePath);
-                        await (0, index_js_1.set_ASSETS_MANIFEST)(options, bundle);
-                    }
-                }
+                (0, fixServerAssets_js_1.fixServerAssets_assertUsageCssTarget)(config);
             }
         }
     ];
@@ -133,7 +74,6 @@ async function getEntries(config) {
     if ((0, viteIsSSR_js_1.viteIsSSR)(config)) {
         const pageEntries = getPageEntries(pageConfigs);
         const entries = {
-            // buildEntry: resolve('dist/esm/node/buildEntry.js'), // TODO/next-major-release: remove
             ...pageFileEntries,
             // Ensure Rollup generates a bundle per page: https://github.com/vikejs/vike/issues/349#issuecomment-1166247275
             ...pageEntries
@@ -263,8 +203,8 @@ function getEntryFromPageConfig(pageConfig, isForClientSide) {
 }
 function resolve(filePath) {
     (0, utils_js_1.assert)(filePath.startsWith('dist/'));
-    // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/
-    return require_.resolve(`../../../../../${filePath}`);
+    // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/build/
+    return require_.resolve(`../../../../../../${filePath}`);
 }
 function addLogHook() {
     const tty = process.stdout.isTTY && !process.env.CI; // Equals https://github.com/vitejs/vite/blob/193d55c7b9cbfec5b79ebfca276d4a721e7de14d/packages/vite/src/node/plugins/reporter.ts#L27

package/dist/cjs/node/plugin/plugins/{buildEntry/index.js → build/pluginBuildEntry.js}

@@ -3,26 +3,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildEntry = buildEntry;
-exports.set_ASSETS_MANIFEST = set_ASSETS_MANIFEST;
+exports.pluginBuildEntry = pluginBuildEntry;
+exports.set_macro_ASSETS_MANIFEST = set_macro_ASSETS_MANIFEST;
 const plugin_1 = require("@brillout/vite-plugin-server-entry/plugin");
 const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
 const utils_js_1 = require("../../utils.js");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 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);
 const extractExportNamesPlugin_js_1 = require("../extractExportNamesPlugin.js");
 const globalContext_js_1 = require("../../../runtime/globalContext.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const ASSETS_MANIFEST = '__VITE_ASSETS_MANIFEST__';
-function buildEntry() {
+function pluginBuildEntry() {
     let config;
     return [
         {
-            name: 'vike:buildEntry',
+            name: 'vike:build:pluginBuildEntry',
+            apply: 'build',
             enforce: 'post',
             async configResolved(config_) {
                 config = config_;
@@ -64,12 +65,11 @@ function getServerProductionEntryCode(config) {
     return importerCode;
 }
 /** Set the value of the ASSETS_MANIFEST constant inside dist/server/entry.js (or dist/server/index.js) */
-async function set_ASSETS_MANIFEST(options, bundle) {
+async function set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath) {
     const { dir } = options;
     (0, utils_js_1.assert)(dir);
     const chunkPath = find_ASSETS_MANIFEST(bundle);
     const chunkFilePath = path_1.default.join(dir, chunkPath);
-    const assetsJsonFilePath = path_1.default.join(dir, '..', 'assets.json');
     const [assetsJsonString, chunkFileContent] = await Promise.all([
         await promises_1.default.readFile(assetsJsonFilePath, 'utf8'),
         await promises_1.default.readFile(chunkFilePath, 'utf8')
@@ -93,7 +93,7 @@ function find_ASSETS_MANIFEST(bundle) {
 function getImportPath(config) {
     // We resolve filePathAbsolute even if we don't use it: we use require.resolve() as an assertion that the relative path is correct
     const filePathAbsolute = (0, utils_js_1.toPosixPath)(
-    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/buildEntry/index.js
+    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/pluginBuildEntry/index.js
     require_.resolve(`../../../../../../dist/esm/__internal/index.js`));
     if (
     // Let's implement a new config if a user needs the import to be a relative path instead of 'vike/__internal' (AFAIK a relative path is needed only if a framework has npm package 'vike' as direct dependency instead of a peer dependency and if the user of that framework uses pnpm)