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

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

@@ -1,56 +1,45 @@
 export { isViteServerSide };
 export { isViteClientSide };
-export { isViteServerSide_withoutEnv };
+export { isViteServerSide_viteEnvOptional };
 export { isViteServerSide_onlySsrEnv };
 export { isViteServerSide_extraSafe };
 import { assert } from '../../../utils/assert.js';
 function isViteServerSide_impl(configGlobal, viteEnv) {
     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);
+        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;
+        assert(isServerSide === isServerSide1 || isServerSide1 === null, debug);
+        assert(isServerSide === isServerSide2 || isServerSide2 === null, debug);
+        assert(isServerSide === isServerSide3 || isServerSide3 === null, debug);
+        assert(isServerSide !== null);
+        return isServerSide;
     }
-    assert(!viteEnv);
-    return !!configGlobal.build?.ssr;
 }
 function getBuildSsrValue(buildSsr) {
     if (buildSsr === undefined)
         return null;
+    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) {
@@ -61,37 +50,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') {
-            assert(res === isServerSide, debug);
-            return res;
-        }
-        return isServerSide;
-    }
-    if (config.command === 'build') {
-        const res = config.build.ssr;
-        assert(typeof res === 'boolean', debug);
-        assert(res === options?.ssr || options?.ssr === undefined, debug);
-        assert(res === isServerSide, debug);
-        return res;
-    }
-    else {
-        const res = options?.ssr;
-        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)
-        */
-        assert(res === isServerSide, debug);
-        return res;
-    }
+    assert(options, debug);
+    assert(typeof options.ssr === 'boolean', debug);
+    assert(options.ssr === isServerSide, debug);
+    return isServerSide;
 }

package/dist/esm/types/Config.d.ts

