vike 0.4.250-commit-6161324 → 0.4.250-commit-0d50da9

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

@@ -1,3 +1,4 @@
+import '../../assertEnvVite.js';
 export { transpileAndExecuteFile };
 export { getConfigBuildErrorFormatted };
 export { getConfigExecutionErrorIntroMsg };
@@ -7,7 +8,19 @@ import fs from 'node:fs';
 import path from 'node:path';
 import pc from '@brillout/picocolors';
 import { import_ } from '@brillout/import';
-import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, assertWarning, isObject, toPosixPath, assertUsage, isPlainScriptFile, createDebug, assertFilePathAbsoluteFilesystem, assertIsImportPathNpmPackage, genPromise, isVitest, isImportPathNpmPackageOrPathAlias, isImportPathRelative, requireResolveOptionalDir, } from '../../utils.js';
+import { assert, assertWarning, assertUsage } from '../../../../utils/assert.js';
+import { assertIsNotProductionRuntime } from '../../../../utils/assertSetup.js';
+import { createDebug } from '../../../../utils/debug.js';
+import { genPromise } from '../../../../utils/genPromise.js';
+import { getRandomId } from '../../../../utils/getRandomId.js';
+import { assertFilePathAbsoluteFilesystem } from '../../../../utils/isFilePathAbsoluteFilesystem.js';
+import { isImportPathRelative } from '../../../../utils/isImportPath.js';
+import { isObject } from '../../../../utils/isObject.js';
+import { isPlainScriptFile } from '../../../../utils/isScriptFile.js';
+import { isVitest } from '../../../../utils/isVitest.js';
+import { assertIsImportPathNpmPackage, isImportPathNpmPackageOrPathAlias } from '../../../../utils/parseNpmPackage.js';
+import { assertPosixPath, toPosixPath } from '../../../../utils/path.js';
+import { requireResolveOptionalDir } from '../../../../utils/requireResolve.js';
 import { transformPointerImports } from './pointerImports.js';
 import sourceMapSupport from 'source-map-support';
 import { getFilePathAbsoluteUserRootDir } from '../getFilePath.js';

package/dist/node/vite/shared/resolveVikeConfigInternal.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvVite.js';
 export { getVikeConfig };
 export type { VikeConfig };
 export { getVikeConfigInternal };
@@ -17,7 +18,7 @@ import { type GlobalConfigPublic } from '../../../shared-server-client/page-conf
 import { type PlusFile } from './resolveVikeConfigInternal/getPlusFilesByLocationId.js';
 import type { PrerenderContextPublic } from '../../prerender/runPrerender.js';
 import type { ResolvedConfig, UserConfig } from 'vite';
