vike 0.4.195 → 0.4.196-commit-df033dd

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transpileAndExecuteFile.js

@@ -176,12 +176,11 @@ async function transpileWithEsbuild(filePath, userRootDir, transformImports) {
                     }
                     if (debug.isActivated)
                         debug('onResolved()', { args, resolved, importPathTranspiled, isPointerImport, isExternal });
-                    pointerImports[importPathTranspiled] = isPointerImport;
                     if (isExternal) {
+                        pointerImports[importPathTranspiled] = isPointerImport;
                         return { external: true, path: importPathTranspiled };
                     }
                     else {
-                        resolved.path = importPathTranspiled;
                         return resolved;
                     }
                 });

package/dist/esm/node/runtime/html/stream.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 export { processStream };
 export { streamToString };
 export { stampPipe };

package/dist/esm/node/runtime/index-deprecated.d.ts

@@ -13,5 +13,5 @@ export * from '../../types/index-dreprecated.js';
  * See https://vike.dev/render
  */
 export declare const RenderErrorPage: (args_0?: {
-    pageContext?: Record<string, unknown> | undefined;
+    pageContext?: Record<string, unknown>;
 } | undefined) => Error;

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

@@ -7,17 +7,17 @@ import { getGlobalContext } from '../globalContext.js';
 import { getConfigValueRuntime } from '../../../shared/page-configs/getConfigValue.js';
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
-        const { clientEntryLoaded, isClientRouting } = analyzeClientSide(pageConfig, pageFilesAll, pageId);
+        const { isClientRuntimeLoaded, isClientRouting } = analyzeClientSide(pageConfig, pageFilesAll, pageId);
         const clientEntries = [];
         const clientFilePath = getConfigValueRuntime(pageConfig, 'client', 'string')?.value ?? null;
         if (clientFilePath)
             clientEntries.push(clientFilePath);
-        if (clientEntryLoaded)
+        if (isClientRuntimeLoaded)
             clientEntries.push(getVikeClientEntry(isClientRouting));
         const clientDependencies = [];
         clientDependencies.push({
             id: getVirtualFileIdPageConfigValuesAll(pageConfig.pageId, true),
-            onlyAssets: clientEntryLoaded ? false : true,
+            onlyAssets: isClientRuntimeLoaded ? false : true,
             eagerlyImported: false
         });
         // In production we inject the import of the server virtual module with ?extractAssets inside the client virtual module
