vike 0.4.237-commit-fd8294f → 0.4.237-commit-2c1db32

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

@@ -10,11 +10,11 @@ const vite_1 = require("vite");
  */
 async function build(options = {}) {
     const { viteConfigFromUserEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options, 'build');
-    // Pass it to pluginAutoFullBuild()
+    // Pass it to vike:build:pluginBuildApp
     if (viteConfigFromUserEnhanced)
         viteConfigFromUserEnhanced._viteConfigFromUserEnhanced = viteConfigFromUserEnhanced;
     const builder = await (0, vite_1.createBuilder)(viteConfigFromUserEnhanced);
-    // See Vite plugin vike:build:pluginBuildApp
+    // buildApp() is implemented by vike:build:pluginBuildApp
     await builder.buildApp();
     return {
     /* We don't return `viteConfig` because `viteConfigFromUserEnhanced` is `InlineConfig` not `ResolvedConfig`

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

@@ -71,7 +71,6 @@ async function resolveConfigs(viteConfigFromUserApiOptions, operation) {
     const viteConfigFromUserEnhanced = applyVikeViteConfig(viteInfo.viteConfigFromUserEnhanced, vikeConfig);
     const { viteConfigResolved } = await assertViteRoot2(viteInfo.root, viteConfigFromUserEnhanced, operation);
     return {
-        vikeConfig,
         viteConfigResolved, // ONLY USE if strictly necessary. (We plan to remove assertViteRoot2() as explained in the comments of that function.)
         viteConfigFromUserEnhanced,
     };

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

@@ -35,7 +35,7 @@ async function runPrerenderFromAutoRun(viteConfig) {
         await (0, runPrerender_js_1.runPrerender)({ viteConfig }, 'auto-run');
     }
     catch (err) {
-        // Avoid Rollup prefixing the error with [vike:build:pluginAutoFullBuild], see for example https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
+        // 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);

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

@@ -26,7 +26,7 @@ const globalObject = (0, utils_js_1.getGlobalObject)('build/handleAssetsManifest
 });
 // 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)();
 }
@@ -217,13 +217,13 @@ 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, env) {
-    if (!handleAssetsManifest_isFixEnabled(config))
+    if (!handleAssetsManifest_isFixEnabled())
         return;
     const isServerSide = (0, isViteServerSide_js_1.isViteServerSide)(config, env);
     (0, utils_js_1.assert)(typeof isServerSide === 'boolean');
@@ -284,8 +284,8 @@ 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 isFixEnabled = handleAssetsManifest_isFixEnabled(config);
+async function handleAssetsManifest_getBuildConfig() {
+    const isFixEnabled = handleAssetsManifest_isFixEnabled();
     return {
         // https://github.com/vikejs/vike/issues/1339
         ssrEmitAssets: isFixEnabled ? true : undefined,
@@ -293,7 +293,7 @@ async function handleAssetsManifest_getBuildConfig(config) {
         cssMinify: isFixEnabled ? 'esbuild' : undefined,
         manifest: true,
         /* Already set by vike:build:pluginBuildApp
-        copyPublicDir: !isViteServerSide_withoutEnv(config),
+        copyPublicDir: !isViteServerSide_viteEnvOptional(config),
         */
     };
 }
@@ -318,7 +318,7 @@ async function handleAssetsManifest(config, viteEnv, options, bundle) {
     }
 }
 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) {

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

@@ -1,11 +1,28 @@
 "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;
+exports.isPrerenderForceExit = isPrerenderForceExit;
 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',
@@ -22,7 +39,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);
                                 }
@@ -57,5 +74,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;
+    const configInline = getFullBuildInlineConfig(config);
+    if ((0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig)) {
+        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

@@ -12,12 +12,10 @@ 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 isViteServerSide_js_1 = require("../../shared/isViteServerSide.js");
-const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
 const retrievePageAssetsProd_js_1 = require("../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js");
 function pluginBuildConfig() {
     let config;
-    let configUnresolved;
     return [
         {
             name: 'vike:build:pluginBuildConfig',
@@ -36,23 +34,11 @@ function pluginBuildConfig() {
                     (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssCodeSplit)(config);
                 },
             },
-            configEnvironment: {
-                order: 'post',
-                async handler(envName, configEnv) {
-                    (0, utils_js_1.assert)(configUnresolved);
-                    return {
-                        build: {
-                            outDir: (0, getOutDirs_js_1.resolveOutDir_configEnvironment)(configUnresolved, envName, configEnv),
-                        },
-                    };
-                },
-            },
             config: {
                 order: 'post',
-                async handler(config) {
-                    configUnresolved = config;
+                async handler() {
                     (0, utils_js_1.onSetupBuild)();
-                    const build = await (0, handleAssetsManifest_js_1.handleAssetsManifest_getBuildConfig)(config);
+                    const build = await (0, handleAssetsManifest_js_1.handleAssetsManifest_getBuildConfig)();
                     return { build };
                 },
             },
@@ -68,7 +54,7 @@ async function getEntries(config) {
     // TO-DO/next-major-release: remove
     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, isViteServerSide_js_1.isViteServerSide_withoutEnv)(config)) {
+    if ((0, isViteServerSide_js_1.isViteServerSide_viteEnvOptional)(config)) {
         const pageEntries = getPageEntries(pageConfigs);
         const entries = {
             ...pageFileEntries,
@@ -141,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, isViteServerSide_js_1.isViteServerSide_withoutEnv)(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');

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

@@ -18,7 +18,7 @@ function pluginModuleBanner() {
         transform: {
             order: 'post',
             handler(code, id, options) {
-                if (!(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment) &&
+                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;

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

@@ -5,7 +5,6 @@ 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 pluginBuildConfig_js_1 = require("./pluginBuild/pluginBuildConfig.js");
 const pluginModuleBanner_js_1 = require("./pluginBuild/pluginModuleBanner.js");
@@ -13,7 +12,6 @@ function pluginBuild() {
     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)(),

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

@@ -38,7 +38,7 @@ function pluginEnvVars() {
             if (!code.includes('({}).'))
                 return;
             const isBuild = config.command === 'build';
-            const isClientSide = !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment);
+            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)

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

@@ -47,7 +47,7 @@ function pluginExtractAssets() {
                 }
                 const includeAssetsImportedByServer = (0, retrievePageAssetsProd_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config);
                 (0, utils_js_1.assert)(includeAssetsImportedByServer);
-                (0, utils_js_1.assert)(!(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment));
+                (0, utils_js_1.assert)(!(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options));
                 const importStatements = await (0, parseEsModule_js_1.getImportStatements)(src);
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
@@ -64,7 +64,7 @@ function pluginExtractAssets() {
             //  - Vite's `vite:resolve` plugin; https://github.com/vitejs/vite/blob/d649daba7682791178b711d9a3e44a6b5d00990c/packages/vite/src/node/plugins/resolve.ts#L105
             enforce: 'pre',
             async resolveId(source, importer, options) {
-                if ((0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment)) {
+                if ((0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options)) {
                     // When building for the server, there should never be a `?extractAssets` query
                     (0, utils_js_1.assert)(!extractAssetsRE.test(source));
                     (0, utils_js_1.assert)(importer === undefined || !extractAssetsRE.test(importer));
@@ -141,7 +141,7 @@ function pluginExtractAssets() {
             async configResolved(config_) {
                 config = config_;
                 vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
-                isFixEnabled = (0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)(config);
+                isFixEnabled = (0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)();
                 if (!isFixEnabled) {
                     // https://github.com/vikejs/vike/issues/1060
                     (0, utils_js_1.assertUsage)(!config.plugins.find((p) => p.name === 'vite-tsconfig-paths'), 'vite-tsconfig-paths not supported, remove it and use vite.config.js#resolve.alias instead');

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

@@ -19,7 +19,7 @@ function pluginExtractExportNames() {
         enforce: 'post',
         async transform(src, id, options) {
             id = (0, normalizeId_js_1.normalizeId)(id);
-            const isClientSide = !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment);
+            const isClientSide = !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options);
             if (extractExportNamesRE.test(id)) {
                 const code = await getExtractExportNamesCode(src, isClientSide, !isDev, id);
                 debug('id ' + id, ['result:\n' + code.code.trim(), 'src:\n' + src.trim()]);

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

@@ -34,7 +34,7 @@ function pluginFileEnv() {
             const importers = Array.from(moduleInfo.importers)
                 .map((m) => m.id)
                 .filter((id) => id !== null);
-            assertFileEnv(id, (0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment), importers, 
+            assertFileEnv(id, (0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options), importers, 
             // In dev, we only show a warning because we don't want to disrupt when the user plays with settings such as [ssr](https://vike.dev/ssr).
             true);
         },
@@ -46,7 +46,7 @@ function pluginFileEnv() {
                 return;
             if (skip(id))
                 return;
-            const isServerSide = (0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment);
+            const isServerSide = (0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options);
             if (!isWrongEnv(id, isServerSide))
                 return;
             const { importers } = this.getModuleInfo(id);

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

@@ -15,25 +15,15 @@ const sirv_1 = __importDefault(require("sirv"));
 const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
 function pluginPreview() {
     let config;
-    let configUnresolved;
     let vikeConfig;
     return {
         name: 'vike:pluginPreview',
         apply: utils_js_1.applyPreview,
-        config(config) {
-            configUnresolved = config;
+        config() {
             return {
                 appType: 'custom',
             };
         },
-        configEnvironment(envName, configEnv) {
-            (0, utils_js_1.assert)(configUnresolved);
-            return {
-                build: {
-                    outDir: (0, getOutDirs_js_1.resolveOutDir_configEnvironment)(configUnresolved, envName, configEnv),
-                },
-            };
-        },
         async configResolved(config_) {
             config = config_;
             vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();

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

@@ -35,7 +35,7 @@ function pluginReplaceConstants() {
             const constantsMap = [];
             constantsMap.push({
                 constants: ['pageContext.isClientSide', 'globalContext.isClientSide', 'pageContext.globalContext.isClientSide'],
-                replacement: !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, this.environment),
+                replacement: !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, this.environment, options),
             });
             constantsMap.forEach(({ constants, replacement }) => {
                 if (!constants.some((c) => code.includes(c)))

package/dist/cjs/node/vite/plugins/pluginVirtualFiles/generateVirtualFileGlobalEntryWithOldDesign.js

@@ -18,7 +18,7 @@ async function generateVirtualFileGlobalEntryWithOldDesign(id, options, config,
     const idParsed = (0, virtualFileId_js_1.parseVirtualFileId)(id);
     (0, utils_js_1.assert)(idParsed && idParsed.type === 'global-entry');
     const { isForClientSide, isClientRouting } = idParsed;
-    (0, utils_js_1.assert)(isForClientSide === !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, options, env));
+    (0, utils_js_1.assert)(isForClientSide === !(0, isViteServerSide_js_1.isViteServerSide_extraSafe)(config, env, options));
     const code = await getCode(config, isForClientSide, isClientRouting, isDev, id);
     return code;
 }

package/dist/cjs/node/vite/plugins/pluginVirtualFiles/generateVirtualFilePageEntry.js

@@ -10,7 +10,7 @@ const serializeConfigValues_js_1 = require("../../../../shared/page-configs/seri
 const handleAssetsManifest_js_1 = require("../pluginBuild/handleAssetsManifest.js");
 const getConfigValueBuildTime_js_1 = require("../../../../shared/page-configs/getConfigValueBuildTime.js");
 const retrievePageAssetsProd_js_1 = require("../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js");
-async function generateVirtualFilePageEntry(id, isDev, config) {
+async function generateVirtualFilePageEntry(id, isDev) {
     const result = (0, virtualFileId_js_1.parseVirtualFileId)(id);
     (0, utils_js_1.assert)(result && result.type === 'page-entry');
     /* This assertion fails when using includeAssetsImportedByServer
@@ -34,11 +34,11 @@ async function generateVirtualFilePageEntry(id, isDev, config) {
             throw (0, utils_js_1.getProjectError)('Outdated request');
         //*/
     }
-    const code = getCode(pageConfig, isForClientSide, pageId, (0, retrievePageAssetsProd_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config), config, isDev);
+    const code = getCode(pageConfig, isForClientSide, pageId, (0, retrievePageAssetsProd_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config), isDev);
     (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
 }
-function getCode(pageConfig, isForClientSide, pageId, includeAssetsImportedByServer, config, isDev) {
+function getCode(pageConfig, isForClientSide, pageId, includeAssetsImportedByServer, isDev) {
     const lines = [];
     const importStatements = [];
     const filesEnv = new Map();
@@ -46,7 +46,7 @@ function getCode(pageConfig, isForClientSide, pageId, includeAssetsImportedBySer
     lines.push('export const configValuesSerialized = {');
     lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, { isForClientSide, isClientRouting, isDev }, '', false));
     lines.push('};');
-    if (!(0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)(config) && includeAssetsImportedByServer && isForClientSide && !isDev) {
+    if (!(0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)() && includeAssetsImportedByServer && isForClientSide && !isDev) {
         importStatements.push(`import '${(0, extractAssetsQuery_js_1.extractAssetsAddQuery)((0, virtualFileId_js_1.generateVirtualFileId)({ type: 'page-entry', pageId, isForClientSide: false }))}'`);
     }
     const code = [...importStatements, ...lines].join('\n');

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

@@ -51,7 +51,7 @@ function pluginVirtualFiles() {
             const idParsed = (0, virtualFileId_js_1.parseVirtualFileId)(id);
             if (idParsed) {
                 if (idParsed.type === 'page-entry') {
-                    const code = await (0, generateVirtualFilePageEntry_js_1.generateVirtualFilePageEntry)(id, isDev, config);
+                    const code = await (0, generateVirtualFilePageEntry_js_1.generateVirtualFilePageEntry)(id, isDev);
                     return code;
                 }
                 if (idParsed.type === 'global-entry') {

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

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOutDirs = getOutDirs;
 exports.resolveOutDir = resolveOutDir;
-exports.resolveOutDir_configEnvironment = resolveOutDir_configEnvironment;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../utils.js");
 const isViteServerSide_js_1 = require("./isViteServerSide.js");
@@ -20,21 +19,11 @@ function getOutDirs(configGlobal, viteEnv) {
     assertNormalization(outDirs.outDirServer);
     return outDirs;
 }
-function resolveOutDir_configEnvironment(configGlobal, envName, configEnv) {
-    (0, utils_js_1.assert)(configGlobal && envName && configEnv);
-    const viteEnv = { name: envName, config: configEnv };
-    const isServerSide = (0, isViteServerSide_js_1.isViteServerSide)(configGlobal, viteEnv);
-    return resolveOutDir(configEnv, isServerSide);
-}
 /** Appends `client/` or `server/` to `config.build.outDir` */
 function resolveOutDir(config, isServerSide) {
-    debug('resolveOutDir()', new Error().stack);
-    debug('isServerSide', isServerSide);
+    debug('resolveOutDir()');
     const outDir = getOutDirFromViteUserConfig(config) || 'dist';
     debug('outDir', outDir);
-    /* outDir may already be resolved when using Telefunc + Vike (because both Telefunc and Vike use this logic)
-    assert(isOutDirRoot(outDir))
-    */
     const { outDirClient, outDirServer } = getOutDirsAll(outDir);
     if (isServerSide) {
         debug('outDirServer', 'outDirServer');
@@ -119,7 +108,7 @@ function assertOutDirResolved(outDir, configGlobal, viteEnv) {
     (0, utils_js_1.assert)('/client'.length === '/server'.length);
     const outDirCorrected = outDir.slice(0, -1 * '/client'.length);
     const wrongUsage = `You've set Vite's config.build.outDir to ${picocolors_1.default.cyan(outDir)} but you should set it to ${picocolors_1.default.cyan(outDirCorrected)} instead.`;
-    const isServerSide = (0, isViteServerSide_js_1.isViteServerSide_withoutEnv)(configGlobal, viteEnv);
+    const isServerSide = (0, isViteServerSide_js_1.isViteServerSide_viteEnvOptional)(configGlobal, viteEnv);
     if (isServerSide) {
         (0, utils_js_1.assertUsage)(outDir.endsWith('/server'), wrongUsage);
     }

package/dist/cjs/node/vite/shared/isViteServerSide.js

@@ -2,57 +2,46 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isViteServerSide = isViteServerSide;
 exports.isViteClientSide = isViteClientSide;
-exports.isViteServerSide_withoutEnv = isViteServerSide_withoutEnv;
+exports.isViteServerSide_viteEnvOptional = isViteServerSide_viteEnvOptional;
 exports.isViteServerSide_onlySsrEnv = isViteServerSide_onlySsrEnv;
 exports.isViteServerSide_extraSafe = isViteServerSide_extraSafe;
 const assert_js_1 = require("../../../utils/assert.js");
 function isViteServerSide_impl(configGlobal, viteEnv) {
     (0, assert_js_1.assert)(!('consumer' in configGlobal)); // make sure configGlobal isn't viteEnv.config
-    const isServerSide1 = !viteEnv?.config.consumer ? null : viteEnv.config.consumer !== 'client';
-    const isServerSide2 = !viteEnv?.config.build ? null : getBuildSsrValue(viteEnv.config.build.ssr);
-    const isServerSide3 = !configGlobal.build ? null : getBuildSsrValue(configGlobal.build.ssr);
-    const isServerSide4 = viteEnv?.name === 'ssr' ? true : viteEnv?.name === 'client' ? false : null;
     const debug = {
         viteEnvIsUndefined: !viteEnv,
         viteEnvName: viteEnv?.name ?? null,
         viteEnvConsumer: viteEnv?.config.consumer ?? null,
         configEnvBuildSsr: viteEnv?.config.build?.ssr ?? null,
         configGlobalBuildSsr: configGlobal.build?.ssr ?? null,
-        isServerSide1,
-        isServerSide2,
-        isServerSide3,
-        isServerSide4,
     };
-    if (isServerSide1 !== null) {
-        // assert(isServerSide1 === isServerSide4 || isServerSide4 === null, debug)
-        /* This assertion can fail, seems to be a Vite bug?
-        assert(isServerSide1 === isServerSide2, debug)
-        */
-        return isServerSide1;
-    }
-    if (isServerSide2 !== null) {
-        // assert(isServerSide2 === isServerSide4 || isServerSide4 === null, debug)
-        return isServerSide2;
-    }
-    if (isServerSide3 !== null) {
-        // assert(isServerSide3 === isServerSide4 || isServerSide4 === null, debug)
-        return isServerSide3;
+    if (!viteEnv) {
+        const isServerSide = getBuildSsrValue(configGlobal.build?.ssr);
+        (0, assert_js_1.assert)(typeof isServerSide === 'boolean', debug);
+        return isServerSide;
     }
-    if (isServerSide4 !== null) {
-        return isServerSide4;
+    else {
+        const isServerSide1 = !viteEnv.config.consumer ? null : viteEnv.config.consumer !== 'client';
+        const isServerSide2 = getBuildSsrValue(viteEnv.config.build?.ssr);
+        const isServerSide3 = viteEnv.name === 'ssr' ? true : viteEnv.name === 'client' ? false : null;
+        const isServerSide = isServerSide1 ?? isServerSide2;
+        (0, assert_js_1.assert)(isServerSide === isServerSide1 || isServerSide1 === null, debug);
+        (0, assert_js_1.assert)(isServerSide === isServerSide2 || isServerSide2 === null, debug);
+        (0, assert_js_1.assert)(isServerSide === isServerSide3 || isServerSide3 === null, debug);
+        (0, assert_js_1.assert)(isServerSide !== null);
+        return isServerSide;
     }
-    (0, assert_js_1.assert)(!viteEnv);
-    return !!configGlobal.build?.ssr;
 }
 function getBuildSsrValue(buildSsr) {
     if (buildSsr === undefined)
         return null;
+    (0, assert_js_1.assert)(typeof buildSsr === 'boolean' || typeof buildSsr === 'string');
     return !!buildSsr;
 }
 function isViteServerSide(configGlobal, viteEnv) {
     return isViteServerSide_impl(configGlobal, viteEnv);
 }
-function isViteServerSide_withoutEnv(configGlobal, viteEnv) {
+function isViteServerSide_viteEnvOptional(configGlobal, viteEnv) {
     return isViteServerSide_impl(configGlobal, viteEnv);
 }
 function isViteClientSide(configGlobal, viteEnv) {
@@ -63,37 +52,17 @@ function isViteServerSide_onlySsrEnv(configGlobal, viteEnv) {
     return viteEnv.name ? viteEnv.name === 'ssr' : isViteServerSide(configGlobal, viteEnv);
 }
 // Vite is quite messy about setting config.build.ssr — for security purposes, we use an extra safe implementation with lots of assertions, which is needed for the .client.js and .server.js guarantee.
-function isViteServerSide_extraSafe(config, options, viteEnv) {
+function isViteServerSide_extraSafe(config, viteEnv, options) {
     const isServerSide = isViteServerSide(config, viteEnv);
     const debug = {
+        isServerSide,
         configCommand: config.command,
-        configBuildSsr: config.build.ssr,
+        configBuildSsr: getBuildSsrValue(config.build.ssr),
         optionsIsUndefined: options === undefined,
-        optionsSsr: options?.ssr,
-        isServerSide,
+        optionsSsr: options?.ssr ?? null,
     };
-    if (true) {
-        const res = options?.ssr;
-        if (typeof res === 'boolean') {
-            (0, assert_js_1.assert)(res === isServerSide, debug);
-            return res;
-        }
-        return isServerSide;
-    }
-    if (config.command === 'build') {
-        const res = config.build.ssr;
-        (0, assert_js_1.assert)(typeof res === 'boolean', debug);
-        (0, assert_js_1.assert)(res === options?.ssr || options?.ssr === undefined, debug);
-        (0, assert_js_1.assert)(res === isServerSide, debug);
-        return res;
-    }
-    else {
-        const res = options?.ssr;
-        (0, assert_js_1.assert)(typeof res === 'boolean', debug);
-        /* This assertion can fail, seems to be a Vite bug? It's very unexpected.
-        if (typeof config.build.ssr === 'boolean') assert(res === config.build.ssr)
-        */
-        (0, assert_js_1.assert)(res === isServerSide, debug);
-        return res;
-    }
+    (0, assert_js_1.assert)(options, debug);
+    (0, assert_js_1.assert)(typeof options.ssr === 'boolean', debug);
+    (0, assert_js_1.assert)(options.ssr === isServerSide, debug);
+    return isServerSide;
 }