-import { type DangerouslyUseInternals } from '../../../shared-server-client/getProxyForPublicUsage.js';
+import { type DangerouslyUseInternals } from '../../../shared-server-client/getPublicProxy.js';
 type VikeConfigContext = {
     userRootDir: string;
     isDev: boolean;

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

@@ -1,3 +1,4 @@
+import '../assertEnvVite.js';
 // Public usage
 export { getVikeConfig };
 // Internal usage
@@ -10,7 +11,26 @@ export { isV1Design };
 export { getConfVal };
 export { getConfigDefinitionOptional };
 export { getVikeConfigFromCliOrEnv };
-import { assertPosixPath, assert, isObject, assertUsage, assertWarning, objectEntries, hasProp, includes, assertIsNotProductionRuntime, getMostSimilar, joinEnglish, assertKeys, objectKeys, objectFromEntries, unique, isCallable, makeFirst, lowerFirst, makeLast, genPromise, checkType, objectAssign, getGlobalObject, } from '../utils.js';
+import { assertKeys } from '../../../utils/assertKeys.js';
+import { assertIsNotProductionRuntime } from '../../../utils/assertSetup.js';
+import { getMostSimilar } from '../../../utils/getMostSimilar.js';
+import { includes } from '../../../utils/includes.js';
+import { objectEntries } from '../../../utils/objectEntries.js';
+import { objectFromEntries } from '../../../utils/objectFromEntries.js';
+import { objectKeys } from '../../../utils/objectKeys.js';
+import { makeLast } from '../../../utils/sorter.js';
+import { assert, assertUsage, assertWarning } from '../../../utils/assert.js';
+import { checkType } from '../../../utils/checkType.js';
+import { genPromise } from '../../../utils/genPromise.js';
+import { getGlobalObject } from '../../../utils/getGlobalObject.js';
+import { hasProp } from '../../../utils/hasProp.js';
+import { isCallable } from '../../../utils/isCallable.js';
+import { isObject } from '../../../utils/isObject.js';
+import { joinEnglish } from '../../../utils/joinEnglish.js';
+import { objectAssign } from '../../../utils/objectAssign.js';
+import { makeFirst, lowerFirst } from '../../../utils/sorter.js';
+import { unique } from '../../../utils/unique.js';
+import { assertPosixPath } from '../../../utils/path.js';
 import { configDefinitionsBuiltIn, } from './resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
 import { getFileSuffixes } from '../../../shared-server-node/getFileSuffixes.js';
 import { getLocationId, getFilesystemRouteString, getFilesystemRouteDefinedBy, isInherited, sortAfterInheritanceOrder, applyFilesystemRoutingRootEffect, } from './resolveVikeConfigInternal/filesystemRouting.js';
@@ -30,11 +50,11 @@ import { getEnvVarObject } from './getEnvVarObject.js';
 import { getVikeApiOperation } from '../../../shared-server-node/api-context.js';
 import { getCliOptions } from '../../cli/context.js';
 import { resolvePrerenderConfigGlobal } from '../../prerender/resolvePrerenderConfig.js';
-import { getProxyForPublicUsage, } from '../../../shared-server-client/getProxyForPublicUsage.js';
+import { getPublicProxy } from '../../../shared-server-client/getPublicProxy.js';
 import { setVikeConfigError } from '../../../shared-server-node/getVikeConfigError.js';
 assertIsNotProductionRuntime();
 const globalObject = getGlobalObject('vite/shared/resolveVikeConfigInternal.ts', {
-    restartVite: false,
+    restartViteBecauseOfError: false,
     vikeConfigHasBuildError: null,
     isV1Design_: null,
     vikeConfigPromise: null,
@@ -70,7 +90,7 @@ function getVikeConfig(
 // TO-DO/next-major-release: remove
 /** @deprecated the `config` argument isn't needed anymore — remove it (it doesn't have any effect) */
 _config) {
-    /* TO-DO/eventualy: add deprecation warning. We don't do it yet because of vike-server and vike-cloudflare which are using getVikeConfig() with the argument.
+    /* TO-DO/eventually: add deprecation warning. We don't do it yet because of vike-server and vike-cloudflare which are using getVikeConfig() with the argument.
     assertWarning(
       config === undefined,
       `getVikeConfig() doesn't accept any argument anymore — remove the argument (it doesn't have any effect)`,
@@ -80,7 +100,7 @@ _config) {
     assert(globalObject.vikeConfigSync);
     const vikeConfig = globalObject.vikeConfigSync;
     assertUsage(vikeConfig, 'getVikeConfig() can only be used when Vite is loaded (i.e. during development or build) — Vite is never loaded in production.');
-    const vikeConfigPublic = getProxyForPublicUsage(vikeConfig, 'vikeConfig');
+    const vikeConfigPublic = getPublicProxy(vikeConfig, 'vikeConfig');
     return vikeConfigPublic;
 }
 function setVikeConfigContext(vikeConfigCtx_) {
@@ -115,6 +135,7 @@ async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, v
         transpileCache: {},
         vikeConfigDependencies: new Set(),
     };
+    const vikeConfigOld = globalObject.vikeConfigSync;
     let hasError = false;
     let ret;
     let err;
@@ -143,13 +164,18 @@ async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, v
         const hadError = globalObject.vikeConfigHasBuildError;
         globalObject.vikeConfigHasBuildError = false;
         setVikeConfigError({ errorBuild: false });
+        let viteRestarted = false;
         if (hadError) {
             logConfigInfo(vikeConfigErrorRecoverMsg, 'error-resolve');
-            if (globalObject.restartVite) {
-                globalObject.restartVite = false;
+            if (globalObject.restartViteBecauseOfError) {
+                globalObject.restartViteBecauseOfError = false;
                 restartViteDevServer();
+                viteRestarted = true;
             }
         }
+        if (!viteRestarted && isDev && hasViteConfigChanged(vikeConfigOld, ret)) {
+            restartViteDevServer();
+        }
         resolve(ret);
     }
     else {
@@ -158,15 +184,47 @@ async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, v
         globalObject.vikeConfigHasBuildError = true;
         setVikeConfigError({ errorBuild: { err } });
         if (!doNotRestartViteOnError)
-            globalObject.restartVite = true;
+            globalObject.restartViteBecauseOfError = true;
         if (!isDev) {
             reject(err);
         }
         else {
             logErrorServerDev(err, null);
-            resolve(getVikeConfigDummy(esbuildCache));
+            resolve(await getVikeConfigDummy(esbuildCache));
+        }
+    }
+}
+function hasViteConfigChanged(vikeConfigOld, vikeConfigNew) {
+    if (!vikeConfigOld)
+        return false;
+    const configDefinitions = vikeConfigNew._pageConfigGlobal.configDefinitions;
+    const viteConfigNames = Object.keys(configDefinitions).filter((configName) => configDefinitions[configName].vite);
+    const configValuesOld = getConfigValues(vikeConfigOld._pageConfigGlobal, true);
+    const configValuesNew = getConfigValues(vikeConfigNew._pageConfigGlobal, true);
+    for (const configName of viteConfigNames) {
+        const valOld = configValuesOld[configName]?.value;
+        const valNew = configValuesNew[configName]?.value;
+        // TO-DO/eventually: make it work for functions e.g. Vite plugins added via +vite — two solutions to make it work:
+        //  - We cache transpileWithEsbuild() but it's far from trivial
+        //  - We trigger a Vite reload by watching file changes instead of hasViteConfigChanged()
+        //    - Implementation: https://github.com/vikejs/vike/pull/3017/changes/1e55cbc1ed8bac4a72bf8c658cfbd67eecb7802a
+        if (!deepEqualPrimitive(valOld, valNew)) {
+            return true;
         }
     }
+    return false;
+}
+function deepEqualPrimitive(x, y) {
+    const tx = typeof x;
+    const ty = typeof y;
+    // Skip functions - treat them as always equal
+    if (tx === 'function' && ty === 'function')
+        return true;
+    // Copy of utils/deepEqual.ts for everything else
+    return x && y && tx === 'object' && tx === ty
+        ? Object.keys(x).length === Object.keys(y).length &&
+            Object.keys(x).every((key) => deepEqualPrimitive(x[key], y[key]))
+        : x === y;
 }
 async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esbuildCache) {
     const plusFilesByLocationId = await getPlusFilesByLocationId(userRootDir, esbuildCache);
@@ -178,7 +236,7 @@ async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esb
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
     setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved);
     const globalConfigPublic = resolveGlobalConfig(pageConfigGlobal, pageConfigs);
-    const prerenderContext = resolvePrerenderContext({
+    const prerenderContext = await resolvePrerenderContext({
         config: globalConfigPublic.config,
         _from: globalConfigPublic._from,
         _pageConfigs: pageConfigs,
@@ -202,7 +260,7 @@ async function resolveConfigDefinitions(plusFilesByLocationId, userRootDir, esbu
         .flat()
         .sort((plusFile1, plusFile2) => sortAfterInheritanceOrderGlobal(plusFile1, plusFile2, plusFilesByLocationId, null));
     const configDefinitionsGlobal = getConfigDefinitions(
-    // We use `plusFilesByLocationId` in order to allow local Vike extensions to create global configs, and to set the value of global configs such as `+vite` (enabling Vike extensions to add Vite plugins).
+    // We use `plusFilesByLocationId` in order to allow non-global Vike extensions to create global configs, and to set the value of global configs such as `+vite` (enabling Vike extensions to add Vite plugins).
     plusFilesByLocationIdOrdered, (configDef) => !!configDef.global);
     await loadCustomConfigBuildTimeFiles(plusFilesByLocationId, configDefinitionsGlobal, userRootDir, esbuildCache);
     const configDefinitionsAll = getConfigDefinitions(Object.values(plusFilesByLocationId).flat());
@@ -259,7 +317,7 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesByLocationI
     };
     objectEntries(configDefinitionsResolved.configDefinitionsGlobal).forEach(([configName, configDef]) => {
         const sources = resolveConfigValueSources(configName, configDef, 
-        // We use `plusFilesByLocationId` in order to allow local Vike extensions to create global configs, and to set the value of global configs such as `+vite` (enabling Vike extensions to add Vite plugins).
+        // We use `plusFilesByLocationId` in order to allow non-global Vike extensions to create global configs, and to set the value of global configs such as `+vite` (enabling Vike extensions to add Vite plugins).
         Object.values(plusFilesByLocationId).flat(), userRootDir, true, plusFilesByLocationId);
         if (sources.length === 0)
             return;
@@ -322,7 +380,7 @@ function assertGlobalConfigLocation(configName, sources, plusFilesByLocationId,
         // It's `null` when the config is defined by `vike(options)` in vite.config.js
         assert(plusFile);
         const { filePathAbsoluteUserRootDir } = plusFile.filePath;
-        // Allow local Vike extensions to set global configs (`filePathAbsoluteUserRootDir===null` for Vike extension)
+        // Allow non-global Vike extensions to set global configs (`filePathAbsoluteUserRootDir===null` for Vike extension)
         if (!filePathAbsoluteUserRootDir)
             return;
         assert(!plusFile.isExtensionConfig);
@@ -330,7 +388,7 @@ function assertGlobalConfigLocation(configName, sources, plusFilesByLocationId,
             const configDef = configDefinitionsGlobal[configName];
             assert(configDef);
             const isConditionallyGlobal = isCallable(configDef.global);
-            const errBeg = `${filePathAbsoluteUserRootDir} (which is a local config file) sets the config ${pc.cyan(configName)}`;
+            const errBeg = `${filePathAbsoluteUserRootDir} (which is a non-global config file) sets the config ${pc.cyan(configName)}`;
             const errMid = !isConditionallyGlobal
                 ? "but it's a global config"
                 : 'to a value that is global';
@@ -801,6 +859,13 @@ function assertMetaUsage(metaVal, metaConfigDefinedAt) {
                 assertUsage(false, `${metaConfigDefinedAt} sets ${pc.cyan(`meta.${configName}.effect`)} but it's only supported if meta.${configName}.env has ${pc.cyan('{ config: true }')} (but it's ${pc.cyan(JSON.stringify(configEnv))} instead)`);
             }
         }
+        // Validate if `vite: true` then `global` and `env.config`
+        if (def.vite) {
+            assert(metaConfigDefinedAt);
+            const errMsgBegin = `${metaConfigDefinedAt} sets ${pc.cyan(`meta.${configName}.vite`)} to ${pc.cyan('true')} which requires`;
+            assertUsage(def.global, `${errMsgBegin} ${pc.cyan(`meta.${configName}.global`)} to be ${pc.cyan('true')}`);
+            assertUsage(configEnv.config, `${errMsgBegin} ${pc.cyan(`meta.${configName}.env.config`)} to be ${pc.cyan('true')}`);
+        }
     });
 }
 // Test: https://github.com/vikejs/vike/blob/871a111a77d637bbd156b07be5ae728c3d595501/test/playground/pages/config-meta/effect/e2e-test.ts
@@ -1092,8 +1157,8 @@ function isGlobalLocation(locationId, plusFilesByLocationId) {
         .map(([locationId]) => locationId);
     return locationIdsPage.every((locId) => isInherited(locationId, locId));
 }
-function resolvePrerenderContext(vikeConfig) {
-    const { isPrerenderingEnabled, isPrerenderingEnabledForAllPages } = resolvePrerenderConfigGlobal(vikeConfig);
+async function resolvePrerenderContext(vikeConfig) {
+    const { isPrerenderingEnabled, isPrerenderingEnabledForAllPages } = await resolvePrerenderConfigGlobal(vikeConfig);
     globalObject.prerenderContext ?? (globalObject.prerenderContext = {
         isPrerenderingEnabled: false,
         isPrerenderingEnabledForAllPages: false,
@@ -1121,14 +1186,14 @@ function restartViteDevServer() {
     })();
     swallowViteLogForceOptimization_disable();
 }
-function getVikeConfigDummy(esbuildCache) {
+async function getVikeConfigDummy(esbuildCache) {
     const pageConfigsDummy = [];
     const pageConfigGlobalDummy = {
         configValueSources: {},
         configDefinitions: {},
     };
     const globalConfigPublicDummy = resolveGlobalConfig(pageConfigGlobalDummy, pageConfigsDummy);
-    const prerenderContextDummy = resolvePrerenderContext({
+    const prerenderContextDummy = await resolvePrerenderContext({
         config: globalConfigPublicDummy.config,
         _from: globalConfigPublicDummy._from,
         _pageConfigs: pageConfigsDummy,

package/dist/node/vite/shared/rollupIsEsm.d.ts

@@ -1,3 +1,5 @@
-export declare function rollupIsEsm(rollupOptions: {
+import '../assertEnvVite.js';
+export { rollupIsEsm };
+declare function rollupIsEsm(rollupOptions: {
     format: string;
 }): boolean;

package/dist/node/vite/shared/rollupIsEsm.js

@@ -1,5 +1,7 @@
-import { assert } from '../utils.js';
-export function rollupIsEsm(rollupOptions) {
+import '../assertEnvVite.js';
+export { rollupIsEsm };
+import { assert } from '../../../utils/assert.js';
+function rollupIsEsm(rollupOptions) {
     const { format } = rollupOptions;
     assert(typeof format === 'string');
     assert(format === 'amd' ||

package/dist/server/__internal/index.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvServer.js';
 export { setGlobalContext_prodBuildEntry } from '../runtime/globalContext.js';
 export { route, getPagesAndRoutes };
 export type { PageRoutes, PageFile, PageConfigRuntime as PageConfig };

package/dist/server/__internal/index.js

@@ -1,3 +1,4 @@
+import '../assertEnvServer.js';
 // Used by vike:build:pluginProdBuildEntry
 export { setGlobalContext_prodBuildEntry } from '../runtime/globalContext.js';
 // Used by vite-plugin-vercel

package/dist/server/__internal/vite.d.ts

@@ -1 +1,2 @@
+import '../assertEnvServer.js';
 export { startupLog } from '../../node/api/dev.js';

package/dist/server/__internal/vite.js

@@ -1 +1,2 @@
+import '../assertEnvServer.js';
 export { startupLog } from '../../node/api/dev.js';

package/dist/server/assertEnvServer.d.ts

@@ -0,0 +1 @@
+import '../utils/trackLogs.js';

package/dist/server/{onLoad.js → assertEnvServer.js}

@@ -1,12 +1,18 @@
-export { onLoad };
+import '../utils/trackLogs.js'; // should be loaded ASAP
 import { assertIsNotBrowser } from '../utils/assertIsNotBrowser.js';
 import { assertNodeVersion } from '../utils/assertNodeVersion.js';
 import { setAssertAlwaysShowStackTrace } from '../utils/assert.js';
 import { installRequireShim } from '@brillout/require-shim';
 import { isDebugError } from '../utils/debug.js';
-function onLoad() {
+import { installUncaughtErrorHandlers } from '../utils/installUncaughtErrorHandlers.js';
+assertEnv();
+onLoad();
+function assertEnv() {
     assertIsNotBrowser();
     assertNodeVersion();
+}
+function onLoad() {
+    installUncaughtErrorHandlers();
     if (isDebugError()) {
         // Is also executed upon `$ vike build` because node/vite/utils.ts imports server/utils.ts
         Error.stackTraceLimit = Infinity;

package/dist/server/client/router.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvServer.js';
 export { navigate };
 export { reload };
 export { prefetch };

package/dist/server/client/router.js

@@ -1,3 +1,4 @@
+import '../assertEnvServer.js';
 export { navigate };
 export { reload };
 export { prefetch };

package/dist/server/createPageRenderer.d.ts

@@ -1,3 +1,4 @@
+import './assertEnvServer.js';
 import { renderPageServer } from './runtime/renderPageServer.js';
 export { createPageRenderer };
 type Options = {

package/dist/server/createPageRenderer.js

@@ -1,7 +1,8 @@
+import './assertEnvServer.js';
 // TO-DO/next-major-release: remove this file
 //import { SsrEnv, setSsrEnv } from './ssrEnv.js'
 import { renderPageServer } from './runtime/renderPageServer.js';
-import { assertWarning } from './utils.js';
+import { assertWarning } from '../utils/assert.js';
 //import { importBuildWasLoaded } from './importBuild.js'
 export { createPageRenderer };
 /** @deprecated */

package/dist/server/importBuild.d.ts

@@ -1 +1 @@
-export {};
+import './assertEnvServer.js';

package/dist/server/importBuild.js

@@ -1,3 +1,3 @@
+import './assertEnvServer.js';
 // TO-DO/next-major-release: remove
 console.warn("[vike][Warning] importBuild.js is not needed anymore; it has no effect. Remove `import 'dist/server/importBuild.js'` to remove this warning. More infos at https://vike.dev/importBuild.js");
-export {};

package/dist/server/runtime/asyncHook.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvServer.js';
 export { getPageContext_withAsyncHook };
 export { getRequestId_withAsyncHook };
 export { getAsyncLocalStorage };

package/dist/server/runtime/asyncHook.js

@@ -1,8 +1,12 @@
+import '../assertEnvServer.js';
 export { getPageContext_withAsyncHook };
 export { getRequestId_withAsyncHook };
 export { getAsyncLocalStorage };
-import { preparePageContextForPublicUsageServer } from './renderPageServer/preparePageContextForPublicUsageServer.js';
-import { assert, assertIsNotBrowser, getGlobalObject, isObject } from '../utils.js';
+import { getPageContextPublicServer } from './renderPageServer/getPageContextPublicServer.js';
+import { assert } from '../../utils/assert.js';
+import { assertIsNotBrowser } from '../../utils/assertIsNotBrowser.js';
+import { getGlobalObject } from '../../utils/getGlobalObject.js';
+import { isObject } from '../../utils/isObject.js';
 import { import_ } from '@brillout/import';
 assertIsNotBrowser();
 const globalObject = getGlobalObject('server/runtime/asyncHook.ts', {
@@ -39,5 +43,5 @@ function getPageContext_withAsyncHook() {
     const pageContext = asyncStore?.pageContext;
     if (!pageContext)
         return null;
-    return preparePageContextForPublicUsageServer(pageContext);
+    return getPageContextPublicServer(pageContext);
 }

package/dist/server/runtime/createDevMiddleware.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvServer.js';
 export { createDevMiddleware_ as createDevMiddleware };
 import type { createDevMiddleware as createDevMiddlewareType } from '../../node/createDevMiddleware.js';
 declare const createDevMiddleware_: typeof createDevMiddlewareType;

package/dist/server/runtime/createDevMiddleware.js

@@ -1,3 +1,4 @@
+import '../assertEnvServer.js';
 export { createDevMiddleware_ as createDevMiddleware };
 const createDevMiddleware_ = async (...args) => {
     const p = '../../node/createDevMiddleware.js';

package/dist/server/runtime/getPageContext.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvServer.js';
 export { getPageContext };
 export { providePageContext };
 export type { GetPageContextParams };

package/dist/server/runtime/getPageContext.js

@@ -1,3 +1,4 @@
+import '../assertEnvServer.js';
 export { getPageContext };
 export { providePageContext };
 import { getPageContext_withAsyncHook } from './asyncHook.js';

package/dist/server/runtime/globalContext.d.ts

@@ -1,3 +1,4 @@
+import '../assertEnvServer.js';
 export { getGlobalContext };
 export { getGlobalContextSync };
 export { getGlobalContextAsync };

package/dist/server/runtime/globalContext.js

@@ -1,3 +1,4 @@
+import '../assertEnvServer.js';
 // Public use
 export { getGlobalContext };
 export { getGlobalContextSync };
@@ -28,7 +29,22 @@ export { vikeConfigErrorRecoverMsg };
 //   - 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, createDebug, checkType, PROJECT_VERSION, getViteRPC, isRunnableDevEnvironment, assertIsNotBrowser, isNonRunnableDevProcess, objectAssign, setNodeEnvProductionIfUndefined, } from '../utils.js';
+import { PROJECT_VERSION } from '../../utils/PROJECT_VERSION.js';
+import { assert, assertUsage, assertWarning } from '../../utils/assert.js';
+import { assertIsNotBrowser } from '../../utils/assertIsNotBrowser.js';
+import { isPlainObject } from '../../utils/isPlainObject.js';
+import { objectReplace } from '../../utils/objectReplace.js';
+import { genPromise } from '../../utils/genPromise.js';
+import { createDebug } from '../../utils/debug.js';
+import { getViteRPC } from '../../utils/getViteRPC.js';
+import { isRunnableDevEnvironment } from '../../utils/isRunnableDevEnvironment.js';
+import { isNonRunnableDevProcess } from '../../utils/isNonRunnableDevProcess.js';
+import { onSetupRuntime, setNodeEnvProductionIfUndefined } from '../../utils/assertSetup.js';
+import { checkType } from '../../utils/checkType.js';
+import { getGlobalObject } from '../../utils/getGlobalObject.js';
+import { hasProp } from '../../utils/hasProp.js';
+import { isObject } from '../../utils/isObject.js';
+import { objectAssign } from '../../utils/objectAssign.js';
 import { importServerProductionEntry } from '@brillout/vite-plugin-server-entry/runtime';
 import { virtualFileIdGlobalEntryServer } from '../../shared-server-node/virtualFileId.js';
 import pc from '@brillout/picocolors';
@@ -36,7 +52,7 @@ import { loadPageRoutes, loadPageRoutesSync } from '../../shared-server-client/r
 import { assertV1Design } from '../../shared-server-node/assertV1Design.js';
 import { resolveBase } from '../../shared-server-node/resolveBase.js';
 import { createGlobalContextShared, getGlobalContextSyncErrMsg, } from '../../shared-server-client/createGlobalContextShared.js';
-import { prepareGlobalContextForPublicUsage } from '../../shared-server-client/prepareGlobalContextForPublicUsage.js';
+import { getGlobalContextPublicShared } from '../../shared-server-client/getGlobalContextPublicShared.js';
 import { logRuntimeError, logRuntimeInfo } from './loggerRuntime.js';
 import { debugFileChange, getVikeConfigErrorBuild, setVikeConfigError, } from '../../shared-server-node/getVikeConfigError.js';
 import { getVikeApiOperation } from '../../shared-server-node/api-context.js';
@@ -102,7 +118,7 @@ async function getGlobalContextAsync(isProduction) {
     if (!isProduction)
         await globalObject.waitForUserFilesUpdate;
     assertGlobalContextIsDefined();
-    return getGlobalContextForPublicUsage();
+    return getGlobalContextPublic();
 }
 /**
  * Get runtime information about your app.
@@ -119,13 +135,13 @@ function getGlobalContextSync() {
     // - getGlobalContextSync() is used in production by vike-vercel
     //   - https://discord.com/channels/@me/942519153502339072/1389546794676916344 (PM between Rom and Joël)
     "getGlobalContextSync() shouldn't be used in development, see https://vike.dev/getGlobalContext", { onlyOnce: true });
-    return getGlobalContextForPublicUsage();
+    return getGlobalContextPublic();
 }
-function getGlobalContextForPublicUsage() {
+function getGlobalContextPublic() {
     const { globalContext } = globalObjectTyped;
     assert(globalContext);
-    const globalContextForPublicUsage = prepareGlobalContextForPublicUsage(globalContext);
-    return globalContextForPublicUsage;
+    const globalContextPublic = getGlobalContextPublicShared(globalContext);
+    return globalContextPublic;
 }
 async function setGlobalContext_viteDevServer(viteDevServer) {
     debug('setGlobalContext_viteDevServer()');

package/dist/server/runtime/index-deprecated.d.ts

@@ -1 +1,2 @@
+import '../assertEnvServer.js';
 export * from './index.js';

package/dist/server/runtime/index-deprecated.js

@@ -1,7 +1,8 @@
+import '../assertEnvServer.js';
 // TO-DO/eventually: point package.json#exports['./server'] to this file.
 // - Write migration guide, see comment below.
 export * from './index.js';
-import { assertWarning } from '../utils.js';
+import { assertWarning } from '../../utils/assert.js';
 import pc from '@brillout/picocolors';
 assertWarning(false, [
     'You have outdated imports:',

package/dist/server/runtime/index.d.ts

@@ -1,7 +1,8 @@
+import '../assertEnvServer.js';
 export { renderPageServer as renderPage } from './renderPageServer.js';
 export { escapeInject, dangerouslySkipEscape } from './renderPageServer/html/renderHtml.js';
 export { pipeWebStream, pipeNodeStream, pipeStream, stampPipe } from './renderPageServer/html/stream.js';
-export { PROJECT_VERSION as version } from '../utils.js';
+export { PROJECT_VERSION as version } from '../../utils/PROJECT_VERSION.js';
 export { getGlobalContext, getGlobalContextSync, getGlobalContextAsync } from './globalContext.js';
 export { createDevMiddleware } from './createDevMiddleware.js';
 export * from '../../types/index-dreprecated.js';

package/dist/server/runtime/index.js

@@ -1,10 +1,8 @@
-import { isBrowser } from '../../utils/isBrowser.js';
-import { assert } from '../../utils/assert.js';
-assert(!isBrowser());
+import '../assertEnvServer.js';
 export { renderPageServer as renderPage } from './renderPageServer.js';
 export { escapeInject, dangerouslySkipEscape } from './renderPageServer/html/renderHtml.js';
 export { pipeWebStream, pipeNodeStream, pipeStream, stampPipe } from './renderPageServer/html/stream.js';
-export { PROJECT_VERSION as version } from '../utils.js';
+export { PROJECT_VERSION as version } from '../../utils/PROJECT_VERSION.js';
 export { getGlobalContext, getGlobalContextSync, getGlobalContextAsync } from './globalContext.js';
 export { createDevMiddleware } from './createDevMiddleware.js';
 // TO-DO/next-major-release: remove
@@ -12,7 +10,7 @@ export { createDevMiddleware } from './createDevMiddleware.js';
 export * from '../../types/index-dreprecated.js';
 export { injectAssets__public as _injectAssets } from './renderPageServer/html/injectAssets/injectAssets__public.js';
 export { createPageRenderer } from '../createPageRenderer.js';
-import { assertWarning } from '../utils.js';
+import { assertWarning } from '../../utils/assert.js';
 import pc from '@brillout/picocolors';
 import { RenderErrorPage as RenderErrorPage_ } from '../../shared-server-client/route/abort.js';
 /** @deprecated

package/dist/server/runtime/logErrorServer.d.ts

@@ -1,5 +1,6 @@
+import '../assertEnvServer.js';
 export { logErrorServer };
 export { hasAlreadyLogged };
-import type { PageContextCreatedServerBase } from './renderPageServer/createPageContextServerSide.js';
-declare function logErrorServer(err: unknown, pageContext: PageContextCreatedServerBase | null): void;
+import type { PageContextCreatedServer, PageContextCreatedServerWithoutGlobalContext } from './renderPageServer/createPageContextServer.js';
+declare function logErrorServer(err: unknown, pageContext: null | PageContextCreatedServer | PageContextCreatedServerWithoutGlobalContext): void;
 declare function hasAlreadyLogged(err: unknown): boolean;

package/dist/server/runtime/logErrorServer.js

@@ -1,7 +1,13 @@
+import '../assertEnvServer.js';
 export { logErrorServer };
 export { hasAlreadyLogged };
 import pc from '@brillout/picocolors';
-import { assertIsNotBrowser, assertWarning, getGlobalObject, hasRed, isDebugError, isObject } from '../utils.js';
+import { assertWarning } from '../../utils/assert.js';
+import { assertIsNotBrowser } from '../../utils/assertIsNotBrowser.js';
+import { hasRed } from '../../utils/colorsServer.js';
+import { isDebugError } from '../../utils/debug.js';
+import { getGlobalObject } from '../../utils/getGlobalObject.js';
+import { isObject } from '../../utils/isObject.js';
 import { execHookOnError } from './renderPageServer/execHookOnError.js';
 import { addErrorHint } from './renderPageServer/addErrorHint.js';
 import { isAbortError } from '../../shared-server-client/route/abort.js';

package/dist/server/runtime/loggerRuntime.d.ts

@@ -1,13 +1,14 @@
+import '../assertEnvServer.js';
 export declare let logRuntimeError: LogRuntimeError;
 export declare let logRuntimeInfo: LogRuntimeInfo | null | LogRuntimeInfo;
 export { setLogRuntimeDev };
 export { assertPageContext_logRuntime };
 export type { PageContext_logRuntime };
 import type { LogType } from '../../node/vite/shared/loggerDev.js';
-import type { PageContextCreatedServerBase } from './renderPageServer/createPageContextServerSide.js';
+import type { PageContextCreatedServer, PageContextCreatedServerWithoutGlobalContext } from './renderPageServer/createPageContextServer.js';
 type LogRuntimeInfo = (msg: string, pageContext: PageContext_logRuntime, logType: LogType) => void;
 type LogRuntimeError = (err: unknown, pageContext: PageContext_logRuntime) => void;
-type PageContext_logRuntime = null | (PageContextCreatedServerBase & {
+type PageContext_logRuntime = null | ((PageContextCreatedServer | PageContextCreatedServerWithoutGlobalContext) & {
     _requestId: number;
 });
 declare function setLogRuntimeDev(logRuntimeErrorDev: LogRuntimeError, logRuntimeInfoDev: LogRuntimeInfo): void;

package/dist/server/runtime/loggerRuntime.js

@@ -1,10 +1,11 @@
+import '../assertEnvServer.js';
 // Logger used by the the server runtime. (Also during pre-rendering since it uses the sever runtime.)
 export let logRuntimeError;
 export let logRuntimeInfo = null; // is `null` in production
 export { setLogRuntimeDev };
 export { assertPageContext_logRuntime };
 import { loggRuntimeErrorProd } from './renderPageServer/loggerProd.js';
-import { assert } from '../utils.js';
+import { assert } from '../../utils/assert.js';
 // Set production logger (which is overwritten by loggerDev.ts in non-production environments such as development and during pre-rendering)
 logRuntimeError =
     // @ts-expect-error

package/dist/server/runtime/page-files/setup.d.ts

@@ -1 +1 @@
-export {};
+import '../../assertEnvServer.js';

package/dist/server/runtime/page-files/setup.js

@@ -1,4 +1,4 @@
-export {};
+import '../../assertEnvServer.js';
 // TO-DO/eventually: remove
 // - This was used by some older Vike extensions made by Joël (I believe vite-plugin-vercel)
 // - See also https://github.com/vikejs/vike/issues/2122