vike 0.4.152 → 0.4.153-commit-159c659

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

@@ -26,7 +26,7 @@ export * from '../../utils/filesystemPathHandling.js';
 export * from '../../utils/getOutDirs.js';
 export * from '../../utils/capitalizeFirstLetter.js';
 export * from '../../utils/debugGlob.js';
-export * from '../../utils/isEquivalentError.js';
+export * from '../../utils/isSameErrorMessage.js';
 export * from '../../utils/styleFileRE.js';
 export * from '../../utils/isPropertyGetter.js';
 export * from '../../utils/debug.js';
@@ -48,7 +48,6 @@ export * from '../../utils/path-shim.js';
 export * from '../../utils/nodeEnv.js';
 export * from '../../utils/isHtml.js';
 export * from '../../utils/warnIfErrorIsNotObject.js';
-export * from '../../utils/dynamicImport.js';
 export * from '../../utils/stripAnsi.js';
 export * from '../../utils/getTerminWidth.js';
 export * from '../../utils/truncateString.js';

package/dist/esm/shared/hooks/getHook.d.ts

@@ -2,6 +2,7 @@ export { getHook };
 export { getHookFromPageConfig };
 export { getHookFromPageConfigGlobal };
 export { assertHook };
+export { setIsPrerenderering };
 export type { Hook };
 export type { HookName };
 export type { HookLoc };
@@ -32,3 +33,4 @@ declare function assertHook<TPageContext extends PageContextExports, THookName e
     exports: Record<THookName, Function | undefined>;
 };
 declare function getHookTimeoutDefault(hookName: HookName): HookTimeout;
+declare function setIsPrerenderering(): void;

package/dist/esm/shared/hooks/getHook.js

@@ -2,12 +2,17 @@ export { getHook };
 export { getHookFromPageConfig };
 export { getHookFromPageConfigGlobal };
 export { assertHook };
+export { setIsPrerenderering };
 // TODO/v1-release: remove
 // We export for old V0.4 design which doesn't support config.hooksTimeout
 export { getHookTimeoutDefault };
+import { getGlobalObject } from '../../utils/getGlobalObject.js';
 import { getConfigValue, getHookFilePathToShowToUser } from '../page-configs/helpers.js';
 import { assert, assertUsage, checkType, isCallable, isObject } from '../utils.js';
 import pc from '@brillout/picocolors';
