vike 0.4.237-commit-cc7f0f6 → 0.4.237-commit-33e34e7

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

@@ -12,27 +12,21 @@ export { initGlobalContext_getPagesAndRoutes };
 export { setGlobalContext_viteDevServer };
 export { setGlobalContext_viteConfig };
 export { setGlobalContext_isPrerendering };
-export { setGlobalContext_isProduction };
-export { setGlobalContext_buildEntry }; // production entry
+export { setGlobalContext_isProductionAccordingToVite };
+export { setGlobalContext_prodBuildEntry }; // production entry
 export { clearGlobalContext };
 export { assertBuildInfo };
 export { updateUserFiles };
 export { vikeConfigErrorRecoverMsg };
-// TODO/now: use isProductionEnvironment() instead of globalObject.isProduction
-// TODO/now: rename:
-//  - isProduction => isProductionEnvironment
-//  - setIsProduction => setIsProductionEnvironment
-//  - setGlobalContext_isProduction => setGlobalContext_isProductionEnvironment
-//  - sProductionEnvironment => sDevEnv
 // The core logic revolves around:
 // - virtualFileExportsGlobalEntry is the main requirement
-// - In production: globalObject.buildEntry which is the production entry set by @brillout/vite-plugin-server-entry
-//   - loadBuildEntry() sets globalObject.buildEntry and then sets virtualFileExportsGlobalEntry
-//   - With vike-server it's set at server start: @brillout/vite-plugin-server-entry injects `import './entry.mjs'` (the production entry generated by @brillout/vite-plugin-server-entry) as first line of code of dist/server/index.mjs while dist/server/entry.mjs calls setGlobalContext_buildEntry()
+// - In production: globalObject.prodBuildEntry which is the production entry set by @brillout/vite-plugin-server-entry
+//   - loadProdBuildEntry() sets globalObject.prodBuildEntry and then sets virtualFileExportsGlobalEntry
+//   - With vike-server it's set at server start: @brillout/vite-plugin-server-entry injects `import './entry.mjs'` (the production entry generated by @brillout/vite-plugin-server-entry) as first line of code of dist/server/index.mjs while dist/server/entry.mjs calls setGlobalContext_prodBuildEntry()
 //   - Without vike-server it's manually loaded here using importServerProductionEntry() which uses @brillout/vite-plugin-server-entry's autoImporter or crawler
 // - In development: globalObject.viteDevServer which is Vite's development server
 //   - globalObject.viteDevServer is used by updateUserFiles() which then sets virtualFileExportsGlobalEntry
-import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectReplace, isObject, hasProp, getGlobalObject, genPromise, createDebugger, checkType, PROJECT_VERSION, getViteRPC, isRunnableDevEnvironment, assertIsNotBrowser, } from './utils.js';
+import { assert, onSetupRuntime, assertUsage, assertWarning, isPlainObject, objectReplace, isObject, hasProp, getGlobalObject, genPromise, createDebugger, checkType, PROJECT_VERSION, getViteRPC, isRunnableDevEnvironment, assertIsNotBrowser, isNonRunnableDev, } from './utils.js';
 import { importServerProductionEntry } from '@brillout/vite-plugin-server-entry/runtime';
 import { virtualFileIdGlobalEntryServer } from '../shared/virtualFileId.js';
 import pc from '@brillout/picocolors';
@@ -44,6 +38,7 @@ import { prepareGlobalContextForPublicUsage } from '../../shared/prepareGlobalCo
 import { logRuntimeError, logRuntimeInfo } from './loggerRuntime.js';
 import { getVikeConfigErrorBuild, setVikeConfigError } from '../shared/getVikeConfigError.js';
 import { hasAlreadyLogged } from './renderPage/isNewError.js';
+import { getVikeApiOperation } from '../api/context.js';
 const debug = createDebugger('vike:globalContext');
 const globalObject = getGlobalObject('runtime/globalContext.ts', getInitialGlobalObject());
 // Trick to break down TypeScript circular dependency
