vike 0.4.237 → 0.4.238

package/dist/cjs/node/vite/plugins/pluginBuild/handleAssetsManifest.js

@@ -13,19 +13,20 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_fs_2 = require("node:fs");
 const utils_js_1 = require("../../utils.js");
-const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
+const virtualFileId_js_1 = require("../../../shared/virtualFileId.js");
 const getAssetsDir_js_1 = require("../../shared/getAssetsDir.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
-const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
-const pluginBuildEntry_js_1 = require("./pluginBuildEntry.js");
+const isViteServerSide_js_1 = require("../../shared/isViteServerSide.js");
+const pluginProdBuildEntry_js_1 = require("./pluginProdBuildEntry.js");
 const getManifestFilePathRelative_js_1 = require("../../shared/getManifestFilePathRelative.js");
-(0, utils_js_1.assertIsSingleModuleInstance)('build/handleAssetsManifest.ts');
-let assetsJsonFilePath;
+const globalObject = (0, utils_js_1.getGlobalObject)('build/handleAssetsManifest.ts', {
+    assetsJsonFilePath: undefined,
+});
 // true  => use workaround config.build.ssrEmitAssets
 // false => use workaround extractAssets plugin
-function handleAssetsManifest_isFixEnabled(config) {
+function handleAssetsManifest_isFixEnabled() {
     // Allow user to toggle between the two workarounds? E.g. based on https://vike.dev/includeAssetsImportedByServer.
     return (0, resolveVikeConfigInternal_js_1.isV1Design)();
 }
@@ -38,7 +39,7 @@ async function fixServerAssets(config) {
     return { clientManifestMod, serverManifestMod };
 }
 async function copyAssets(filesToMove, filesToRemove, config) {
-    const { outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
+    const { outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
     const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
     const assetsDirServer = node_path_1.default.posix.join(outDirServer, assetsDir);
     if (!filesToMove.length && !filesToRemove.length && !(0, node_fs_2.existsSync)(assetsDirServer))
@@ -170,13 +171,13 @@ function addServerAssets(clientManifest, serverManifest) {
 }
 function getPageId(key) {
     // Normalize from:
-    //   ../../virtual:vike:pageConfigLazy:client:/pages/index
+    //   ../../virtual:vike:page-entry:client:/pages/index
     // to:
-    //   virtual:vike:pageConfigLazy:client:/pages/index
+    //   virtual:vike:page-entry:client:/pages/index
     // (This seems to be needed only for vitest tests that use Vite's build() API with an inline config.)
     key = key.substring(key.indexOf('virtual:vike'));
-    const result = (0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(key);
-    return result && result.pageId;
+    const result = (0, virtualFileId_js_1.parseVirtualFileId)(key);
+    return result && result.type === 'page-entry' ? result.pageId : null;
 }
 function collectResources(entryRoot, manifest) {
     const css = [];
@@ -216,15 +217,15 @@ function getHash(src) {
 }
 // https://github.com/vikejs/vike/issues/1993
 function handleAssetsManifest_assertUsageCssCodeSplit(config) {
-    if (!handleAssetsManifest_isFixEnabled(config))
+    if (!handleAssetsManifest_isFixEnabled())
         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 = [];
-function handleAssetsManifest_assertUsageCssTarget(config) {
-    if (!handleAssetsManifest_isFixEnabled(config))
+function handleAssetsManifest_assertUsageCssTarget(config, env) {
+    if (!handleAssetsManifest_isFixEnabled())
         return;
-    const isServerSide = (0, isViteServerBuild_js_1.isViteServerBuild)(config);
+    const isServerSide = (0, isViteServerSide_js_1.isViteServerSide)(config, env);
     (0, utils_js_1.assert)(typeof isServerSide === 'boolean');
     (0, utils_js_1.assert)(config.build.target !== undefined);
     targets.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
@@ -283,43 +284,41 @@ async function writeManifestFile(manifest, manifestFilePath) {
     const manifestFileContent = JSON.stringify(manifest, null, 2);
     await promises_1.default.writeFile(manifestFilePath, manifestFileContent, 'utf-8');
 }
-async function handleAssetsManifest_getBuildConfig(config) {
-    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
-    const isFixEnabled = handleAssetsManifest_isFixEnabled(config);
+async function handleAssetsManifest_getBuildConfig() {
+    const isFixEnabled = handleAssetsManifest_isFixEnabled();
     return {
         // https://github.com/vikejs/vike/issues/1339
         ssrEmitAssets: isFixEnabled ? true : undefined,
         // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
         cssMinify: isFixEnabled ? 'esbuild' : undefined,
         manifest: true,
-        copyPublicDir: vikeConfig.config.vite6BuilderApp
-            ? // Already set by vike:build:pluginBuildApp
-                undefined
-            : !(0, isViteServerBuild_js_1.isViteServerBuild)(config),
+        /* Already set by vike:build:pluginBuildApp
+        copyPublicDir: !isViteServerSide_viteEnvOptional(config),
+        */
     };
 }
 async function handleAssetsManifest(config, viteEnv, options, bundle) {
-    const isSsrEnv = (0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv);
+    const isSsrEnv = (0, isViteServerSide_js_1.isViteServerSide_onlySsrEnv)(config, viteEnv);
     if (isSsrEnv) {
-        (0, utils_js_1.assert)(!assetsJsonFilePath);
+        (0, utils_js_1.assert)(!globalObject.assetsJsonFilePath);
         const outDirs = (0, getOutDirs_js_1.getOutDirs)(config, viteEnv);
-        assetsJsonFilePath = node_path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
-        await writeAssetsManifestFile(assetsJsonFilePath, config);
+        globalObject.assetsJsonFilePath = node_path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
+        await writeAssetsManifestFile(globalObject.assetsJsonFilePath, config);
     }
-    if ((0, isViteServerBuild_js_1.isViteServerBuild)(config, viteEnv)) {
+    if ((0, isViteServerSide_js_1.isViteServerSide)(config, viteEnv)) {
         const outDir = options.dir;
         (0, utils_js_1.assert)(outDir);
         // Replace __VITE_ASSETS_MANIFEST__ in server builds
         // - Always replace it in dist/server/
         // - Also in some other server builds such as dist/vercel/ from vike-vercel
         // - Don't replace it in dist/rsc/ from vike-react-rsc since __VITE_ASSETS_MANIFEST__ doesn't exist there
-        const noop = await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(assetsJsonFilePath, bundle, outDir);
+        const noop = await (0, pluginProdBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(globalObject.assetsJsonFilePath, bundle, outDir);
         if (isSsrEnv)
             (0, utils_js_1.assert)(!noop); // dist/server should always contain __VITE_ASSETS_MANIFEST__
     }
 }
 async function writeAssetsManifestFile(assetsJsonFilePath, config) {
-    const isFixEnabled = handleAssetsManifest_isFixEnabled(config);
+    const isFixEnabled = handleAssetsManifest_isFixEnabled();
     const clientManifestFilePath = getManifestFilePath(config, true);
     const serverManifestFilePath = getManifestFilePath(config, false);
     if (!isFixEnabled) {
@@ -333,7 +332,7 @@ async function writeAssetsManifestFile(assetsJsonFilePath, config) {
     await promises_1.default.rm(serverManifestFilePath);
 }
 function getManifestFilePath(config, client) {
-    const outDirs = (0, getOutDirs_js_1.getOutDirs)(config);
+    const outDirs = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
     const outDir = client ? outDirs.outDirClient : outDirs.outDirServer;
     const env = client ? config.environments.client : config.environments.ssr;
     (0, utils_js_1.assert)(env);

package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildApp.js

@@ -1,12 +1,27 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginBuildApp = pluginBuildApp;
 const runPrerenderEntry_js_1 = require("../../../prerender/runPrerenderEntry.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const utils_js_1 = require("../../utils.js");
-const pluginAutoFullBuild_js_1 = require("./pluginAutoFullBuild.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 resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
+const context_js_2 = require("../../../api/context.js");
+const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
+const isViteServerSide_js_1 = require("../../shared/isViteServerSide.js");
+const runPrerenderEntry_js_2 = require("../../../prerender/runPrerenderEntry.js");
+const getManifestFilePathRelative_js_1 = require("../../shared/getManifestFilePathRelative.js");
+const globalObject = (0, utils_js_1.getGlobalObject)('build/pluginBuildApp.ts', {
+    forceExit: false,
+});
 function pluginBuildApp() {
+    let config;
     return [
         {
             name: 'vike:build:pluginBuildApp:pre',
@@ -14,10 +29,7 @@ function pluginBuildApp() {
             enforce: 'pre',
             config: {
                 order: 'pre',
-                async handler(_config) {
-                    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
-                    if (!vikeConfig.config.vite6BuilderApp)
-                        return;
+                handler(_config) {
                     return {
                         builder: {
                             // Can be overridden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
@@ -26,7 +38,7 @@ function pluginBuildApp() {
                                 (0, utils_js_1.assert)(builder.environments.ssr);
                                 await builder.build(builder.environments.client);
                                 await builder.build(builder.environments.ssr);
-                                if ((0, pluginAutoFullBuild_js_1.isPrerenderForceExit)()) {
+                                if (isPrerenderForceExit()) {
                                     (0, runPrerenderEntry_js_1.runPrerender_forceExit)();
                                     (0, utils_js_1.assert)(false);
                                 }
@@ -39,10 +51,7 @@ function pluginBuildApp() {
         {
             name: 'vike:build:pluginBuildApp',
             apply: 'build',
-            async config(config) {
-                const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
-                if (!vikeConfig.config.vite6BuilderApp)
-                    return;
+            config(config) {
                 return {
                     environments: {
                         ssr: {
@@ -55,6 +64,7 @@ function pluginBuildApp() {
                         client: {
                             consumer: 'client',
                             build: {
+                                outDir: (0, getOutDirs_js_1.resolveOutDir)(config, false),
                                 copyPublicDir: true,
                                 ssr: false,
                             },
@@ -63,5 +73,107 @@ function pluginBuildApp() {
                 };
             },
         },
+        {
+            name: 'vike:build:pluginBuildApp:autoFullBuild:pre',
+            apply: 'build',
+            enforce: 'pre',
+            async configResolved(config_) {
+                config = config_;
+                await abortViteBuildSsr();
+            },
+            // TO-DO/eventually: stop using this writeBundle() hack and, instead, use the buildApp() implementation above.
+            // - Could it cause issues if a tool uses the writeBundle() hack together with getVikeConfig() ?
+            writeBundle: {
+                /* We can't use this because it breaks Vite's logging. TO-DO/eventually: try again with latest Vite version.
+                sequential: true,
+                order: 'pre',
+                */
+                async handler(options, bundle) {
+                    try {
+                        await (0, handleAssetsManifest_js_1.handleAssetsManifest)(config, this.environment, options, bundle);
+                        await triggerPrerendering(config, this.environment, bundle);
+                    }
+                    catch (err) {
+                        // We use try-catch also because:
+                        // - Vite/Rollup swallows errors thrown inside the writeBundle() hook. (It doesn't swallow errors thrown inside the first writeBundle() hook while building the client-side, but it does swallow errors thrown inside the second writeBundle() while building the server-side triggered after Vike calls Vite's `build()` API.)
+                        // - Avoid Rollup prefixing the error with [vike:build:pluginBuildApp], see for example https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
+                        console.error(err);
+                        (0, logErrorHint_js_1.logErrorHint)(err);
+                        process.exit(1);
+                    }
+                },
+            },
+        },
+        {
+            name: 'vike:build:pluginBuildApp:autoFullBuild:post',
+            apply: 'build',
+            enforce: 'post',
+            closeBundle: {
+                sequential: true,
+                order: 'post',
+                handler() {
+                    (0, utils_js_1.onSetupBuild)();
+                    (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssTarget)(config, this.environment);
+                    /* Let vike:build:pluginBuildApp force exit
+                    runPrerender_forceExit()
+                    */
+                },
+            },
+        },
     ];
 }
+async function triggerPrerendering(config, viteEnv, bundle) {
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+    if (!(0, isViteServerSide_js_1.isViteServerSide_onlySsrEnv)(config, viteEnv))
+        return;
+    if (isDisabled(vikeConfig))
+        return;
+    // Workaround for @vitejs/plugin-legacy
+    //  - 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[(0, getManifestFilePathRelative_js_1.getManifestFilePathRelative)(config.build.manifest)])
+        return;
+    if (!(0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig))
+        return;
+    const configInline = getFullBuildInlineConfig(config);
+    const res = await (0, runPrerenderEntry_js_2.runPrerenderFromAutoRun)(configInline);
+    globalObject.forceExit = res.forceExit;
+    (0, utils_js_1.assert)((0, context_js_1.wasPrerenderRun)());
+}
+async function abortViteBuildSsr() {
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+    if (vikeConfig.config.disableAutoFullBuild !== true && (0, isViteCliCall_js_1.isViteCliCall)() && (0, isViteCliCall_js_1.getViteConfigFromCli)()?.build.ssr) {
+        (0, utils_js_1.assertWarning)(false, `The CLI call ${picocolors_1.default.cyan('$ vite build --ssr')} is superfluous since ${picocolors_1.default.cyan('$ vite build')} also builds the server-side. If you want two separate build steps then use https://vike.dev/disableAutoFullBuild or use Vite's ${picocolors_1.default.cyan('build()')} API.`, { onlyOnce: true });
+        process.exit(0);
+    }
+}
+function isDisabled(vikeConfig) {
+    const { disableAutoFullBuild } = vikeConfig.config;
+    if (disableAutoFullBuild === undefined || disableAutoFullBuild === 'prerender') {
+        const isUserUsingViteApi = !(0, isViteCliCall_js_1.isViteCliCall)() && !(0, context_js_2.isVikeCliOrApi)();
+        return isUserUsingViteApi;
+    }
+    else {
+        return disableAutoFullBuild;
+    }
+}
+function isPrerenderForceExit() {
+    return globalObject.forceExit;
+}
+function getFullBuildInlineConfig(config) {
+    const configFromCli = !(0, isViteCliCall_js_1.isViteCliCall)() ? null : (0, isViteCliCall_js_1.getViteConfigFromCli)();
+    if (config._viteConfigFromUserEnhanced) {
+        return config._viteConfigFromUserEnhanced;
+    }
+    else {
+        return {
+            ...configFromCli,
+            configFile: configFromCli?.configFile || config.configFile,
+            root: config.root,
+            build: {
+                ...configFromCli?.build,
+            },
+        };
+    }
+}

package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildConfig.js

@@ -6,15 +6,14 @@ exports.analyzeClientEntries = analyzeClientEntries;
 const utils_js_1 = require("../../utils.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const findPageFiles_js_1 = require("../../shared/findPageFiles.js");
-const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
+const virtualFileId_js_1 = require("../../../shared/virtualFileId.js");
 const extractAssetsQuery_js_1 = require("../../../shared/extractAssetsQuery.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 isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
-const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
+const isViteServerSide_js_1 = require("../../shared/isViteServerSide.js");
 const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
-const getPageAssets_js_1 = require("../../../runtime/renderPage/getPageAssets.js");
+const retrievePageAssetsProd_js_1 = require("../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js");
 function pluginBuildConfig() {
     let config;
     return [
@@ -37,14 +36,10 @@ function pluginBuildConfig() {
             },
             config: {
                 order: 'post',
-                async handler(config) {
+                async handler() {
                     (0, utils_js_1.onSetupBuild)();
-                    return {
-                        build: {
-                            outDir: (0, getOutDirs_js_1.resolveOutDir)(config),
-                            ...(await (0, handleAssetsManifest_js_1.handleAssetsManifest_getBuildConfig)(config)),
-                        },
-                    };
+                    const build = await (0, handleAssetsManifest_js_1.handleAssetsManifest_getBuildConfig)();
+                    return { build };
                 },
             },
             buildStart() {
@@ -57,9 +52,9 @@ async function getEntries(config) {
     const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
     const { _pageConfigs: pageConfigs } = vikeConfig;
     // TO-DO/next-major-release: remove
-    const pageFileEntries = await getPageFileEntries(config, (0, getPageAssets_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config));
+    const pageFileEntries = await getPageFileEntries(config, (0, retrievePageAssetsProd_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config));
     (0, utils_js_1.assertUsage)(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
-    if ((0, isViteServerBuild_js_1.isViteServerBuild)(config)) {
+    if ((0, isViteServerSide_js_1.isViteServerSide_viteEnvOptional)(config)) {
         const pageEntries = getPageEntries(pageConfigs);
         const entries = {
             ...pageFileEntries,
@@ -78,8 +73,8 @@ async function getEntries(config) {
             ...clientEntries,
             ...pageFileEntries,
         };
-        const clientRoutingEntry = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/client/runtime-client-routing/entry.js');
-        const serverRoutingEntry = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/client/runtime-server-routing/entry.js');
+        const clientRoutingEntry = (0, utils_js_1.requireResolveDistFile)('dist/esm/client/runtime-client-routing/entry.js');
+        const serverRoutingEntry = (0, utils_js_1.requireResolveDistFile)('dist/esm/client/runtime-server-routing/entry.js');
         if (hasClientRouting) {
             entries['entries/entry-client-routing'] = clientRoutingEntry;
         }
@@ -132,7 +127,7 @@ function analyzeClientEntries(pageConfigs, config) {
 // Ensure Rollup creates entries for each page file, see https://github.com/vikejs/vike/issues/350
 // (Otherwise the page files may be missing in the client manifest.json)
 async function getPageFileEntries(config, includeAssetsImportedByServer) {
-    const isForClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild)(config);
+    const isForClientSide = !(0, isViteServerSide_js_1.isViteServerSide_viteEnvOptional)(config);
     const fileTypes = isForClientSide ? ['.page', '.page.client'] : ['.page', '.page.server'];
     if (isForClientSide && includeAssetsImportedByServer) {
         fileTypes.push('.page.server');
@@ -176,7 +171,7 @@ function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
 }
 function getEntryFromPageConfig(pageConfig, isForClientSide) {
     let { pageId } = pageConfig;
-    const entryTarget = (0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageId, isForClientSide);
+    const entryTarget = (0, virtualFileId_js_1.generateVirtualFileId)({ type: 'page-entry', pageId, isForClientSide });
     let entryName = pageId;
     // Avoid:
     // ```

package/dist/cjs/node/vite/plugins/pluginBuild/pluginDistPackageJsonFile.js

@@ -1,16 +1,8 @@
 "use strict";
-/*
- * We create a file `dist/server/package.json` to support ESM users.
- * Otherwise, following error is thrown:
- *   Must use import to load ES Module: dist/server/pageFiles.js
- *   require() of ES modules is not supported.
- *   require() of dist/server/pageFiles.js from node_modules/vike/dist/esm/node/runtime/page-files/setup.js is an ES module file as it is a .js file whose nearest parent package.json contains "type": "module" which defines all .js files in that package scope as ES modules.
- * Reproduction: https://github.com/brillout/vite-plugin-ssr-server-import-syntax
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginDistPackageJsonFile = pluginDistPackageJsonFile;
 const rollupIsEsm_js_1 = require("../../shared/rollupIsEsm.js");
-const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
+const isViteServerSide_js_1 = require("../../shared/isViteServerSide.js");
 function pluginDistPackageJsonFile() {
     let config;
     return {
@@ -20,7 +12,7 @@ function pluginDistPackageJsonFile() {
             config = config_;
         },
         generateBundle(options, bundle) {
-            if (!(0, isViteServerBuild_js_1.isViteServerBuild)(config))
+            if (!(0, isViteServerSide_js_1.isViteServerSide)(config, this.environment))
                 return;
             const isEsm = (0, rollupIsEsm_js_1.rollupIsEsm)(options);
             const fileName = 'package.json';

package/dist/cjs/node/vite/plugins/pluginBuild/pluginModuleBanner.js

@@ -1,12 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginModuleBanner = pluginModuleBanner;
-const magic_string_1 = __importDefault(require("magic-string"));
 const utils_js_1 = require("../../utils.js");
-const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
+const getMagicString_js_1 = require("../../shared/getMagicString.js");
+const isViteServerSide_js_1 = require("../../shared/isViteServerSide.js");
 // Rollup's banner feature doesn't work with Vite: https://github.com/vitejs/vite/issues/8412
 // But, anyways, we want to prepend the banner at the beginning of each module, not at the beginning of each file (I believe that's what Rollup's banner feature does).
 function pluginModuleBanner() {
@@ -21,7 +18,7 @@ function pluginModuleBanner() {
         transform: {
             order: 'post',
             handler(code, id, options) {
-                if (!(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options) &&
+                if (!(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options) &&
                     // Inject module banners if user sets `build.minify` to `false` for inspecting dist/client/
                     config.build.minify) {
                     return;
@@ -32,15 +29,12 @@ function pluginModuleBanner() {
                 if (id.startsWith(config.root))
                     id = id.slice(config.root.length + 1);
                 id = id.replaceAll('*/', '*\\/'); // https://github.com/vikejs/vike/issues/2377
-                const magicString = new magic_string_1.default(code);
+                const { magicString, getMagicStringResult } = (0, getMagicString_js_1.getMagicString)(code, id);
                 // Use legal comment so that esbuild doesn't remove it.
                 // - Terser still removes the comment, but I guess users use terser to minify JavaScript so I guess it's a good thing that comment is removed.
                 // - https://esbuild.github.io/api/#legal-comments
                 magicString.prepend(`/*! ${id} [vike:pluginModuleBanner] */\n`);
-                return {
-                    code: magicString.toString(),
-                    map: magicString.generateMap({ hires: true, source: id }),
-                };
+                return getMagicStringResult();
             },
         },
     };

package/dist/cjs/node/vite/plugins/pluginBuild/{pluginBuildEntry.js → pluginProdBuildEntry.js}

@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pluginBuildEntry = pluginBuildEntry;
+exports.pluginProdBuildEntry = pluginProdBuildEntry;
 exports.set_macro_ASSETS_MANIFEST = set_macro_ASSETS_MANIFEST;
 const plugin_1 = require("@brillout/vite-plugin-server-entry/plugin");
-const virtualFileEntry_js_1 = require("../../../shared/virtualFiles/virtualFileEntry.js");
+const virtualFileId_js_1 = require("../../../shared/virtualFileId.js");
 const utils_js_1 = require("../../utils.js");
 const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
@@ -15,11 +15,11 @@ const globalContext_js_1 = require("../../../runtime/globalContext.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const getViteConfigRuntime_js_1 = require("../../shared/getViteConfigRuntime.js");
 const ASSETS_MANIFEST = '__VITE_ASSETS_MANIFEST__';
-function pluginBuildEntry() {
+function pluginProdBuildEntry() {
     let config;
     return [
         {
-            name: 'vike:build:pluginBuildEntry',
+            name: 'vike:build:pluginProdBuildEntry',
             apply: 'build',
             enforce: 'post',
             async configResolved(config_) {
@@ -44,15 +44,15 @@ function getServerProductionEntryCode(config) {
     (0, globalContext_js_1.assertBuildInfo)(buildInfo);
     // After the old design is removed, let's maybe simplify and move everything into a single virtual module
     const importerCode = [
-        `  import { setGlobalContext_buildEntry } from '${importPath}';`,
-        `  import * as virtualFileExports from '${virtualFileEntry_js_1.virtualFileIdEntryServer}';`,
+        `  import { setGlobalContext_prodBuildEntry } from '${importPath}';`,
+        `  import * as virtualFileExportsGlobalEntry from '${virtualFileId_js_1.virtualFileIdGlobalEntryServer}';`,
         `  {`,
-        // Because of a Rollup bug, we have to assign ASSETS_MANIFEST to a variable before passing it to setGlobalContext_buildEntry()
+        // Because of a Rollup bug, we have to assign ASSETS_MANIFEST to a variable before passing it to setGlobalContext_prodBuildEntry()
         // - This workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d
         `    const assetsManifest = ${ASSETS_MANIFEST};`,
         `    const buildInfo = ${JSON.stringify(buildInfo, null, 2)};`,
-        '    setGlobalContext_buildEntry({',
-        `      virtualFileExports,`,
+        '    setGlobalContext_prodBuildEntry({',
+        `      virtualFileExportsGlobalEntry,`,
         `      assetsManifest,`,
         `      buildInfo,`,
         '    });',
@@ -95,14 +95,14 @@ 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.requireResolveVikeDistFile)('dist/esm/__internal/index.js');
+    const filePathAbsolute = (0, utils_js_1.requireResolveDistFile)('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)
     true) {
         return 'vike/__internal';
     }
     else {
-        const { outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
+        const { outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
         const filePathRelative = node_path_1.default.posix.relative(outDirServer, filePathAbsolute);
         return filePathRelative;
     }

package/dist/cjs/node/vite/plugins/pluginBuild.js

@@ -5,16 +5,14 @@ const pluginBuildApp_js_1 = require("./pluginBuild/pluginBuildApp.js");
 const pluginDistPackageJsonFile_js_1 = require("./pluginBuild/pluginDistPackageJsonFile.js");
 const pluginSuppressRollupWarning_js_1 = require("./pluginBuild/pluginSuppressRollupWarning.js");
 const pluginDistFileNames_js_1 = require("./pluginBuild/pluginDistFileNames.js");
-const pluginAutoFullBuild_js_1 = require("./pluginBuild/pluginAutoFullBuild.js");
-const pluginBuildEntry_js_1 = require("./pluginBuild/pluginBuildEntry.js");
+const pluginProdBuildEntry_js_1 = require("./pluginBuild/pluginProdBuildEntry.js");
 const pluginBuildConfig_js_1 = require("./pluginBuild/pluginBuildConfig.js");
 const pluginModuleBanner_js_1 = require("./pluginBuild/pluginModuleBanner.js");
 function pluginBuild() {
     return [
         ...(0, pluginBuildConfig_js_1.pluginBuildConfig)(),
         ...(0, pluginBuildApp_js_1.pluginBuildApp)(),
-        ...(0, pluginAutoFullBuild_js_1.pluginAutoFullBuild)(),
-        ...(0, pluginBuildEntry_js_1.pluginBuildEntry)(),
+        ...(0, pluginProdBuildEntry_js_1.pluginProdBuildEntry)(),
         (0, pluginDistPackageJsonFile_js_1.pluginDistPackageJsonFile)(),
         (0, pluginSuppressRollupWarning_js_1.pluginSuppressRollupWarning)(),
         (0, pluginDistFileNames_js_1.pluginDistFileNames)(),

package/dist/cjs/node/vite/plugins/pluginDev/determineFsAllowList.js

@@ -23,6 +23,6 @@ async function determineFsAllowList(config) {
     // We add it again just to be sure.
     fsAllow.push((0, vite_1.searchForWorkspaceRoot)(process.cwd()));
     // Add node_modules/vike/
-    const vikeNodeModulesRoot = (0, utils_js_1.getVikeNodeModulesRoot)();
-    fsAllow.push(vikeNodeModulesRoot);
+    const packageNodeModulesDirectory = (0, utils_js_1.getPackageNodeModulesDirectory)();
+    fsAllow.push(packageNodeModulesDirectory);
 }

package/dist/cjs/node/vite/plugins/pluginDev/determineOptimizeDeps.js

@@ -5,7 +5,7 @@ const findPageFiles_js_1 = require("../../shared/findPageFiles.js");
 const utils_js_1 = require("../../utils.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const pluginBuildConfig_js_1 = require("../pluginBuild/pluginBuildConfig.js");
-const virtualFileEntry_js_1 = require("../../../shared/virtualFiles/virtualFileEntry.js");
+const virtualFileId_js_1 = require("../../../shared/virtualFileId.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
 const getConfigValueSourcesRelevant_js_1 = require("../pluginVirtualFiles/getConfigValueSourcesRelevant.js");
 const debug = (0, utils_js_1.createDebugger)('vike:optimizeDeps');
@@ -15,8 +15,9 @@ async function determineOptimizeDeps(config) {
     const { entriesClient, entriesServer, includeClient, includeServer } = await getPageDeps(config, pageConfigs);
     config.optimizeDeps.include = add(config.optimizeDeps.include, includeClient);
     config.optimizeDeps.entries = add(config.optimizeDeps.entries, entriesClient);
-    // Workaround until https://github.com/vitejs/vite-plugin-react/issues/650
-    // - TODO/soon: remove workaround once https://github.com/vitejs/vite/pull/20495 is released
+    // Workaround for https://github.com/vitejs/vite-plugin-react/issues/650
+    // - The issue was closed as completed with https://github.com/vitejs/vite/pull/20495 but it doesn't fix the issue and the workaround is still needed.
+    // - TO-DO/eventually: try removing the workaround and see if the CI fails (at test/@cloudflare_vite-plugin/) — maybe the issue will get fixed at some point.
     includeServer.push('react/jsx-dev-runtime');
     for (const envName in config.environments) {
         const env = config.environments[envName];
@@ -133,9 +134,9 @@ async function getPageDeps(config, pageConfigs) {
         const { hasClientRouting, hasServerRouting, clientEntries } = (0, pluginBuildConfig_js_1.analyzeClientEntries)(pageConfigs, config);
         Object.values(clientEntries).forEach((e) => addEntry(e, true));
         if (hasClientRouting)
-            addEntry(virtualFileEntry_js_1.virtualFileIdEntryClientCR, true);
+            addEntry(virtualFileId_js_1.virtualFileIdGlobalEntryClientCR, true);
         if (hasServerRouting)
-            addEntry(virtualFileEntry_js_1.virtualFileIdEntryClientSR, true);
+            addEntry(virtualFileId_js_1.virtualFileIdGlobalEntryClientSR, true);
     }
     entriesClient = entriesClient;
     entriesServer = entriesServer;

package/dist/cjs/node/vite/plugins/pluginEnvVars.js

@@ -1,16 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginEnvVars = pluginEnvVars;
-const magic_string_1 = __importDefault(require("magic-string"));
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
 const getFilePath_js_1 = require("../shared/getFilePath.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
-const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
-const applyRegExWithMagicString_js_1 = require("../shared/applyRegExWithMagicString.js");
+const isViteServerSide_js_1 = require("../shared/isViteServerSide.js");
+const getMagicString_js_1 = require("../shared/getMagicString.js");
 // TO-DO/eventually:
 // - Make ({}) work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
@@ -42,8 +38,8 @@ function pluginEnvVars() {
             if (!code.includes('({}).'))
                 return;
             const isBuild = config.command === 'build';
-            const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options);
-            const magicString = new magic_string_1.default(code);
+            const isClientSide = !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options);
+            const { magicString, getMagicStringResult } = (0, getMagicString_js_1.getMagicString)(code, id);
             // Find & check
             const replacements = Object.entries(envsAll)
                 .filter(([key]) => {
@@ -81,14 +77,11 @@ function pluginEnvVars() {
                 .filter(utils_js_1.isNotNullish);
             // Apply
             replacements.forEach(({ regExpStr, replacement }) => {
-                (0, applyRegExWithMagicString_js_1.applyRegExpWithMagicString)(magicString, regExpStr, replacement);
+                magicString.replaceAll(new RegExp(regExpStr, 'g'), JSON.stringify(replacement));
             });
             if (!magicString.hasChanged())
                 return null;
-            return {
-                code: magicString.toString(),
-                map: magicString.generateMap({ hires: true, source: id }),
-            };
+            return getMagicStringResult();
         },
     };
 }