@@ -403,9 +403,7 @@ type ConfigBuiltIn = {
     includeAssetsImportedByServer?: boolean;
     /** @deprecated See https://vike.dev/disableAutoFullBuild */
     disableAutoFullBuild?: boolean | 'prerender';
-    /**
-     * @deprecated It's value is now always true.
-     */
+    /** @deprecated It's value is now always true. */
     vite6BuilderApp?: true;
     /** The Base URL of your server.
      *

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.237-commit-fd8294f";
+export declare const PROJECT_VERSION: "0.4.237-commit-2c1db32";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.237-commit-fd8294f';
+export const PROJECT_VERSION = '0.4.237-commit-2c1db32';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.237-commit-fd8294f",
+  "version": "0.4.237-commit-2c1db32",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {

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

@@ -1,132 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pluginAutoFullBuild = pluginAutoFullBuild;
-exports.isPrerenderForceExit = isPrerenderForceExit;
-const utils_js_1 = require("../../utils.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_1 = require("../../../prerender/runPrerenderEntry.js");
-const getManifestFilePathRelative_js_1 = require("../../shared/getManifestFilePathRelative.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('build/pluginAutoFullBuild.ts', {
-    forceExit: false,
-});
-function pluginAutoFullBuild() {
-    let config;
-    return [
-        {
-            name: 'vike:build:pluginAutoFullBuild',
-            apply: 'build',
-            enforce: 'pre',
-            async configResolved(config_) {
-                config = config_;
-                await abortViteBuildSsr();
-            },
-            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 triggerFullBuild(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: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);
-                    }
-                },
-            },
-        },
-        {
-            name: 'vike:build:pluginAutoFullBuild: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 triggerFullBuild(config, viteEnv, bundle) {
-    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
-    // Whether builder.buildApp() is being used, see plugin:build:pluginBuildApp
-    // If builder.buildApp() => trigger at end of `this.environment.name === 'ssr'`.
-    // Else => trigger at end of client-side build.
-    if (!(0, isViteServerSide_js_1.isViteServerSide_onlySsrEnv)(config, viteEnv))
-        return;
-    if (isEntirelyDisabled(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);
-    /* Already triggered by vike:build:pluginBuildApp
-    await build(setSSR(configInline))
-    */
-    if ((0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig)) {
-        const res = await (0, runPrerenderEntry_js_1.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 isEntirelyDisabled(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/esm/node/vite/plugins/pluginBuild/pluginAutoFullBuild.d.ts

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

package/dist/esm/node/vite/plugins/pluginBuild/pluginAutoFullBuild.js

@@ -1,127 +0,0 @@
-export { pluginAutoFullBuild };
-export { isPrerenderForceExit };
-import { assert, assertWarning, getGlobalObject, onSetupBuild } from '../../utils.js';
-import { isPrerenderAutoRunEnabled, wasPrerenderRun } from '../../../prerender/context.js';
-import { isViteCliCall, getViteConfigFromCli } from '../../shared/isViteCliCall.js';
-import pc from '@brillout/picocolors';
-import { logErrorHint } from '../../../runtime/renderPage/logErrorHint.js';
-import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
-import { isVikeCliOrApi } from '../../../api/context.js';
-import { handleAssetsManifest, handleAssetsManifest_assertUsageCssTarget } from './handleAssetsManifest.js';
-import { isViteServerSide_onlySsrEnv } from '../../shared/isViteServerSide.js';
-import { runPrerenderFromAutoRun } from '../../../prerender/runPrerenderEntry.js';
-import { getManifestFilePathRelative } from '../../shared/getManifestFilePathRelative.js';
-const globalObject = getGlobalObject('build/pluginAutoFullBuild.ts', {
-    forceExit: false,
-});
-function pluginAutoFullBuild() {
-    let config;
-    return [
-        {
-            name: 'vike:build:pluginAutoFullBuild',
-            apply: 'build',
-            enforce: 'pre',
-            async configResolved(config_) {
-                config = config_;
-                await abortViteBuildSsr();
-            },
-            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 handleAssetsManifest(config, this.environment, options, bundle);
-                        await triggerFullBuild(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:pluginAutoFullBuild], see for example https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
-                        console.error(err);
-                        logErrorHint(err);
-                        process.exit(1);
-                    }
-                },
-            },
-        },
-        {
-            name: 'vike:build:pluginAutoFullBuild:post',
-            apply: 'build',
-            enforce: 'post',
-            closeBundle: {
-                sequential: true,
-                order: 'post',
-                handler() {
-                    onSetupBuild();
-                    handleAssetsManifest_assertUsageCssTarget(config, this.environment);
-                    /* Let vike:build:pluginBuildApp force exit
-                    runPrerender_forceExit()
-                    */
-                },
-            },
-        },
-    ];
-}
-async function triggerFullBuild(config, viteEnv, bundle) {
-    const vikeConfig = await getVikeConfigInternal();
-    // Whether builder.buildApp() is being used, see plugin:build:pluginBuildApp
-    // If builder.buildApp() => trigger at end of `this.environment.name === 'ssr'`.
-    // Else => trigger at end of client-side build.
-    if (!isViteServerSide_onlySsrEnv(config, viteEnv))
-        return;
-    if (isEntirelyDisabled(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[getManifestFilePathRelative(config.build.manifest)])
-        return;
-    const configInline = getFullBuildInlineConfig(config);
-    /* Already triggered by vike:build:pluginBuildApp
-    await build(setSSR(configInline))
-    */
-    if (isPrerenderAutoRunEnabled(vikeConfig)) {
-        const res = await runPrerenderFromAutoRun(configInline);
-        globalObject.forceExit = res.forceExit;
-        assert(wasPrerenderRun());
-    }
-}
-async function abortViteBuildSsr() {
-    const vikeConfig = await getVikeConfigInternal();
-    if (vikeConfig.config.disableAutoFullBuild !== true && isViteCliCall() && getViteConfigFromCli()?.build.ssr) {
-        assertWarning(false, `The CLI call ${pc.cyan('$ vite build --ssr')} is superfluous since ${pc.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 ${pc.cyan('build()')} API.`, { onlyOnce: true });
-        process.exit(0);
-    }
-}
-function isEntirelyDisabled(vikeConfig) {
-    const { disableAutoFullBuild } = vikeConfig.config;
-    if (disableAutoFullBuild === undefined || disableAutoFullBuild === 'prerender') {
-        const isUserUsingViteApi = !isViteCliCall() && !isVikeCliOrApi();
-        return isUserUsingViteApi;
-    }
-    else {
-        return disableAutoFullBuild;
-    }
-}
-function isPrerenderForceExit() {
-    return globalObject.forceExit;
-}
-function getFullBuildInlineConfig(config) {
-    const configFromCli = !isViteCliCall() ? null : getViteConfigFromCli();
-    if (config._viteConfigFromUserEnhanced) {
-        return config._viteConfigFromUserEnhanced;
-    }
-    else {
-        return {
-            ...configFromCli,
-            configFile: configFromCli?.configFile || config.configFile,
-            root: config.root,
-            build: {
-                ...configFromCli?.build,
-            },
-        };
-    }
-}