vike 0.4.237 → 0.4.238-commit-5762291

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

@@ -5,7 +5,7 @@ export { runPrerender };
 import path from 'node:path';
 import { route } from '../../shared/route/index.js';
 import { assert, assertUsage, assertWarning, hasProp, objectAssign, isObjectWithKeys, isCallable, isPropertyGetter, assertPosixPath, urlToFile, isPlainObject, pLimit, isArray, onSetupPrerender, PROJECT_VERSION, preservePropertyGetters, changeEnumerable, escapeHtml, } from './utils.js';
-import { prerenderPage } from '../runtime/renderPage/renderPageAlreadyRouted.js';
+import { prerenderPage } from '../runtime/renderPage/renderPageAfterRoute.js';
 import { createPageContextServerSide } from '../runtime/renderPage/createPageContextServerSide.js';
 import pc from '@brillout/picocolors';
 import { cpus } from 'node:os';
@@ -15,10 +15,10 @@ import { getPageFilesServerSide } from '../../shared/getPageFiles.js';
 import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
 import { getUrlFromRouteString } from '../../shared/route/resolveRouteString.js';
 import { getConfigValueRuntime } from '../../shared/page-configs/getConfigValueRuntime.js';
-import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
+import { loadAndParseVirtualFilePageEntry } from '../../shared/page-configs/loadAndParseVirtualFilePageEntry.js';
 import { getErrorPageId, isErrorPage } from '../../shared/error-page.js';
 import { isAbortError } from '../../shared/route/abort.js';
-import { loadPageConfigsLazyServerSideAndExecHook } from '../runtime/renderPage/loadPageConfigsLazyServerSide.js';
+import { loadPageConfigsLazyServerSide } from '../runtime/renderPage/loadPageConfigsLazyServerSide.js';
 import { getHookFromPageConfig, getHookFromPageConfigGlobal, getHookTimeoutDefault, getHook_setIsPrerenderering, } from '../../shared/hooks/getHook.js';
 import { noRouteMatch } from '../../shared/route/noRouteMatch.js';
 import { getVikeConfigInternal } from '../vite/shared/resolveVikeConfigInternal.js';
@@ -29,7 +29,7 @@ import { getOutDirs } from '../vite/shared/getOutDirs.js';
 import fs from 'node:fs';
 import { getProxyForPublicUsage } from '../../shared/getProxyForPublicUsage.js';
 import { getStaticRedirectsForPrerender } from '../runtime/renderPage/resolveRedirects.js';
