vike 0.4.237-commit-2c1db32 → 0.4.237-commit-cc7f0f6

package/dist/cjs/node/runtime/globalContext.js

@@ -420,13 +420,18 @@ async function updateUserFiles() {
 async function createGlobalContext(virtualFileExportsGlobalEntry) {
     debug('createGlobalContext()');
     (0, utils_js_1.assert)(!(0, getVikeConfigError_js_1.getVikeConfigErrorBuild)());
-    const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExportsGlobalEntry, globalObject, addGlobalContext, addGlobalContextTmp, addGlobalContextAsync);
+    const globalContextPromise = (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExportsGlobalEntry, globalObject, addGlobalContext, addGlobalContextTmp, addGlobalContextAsync);
+    debug('createGlobalContext() - done [sync]');
+    // We define an early globalContext version synchronously, so that getGlobalContextSync() can be called early.
+    // - Required by vike-vercel
+    (0, utils_js_1.assert)(globalObject.globalContext);
+    const globalContext = await globalContextPromise;
     (0, assertV1Design_js_1.assertV1Design)(
     // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);
     assertGlobalContextIsDefined();
     (0, utils_js_1.onSetupRuntime)();
-    debug('createGlobalContext() - done');
+    debug('createGlobalContext() - done [async]');
     // Never actually used, only used for TypeScript `ReturnType<typeof createGlobalContext>`
     return globalContext;
 }

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

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (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");
@@ -135,12 +134,12 @@ async function triggerPrerendering(config, viteEnv, bundle) {
     //  - Issue & reproduction: https://github.com/vikejs/vike/issues/1154#issuecomment-1965954636
     if (!bundle[(0, getManifestFilePathRelative_js_1.getManifestFilePathRelative)(config.build.manifest)])
         return;
+    if (!(0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig))
+        return;
     const configInline = getFullBuildInlineConfig(config);
-    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)());
-    }
+    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)();

package/dist/cjs/shared/createGlobalContextShared.js

@@ -10,12 +10,13 @@ const prepareGlobalContextForPublicUsage_js_1 = require("./prepareGlobalContextF
 const getHook_js_1 = require("./hooks/getHook.js");
 const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 exports.getGlobalContextSyncErrMsg = getGlobalContextSyncErrMsg;
-const globalObject_ = (0, utils_js_1.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 } = (0, utils_js_1.genPromise)({
         // Avoid this Cloudflare Worker error:
         // ```console
@@ -23,8 +24,11 @@ addGlobalContextTmp, addGlobalContextAsync) {
         // ```
         timeout: null,
     });
-    globalObject_.previousCallPromise = promise;
-    await previousCallPromise;
+    globalObject.previousCallPromise = promise;
+    if (previousCallPromise) {
+        (0, utils_js_1.assert)(globalObject.globalContext);
+        await previousCallPromise;
+    }
     const globalContext = createGlobalContextBase(virtualFileExportsGlobalEntry);
     let isNewGlobalContext;
     if (!globalObject.globalContext) {

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-2c1db32';
+exports.PROJECT_VERSION = '0.4.237-commit-cc7f0f6';

package/dist/esm/node/runtime/globalContext.js

@@ -416,13 +416,18 @@ async function updateUserFiles() {
 async function createGlobalContext(virtualFileExportsGlobalEntry) {
     debug('createGlobalContext()');
     assert(!getVikeConfigErrorBuild());
-    const globalContext = await createGlobalContextShared(virtualFileExportsGlobalEntry, globalObject, addGlobalContext, addGlobalContextTmp, addGlobalContextAsync);
+    const globalContextPromise = createGlobalContextShared(virtualFileExportsGlobalEntry, globalObject, addGlobalContext, addGlobalContextTmp, addGlobalContextAsync);
+    debug('createGlobalContext() - done [sync]');
+    // We define an early globalContext version synchronously, so that getGlobalContextSync() can be called early.
+    // - Required by vike-vercel
+    assert(globalObject.globalContext);
+    const globalContext = await globalContextPromise;
     assertV1Design(
     // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);
     assertGlobalContextIsDefined();
     onSetupRuntime();
-    debug('createGlobalContext() - done');
+    debug('createGlobalContext() - done [async]');
     // Never actually used, only used for TypeScript `ReturnType<typeof createGlobalContext>`
     return globalContext;
 }

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

@@ -1,5 +1,3 @@
 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,5 +1,4 @@
 export { pluginBuildApp };
-export { isPrerenderForceExit };
 import { runPrerender_forceExit } from '../../../prerender/runPrerenderEntry.js';
 import { resolveOutDir } from '../../shared/getOutDirs.js';
 import { assert, assertWarning, getGlobalObject, onSetupBuild } from '../../utils.js';
@@ -130,12 +129,12 @@ async function triggerPrerendering(config, viteEnv, bundle) {
     //  - Issue & reproduction: https://github.com/vikejs/vike/issues/1154#issuecomment-1965954636
     if (!bundle[getManifestFilePathRelative(config.build.manifest)])
         return;
+    if (!isPrerenderAutoRunEnabled(vikeConfig))
+        return;
     const configInline = getFullBuildInlineConfig(config);
-    if (isPrerenderAutoRunEnabled(vikeConfig)) {
-        const res = await runPrerenderFromAutoRun(configInline);
-        globalObject.forceExit = res.forceExit;
-        assert(wasPrerenderRun());
-    }
+    const res = await runPrerenderFromAutoRun(configInline);
+    globalObject.forceExit = res.forceExit;
+    assert(wasPrerenderRun());
 }
 async function abortViteBuildSsr() {
     const vikeConfig = await getVikeConfigInternal();

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/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.237-commit-2c1db32";
+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-2c1db32';
+export const PROJECT_VERSION = '0.4.237-commit-cc7f0f6';

package/package.json

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