vike 0.4.228-commit-0e9e0f2 → 0.4.228-commit-1bb55f1

package/dist/cjs/__internal/index.js

@@ -17,7 +17,7 @@ const assertSetup_js_1 = require("../utils/assertSetup.js");
 async function getPagesAndRoutes() {
     (0, assertSetup_js_1.setNodeEnvProduction)();
     await (0, globalContext_js_2.initGlobalContext_getPagesAndRoutes)();
-    const { globalContext } = await (0, globalContext_js_2.getGlobalContextInternal)();
+    const { globalContext } = await (0, globalContext_js_2.getGlobalContextServerInternal)();
     const { 
     //
     _pageRoutes: pageRoutes, _pageFilesAll: pageFilesAll, _pageConfigs: pageConfigs, _allPageIds: allPageIds } = globalContext;

package/dist/cjs/client/client-routing-runtime/globalContext.js

@@ -33,13 +33,13 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGlobalContext = void 0;
-const createGetGlobalContext_js_1 = require("../shared/createGetGlobalContext.js");
+exports.getGlobalContextClientInternal = void 0;
+const createGetGlobalContextClient_js_1 = require("../shared/createGetGlobalContextClient.js");
 const loadPageRoutes_js_1 = require("../../shared/route/loadPageRoutes.js");
 // @ts-ignore
 const virtualFileExports = __importStar(require("virtual:vike:importUserCode:client:client-routing"));
-const getGlobalContext = (0, createGetGlobalContext_js_1.createGetGlobalContext)(virtualFileExports, true, addGlobalContext);
-exports.getGlobalContext = getGlobalContext;
+const getGlobalContextClientInternal = (0, createGetGlobalContextClient_js_1.createGetGlobalContextClient)(virtualFileExports, true, addGlobalContext);
+exports.getGlobalContextClientInternal = getGlobalContextClientInternal;
 async function addGlobalContext(globalContext) {
     const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
     return {

package/dist/cjs/client/server-routing-runtime/globalContext.js

@@ -33,9 +33,9 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGlobalContext = void 0;
-const createGetGlobalContext_js_1 = require("../shared/createGetGlobalContext.js");
+exports.getGlobalContextClientInternal = void 0;
+const createGetGlobalContextClient_js_1 = require("../shared/createGetGlobalContextClient.js");
 // @ts-ignore
 const virtualFileExports = __importStar(require("virtual:vike:importUserCode:client:server-routing"));
-const getGlobalContext = (0, createGetGlobalContext_js_1.createGetGlobalContext)(virtualFileExports, false);
-exports.getGlobalContext = getGlobalContext;
+const getGlobalContextClientInternal = (0, createGetGlobalContextClient_js_1.createGetGlobalContextClient)(virtualFileExports, false);
+exports.getGlobalContextClientInternal = getGlobalContextClientInternal;

package/dist/cjs/client/shared/{createGetGlobalContext.js → createGetGlobalContextClient.js}

@@ -1,11 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createGetGlobalContext = createGetGlobalContext;
+exports.getGlobalContext = getGlobalContext;
+exports.getGlobalContextSync = getGlobalContextSync;
+exports.createGetGlobalContextClient = createGetGlobalContextClient;
 const createGlobalContextShared_js_1 = require("../../shared/createGlobalContextShared.js");
 const getJsonSerializedInHtml_js_1 = require("./getJsonSerializedInHtml.js");
 const utils_js_1 = require("./utils.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('createGetGlobalContext.ts', {});
-function createGetGlobalContext(virtualFileExports, isClientRouting, addGlobalContext) {
+const globalObject = (0, utils_js_1.getGlobalObject)('createGetGlobalContextClient.ts', (() => {
+    const { promise: globalContextPromise, resolve: globalContextPromiseResolve } = (0, utils_js_1.genPromise)();
+    return {
+        globalContextPromise,
+        globalContextPromiseResolve
+    };
+})());
+function createGetGlobalContextClient(virtualFileExports, isClientRouting, addGlobalContext) {
     (0, utils_js_1.assert)(globalObject.isClientRouting === undefined || globalObject.isClientRouting === isClientRouting);
     globalObject.isClientRouting = isClientRouting;
     // Eagerly call onCreateGlobalContext() hook
@@ -32,7 +40,19 @@ function createGetGlobalContext(virtualFileExports, isClientRouting, addGlobalCo
             (0, utils_js_1.objectAssign)(globalContextAddendum, await addGlobalContext?.(globalContext));
             return globalContextAddendum;
         });
+        (0, utils_js_1.assert)(globalObject.globalContext);
+        globalObject.globalContextPromiseResolve(globalObject.globalContext);
         // Return
         return globalContext;
     }
 }
+// The type is never used: it's the type of the server-side getGlobalContext() that is used.
+async function getGlobalContext() {
+    const globalContext = await globalObject.globalContextPromise;
+    return globalContext;
+}
+function getGlobalContextSync() {
+    const { globalContext } = globalObject;
+    (0, utils_js_1.assertUsage)(globalContext, createGlobalContextShared_js_1.getGlobalContextSyncErrMsg);
+    return globalContext;
+}

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

@@ -19,3 +19,4 @@ __exportStar(require("../../utils/parseUrl.js"), exports);
 __exportStar(require("../../utils/getGlobalObject.js"), exports);
 __exportStar(require("../../utils/objectAssign.js"), exports);
 __exportStar(require("../../utils/hasProp.js"), exports);
+__exportStar(require("../../utils/genPromise.js"), exports);

package/dist/cjs/node/plugin/plugins/commonConfig.js

@@ -158,14 +158,17 @@ function assertSingleInstance(config) {
 function assertVikeCliOrApi(config) {
     if ((0, context_js_1.isVikeCliOrApi)())
         return;
-    if ((0, utils_js_1.isVitest)())
-        return;
     if ((0, isViteCliCall_js_1.isViteCliCall)()) {
+        (0, utils_js_1.assert)(!(0, utils_js_1.isVitest)());
         (0, utils_js_1.assertWarning)(false, `Vite's CLI is deprecated ${picocolors_1.default.underline('https://vike.dev/migration/cli')}`, {
             onlyOnce: true
         });
         return;
     }
+    if ((0, utils_js_1.isVitest)()) {
+        (0, utils_js_1.assertWarning)(false, `Unexpected Vitest setup: you seem to be using Vitest together with Vike's Vite plugin but without using Vike's JavaScript API which is unexpected, see ${picocolors_1.default.underline('https://vike.dev/vitest')}`, { onlyOnce: true });
+        return;
+    }
     if (config.server.middlewareMode) {
         (0, utils_js_1.assertWarning)(false, `${picocolors_1.default.cyan('vite.createServer()')} is deprecated ${picocolors_1.default.underline('https://vike.dev/migration/cli#api')}`, {
             onlyOnce: true

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

@@ -212,7 +212,6 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                             //   - Vike doesn't resolve path aliases at all.
                             //   - Node.js doesn't support `tsconfig.js#compilerOptions.paths`.
                             // - Esbuild path alias resolution seems reliable, e.g. it supports `tsconfig.js#compilerOptions.paths`.
-                            (0, utils_js_1.assert)(!(0, utils_js_1.isImportPathNpmPackageOrPathAlias)(importPathOriginal));
                             importPathTranspiled = importPathResolved;
                         }
                         else {

package/dist/cjs/node/prerender/runPrerender.js

@@ -132,7 +132,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
     }
     const concurrencyLimit = (0, utils_js_1.pLimit)(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? (0, os_1.cpus)().length : parallel);
     await (0, globalContext_js_1.initGlobalContext_runPrerender)();
-    const { globalContext, globalContext_public } = await (0, globalContext_js_1.getGlobalContextInternal)();
+    const { globalContext, globalContext_public } = await (0, globalContext_js_1.getGlobalContextServerInternal)();
     globalContext._pageFilesAll.forEach(assertExportNames);
     const prerenderContext = {
         pageContexts: [],

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalContext = getGlobalContext;
 exports.getGlobalContextSync = getGlobalContextSync;
 exports.getGlobalContextAsync = getGlobalContextAsync;
-exports.getGlobalContextInternal = getGlobalContextInternal;
+exports.getGlobalContextServerInternal = getGlobalContextServerInternal;
 exports.getViteDevServer = getViteDevServer;
 exports.getViteConfig = getViteConfig;
 exports.initGlobalContext_renderPage = initGlobalContext_renderPage;
@@ -41,8 +41,8 @@ const globalObject = (0, utils_js_1.getGlobalObject)('runtime/globalContext.ts',
 // Trick to break down TypeScript circular dependency
 // https://chat.deepseek.com/a/chat/s/d7e9f90a-c7f3-4108-9cd5-4ad6caed3539
 const globalObjectTyped = globalObject;
-async function getGlobalContextInternal() {
-    // getGlobalContextInternal() should always be called after initGlobalContext()
+async function getGlobalContextServerInternal() {
+    // getGlobalContextServerInternal() should always be called after initGlobalContext()
     (0, utils_js_1.assert)(globalObject.isInitialized);
     assertGlobalContextIsDefined();
     if (globalObject.isProduction !== true)
@@ -64,6 +64,7 @@ function assertGlobalContextIsDefined() {
     (0, utils_js_1.assert)(globalObject.globalContext);
     (0, utils_js_1.assert)(globalObject.globalContext_public);
 }
+// We purposely return GlobalContext instead of GlobalContextServer because `import { getGlobalContext } from 'vike'` can resolve to the client-side implementation.
 /**
  * Get runtime information about your app.
  *
@@ -105,9 +106,9 @@ async function getGlobalContextAsync(isProduction) {
 function getGlobalContextSync() {
     debug('getGlobalContextSync()');
     const { globalContext_public } = globalObjectTyped;
-    (0, utils_js_1.assertUsage)(globalContext_public, "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.");
+    (0, utils_js_1.assertUsage)(globalContext_public, createGlobalContextShared_js_1.getGlobalContextSyncErrMsg);
     (0, utils_js_1.assertWarning)(false, 
-    // We discourage users from using it because using `pageContext.globalContext` is better: it doesn't have the race condition issue that `getGlobalContextSync()` would have when called inside React/Vue components.
+    // We discourage users from using it because `pageContext.globalContext` is safer: I ain't sure but there could be race conditions when using `getGlobalContextSync()` inside React/Vue components upon HMR.
     // We're lying about "is going to be deprecated in the next major release": let's keep it and see if users need it (so far I can't see a use case for it).
     'getGlobalContextSync() is going to be deprecated in the next major release, see https://vike.dev/getGlobalContext', { onlyOnce: true });
     return globalContext_public;

package/dist/cjs/node/runtime/index-deprecated.js

@@ -1,6 +1,4 @@
 "use strict";
-// TODO/v1-release: replace this with:
-// assertUsage(false, "`import { something } from 'vike'` doesn't exist: instead import from 'vike/server', 'vike/client', 'vike/plugin', ...")
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -19,44 +17,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RenderErrorPage = void 0;
-const isBrowser_js_1 = require("../../utils/isBrowser.js");
-const assert_js_1 = require("../../utils/assert.js");
-(0, assert_js_1.assertUsage)(!(0, isBrowser_js_1.isBrowser)(), "It's forbidden to `import { something } from 'vike'` on the client-side: the module 'vike' is a server-only module.", { showStackTrace: true });
-__exportStar(require("./index-common.js"), exports);
-__exportStar(require("../../types/index-dreprecated.js"), exports);
+// TODO/soon: point package.json#exports['./server'] to this file.
+// - Write migration guide, see comment below.
+__exportStar(require("./index.js"), exports);
 const utils_js_1 = require("./utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const abort_js_1 = require("../../shared/route/abort.js");
-/** @deprecated
- * Replace:
- *   ```
- *   import { RenderErrorPage } from 'vike'
- *   ```
- * With:
- *   ```
- *   import { render } from 'vike/abort'
- *   ```
- *
- * See https://vike.dev/render
- */
-const RenderErrorPage = (...args) => {
-    (0, utils_js_1.assertWarning)(false, [
-        'Replace:',
-        picocolors_1.default.red("  import { RenderErrorPage } from 'vike'"),
-        'With:',
-        picocolors_1.default.green("  import { render } from 'vike/abort'"),
-        'See https://vike.dev/render'
-    ].join('\n'), { onlyOnce: true, showStackTrace: true });
-    return (0, abort_js_1.RenderErrorPage)(...args);
-};
-exports.RenderErrorPage = RenderErrorPage;
 (0, utils_js_1.assertWarning)(false, [
-    'You have following imports which are outdated:',
-    picocolors_1.default.red("  import { something } from 'vike'"),
+    'You have outdated imports:',
+    picocolors_1.default.bold(picocolors_1.default.red("  import { something } from 'vike/server'")),
     'Replace them with:',
-    picocolors_1.default.green("  import { something } from 'vike/server'"),
-    `Or if ${picocolors_1.default.cyan('something')} is a type:`,
-    picocolors_1.default.green("  import type { something } from 'vike/types'"),
-    "Make sure to import renderPage(), escapeInject, html, dangerouslySkipEscape(), pipeWebStream(), pipeNodeStream(), pipeStream(), stampPipe() from 'vike/server'. (Or inspect the error stack below to find the import causing this warning.)"
+    picocolors_1.default.bold(picocolors_1.default.green("  import { something } from 'vike'"))
+    /* Add migration guide, with migration scritps such as `$ rename vike/server vike`
+    `See ${pc.underline('https://vike.dev/migration/0.4.xxx')}`
+    */
 ].join('\n'), { showStackTrace: true, onlyOnce: true });

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

@@ -13,8 +13,62 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RenderErrorPage = exports.createPageRenderer = exports._injectAssets = exports.createDevMiddleware = exports.getGlobalContextAsync = exports.getGlobalContextSync = exports.getGlobalContext = exports.version = exports.stampPipe = exports.pipeStream = exports.pipeNodeStream = exports.pipeWebStream = exports.dangerouslySkipEscape = exports.escapeInject = exports.renderPage = void 0;
 const isBrowser_js_1 = require("../../utils/isBrowser.js");
 const assert_js_1 = require("../../utils/assert.js");
-(0, assert_js_1.assertUsage)(!(0, isBrowser_js_1.isBrowser)(), "It's forbidden to `import { something } from 'vike/server'` on the client-side: the module 'vike/server' is a server-only module.", { showStackTrace: true });
-__exportStar(require("./index-common.js"), exports);
+(0, assert_js_1.assert)(!(0, isBrowser_js_1.isBrowser)());
+var renderPage_js_1 = require("./renderPage.js");
+Object.defineProperty(exports, "renderPage", { enumerable: true, get: function () { return renderPage_js_1.renderPage; } });
+var renderHtml_js_1 = require("./html/renderHtml.js");
+Object.defineProperty(exports, "escapeInject", { enumerable: true, get: function () { return renderHtml_js_1.escapeInject; } });
+Object.defineProperty(exports, "dangerouslySkipEscape", { enumerable: true, get: function () { return renderHtml_js_1.dangerouslySkipEscape; } });
+var stream_js_1 = require("./html/stream.js");
+Object.defineProperty(exports, "pipeWebStream", { enumerable: true, get: function () { return stream_js_1.pipeWebStream; } });
+Object.defineProperty(exports, "pipeNodeStream", { enumerable: true, get: function () { return stream_js_1.pipeNodeStream; } });
+Object.defineProperty(exports, "pipeStream", { enumerable: true, get: function () { return stream_js_1.pipeStream; } });
+Object.defineProperty(exports, "stampPipe", { enumerable: true, get: function () { return stream_js_1.stampPipe; } });
+var utils_js_1 = require("./utils.js");
+Object.defineProperty(exports, "version", { enumerable: true, get: function () { return utils_js_1.PROJECT_VERSION; } });
+var globalContext_js_1 = require("./globalContext.js");
+Object.defineProperty(exports, "getGlobalContext", { enumerable: true, get: function () { return globalContext_js_1.getGlobalContext; } });
+Object.defineProperty(exports, "getGlobalContextSync", { enumerable: true, get: function () { return globalContext_js_1.getGlobalContextSync; } });
+Object.defineProperty(exports, "getGlobalContextAsync", { enumerable: true, get: function () { return globalContext_js_1.getGlobalContextAsync; } });
+var index_js_1 = require("../runtime-dev/index.js");
+Object.defineProperty(exports, "createDevMiddleware", { enumerable: true, get: function () { return index_js_1.createDevMiddleware; } });
+// TODO/v1-release: remove
+// Deprecated exports
+__exportStar(require("../../types/index-dreprecated.js"), exports);
+var injectAssets__public_js_1 = require("./html/injectAssets/injectAssets__public.js");
+Object.defineProperty(exports, "_injectAssets", { enumerable: true, get: function () { return injectAssets__public_js_1.injectAssets__public; } });
+var createPageRenderer_js_1 = require("../createPageRenderer.js");
+Object.defineProperty(exports, "createPageRenderer", { enumerable: true, get: function () { return createPageRenderer_js_1.createPageRenderer; } });
+const utils_js_2 = require("./utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const abort_js_1 = require("../../shared/route/abort.js");
+/** @deprecated
+ * Replace:
+ *   ```
+ *   import { RenderErrorPage } from 'vike'
+ *   ```
+ * With:
+ *   ```
+ *   import { render } from 'vike/abort'
+ *   ```
+ *
+ * See https://vike.dev/render
+ */
+const RenderErrorPage = (...args) => {
+    (0, utils_js_2.assertWarning)(false, [
+        'Replace:',
+        picocolors_1.default.red("  import { RenderErrorPage } from 'vike'"),
+        'With:',
+        picocolors_1.default.green("  import { render } from 'vike/abort'"),
+        'See https://vike.dev/render'
+    ].join('\n'), { onlyOnce: true, showStackTrace: true });
+    return (0, abort_js_1.RenderErrorPage)(...args);
+};
+exports.RenderErrorPage = RenderErrorPage;

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

@@ -81,7 +81,7 @@ async function renderPagePrepare(pageContextInit, httpRequestId) {
     else {
         // `globalContext` now contains the entire Vike config and getVikeConfig() isn't called anymore for this request.
     }
-    const { globalContext, globalContext_public } = await (0, globalContext_js_1.getGlobalContextInternal)();
+    const { globalContext, globalContext_public } = await (0, globalContext_js_1.getGlobalContextServerInternal)();
     const pageContextBegin = await getPageContextBegin(pageContextInit, globalContext, globalContext_public, httpRequestId);
     // Check Base URL
     {

package/dist/cjs/shared/createGlobalContextShared.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGlobalContextSyncErrMsg = void 0;
 exports.createGlobalContextShared = createGlobalContextShared;
+const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
+exports.getGlobalContextSyncErrMsg = getGlobalContextSyncErrMsg;
 const getPageConfigsRuntime_js_1 = require("./getPageConfigsRuntime.js");
 const executeHookGeneric_js_1 = require("./hooks/executeHookGeneric.js");
 const utils_js_1 = require("./utils.js");

package/dist/cjs/shared/route/loadPageRoutes.js

@@ -10,7 +10,7 @@ const getConfigDefinedAt_js_1 = require("../page-configs/getConfigDefinedAt.js")
 const resolveRouteFunction_js_1 = require("./resolveRouteFunction.js");
 const getHook_js_1 = require("../hooks/getHook.js");
 async function loadPageRoutes(
-// Remove all arguments and use GlobalContextInternal instead?
+// Remove all arguments and use GlobalContextServerInternal instead?
 pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds) {
     // TODO/next-major: remove & make this function sync
     await Promise.all(pageFilesAll.filter((p) => p.fileType === '.page.route').map((p) => p.loadFile?.()));

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-0e9e0f2';
+exports.PROJECT_VERSION = '0.4.228-commit-1bb55f1';

package/dist/esm/__internal/index.js

@@ -3,7 +3,7 @@ export { setGlobalContext_buildEntry } from '../node/runtime/globalContext.js';
 // Needed by vite-plugin-vercel
 export { route, getPagesAndRoutes };
 import { route as routeInternal } from '../shared/route/index.js';
-import { getGlobalContextInternal, initGlobalContext_getPagesAndRoutes } from '../node/runtime/globalContext.js';
+import { getGlobalContextServerInternal, initGlobalContext_getPagesAndRoutes } from '../node/runtime/globalContext.js';
 import { setNodeEnvProduction } from '../utils/assertSetup.js';
 /**
  * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel} to compute some rewrite rules and extract { isr } configs.
@@ -13,7 +13,7 @@ import { setNodeEnvProduction } from '../utils/assertSetup.js';
 async function getPagesAndRoutes() {
     setNodeEnvProduction();
     await initGlobalContext_getPagesAndRoutes();
-    const { globalContext } = await getGlobalContextInternal();
+    const { globalContext } = await getGlobalContextServerInternal();
     const { 
     //
     _pageRoutes: pageRoutes, _pageFilesAll: pageFilesAll, _pageConfigs: pageConfigs, _allPageIds: allPageIds } = globalContext;

package/dist/esm/client/client-routing-runtime/createPageContext.js

@@ -2,10 +2,10 @@ export { createPageContextClientSide };
 import { createPageContextShared } from '../../shared/createPageContextShared.js';
 import { getPageContextUrlComputed } from '../../shared/getPageContextUrlComputed.js';
 import { getBaseServer } from './getBaseServer.js';
-import { getGlobalContext } from './globalContext.js';
+import { getGlobalContextClientInternal } from './globalContext.js';
 import { assert, augmentType, isBaseServer, objectAssign } from './utils.js';
 async function createPageContextClientSide(urlOriginal) {
-    const globalContext = await getGlobalContext();
+    const globalContext = await getGlobalContextClientInternal();
     const baseServer = getBaseServer();
     assert(isBaseServer(baseServer));
     const pageContextCreated = {

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

@@ -1,9 +1,9 @@
-export { getGlobalContext };
+export { getGlobalContextClientInternal };
 export type { GlobalContextClient };
 import type { GlobalContextSharedPublic } from '../../shared/createGlobalContextShared.js';
 type GlobalContextClient = GlobalContextSharedPublic & Pick<GlobalContextClientInternal, 'isClientSide'> & Vike.GlobalContext & Vike.GlobalContextClient & {};
-type GlobalContextClientInternal = Awaited<ReturnType<typeof getGlobalContext>>;
-declare const getGlobalContext: () => Promise<{
+type GlobalContextClientInternal = Awaited<ReturnType<typeof getGlobalContextClientInternal>>;
+declare const getGlobalContextClientInternal: () => Promise<{
     isGlobalContext: true;
     _virtualFileExports: unknown;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];

package/dist/esm/client/client-routing-runtime/globalContext.js

@@ -1,9 +1,9 @@
-export { getGlobalContext };
-import { createGetGlobalContext } from '../shared/createGetGlobalContext.js';
+export { getGlobalContextClientInternal };
+import { createGetGlobalContextClient } from '../shared/createGetGlobalContextClient.js';
 import { loadPageRoutes } from '../../shared/route/loadPageRoutes.js';
 // @ts-ignore
 import * as virtualFileExports from 'virtual:vike:importUserCode:client:client-routing';
-const getGlobalContext = createGetGlobalContext(virtualFileExports, true, addGlobalContext);
+const getGlobalContextClientInternal = createGetGlobalContextClient(virtualFileExports, true, addGlobalContext);
 async function addGlobalContext(globalContext) {
     const { pageRoutes, onBeforeRouteHook } = await loadPageRoutes(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
     return {

package/dist/esm/client/index.d.ts

@@ -0,0 +1 @@
+export { getGlobalContext, getGlobalContext as getGlobalContextAsync, getGlobalContextSync } from './shared/createGetGlobalContextClient.js';

package/dist/esm/client/index.js

@@ -0,0 +1,4 @@
+import { isBrowser } from '../utils/isBrowser.js';
+import { assert } from '../utils/assert.js';
+assert(isBrowser());
+export { getGlobalContext, getGlobalContext as getGlobalContextAsync, getGlobalContextSync } from './shared/createGetGlobalContextClient.js';

package/dist/esm/client/node.js

@@ -1,9 +1,7 @@
 import { assertUsage } from './server-routing-runtime/utils.js';
 assertUsage(false, [
-    'Following imports are forbidden on the client-side:',
+    'Server imports are forbidden on the client-side:',
     "  import { something } from 'vike/server'",
-    // TODO/v1-release: remove this line (also remove s above in `s/Following imports/Following import/`)
-    "  import { something } from 'vike'",
     'Did you mean the following instead?',
     "  import { something } from 'vike/client/router'"
 ].join('\n'), { showStackTrace: true });

package/dist/esm/client/server-routing-runtime/createPageContextClientSide.js

@@ -4,10 +4,10 @@ import { getPageContextSerializedInHtml } from '../shared/getJsonSerializedInHtm
 import { loadUserFilesClientSide } from '../shared/loadUserFilesClientSide.js';
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 import { createPageContextShared } from '../../shared/createPageContextShared.js';
-import { getGlobalContext } from './globalContext.js';
+import { getGlobalContextClientInternal } from './globalContext.js';
 const urlFirst = getCurrentUrl({ withoutHash: true });
 async function createPageContextClientSide() {
-    const globalContext = await getGlobalContext();
+    const globalContext = await getGlobalContextClientInternal();
     const pageContextCreated = {
         /* Don't spread globalContext for now? Or never spread it as it leads to confusion? The convenience isn't worth the added confusion?
         ...globalContext, // least precedence

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

@@ -1,8 +1,9 @@
-export { getGlobalContext };
+export { getGlobalContextClientInternal };
 export type { GlobalContextClientWithServerRouting };
 import type { GlobalContextSharedPublic } from '../../shared/createGlobalContextShared.js';
-type GlobalContextClientWithServerRouting = GlobalContextSharedPublic & Vike.GlobalContext & Vike.GlobalContextClient & {};
-declare const getGlobalContext: () => Promise<{
+type GlobalContextClientWithServerRouting = GlobalContextSharedPublic & Pick<GlobalContextClientInternal, 'isClientSide'> & Vike.GlobalContext & Vike.GlobalContextClient & {};
+type GlobalContextClientInternal = Awaited<ReturnType<typeof getGlobalContextClientInternal>>;
+declare const getGlobalContextClientInternal: () => Promise<{
     isGlobalContext: true;
     _virtualFileExports: unknown;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];

package/dist/esm/client/server-routing-runtime/globalContext.js

@@ -1,5 +1,5 @@
-export { getGlobalContext };
-import { createGetGlobalContext } from '../shared/createGetGlobalContext.js';
+export { getGlobalContextClientInternal };
+import { createGetGlobalContextClient } from '../shared/createGetGlobalContextClient.js';
 // @ts-ignore
 import * as virtualFileExports from 'virtual:vike:importUserCode:client:server-routing';
-const getGlobalContext = createGetGlobalContext(virtualFileExports, false);
+const getGlobalContextClientInternal = createGetGlobalContextClient(virtualFileExports, false);

package/dist/esm/client/shared/{createGetGlobalContext.d.ts → createGetGlobalContextClient.d.ts}

@@ -1,6 +1,8 @@
-export { createGetGlobalContext };
+export { getGlobalContext };
+export { getGlobalContextSync };
+export { createGetGlobalContextClient };
 import { type GlobalContextShared } from '../../shared/createGlobalContextShared.js';
-declare function createGetGlobalContext<GlobalContextAddendum extends object>(virtualFileExports: unknown, isClientRouting: boolean, addGlobalContext?: (globalContext: GlobalContextShared) => Promise<GlobalContextAddendum>): () => Promise<{
+declare function createGetGlobalContextClient<GlobalContextAddendum extends object>(virtualFileExports: unknown, isClientRouting: boolean, addGlobalContext?: (globalContext: GlobalContextShared) => Promise<GlobalContextAddendum>): () => Promise<{
     isGlobalContext: true;
     _virtualFileExports: unknown;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
@@ -17,3 +19,5 @@ declare function createGetGlobalContext<GlobalContextAddendum extends object>(vi
      */
     isClientSide: true;
 } & Awaited<GlobalContextAddendum>>>;
+declare function getGlobalContext(): Promise<never>;
+declare function getGlobalContextSync(): never;

package/dist/esm/client/shared/{createGetGlobalContext.js → createGetGlobalContextClient.js}

@@ -1,9 +1,19 @@
-export { createGetGlobalContext };
-import { createGlobalContextShared } from '../../shared/createGlobalContextShared.js';
+// Public usage
+export { getGlobalContext };
+export { getGlobalContextSync };
+// Internal usage
+export { createGetGlobalContextClient };
+import { createGlobalContextShared, getGlobalContextSyncErrMsg } from '../../shared/createGlobalContextShared.js';
 import { getGlobalContextSerializedInHtml } from './getJsonSerializedInHtml.js';
-import { assert, getGlobalObject, objectAssign } from './utils.js';
-const globalObject = getGlobalObject('createGetGlobalContext.ts', {});
-function createGetGlobalContext(virtualFileExports, isClientRouting, addGlobalContext) {
+import { assert, assertUsage, genPromise, getGlobalObject, objectAssign } from './utils.js';
+const globalObject = getGlobalObject('createGetGlobalContextClient.ts', (() => {
+    const { promise: globalContextPromise, resolve: globalContextPromiseResolve } = genPromise();
+    return {
+        globalContextPromise,
+        globalContextPromiseResolve
+    };
+})());
+function createGetGlobalContextClient(virtualFileExports, isClientRouting, addGlobalContext) {
     assert(globalObject.isClientRouting === undefined || globalObject.isClientRouting === isClientRouting);
     globalObject.isClientRouting = isClientRouting;
     // Eagerly call onCreateGlobalContext() hook
@@ -30,7 +40,19 @@ function createGetGlobalContext(virtualFileExports, isClientRouting, addGlobalCo
             objectAssign(globalContextAddendum, await addGlobalContext?.(globalContext));
             return globalContextAddendum;
         });
+        assert(globalObject.globalContext);
+        globalObject.globalContextPromiseResolve(globalObject.globalContext);
         // Return
         return globalContext;
     }
 }
+// The type is never used: it's the type of the server-side getGlobalContext() that is used.
+async function getGlobalContext() {
+    const globalContext = await globalObject.globalContextPromise;
+    return globalContext;
+}
+function getGlobalContextSync() {
+    const { globalContext } = globalObject;
+    assertUsage(globalContext, getGlobalContextSyncErrMsg);
+    return globalContext;
+}

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

@@ -3,3 +3,4 @@ export * from '../../utils/parseUrl.js';
 export * from '../../utils/getGlobalObject.js';
 export * from '../../utils/objectAssign.js';
 export * from '../../utils/hasProp.js';
+export * from '../../utils/genPromise.js';

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

@@ -3,3 +3,4 @@ export * from '../../utils/parseUrl.js';
 export * from '../../utils/getGlobalObject.js';
 export * from '../../utils/objectAssign.js';
 export * from '../../utils/hasProp.js';
+export * from '../../utils/genPromise.js';

package/dist/esm/node/plugin/plugins/commonConfig.js

@@ -153,14 +153,17 @@ function assertSingleInstance(config) {
 function assertVikeCliOrApi(config) {
     if (isVikeCliOrApi())
         return;
-    if (isVitest())
-        return;
     if (isViteCliCall()) {
+        assert(!isVitest());
         assertWarning(false, `Vite's CLI is deprecated ${pc.underline('https://vike.dev/migration/cli')}`, {
             onlyOnce: true
         });
         return;
     }
+    if (isVitest()) {
+        assertWarning(false, `Unexpected Vitest setup: you seem to be using Vitest together with Vike's Vite plugin but without using Vike's JavaScript API which is unexpected, see ${pc.underline('https://vike.dev/vitest')}`, { onlyOnce: true });
+        return;
+    }
     if (config.server.middlewareMode) {
         assertWarning(false, `${pc.cyan('vite.createServer()')} is deprecated ${pc.underline('https://vike.dev/migration/cli#api')}`, {
             onlyOnce: true

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

@@ -207,7 +207,6 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports, esb
                             //   - Vike doesn't resolve path aliases at all.
                             //   - Node.js doesn't support `tsconfig.js#compilerOptions.paths`.
                             // - Esbuild path alias resolution seems reliable, e.g. it supports `tsconfig.js#compilerOptions.paths`.
-                            assert(!isImportPathNpmPackageOrPathAlias(importPathOriginal));
                             importPathTranspiled = importPathResolved;
                         }
                         else {

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

@@ -5,7 +5,7 @@ export { runPrerender_forceExit };
 export type { PrerenderOptions };
 export type { PrerenderContextPublic };
 import type { PageFile } from '../../shared/getPageFiles.js';
-import { type GlobalContextInternal, type GlobalContextServer } from '../runtime/globalContext.js';
+import { type GlobalContextServerInternal, type GlobalContextServer } from '../runtime/globalContext.js';
 import type { InlineConfig, ResolvedConfig } from 'vite';
 import type { APIOptions } from '../api/types.js';
 type ProvidedByHook = null | {
@@ -66,7 +66,7 @@ declare function runPrerenderFromCLIPrerenderCommand(): Promise<void>;
 declare function runPrerenderFromAutoRun(viteConfig: InlineConfig | undefined): Promise<{
     forceExit: boolean;
 }>;
-declare function createPageContextPrerendering(urlOriginal: string, prerenderContext: PrerenderContext, globalContext: GlobalContextInternal, globalContext_public: GlobalContextServer, is404: boolean, pageId: string | undefined, providedByHook: ProvidedByHook): Promise<((({
+declare function createPageContextPrerendering(urlOriginal: string, prerenderContext: PrerenderContext, globalContext: GlobalContextServerInternal, globalContext_public: GlobalContextServer, is404: boolean, pageId: string | undefined, providedByHook: ProvidedByHook): Promise<((({
     isClientSide: boolean;
     isPrerendering: boolean;
 } & Pick<import("../../shared/types.js").PageContextBuiltInServerInternal, "urlOriginal" | "headersOriginal"> & {

package/dist/esm/node/prerender/runPrerender.js

@@ -9,7 +9,7 @@ import { prerenderPage } from '../runtime/renderPage/renderPageAlreadyRouted.js'
 import { createPageContextServerSide } from '../runtime/renderPage/createPageContextServerSide.js';
 import pc from '@brillout/picocolors';
 import { cpus } from 'os';
-import { getGlobalContextInternal, initGlobalContext_runPrerender, setGlobalContext_isPrerendering } from '../runtime/globalContext.js';
+import { getGlobalContextServerInternal, initGlobalContext_runPrerender, setGlobalContext_isPrerendering } from '../runtime/globalContext.js';
 import { resolveConfig } from 'vite';
 import { getPageFilesServerSide } from '../../shared/getPageFiles.js';
 import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
@@ -94,7 +94,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
     }
     const concurrencyLimit = pLimit(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? cpus().length : parallel);
     await initGlobalContext_runPrerender();
-    const { globalContext, globalContext_public } = await getGlobalContextInternal();
+    const { globalContext, globalContext_public } = await getGlobalContextServerInternal();
     globalContext._pageFilesAll.forEach(assertExportNames);
     const prerenderContext = {
         pageContexts: [],