npm - @qwik.dev/router - Versions diffs - 2.0.0-alpha.7 → 2.0.0-alpha.9 - Mend

@qwik.dev/router 2.0.0-alpha.7 → 2.0.0-alpha.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/lib/index.d.ts +11 -2
package/lib/index.qwik.cjs +18 -4
package/lib/index.qwik.mjs +21 -7
package/lib/middleware/aws-lambda/index.d.ts +3 -5
package/lib/middleware/cloudflare-pages/index.d.ts +2 -2
package/lib/middleware/node/index.d.ts +0 -2
package/lib/middleware/request-handler/index.cjs +21 -32
package/lib/middleware/request-handler/index.d.ts +4 -9
package/lib/middleware/request-handler/index.mjs +21 -32
package/lib/static/index.d.ts +0 -2
package/lib/vite/index.cjs +21 -32
package/lib/vite/index.mjs +21 -32
package/package.json +4 -4

package/lib/index.d.ts CHANGED Viewed

@@ -277,6 +277,14 @@ export declare interface DocumentStyle {
 declare type EndpointModuleLoader = () => Promise<RouteModule>;
+/** @public */
+export declare const ErrorBoundary: Component<ErrorBoundaryProps>;
+/** @public */
+declare interface ErrorBoundaryProps {
+    fallback$?: QRL<(error: any) => any>;
+}
 declare type Failed = {
     failed: true;
 };
@@ -419,7 +427,8 @@ declare type MenuModuleLoader = () => Promise<MenuModule>;
 declare type ModuleLoader = ContentModuleLoader | EndpointModuleLoader;
 /** @public */
-export declare type NavigationType = 'initial' | 'form' | 'link' | 'popstate';
+declare type NavigationType_2 = 'initial' | 'form' | 'link' | 'popstate';
+export { NavigationType_2 as NavigationType }
 /**
  * Creates a new object from `obj` by omitting a set of `keys`.
@@ -587,7 +596,7 @@ declare interface RouteModule<BODY = unknown> {
 /** @public */
 export declare type RouteNavigate = QRL<(path?: string | number | URL, options?: {
-    type?: Exclude<NavigationType, 'initial'>;
+    type?: Exclude<NavigationType_2, 'initial'>;
     forceReload?: boolean;
     replaceState?: boolean;
     scroll?: boolean;

package/lib/index.qwik.cjs CHANGED Viewed

@@ -23,6 +23,18 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 const qwikRouterConfig__namespace = /* @__PURE__ */ _interopNamespaceDefault(qwikRouterConfig);
+const ErrorBoundary = core.component$((props) => {
+  const store2 = core.useErrorBoundary();
+  core.useOnWindow("qerror", core.$((e) => {
+    store2.error = e.detail.error;
+  }));
+  if (store2.error && props.fallback$) {
+    return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {
+      children: props.fallback$(store2.error)
+    });
+  }
+  return /* @__PURE__ */ jsxRuntime.jsx(core.Slot, {});
+});
 const MODULE_CACHE = /* @__PURE__ */ new WeakMap();
 const CLIENT_DATA_CACHE = /* @__PURE__ */ new Map();
 const PREFETCHED_NAVIGATE_PATHS = /* @__PURE__ */ new Set();
@@ -1420,7 +1432,7 @@ const routeLoaderQrl = (loaderQrl, ...rest) => {
     If your are managing reusable logic or a library it is essential that this function is re-exported from within 'layout.tsx' or 'index.tsx file of the existing route otherwise it will not run or throw exception.
     For more information check: https://qwik.dev/docs/re-exporting-loaders/`);
       }
-      return internal._wrapProp(state, id);
+      return internal._wrapStore(state, id);
     });
   }
   loader.__brand = "server_loader";
