vike 0.4.227-commit-e36b916 → 0.4.227-commit-710dcb6

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

@@ -1,6 +1,5 @@
 export { renderPageAlreadyRouted };
 export { prerenderPage };
-export { prerender404Page };
 export { getPageContextInitEnhanced };
 export { createPageContext };
 export type { PageContextAfterRender };
@@ -210,187 +209,6 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _urlHandler: null;
     };
 }>;
-declare function prerender404Page(pageContextInit_: Record<string, unknown> | null, globalContext: GlobalContextInternal): Promise<{
-    documentHtml: string;
-    pageContextSerialized: null;
-    pageContext: {
-        _isPageContextObject: boolean;
-        isClientSide: boolean;
-        isPrerendering: boolean;
-    } & Record<string, unknown> & {
-        urlOriginal: string;
-        headersOriginal?: unknown;
-        headers?: unknown;
-    } & {
-        _objectCreatedByVike: boolean;
-        _baseServer: string;
-        _baseAssets: string;
-        _includeAssetsImportedByServer: boolean;
-        _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        _pageRoutes: import("../../../__internal/index.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-        _globalContext: GlobalContextInternal;
-        /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
-        globalContext: Pick<{
-            viteConfigRuntime: {
-                _baseViteOriginal: null | string;
-            };
-            config: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigUserFriendly["config"];
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
-        } & import("../../shared/resolveBase.js").BaseUrlsResolved & ({
-            pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            pageConfigs: import("../../../__internal/index.js").PageConfig[];
-            pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-            allPageIds: string[];
-            pageRoutes: import("../../../__internal/index.js").PageRoutes;
-            onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
-            config: import("../../../types/index.js").ConfigResolved;
-        } & ({
-            isProduction: false;
-            isPrerendering: false;
-            viteConfig: import("vite").ResolvedConfig;
-            viteDevServer: import("vite").ViteDevServer;
-            assetsManifest: null;
-        } | ({
-            isProduction: true;
-            assetsManifest: import("../../shared/ViteManifest.js").ViteManifest;
-            viteDevServer: null;
-        } & ({
-            isPrerendering: false;
-            viteConfig: null;
-        } | {
-            isPrerendering: true;
-            usesClientRouter: boolean;
-            viteConfig: import("vite").ResolvedConfig;
-        })))), "pages" | "baseServer" | "baseAssets" | "config" | "assetsManifest" | "viteConfig">;
-        _pageContextInit: {
-            urlOriginal: string;
-            headersOriginal?: unknown;
-            headers?: unknown;
-        };
-        _urlRewrite: string | null;
-        _urlHandler: ((url: string) => string) | null;
-        isClientSideNavigation: boolean;
-    } & {
-        urlParsed: import("../utils.js").UrlPublic;
-        urlPathname: string;
-        url: string;
-    } & {
-        headers: Record<string, string> | null;
-    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
-        Page: unknown;
-        _isHtmlOnly: boolean;
-        _passToClient: string[];
-        _pageFilePathsLoaded: string[];
-    } & {
-        __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
-    } & {
-        routeParams: Record<string, string>;
-        pageId: string;
-        _urlRewrite: null;
-        _httpRequestId: number | null;
-        _usesClientRouter: boolean;
-        _pageContextAlreadyProvidedByOnPrerenderHook?: true;
-        is404: null | boolean;
-    } & {
-        isClientSideNavigation: boolean;
-        _urlHandler: null;
-    };
-} | {
-    documentHtml: string;
-    pageContextSerialized: string;
-    pageContext: {
-        _isPageContextObject: boolean;
-        isClientSide: boolean;
-        isPrerendering: boolean;
-    } & Record<string, unknown> & {
-        urlOriginal: string;
-        headersOriginal?: unknown;
-        headers?: unknown;
-    } & {
-        _objectCreatedByVike: boolean;
-        _baseServer: string;
-        _baseAssets: string;
-        _includeAssetsImportedByServer: boolean;
-        _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        _pageRoutes: import("../../../__internal/index.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-        _globalContext: GlobalContextInternal;
-        /** @experimental This is a beta feature https://vike.dev/getGlobalContext */
-        globalContext: Pick<{
-            viteConfigRuntime: {
-                _baseViteOriginal: null | string;
-            };
-            config: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigUserFriendly["config"];
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
-        } & import("../../shared/resolveBase.js").BaseUrlsResolved & ({
-            pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            pageConfigs: import("../../../__internal/index.js").PageConfig[];
-            pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-            allPageIds: string[];
-            pageRoutes: import("../../../__internal/index.js").PageRoutes;
-            onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
-            config: import("../../../types/index.js").ConfigResolved;
-        } & ({
-            isProduction: false;
-            isPrerendering: false;
-            viteConfig: import("vite").ResolvedConfig;
-            viteDevServer: import("vite").ViteDevServer;
-            assetsManifest: null;
-        } | ({
-            isProduction: true;
-            assetsManifest: import("../../shared/ViteManifest.js").ViteManifest;
-            viteDevServer: null;
-        } & ({
-            isPrerendering: false;
-            viteConfig: null;
-        } | {
-            isPrerendering: true;
-            usesClientRouter: boolean;
-            viteConfig: import("vite").ResolvedConfig;
-        })))), "pages" | "baseServer" | "baseAssets" | "config" | "assetsManifest" | "viteConfig">;
-        _pageContextInit: {
-            urlOriginal: string;
-            headersOriginal?: unknown;
-            headers?: unknown;
-        };
-        _urlRewrite: string | null;
-        _urlHandler: ((url: string) => string) | null;
-        isClientSideNavigation: boolean;
-    } & {
-        urlParsed: import("../utils.js").UrlPublic;
-        urlPathname: string;
-        url: string;
-    } & {
-        headers: Record<string, string> | null;
-    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
-        Page: unknown;
-        _isHtmlOnly: boolean;
-        _passToClient: string[];
-        _pageFilePathsLoaded: string[];
-    } & {
-        __getPageAssets: () => Promise<import("./getPageAssets.js").PageAsset[]>;
-    } & {
-        routeParams: Record<string, string>;
-        pageId: string;
-        _urlRewrite: null;
-        _httpRequestId: number | null;
-        _usesClientRouter: boolean;
-        _pageContextAlreadyProvidedByOnPrerenderHook?: true;
-        is404: null | boolean;
-    } & {
-        isClientSideNavigation: boolean;
-        _urlHandler: null;
-    };
-} | null>;
 type PageContextInitEnhanced = Awaited<ReturnType<typeof getPageContextInitEnhanced>>;
 declare function getPageContextInitEnhanced(pageContextInit: {
     urlOriginal: string;

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

@@ -1,6 +1,5 @@
 export { renderPageAlreadyRouted };
 export { prerenderPage };
-export { prerender404Page };
 export { getPageContextInitEnhanced };
 export { createPageContext };
 import { getErrorPageId } from '../../../shared/error-page.js';
@@ -80,28 +79,6 @@ async function prerenderPage(pageContext) {
         return { documentHtml, pageContextSerialized, pageContext };
     }
 }
-async function prerender404Page(pageContextInit_, globalContext) {
-    const errorPageId = getErrorPageId(globalContext.pageFilesAll, globalContext.pageConfigs);
-    if (!errorPageId) {
-        return null;
-    }
-    // A URL is required for `viteDevServer.transformIndexHtml(url,html)`
-    const pageContextInit = { urlOriginal: '/fake-404-url' };
-    objectAssign(pageContextInit, pageContextInit_);
-    const pageContext = await getPageContextInitEnhanced(pageContextInit, globalContext, true);
-    objectAssign(pageContext, {
-        pageId: errorPageId,
-        _httpRequestId: null,
-        _urlRewrite: null,
-        is404: true,
-        routeParams: {},
-        // `prerender404Page()` is about generating `dist/client/404.html` for static hosts; there is no Client Routing.
-        _usesClientRouter: false,
-        _debugRouteMatches: []
-    });
-    objectAssign(pageContext, await loadUserFilesServerSide(pageContext));
-    return prerenderPage(pageContext);
-}
 async function getPageContextInitEnhanced(pageContextInit, globalContext, isPrerendering, { ssr: { urlRewrite, urlHandler, isClientSideNavigation } = {
     urlRewrite: null,
     urlHandler: null,

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

@@ -30,4 +30,4 @@ type RouteMatch = {
     routeParams: Record<string, string>;
 };
 type RouteMatches = 'CUSTOM_ROUTING' | RouteMatch[];
-declare function route(pageContext: PageContextForRoute): Promise<PageContextFromRoute>;
+declare function route(pageContext: PageContextForRoute, skipOnBeforeRouteHook?: true): Promise<PageContextFromRoute>;

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

@@ -13,23 +13,25 @@ import { resolveRouteFunction } from './resolveRouteFunction.js';
 import { executeOnBeforeRouteHook } from './executeOnBeforeRouteHook.js';
 import { debug } from './debug.js';
 import pc from '@brillout/picocolors';
-async function route(pageContext) {
+async function route(pageContext, skipOnBeforeRouteHook) {
     debug('Pages routes:', pageContext._pageRoutes);
     assertPageContextUrl(pageContext);
     const pageContextFromRoute = {};
     // onBeforeRoute()
-    const pageContextFromOnBeforeRouteHook = await executeOnBeforeRouteHook(pageContext);
-    if (pageContextFromOnBeforeRouteHook) {
-        if (pageContextFromOnBeforeRouteHook._routingProvidedByOnBeforeRouteHook) {
-            assert(pageContextFromOnBeforeRouteHook.pageId);
-            return pageContextFromOnBeforeRouteHook;
-        }
-        else {
-            objectAssign(pageContextFromRoute, pageContextFromOnBeforeRouteHook);
+    if (!skipOnBeforeRouteHook) {
+        const pageContextFromOnBeforeRouteHook = await executeOnBeforeRouteHook(pageContext);
+        if (pageContextFromOnBeforeRouteHook) {
+            if (pageContextFromOnBeforeRouteHook._routingProvidedByOnBeforeRouteHook) {
+                assert(pageContextFromOnBeforeRouteHook.pageId);
+                return pageContextFromOnBeforeRouteHook;
+            }
+            else {
+                objectAssign(pageContextFromRoute, pageContextFromOnBeforeRouteHook);
+            }
         }
+        // We take into account pageContext.urlLogical set by onBeforeRoute()
+        objectAssign(pageContext, pageContextFromOnBeforeRouteHook);
     }
-    // We take into account pageContext.urlLogical set by onBeforeRoute()
-    objectAssign(pageContext, pageContextFromOnBeforeRouteHook);
     // Vike's routing
     const allPageIds = pageContext._allPageIds;
     assertUsage(allPageIds.length > 0, 'No page found. You must create at least one page.');

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.227-commit-e36b916";
+export declare const PROJECT_VERSION: "0.4.227-commit-710dcb6";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.227-commit-e36b916';
+export const PROJECT_VERSION = '0.4.227-commit-710dcb6';

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

@@ -0,0 +1,2 @@
+export { preservePropertyGetters };
+declare function preservePropertyGetters<T extends object>(objOriginal: T): void;

package/dist/esm/utils/preservePropertyGetters.js

@@ -0,0 +1,28 @@
+export { preservePropertyGetters };
+import { assert } from './assert.js';
+function preservePropertyGetters(objOriginal) {
+    // Store original getter descriptors
+    const getters = Object.fromEntries(Object.entries(Object.getOwnPropertyDescriptors(objOriginal)).filter(([_, desc]) => 'get' in desc));
+    // Make getters non-enumerable
+    for (const [key, desc] of Object.entries(getters)) {
+        Object.defineProperty(objOriginal, key, { ...desc, enumerable: false });
+    }
+    const restorePropertyGetters = function () {
+        const objCopy = this;
+        delete objOriginal._restorePropertyGetters;
+        delete objCopy._restorePropertyGetters;
+        for (const [key, desc] of Object.entries(getters)) {
+            if (objCopy !== objOriginal) {
+                assert(!(key in objCopy));
+                Object.defineProperty(objCopy, key, desc); // Add property getters to copy
+            }
+            assert(key in objOriginal);
+            Object.defineProperty(objOriginal, key, desc); // Restore original `enumerable` value
+        }
+    };
+    Object.defineProperty(objOriginal, '_restorePropertyGetters', {
+        value: restorePropertyGetters,
+        enumerable: true,
+        configurable: true
+    });
+}

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

@@ -1,2 +1,6 @@
 export { requireResolve };
+export { requireResolveExpected };
+export { requireResolveInternal };
 declare function requireResolve(importPath: string, cwd: string): string | null;
+declare function requireResolveExpected(importPath: string, cwd: string): string;
+declare function requireResolveInternal(importPath: string, cwd: string): string;

package/dist/esm/utils/requireResolve.js

@@ -1,36 +1,77 @@
 export { requireResolve };
+export { requireResolveExpected };
+export { requireResolveInternal };
 import { assert } from './assert.js';
 import { assertIsNotBrowser } from './assertIsNotBrowser.js';
 import { assertIsNotProductionRuntime } from './assertSetup.js';
 import { assertPosixPath, toPosixPath } from './path.js';
 import { scriptFileExtensionList } from './isScriptFile.js';
-import { createRequire } from 'module';
+import { createRequire } from 'node:module';
+import path from 'node:path';
 // @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 assertIsNotBrowser();
 assertIsNotProductionRuntime();
-// We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
-// - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
-function requireResolve(importPath, cwd) {
+function requireResolve_(importPath, cwd) {
     assertPosixPath(cwd);
+    assertPosixPath(importPath);
+    cwd = resolveCwd(cwd);
     const clean = addFileExtensionsToRequireResolve();
     importPath = removeFileExtention(importPath);
     let importedFile;
     try {
+        // We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
+        // - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
         importedFile = require_.resolve(importPath, { paths: [cwd] });
     }
-    catch {
-        importedFile = null;
-    }
-    finally {
+    catch (err) {
         clean();
+        return { importedFile: undefined, err, hasFailed: true };
     }
-    if (importedFile) {
-        importedFile = toPosixPath(importedFile);
+    clean();
+    importedFile = toPosixPath(importedFile);
+    return { importedFile, err: undefined, hasFailed: false };
+}
+function requireResolve(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd);
+    if (res.hasFailed)
+        return null;
+    return res.importedFile;
+}
+function requireResolveExpected(importPath, cwd) {
+    const res = requireResolve_(importPath, cwd);
+    if (res.hasFailed)
+        throw res.err;
+    return res.importedFile;
+}
+// For internal Vike files that are expected to exist and to be .js files
+function requireResolveInternal(importPath, cwd) {
+    assertPosixPath(cwd);
+    assertPosixPath(importPath);
+    cwd = resolveCwd(cwd);
+    let importedFile;
+    try {
+        importedFile = require_.resolve(importPath, { paths: [cwd] });
     }
+    catch (err) {
+        console.log('err', err);
+        assert(false, { cwd, importPath });
+    }
+    importedFile = toPosixPath(importedFile);
     return importedFile;
 }
+function resolveCwd(cwd) {
+    let prefix = 'file://';
+    if (process.platform === 'win32')
+        prefix += '/';
+    if (cwd.startsWith(prefix)) {
+        cwd = cwd.slice(prefix.length);
+        cwd = path.posix.dirname(cwd);
+    }
+    assert(!cwd.startsWith('file:'));
+    return cwd;
+}
 function removeFileExtention(importPath) {
     // Skip for Bun: https://github.com/vikejs/vike/issues/2204
     //@ts-ignore

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.227-commit-e36b916",
+  "version": "0.4.227-commit-710dcb6",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {