vike 0.4.237-commit-92dc549 → 0.4.237-commit-fd8294f

package/dist/esm/node/vite/shared/isViteServerSide.js

@@ -4,16 +4,16 @@ export { isViteServerSide_withoutEnv };
 export { isViteServerSide_onlySsrEnv };
 export { isViteServerSide_extraSafe };
 import { assert } from '../../../utils/assert.js';
-function isViteServerSide_withoutEnv(configGlobal, viteEnv) {
+function isViteServerSide_impl(configGlobal, viteEnv) {
     assert(!('consumer' in configGlobal)); // make sure configGlobal isn't viteEnv.config
     const isServerSide1 = !viteEnv?.config.consumer ? null : viteEnv.config.consumer !== 'client';
-    const isServerSide2 = !viteEnv?.name ? null : viteEnv.name !== 'client'; // I can't think of a use case for creating another client-side environment
-    const isServerSide3 = !viteEnv ? null : !!viteEnv.config.build?.ssr;
-    const isServerSide4 = !!configGlobal.build?.ssr;
+    const isServerSide2 = !viteEnv?.config.build ? null : getBuildSsrValue(viteEnv.config.build.ssr);
+    const isServerSide3 = !configGlobal.build ? null : getBuildSsrValue(configGlobal.build.ssr);
+    const isServerSide4 = viteEnv?.name === 'ssr' ? true : viteEnv?.name === 'client' ? false : null;
     const debug = {
-        envIsUndefined: !viteEnv,
-        envName: viteEnv?.name ?? null,
-        envConsumer: viteEnv?.config.consumer ?? null,
+        viteEnvIsUndefined: !viteEnv,
+        viteEnvName: viteEnv?.name ?? null,
+        viteEnvConsumer: viteEnv?.config.consumer ?? null,
         configEnvBuildSsr: viteEnv?.config.build?.ssr ?? null,
         configGlobalBuildSsr: configGlobal.build?.ssr ?? null,
         isServerSide1,
@@ -22,25 +22,36 @@ function isViteServerSide_withoutEnv(configGlobal, viteEnv) {
         isServerSide4,
     };
     if (isServerSide1 !== null) {
-        assert(isServerSide1 === isServerSide2 || isServerSide2 === null, debug);
+        // assert(isServerSide1 === isServerSide4 || isServerSide4 === null, debug)
         /* This assertion can fail, seems to be a Vite bug?
-        assert(isServerSide1 === isServerSide3, debug)
+        assert(isServerSide1 === isServerSide2, debug)
         */
         return isServerSide1;
     }
     if (isServerSide2 !== null) {
-        /* This assertion can fail, seems to be a Vite bug?
-        assert(isServerSide2 === isServerSide3, debug)
-        */
+        // assert(isServerSide2 === isServerSide4 || isServerSide4 === null, debug)
         return isServerSide2;
     }
     if (isServerSide3 !== null) {
+        // assert(isServerSide3 === isServerSide4 || isServerSide4 === null, debug)
         return isServerSide3;
     }
-    return isServerSide4;
+    if (isServerSide4 !== null) {
+        return isServerSide4;
+    }
+    assert(!viteEnv);
+    return !!configGlobal.build?.ssr;
+}
+function getBuildSsrValue(buildSsr) {
+    if (buildSsr === undefined)
+        return null;
+    return !!buildSsr;
 }
 function isViteServerSide(configGlobal, viteEnv) {
-    return isViteServerSide_withoutEnv(configGlobal, viteEnv);
+    return isViteServerSide_impl(configGlobal, viteEnv);
+}
+function isViteServerSide_withoutEnv(configGlobal, viteEnv) {
+    return isViteServerSide_impl(configGlobal, viteEnv);
 }
 function isViteClientSide(configGlobal, viteEnv) {
     return !isViteServerSide(configGlobal, viteEnv);
@@ -51,20 +62,36 @@ function isViteServerSide_onlySsrEnv(configGlobal, viteEnv) {
 }
 // Vite is quite messy about setting config.build.ssr — for security purposes, we use an extra safe implementation with lots of assertions, which is needed for the .client.js and .server.js guarantee.
 function isViteServerSide_extraSafe(config, options, viteEnv) {
+    const isServerSide = isViteServerSide(config, viteEnv);
+    const debug = {
+        configCommand: config.command,
+        configBuildSsr: config.build.ssr,
+        optionsIsUndefined: options === undefined,
+        optionsSsr: options?.ssr,
+        isServerSide,
+    };
+    if (true) {
+        const res = options?.ssr;
+        if (typeof res === 'boolean') {
+            assert(res === isServerSide, debug);
+            return res;
+        }
+        return isServerSide;
+    }
     if (config.command === 'build') {
         const res = config.build.ssr;
-        assert(typeof res === 'boolean');
-        assert(res === options?.ssr || options?.ssr === undefined);
-        assert(res === isViteServerSide(config, viteEnv));
+        assert(typeof res === 'boolean', debug);
+        assert(res === options?.ssr || options?.ssr === undefined, debug);
+        assert(res === isServerSide, debug);
         return res;
     }
     else {
         const res = options?.ssr;
-        assert(typeof res === 'boolean');
+        assert(typeof res === 'boolean', debug);
         /* This assertion can fail, seems to be a Vite bug? It's very unexpected.
         if (typeof config.build.ssr === 'boolean') assert(res === config.build.ssr)
         */
-        assert(res === isViteServerSide(config, viteEnv));
+        assert(res === isServerSide, debug);
         return res;
     }
 }

package/dist/esm/shared/page-configs/loadAndParseVirtualFilePageEntry.d.ts

@@ -0,0 +1,3 @@
+export { loadAndParseVirtualFilePageEntry };
+import type { PageConfigRuntime, PageConfigRuntimeLoaded } from '../../types/PageConfig.js';
+declare function loadAndParseVirtualFilePageEntry(pageConfig: PageConfigRuntime, isDev: boolean): Promise<PageConfigRuntimeLoaded>;

package/dist/esm/shared/page-configs/{loadPageEntry.js → loadAndParseVirtualFilePageEntry.js}

@@ -1,7 +1,7 @@
-export { loadPageEntry };
+export { loadAndParseVirtualFilePageEntry };
 import { assert, objectAssign } from '../utils.js';
 import { parseConfigValuesSerialized } from './serialize/parsePageConfigsSerialized.js';
-async function loadPageEntry(pageConfig, isDev) {
+async function loadAndParseVirtualFilePageEntry(pageConfig, isDev) {
     if ('isPageEntryLoaded' in pageConfig &&
         // We don't need to cache in dev, since Vite already caches the virtual module
         !isDev) {

package/dist/esm/shared/page-configs/resolveVikeConfigPublic.js

@@ -1,3 +1,8 @@
+// TO-DO/soon: rename PageConfig names
+// - Use `Internal` suffix, i.e. {Page,Global}ConfigInternal
+//   - While keeping {Page,Global}ConfigPublic or remove Public suffix and rename it to {Page,Global}Config ?
+// - rename EagerLoaded EagerlyLoaded
+// - remove `LazyLoaded` suffix
 // TO-DO/soon/same-api: use public API internally?
 // TO-DO/soon/flat-pageContext: rename definedAt => definedBy
 export { resolveVikeConfigPublicGlobal };

package/dist/esm/shared/route/execHookOnBeforeRoute.d.ts

@@ -1,7 +1,7 @@
 export { execHookOnBeforeRoute };
-import type { PageContextForRoute, PageContextFromRoute } from './index.js';
-declare function execHookOnBeforeRoute(pageContext: PageContextForRoute): Promise<null | ({
+import type { PageContextBeforeRoute, PageContextAfterRoute } from './index.js';
+declare function execHookOnBeforeRoute(pageContext: PageContextBeforeRoute): Promise<null | ({
     _routingProvidedByOnBeforeRouteHook: true;
-} & PageContextFromRoute) | {
+} & PageContextAfterRoute) | {
     _routingProvidedByOnBeforeRouteHook: false;
 }>;

package/dist/esm/shared/route/execHookOnBeforeRoute.js

@@ -23,7 +23,6 @@ async function execHookOnBeforeRoute(pageContext) {
             }
             objectAssign(pageContextFromOnBeforeRouteHook, {
                 _routingProvidedByOnBeforeRouteHook: true,
-                _debugRouteMatches: 'CUSTOM_ROUTING',
             });
             return pageContextFromOnBeforeRouteHook;
         }

package/dist/esm/shared/route/index.d.ts

@@ -1,19 +1,18 @@
 export { route };
-export type { PageContextForRoute };
-export type { PageContextFromRoute };
+export type { PageContextBeforeRoute };
+export type { PageContextAfterRoute };
 export type { PageRoutes };
 export type { RouteMatches };
 import { type PageContextUrlInternal, type PageContextUrlSource } from '../getPageContextUrlComputed.js';
 import type { PageRoutes, RouteType } from './loadPageRoutes.js';
 import type { GlobalContextInternal } from '../createGlobalContextShared.js';
-type PageContextForRoute = PageContextUrlInternal & {
+type PageContextBeforeRoute = PageContextUrlInternal & {
     _globalContext: GlobalContextInternal;
 } & PageContextUrlSource;
-type PageContextFromRoute = {
+type PageContextAfterRoute = {
     pageId: string | null;
     routeParams: Record<string, string>;
     _routingProvidedByOnBeforeRouteHook?: boolean;
-    _debugRouteMatches: RouteMatches;
 };
 type RouteMatch = {
     pageId: string;
@@ -23,4 +22,4 @@ type RouteMatch = {
     routeParams: Record<string, string>;
 };
 type RouteMatches = 'CUSTOM_ROUTING' | RouteMatch[];
-declare function route(pageContext: PageContextForRoute, skipOnBeforeRouteHook?: true): Promise<PageContextFromRoute>;
+declare function route(pageContext: PageContextBeforeRoute, skipOnBeforeRouteHook?: true): Promise<PageContextAfterRoute>;

package/dist/esm/shared/route/index.js

@@ -81,7 +81,6 @@ async function route(pageContext, skipOnBeforeRouteHook) {
     resolvePrecedence(routeMatches);
     const winner = routeMatches[0] ?? null;
     debug(`Route matches for URL ${pc.cyan(urlPathname)} (in precedence order):`, routeMatches);
-    objectAssign(pageContextFromRoute, { _debugRouteMatches: routeMatches });
     // For vite-plugin-vercel https://github.com/magne4000/vite-plugin-vercel/blob/main/packages/vike-integration/vike.ts#L173
     objectAssign(pageContextFromRoute, { _routeMatch: winner });
     if (!winner) {

package/dist/esm/types/Config.d.ts

@@ -404,11 +404,9 @@ type ConfigBuiltIn = {
     /** @deprecated See https://vike.dev/disableAutoFullBuild */
     disableAutoFullBuild?: boolean | 'prerender';
     /**
-     * Use builder.buildApp() to orchestrate the build process.
-     *
-     * @experimental
+     * @deprecated It's value is now always true.
      */
-    vite6BuilderApp?: boolean;
+    vite6BuilderApp?: true;
     /** The Base URL of your server.
      *
      * https://vike.dev/base-url

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.237-commit-92dc549";
+export declare const PROJECT_VERSION: "0.4.237-commit-fd8294f";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.237-commit-92dc549';
+export const PROJECT_VERSION = '0.4.237-commit-fd8294f';

package/dist/esm/utils/updateType.d.ts

@@ -0,0 +1,3 @@
+export { updateType };
+/** Help TypeScript update the type of dynamically modified objects. */
+declare function updateType<Thing, Clone>(thing: Thing, clone: Clone): asserts thing is Thing & Clone;

package/dist/esm/utils/updateType.js

@@ -0,0 +1,7 @@
+export { updateType };
+import { assert } from './assert.js';
+/** Help TypeScript update the type of dynamically modified objects. */
+function updateType(thing, clone) {
+    // @ts-ignore
+    assert(thing === clone);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.237-commit-92dc549",
+  "version": "0.4.237-commit-fd8294f",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -132,7 +132,7 @@
     "@brillout/json-serializer": "^0.5.20",
     "@brillout/picocolors": "^1.0.26",
     "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-server-entry": "^0.7.12",
+    "@brillout/vite-plugin-server-entry": "^0.7.13",
     "acorn": "^8.0.0",
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",
@@ -263,7 +263,7 @@
     "react-streaming": "^0.4.3",
     "rimraf": "^5.0.5",
     "typescript": "^5.8.3",
-    "vite": "^7.0.6"
+    "vite": "^7.1.3"
   },
   "scripts": {
     "dev": "tsc --watch",

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

@@ -1,52 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.debugPageFiles = debugPageFiles;
-const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const utils_js_1 = require("../utils.js");
-function debugPageFiles({ pageContext, isHtmlOnly, isClientRouting, pageFilesLoaded, pageFilesServerSide, pageFilesClientSide, clientEntries, clientDependencies, }) {
-    const debug = (0, utils_js_1.createDebugger)('vike:pageFiles', { serialization: { emptyArray: 'None' } });
-    const padding = '   - ';
-    debug('All page files:', printPageFiles(pageContext._globalContext._pageFilesAll, true));
-    debug(`URL:`, pageContext.urlOriginal);
-    debug.options({ serialization: { emptyArray: 'No match' } })(`Routing:`, printRouteMatches(pageContext._debugRouteMatches));
-    debug(`pageId:`, pageContext.pageId);
-    debug('Page type:', isHtmlOnly ? 'HTML-only' : 'SSR/SPA');
-    debug(`Routing type:`, !isHtmlOnly && isClientRouting ? 'Client Routing' : 'Server Routing');
-    debug('Server-side page files:', printPageFiles(pageFilesLoaded));
-    (0, utils_js_1.assert)(samePageFiles(pageFilesLoaded, pageFilesServerSide));
-    debug('Client-side page files:', printPageFiles(pageFilesClientSide));
-    debug('Client-side entries:', clientEntries);
-    debug('Client-side dependencies:', clientDependencies);
-    return;
-    function printRouteMatches(debugRouteMatches) {
-        if (debugRouteMatches === 'ROUTING_ERROR') {
-            return 'Routing Failed';
-        }
-        if (debugRouteMatches === 'CUSTOM_ROUTING') {
-            return 'Custom Routing';
-        }
-        return debugRouteMatches;
-    }
-    function printPageFiles(pageFiles, genericPageFilesLast = false) {
-        if (pageFiles.length === 0) {
-            return 'None';
-        }
-        return ('\n' +
-            pageFiles
-                .sort((p1, p2) => p1.filePath.localeCompare(p2.filePath))
-                .sort((0, utils_js_1.makeFirst)((p) => (p.isRendererPageFile ? !genericPageFilesLast : null)))
-                .sort((0, utils_js_1.makeFirst)((p) => (p.isDefaultPageFile ? !genericPageFilesLast : null)))
-                .map((p) => p.filePath)
-                .map((s) => s.split('_default.page.').join(`${picocolors_1.default.blue('_default')}.page.`))
-                .map((s) => s.split('/renderer/').join(`/${picocolors_1.default.red('renderer')}/`))
-                .map((s) => padding + s)
-                .join('\n'));
-    }
-}
-function samePageFiles(pageFiles1, pageFiles2) {
-    return (pageFiles1.every((p1) => pageFiles2.some((p2) => p2.filePath === p1.filePath)) &&
-        pageFiles2.every((p2) => pageFiles1.some((p1) => p1.filePath === p2.filePath)));
-}

package/dist/esm/node/runtime/renderPage/debugPageFiles.d.ts

@@ -1,23 +0,0 @@
-export { debugPageFiles };
-export type { PageContextDebugRouteMatches };
-import type { RouteMatches } from '../../../shared/route/index.js';
-import type { ClientDependency } from '../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
-import type { PageFile } from '../../../shared/getPageFiles.js';
-import type { GlobalContextServerInternal } from '../globalContext.js';
-type PageContextDebugRouteMatches = {
-    _debugRouteMatches: 'ROUTING_ERROR' | RouteMatches;
-};
-declare function debugPageFiles({ pageContext, isHtmlOnly, isClientRouting, pageFilesLoaded, pageFilesServerSide, pageFilesClientSide, clientEntries, clientDependencies, }: {
-    pageContext: {
-        urlOriginal: string;
-        pageId: string;
-        _globalContext: GlobalContextServerInternal;
-    } & PageContextDebugRouteMatches;
-    isHtmlOnly: boolean;
-    isClientRouting: boolean;
-    pageFilesLoaded: PageFile[];
-    pageFilesClientSide: PageFile[];
-    pageFilesServerSide: PageFile[];
-    clientEntries: string[];
-    clientDependencies: ClientDependency[];
-}): void;

package/dist/esm/node/runtime/renderPage/debugPageFiles.js

@@ -1,47 +0,0 @@
-export { debugPageFiles };
-import pc from '@brillout/picocolors';
-import { assert, makeFirst, createDebugger } from '../utils.js';
-function debugPageFiles({ pageContext, isHtmlOnly, isClientRouting, pageFilesLoaded, pageFilesServerSide, pageFilesClientSide, clientEntries, clientDependencies, }) {
-    const debug = createDebugger('vike:pageFiles', { serialization: { emptyArray: 'None' } });
-    const padding = '   - ';
-    debug('All page files:', printPageFiles(pageContext._globalContext._pageFilesAll, true));
-    debug(`URL:`, pageContext.urlOriginal);
-    debug.options({ serialization: { emptyArray: 'No match' } })(`Routing:`, printRouteMatches(pageContext._debugRouteMatches));
-    debug(`pageId:`, pageContext.pageId);
-    debug('Page type:', isHtmlOnly ? 'HTML-only' : 'SSR/SPA');
-    debug(`Routing type:`, !isHtmlOnly && isClientRouting ? 'Client Routing' : 'Server Routing');
-    debug('Server-side page files:', printPageFiles(pageFilesLoaded));
-    assert(samePageFiles(pageFilesLoaded, pageFilesServerSide));
-    debug('Client-side page files:', printPageFiles(pageFilesClientSide));
-    debug('Client-side entries:', clientEntries);
-    debug('Client-side dependencies:', clientDependencies);
-    return;
-    function printRouteMatches(debugRouteMatches) {
-        if (debugRouteMatches === 'ROUTING_ERROR') {
-            return 'Routing Failed';
-        }
-        if (debugRouteMatches === 'CUSTOM_ROUTING') {
-            return 'Custom Routing';
-        }
-        return debugRouteMatches;
-    }
-    function printPageFiles(pageFiles, genericPageFilesLast = false) {
-        if (pageFiles.length === 0) {
-            return 'None';
-        }
-        return ('\n' +
-            pageFiles
-                .sort((p1, p2) => p1.filePath.localeCompare(p2.filePath))
-                .sort(makeFirst((p) => (p.isRendererPageFile ? !genericPageFilesLast : null)))
-                .sort(makeFirst((p) => (p.isDefaultPageFile ? !genericPageFilesLast : null)))
-                .map((p) => p.filePath)
-                .map((s) => s.split('_default.page.').join(`${pc.blue('_default')}.page.`))
-                .map((s) => s.split('/renderer/').join(`/${pc.red('renderer')}/`))
-                .map((s) => padding + s)
-                .join('\n'));
-    }
-}
-function samePageFiles(pageFiles1, pageFiles2) {
-    return (pageFiles1.every((p1) => pageFiles2.some((p2) => p2.filePath === p1.filePath)) &&
-        pageFiles2.every((p2) => pageFiles1.some((p1) => p1.filePath === p2.filePath)));
-}

package/dist/esm/shared/page-configs/loadPageEntry.d.ts

@@ -1,3 +0,0 @@
-export { loadPageEntry };
-import type { PageConfigRuntime, PageConfigRuntimeLoaded } from '../../types/PageConfig.js';
-declare function loadPageEntry(pageConfig: PageConfigRuntime, isDev: boolean): Promise<PageConfigRuntimeLoaded>;

package/dist/esm/utils/augmentType.d.ts

@@ -1,3 +0,0 @@
-export { augmentType };
-/** Help TypeScript augment the type of objects. */
-declare function augmentType<Thing, Clone>(thing: Thing, clone: Clone): asserts thing is Thing & Clone;

package/dist/esm/utils/augmentType.js

@@ -1,7 +0,0 @@
-export { augmentType };
-import { assert } from './assert.js';
-/** Help TypeScript augment the type of objects. */
-function augmentType(thing, clone) {
-    // @ts-ignore
-    assert(thing === clone);
-}