@@ -1598,6 +1610,7 @@ const serverQrl = (qrl, options) => {
           headers: {
             ...headers,
             "Content-Type": "application/qwik-json",
+            Accept: "application/json, application/qwik-json, text/qwik-json-stream, text/plain",
             // Required so we don't call accidentally
             "X-QRL": qrlHash
           },
@@ -1629,19 +1642,19 @@ const serverQrl = (qrl, options) => {
         } else if (contentType === "application/qwik-json") {
           const str = await res.text();
           const [obj] = internal._deserialize(str, ctxElm ?? document.documentElement);
-          if (res.status >= 500) {
+          if (res.status >= 400) {
             throw obj;
           }
           return obj;
         } else if (contentType === "application/json") {
           const obj = await res.json();
-          if (res.status >= 500) {
+          if (res.status >= 400) {
             throw obj;
           }
           return obj;
         } else if (contentType === "text/plain" || contentType === "text/html") {
           const str = await res.text();
-          if (res.status >= 500) {
+          if (res.status >= 400) {
             throw str;
           }
           return str;
@@ -1837,6 +1850,7 @@ Object.defineProperty(exports, "z", {
   enumerable: true,
   get: () => zod.z
 });
+exports.ErrorBoundary = ErrorBoundary;
 exports.Form = Form;
 exports.Link = Link;
 exports.QWIK_CITY_SCROLLER = QWIK_CITY_SCROLLER;

package/lib/index.qwik.mjs CHANGED Viewed

@@ -1,10 +1,22 @@
-import { jsx, jsxs, Fragment } from "@qwik.dev/core/jsx-runtime";
-import { isBrowser, createContextId, implicit$FirstArg, useContext, useVisibleTask$, noSerialize, useServerData, component$, untrack, $, sync$, isDev, Slot, withLocale, event$, useStyles$, useStore, useSignal, useContextProvider, useTask$, isServer, getLocale, jsx as jsx$1, SkipRender } from "@qwik.dev/core";
-import { _deserialize, _weakSerialize, _getContextElement, _waitUntilRendered, _getQContainerElement, _wrapProp, _getContextEvent, _serialize } from "@qwik.dev/core/internal";
+import { jsx, Fragment, jsxs } from "@qwik.dev/core/jsx-runtime";
+import { component$, useErrorBoundary, useOnWindow, $, Slot, isBrowser, createContextId, implicit$FirstArg, useContext, useVisibleTask$, noSerialize, useServerData, untrack, sync$, isDev, withLocale, event$, useStyles$, useStore, useSignal, useContextProvider, useTask$, isServer, getLocale, jsx as jsx$1, SkipRender } from "@qwik.dev/core";
+import { _deserialize, _weakSerialize, _getContextElement, _waitUntilRendered, _getQContainerElement, _wrapStore, _getContextEvent, _serialize } from "@qwik.dev/core/internal";
 import * as qwikRouterConfig from "@qwik-router-config";
 import { z } from "zod";
 import { z as z2 } from "zod";
 import swRegister from "@qwik-router-sw-register";
+const ErrorBoundary = component$((props) => {
+  const store2 = useErrorBoundary();
+  useOnWindow("qerror", $((e) => {
+    store2.error = e.detail.error;
+  }));
+  if (store2.error && props.fallback$) {
+    return /* @__PURE__ */ jsx(Fragment, {
+      children: props.fallback$(store2.error)
+    });
+  }
+  return /* @__PURE__ */ jsx(Slot, {});
+});
 const MODULE_CACHE = /* @__PURE__ */ new WeakMap();
 const CLIENT_DATA_CACHE = /* @__PURE__ */ new Map();
 const PREFETCHED_NAVIGATE_PATHS = /* @__PURE__ */ new Set();
@@ -1402,7 +1414,7 @@ const routeLoaderQrl = (loaderQrl, ...rest) => {
     If your are managing reusable logic or a library it is essential that this function is re-exported from within 'layout.tsx' or 'index.tsx file of the existing route otherwise it will not run or throw exception.
     For more information check: https://qwik.dev/docs/re-exporting-loaders/`);
       }
-      return _wrapProp(state, id);
+      return _wrapStore(state, id);
     });
   }
   loader.__brand = "server_loader";
@@ -1580,6 +1592,7 @@ const serverQrl = (qrl, options) => {
           headers: {
             ...headers,
             "Content-Type": "application/qwik-json",
+            Accept: "application/json, application/qwik-json, text/qwik-json-stream, text/plain",
             // Required so we don't call accidentally
             "X-QRL": qrlHash
           },
@@ -1611,19 +1624,19 @@ const serverQrl = (qrl, options) => {
         } else if (contentType === "application/qwik-json") {
           const str = await res.text();
           const [obj] = _deserialize(str, ctxElm ?? document.documentElement);
-          if (res.status >= 500) {
+          if (res.status >= 400) {
             throw obj;
           }
           return obj;
         } else if (contentType === "application/json") {
           const obj = await res.json();
-          if (res.status >= 500) {
+          if (res.status >= 400) {
             throw obj;
           }
           return obj;
         } else if (contentType === "text/plain" || contentType === "text/html") {
           const str = await res.text();
-          if (res.status >= 500) {
+          if (res.status >= 400) {
             throw str;
           }
           return str;
@@ -1816,6 +1829,7 @@ function omitProps(obj, keys) {
   return omittedObj;
 }
 export {
+  ErrorBoundary,
   Form,
   Link,
   QWIK_CITY_SCROLLER,

package/lib/middleware/aws-lambda/index.d.ts CHANGED Viewed

@@ -1,5 +1,3 @@
-/// <reference types="node" />
 import { Http2ServerRequest } from 'http2';
 import { IncomingMessage } from 'http';
 import { NodeRequestNextFunction } from '@qwik.dev/router/middleware/node';
@@ -27,9 +25,9 @@ export declare const createQwikCity: typeof createQwikRouter;
 /** @public */
 export declare function createQwikRouter(opts: AwsOpt): {
     fixPath: (pathT: string) => string;
-    router: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse<IncomingMessage>, next: NodeRequestNextFunction) => Promise<void>;
-    staticFile: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse<IncomingMessage>, next: (e?: any) => void) => Promise<void>;
-    notFound: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse<IncomingMessage>, next: (e: any) => void) => Promise<void>;
+    router: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: NodeRequestNextFunction) => Promise<void>;
+    staticFile: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e?: any) => void) => Promise<void>;
+    notFound: (req: IncomingMessage | Http2ServerRequest, res: ServerResponse, next: (e: any) => void) => Promise<void>;
     handle: (req: any, res: any) => void;
 };

package/lib/middleware/cloudflare-pages/index.d.ts CHANGED Viewed

@@ -7,11 +7,11 @@ import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-ha
 export declare const createQwikCity: typeof createQwikRouter;
 /** @public */
-export declare function createQwikRouter(opts: QwikRouterCloudflarePagesOptions): (request: PlatformCloudflarePages['request'], env: PlatformCloudflarePages['env'] & {
+export declare function createQwikRouter(opts: QwikRouterCloudflarePagesOptions): (request: PlatformCloudflarePages["request"], env: PlatformCloudflarePages["env"] & {
     ASSETS: {
         fetch: (req: Request) => Response;
     };
-}, ctx: PlatformCloudflarePages['ctx']) => Promise<Response>;
+}, ctx: PlatformCloudflarePages["ctx"]) => Promise<Response>;
 /** @public */
 export declare interface PlatformCloudflarePages {

package/lib/middleware/node/index.d.ts CHANGED Viewed

@@ -1,5 +1,3 @@
-/// <reference types="node" />
 import type { ClientConn } from '@qwik.dev/router/middleware/request-handler';
 import type { Http2ServerRequest } from 'node:http2';
 import type { IncomingMessage } from 'node:http';

package/lib/middleware/request-handler/index.cjs CHANGED Viewed

@@ -43,17 +43,11 @@ module.exports = __toCommonJS(request_handler_exports);
 // packages/qwik-router/src/middleware/request-handler/error-handler.ts
 var ServerError = class extends Error {
   constructor(status, data) {
-    super();
+    super(typeof data === "string" ? data : void 0);
     this.status = status;
     this.data = data;
   }
 };
-var ErrorResponse = class extends Error {
-  constructor(status, message) {
-    super(message);
-    this.status = status;
-  }
-};
 function getErrorHtml(status, e) {
   let message = "Server Error";
   if (e != null) {
@@ -584,12 +578,18 @@ async function runNext(requestEv, resolve) {
     if (e instanceof RedirectMessage) {
       const stream = requestEv.getWritableStream();
       await stream.close();
-    } else if (e instanceof ErrorResponse) {
-      console.error(e);
+    } else if (e instanceof ServerError) {
       if (!requestEv.headersSent) {
-        const html = getErrorHtml(e.status, e);
         const status = e.status;
-        requestEv.html(status, html);
+        const accept = requestEv.request.headers.get("Accept");
+        if (accept && !accept.includes("text/html")) {
+          const qwikSerializer = requestEv[RequestEvQwikSerializer];
+          requestEv.headers.set("Content-Type", "application/qwik-json");
+          requestEv.send(status, await qwikSerializer._serialize([e.data]));
+        } else {
+          const html = getErrorHtml(e.status, e.data);
+          requestEv.html(status, html);
+        }
       }
     } else if (!(e instanceof AbortMessage)) {
       if (getRequestMode(requestEv) !== "dev") {
@@ -782,7 +782,7 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manif
     },
     error: (statusCode, message) => {
       status = statusCode;
-      return new ErrorResponse(statusCode, message);
+      return new ServerError(statusCode, message);
     },
     redirect: (statusCode, url2) => {
       check();
@@ -883,7 +883,7 @@ var parseRequest = async ({ request, method, query }, sharedMap, qwikSerializer)
       if (data) {
         try {
           return qwikSerializer._deserialize(decodeURIComponent(data));
-        } catch (err) {
+        } catch {
         }
       }
     }
@@ -1182,25 +1182,14 @@ async function pureServerFunction(ev) {
       const [qrl, ...args] = data;
       if (isQrl(qrl) && qrl.getHash() === fn) {
         let result;
-        try {
-          if (isDev) {
-            result = await measure(
-              ev,
-              `server_${qrl.getSymbol()}`,
-              () => qrl.apply(ev, args)
-            );
-          } else {
-            result = await qrl.apply(ev, args);
-          }
-        } catch (err) {
-          if (err instanceof ServerError) {
-            ev.headers.set("Content-Type", "application/qwik-json");
-            ev.send(err.status, await qwikSerializer._serialize([err.data]));
-            return;
-          }
-          ev.headers.set("Content-Type", "application/qwik-json");
-          ev.send(500, await qwikSerializer._serialize([err]));
-          return;
+        if (isDev) {
+          result = await measure(
+            ev,
+            `server_${qrl.getSymbol()}`,
+            () => qrl.apply(ev, args)
+          );
+        } else {
+          result = await qrl.apply(ev, args);
         }
         if (isAsyncIterator(result)) {
           ev.headers.set("Content-Type", "text/qwik-json-stream");

package/lib/middleware/request-handler/index.d.ts CHANGED Viewed

@@ -100,7 +100,7 @@ export declare interface ClientConn {
  * HTTP Client Error Status Codes Status codes in the 4xx range indicate that the client's request
  * was malformed or invalid and could not be understood or processed by the server.
  */
-declare type ClientErrorCode = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 421 | 422 | 423 | 424 | 425 | 426 | 428 | 429 | 431 | 451;
+declare type ClientErrorCode = 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 421 | 422 | 423 | 424 | 425 | 426 | 428 | 429 | 431 | 451 | 499;
 /** @public */
 declare interface ContentHeading {
@@ -286,11 +286,6 @@ export declare interface EnvGetter {
 declare type ErrorCodes = ClientErrorCode | ServerErrorCode;
-declare class ErrorResponse extends Error {
-    status: number;
-    constructor(status: number, message?: string);
-}
 /** @public */
 export declare function getErrorHtml(status: number, e: any): string;
@@ -486,7 +481,7 @@ export declare interface RequestEventCommon<PLATFORM = QwikRouterPlatform> exten
      * to end a response with `404`, and use the 404 handler in the routes directory. See
      * https://developer.mozilla.org/en-US/docs/Web/HTTP/Status for which status code should be used.
      */
-    readonly error: (statusCode: ErrorCodes, message: string) => ErrorResponse;
+    readonly error: <T = any>(statusCode: ErrorCodes, message: T) => ServerError<T>;
     /**
      * Convenience method to send an text body response. The response will be automatically set the
      * `Content-Type` header to`text/plain; charset=utf-8`. An `text()` response can only be called
@@ -594,7 +589,7 @@ declare interface SendMethod {
 }
 /** @public */
-export declare class ServerError<T = Record<any, any>> extends Error {
+export declare class ServerError<T = any> extends Error {
     status: number;
     data: T;
     constructor(status: number, data: T);
@@ -673,7 +668,7 @@ declare type SuccessCode = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207 | 208 |
 export declare class _TextEncoderStream_polyfill {
     #private;
     get encoding(): string;
-    get readable(): ReadableStream<Uint8Array>;
+    get readable(): ReadableStream<Uint8Array<ArrayBufferLike>>;
     get writable(): WritableStream<string>;
     get [Symbol.toStringTag](): string;
 }

package/lib/middleware/request-handler/index.mjs CHANGED Viewed

@@ -1,17 +1,11 @@
 // packages/qwik-router/src/middleware/request-handler/error-handler.ts
 var ServerError = class extends Error {
   constructor(status, data) {
-    super();
+    super(typeof data === "string" ? data : void 0);
     this.status = status;
     this.data = data;
   }
 };
-var ErrorResponse = class extends Error {
-  constructor(status, message) {
-    super(message);
-    this.status = status;
-  }
-};
 function getErrorHtml(status, e) {
   let message = "Server Error";
   if (e != null) {
@@ -542,12 +536,18 @@ async function runNext(requestEv, resolve) {
     if (e instanceof RedirectMessage) {
       const stream = requestEv.getWritableStream();
       await stream.close();
-    } else if (e instanceof ErrorResponse) {
-      console.error(e);
+    } else if (e instanceof ServerError) {
       if (!requestEv.headersSent) {
-        const html = getErrorHtml(e.status, e);
         const status = e.status;
-        requestEv.html(status, html);
+        const accept = requestEv.request.headers.get("Accept");
+        if (accept && !accept.includes("text/html")) {
+          const qwikSerializer = requestEv[RequestEvQwikSerializer];
+          requestEv.headers.set("Content-Type", "application/qwik-json");
+          requestEv.send(status, await qwikSerializer._serialize([e.data]));
+        } else {
+          const html = getErrorHtml(e.status, e.data);
+          requestEv.html(status, html);
+        }
       }
     } else if (!(e instanceof AbortMessage)) {
       if (getRequestMode(requestEv) !== "dev") {
@@ -740,7 +740,7 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manif
     },
     error: (statusCode, message) => {
       status = statusCode;
-      return new ErrorResponse(statusCode, message);
+      return new ServerError(statusCode, message);
     },
     redirect: (statusCode, url2) => {
       check();
@@ -841,7 +841,7 @@ var parseRequest = async ({ request, method, query }, sharedMap, qwikSerializer)
       if (data) {
         try {
           return qwikSerializer._deserialize(decodeURIComponent(data));
-        } catch (err) {
+        } catch {
         }
       }
     }
@@ -1140,25 +1140,14 @@ async function pureServerFunction(ev) {
       const [qrl, ...args] = data;
       if (isQrl(qrl) && qrl.getHash() === fn) {
         let result;
-        try {
-          if (isDev) {
-            result = await measure(
-              ev,
-              `server_${qrl.getSymbol()}`,
-              () => qrl.apply(ev, args)
-            );
-          } else {
-            result = await qrl.apply(ev, args);
-          }
-        } catch (err) {
-          if (err instanceof ServerError) {
-            ev.headers.set("Content-Type", "application/qwik-json");
-            ev.send(err.status, await qwikSerializer._serialize([err.data]));
-            return;
-          }
-          ev.headers.set("Content-Type", "application/qwik-json");
-          ev.send(500, await qwikSerializer._serialize([err]));
-          return;
+        if (isDev) {
+          result = await measure(
+            ev,
+            `server_${qrl.getSymbol()}`,
+            () => qrl.apply(ev, args)
+          );
+        } else {
+          result = await qrl.apply(ev, args);
         }
         if (isAsyncIterator(result)) {
           ev.headers.set("Content-Type", "text/qwik-json-stream");

package/lib/static/index.d.ts CHANGED Viewed

@@ -1,5 +1,3 @@
-/// <reference types="node" />
 import type { RenderOptions } from '@qwik.dev/core/server';
 /**

package/lib/vite/index.cjs CHANGED Viewed

@@ -14306,17 +14306,11 @@ var import_vite2 = require("vite");
 // packages/qwik-router/src/middleware/request-handler/error-handler.ts
 var ServerError = class extends Error {
   constructor(status, data) {
-    super();
+    super(typeof data === "string" ? data : void 0);
     this.status = status;
     this.data = data;
   }
 };
-var ErrorResponse = class extends Error {
-  constructor(status, message) {
-    super(message);
-    this.status = status;
-  }
-};
 function getErrorHtml(status, e) {
   let message = "Server Error";
   if (e != null) {
@@ -14764,12 +14758,18 @@ async function runNext(requestEv, resolve4) {
     if (e instanceof RedirectMessage) {
       const stream = requestEv.getWritableStream();
       await stream.close();
-    } else if (e instanceof ErrorResponse) {
-      console.error(e);
+    } else if (e instanceof ServerError) {
       if (!requestEv.headersSent) {
-        const html5 = getErrorHtml(e.status, e);
         const status = e.status;
-        requestEv.html(status, html5);
+        const accept = requestEv.request.headers.get("Accept");
+        if (accept && !accept.includes("text/html")) {
+          const qwikSerializer = requestEv[RequestEvQwikSerializer];
+          requestEv.headers.set("Content-Type", "application/qwik-json");
+          requestEv.send(status, await qwikSerializer._serialize([e.data]));
+        } else {
+          const html5 = getErrorHtml(e.status, e.data);
+          requestEv.html(status, html5);
+        }
       }
     } else if (!(e instanceof AbortMessage)) {
       if (getRequestMode(requestEv) !== "dev") {
@@ -14962,7 +14962,7 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manif
     },
     error: (statusCode, message) => {
       status = statusCode;
-      return new ErrorResponse(statusCode, message);
+      return new ServerError(statusCode, message);
     },
     redirect: (statusCode, url2) => {
       check();
@@ -15063,7 +15063,7 @@ var parseRequest = async ({ request, method, query }, sharedMap, qwikSerializer)
       if (data) {
         try {
           return qwikSerializer._deserialize(decodeURIComponent(data));
-        } catch (err) {
+        } catch {
         }
       }
     }
@@ -15365,25 +15365,14 @@ async function pureServerFunction(ev) {
       const [qrl, ...args] = data;
       if (isQrl(qrl) && qrl.getHash() === fn) {
         let result;
-        try {
-          if (isDev) {
-            result = await measure(
-              ev,
-              `server_${qrl.getSymbol()}`,
-              () => qrl.apply(ev, args)
-            );
-          } else {
-            result = await qrl.apply(ev, args);
-          }
-        } catch (err) {
-          if (err instanceof ServerError) {
-            ev.headers.set("Content-Type", "application/qwik-json");
-            ev.send(err.status, await qwikSerializer._serialize([err.data]));
-            return;
-          }
-          ev.headers.set("Content-Type", "application/qwik-json");
-          ev.send(500, await qwikSerializer._serialize([err]));
-          return;
+        if (isDev) {
+          result = await measure(
+            ev,
+            `server_${qrl.getSymbol()}`,
+            () => qrl.apply(ev, args)
+          );
+        } else {
+          result = await qrl.apply(ev, args);
         }
         if (isAsyncIterator(result)) {
           ev.headers.set("Content-Type", "text/qwik-json-stream");

package/lib/vite/index.mjs CHANGED Viewed

@@ -14295,17 +14295,11 @@ import { loadEnv } from "vite";
 // packages/qwik-router/src/middleware/request-handler/error-handler.ts
 var ServerError = class extends Error {
   constructor(status, data) {
-    super();
+    super(typeof data === "string" ? data : void 0);
     this.status = status;
     this.data = data;
   }
 };
-var ErrorResponse = class extends Error {
-  constructor(status, message) {
-    super(message);
-    this.status = status;
-  }
-};
 function getErrorHtml(status, e) {
   let message = "Server Error";
   if (e != null) {
@@ -14753,12 +14747,18 @@ async function runNext(requestEv, resolve4) {
     if (e instanceof RedirectMessage) {
       const stream = requestEv.getWritableStream();
       await stream.close();
-    } else if (e instanceof ErrorResponse) {
-      console.error(e);
+    } else if (e instanceof ServerError) {
       if (!requestEv.headersSent) {
-        const html5 = getErrorHtml(e.status, e);
         const status = e.status;
-        requestEv.html(status, html5);
+        const accept = requestEv.request.headers.get("Accept");
+        if (accept && !accept.includes("text/html")) {
+          const qwikSerializer = requestEv[RequestEvQwikSerializer];
+          requestEv.headers.set("Content-Type", "application/qwik-json");
+          requestEv.send(status, await qwikSerializer._serialize([e.data]));
+        } else {
+          const html5 = getErrorHtml(e.status, e.data);
+          requestEv.html(status, html5);
+        }
       }
     } else if (!(e instanceof AbortMessage)) {
       if (getRequestMode(requestEv) !== "dev") {
@@ -14951,7 +14951,7 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manif
     },
     error: (statusCode, message) => {
       status = statusCode;
-      return new ErrorResponse(statusCode, message);
+      return new ServerError(statusCode, message);
     },
     redirect: (statusCode, url2) => {
       check();
@@ -15052,7 +15052,7 @@ var parseRequest = async ({ request, method, query }, sharedMap, qwikSerializer)
       if (data) {
         try {
           return qwikSerializer._deserialize(decodeURIComponent(data));
-        } catch (err) {
+        } catch {
         }
       }
     }
@@ -15354,25 +15354,14 @@ async function pureServerFunction(ev) {
       const [qrl, ...args] = data;
       if (isQrl(qrl) && qrl.getHash() === fn) {
         let result;
-        try {
-          if (isDev) {
-            result = await measure(
-              ev,
-              `server_${qrl.getSymbol()}`,
-              () => qrl.apply(ev, args)
-            );
-          } else {
-            result = await qrl.apply(ev, args);
-          }
-        } catch (err) {
-          if (err instanceof ServerError) {
-            ev.headers.set("Content-Type", "application/qwik-json");
-            ev.send(err.status, await qwikSerializer._serialize([err.data]));
-            return;
-          }
-          ev.headers.set("Content-Type", "application/qwik-json");
-          ev.send(500, await qwikSerializer._serialize([err]));
-          return;
+        if (isDev) {
+          result = await measure(
+            ev,
+            `server_${qrl.getSymbol()}`,
+            () => qrl.apply(ev, args)
+          );
+        } else {
+          result = await qrl.apply(ev, args);
         }
         if (isAsyncIterator(result)) {
           ev.headers.set("Content-Type", "text/qwik-json-stream");

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@qwik.dev/router",
   "description": "The router for Qwik.",
-  "version": "2.0.0-alpha.7",
+  "version": "2.0.0-alpha.9",
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "dependencies": {
     "@mdx-js/mdx": "^3",
@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@azure/functions": "3.5.1",
-    "@microsoft/api-extractor": "7.43.1",
+    "@microsoft/api-extractor": "7.52.1",
     "@netlify/edge-functions": "2.10.0",
     "@types/mdast": "4.0.4",
     "@types/node": "20.14.11",
@@ -36,12 +36,12 @@
     "remark-gfm": "4.0.0",
     "set-cookie-parser": "2.6.0",
     "tsm": "2.3.0",
-    "typescript": "5.4.5",
+    "typescript": "5.8.2",
     "unified": "11.0.5",
     "unist-util-visit": "5.0.0",
     "uvu": "0.5.6",
     "yaml": "2.4.5",
-    "@qwik.dev/core": "2.0.0-alpha.7"
+    "@qwik.dev/core": "2.0.0-alpha.9"
   },
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"