-import { augmentType } from '../runtime/utils.js';
+import { updateType } from '../runtime/utils.js';
 const docLink = 'https://vike.dev/i18n#pre-rendering';
 async function runPrerender(options = {}, trigger) {
     setWasPrerenderRun(trigger);
@@ -44,7 +44,7 @@ async function runPrerender(options = {}, trigger) {
     await disableReactStreaming();
     const viteConfig = await resolveViteConfig(options.viteConfig || {}, 'build', 'production');
     const vikeConfig = await getVikeConfigInternal();
-    const { outDirServer } = getOutDirs(viteConfig);
+    const { outDirServer } = getOutDirs(viteConfig, undefined);
     const prerenderConfigGlobal = resolvePrerenderConfigGlobal(vikeConfig);
     const { partial, noExtraDir, parallel, defaultLocalValue, isPrerenderingEnabled } = prerenderConfigGlobal;
     if (!isPrerenderingEnabled) {
@@ -174,7 +174,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, globalContext,
     // V1 design
     await Promise.all(globalContext._pageConfigs.map((pageConfig) => concurrencyLimit(async () => {
         const hookName = 'onBeforePrerenderStart';
-        const pageConfigLoaded = await loadConfigValues(pageConfig, false);
+        const pageConfigLoaded = await loadAndParseVirtualFilePageEntry(pageConfig, false);
         const hook = getHookFromPageConfig(pageConfigLoaded, hookName);
         if (!hook)
             return;
@@ -319,11 +319,10 @@ async function createPageContextPrerendering(urlOriginal, prerenderContext, glob
         assert(pageId);
         objectAssign(pageContext, {
             pageId,
-            _debugRouteMatches: [],
             routeParams: {},
         });
     }
-    augmentType(pageContext, await loadPageConfigsLazyServerSideAndExecHook(pageContext));
+    updateType(pageContext, await loadPageConfigsLazyServerSide(pageContext));
     let usesClientRouter;
     {
         const { pageId } = pageContext;
@@ -552,7 +551,7 @@ async function writeFiles({ pageContext, htmlString, pageContextSerialized }, vi
 async function write(pageContext, fileType, fileContent, viteConfig, onPagePrerender, prerenderContext, logLevel) {
     const { urlOriginal } = pageContext;
     assert(urlOriginal.startsWith('/'));
-    const { outDirClient } = getOutDirs(viteConfig);
+    const { outDirClient } = getOutDirs(viteConfig, undefined);
     const { root } = viteConfig;
     let fileUrl;
     if (fileType === 'HTML') {

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

@@ -33,7 +33,7 @@ async function runPrerenderFromAutoRun(viteConfig) {
         await runPrerender({ viteConfig }, 'auto-run');
     }
     catch (err) {
-        // Avoid Rollup prefixing the error with [vike:build:pluginAutoFullBuild], see for example https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
+        // Avoid Rollup prefixing the error with [vike:build:pluginBuildApp], see for example https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
         console.error(err);
         logErrorHint(err);
         process.exit(1);

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

@@ -0,0 +1,12 @@
+export { resolvePageContextCspNone };
+export { inferNonceAttr };
+export { addCspHeader };
+export type { PageContextCspNonce };
+import type { VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
+import type { PageContextServer } from '../../types/PageContext.js';
+declare function resolvePageContextCspNone(pageContext: VikeConfigPublicPageLazyLoaded & PageContextCspNonce): Promise<{
+    cspNonce: string;
+} | undefined>;
+type PageContextCspNonce = Pick<PageContextServer, 'cspNonce'>;
+declare function inferNonceAttr(pageContext: PageContextCspNonce): string;
+declare function addCspHeader(pageContext: PageContextCspNonce, headersResponse: Headers): void;

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

@@ -0,0 +1,44 @@
+export { resolvePageContextCspNone };
+export { inferNonceAttr };
+export { addCspHeader };
+import { import_ } from '@brillout/import';
+async function resolvePageContextCspNone(pageContext) {
+    if (pageContext.cspNonce)
+        return; // already set by user e.g. `renderPage({ cspNonce: '123456789' })`
+    const { csp } = pageContext.config;
+    if (!csp?.nonce)
+        return;
+    let cspNonce;
+    if (csp.nonce === true) {
+        cspNonce = await generateNonce();
+    }
+    else {
+        cspNonce = await csp.nonce(pageContext);
+    }
+    const pageContextAddendum = { cspNonce };
+    return pageContextAddendum;
+}
+// Generate a cryptographically secure nonce for Content Security Policy (CSP).
+// Returns a base64url-encoded nonce string (URL-safe, no padding).
+// https://github.com/vikejs/vike/issues/1554#issuecomment-3181128304
+async function generateNonce() {
+    let cryptoModule;
+    try {
+        cryptoModule = (await import_('crypto')).default;
+    }
+    catch {
+        return Math.random().toString(36).substring(2, 18);
+    }
+    return cryptoModule.randomBytes(16).toString('base64url');
+}
+function inferNonceAttr(pageContext) {
+    const nonceAttr = pageContext.cspNonce ? ` nonce="${pageContext.cspNonce}"` : '';
+    return nonceAttr;
+}
+function addCspHeader(pageContext, headersResponse) {
+    if (!pageContext.cspNonce)
+        return;
+    if (headersResponse.get('Content-Security-Policy'))
+        return;
+    headersResponse.set('Content-Security-Policy', `script-src 'self' 'nonce-${pageContext.cspNonce}'`);
+}

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

@@ -10,8 +10,8 @@ export { initGlobalContext_getPagesAndRoutes };
 export { setGlobalContext_viteDevServer };
 export { setGlobalContext_viteConfig };
 export { setGlobalContext_isPrerendering };
-export { setGlobalContext_isProduction };
-export { setGlobalContext_buildEntry };
+export { setGlobalContext_isProductionAccordingToVite };
+export { setGlobalContext_prodBuildEntry };
 export { clearGlobalContext };
 export { assertBuildInfo };
 export { updateUserFiles };
@@ -32,7 +32,7 @@ declare function getGlobalContextServerInternal(): Promise<{
     globalContext: (Record<string, unknown> & {
         isGlobalContext: true;
         _isOriginalObject: true;
-        _virtualFileExports: unknown;
+        _virtualFileExportsGlobalEntry: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
         _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -45,7 +45,7 @@ declare function getGlobalContextServerInternal(): Promise<{
         };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
         };
     } & {
         _isProduction: false;
@@ -72,7 +72,7 @@ declare function getGlobalContextServerInternal(): Promise<{
     }) | (Record<string, unknown> & {
         isGlobalContext: true;
         _isOriginalObject: true;
-        _virtualFileExports: unknown;
+        _virtualFileExportsGlobalEntry: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
         _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -85,7 +85,7 @@ declare function getGlobalContextServerInternal(): Promise<{
         };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
         };
     } & {
         _isPrerendering: true;
@@ -113,7 +113,7 @@ declare function getGlobalContextServerInternal(): Promise<{
     }) | (Record<string, unknown> & {
         isGlobalContext: true;
         _isOriginalObject: true;
-        _virtualFileExports: unknown;
+        _virtualFileExportsGlobalEntry: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
         _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -126,7 +126,7 @@ declare function getGlobalContextServerInternal(): Promise<{
         };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
         };
     } & {
         _isPrerendering: false;
@@ -174,13 +174,13 @@ declare function getGlobalContextSync(): GlobalContext;
 declare function setGlobalContext_viteDevServer(viteDevServer: ViteDevServer): Promise<void>;
 declare function setGlobalContext_viteConfig(viteConfig: ResolvedConfig, viteConfigRuntime: ViteConfigRuntime): void;
 declare function setGlobalContext_isPrerendering(): void;
-declare function setGlobalContext_isProduction(isProduction: boolean, tolerateContraditction?: boolean): void;
+declare function setGlobalContext_isProductionAccordingToVite(isProductionAccordingToVite: boolean): void;
 declare function getViteDevServer(): ViteDevServer | null;
 declare function getViteConfig(): ResolvedConfig | null;
 declare function initGlobalContext_renderPage(): Promise<void>;
 declare function initGlobalContext_runPrerender(): Promise<void>;
 declare function initGlobalContext_getPagesAndRoutes(): Promise<void>;
-declare function setGlobalContext_buildEntry(buildEntry: unknown): Promise<void>;
+declare function setGlobalContext_prodBuildEntry(prodBuildEntry: unknown): Promise<void>;
 type BuildInfo = {
     versionAtBuildTime: string;
     usesClientRouter: boolean;
@@ -190,10 +190,10 @@ declare function assertBuildInfo(buildInfo: unknown): asserts buildInfo is Build
 declare function updateUserFiles(): Promise<{
     success: boolean;
 }>;
-declare function createGlobalContext(virtualFileExports: unknown): Promise<{
+declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Promise<{
     isGlobalContext: true;
     _isOriginalObject: true;
-    _virtualFileExports: unknown;
+    _virtualFileExportsGlobalEntry: unknown;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
     _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -206,7 +206,7 @@ declare function createGlobalContext(virtualFileExports: unknown): Promise<{
     };
     config: import("../../types/index.js").ConfigResolved;
     pages: {
-        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
     };
 } & (({
     _isProduction: false;