+const globalObject = getGlobalObject('getHook.ts', {
+    isPrerendering: false
+});
 function getHook(pageContext, hookName) {
     if (!(hookName in pageContext.exports)) {
         return null;
@@ -110,19 +115,20 @@ function getHookTimeoutDefault(hookName) {
             warning: 1 * 1000
         };
     }
-    if (hookName === 'onPrerenderStart' ||
-        hookName === 'onBeforePrerenderStart' ||
-        // TODO/v1-release: remove
-        // Old V0.4 design hooks (https://vike.dev/migration/v1-design#renamed-hooks)
-        hookName === 'onBeforePrerender' ||
-        hookName === 'prerender') {
+    if (globalObject.isPrerendering) {
         return {
-            error: 10 * 60 * 1000,
+            error: 2 * 60 * 1000,
             warning: 30 * 1000
         };
     }
+    else {
+        assert(!hookName.toLowerCase().includes('prerender'));
+    }
     return {
         error: 30 * 1000,
         warning: 4 * 1000
     };
 }
+function setIsPrerenderering() {
+    globalObject.isPrerendering = true;
+}

package/dist/esm/shared/misc/isRenderFailure.d.ts

@@ -0,0 +1 @@
+export declare const isRenderFailure = "_isRenderFailure";

package/dist/esm/shared/misc/isRenderFailure.js

@@ -0,0 +1 @@
+export const isRenderFailure = '_isRenderFailure';

package/dist/esm/shared/misc/pageContextInitIsPassedToClient.d.ts

@@ -0,0 +1 @@
+export declare const pageContextInitIsPassedToClient = "_pageContextInitIsPassedToClient";

package/dist/esm/shared/misc/pageContextInitIsPassedToClient.js

@@ -0,0 +1 @@
+export const pageContextInitIsPassedToClient = '_pageContextInitIsPassedToClient';

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

@@ -29,13 +29,13 @@ export type { OnRenderHtmlAsync };
 export type { OnRenderHtmlSync };
 export type { RouteAsync };
 export type { RouteSync };
-import type { PrefetchStaticAssets } from '../../client/client-routing-runtime/prefetch/getPrefetchSettings.js';
 import type { ConfigDefinition } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js';
 import type { DocumentHtml } from '../../node/runtime/html/renderHtml.js';
 import type { ConfigVikeUserProvided } from '../ConfigVike.js';
 import type { Vike, VikePackages } from '../VikeNamespace.js';
 import type { HooksTimeoutProvidedByUser } from '../hooks/getHook.js';
 import type { PageContextClient, PageContextServer } from '../types.js';
+import type { PrefetchStaticAssets } from '../types/PrefetchStaticAssets.js';
 type HookName = HookNamePage | HookNameGlobal | HookNameOldDesign;
 type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data';
 type HookNameGlobal = 'onBeforePrerender' | 'onBeforeRoute' | 'onPrerenderStart';

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

@@ -57,7 +57,7 @@ declare function render(abortStatusCode: 401 | 403 | 404 | 410 | 429 | 500 | 503
  * @param abortReason Sets `pageContext.abortReason` which is used by the error page to show a message to the user, see https://vike.dev/error-page
  */
 declare function render(url: `/${string}`, abortReason?: AbortReason): Error;
-type AbortCall = `throw redirect(${string})` | `throw render(${string})` | `throw RenderErrorPage()`;
+type AbortCall = `redirect(${string})` | `render(${string})` | `RenderErrorPage()`;
 type PageContextAbort = {
     _abortCall: AbortCall;
 } & (({

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

@@ -7,7 +7,7 @@ export { logAbortErrorHandled };
 export { getPageContextFromAllRewrites };
 export { AbortRender };
 export { assertNoInfiniteAbortLoop };
-import { assert, assertInfo, assertUsage, assertWarning, checkType, hasProp, joinEnglish, objectAssign, projectInfo, truncateString } from './utils.js';
+import { assert, assertInfo, assertUsage, assertWarning, checkType, hasProp, isUserHookError, joinEnglish, objectAssign, projectInfo, truncateString } from './utils.js';
 import pc from '@brillout/picocolors';
 /**
  * Abort the rendering of the current page, and redirect the user to another URL instead.
@@ -30,7 +30,7 @@ function redirect(url, statusCode) {
     const pageContextAbort = {};
     objectAssign(pageContextAbort, {
         _abortCaller: abortCaller,
-        _abortCall: `throw redirect(${args.join(', ')})`,
+        _abortCall: `redirect(${args.join(', ')})`,
         _urlRedirect: {
             url,
             statusCode
@@ -43,7 +43,7 @@ function render(value, abortReason) {
     if (abortReason !== undefined)
         args.push(truncateString(JSON.stringify(abortReason), 30));
     const abortCaller = 'throw render()';
-    const abortCall = `throw render(${args.join(', ')})`;
+    const abortCall = `render(${args.join(', ')})`;
     return render_(value, abortReason, abortCall, abortCaller);
 }
 function render_(value, abortReason, abortCall, abortCaller, pageContextAddendum) {
@@ -92,7 +92,7 @@ function RenderErrorPage({ pageContext = {} } = {}) {
         abortReason = 'Something went wrong';
     }
     objectAssign(pageContext, { _isLegacyRenderErrorPage: true });
-    return render_(abortStatusCode, abortReason, 'throw RenderErrorPage()', 'throw RenderErrorPage()', pageContext);
+    return render_(abortStatusCode, abortReason, 'RenderErrorPage()', 'throw RenderErrorPage()', pageContext);
 }
 const stamp = '_isAbortError';
 function isAbortError(thing) {
@@ -115,7 +115,18 @@ function logAbortErrorHandled(err, isProduction, pageContext) {
     const urlCurrent = pageContext._urlRewrite ?? pageContext.urlOriginal;
     assert(urlCurrent);
     const abortCall = err._pageContextAbort._abortCall;
-    assertInfo(false, `${pc.cyan(abortCall)} intercepted while rendering ${pc.cyan(urlCurrent)}`, { onlyOnce: false });
+    assert(abortCall);
+    const hookLoc = isUserHookError(err);
+    let thrownBy = '';
+    if (hookLoc) {
+        thrownBy = ` by ${pc.cyan(`${hookLoc.hookName}()`)} hook defined at ${hookLoc.hookFilePath}`;
+    }
+    else {
+        // hookLoc is missing when serializing abort errors from server to client
+    }
+    assertInfo(false, `${pc.cyan(abortCall)} thrown${thrownBy} while rendering ${pc.cyan(urlCurrent)}`, {
+        onlyOnce: false
+    });
 }
 function assertStatusCode(statusCode, expected, caller) {
     const expectedEnglish = joinEnglish(expected.map((s) => s.toString()), 'or');

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

@@ -16,7 +16,6 @@ pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds) {
 }
 function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
     const pageRoutes = [];
-    let pageIds = [...allPageIds];
     // V1 Design
     if (pageConfigs.length > 0) {
         assert(filesystemRoots === null);
@@ -25,7 +24,6 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
             .filter((p) => !p.isErrorPage)
             .forEach((pageConfig) => {
             const pageId = pageConfig.pageId;
-            pageIds = removePageId(pageIds, pageId);
             let pageRoute = null;
             {
                 const configName = 'route';
@@ -79,7 +77,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
     if (pageConfigs.length === 0) {
         assert(filesystemRoots);
         const comesFromV1PageConfig = false;
-        pageIds
+        allPageIds
             .filter((pageId) => !isErrorPageId(pageId, false))
             .forEach((pageId) => {
             const pageRouteFile = pageFilesAll.find((p) => p.pageId === pageId && p.fileType === '.page.route');
@@ -179,9 +177,3 @@ function dirname(filePath) {
     assert(!dirPath.endsWith('/') || dirPath === '/');
     return dirPath;
 }
-function removePageId(pageIds, pageId) {
-    const { length } = pageIds;
-    pageIds = pageIds.filter((id) => id !== pageId);
-    assert(pageIds.length === length - 1);
-    return pageIds;
-}

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

@@ -0,0 +1,2 @@
+export { isSameErrorMessage };
+declare function isSameErrorMessage(err1: unknown, err2: unknown): boolean;

package/dist/esm/utils/isSameErrorMessage.js

@@ -0,0 +1,7 @@
+import { isObject } from './isObject.js';
+export { isSameErrorMessage };
+function isSameErrorMessage(err1, err2) {
+    if (!isObject(err1) || !isObject(err2))
+        return false;
+    return err1.message === err2.message;
+}

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

@@ -1,13 +1,13 @@
 export { projectInfo };
 export type { ProjectTag };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.152";
+declare const PROJECT_VERSION: "0.4.153-commit-159c659";
 type PackageName = typeof projectInfo.npmPackageName;
 type ProjectVersion = typeof projectInfo.projectVersion;
 type ProjectTag = `[${PackageName}]` | `[${PackageName}@${ProjectVersion}]`;
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.152";
+    projectVersion: "0.4.153-commit-159c659";
     npmPackageName: "vike";
     githubRepository: "https://github.com/vikejs/vike";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
 import { onProjectInfo } from './assertSingleInstance.js';
-const PROJECT_VERSION = '0.4.152';
+const PROJECT_VERSION = '0.4.153-commit-159c659';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "vike",
-  "version": "0.4.152",
+  "version": "0.4.153-commit-159c659",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
     "build:esm": "tsc",
     "build:cjs": "pnpm run build:cjs:ts && pnpm run build:cjs:fixup",
-    "build:cjs:ts": "tsc --outDir ./dist/cjs/ --module CommonJS --target ES2020 --moduleResolution Node10 --declaration false",
+    "build:cjs:ts": "tsc --project ./tsconfig.cjs.json",
     "build:cjs:fixup": "node ./dist-cjs-fixup.mjs",
     "release": "release-me patch",
     "release:commit": "release-me commit"

package/dist/cjs/utils/dynamicImport.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.dynamicImport = void 0;
-/** Only works for npm packages, for files use @brillout/import instead */
-function dynamicImport(mod) {
-    return new Function('mod', 'return import(mod)')(mod);
-}
-exports.dynamicImport = dynamicImport;

package/dist/cjs/utils/isEquivalentError.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEquivalentError = void 0;
-const isObject_js_1 = require("./isObject.js");
-const deepEqual_js_1 = require("./deepEqual.js");
-function isEquivalentError(err1, err2) {
-    return ((0, isObject_js_1.isObject)(err1) &&
-        (0, isObject_js_1.isObject)(err2) &&
-        err1.constructor === err2.constructor &&
-        (0, deepEqual_js_1.deepEqual)({ ...err1, stack: null }, { ...err2, stack: null }) &&
-        // 'message' and 'stack' are usually non-emurable
-        err2.message === err2.message
-    /* Doesn't work because: the stack trace isn't exactly the same between the original page rendering and the fallback error page rendering
-    err2.stack === err2.stack
-    */
-    );
-}
-exports.isEquivalentError = isEquivalentError;

package/dist/esm/node/plugin/plugins/assertFileEnv.d.ts

@@ -1,3 +0,0 @@
-export { assertFileEnv };
-import type { Plugin } from 'vite';
-declare function assertFileEnv(): Plugin;

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

@@ -1,2 +0,0 @@
-/** Only works for npm packages, for files use @brillout/import instead */
-export declare function dynamicImport<Mod = never>(mod: string): Promise<Mod>;

package/dist/esm/utils/dynamicImport.js

@@ -1,4 +0,0 @@
-/** Only works for npm packages, for files use @brillout/import instead */
-export function dynamicImport(mod) {
-    return new Function('mod', 'return import(mod)')(mod);
-}

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

@@ -1,2 +0,0 @@
-export { isEquivalentError };
-declare function isEquivalentError(err1: unknown, err2: unknown): boolean;

package/dist/esm/utils/isEquivalentError.js

@@ -1,15 +0,0 @@
-import { isObject } from './isObject.js';
-import { deepEqual } from './deepEqual.js';
-export { isEquivalentError };
-function isEquivalentError(err1, err2) {
-    return (isObject(err1) &&
-        isObject(err2) &&
-        err1.constructor === err2.constructor &&
-        deepEqual({ ...err1, stack: null }, { ...err2, stack: null }) &&
-        // 'message' and 'stack' are usually non-emurable
-        err2.message === err2.message
-    /* Doesn't work because: the stack trace isn't exactly the same between the original page rendering and the fallback error page rendering
-    err2.stack === err2.stack
-    */
-    );
-}