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

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.237-commit-fd8294f';
+exports.PROJECT_VERSION = '0.4.237-commit-2c1db32';

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

@@ -8,11 +8,11 @@ import { createBuilder } from 'vite';
  */
 async function build(options = {}) {
     const { viteConfigFromUserEnhanced } = await prepareViteApiCall(options, 'build');
-    // Pass it to pluginAutoFullBuild()
+    // Pass it to vike:build:pluginBuildApp
     if (viteConfigFromUserEnhanced)
         viteConfigFromUserEnhanced._viteConfigFromUserEnhanced = viteConfigFromUserEnhanced;
     const builder = await 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/esm/node/api/prepareViteApiCall.d.ts

@@ -4,9 +4,7 @@ export { assertViteRoot };
 export { normalizeViteRoot };
 import type { InlineConfig, ResolvedConfig } from 'vite';
 import type { APIOptions, Operation } from './types.js';
-import { type VikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js';
 declare function prepareViteApiCall(options: APIOptions, operation: Operation): Promise<{
-    vikeConfig: VikeConfigInternal;
     viteConfigResolved: ResolvedConfig;
     viteConfigFromUserEnhanced: InlineConfig | undefined;
 }>;

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

@@ -33,7 +33,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/esm/node/prerender/runPrerenderEntry.js

@@ -33,7 +33,7 @@ async function runPrerenderFromAutoRun(viteConfig) {
         await 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);
         logErrorHint(err);
         process.exit(1);

package/dist/esm/node/vite/plugins/pluginBuild/handleAssetsManifest.d.ts

@@ -3,12 +3,12 @@ export { handleAssetsManifest_getBuildConfig };
 export { handleAssetsManifest_isFixEnabled };
 export { handleAssetsManifest_assertUsageCssCodeSplit };
 export { handleAssetsManifest_assertUsageCssTarget };
-import type { Environment, ResolvedConfig, Rollup, UserConfig } from 'vite';
+import type { Environment, ResolvedConfig, Rollup } from 'vite';
 type Bundle = Rollup.OutputBundle;
-declare function handleAssetsManifest_isFixEnabled(config: ResolvedConfig | UserConfig): boolean;
+declare function handleAssetsManifest_isFixEnabled(): boolean;
 declare function handleAssetsManifest_assertUsageCssCodeSplit(config: ResolvedConfig): void;
 declare function handleAssetsManifest_assertUsageCssTarget(config: ResolvedConfig, env: Environment): void;
-declare function handleAssetsManifest_getBuildConfig(config: UserConfig): Promise<{
+declare function handleAssetsManifest_getBuildConfig(): Promise<{
     readonly ssrEmitAssets: true | undefined;
     readonly cssMinify: "esbuild" | undefined;
     readonly manifest: true;

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

@@ -21,7 +21,7 @@ const globalObject = getGlobalObject('build/handleAssetsManifest.ts', {
 });
 // 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 isV1Design();
 }
@@ -212,13 +212,13 @@ function getHash(src) {
 }
 // https://github.com/vikejs/vike/issues/1993
 function handleAssetsManifest_assertUsageCssCodeSplit(config) {
-    if (!handleAssetsManifest_isFixEnabled(config))
+    if (!handleAssetsManifest_isFixEnabled())
         return;
     assertWarning(config.build.cssCodeSplit, `${pc.cyan('build.cssCodeSplit')} shouldn't be set to ${pc.cyan('false')} (https://github.com/vikejs/vike/issues/1993)`, { onlyOnce: true });
 }
 const targets = [];
 function handleAssetsManifest_assertUsageCssTarget(config, env) {
-    if (!handleAssetsManifest_isFixEnabled(config))
+    if (!handleAssetsManifest_isFixEnabled())
         return;
     const isServerSide = isViteServerSide(config, env);
     assert(typeof isServerSide === 'boolean');
@@ -279,8 +279,8 @@ async function writeManifestFile(manifest, manifestFilePath) {
     const manifestFileContent = JSON.stringify(manifest, null, 2);
     await fs.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,
@@ -288,7 +288,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),
         */
     };
 }
@@ -313,7 +313,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/esm/node/vite/plugins/pluginBuild/pluginBuildApp.d.ts

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

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

@@ -1,9 +1,23 @@
 export { pluginBuildApp };
+export { isPrerenderForceExit };
 import { runPrerender_forceExit } from '../../../prerender/runPrerenderEntry.js';
 import { resolveOutDir } from '../../shared/getOutDirs.js';
-import { assert } from '../../utils.js';
-import { isPrerenderForceExit } from './pluginAutoFullBuild.js';
+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/pluginBuildApp.ts', {
+    forceExit: false,
+});
 function pluginBuildApp() {
+    let config;
     return [
         {
             name: 'vike:build:pluginBuildApp:pre',
@@ -55,5 +69,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 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);
+                        logErrorHint(err);
+                        process.exit(1);
+                    }
+                },
+            },
+        },
+        {
+            name: 'vike:build:pluginBuildApp:autoFullBuild: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 triggerPrerendering(config, viteEnv, bundle) {
+    const vikeConfig = await getVikeConfigInternal();
+    if (!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[getManifestFilePathRelative(config.build.manifest)])
+        return;
+    const configInline = getFullBuildInlineConfig(config);
+    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 isDisabled(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,
+            },
+        };
+    }
+}

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