@@ -53,7 +53,7 @@ function analyzePage(pageFilesAll, pageConfig, pageId) {
             });
         });
         return {
-            isHtmlOnly: !clientEntryLoaded,
+            isHtmlOnly: !isClientRuntimeLoaded,
             isClientRouting,
             clientEntries,
             clientDependencies,

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

@@ -11,6 +11,7 @@ import type { RenderHook } from './executeOnRenderHtmlHook.js';
 import type { RedirectStatusCode, AbortStatusCode, UrlRedirect } from '../../../shared/route/abort.js';
 import { HttpResponseBody } from './getHttpResponseBody.js';
 import { type EarlyHint } from './getEarlyHints.js';
+import type { PageFile } from '../../../shared/getPageFiles.js';
 type HttpResponse = {
     statusCode: 200 | 404 | 500 | RedirectStatusCode | AbortStatusCode;
     headers: [string, string][];
@@ -27,6 +28,9 @@ declare function createHttpResponsePage(htmlRender: HtmlRender, renderHook: null
     abortStatusCode?: AbortStatusCode;
 }): Promise<HttpResponse>;
 declare function createHttpResponseFavicon404(): HttpResponse;
-declare function createHttpResponseError(): HttpResponse;
+declare function createHttpResponseError(pageContext: null | {
+    _pageFilesAll: PageFile[];
+    _pageConfigs: PageConfigRuntime[];
+}): HttpResponse;
 declare function createHttpResponsePageContextJson(pageContextSerialized: string): Promise<HttpResponse>;
 declare function createHttpResponseRedirect({ url, statusCode }: UrlRedirect, urlLogical: string): HttpResponse;

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

@@ -4,7 +4,7 @@ export { createHttpResponseError };
 export { createHttpResponseRedirect };
 export { createHttpResponseFavicon404 };
 import { assert, assertWarning } from '../utils.js';
-import { isErrorPage } from '../../../shared/error-page.js';
+import { getErrorPageId, isErrorPage } from '../../../shared/error-page.js';
 import { getHttpResponseBody, getHttpResponseBodyStreamHandlers } from './getHttpResponseBody.js';
 import { getEarlyHints } from './getEarlyHints.js';
 import { getCacheControl } from './createHttpResponse/getCacheControl.js';
@@ -38,8 +38,20 @@ function createHttpResponseFavicon404() {
     const httpResponse = createHttpResponse(404, 'text/html;charset=utf-8', [], "<p>No favicon.ico found.</p><script>console.log('This HTTP response was generated by Vike.')</script>");
     return httpResponse;
 }
-function createHttpResponseError() {
-    const httpResponse = createHttpResponse(500, 'text/html;charset=utf-8', [], "<p>An error occurred.</p><script>console.log('This HTTP response was generated by Vike. This response is used instead of rendering the error page (https://vike.dev/error-page), either because there isn't error page or because an error occurred while rendering the error page.')</script>");
+function createHttpResponseError(pageContext) {
+    const reason = (() => {
+        if (!pageContext) {
+            return 'no error page (https://vike.dev/error-page) could be rendered';
+        }
+        const errorPageId = getErrorPageId(pageContext._pageFilesAll, pageContext._pageConfigs);
+        if (errorPageId) {
+            return "the error page (https://vike.dev/error-page) couldn't be rendered (for example if an error occurred while rendering the error page)";
+        }
+        else {
+            return 'no error page (https://vike.dev/error-page) is defined, make sure to create one';
+        }
+    })();
+    const httpResponse = createHttpResponse(500, 'text/html;charset=utf-8', [], `<p>An error occurred.</p><script>console.log(${JSON.stringify(`This HTTP response was generated by Vike. Vike returned this response because ${reason}.`)})</script>`);
     return httpResponse;
 }
 async function createHttpResponsePageContextJson(pageContextSerialized) {

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

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 export { getHttpResponseBody };
 export { getHttpResponseBodyStreamHandlers };
 export type { HttpResponseBody };

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

@@ -1,11 +1,13 @@
 export { handleErrorWithoutErrorPage };
 import type { PageContextAfterRender } from './renderPageAlreadyRouted.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
+import type { PageFile } from '../../../shared/getPageFiles.js';
 declare function handleErrorWithoutErrorPage<PageContext extends {
     isClientSideNavigation: boolean;
     errorWhileRendering: null | Error;
     is404: null | boolean;
     _pageId: null;
+    _pageFilesAll: PageFile[];
     _pageConfigs: PageConfigRuntime[];
     urlOriginal: string;
 }>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;

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

@@ -13,7 +13,7 @@ async function handleErrorWithoutErrorPage(pageContext) {
         warnMissingErrorPage(isV1);
     }
     if (!pageContext.isClientSideNavigation) {
-        const httpResponse = createHttpResponseError();
+        const httpResponse = createHttpResponseError(pageContext);
         objectAssign(pageContext, { httpResponse });
         return pageContext;
     }

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

@@ -78,7 +78,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _urlRewrite: null;
         _httpRequestId: number | null;
         _usesClientRouter: boolean;
-        _pageContextAlreadyProvidedByOnPrerenderHook?: true | undefined;
+        _pageContextAlreadyProvidedByOnPrerenderHook?: true;
         is404: null | boolean;
     } & {
         isClientSideNavigation: boolean;
@@ -129,7 +129,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _urlRewrite: null;
         _httpRequestId: number | null;
         _usesClientRouter: boolean;
-        _pageContextAlreadyProvidedByOnPrerenderHook?: true | undefined;
+        _pageContextAlreadyProvidedByOnPrerenderHook?: true;
         is404: null | boolean;
     } & {
         isClientSideNavigation: boolean;
@@ -181,8 +181,8 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _urlRewrite: null;
         _httpRequestId: number | null;
         _usesClientRouter: boolean;
-        _pageContextAlreadyProvidedByOnPrerenderHook?: true | undefined;
-        is404: boolean | null;
+        _pageContextAlreadyProvidedByOnPrerenderHook?: true;
+        is404: null | boolean;
     } & {
         isClientSideNavigation: boolean;
         _urlHandler: null;
@@ -232,8 +232,8 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _urlRewrite: null;
         _httpRequestId: number | null;
         _usesClientRouter: boolean;
-        _pageContextAlreadyProvidedByOnPrerenderHook?: true | undefined;
-        is404: boolean | null;
+        _pageContextAlreadyProvidedByOnPrerenderHook?: true;
+        is404: null | boolean;
     } & {
         isClientSideNavigation: boolean;
         _urlHandler: null;

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

@@ -50,7 +50,7 @@ async function renderPageAndPrepare(pageContextInit, httpRequestId) {
     // Invalid config
     const handleInvalidConfig = (err) => {
         logRuntimeInfo?.(pc.bold(pc.red('Error while loading a Vike config file, see error above.')), httpRequestId, 'error');
-        const pageContextWithError = getPageContextHttpResponseError(err, pageContextInit);
+        const pageContextWithError = getPageContextHttpResponseError(err, pageContextInit, null);
         return pageContextWithError;
     };
     if (isConfigInvalid) {
@@ -70,7 +70,7 @@ async function renderPageAndPrepare(pageContextInit, httpRequestId) {
         // initGlobalContext_renderPage() and getRenderContext() don't call any user hooks => err isn't thrown from user code.
         assert(!isAbortError(err));
         logRuntimeError(err, httpRequestId);
-        const pageContextWithError = getPageContextHttpResponseError(err, pageContextInit);
+        const pageContextWithError = getPageContextHttpResponseError(err, pageContextInit, null);
         return pageContextWithError;
     }
     if (isConfigInvalid) {
@@ -176,7 +176,7 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderC
                 if (!handled.pageContextReturn) {
                     const pageContextAbort = errErrorPage._pageContextAbort;
                     assertWarning(false, `Failed to render error page because ${pc.cyan(pageContextAbort._abortCall)} was called: make sure ${pc.cyan(pageContextAbort._abortCaller)} doesn't occur while the error page is being rendered.`, { onlyOnce: false });
-                    const pageContextHttpWithError = getPageContextHttpResponseError(errNominalPage, pageContextInit);
+                    const pageContextHttpWithError = getPageContextHttpResponseError(errNominalPage, pageContextInit, pageContextErrorPageInit);
                     return pageContextHttpWithError;
                 }
                 // `throw redirect()` / `throw render(url)`
@@ -185,7 +185,7 @@ async function renderPageAlreadyPrepared(pageContextInit, httpRequestId, renderC
             if (isNewError(errErrorPage, errNominalPage)) {
                 logRuntimeError(errErrorPage, httpRequestId);
             }
-            const pageContextWithError = getPageContextHttpResponseError(errNominalPage, pageContextInit);
+            const pageContextWithError = getPageContextHttpResponseError(errNominalPage, pageContextInit, pageContextErrorPageInit);
             return pageContextWithError;
         }
         return pageContextErrorPage;
@@ -239,9 +239,9 @@ function logHttpResponse(urlOriginalPretty, httpRequestId, pageContextReturn) {
 function prettyUrl(url) {
     return pc.bold(decodeURI(url));
 }
-function getPageContextHttpResponseError(err, pageContextInit) {
+function getPageContextHttpResponseError(err, pageContextInit, pageContext) {
     const pageContextWithError = createPageContext(pageContextInit);
-    const httpResponse = createHttpResponseError();
+    const httpResponse = createHttpResponseError(pageContext);
     objectAssign(pageContextWithError, {
         httpResponse,
         errorWhileRendering: err

package/dist/esm/shared/getPageFiles/analyzeClientSide.d.ts

@@ -2,6 +2,6 @@ export { analyzeClientSide };
 import type { PageConfigRuntime } from '../page-configs/PageConfig.js';
 import type { PageFile } from './getPageFileObject.js';
 declare function analyzeClientSide(pageConfig: PageConfigRuntime | null, pageFilesAll: PageFile[], pageId: string): {
-    clientEntryLoaded: boolean;
+    isClientRuntimeLoaded: boolean;
     isClientRouting: boolean;
 };

package/dist/esm/shared/getPageFiles/analyzeClientSide.js

@@ -5,13 +5,13 @@ function analyzeClientSide(pageConfig, pageFilesAll, pageId) {
     // V1 design
     if (pageConfig) {
         const isClientRouting = getConfigValueRuntime(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
-        const clientEntryLoaded = getConfigValueRuntime(pageConfig, 'clientEntryLoaded', 'boolean')?.value ?? false;
-        return { clientEntryLoaded, isClientRouting };
+        const isClientRuntimeLoaded = getConfigValueRuntime(pageConfig, 'isClientRuntimeLoaded', 'boolean')?.value ?? false;
+        return { isClientRuntimeLoaded, isClientRouting };
     }
     else {
         // TODO/v1-release: remove
         // V0.4 design
         const { isHtmlOnly, isClientRouting } = analyzePageClientSide(pageFilesAll, pageId);
-        return { clientEntryLoaded: !isHtmlOnly, isClientRouting };
+        return { isClientRuntimeLoaded: !isHtmlOnly, isClientRouting };
     }
 }

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

@@ -41,7 +41,7 @@ type HookName = HookNamePage | HookNameGlobal | HookNameOldDesign;
 type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data';
 type HookNameGlobal = 'onBeforePrerender' | 'onBeforeRoute' | 'onPrerenderStart';
 type HookNameOldDesign = 'render' | 'prerender';
-type ConfigNameBuiltIn = Exclude<keyof Config, keyof ConfigVikeUserProvided | 'onBeforeRoute' | 'onPrerenderStart'> | 'prerender' | 'clientEntryLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'hooksTimeout' | 'clientHooks';
+type ConfigNameBuiltIn = Exclude<keyof Config, keyof ConfigVikeUserProvided | 'onBeforeRoute' | 'onPrerenderStart'> | 'prerender' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'hooksTimeout' | 'clientHooks';
 type Config = ConfigBuiltIn & Vike.Config & (VikePackages.ConfigVikeReact | VikePackages.ConfigVikeVue | VikePackages.ConfigVikeSolid | VikePackages.ConfigVikeSvelte | VikePackages.ConfigVikeAngular);
 /** Hook for fetching data.
  *

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.195";
+export declare const PROJECT_VERSION: "0.4.196-commit-df033dd";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.195';
+export const PROJECT_VERSION = '0.4.196-commit-df033dd';

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

@@ -1,8 +1,8 @@
 export declare const debugGlob: ((...msgs: unknown[]) => void) & {
     options: (optionsLocal: {
         serialization?: {
-            emptyArray?: string | undefined;
-        } | undefined;
+            emptyArray?: string;
+        };
     }) => (...msgs: unknown[]) => void;
     isActivated: boolean;
 };

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

@@ -1,4 +1,4 @@
-export declare function genPromise<T>(): {
+export declare function genPromise<T = void>(): {
     promise: Promise<T>;
     resolve: (val: T) => void;
 };

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.195";
+    projectVersion: "0.4.196-commit-df033dd";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.195",
+  "version": "0.4.196-commit-df033dd",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -123,7 +123,7 @@
   "dependencies": {
     "@brillout/import": "^0.2.3",
     "@brillout/json-serializer": "^0.5.13",
-    "@brillout/picocolors": "^1.0.14",
+    "@brillout/picocolors": "^1.0.15",
     "@brillout/require-shim": "^0.1.2",
     "@brillout/vite-plugin-server-entry": "^0.4.11",
     "acorn": "^8.0.0",
@@ -225,11 +225,12 @@
   ],
   "devDependencies": {
     "@biomejs/biome": "^1.5.3",
-    "@brillout/release-me": "^0.4.0",
+    "@brillout/release-me": "^0.4.2",
     "@types/estree": "^1.0.5",
     "@types/jest": "^29.5.11",
     "@types/node": "^20.10.5",
     "@types/resolve": "^1.20.6",
+    "@types/semver": "^7.5.8",
     "@types/source-map-support": "^0.5.10",
     "acorn": "^8.11.2",
     "cac": "^6.7.14",
@@ -241,7 +242,7 @@
     "semver": "^7.6.3",
     "sirv": "^2.0.4",
     "source-map-support": "^0.5.21",
-    "typescript": "^5.4.5",
+    "typescript": "^5.6.2",
     "vite": "^5.4.0"
   },
   "scripts": {
@@ -255,4 +256,4 @@
     "release:minor": "release-me minor",
     "release:commit": "release-me commit"
   }
-}
+}