vike 0.4.260 → 0.4.262

package/dist/node/vite/shared/resolveVikeConfigInternal/{getPlusFilesByLocationId.js → getPlusFiles.js}

@@ -1,18 +1,17 @@
-export { getPlusFilesByLocationId };
+export { getPlusFiles };
 export { getPlusFileFromConfigFile };
 import { assert } from '../../../../utils/assert.js';
 import { metaBuiltIn } from './metaBuiltIn.js';
 import { getLocationId } from './filesystemRouting.js';
-import { crawlPlusFilePaths, getPlusFileValueConfigName } from './crawlPlusFilePaths.js';
+import { crawlPlusFiles, getPlusFileValueConfigName } from './crawlPlusFiles.js';
 import { getConfigFileExport } from './getConfigFileExport.js';
 import { loadConfigFile, loadValueFile } from './loadFileAtConfigTime.js';
 import { resolvePointerImport } from './resolvePointerImport.js';
 import { getFilePathResolved } from '../getFilePath.js';
 import { assertExtensionsConventions, assertExtensionsRequire } from './assertExtensions.js';
 import '../../assertEnvVite.js';
-// TODO/after-PR-merge rename getPlusFilesByLocationId getPlusFiles
-async function getPlusFilesByLocationId(userRootDir, esbuildCache) {
-    const plusFilePaths = (await crawlPlusFilePaths(userRootDir)).map(({ filePathAbsoluteUserRootDir }) => getFilePathResolved({ filePathAbsoluteUserRootDir, userRootDir }));
+async function getPlusFiles(userRootDir, esbuildCache) {
+    const plusFilePaths = (await crawlPlusFiles(userRootDir)).map(({ filePathAbsoluteUserRootDir }) => getFilePathResolved({ filePathAbsoluteUserRootDir, userRootDir }));
     const plusFilesByLocationId = {};
     await Promise.all(plusFilePaths.map(async (filePath) => {
         if (getPlusFileValueConfigName(filePath.filePathAbsoluteFilesystem) === 'config') {

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

@@ -5,7 +5,7 @@ export type { ConfigFile };
 export type { PointerImportLoaded };
 import type { FilePathResolved } from '../../../../types/FilePath.js';
 import { type EsbuildCache } from './transpileAndExecuteFile.js';
-import type { PlusFileValue } from './getPlusFilesByLocationId.js';
+import type { PlusFileValue } from './getPlusFiles.js';
 import { PointerImport } from './resolvePointerImport.js';
 import type { ConfigDefinitionsInternal } from './metaBuiltIn.js';
 import '../../assertEnvVite.js';

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

@@ -327,6 +327,10 @@ const metaBuiltIn = {
     vercel: {
         env: { config: true },
     },
+    ai: {
+        env: { config: true },
+        global: true,
+    },
 };
 function getConfigEnv(pageConfig, configName) {
     const source = getConfigValueSourceRelevantAnyEnv(configName, pageConfig);

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

@@ -15,7 +15,7 @@ export type { PageConfigBuildTimeBeforeComputed };
 import type { PageConfigGlobalBuildTime, ConfigEnv, PageConfigBuildTime, DefinedAtFilePath } from '../../../types/PageConfig.js';
 import { type ConfigDefinitionsInternal } from './resolveVikeConfigInternal/metaBuiltIn.js';
 import { type GlobalConfigPublic } from '../../../shared-server-client/page-configs/resolveVikeConfigPublic.js';
-import { type PlusFile } from './resolveVikeConfigInternal/getPlusFilesByLocationId.js';
+import { type PlusFile } from './resolveVikeConfigInternal/getPlusFiles.js';
 import type { PrerenderContextPublic } from '../../prerender/runPrerender.js';
 import type { ResolvedConfig, UserConfig } from 'vite';
 import { type DangerouslyUseInternals } from '../../../shared-server-client/getPublicProxy.js';
@@ -63,7 +63,7 @@ declare function getVikeConfigFromCliOrEnv(): {
     configFromCliOptions: import("../../cli/parseCli.js").CliOptions | null;
     configFromEnvVar: Record<string, unknown> | null;
 };
-declare const EARLY_SETTINGS: readonly ["root", "mode"];
+declare const EARLY_SETTINGS: readonly ['root', 'mode'];
 type PageConfigBuildTimeBeforeComputed = Omit<PageConfigBuildTime, 'configValuesComputed'>;
 declare function getConfigDefinitionOptional(configDefinitions: ConfigDefinitionsInternal, configName: string): {
     env: ConfigEnv;

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

@@ -45,10 +45,10 @@ import { getFilePathResolved } from './getFilePath.js';
 import { getConfigValueBuildTime } from '../../../shared-server-client/page-configs/getConfigValueBuildTime.js';
 import { resolveGlobalConfigPublic, } from '../../../shared-server-client/page-configs/resolveVikeConfigPublic.js';
 import { getConfigValuesBase, isJsonValue, } from '../../../shared-server-client/page-configs/serialize/serializeConfigValues.js';
-import { getPlusFilesByLocationId, getPlusFileFromConfigFile, } from './resolveVikeConfigInternal/getPlusFilesByLocationId.js';
+import { getPlusFiles, getPlusFileFromConfigFile, } from './resolveVikeConfigInternal/getPlusFiles.js';
 import { assertRouteString } from '../../../shared-server-client/route/resolveRouteString.js';
 import { getExtensionName } from './resolveVikeConfigInternal/assertExtensions.js';
-import { getEnvVarObject } from './getEnvVarObject.js';
+import { getEnvVarObject } from '../../../utils/getEnvVarObject.js';
 import { getVikeApiOperation } from '../../../shared-server-node/api-context.js';
 import { getCliOptions } from '../../cli/context.js';
 import { resolvePrerenderConfigGlobal } from '../../prerender/resolvePrerenderConfig.js';
@@ -216,7 +216,7 @@ function hasViteConfigChanged(vikeConfigOld, vikeConfigNew) {
     return false;
 }
 async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esbuildCache) {
-    const plusFilesByLocationId = await getPlusFilesByLocationId(userRootDir, esbuildCache);
+    const plusFilesByLocationId = await getPlusFiles(userRootDir, esbuildCache);
     const configDefinitionsResolved = await resolveConfigDefinitions(plusFilesByLocationId, userRootDir, esbuildCache);
     const { pageConfigGlobal, pageConfigs } = getPageConfigsBuildTime(configDefinitionsResolved, plusFilesByLocationId, userRootDir);
     if (!globalObject.isV1Design_)
@@ -292,7 +292,7 @@ async function resolveConfigDefinitions(plusFilesByLocationId, userRootDir, esbu
     return configDefinitionsResolved;
 }
 // Load value files (with `env.config===true`) of *custom* configs.
-// - The value files of *built-in* configs are already loaded at `getPlusFilesByLocationId()`.
+// - The value files of *built-in* configs are already loaded at `getPlusFiles()`.
 async function loadCustomConfigBuildTimeFiles(plusFiles, configDefinitions, userRootDir, esbuildCache) {
     const plusFileList = Object.values(plusFiles).flat(1);
     await Promise.all(plusFileList.map(async (plusFile) => {
@@ -715,7 +715,7 @@ function sortPlusFilesSameLocationId(plusFile1, plusFile2, configName) {
             return ret;
     }
     // Config set by +{configName}.js (highest precedence)
-    // No need to make it deterministic: the overall order is already deterministic, see sortMakeDeterministic() at getPlusFilesByLocationId()
+    // No need to make it deterministic: the overall order is already deterministic, see sortMakeDeterministic() at getPlusFiles()
     return 0;
 }
 function resolveConfigValueSources(configName, configDef, plusFilesRelevant, userRootDir, isGlobal, plusFilesByLocationId) {

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

@@ -2,7 +2,7 @@ import '../assertEnvServer.js';
 declare const _default: {
     fetch: (<T extends string>(request: Request, context: Universal.Context, runtime: import("@universal-middleware/core").RuntimeAdapterTarget<T>) => Promise<Response>) & import("@universal-middleware/core").WithUniversalSymbols<{
         name: string;
-        method: ("GET" | "HEAD" | "POST" | "PUT" | "OPTIONS" | "PATCH")[];
+        method: ("GET" | "HEAD" | "OPTIONS" | "PATCH" | "POST" | "PUT")[];
         path: string;
         immutable: true;
     }>;

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

@@ -32,22 +32,22 @@ declare const vikeConfigErrorRecoverMsg: "Vike config loaded";
 type GlobalContextServerInternal = Awaited<ReturnType<typeof createGlobalContext>>;
 declare function getGlobalContextServerInternal(): Promise<{
     globalContext: (Record<string, unknown> & {
+        config: import("../../types/index.js").ConfigResolved;
+        _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+        pages: {
+            [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
+        };
         _globalConfigPublic: {
-            pages: {
-                [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
-            };
             config: import("../../types/index.js").ConfigResolved;
             _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
             _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
             _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+            pages: {
+                [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
+            };
         };
-        pages: {
-            [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
-        };
-        config: import("../../types/index.js").ConfigResolved;
-        _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-        _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-        _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         isGlobalContext: true;
         _isOriginalObject: true;
         _virtualFileExportsGlobalEntry: unknown;
@@ -56,14 +56,14 @@ declare function getGlobalContextServerInternal(): Promise<{
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
     } & {
+        isClientSide: false;
+        _pageRoutes: PageRoutes;
+        _onBeforeRouteHook: HookInternal | null;
         _isProduction: false;
         _isPrerendering: false;
         assetsManifest: null;
         _viteDevServer: ViteDevServer | undefined;
         viteConfig: ResolvedConfig | undefined;
-        isClientSide: false;
-        _pageRoutes: PageRoutes;
-        _onBeforeRouteHook: HookInternal | null;
     } & {
         baseServer: string;
         baseAssets: string;
@@ -80,22 +80,22 @@ declare function getGlobalContextServerInternal(): Promise<{
     } & {
         prerenderContext: PrerenderContext | undefined;
     }) | (Record<string, unknown> & {
+        config: import("../../types/index.js").ConfigResolved;
+        _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+        pages: {
+            [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
+        };
         _globalConfigPublic: {
-            pages: {
-                [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
-            };
             config: import("../../types/index.js").ConfigResolved;
             _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
             _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
             _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+            pages: {
+                [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
+            };
         };
-        pages: {
-            [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
-        };
-        config: import("../../types/index.js").ConfigResolved;
-        _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-        _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-        _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         isGlobalContext: true;
         _isOriginalObject: true;
         _virtualFileExportsGlobalEntry: unknown;
@@ -104,15 +104,15 @@ declare function getGlobalContextServerInternal(): Promise<{
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
     } & {
-        _isPrerendering: true;
-        viteConfig: ResolvedConfig;
+        isClientSide: false;
+        _pageRoutes: PageRoutes;
+        _onBeforeRouteHook: HookInternal | null;
         _isProduction: true;
         assetsManifest: ViteManifest;
         _viteDevServer: null;
         _usesClientRouter: boolean;
-        isClientSide: false;
-        _pageRoutes: PageRoutes;
-        _onBeforeRouteHook: HookInternal | null;
+        _isPrerendering: true;
+        viteConfig: ResolvedConfig;
     } & {
         baseServer: string;
         baseAssets: string;
@@ -129,22 +129,22 @@ declare function getGlobalContextServerInternal(): Promise<{
     } & {
         prerenderContext: PrerenderContext | undefined;
     }) | (Record<string, unknown> & {
+        config: import("../../types/index.js").ConfigResolved;
+        _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+        pages: {
+            [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
+        };
         _globalConfigPublic: {
-            pages: {
-                [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
-            };
             config: import("../../types/index.js").ConfigResolved;
             _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
             _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
             _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+            pages: {
+                [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
+            };
         };
-        pages: {
-            [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
-        };
-        config: import("../../types/index.js").ConfigResolved;
-        _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-        _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-        _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         isGlobalContext: true;
         _isOriginalObject: true;
         _virtualFileExportsGlobalEntry: unknown;
@@ -153,15 +153,15 @@ declare function getGlobalContextServerInternal(): Promise<{
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
     } & {
-        _isPrerendering: false;
-        viteConfig: null;
+        isClientSide: false;
+        _pageRoutes: PageRoutes;
+        _onBeforeRouteHook: HookInternal | null;
         _isProduction: true;
         assetsManifest: ViteManifest;
         _viteDevServer: null;
         _usesClientRouter: boolean;
-        isClientSide: false;
-        _pageRoutes: PageRoutes;
-        _onBeforeRouteHook: HookInternal | null;
+        _isPrerendering: false;
+        viteConfig: null;
     } & {
         baseServer: string;
         baseAssets: string;
@@ -180,22 +180,22 @@ declare function getGlobalContextServerInternal(): Promise<{
     });
 }>;
 declare function getGlobalContextServerInternalOptional(): (Record<string, unknown> & (({
+    config: import("../../types/index.js").ConfigResolved;
+    _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
+    _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
+    _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+    pages: {
+        [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
+    };
     _globalConfigPublic: {
-        pages: {
-            [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
-        };
         config: import("../../types/index.js").ConfigResolved;
         _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
         _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
         _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+        pages: {
+            [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
+        };
     };
-    pages: {
-        [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
-    };
-    config: import("../../types/index.js").ConfigResolved;
-    _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-    _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-    _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     isGlobalContext: true;
     _isOriginalObject: true;
     _virtualFileExportsGlobalEntry: unknown;
@@ -204,34 +204,34 @@ declare function getGlobalContextServerInternalOptional(): (Record<string, unkno
     _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
     _allPageIds: string[];
 } & (({
+    isClientSide: false;
+    _pageRoutes: PageRoutes;
+    _onBeforeRouteHook: HookInternal | null;
     _isProduction: false;
     _isPrerendering: false;
     assetsManifest: null;
     _viteDevServer: ViteDevServer | undefined;
     viteConfig: ResolvedConfig | undefined;
+} | {
     isClientSide: false;
     _pageRoutes: PageRoutes;
     _onBeforeRouteHook: HookInternal | null;
-} | {
-    _isPrerendering: true;
-    viteConfig: ResolvedConfig;
     _isProduction: true;
     assetsManifest: ViteManifest;
     _viteDevServer: null;
     _usesClientRouter: boolean;
+    _isPrerendering: true;
+    viteConfig: ResolvedConfig;
+} | {
     isClientSide: false;
     _pageRoutes: PageRoutes;
     _onBeforeRouteHook: HookInternal | null;
-} | {
-    _isPrerendering: false;
-    viteConfig: null;
     _isProduction: true;
     assetsManifest: ViteManifest;
     _viteDevServer: null;
     _usesClientRouter: boolean;
-    isClientSide: false;
-    _pageRoutes: PageRoutes;
-    _onBeforeRouteHook: HookInternal | null;
+    _isPrerendering: false;
+    viteConfig: null;
 }) & {
     baseServer: string;
     baseAssets: string;
@@ -287,22 +287,22 @@ declare function updateUserFiles(): Promise<{
     success: boolean;
 }>;
 declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Promise<({
+    config: import("../../types/index.js").ConfigResolved;
+    _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
+    _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
+    _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+    pages: {
+        [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
+    };
     _globalConfigPublic: {
-        pages: {
-            [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
-        };
         config: import("../../types/index.js").ConfigResolved;
         _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
         _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
         _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+        pages: {
+            [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
+        };
     };
-    pages: {
-        [k: string]: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
-    };
-    config: import("../../types/index.js").ConfigResolved;
-    _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-    _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-    _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     isGlobalContext: true;
     _isOriginalObject: true;
     _virtualFileExportsGlobalEntry: unknown;
@@ -311,34 +311,34 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
     _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
     _allPageIds: string[];
 } & (({
+    isClientSide: false;
+    _pageRoutes: PageRoutes;
+    _onBeforeRouteHook: HookInternal | null;
     _isProduction: false;
     _isPrerendering: false;
     assetsManifest: null;
     _viteDevServer: ViteDevServer | undefined;
     viteConfig: ResolvedConfig | undefined;
+} | {
     isClientSide: false;
     _pageRoutes: PageRoutes;
     _onBeforeRouteHook: HookInternal | null;
-} | {
-    _isPrerendering: true;
-    viteConfig: ResolvedConfig;
     _isProduction: true;
     assetsManifest: ViteManifest;
     _viteDevServer: null;
     _usesClientRouter: boolean;
+    _isPrerendering: true;
+    viteConfig: ResolvedConfig;
+} | {
     isClientSide: false;
     _pageRoutes: PageRoutes;
     _onBeforeRouteHook: HookInternal | null;
-} | {
-    _isPrerendering: false;
-    viteConfig: null;
     _isProduction: true;
     assetsManifest: ViteManifest;
     _viteDevServer: null;
     _usesClientRouter: boolean;
-    isClientSide: false;
-    _pageRoutes: PageRoutes;
-    _onBeforeRouteHook: HookInternal | null;
+    _isPrerendering: false;
+    viteConfig: null;
 }) & {
     baseServer: string;
     baseAssets: string;

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

@@ -31,22 +31,22 @@ declare function createPageContextServer(pageContextInit: PageContextInitInterna
     _reqWeb?: Request;
 } & {
     _globalContext: ({
+        config: import("../../../types/index.js").ConfigResolved;
+        _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+        pages: {
+            [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
+        };
         _globalConfigPublic: {
-            pages: {
-                [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
-            };
             config: import("../../../types/index.js").ConfigResolved;
             _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
             _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
             _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+            pages: {
+                [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
+            };
         };
-        pages: {
-            [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
-        };
-        config: import("../../../types/index.js").ConfigResolved;
-        _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-        _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-        _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         isGlobalContext: true;
         _isOriginalObject: true;
         _virtualFileExportsGlobalEntry: unknown;
@@ -55,34 +55,34 @@ declare function createPageContextServer(pageContextInit: PageContextInitInterna
         _pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
     } & (({
+        isClientSide: false;
+        _pageRoutes: import("../../__internal/index.js").PageRoutes;
+        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         _isProduction: false;
         _isPrerendering: false;
         assetsManifest: null;
         _viteDevServer: import("vite").ViteDevServer | undefined;
         viteConfig: import("vite").ResolvedConfig | undefined;
+    } | {
         isClientSide: false;
         _pageRoutes: import("../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
-    } | {
-        _isPrerendering: true;
-        viteConfig: import("vite").ResolvedConfig;
         _isProduction: true;
         assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
         _usesClientRouter: boolean;
+        _isPrerendering: true;
+        viteConfig: import("vite").ResolvedConfig;
+    } | {
         isClientSide: false;
         _pageRoutes: import("../../__internal/index.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
-    } | {
-        _isPrerendering: false;
-        viteConfig: null;
         _isProduction: true;
         assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
         _usesClientRouter: boolean;
-        isClientSide: false;
-        _pageRoutes: import("../../__internal/index.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
+        _isPrerendering: false;
+        viteConfig: null;
     }) & {
         baseServer: string;
         baseAssets: string;
@@ -114,13 +114,13 @@ declare function createPageContextServer(pageContextInit: PageContextInitInterna
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {
-    pages: {
-        [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
-    };
     config: import("../../../types/index.js").ConfigResolved;
     _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
     _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
     _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+    pages: {
+        [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
+    };
 } & {
     urlParsed: import("../../../utils/parseUrl.js").UrlPublic;
     urlPathname: string;

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

@@ -7,9 +7,10 @@ import '../../assertEnvServer.js';
 type PageContextExecHookServer = PageContextConfig & PageContextExecHook & {
     isClientSideNavigation: boolean;
 };
-declare function execHookServer(hookName: HookName, pageContext: PageContextExecHookServer): Promise<(import("../../../shared-server-client/hooks/getHook.js").HookLoc & {
+declare function execHookServer(hookName: HookName, pageContext: PageContextExecHookServer): Promise<{
     hookFn: (arg: import("../../../shared-server-client/createPageContextShared.js").PageContextCreated, ...rest: unknown[]) => unknown;
     hookTimeout: import("../../../shared-server-client/hooks/getHook.js").HookTimeout;
-} & {
+    hookName: import("../../../types/Config.js").HookNameOld;
+    hookFilePath: string;
     hookReturn: unknown;
-})[]>;
+}[]>;

package/dist/server/runtime/renderPageServer/html/injectAssets/injectHtmlTags.js

@@ -99,7 +99,9 @@ function injectBreakLines(htmlFragment, before, after) {
     const whitespaceExtra = paddingParent ? '  ' : '';
     const whitespace = `${paddingParent}${whitespaceExtra}`;
     const padding = `\n${whitespace}`;
-    htmlFragment = htmlFragment.replace(/<[^\/]/g, (match) => `${padding}${match}`);
+    // Match whole tags, and whole raw text elements (their content isn't markup): injecting a line break inside `<script>document.write('<div>')</script>` or inside an attribute value would corrupt it. https://github.com/vikejs/vike/issues/3457
+    const tagRE = /<(script|style|textarea|title)\b[^>]*>[\s\S]*?<\/\1>|<[^\/][^>]*>/gi;
+    htmlFragment = htmlFragment.replace(tagRE, (match) => `${padding}${match}`);
     if (isBlankLine) {
         assert(htmlFragment.startsWith(padding), { htmlFragment });
         htmlFragment = whitespaceExtra + htmlFragment.slice(padding.length);

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

@@ -30,22 +30,22 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     _reqWeb?: Request;
 } & {
     _globalContext: ({
+        config: import("../../../types/index.js").ConfigResolved;
+        _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+        pages: {
+            [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
+        };
         _globalConfigPublic: {
-            pages: {
-                [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
-            };
             config: import("../../../types/index.js").ConfigResolved;
             _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
             _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
             _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+            pages: {
+                [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
+            };
         };
-        pages: {
-            [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
-        };
-        config: import("../../../types/index.js").ConfigResolved;
-        _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
-        _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-        _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         isGlobalContext: true;
         _isOriginalObject: true;
         _virtualFileExportsGlobalEntry: unknown;
@@ -54,34 +54,34 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
         _pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
     } & (({
+        isClientSide: false;
+        _pageRoutes: import("../../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
+        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         _isProduction: false;
         _isPrerendering: false;
         assetsManifest: null;
         _viteDevServer: import("vite").ViteDevServer | undefined;
         viteConfig: import("vite").ResolvedConfig | undefined;
+    } | {
         isClientSide: false;
         _pageRoutes: import("../../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
-    } | {
-        _isPrerendering: true;
-        viteConfig: import("vite").ResolvedConfig;
         _isProduction: true;
         assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
         _usesClientRouter: boolean;
+        _isPrerendering: true;
+        viteConfig: import("vite").ResolvedConfig;
+    } | {
         isClientSide: false;
         _pageRoutes: import("../../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
-    } | {
-        _isPrerendering: false;
-        viteConfig: null;
         _isProduction: true;
         assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
         _viteDevServer: null;
         _usesClientRouter: boolean;
-        isClientSide: false;
-        _pageRoutes: import("../../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
+        _isPrerendering: false;
+        viteConfig: null;
     }) & {
         baseServer: string;
         baseAssets: string;
@@ -113,13 +113,13 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
 } & {
-    pages: {
-        [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
-    };
     config: import("../../../types/index.js").ConfigResolved;
     _source: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
     _sources: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
     _from: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+    pages: {
+        [k: string]: import("../../../shared-server-client/page-configs/resolveVikeConfigPublic.js").PageConfigPublicWithRoute;
+    };
 } & {
     urlParsed: import("../../../utils/parseUrl.js").UrlPublic;
     urlPathname: string;