@@ -55,7 +50,7 @@ async function getGlobalContextServerInternal() {
     // getGlobalContextServerInternal() should always be called after initGlobalContext()
     assert(globalObject.isInitialized);
     assertGlobalContextIsDefined();
-    if (globalObject.isProduction !== true)
+    if (!isProd())
         await globalObject.waitForUserFilesUpdate;
     const { globalContext } = globalObjectTyped;
     assertIsDefined(globalContext);
@@ -80,10 +75,9 @@ function assertGlobalContextIsDefined() {
  */
 async function getGlobalContext() {
     debug('getGlobalContext()');
-    const { isProduction } = globalObject;
+    const isProduction = isProdOptional();
     // This assertion cannot fail for vike-server users (because when using vike-server it's guaranteed that globalObject.isProduction is set before executing any user-land code and any Vike extension code).
-    assertUsage(isProduction !== undefined, "The global context isn't set yet, use getGlobalContextAsync() instead.");
-    assert(typeof globalObject.isProduction === 'boolean');
+    assertUsage(isProduction !== null, "The global context isn't set yet, use getGlobalContextAsync() instead.");
     return await getGlobalContextAsync(isProduction);
 }
 /**
@@ -94,7 +88,7 @@ async function getGlobalContext() {
 async function getGlobalContextAsync(isProduction) {
     debug('getGlobalContextAsync()');
     assertUsage(typeof isProduction === 'boolean', `[getGlobalContextAsync(isProduction)] Argument ${pc.cyan('isProduction')} ${isProduction === undefined ? 'is missing' : `should be ${pc.cyan('true')} or ${pc.cyan('false')}`}`);
-    setIsProduction(isProduction);
+    globalObject.isProductionAccordingToUser = isProduction;
     if (!globalObject.globalContext)
         await initGlobalContext_getGlobalContextAsync();
     if (!isProduction)
@@ -111,9 +105,7 @@ function getGlobalContextSync() {
     debug('getGlobalContextSync()');
     const { globalContext } = globalObjectTyped;
     assertUsage(globalContext, getGlobalContextSyncErrMsg);
-    const isProd = globalContext._isProduction;
-    assert(typeof isProd === 'boolean');
-    assertWarning(isProd, 
+    assertWarning(isProd(), 
     // - We discourage users from using it in development because `pageContext.globalContext` is safer: I ain't sure but there could be race conditions when using `getGlobalContextSync()` inside React/Vue components upon HMR.
     // - I don't see any issues with getGlobalContextSync() in production.
     // - getGlobalContextSync() is used in production by vike-vercel
@@ -129,7 +121,6 @@ function getGlobalContextForPublicUsage() {
 }
 async function setGlobalContext_viteDevServer(viteDevServer) {
     debug('setGlobalContext_viteDevServer()');
-    setIsProduction(false);
     // We cannot cache globalObject.viteDevServer because it's fully replaced when the user modifies vite.config.js => Vite's dev server is fully reloaded and a new viteDevServer replaces the previous one.
     if (!globalObject.viteDevServer) {
         assertIsNotInitializedYet();
@@ -157,17 +148,9 @@ function assertIsNotInitializedYet() {
 }
 function setGlobalContext_isPrerendering() {
     globalObject.isPrerendering = true;
-    setIsProduction(true);
 }
-function setGlobalContext_isProduction(isProduction, tolerateContradiction = false) {
-    if (debug.isActivated)
-        debug('setGlobalContext_isProduction()', { isProduction, tolerateContradiction });
-    if (globalObject.isProduction === undefined) {
-        setIsProduction(isProduction);
-    }
-    else {
-        assert(globalObject.isProduction === isProduction || tolerateContradiction);
-    }
+function setGlobalContext_isProductionAccordingToVite(isProductionAccordingToVite) {
+    globalObject.isProductionAccordingToVite = isProductionAccordingToVite;
 }
 function getViteDevServer() {
     return globalObject.viteDevServer ?? null;
@@ -177,15 +160,13 @@ function getViteConfig() {
 }
 async function initGlobalContext_renderPage() {
     debug('initGlobalContext_renderPage()');
-    // `globalObject.isProduction === undefined` when using production server without `vike-server`. (There isn't any reliable signal we can use to determine early whether the environment is production or development.)
-    if (globalObject.isProduction === undefined)
-        setIsProduction(true);
+    globalObject.isAfterFirstRenderPageCall = true;
     await initGlobalContext();
 }
 async function initGlobalContext_runPrerender() {
     debug('initGlobalContext_runPrerender()');
     assert(globalObject.isPrerendering === true);
-    assert(globalObject.isProduction === true);
+    assert(isProd());
     if (globalObject.initGlobalContext_runPrerender_alreadyCalled)
         return;
     globalObject.initGlobalContext_runPrerender_alreadyCalled = true;
@@ -203,12 +184,11 @@ async function initGlobalContext_getGlobalContextAsync() {
 }
 async function initGlobalContext_getPagesAndRoutes() {
     debug('initGlobalContext_getPagesAndRoutes()');
-    setIsProduction(true);
+    globalObject.isProductionAccordingToPhotonVercel = true;
     await initGlobalContext();
 }
 async function initGlobalContext() {
-    const { isProduction } = globalObject;
-    assert(typeof isProduction === 'boolean');
+    const isProduction = isProd();
     if (!isProduction) {
         if (isProcessSharedWithVite()) {
             await globalObject.viteDevServerPromise;
@@ -221,18 +201,11 @@ async function initGlobalContext() {
         await globalObject.waitForUserFilesUpdate;
     }
     else {
-        await loadBuildEntry(globalObject.viteConfigRuntime?.build.outDir);
+        await loadProdBuildEntry(globalObject.viteConfigRuntime?.build.outDir);
     }
     assertGlobalContextIsDefined();
     globalObject.isInitialized = true;
 }
-function setIsProduction(isProduction) {
-    debug('setIsProduction', isProduction);
-    assert(typeof isProduction === 'boolean');
-    if (globalObject.isProduction !== undefined)
-        assert(globalObject.isProduction === isProduction);
-    globalObject.isProduction = isProduction;
-}
 function assertViteManifest(manifest) {
     assert(isPlainObject(manifest));
     /* We should include these assertions but we don't as a workaround for PWA manifests: https://github.com/vikejs/vike/issues/769
@@ -246,57 +219,56 @@ function assertViteManifest(manifest) {
       })
     */
 }
-async function loadBuildEntry(outDir) {
-    debug('loadBuildEntry()');
+async function loadProdBuildEntry(outDir) {
+    debug('loadProdBuildEntry()');
     if (globalObject.globalContext) {
-        debug('loadBuildEntry() - already done');
+        debug('loadProdBuildEntry() - already done');
         return;
     }
-    if (!globalObject.buildEntry) {
+    if (!globalObject.prodBuildEntry) {
         debug('importServerProductionEntry()');
-        // importServerProductionEntry() loads dist/server/entry.mjs which calls setGlobalContext_buildEntry()
+        // importServerProductionEntry() loads dist/server/entry.mjs which calls setGlobalContext_prodBuildEntry()
         await importServerProductionEntry({ outDir });
-        if (!globalObject.buildEntry) {
-            debug('globalObject.buildEntryPrevious');
+        if (!globalObject.prodBuildEntry) {
+            debug('globalObject.prodBuildEntryPrevious');
             // Needed, for example, when calling the API prerender() then preview() because both trigger a importServerProductionEntry() call but only the first only is applied because of the import() cache. (A proper implementation would be to clear the import() cache, but it probably isn't possible on platforms such as Cloudflare Workers.)
-            globalObject.buildEntry = globalObject.buildEntryPrevious;
+            globalObject.prodBuildEntry = globalObject.prodBuildEntryPrevious;
         }
-        assert(globalObject.buildEntry);
-        // If using `inject` then dist/server/index.js imports dist/server/entry.js and loadBuildEntry() isn't needed.
+        assert(globalObject.prodBuildEntry);
+        // If using `inject` then dist/server/index.js imports dist/server/entry.js and loadProdBuildEntry() isn't needed.
         // If dist/server/entry.js isn't imported then this means the user is running the original server entry `$ ts-node server/index.ts`.
         assertWarning(
         // vike-server => `inject === true`
         // vike-node => `inject === [ 'index' ]` => we don't show the warning to vike-node users (I don't remember why).
         globalObject.buildInfo?.viteConfigRuntime.vitePluginServerEntry.inject !== true || globalObject.isPrerendering, `Run the built server entry (e.g. ${pc.cyan('$ node dist/server/index.mjs')}) instead of the original server entry (e.g. ${pc.cyan('$ ts-node server/index.ts')})`, { onlyOnce: true });
     }
-    const { buildEntry } = globalObject;
-    assertBuildEntry(buildEntry);
-    globalObject.assetsManifest = buildEntry.assetsManifest;
-    globalObject.buildInfo = buildEntry.buildInfo;
-    await createGlobalContext(buildEntry.virtualFileExportsGlobalEntry);
+    const { prodBuildEntry } = globalObject;
+    assertProdBuildEntry(prodBuildEntry);
+    globalObject.assetsManifest = prodBuildEntry.assetsManifest;
+    globalObject.buildInfo = prodBuildEntry.buildInfo;
+    await createGlobalContext(prodBuildEntry.virtualFileExportsGlobalEntry);
 }
 // This is the production entry, see:
-// https://github.com/vikejs/vike/blob/798e5465dc3e3e6723b38b601a50350c0a006fb8/packages/vike/node/vite/plugins/pluginBuild/pluginBuildEntry.ts#L47
-async function setGlobalContext_buildEntry(buildEntry) {
-    debug('setGlobalContext_buildEntry()');
-    setIsProduction(true);
-    assertBuildEntry(buildEntry);
-    globalObject.buildEntry = buildEntry;
-    globalObject.buildEntryPrevious = buildEntry;
-    assert(globalObject.buildEntry); // ensure no infinite loop
-    await loadBuildEntry();
+// https://github.com/vikejs/vike/blob/8c350e8105a626469e87594d983090919e82099b/packages/vike/node/vite/plugins/pluginBuild/pluginProdBuildEntry.ts#L47
+async function setGlobalContext_prodBuildEntry(prodBuildEntry) {
+    debug('setGlobalContext_prodBuildEntry()');
+    assertProdBuildEntry(prodBuildEntry);
+    globalObject.prodBuildEntry = prodBuildEntry;
+    globalObject.prodBuildEntryPrevious = prodBuildEntry;
+    assert(globalObject.prodBuildEntry); // ensure no infinite loop
+    await loadProdBuildEntry();
     assertGlobalContextIsDefined();
-    debug('setGlobalContext_buildEntry() - done');
-}
-function assertBuildEntry(buildEntry) {
-    assert(isObject(buildEntry));
-    assert(hasProp(buildEntry, 'virtualFileExportsGlobalEntry', 'object'));
-    const { virtualFileExportsGlobalEntry } = buildEntry;
-    assert(hasProp(buildEntry, 'assetsManifest', 'object'));
-    const { assetsManifest } = buildEntry;
+    debug('setGlobalContext_prodBuildEntry() - done');
+}
+function assertProdBuildEntry(prodBuildEntry) {
+    assert(isObject(prodBuildEntry));
+    assert(hasProp(prodBuildEntry, 'virtualFileExportsGlobalEntry', 'object'));
+    const { virtualFileExportsGlobalEntry } = prodBuildEntry;
+    assert(hasProp(prodBuildEntry, 'assetsManifest', 'object'));
+    const { assetsManifest } = prodBuildEntry;
     assertViteManifest(assetsManifest);
-    assert(hasProp(buildEntry, 'buildInfo', 'object'));
-    const { buildInfo } = buildEntry;
+    assert(hasProp(prodBuildEntry, 'buildInfo', 'object'));
+    const { buildInfo } = prodBuildEntry;
     assertBuildInfo(buildInfo);
     checkType({ virtualFileExportsGlobalEntry, assetsManifest, buildInfo });
 }
@@ -319,7 +291,7 @@ function assertVersionAtBuildTime(versionAtBuildTime) {
 }
 async function updateUserFiles() {
     debug('updateUserFiles()');
-    assert(!globalObject.isProduction);
+    assert(!isProd());
     const { promise, resolve } = genPromise();
     globalObject.waitForUserFilesUpdate = promise;
     globalObject.waitForUserFilesUpdateResolve ?? (globalObject.waitForUserFilesUpdateResolve = []);
@@ -422,12 +394,12 @@ async function createGlobalContext(virtualFileExportsGlobalEntry) {
     // - Required by vike-vercel
     assert(globalObject.globalContext);
     const globalContext = await globalContextPromise;
+    debug('createGlobalContext() - done [async]');
     assertV1Design(
     // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);
     assertGlobalContextIsDefined();
     onSetupRuntime();
-    debug('createGlobalContext() - done [async]');
     // Never actually used, only used for TypeScript `ReturnType<typeof createGlobalContext>`
     return globalContext;
 }
@@ -447,8 +419,8 @@ function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
         _pageRoutes: pageRoutes,
         _onBeforeRouteHook: onBeforeRouteHook,
     };
-    const { viteDevServer, viteConfig, isPrerendering, isProduction } = globalObject;
-    assert(typeof isProduction === 'boolean');
+    const { viteDevServer, viteConfig, isPrerendering } = globalObject;
+    const isProduction = isProd();
     if (!isProduction) {
         assert(globalContext); // main common requirement
         assert(!isPrerendering);
@@ -462,7 +434,7 @@ function addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook) {
         };
     }
     else {
-        assert(globalObject.buildEntry);
+        assert(globalObject.prodBuildEntry);
         assert(globalContext); // main common requiement
         const { buildInfo, assetsManifest } = globalObject;
         assert(buildInfo);
@@ -500,7 +472,7 @@ async function addGlobalContextAsync(globalContext) {
         }
         else {
             assert(!isProcessSharedWithVite()); // process shared with Vite => globalObject.viteConfigRuntime should be set
-            assert(!globalObject.isProduction); // production => globalObject.buildInfo.viteConfigRuntime should be set
+            assert(!isProd()); // production => globalObject.buildInfo.viteConfigRuntime should be set
             assert(isNonRunnableDev());
             const rpc = getViteRPC();
             viteConfigRuntime = await rpc.getViteConfigRuntimeRPC();
@@ -514,13 +486,12 @@ async function addGlobalContextAsync(globalContext) {
 }
 function clearGlobalContext() {
     debug('clearGlobalContext()');
-    objectReplace(globalObject, getInitialGlobalObject(), ['buildEntryPrevious']);
+    objectReplace(globalObject, getInitialGlobalObject(), ['prodBuildEntryPrevious']);
 }
 function getInitialGlobalObject() {
     debug('getInitialGlobalObject()');
     const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = genPromise();
     return {
-        isProduction: isNonRunnableDev() ? false : undefined,
         viteDevServerPromise,
         viteDevServerPromiseResolve,
     };
@@ -547,10 +518,51 @@ function isRunnable(viteDevServer) {
         assert(!isNonRunnableDev());
     return yes;
 }
-function isNonRunnableDev() {
-    if (typeof __VIKE__IS_NON_RUNNABLE_DEV === 'undefined')
-        return null;
-    const yes = __VIKE__IS_NON_RUNNABLE_DEV;
+function isProd() {
+    const isProduction = isProdOptional();
+    if (isProduction === null) {
+        if (globalObject.isAfterFirstRenderPageCall) {
+            // When using a production server without vike-server, there isn't any reliable signal we can use to determine early whether the environment is production or development. If renderPage() was called then some non-negligible amount of time passed — it's likely that, in dev, one of the Vite hooks should have already sent a signal we can use to determine prod/dev.
+            return true;
+        }
+        else {
+            assert(false);
+        }
+    }
+    return isProduction;
+}
+function isProdOptional() {
+    const vikeApiOperation = getVikeApiOperation()?.operation ?? null;
+    const yes = 
+    // setGlobalContext_prodBuildEntry() was called
+    !!globalObject.prodBuildEntry ||
+        globalObject.isPrerendering === true ||
+        // Vike CLI & Vike API
+        (!!vikeApiOperation && vikeApiOperation !== 'dev') ||
+        // Vite command
+        globalObject.isProductionAccordingToVite === true ||
+        // getGlobalContextAsync(isProduction)
+        globalObject.isProductionAccordingToUser === true ||
+        // vite-plugin-vercel
+        globalObject.isProductionAccordingToPhotonVercel === true;
     assert(typeof yes === 'boolean');
-    return yes;
+    const no = !!globalObject.viteDevServer ||
+        // Vike CLI & Vike API
+        vikeApiOperation === 'dev' ||
+        // Vite command
+        globalObject.isProductionAccordingToVite === false ||
+        // getGlobalContextAsync(isProduction)
+        globalObject.isProductionAccordingToUser === false ||
+        // @cloudflare/vite-plugin
+        isNonRunnableDev() === true;
+    assert(typeof no === 'boolean');
+    if (yes) {
+        assert(no === false);
+        return true;
+    }
+    if (no) {
+        assert(yes === false);
+        return false;
+    }
+    return null;
 }

package/dist/esm/node/runtime/utils.d.ts

@@ -60,3 +60,4 @@ export * from '../../utils/changeEnumerable.js';
 export * from '../../utils/getViteRPC.js';
 export * from '../../utils/isRunnableDevEnvironment.js';
 export * from '../../utils/assertIsNotBrowser.js';
+export * from '../../utils/isNonRunnableDev.js';

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

@@ -64,3 +64,4 @@ export * from '../../utils/changeEnumerable.js';
 export * from '../../utils/getViteRPC.js';
 export * from '../../utils/isRunnableDevEnvironment.js';
 export * from '../../utils/assertIsNotBrowser.js';
+export * from '../../utils/isNonRunnableDev.js';

package/dist/esm/node/runtime-dev/createDevMiddleware.d.ts

@@ -1,9 +1,9 @@
 export { createDevMiddleware };
 import type { ResolvedConfig, Connect, ViteDevServer } from 'vite';
-import type { APIOptions } from '../api/types.js';
+import type { ApiOptions } from '../api/types.js';
 declare function createDevMiddleware(options?: {
     root?: string;
-} & APIOptions): Promise<{
+} & ApiOptions): Promise<{
     devMiddleware: Connect.Server;
     viteServer: ViteDevServer;
     viteConfig: ResolvedConfig;

package/dist/esm/node/runtime-dev/createDevMiddleware.js

@@ -1,14 +1,12 @@
 export { createDevMiddleware };
 import { createServer } from 'vite';
 import { prepareViteApiCall } from '../api/prepareViteApiCall.js';
-import { setGlobalContext_isProduction } from '../runtime/globalContext.js';
 /*
  * Create server middleware for development with HMR and lazy-transpiling.
  *
  * https://vike.dev/createDevMiddleware
  */
 async function createDevMiddleware(options = {}) {
-    setGlobalContext_isProduction(false, true);
     const optionsMod = {
         ...options,
         viteConfig: {

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

@@ -14,7 +14,7 @@ import pc from '@brillout/picocolors';
 import { isV1Design } from '../../shared/resolveVikeConfigInternal.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
 import { isViteServerSide_onlySsrEnv, isViteServerSide } from '../../shared/isViteServerSide.js';
-import { set_macro_ASSETS_MANIFEST } from './pluginBuildEntry.js';
+import { set_macro_ASSETS_MANIFEST } from './pluginProdBuildEntry.js';
 import { getManifestFilePathRelative } from '../../shared/getManifestFilePathRelative.js';
 const globalObject = getGlobalObject('build/handleAssetsManifest.ts', {
     assetsJsonFilePath: undefined,

package/dist/esm/node/vite/plugins/pluginBuild/{pluginBuildEntry.d.ts → pluginProdBuildEntry.d.ts}

@@ -1,6 +1,6 @@
-export { pluginBuildEntry };
+export { pluginProdBuildEntry };
 export { set_macro_ASSETS_MANIFEST };
 import type { Plugin, Rollup } from 'vite';
 type Bundle = Rollup.OutputBundle;
-declare function pluginBuildEntry(): Plugin[];
+declare function pluginProdBuildEntry(): Plugin[];
 declare function set_macro_ASSETS_MANIFEST(assetsJsonFilePath: string | undefined, bundle: Bundle, outDir: string): Promise<boolean>;

package/dist/esm/node/vite/plugins/pluginBuild/{pluginBuildEntry.js → pluginProdBuildEntry.js}

@@ -1,4 +1,4 @@
-export { pluginBuildEntry };
+export { pluginProdBuildEntry };
 export { set_macro_ASSETS_MANIFEST };
 import { serverProductionEntryPlugin } from '@brillout/vite-plugin-server-entry/plugin';
 import { virtualFileIdGlobalEntryServer } from '../../../shared/virtualFileId.js';
@@ -10,11 +10,11 @@ import { assertBuildInfo } from '../../../runtime/globalContext.js';
 import { getOutDirs } from '../../shared/getOutDirs.js';
 import { getViteConfigRuntime } from '../../shared/getViteConfigRuntime.js';
 const ASSETS_MANIFEST = '__VITE_ASSETS_MANIFEST__';
-function pluginBuildEntry() {
+function pluginProdBuildEntry() {
     let config;
     return [
         {
-            name: 'vike:build:pluginBuildEntry',
+            name: 'vike:build:pluginProdBuildEntry',
             apply: 'build',
             enforce: 'post',
             async configResolved(config_) {
@@ -39,14 +39,14 @@ function getServerProductionEntryCode(config) {
     assertBuildInfo(buildInfo);
     // After the old design is removed, let's maybe simplify and move everything into a single virtual module
     const importerCode = [
-        `  import { setGlobalContext_buildEntry } from '${importPath}';`,
+        `  import { setGlobalContext_prodBuildEntry } from '${importPath}';`,
         `  import * as virtualFileExportsGlobalEntry from '${virtualFileIdGlobalEntryServer}';`,
         `  {`,
-        // Because of a Rollup bug, we have to assign ASSETS_MANIFEST to a variable before passing it to setGlobalContext_buildEntry()
+        // Because of a Rollup bug, we have to assign ASSETS_MANIFEST to a variable before passing it to setGlobalContext_prodBuildEntry()
         // - This workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d
         `    const assetsManifest = ${ASSETS_MANIFEST};`,
         `    const buildInfo = ${JSON.stringify(buildInfo, null, 2)};`,
-        '    setGlobalContext_buildEntry({',
+        '    setGlobalContext_prodBuildEntry({',
         `      virtualFileExportsGlobalEntry,`,
         `      assetsManifest,`,
         `      buildInfo,`,

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

@@ -3,14 +3,14 @@ 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 { pluginBuildEntry } from './pluginBuild/pluginBuildEntry.js';
+import { pluginProdBuildEntry } from './pluginBuild/pluginProdBuildEntry.js';
 import { pluginBuildConfig } from './pluginBuild/pluginBuildConfig.js';
 import { pluginModuleBanner } from './pluginBuild/pluginModuleBanner.js';
 function pluginBuild() {
     return [
         ...pluginBuildConfig(),
         ...pluginBuildApp(),
-        ...pluginBuildEntry(),
+        ...pluginProdBuildEntry(),
         pluginDistPackageJsonFile(),
         pluginSuppressRollupWarning(),
         pluginDistFileNames(),

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

@@ -18,7 +18,8 @@ function getViteRpcFunctions(viteDevServer) {
     };
 }
 function pluginNonRunnableDev() {
-    const runtimeGlobalContextFilePath = requireResolveDistFile('dist/esm/node/runtime/globalContext.js');
+    const distFileIsNonRunnableDev = requireResolveDistFile('dist/esm/utils/isNonRunnableDev.js');
+    const distFileGlobalContext = requireResolveDistFile('dist/esm/node/runtime/globalContext.js');
     let config;
     return {
         name: 'vike:pluginNonRunnableDev',
@@ -31,14 +32,17 @@ function pluginNonRunnableDev() {
         transform(code, id) {
             if (!config._isDev)
                 return;
-            if (id !== runtimeGlobalContextFilePath)
+            if (id !== distFileIsNonRunnableDev && id !== distFileGlobalContext)
+                return;
+            if (isRunnableDevEnvironment(this.environment))
                 return;
-            const isNonRunnableDev = !isRunnableDevEnvironment(this.environment);
             const { magicString, getMagicStringResult } = getMagicString(code, id);
-            if (isNonRunnableDev) {
+            if (id === distFileIsNonRunnableDev) {
+                magicString.replaceAll('__VIKE__IS_NON_RUNNABLE_DEV', JSON.stringify(true));
+            }
+            if (id === distFileGlobalContext) {
                 magicString.replaceAll('__VIKE__DYNAMIC_IMPORT', 'import');
             }
-            magicString.replaceAll('__VIKE__IS_NON_RUNNABLE_DEV', JSON.stringify(isNonRunnableDev));
             return getMagicStringResult();
         },
     };

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

@@ -1,5 +1,5 @@
 export { pluginSetGlobalContext };
-import { setGlobalContext_viteDevServer, setGlobalContext_viteConfig, setGlobalContext_isProduction, } from '../../runtime/globalContext.js';
+import { setGlobalContext_viteDevServer, setGlobalContext_viteConfig, setGlobalContext_isProductionAccordingToVite, } from '../../runtime/globalContext.js';
 import { isDevCheck, markSetup_isViteDev, markSetup_viteDevServer, markSetup_vitePreviewServer } from '../utils.js';
 import { reloadVikeConfig } from '../shared/resolveVikeConfigInternal.js';
 import { getViteConfigRuntime } from '../shared/getViteConfigRuntime.js';
@@ -27,7 +27,7 @@ function pluginSetGlobalContext() {
                 order: 'pre',
                 handler(_, env) {
                     const isViteDev = isDevCheck(env);
-                    setGlobalContext_isProduction(!isViteDev);
+                    setGlobalContext_isProductionAccordingToVite(!isViteDev);
                     markSetup_isViteDev(isViteDev);
                 },
             },

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

@@ -26,7 +26,7 @@ import { resolveVikeConfigPublicGlobal, resolveVikeConfigPublicPageEagerLoaded,
 import { getConfigValuesBase, isJsonValue } from '../../../shared/page-configs/serialize/serializeConfigValues.js';
 import { getPlusFilesAll, } from './resolveVikeConfigInternal/getPlusFilesAll.js';
 import { getEnvVarObject } from './getEnvVarObject.js';
-import { getApiOperation } from '../../api/context.js';
+import { getVikeApiOperation } from '../../api/context.js';
 import { getCliOptions } from '../../cli/context.js';
 import { resolvePrerenderConfigGlobal } from '../../prerender/resolvePrerenderConfig.js';
 import { getProxyForPublicUsage } from '../../../shared/getProxyForPublicUsage.js';
@@ -416,9 +416,9 @@ function temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, use
 }
 function setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved) {
     // Vike API — passed options [lowest precedence]
-    const apiOperation = getApiOperation();
-    if (apiOperation?.options.vikeConfig) {
-        addSources(apiOperation.options.vikeConfig, { definedBy: 'api', operation: apiOperation.operation }, false);
+    const vikeApiOperation = getVikeApiOperation();
+    if (vikeApiOperation?.options.vikeConfig) {
+        addSources(vikeApiOperation.options.vikeConfig, { definedBy: 'api', operation: vikeApiOperation.operation }, false);
     }
     const { configFromCliOptions, configFromEnvVar } = getVikeConfigFromCliOrEnv();
     // Vike CLI options

package/dist/esm/shared/createGlobalContextShared.d.ts

@@ -12,7 +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>;
+    previousCreateGlobalContextPromise?: 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

@@ -8,12 +8,10 @@ import { prepareGlobalContextForPublicUsage } from './prepareGlobalContextForPub
 import { getHookFromPageConfigGlobalCumulative } from './hooks/getHook.js';
 const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 // TO-DO/eventually use flat globalContext — like flat pageContext
-async function createGlobalContextShared(virtualFileExportsGlobalEntry, 
-// TODO/now rename previousCallPromise to previousCreateGlobalContextPromise
-globalObject, addGlobalContext, 
+async function createGlobalContextShared(virtualFileExportsGlobalEntry, 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 { previousCreateGlobalContextPromise } = globalObject;
     const { promise, resolve } = genPromise({
         // Avoid this Cloudflare Worker error:
         // ```console
@@ -21,10 +19,10 @@ addGlobalContextTmp, addGlobalContextAsync) {
         // ```
         timeout: null,
     });
-    globalObject.previousCallPromise = promise;
-    if (previousCallPromise) {
+    globalObject.previousCreateGlobalContextPromise = promise;
+    if (previousCreateGlobalContextPromise) {
         assert(globalObject.globalContext);
-        await previousCallPromise;
+        await previousCreateGlobalContextPromise;
     }
     const globalContext = createGlobalContextBase(virtualFileExportsGlobalEntry);
     let isNewGlobalContext;

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

@@ -26,7 +26,7 @@ import type { LocationId } from '../node/vite/shared/resolveVikeConfigInternal/f
 import type { FilePath } from './FilePath.js';
 import type { ConfigDefinitionsInternal } from '../node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
 import type { PlusFile } from '../node/vite/shared/resolveVikeConfigInternal/getPlusFilesAll.js';
-import type { Operation } from '../node/api/types.js';
+import type { ApiOperation } from '../node/api/types.js';
 type PageConfigCommon = {
     pageId: string;
 } & PageConfigRoute;
@@ -144,7 +144,7 @@ type DefinedBy = {
     definedBy: 'cli' | 'env';
 } | {
     definedBy: 'api';
-    operation: Operation;
+    operation: ApiOperation;
 };
 type DefinedAtFile = {
     filePathToShowToUser: string;

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.237-commit-cc7f0f6";
+export declare const PROJECT_VERSION: "0.4.237-commit-33e34e7";

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