@@ -9,13 +9,11 @@ import { extractAssetsAddQuery } from '../../../shared/extractAssetsQuery.js';
 import { prependEntriesDir } from '../../../shared/prependEntriesDir.js';
 import { getFilePathResolved } from '../../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../../shared/page-configs/getConfigValueBuildTime.js';
-import { isViteServerSide_withoutEnv } from '../../shared/isViteServerSide.js';
-import { resolveOutDir_configEnvironment } from '../../shared/getOutDirs.js';
+import { isViteServerSide_viteEnvOptional } from '../../shared/isViteServerSide.js';
 import { handleAssetsManifest_assertUsageCssCodeSplit, handleAssetsManifest_getBuildConfig, } from './handleAssetsManifest.js';
 import { resolveIncludeAssetsImportedByServer } from '../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js';
 function pluginBuildConfig() {
     let config;
-    let configUnresolved;
     return [
         {
             name: 'vike:build:pluginBuildConfig',
@@ -34,23 +32,11 @@ function pluginBuildConfig() {
                     handleAssetsManifest_assertUsageCssCodeSplit(config);
                 },
             },
-            configEnvironment: {
-                order: 'post',
-                async handler(envName, configEnv) {
-                    assert(configUnresolved);
-                    return {
-                        build: {
-                            outDir: resolveOutDir_configEnvironment(configUnresolved, envName, configEnv),
-                        },
-                    };
-                },
-            },
             config: {
                 order: 'post',
-                async handler(config) {
-                    configUnresolved = config;
+                async handler() {
                     onSetupBuild();
-                    const build = await handleAssetsManifest_getBuildConfig(config);
+                    const build = await handleAssetsManifest_getBuildConfig();
                     return { build };
                 },
             },
@@ -66,7 +52,7 @@ async function getEntries(config) {
     // TO-DO/next-major-release: remove
     const pageFileEntries = await getPageFileEntries(config, resolveIncludeAssetsImportedByServer(vikeConfig.config));
     assertUsage(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
-    if (isViteServerSide_withoutEnv(config)) {
+    if (isViteServerSide_viteEnvOptional(config)) {
         const pageEntries = getPageEntries(pageConfigs);
         const entries = {
             ...pageFileEntries,
@@ -139,7 +125,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 = !isViteServerSide_withoutEnv(config);
+    const isForClientSide = !isViteServerSide_viteEnvOptional(config);
     const fileTypes = isForClientSide ? ['.page', '.page.client'] : ['.page', '.page.server'];
     if (isForClientSide && includeAssetsImportedByServer) {
         fileTypes.push('.page.server');

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

@@ -16,7 +16,7 @@ function pluginModuleBanner() {
         transform: {
             order: 'post',
             handler(code, id, options) {
-                if (!isViteServerSide_extraSafe(config, options, this.environment) &&
+                if (!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/esm/node/vite/plugins/pluginBuild.js

@@ -3,7 +3,6 @@ import { pluginBuildApp } from './pluginBuild/pluginBuildApp.js';
 import { pluginDistPackageJsonFile } from './pluginBuild/pluginDistPackageJsonFile.js';
 import { pluginSuppressRollupWarning } from './pluginBuild/pluginSuppressRollupWarning.js';
 import { pluginDistFileNames } from './pluginBuild/pluginDistFileNames.js';
-import { pluginAutoFullBuild } from './pluginBuild/pluginAutoFullBuild.js';
 import { pluginBuildEntry } from './pluginBuild/pluginBuildEntry.js';
 import { pluginBuildConfig } from './pluginBuild/pluginBuildConfig.js';
 import { pluginModuleBanner } from './pluginBuild/pluginModuleBanner.js';
@@ -11,7 +10,6 @@ function pluginBuild() {
     return [
         ...pluginBuildConfig(),
         ...pluginBuildApp(),
-        ...pluginAutoFullBuild(),
         ...pluginBuildEntry(),
         pluginDistPackageJsonFile(),
         pluginSuppressRollupWarning(),

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

@@ -36,7 +36,7 @@ function pluginEnvVars() {
             if (!code.includes('import.meta.env.'))
                 return;
             const isBuild = config.command === 'build';
-            const isClientSide = !isViteServerSide_extraSafe(config, options, this.environment);
+            const isClientSide = !isViteServerSide_extraSafe(config, this.environment, options);
             const { magicString, getMagicStringResult } = getMagicString(code, id);
             // Find & check
             const replacements = Object.entries(envsAll)

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

@@ -45,7 +45,7 @@ function pluginExtractAssets() {
                 }
                 const includeAssetsImportedByServer = resolveIncludeAssetsImportedByServer(vikeConfig.config);
                 assert(includeAssetsImportedByServer);
-                assert(!isViteServerSide_extraSafe(config, options, this.environment));
+                assert(!isViteServerSide_extraSafe(config, this.environment, options));
                 const importStatements = await getImportStatements(src);
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
@@ -62,7 +62,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 (isViteServerSide_extraSafe(config, options, this.environment)) {
+                if (isViteServerSide_extraSafe(config, this.environment, options)) {
                     // When building for the server, there should never be a `?extractAssets` query
                     assert(!extractAssetsRE.test(source));
                     assert(importer === undefined || !extractAssetsRE.test(importer));
@@ -139,7 +139,7 @@ function pluginExtractAssets() {
             async configResolved(config_) {
                 config = config_;
                 vikeConfig = await getVikeConfigInternal();
-                isFixEnabled = handleAssetsManifest_isFixEnabled(config);
+                isFixEnabled = handleAssetsManifest_isFixEnabled();
                 if (!isFixEnabled) {
                     // https://github.com/vikejs/vike/issues/1060
                     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/esm/node/vite/plugins/pluginExtractExportNames.js

@@ -16,7 +16,7 @@ function pluginExtractExportNames() {
         enforce: 'post',
         async transform(src, id, options) {
             id = normalizeId(id);
-            const isClientSide = !isViteServerSide_extraSafe(config, options, this.environment);
+            const isClientSide = !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/esm/node/vite/plugins/pluginFileEnv.js

@@ -29,7 +29,7 @@ function pluginFileEnv() {
             const importers = Array.from(moduleInfo.importers)
                 .map((m) => m.id)
                 .filter((id) => id !== null);
-            assertFileEnv(id, isViteServerSide_extraSafe(config, options, this.environment), importers, 
+            assertFileEnv(id, 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);
         },
@@ -41,7 +41,7 @@ function pluginFileEnv() {
                 return;
             if (skip(id))
                 return;
-            const isServerSide = isViteServerSide_extraSafe(config, options, this.environment);
+            const isServerSide = isViteServerSide_extraSafe(config, this.environment, options);
             if (!isWrongEnv(id, isServerSide))
                 return;
             const { importers } = this.getModuleInfo(id);

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

@@ -1,34 +1,24 @@
 export { pluginPreview };
-import { assertUsage, applyPreview, assert } from '../utils.js';
+import { assertUsage, applyPreview } from '../utils.js';
 import fs from 'node:fs';
 import path from 'node:path';
 import { addSsrMiddleware } from '../shared/addSsrMiddleware.js';
 import pc from '@brillout/picocolors';
 import { logDockerHint } from './pluginDev.js';
-import { getOutDirs, resolveOutDir_configEnvironment } from '../shared/getOutDirs.js';
+import { getOutDirs } from '../shared/getOutDirs.js';
 import sirv from 'sirv';
 import { getVikeConfigInternal } from '../shared/resolveVikeConfigInternal.js';
 function pluginPreview() {
     let config;
-    let configUnresolved;
     let vikeConfig;
     return {
         name: 'vike:pluginPreview',
         apply: applyPreview,
-        config(config) {
-            configUnresolved = config;
+        config() {
             return {
                 appType: 'custom',
             };
         },
-        configEnvironment(envName, configEnv) {
-            assert(configUnresolved);
-            return {
-                build: {
-                    outDir: resolveOutDir_configEnvironment(configUnresolved, envName, configEnv),
-                },
-            };
-        },
         async configResolved(config_) {
             config = config_;
             vikeConfig = await getVikeConfigInternal();

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

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

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

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

package/dist/esm/node/vite/plugins/pluginVirtualFiles/generateVirtualFilePageEntry.d.ts

@@ -1,3 +1,2 @@
 export { generateVirtualFilePageEntry };
-import type { ResolvedConfig } from 'vite';
-declare function generateVirtualFilePageEntry(id: string, isDev: boolean, config: ResolvedConfig): Promise<string>;
+declare function generateVirtualFilePageEntry(id: string, isDev: boolean): Promise<string>;

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

@@ -8,7 +8,7 @@ import { serializeConfigValues } from '../../../../shared/page-configs/serialize
 import { handleAssetsManifest_isFixEnabled } from '../pluginBuild/handleAssetsManifest.js';
 import { getConfigValueBuildTime } from '../../../../shared/page-configs/getConfigValueBuildTime.js';
 import { resolveIncludeAssetsImportedByServer } from '../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js';
-async function generateVirtualFilePageEntry(id, isDev, config) {
+async function generateVirtualFilePageEntry(id, isDev) {
     const result = parseVirtualFileId(id);
     assert(result && result.type === 'page-entry');
     /* This assertion fails when using includeAssetsImportedByServer
@@ -32,11 +32,11 @@ async function generateVirtualFilePageEntry(id, isDev, config) {
             throw getProjectError('Outdated request');
         //*/
     }
-    const code = getCode(pageConfig, isForClientSide, pageId, resolveIncludeAssetsImportedByServer(vikeConfig.config), config, isDev);
+    const code = getCode(pageConfig, isForClientSide, pageId, resolveIncludeAssetsImportedByServer(vikeConfig.config), isDev);
     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();
@@ -44,7 +44,7 @@ function getCode(pageConfig, isForClientSide, pageId, includeAssetsImportedBySer
     lines.push('export const configValuesSerialized = {');
     lines.push(...serializeConfigValues(pageConfig, importStatements, filesEnv, { isForClientSide, isClientRouting, isDev }, '', false));
     lines.push('};');
-    if (!handleAssetsManifest_isFixEnabled(config) && includeAssetsImportedByServer && isForClientSide && !isDev) {
+    if (!handleAssetsManifest_isFixEnabled() && includeAssetsImportedByServer && isForClientSide && !isDev) {
         importStatements.push(`import '${extractAssetsAddQuery(generateVirtualFileId({ type: 'page-entry', pageId, isForClientSide: false }))}'`);
     }
     const code = [...importStatements, ...lines].join('\n');

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

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

package/dist/esm/node/vite/shared/getOutDirs.d.ts

@@ -1,9 +1,8 @@
 export { getOutDirs };
 export { resolveOutDir };
-export { resolveOutDir_configEnvironment };
 export type { OutDirs };
-import type { UserConfig, ResolvedConfig, EnvironmentOptions } from 'vite';
-import { ViteEnv } from './isViteServerSide.js';
+import type { UserConfig, ResolvedConfig } from 'vite';
+import { type ViteEnv } from './isViteServerSide.js';
 type OutDirs = {
     /** Absolute path to `outDir` */
     outDirRoot: string;
@@ -13,6 +12,5 @@ type OutDirs = {
     outDirServer: string;
 };
 declare function getOutDirs(configGlobal: ResolvedConfig, viteEnv: ViteEnv | undefined): OutDirs;
-declare function resolveOutDir_configEnvironment(configGlobal: UserConfig, envName: string, configEnv: EnvironmentOptions): string;
 /** Appends `client/` or `server/` to `config.build.outDir` */
 declare function resolveOutDir(config: UserConfig, isServerSide: boolean): string;

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

@@ -1,9 +1,8 @@
 export { getOutDirs };
 export { resolveOutDir };
-export { resolveOutDir_configEnvironment };
 import pc from '@brillout/picocolors';
 import { assert, assertPosixPath, assertUsage, createDebugger, pathJoin, toPosixPath } from '../utils.js';
-import { isViteServerSide, isViteServerSide_withoutEnv } from './isViteServerSide.js';
+import { isViteServerSide_viteEnvOptional } from './isViteServerSide.js';
 const debug = createDebugger('vike:outDir');
 function getOutDirs(configGlobal, viteEnv) {
     debug('getOutDirs()', new Error().stack);
@@ -15,21 +14,11 @@ function getOutDirs(configGlobal, viteEnv) {
     assertNormalization(outDirs.outDirServer);
     return outDirs;
 }
-function resolveOutDir_configEnvironment(configGlobal, envName, configEnv) {
-    assert(configGlobal && envName && configEnv);
-    const viteEnv = { name: envName, config: configEnv };
-    const isServerSide = 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');
@@ -114,7 +103,7 @@ function assertOutDirResolved(outDir, configGlobal, viteEnv) {
     assert('/client'.length === '/server'.length);
     const outDirCorrected = outDir.slice(0, -1 * '/client'.length);
     const wrongUsage = `You've set Vite's config.build.outDir to ${pc.cyan(outDir)} but you should set it to ${pc.cyan(outDirCorrected)} instead.`;
-    const isServerSide = isViteServerSide_withoutEnv(configGlobal, viteEnv);
+    const isServerSide = isViteServerSide_viteEnvOptional(configGlobal, viteEnv);
     if (isServerSide) {
         assertUsage(outDir.endsWith('/server'), wrongUsage);
     }

package/dist/esm/node/vite/shared/isViteServerSide.d.ts

@@ -1,6 +1,6 @@
 export { isViteServerSide };
 export { isViteClientSide };
-export { isViteServerSide_withoutEnv };
+export { isViteServerSide_viteEnvOptional };
 export { isViteServerSide_onlySsrEnv };
 export { isViteServerSide_extraSafe };
 export type { ViteEnv };
@@ -10,9 +10,9 @@ type ViteEnv = {
     config: EnvironmentOptions | Environment['config'];
 };
 declare function isViteServerSide(configGlobal: ResolvedConfig | UserConfig, viteEnv: ViteEnv): boolean;
-declare function isViteServerSide_withoutEnv(configGlobal: ResolvedConfig | UserConfig, viteEnv?: ViteEnv | undefined): boolean;
+declare function isViteServerSide_viteEnvOptional(configGlobal: ResolvedConfig | UserConfig, viteEnv?: ViteEnv | undefined): boolean;
 declare function isViteClientSide(configGlobal: ResolvedConfig, viteEnv: ViteEnv): boolean;
 declare function isViteServerSide_onlySsrEnv(configGlobal: ResolvedConfig, viteEnv: ViteEnv): boolean;
-declare function isViteServerSide_extraSafe(config: ResolvedConfig, options: {
+declare function isViteServerSide_extraSafe(config: ResolvedConfig, viteEnv: ViteEnv, options: {
     ssr?: boolean;
-} | undefined, viteEnv: ViteEnv): boolean;
+} | undefined): boolean;