vike 0.4.228-commit-84954ae → 0.4.228-commit-0e9e0f2

package/dist/cjs/client/shared/createGetGlobalContext.js

@@ -20,7 +20,14 @@ function createGetGlobalContext(virtualFileExports, isClientRouting, addGlobalCo
         }
         // Create
         const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, async (globalContext) => {
-            const globalContextAddendum = {};
+            const globalContextAddendum = {
+                /**
+                 * Whether the environment is client-side or server-side / pre-rendering.
+                 *
+                 * We recommend using `import.meta.env.SSR` instead, see https://vike.dev/globalContext
+                 */
+                isClientSide: true
+            };
             (0, utils_js_1.objectAssign)(globalContextAddendum, (0, getJsonSerializedInHtml_js_1.getGlobalContextSerializedInHtml)());
             (0, utils_js_1.objectAssign)(globalContextAddendum, await addGlobalContext?.(globalContext));
             return globalContextAddendum;

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/resolvePointerImport.js

@@ -73,7 +73,7 @@ function resolveImportPathWithNode(pointerImportData, importerFilePath, userRoot
     // filePathAbsoluteFilesystem is null when pointerImportData.importPath is a path alias that Node.js doesn't know about
     const filePathAbsoluteFilesystem = (0, utils_js_1.requireResolveOptional)({
         importPath: pointerImportData.importPath,
-        importerFile: importerFilePathAbsolute,
+        importerFilePath: importerFilePathAbsolute,
         userRootDir
     });
     if (!filePathAbsoluteFilesystem) {

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

@@ -113,7 +113,16 @@ function getGlobalContextSync() {
     return globalContext_public;
 }
 function makePublic(globalContext) {
-    const globalContextPublic = (0, utils_js_1.getPublicProxy)(globalContext, 'globalContext', ['assetsManifest', 'config', 'viteConfig', 'viteConfigRuntime', 'pages', 'baseServer', 'baseAssets'], true);
+    const globalContextPublic = (0, utils_js_1.getPublicProxy)(globalContext, 'globalContext', [
+        'assetsManifest',
+        'config',
+        'viteConfig',
+        'viteConfigRuntime',
+        'pages',
+        'baseServer',
+        'baseAssets',
+        'isClientSide'
+    ], true);
     return globalContextPublic;
 }
 async function setGlobalContext_viteDevServer(viteDevServer) {
@@ -338,6 +347,7 @@ async function setGlobalContext(virtualFileExports) {
 async function addGlobalContext(globalContext) {
     const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
     const globalContextBase = {
+        isClientSide: false,
         _pageRoutes: pageRoutes,
         _onBeforeRouteHook: onBeforeRouteHook
     };

package/dist/cjs/node/runtime/renderPage/preparePageContextForUserConsumptionServerSide.js

@@ -9,7 +9,7 @@ function preparePageContextForUserConsumptionServerSide(pageContext) {
     (0, utils_js_1.assert)((0, utils_js_1.isPlainObject)(pageContext.routeParams));
     (0, utils_js_1.assert)('Page' in pageContext);
     (0, utils_js_1.assert)(typeof pageContext.isClientSideNavigation === 'boolean');
-    (0, utils_js_1.assert)(pageContext._isPageContextObject);
+    (0, utils_js_1.assert)(pageContext.isPageContext);
     (0, utils_js_1.assert)(pageContext.isClientSide === false);
     (0, utils_js_1.assert)(typeof pageContext.isPrerendering === 'boolean');
     (0, preparePageContextForUserConsumption_js_1.preparePageContextForUserConsumption)(pageContext);

package/dist/cjs/shared/assertPageContextProvidedByUser.js

@@ -12,7 +12,7 @@ function assertPageContextProvidedByUser(pageContextProvidedByUser, { hookName,
     (0, utils_js_1.assert)(!hookName.endsWith(')'));
     const errPrefix = `The ${picocolors_1.default.cyan('pageContext')} object provided by the ${hookName}() hook defined by ${hookFilePath}`;
     (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(pageContextProvidedByUser), `${errPrefix} should be an object (but it's ${picocolors_1.default.cyan(`typeof pageContext === ${JSON.stringify(typeof pageContextProvidedByUser)}`)} instead)`);
-    (0, utils_js_1.assertUsage)(!('_isPageContextObject' in pageContextProvidedByUser), `${errPrefix} shouldn't be the whole ${picocolors_1.default.cyan('pageContext')} object, see https://vike.dev/pageContext-manipulation#do-not-return-entire-pagecontext`);
+    (0, utils_js_1.assertUsage)(!('isPageContext' in pageContextProvidedByUser), `${errPrefix} shouldn't be the whole ${picocolors_1.default.cyan('pageContext')} object, see https://vike.dev/pageContext-manipulation#do-not-return-entire-pagecontext`);
     // In principle, it's possible to use onBeforeRoute()` to override and define the whole routing.
     // Is that a good idea to allow users to do this? Beyond deep integration with Vue Router or React Router, is there a use case for this?
     (0, utils_js_1.assertWarning)(!('pageId' in pageContextProvidedByUser), `${errPrefix} sets ${picocolors_1.default.cyan('pageContext.pageId')} which means that Vike's routing is overriden. This is an experimental feature: make sure to contact a vike maintainer before using this.`, { onlyOnce: true });

package/dist/cjs/shared/createGlobalContextShared.js

@@ -33,6 +33,12 @@ async function createGlobalContextShared(virtualFileExports, globalObject, addGl
 function createGlobalContextBase(virtualFileExports) {
     const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig, pageConfigsUserFriendly } = (0, getPageConfigsRuntime_js_1.getPageConfigsRuntime)(virtualFileExports);
     const globalContext = {
+        /**
+         * Useful for distinguishing `globalContext` from other objects and narrowing down TypeScript unions.
+         *
+         * https://vike.dev/globalContext#typescript
+         */
+        isGlobalContext: true,
         _virtualFileExports: virtualFileExports,
         _pageFilesAll: pageFilesAll,
         _pageConfigs: pageConfigs,

package/dist/cjs/shared/createPageContextShared.js

@@ -9,7 +9,7 @@ async function createPageContextShared(pageContextCreated, pageConfigGlobal) {
         pageConfigGlobalValues: pageConfigGlobal.configValues
     });
     (0, utils_js_1.objectAssign)(pageContextCreated, {
-        _isPageContextObject: true,
+        isPageContext: true,
         ...pageConfigGlobalUserFriendly
     }, true);
     await (0, executeHookGeneric_js_1.executeHookGenericGlobalCumulative)('onCreatePageContext', pageConfigGlobal, pageContextCreated, pageContextCreated);

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.228-commit-84954ae';
+exports.PROJECT_VERSION = '0.4.228-commit-0e9e0f2';

package/dist/cjs/utils/objectAssign.js

@@ -9,6 +9,6 @@ function objectAssign(obj, objAddendum, objAddendumCanBePageContextObject) {
     if (!objAddendum)
         return;
     if (!objAddendumCanBePageContextObject)
-        (0, assert_js_1.assert)(!('_isPageContextObject' in objAddendum));
+        (0, assert_js_1.assert)(!('isPageContext' in objAddendum));
     Object.defineProperties(obj, Object.getOwnPropertyDescriptors(objAddendum));
 }

package/dist/cjs/utils/requireResolve.js

@@ -16,93 +16,117 @@ const isScriptFile_js_1 = require("./isScriptFile.js");
 const node_module_1 = require("node:module");
 const node_path_1 = __importDefault(require("node:path"));
 const parseNpmPackage_js_1 = require("./parseNpmPackage.js");
+const isNullish_js_1 = require("./isNullish.js");
 // @ts-ignore `file:///${__filename.split('\\').join('/')}` is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = `file:///${__filename.split('\\').join('/')}`;
+(0, path_js_1.assertPosixPath)(importMetaUrl);
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 (0, assertSetup_js_1.assertIsNotProductionRuntime)();
-function requireResolve_(importPath, importerFile, options) {
-    (0, path_js_1.assertPosixPath)(importerFile);
+// - We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
+//   - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
+// - Passing context to createRequire(context) isn't equivalent to passing it to the `paths` argument of require.resolve()
+//   - https://github.com/brillout/require-test
+//   - In practice, I guess it doesn't make a difference? It just seems to be small Node.js weirdness.
+// - The argument createRequire(argument) seems to be overriden by the `paths` argument require.resolve()
+//   - For example, passing an empty array to `paths` kills the argument passed to `createRequire()`
+//   - Thus, when `paths` is defined, then the context needs to be passed to both createRequire() as well as the `paths` argument of require.resolve()
+function requireResolve_(importPath, importerFilePath, { userRootDir, doNotHandleFileExtension } = {}) {
     (0, path_js_1.assertPosixPath)(importPath);
-    (0, path_js_1.assertPosixPath)(importMetaUrl);
-    (0, assert_js_1.assert)(node_path_1.default.posix.basename(importerFile).includes('.'), { cwd: importerFile });
-    const importerPath = addFilePrefix(importerFile);
-    const require_ = (0, node_module_1.createRequire)(importerPath);
-    if (!options?.doNotHandleFileExtension) {
-        addFileExtensionsToRequireResolve(require_);
-        importPath = removeFileExtention(importPath);
+    const contexts = importerFilePath
+        ? [importerFilePath]
+        : [userRootDir ? getFakeImporterFile(userRootDir) : importMetaUrl];
+    addExtraContextForNpmPackageImport(contexts, { importPath, userRootDir });
+    let importPathResolvedFilePath;
+    let failure;
+    for (const context of contexts) {
+        (0, path_js_1.assertPosixPath)(context);
+        const require_ = (0, node_module_1.createRequire)(ensureFilePrefix(context));
+        if (!doNotHandleFileExtension) {
+            addFileExtensionsToRequireResolve(require_);
+            importPath = removeFileExtention(importPath);
+        }
+        try {
+            importPathResolvedFilePath = require_.resolve(importPath);
+        }
+        catch (err) {
+            /* DEBUG
+            console.log('err', err)
+            console.log('importPath', importPath)
+            console.log('importerFilePath', importerFilePath)
+            console.log('context', context)
+            console.log('importMetaUrl', importMetaUrl)
+            console.log('paths', paths)
+            //*/
+            failure ?? (failure = { err });
+        }
+        if (importPathResolvedFilePath)
+            break;
     }
-    const paths = !options?.paths
-        ? undefined
-        : [
-            // Seems like `importerPath` gets overriden by the `paths` argument, so we add it to `paths`. (For example, passing an empty array to `paths` kills the argument passed to `createRequire()`.)
-            toDirPath(importerFile),
-            ...(options?.paths || [])
-        ];
-    let importedFile;
-    try {
-        // We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
-        // - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
-        importedFile = require_.resolve(importPath, { paths });
+    if (!importPathResolvedFilePath) {
+        (0, assert_js_1.assert)(failure);
+        return { importPathResolvedFilePath: undefined, err: failure.err, hasFailed: true };
     }
-    catch (err) {
-        return { importedFile: undefined, err, hasFailed: true };
+    else {
+        (0, assert_js_1.assert)(importPathResolvedFilePath);
+        importPathResolvedFilePath = (0, path_js_1.toPosixPath)(importPathResolvedFilePath);
+        return { importPathResolvedFilePath, err: undefined, hasFailed: false };
     }
-    importedFile = (0, path_js_1.toPosixPath)(importedFile);
-    return { importedFile, err: undefined, hasFailed: false };
 }
-function requireResolveOptional({ importPath, importerFile, userRootDir }) {
-    const paths = getExtraPathsForNpmPackageImport({ importPath, userRootDir });
-    const res = requireResolve_(importPath, importerFile, { paths });
+function requireResolveOptional({ importPath, importerFilePath, userRootDir }) {
+    const res = requireResolve_(importPath, importerFilePath, { userRootDir });
     if (res.hasFailed)
         return null;
-    return res.importedFile;
+    return res.importPathResolvedFilePath;
 }
 function requireResolveOptionalDir({ importPath, importerDir, userRootDir }) {
-    const importerFile = getFakeFilePath(importerDir);
-    const paths = getExtraPathsForNpmPackageImport({ importPath, userRootDir });
-    const res = requireResolve_(importPath, importerFile, { paths });
+    const importerFilePath = getFakeImporterFile(importerDir);
+    const res = requireResolve_(importPath, importerFilePath, { userRootDir });
     if (res.hasFailed)
         return null;
-    return res.importedFile;
+    return res.importPathResolvedFilePath;
 }
 function requireResolveNpmPackage({ importPathNpmPackage, userRootDir }) {
     (0, parseNpmPackage_js_1.assertIsImportPathNpmPackage)(importPathNpmPackage);
-    const importerFile = getFakeFilePath(userRootDir);
-    const paths = getExtraPathsForNpmPackageImport({ importPath: importPathNpmPackage, userRootDir });
-    const res = requireResolve_(importPathNpmPackage, importerFile, { paths });
+    const importerFilePath = getFakeImporterFile(userRootDir);
+    const res = requireResolve_(importPathNpmPackage, importerFilePath, { userRootDir });
     if (res.hasFailed)
         throw res.err;
-    return res.importedFile;
+    return res.importPathResolvedFilePath;
 }
 function requireResolveVikeDistFile(vikeDistFile) {
     const vikeNodeModulesRoot = getVikeNodeModulesRoot();
     (0, path_js_1.assertPosixPath)(vikeNodeModulesRoot);
     (0, path_js_1.assertPosixPath)(vikeDistFile);
-    const importedFile = node_path_1.default.posix.join(vikeNodeModulesRoot, vikeDistFile);
+    const importPathResolvedFilePath = node_path_1.default.posix.join(vikeNodeModulesRoot, vikeDistFile);
     // Double check
     {
-        const res = requireResolve_(importedFile, 
-        // Passing some dummy context as the context isn't needed since importerFile is already resolved and absolute
-        importMetaUrl, { doNotHandleFileExtension: true });
+        const res = requireResolve_(importPathResolvedFilePath, 
+        // No context needed: importPathResolvedFilePath is already resolved and absolute
+        null, { doNotHandleFileExtension: true });
         if (res.hasFailed)
             throw res.err;
-        (0, assert_js_1.assert)(res.importedFile === importedFile);
+        (0, assert_js_1.assert)(res.importPathResolvedFilePath === importPathResolvedFilePath);
     }
-    return importedFile;
+    return importPathResolvedFilePath;
 }
-function getExtraPathsForNpmPackageImport({ importPath, userRootDir }) {
-    if (
-    // Ideally we'd set `paths` only for npm packages, but unfortunately we cannot always disambiguate between npm package imports and path aliases.
-    !(0, parseNpmPackage_js_1.isImportPathNpmPackageOrPathAlias)(importPath)) {
-        return undefined;
-    }
-    const paths = [
+function addExtraContextForNpmPackageImport(contexts, { importPath, userRootDir }) {
+    // We should add extra context only for npm packages, but unfortunately we cannot always disambiguate between npm package imports and path aliases.
+    if (!(0, parseNpmPackage_js_1.isImportPathNpmPackageOrPathAlias)(importPath))
+        return;
+    const userRootDirFakeFile = userRootDir && getFakeImporterFile(userRootDir);
+    [
         // Workaround for monorepo resolve issue: https://github.com/vikejs/vike-react/pull/161/commits/dbaa6643e78015ac2797c237552800fef29b72a7
-        userRootDir,
-        // I can't think of a use case where this would be needed, but let's add it to be extra safe
-        toDirPath(importMetaUrl)
-    ];
-    return paths;
+        userRootDirFakeFile,
+        // I can't think of a use case where this would be needed, but let's add one extra last chance to sucessfully resolve some complex monorepo setups
+        importMetaUrl
+    ]
+        .filter(isNullish_js_1.isNotNullish)
+        .forEach((context) => {
+        const alreadyHasContext = contexts.includes(context) || contexts.includes(ensureFilePrefix(context));
+        if (alreadyHasContext)
+            return;
+        contexts.push(context);
+    });
 }
 function removeFileExtention(importPath) {
     // Skip for Bun: https://github.com/vikejs/vike/issues/2204
@@ -137,16 +161,14 @@ function getVikeNodeModulesRoot() {
     const vikeNodeModulesRoot = node_path_1.default.posix.join(removeFilePrefix(importMetaUrl), '../../../../');
     return vikeNodeModulesRoot;
 }
-function toDirPath(filePath) {
-    return node_path_1.default.posix.dirname(removeFilePrefix(filePath));
-}
-function getFakeFilePath(dirPath) {
+function getFakeImporterFile(dirPath) {
     (0, path_js_1.assertPosixPath)(dirPath);
-    (0, assert_js_1.assert)(!dirPath.startsWith('file')); // The file:// prefix is bogus with path.join
-    const filePath = node_path_1.default.posix.join(dirPath, 'fakeFileForNodeResolve.js');
-    return filePath;
+    (0, assert_js_1.assert)(!dirPath.startsWith('file')); // The file:// prefix is bogus when used with path.posix.join()
+    const importerFilePath = node_path_1.default.posix.join(dirPath, 'fakeFileForNodeResolve.js');
+    return importerFilePath;
 }
-function addFilePrefix(filePath) {
+function ensureFilePrefix(filePath) {
+    (0, path_js_1.assertPosixPath)(filePath);
     const filePrefix = getFilePrefix();
     if (!filePath.startsWith(filePrefix)) {
         (0, assert_js_1.assert)(!filePath.startsWith('file'));

package/dist/esm/client/client-routing-runtime/createPageContext.d.ts

@@ -1,6 +1,7 @@
 export { createPageContextClientSide };
 declare function createPageContextClientSide(urlOriginal: string): Promise<{
     globalContext: {
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
         _pageConfigs: import("../../__internal/index.js").PageConfig[];
@@ -8,7 +9,9 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
         _allPageIds: string[];
         config: import("../../types/index.js").ConfigResolved;
         pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
-    } & object & {
+    } & {
+        isClientSide: true;
+    } & {
         _pageRoutes: import("../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
     };
@@ -33,5 +36,5 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
     _source: import("../../shared/page-configs/getPageConfigUserFriendly.js").Source;
     _sources: import("../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
     _from: import("../../shared/page-configs/getPageConfigUserFriendly.js").From;
-    _isPageContextObject: boolean;
+    isPageContext: true;
 }>;

package/dist/esm/client/client-routing-runtime/globalContext.d.ts

@@ -1,8 +1,10 @@
 export { getGlobalContext };
 export type { GlobalContextClient };
 import type { GlobalContextSharedPublic } from '../../shared/createGlobalContextShared.js';
-type GlobalContextClient = GlobalContextSharedPublic & Vike.GlobalContext & Vike.GlobalContextClient & {};
+type GlobalContextClient = GlobalContextSharedPublic & Pick<GlobalContextClientInternal, 'isClientSide'> & Vike.GlobalContext & Vike.GlobalContextClient & {};
+type GlobalContextClientInternal = Awaited<ReturnType<typeof getGlobalContext>>;
 declare const getGlobalContext: () => Promise<{
+    isGlobalContext: true;
     _virtualFileExports: unknown;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../__internal/index.js").PageConfig[];
@@ -10,7 +12,9 @@ declare const getGlobalContext: () => Promise<{
     _allPageIds: string[];
     config: import("../../types/index.js").ConfigResolved;
     pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
-} & object & {
+} & {
+    isClientSide: true;
+} & {
     _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
     _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
 }>;

package/dist/esm/client/server-routing-runtime/createPageContextClientSide.d.ts

@@ -1,6 +1,7 @@
 export { createPageContextClientSide };
 declare function createPageContextClientSide(): Promise<{
     globalContext: {
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
         _pageConfigs: import("../../__internal/index.js").PageConfig[];
@@ -8,6 +9,8 @@ declare function createPageContextClientSide(): Promise<{
         _allPageIds: string[];
         config: import("../../types/index.js").ConfigResolved;
         pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+    } & {
+        isClientSide: true;
     } & object;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../__internal/index.js").PageConfig[];
@@ -29,5 +32,5 @@ declare function createPageContextClientSide(): Promise<{
     _source: import("../../shared/page-configs/getPageConfigUserFriendly.js").Source;
     _sources: import("../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
     _from: import("../../shared/page-configs/getPageConfigUserFriendly.js").From;
-    _isPageContextObject: boolean;
+    isPageContext: true;
 }>;

package/dist/esm/client/server-routing-runtime/globalContext.d.ts

@@ -3,6 +3,7 @@ export type { GlobalContextClientWithServerRouting };
 import type { GlobalContextSharedPublic } from '../../shared/createGlobalContextShared.js';
 type GlobalContextClientWithServerRouting = GlobalContextSharedPublic & Vike.GlobalContext & Vike.GlobalContextClient & {};
 declare const getGlobalContext: () => Promise<{
+    isGlobalContext: true;
     _virtualFileExports: unknown;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../__internal/index.js").PageConfig[];
@@ -10,4 +11,6 @@ declare const getGlobalContext: () => Promise<{
     _allPageIds: string[];
     config: import("../../types/index.js").ConfigResolved;
     pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+} & {
+    isClientSide: true;
 } & object>;

package/dist/esm/client/shared/createGetGlobalContext.d.ts

@@ -1,6 +1,7 @@
 export { createGetGlobalContext };
 import { type GlobalContextShared } from '../../shared/createGlobalContextShared.js';
 declare function createGetGlobalContext<GlobalContextAddendum extends object>(virtualFileExports: unknown, isClientRouting: boolean, addGlobalContext?: (globalContext: GlobalContextShared) => Promise<GlobalContextAddendum>): () => Promise<{
+    isGlobalContext: true;
     _virtualFileExports: unknown;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../__internal/index.js").PageConfig[];
@@ -8,4 +9,11 @@ declare function createGetGlobalContext<GlobalContextAddendum extends object>(vi
     _allPageIds: string[];
     config: import("../../types/index.js").ConfigResolved;
     pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
-} & Awaited<object & Awaited<GlobalContextAddendum>>>;
+} & Awaited<{
+    /**
+     * Whether the environment is client-side or server-side / pre-rendering.
+     *
+     * We recommend using `import.meta.env.SSR` instead, see https://vike.dev/globalContext
+     */
+    isClientSide: true;
+} & Awaited<GlobalContextAddendum>>>;

package/dist/esm/client/shared/createGetGlobalContext.js

@@ -18,7 +18,14 @@ function createGetGlobalContext(virtualFileExports, isClientRouting, addGlobalCo
         }
         // Create
         const globalContext = await createGlobalContextShared(virtualFileExports, globalObject, async (globalContext) => {
-            const globalContextAddendum = {};
+            const globalContextAddendum = {
+                /**
+                 * Whether the environment is client-side or server-side / pre-rendering.
+                 *
+                 * We recommend using `import.meta.env.SSR` instead, see https://vike.dev/globalContext
+                 */
+                isClientSide: true
+            };
             objectAssign(globalContextAddendum, getGlobalContextSerializedInHtml());
             objectAssign(globalContextAddendum, await addGlobalContext?.(globalContext));
             return globalContextAddendum;

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/resolvePointerImport.js

@@ -68,7 +68,7 @@ function resolveImportPathWithNode(pointerImportData, importerFilePath, userRoot
     // filePathAbsoluteFilesystem is null when pointerImportData.importPath is a path alias that Node.js doesn't know about
     const filePathAbsoluteFilesystem = requireResolveOptional({
         importPath: pointerImportData.importPath,
-        importerFile: importerFilePathAbsolute,
+        importerFilePath: importerFilePathAbsolute,
         userRootDir
     });
     if (!filePathAbsoluteFilesystem) {

package/dist/esm/node/prerender/runPrerender.d.ts

@@ -75,6 +75,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
 } & {
     globalContext: GlobalContextServer;
     _globalContext: {
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
@@ -100,8 +101,10 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         };
         baseServer: string;
         baseAssets: string;
+        isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
@@ -128,8 +131,10 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _usesClientRouter: boolean;
         baseServer: string;
         baseAssets: string;
+        isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
@@ -156,8 +161,10 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _usesClientRouter: boolean;
         baseServer: string;
         baseAssets: string;
+        isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
@@ -190,7 +197,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     _source: import("../../shared/page-configs/getPageConfigUserFriendly.js").Source;
     _sources: import("../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
     _from: import("../../shared/page-configs/getPageConfigUserFriendly.js").From;
-    _isPageContextObject: boolean;
+    isPageContext: true;
 } & {
     _urlHandler: null;
     _httpRequestId: null;
@@ -209,6 +216,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
 } & {
     globalContext: GlobalContextServer;
     _globalContext: {
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
@@ -234,8 +242,10 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         };
         baseServer: string;
         baseAssets: string;
+        isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
@@ -262,8 +272,10 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _usesClientRouter: boolean;
         baseServer: string;
         baseAssets: string;
+        isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
@@ -290,8 +302,10 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _usesClientRouter: boolean;
         baseServer: string;
         baseAssets: string;
+        isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+        isGlobalContext: true;
         _virtualFileExports: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../shared/page-configs/PageConfig.js").PageConfigRuntime[];
@@ -324,7 +338,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     _source: import("../../shared/page-configs/getPageConfigUserFriendly.js").Source;
     _sources: import("../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
     _from: import("../../shared/page-configs/getPageConfigUserFriendly.js").From;
-    _isPageContextObject: boolean;
+    isPageContext: true;
 } & {
     _urlHandler: null;
     _httpRequestId: null;