vike 0.4.267 → 0.4.268-commit-ca58695

package/dist/server/runtime/renderPageServer/loadPageConfigsLazyServerSide.d.ts

@@ -23,12 +23,6 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     isPrerendering: boolean;
     _requestId: number;
 } & import("../renderPageServer.js").PageContextInit & {
-    _nodeDev?: {
-        req: import("http").IncomingMessage;
-        res: import("http").ServerResponse;
-    };
-    _reqWeb?: Request;
-} & {
     _globalContext: ({
         config: import("../../../types/index.js").ConfigResolved;
         _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
@@ -52,6 +46,10 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
         _pageFilesAll: import("../../../shared-server-client/getPageFiles.js").PageFile[];
         _pageConfigs: PageConfigRuntime[];
         _pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
+        _environmentEntries: Record<string, {
+            pageConfigs: PageConfigRuntime[];
+            pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
+        } | null>;
         _allPageIds: string[];
     } & (({
         isClientSide: false;
@@ -61,6 +59,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
         _isPrerendering: false;
         assetsManifest: null;
         _viteDevServer: import("vite").ViteDevServer | undefined;
+        devMiddleware: import("vite").Connect.Server | null;
         viteConfig: import("vite").ResolvedConfig | undefined;
     } | {
         isClientSide: false;
@@ -69,6 +68,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
         _isProduction: true;
         assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
+        devMiddleware: null;
         _usesClientRouter: boolean;
         _isPrerendering: true;
         viteConfig: import("vite").ResolvedConfig;
@@ -79,12 +79,11 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
         _isProduction: true;
         assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
+        devMiddleware: null;
         _usesClientRouter: boolean;
         _isPrerendering: false;
         viteConfig: null;
     }) & {
-        baseServer: string;
-        baseAssets: string;
         viteConfigRuntime: {
             root: string;
             build: {
@@ -95,6 +94,9 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
                 inject: boolean | undefined;
             };
         };
+        baseServer: string;
+        baseAssets: string;
+        middlewares: import("../universal-middleware/core.js").Middleware[];
     })) & {
         prerenderContext: import("../../../types/index.js").PrerenderContext | undefined;
     };
@@ -102,12 +104,6 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     _baseServer: string;
     _baseAssets: string;
     _pageContextInit: import("../renderPageServer.js").PageContextInit & {
-        _nodeDev?: {
-            req: import("http").IncomingMessage;
-            res: import("http").ServerResponse;
-        };
-        _reqWeb?: Request;
-    } & {
         headers?: Record<string, unknown>;
     };
     _urlHandler: ((url: string) => string) | null;

package/dist/server/runtime/renderPageServer/loadPageConfigsLazyServerSide.js

@@ -15,6 +15,7 @@ import { loadAndParseVirtualFilePageEntry } from '../../../shared-server-client/
 import { execHookServer } from './execHookServer.js';
 import { resolveHeadersResponseEarly } from './headersResponse.js';
 import { resolvePageContextCspNone } from './csp.js';
+import { loadPageContextEnvironments } from './loadPageContextEnvironments.js';
 import '../../assertEnvServer.js';
 async function loadPageConfigsLazyServerSide(pageContext) {
     objectAssign(pageContext, {
@@ -109,7 +110,7 @@ async function resolvePageContext(pageContext) {
     return pageContext;
 }
 async function loadPageUserFiles(pageContext) {
-    const [{ pageContextAddendum }] = await Promise.all([
+    const [{ pageContextAddendum }, pageContextEnvironments] = await Promise.all([
         (async () => {
             const pageFilesServerSide = getPageFilesServerSide(pageContext._pageFilesAll, pageContext.pageId);
             const isDev = !pageContext._globalContext._isProduction;
@@ -120,9 +121,12 @@ async function loadPageUserFiles(pageContext) {
             const pageContextAddendum = resolvePageContextConfig(pageFilesServerSide, pageConfigLoaded, pageContext._globalContext._pageConfigGlobal);
             return { pageContextAddendum };
         })(),
+        pageContext._pageConfig && loadPageContextEnvironments(pageContext),
         analyzePageClientSideInit(pageContext._globalContext._pageFilesAll, pageContext.pageId, {
             sharedPageFilesAlreadyLoaded: true,
         }),
     ]);
+    if (pageContextEnvironments)
+        objectAssign(pageContextAddendum, pageContextEnvironments);
     return pageContextAddendum;
 }

package/dist/server/runtime/renderPageServer/loadPageContextEnvironments.d.ts

@@ -0,0 +1,15 @@
+export { loadPageContextEnvironments };
+import type { GlobalContextServerInternal } from '../globalContext.js';
+import type { PageContextPublicMinimum } from '../../../shared-server-client/getPageContextPublicShared.js';
+import '../../assertEnvServer.js';
+declare function loadPageContextEnvironments(pageContext: PageContextPublicMinimum & {
+    pageId: string;
+    _globalContext: GlobalContextServerInternal;
+}): Promise<{
+    environments: {
+        [k: string]: {
+            config: import("../../../types/index.js").ConfigResolved;
+            pageContext: object;
+        };
+    };
+}>;

package/dist/server/runtime/renderPageServer/loadPageContextEnvironments.js

@@ -0,0 +1,61 @@
+export { loadPageContextEnvironments };
+import { resolvePageContextConfig } from '../../../shared-server-client/page-configs/resolveVikeConfigPublic.js';
+import { parseGlobalEntryPageConfigs, } from '../../../shared-server-client/getPageFiles/parseVirtualFileExportsGlobalEntry.js';
+import { findPageConfig } from '../../../shared-server-client/page-configs/findPageConfig.js';
+import { loadAndParseVirtualFilePageEntry } from '../../../shared-server-client/page-configs/loadAndParseVirtualFilePageEntry.js';
+import { generateVirtualFileIdAdditionalEnvironment } from '../../../shared-server-node/virtualFileId.js';
+import { isRunnableDevEnvironment } from '../../../utils/isRunnableDevEnvironment.js';
+import { assert, assertUsage } from '../../../utils/assert.js';
+import { getPageContextPublicServer } from './getPageContextPublicServer.js';
+import '../../assertEnvServer.js';
+// Additional environments (e.g. `rsc`) run in the same runtime as the server environment => their functions can be called directly
+// - `pageContext.environments[environmentName]` holds the environment's config values and its view of pageContext, which its functions are called with
+async function loadPageContextEnvironments(pageContext) {
+    const environmentEntries = pageContext._globalContext._environmentEntries;
+    const environments = Object.fromEntries(await Promise.all(Object.entries(environmentEntries).map(async ([environmentName, environmentEntry]) => {
+        const pageContextConfigEnv = await loadPageContextConfig(pageContext, environmentName, environmentEntry);
+        const environment = {
+            config: pageContextConfigEnv.config,
+            pageContext: getPageContextEnvView(getPageContextPublicServer(pageContext), pageContextConfigEnv),
+        };
+        return [environmentName, environment];
+    })));
+    const pageContextEnvironments = { environments };
+    return pageContextEnvironments;
+}
+// The same pageContext object, except for the config values (and what's derived from them) which are the environment's
+function getPageContextEnvView(pageContext, pageContextConfig) {
+    // TO-DO/soon/flat-pageContext make this clean using same mechanism as [Flat `pageContext`](https://github.com/vikejs/vike/issues/1268)
+    return new Proxy(pageContext, {
+        get(target, prop) {
+            if (prop === 'Page')
+                return pageContextConfig.exports.Page;
+            if (prop in pageContextConfig)
+                return pageContextConfig[prop];
+            return Reflect.get(target, prop);
+        },
+    });
+}
+async function loadPageContextConfig(pageContext, environmentName, environmentEntry) {
+    const globalContext = pageContext._globalContext;
+    const { pageConfigs, pageConfigGlobal } = await importEnvironmentEntry(globalContext, environmentName, environmentEntry);
+    const pageConfig = findPageConfig(pageConfigs, pageContext.pageId);
+    assert(pageConfig);
+    const pageConfigLoaded = await loadAndParseVirtualFilePageEntry(pageConfig, !globalContext._isProduction);
+    return resolvePageContextConfig([], pageConfigLoaded, pageConfigGlobal);
+}
+async function importEnvironmentEntry(globalContext, environmentName, environmentEntry) {
+    if (environmentEntry) {
+        // Prod
+        assert(globalContext._isProduction);
+        return environmentEntry;
+    }
+    else {
+        // Dev
+        assert(!globalContext._isProduction);
+        const environment = globalContext._viteDevServer?.environments[environmentName];
+        assertUsage(isRunnableDevEnvironment(environment), `The Vike environment ${environmentName} should be a server-side environment running in the same runtime (process or worker) as Vike's server`);
+        const virtualFileId = generateVirtualFileIdAdditionalEnvironment(environmentName);
+        return parseGlobalEntryPageConfigs(await environment.runner.import(virtualFileId));
+    }
+}