vike 0.4.237-commit-2d6f480 → 0.4.237-commit-cc7f0f6

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/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

@@ -2,7 +2,7 @@ export { getOutDirs };
 export { resolveOutDir };
 export type { OutDirs };
 import type { UserConfig, ResolvedConfig } from 'vite';
-import { ViteEnv } from './isViteServerSide.js';
+import { type ViteEnv } from './isViteServerSide.js';
 type OutDirs = {
     /** Absolute path to `outDir` */
     outDirRoot: string;

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

@@ -2,7 +2,7 @@ export { getOutDirs };
 export { resolveOutDir };
 import pc from '@brillout/picocolors';
 import { assert, assertPosixPath, assertUsage, createDebugger, pathJoin, toPosixPath } from '../utils.js';
-import { 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);
@@ -16,13 +16,9 @@ function getOutDirs(configGlobal, viteEnv) {
 }
 /** 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');
@@ -107,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;

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/shared/createGlobalContextShared.d.ts

@@ -12,6 +12,7 @@ declare const getGlobalContextSyncErrMsg = "The global context isn't set yet, ca
 declare function createGlobalContextShared<GlobalContextAdded extends Record<string, any>, GlobalContextAddedAsync extends Record<string, any>>(virtualFileExportsGlobalEntry: unknown, globalObject: {
     globalContext?: Record<string, unknown>;
     onCreateGlobalContextHooks?: Hook[];
+    previousCallPromise?: Promise<void>;
 }, addGlobalContext?: (globalContext: GlobalContextBase) => GlobalContextAdded, addGlobalContextTmp?: (globalContext: GlobalContextBase) => Promise<GlobalContextAdded>, addGlobalContextAsync?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddedAsync>): Promise<{
     /**
      * Useful for distinguishing `globalContext` from other objects and narrowing down TypeScript unions.

package/dist/esm/shared/createGlobalContextShared.js

@@ -1,18 +1,19 @@
 export { createGlobalContextShared };
 export { getGlobalContextSyncErrMsg };
-import { changeEnumerable, genPromise, getGlobalObject, objectAssign, objectReplace, unique } from './utils.js';
+import { assert, changeEnumerable, genPromise, objectAssign, objectReplace, unique } from './utils.js';
 import { parseVirtualFileExportsGlobalEntry } from './getPageFiles/parseVirtualFileExportsGlobalEntry.js';
 import { resolveVikeConfigPublicGlobal, resolveVikeConfigPublicPageEagerLoaded, } from './page-configs/resolveVikeConfigPublic.js';
 import { execHookGlobal } from './hooks/execHook.js';
 import { prepareGlobalContextForPublicUsage } from './prepareGlobalContextForPublicUsage.js';
 import { getHookFromPageConfigGlobalCumulative } from './hooks/getHook.js';
 const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
-const globalObject_ = getGlobalObject('shared/createGlobalContextShared.ts', {});
 // TO-DO/eventually use flat globalContext — like flat pageContext
-async function createGlobalContextShared(virtualFileExportsGlobalEntry, globalObject, addGlobalContext, 
+async function createGlobalContextShared(virtualFileExportsGlobalEntry, 
+// TODO/now rename previousCallPromise to previousCreateGlobalContextPromise
+globalObject, addGlobalContext, 
 // TO-DO/next-major-release: we'll be able to remove addGlobalContextTmp after loadPageRoutes() is sync (it will be sync after we remove the old design)
 addGlobalContextTmp, addGlobalContextAsync) {
-    const { previousCallPromise } = globalObject_;
+    const { previousCallPromise } = globalObject;
     const { promise, resolve } = genPromise({
         // Avoid this Cloudflare Worker error:
         // ```console
@@ -20,8 +21,11 @@ addGlobalContextTmp, addGlobalContextAsync) {
         // ```
         timeout: null,
     });
-    globalObject_.previousCallPromise = promise;
-    await previousCallPromise;
+    globalObject.previousCallPromise = promise;
+    if (previousCallPromise) {
+        assert(globalObject.globalContext);
+        await previousCallPromise;
+    }
     const globalContext = createGlobalContextBase(virtualFileExportsGlobalEntry);
     let isNewGlobalContext;
     if (!globalObject.globalContext) {

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-2d6f480";
+export declare const PROJECT_VERSION: "0.4.237-commit-cc7f0f6";

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-2d6f480';
+export const PROJECT_VERSION = '0.4.237-commit-cc7f0f6';

package/package.json

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