@qwik.dev/router 2.0.0-alpha.1 → 2.0.0-alpha.10

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

@@ -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) {
@@ -459,8 +453,7 @@ function createCacheControl(cacheControl) {
     cacheControl = {
       public: true,
       immutable: true,
-      maxAge: 60 * 60 * 24 * 365,
-      staleWhileRevalidate: 60 * 60 * 24 * 365
+      maxAge: 60 * 60 * 24 * 365
     };
   } else if (cacheControl === "no-cache") {
     cacheControl = {
@@ -470,8 +463,7 @@ function createCacheControl(cacheControl) {
   if (typeof cacheControl === "number") {
     cacheControl = {
       maxAge: cacheControl,
-      sMaxAge: cacheControl,
-      staleWhileRevalidate: cacheControl
+      sMaxAge: cacheControl
     };
   }
   if (cacheControl.immutable) {
@@ -516,14 +508,13 @@ import("node:async_hooks").then((module) => {
     err
   );
 });
-function runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, manifest, trailingSlash = true, basePathname = "/", qwikSerializer) {
+function runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, trailingSlash = true, basePathname = "/", qwikSerializer) {
   let resolve;
   const responsePromise = new Promise((r) => resolve = r);
   const requestEv = createRequestEvent(
     serverRequestEv,
     loadedRoute,
     requestHandlers,
-    manifest,
     trailingSlash,
     basePathname,
     qwikSerializer,
@@ -542,12 +533,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") {
@@ -600,7 +597,7 @@ var RequestRouteName = "@routeName";
 var RequestEvSharedActionId = "@actionId";
 var RequestEvSharedActionFormData = "@actionFormData";
 var RequestEvSharedNonce = "@nonce";
-function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manifest, trailingSlash, basePathname, qwikSerializer, resolved) {
+function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, trailingSlash, basePathname, qwikSerializer, resolved) {
   const { request, platform, env } = serverRequestEv;
   const sharedMap = /* @__PURE__ */ new Map();
   const cookie = new Cookie(request.headers.get("cookie"));
@@ -613,7 +610,6 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manif
     }
     sharedMap.set(IsQData, true);
   }
-  sharedMap.set("@manifest", manifest);
   let routeModuleIndex = -1;
   let writableStream = null;
   let requestData = void 0;
@@ -647,17 +643,25 @@ function createRequestEvent(serverRequestEv, loadedRoute, requestHandlers, manif
     } else {
       status = statusOrResponse.status;
       statusOrResponse.headers.forEach((value, key) => {
+        if (key.toLowerCase() === "set-cookie") {
+          return;
+        }
         headers.append(key, value);
       });
+      statusOrResponse.headers.getSetCookie().forEach((ck) => {
+        const index = ck.indexOf("=");
+        if (index === -1) {
+          return;
+        }
+        const key = ck.slice(0, index).trim();
+        const value = ck.slice(index + 1).trim();
+        cookie.set(key, value);
+      });
       if (statusOrResponse.body) {
         const writableStream2 = requestEv.getWritableStream();
         statusOrResponse.body.pipeTo(writableStream2);
       } else {
-        if (status >= 300 && status < 400) {
-          return new RedirectMessage();
-        } else {
-          requestEv.getWritableStream().getWriter().close();
-        }
+        requestEv.getWritableStream().getWriter().close();
       }
     }
     return exit();
@@ -728,7 +732,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();
@@ -829,7 +833,7 @@ var parseRequest = async ({ request, method, query }, sharedMap, qwikSerializer)
       if (data) {
         try {
           return qwikSerializer._deserialize(decodeURIComponent(data));
-        } catch (err) {
+        } catch {
         }
       }
     }
@@ -1140,13 +1144,9 @@ async function pureServerFunction(ev) {
           }
         } catch (err) {
           if (err instanceof ServerError) {
-            ev.headers.set("Content-Type", "application/qwik-json");
-            ev.send(err.status, await qwikSerializer._serialize([err.data]));
-            return;
+            throw ev.error(err.status, err.data);
           }
-          ev.headers.set("Content-Type", "application/qwik-json");
-          ev.send(500, await qwikSerializer._serialize([err]));
-          return;
+          throw ev.error(500, "Invalid request");
         }
         if (isAsyncIterator(result)) {
           ev.headers.set("Content-Type", "text/qwik-json-stream");
@@ -1388,13 +1388,13 @@ async function measure(requestEv, name, fn) {
 }
 function isContentType(headers, ...types) {
   var _a;
-  const type = ((_a = headers.get("content-type")) == null ? void 0 : _a.split(/;,/, 1)[0].trim()) ?? "";
+  const type = ((_a = headers.get("content-type")) == null ? void 0 : _a.split(/;/, 1)[0].trim()) ?? "";
   return types.includes(type);
 }
 
 // packages/qwik-router/src/middleware/request-handler/request-handler.ts
 async function requestHandler(serverRequestEv, opts, qwikSerializer) {
-  const { render, qwikRouterConfig, manifest, checkOrigin } = opts;
+  const { render, qwikRouterConfig, checkOrigin } = opts;
   if (!qwikRouterConfig) {
     throw new Error("qwikRouterConfig is required.");
   }
@@ -1413,7 +1413,6 @@ async function requestHandler(serverRequestEv, opts, qwikSerializer) {
       serverRequestEv,
       route,
       requestHandlers,
-      manifest,
       qwikRouterConfig.trailingSlash,
       qwikRouterConfig.basePathname,
       qwikSerializer

package/lib/middleware/vercel-edge/index.d.ts

@@ -1,26 +1,26 @@
-import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
-
-/**
- * @deprecated Use `createQwikRouter` instead. Will be removed in V3
- * @public
- */
-export declare const createQwikCity: typeof createQwikRouter;
-
-/** @public */
-export declare function createQwikRouter(opts: QwikRouterVercelEdgeOptions): (request: Request) => Promise<Response>;
-
-/** @public */
-export declare interface PlatformVercel {
-}
-
-/**
- * @deprecated Use `QwikRouterVercelEdgeOptions` instead. Will be removed in V3
- * @public
- */
-export declare type QwikCityVercelEdgeOptions = QwikRouterVercelEdgeOptions;
-
-/** @public */
-export declare interface QwikRouterVercelEdgeOptions extends ServerRenderOptions {
-}
-
-export { }
+import type { ServerRenderOptions } from '@qwik.dev/router/middleware/request-handler';
+
+/**
+ * @deprecated Use `createQwikRouter` instead. Will be removed in V3
+ * @public
+ */
+export declare const createQwikCity: typeof createQwikRouter;
+
+/** @public */
+export declare function createQwikRouter(opts: QwikRouterVercelEdgeOptions): (request: Request) => Promise<Response>;
+
+/** @public */
+export declare interface PlatformVercel {
+}
+
+/**
+ * @deprecated Use `QwikRouterVercelEdgeOptions` instead. Will be removed in V3
+ * @public
+ */
+export declare type QwikCityVercelEdgeOptions = QwikRouterVercelEdgeOptions;
+
+/** @public */
+export declare interface QwikRouterVercelEdgeOptions extends ServerRenderOptions {
+}
+
+export { }

package/lib/service-worker.cjs

@@ -1,267 +1,17 @@
 'use strict';
 
-const getCacheToDelete = (appBundles, cachedUrls) => cachedUrls.filter((url) => !appBundles.some((appBundle) => url.endsWith(appBundle[0])));
-const useCache = (request, response) => !!response && !hasNoCacheHeader(response);
-const hasNoCacheHeader = (r) => {
-    const cacheControl = r.headers.get('Cache-Control') || '';
-    return cacheControl.includes('no-cache') || cacheControl.includes('max-age=0');
-};
-const isAppBundleRequest = (appBundles, requestPathname) => appBundles.some((b) => requestPathname.endsWith('/' + b[0]));
-const getAppBundleByName = (appBundles, appBundleName) => appBundles.find((b) => b[0] === appBundleName);
-const getAppBundlesNamesFromIds = (appBundles, bundleIds) => bundleIds.map((bundleId) => (appBundles[bundleId] ? appBundles[bundleId][0] : null));
-const resolveSymbols = (appSymbols, symbolsHashes) => symbolsHashes.map((s) => appSymbols.get(s)).filter((s) => s != null);
-const computeAppSymbols = (appBundles) => {
-    const appSymbols = new Map();
-    for (const bundle of appBundles) {
-        const hashes = bundle[2];
-        if (hashes) {
-            for (const hash of hashes) {
-                appSymbols.set(hash, bundle[0]);
-            }
-        }
-    }
-    return appSymbols;
-};
-
-const cachedFetch = (cache, fetch, awaitingRequests, request) => new Promise((promiseResolve, promiseReject) => {
-    const url = request.url;
-    const awaitingRequestResolves = awaitingRequests.get(url);
-    if (awaitingRequestResolves) {
-        // there's already an active request happening
-        // don't start a new request
-        awaitingRequestResolves.push([promiseResolve, promiseReject]);
-    }
-    else {
-        // there isn't already an active request for this url
-        // start a new request
-        const resolve = (response) => {
-            // the response has been resolved
-            const resolves = awaitingRequests.get(url);
-            if (resolves) {
-                awaitingRequests.delete(url);
-                // loop through each of the active requests
-                for (const [awaitingResolve] of resolves) {
-                    // clone a new response for each of the active requests
-                    awaitingResolve(response.clone());
-                }
-            }
-            else {
-                // somehow the array of awaiting requests doesn't exist
-                promiseResolve(response.clone());
-            }
-        };
-        const reject = (msg) => {
-            const resolves = awaitingRequests.get(url);
-            if (resolves) {
-                awaitingRequests.delete(url);
-                for (const [_, awaitingReject] of resolves) {
-                    awaitingReject(msg);
-                }
-            }
-            else {
-                promiseReject(msg);
-            }
-        };
-        // create a new array of the request waiting to be resolved
-        awaitingRequests.set(url, [[promiseResolve, promiseReject]]);
-        cache
-            .match(url)
-            .then((cachedResponse) => {
-            if (useCache(request, cachedResponse)) {
-                // cached response found and user did not specifically send
-                // a request header to NOT use the cache (wasn't a hard refresh)
-                resolve(cachedResponse);
-            }
-            else {
-                // no cached response found or user didn't want to use the cache
-                // do a full network request
-                return fetch(request).then(async (networkResponse) => {
-                    if (networkResponse.ok) {
-                        // network response was good, let's cache it
-                        await cache.put(url, networkResponse.clone());
-                    }
-                    resolve(networkResponse);
-                });
-            }
-        })
-            .catch((err) => {
-            // network error, probably offline
-            return cache.match(url).then((cachedResponse) => {
-                if (cachedResponse) {
-                    // luckily we have a cached version, let's use it instead of an offline message
-                    resolve(cachedResponse);
-                }
-                else {
-                    // darn, we've got no connectivity and no cached response
-                    reject(err);
-                }
-            });
-        });
-    }
-});
-
-const qBuildCacheName = 'QwikBuild';
-const existingPrefetchUrls = new Set();
-const awaitingRequests = new Map();
-const prefetchQueue = [];
-
-const prefetchBundleNames = (appBundles, qBuildCache, fetch, baseUrl, prefetchAppBundleNames, highPriority = false) => {
-    if (Array.isArray(prefetchAppBundleNames)) {
-        addBundlesToPrefetchQueue(prefetchAppBundleNames, appBundles, baseUrl, highPriority);
-    }
-    drainQueue(qBuildCache, fetch);
-};
-function addBundlesToPrefetchQueue(bundlesToPrefetch, appBundles, baseUrl, highPriority) {
-    for (const prefetchAppBundleName of bundlesToPrefetch) {
-        try {
-            const appBundle = getAppBundleByName(appBundles, prefetchAppBundleName);
-            if (appBundle) {
-                const importedBundleNames = getAppBundlesNamesFromIds(appBundles, appBundle[1]);
-                const url = new URL(prefetchAppBundleName, baseUrl).href;
-                const queueIndex = prefetchQueue.indexOf(url);
-                if (queueIndex > -1) {
-                    // already in the queue
-                    if (highPriority) {
-                        // move to the front of the queue
-                        prefetchQueue.splice(queueIndex, 1);
-                        prefetchQueue.unshift(url);
-                    }
-                }
-                else {
-                    if (highPriority) {
-                        // add to the front of the queue
-                        prefetchQueue.unshift(url);
-                    }
-                    else {
-                        // add to the end of the queue
-                        prefetchQueue.push(url);
-                    }
-                    addBundlesToPrefetchQueue(importedBundleNames, appBundles, baseUrl, highPriority);
-                }
-            }
-        }
-        catch (e) {
-            console.error(e);
-        }
-    }
-}
-function drainQueue(qBuildCache, fetch) {
-    // do not prefetch more than 6 requests at a time to ensure
-    // the browser is able to handle a user request as soon as possible
-    while (prefetchQueue.length > 0 && awaitingRequests.size < 6) {
-        const url = prefetchQueue.shift();
-        if (!existingPrefetchUrls.has(url)) {
-            const request = new Request(url);
-            existingPrefetchUrls.add(url);
-            cachedFetch(qBuildCache, fetch, awaitingRequests, request)
-                .catch(() => {
-                existingPrefetchUrls.delete(url);
-            })
-                .finally(() => drainQueue(qBuildCache, fetch));
-        }
-    }
-}
-const prefetchLinkBundles = (appBundles, libraryBundleIds, linkBundles, qBuildCache, fetch, baseUrl, linkPathnames) => {
-    try {
-        prefetchBundleNames(appBundles, qBuildCache, fetch, baseUrl, getAppBundlesNamesFromIds(appBundles, libraryBundleIds));
-    }
-    catch (e) {
-        console.error(e);
-    }
-    for (const linkPathname of linkPathnames) {
-        try {
-            for (const linkBundle of linkBundles) {
-                const [route, linkBundleIds] = linkBundle;
-                console;
-                if (route.test(linkPathname)) {
-                    prefetchBundleNames(appBundles, qBuildCache, fetch, baseUrl, getAppBundlesNamesFromIds(appBundles, linkBundleIds));
-                    break;
-                }
-            }
-        }
-        catch (e) {
-            console.error(e);
-        }
-    }
-};
-const prefetchWaterfall = (appBundles, qBuildCache, fetch, requestedBuildUrl) => {
-    try {
-        const { baseUrl, requestedBundleName } = splitUrlToBaseAndBundle(requestedBuildUrl);
-        prefetchBundleNames(appBundles, qBuildCache, fetch, baseUrl, [requestedBundleName], true);
-    }
-    catch (e) {
-        console.error(e);
-    }
-};
-function splitUrlToBaseAndBundle(fullUrl) {
-    const segments = fullUrl.href.split('/');
-    const requestedBundleName = segments[segments.length - 1];
-    segments[segments.length - 1] = '';
-    const baseUrl = new URL(segments.join('/'));
-    return {
-        baseUrl,
-        requestedBundleName,
-    };
-}
-
-const setupServiceWorkerScope = (swScope, appBundles, libraryBundleIds, linkBundles) => {
-    const swFetch = swScope.fetch.bind(swScope);
-    const appSymbols = computeAppSymbols(appBundles);
-    swScope.addEventListener('activate', (event) => {
-        (async () => {
-            try {
-                // Delete any other caches that are not the current SW cache name
-                event.waitUntil(swScope.caches.keys().then((keys) => Promise.all(keys.map((key) => {
-                    if (key !== qBuildCacheName) {
-                        return caches.delete(key);
-                    }
-                }))));
-                // Delete old bundles
-                const qBuildCache = await swScope.caches.open(qBuildCacheName);
-                const cachedRequestKeys = await qBuildCache.keys();
-                const cachedUrls = cachedRequestKeys.map((r) => r.url);
-                const cachedRequestsToDelete = getCacheToDelete(appBundles, cachedUrls);
-                await Promise.all(cachedRequestsToDelete.map((r) => qBuildCache.delete(r)));
-            }
-            catch (e) {
-                console.error(e);
-            }
-        })();
-    });
-    swScope.addEventListener('message', async ({ data }) => {
-        if (data.type === 'qprefetch' && typeof data.base === 'string') {
-            const qBuildCache = await swScope.caches.open(qBuildCacheName);
-            const baseUrl = new URL(data.base, swScope.origin);
-            if (Array.isArray(data.links)) {
-                prefetchLinkBundles(appBundles, libraryBundleIds, linkBundles, qBuildCache, swFetch, baseUrl, data.links);
-            }
-            if (Array.isArray(data.bundles)) {
-                prefetchBundleNames(appBundles, qBuildCache, swFetch, baseUrl, data.bundles);
-            }
-            if (Array.isArray(data.symbols)) {
-                prefetchBundleNames(appBundles, qBuildCache, swFetch, baseUrl, resolveSymbols(appSymbols, data.symbols));
-            }
-        }
-    });
-    swScope.addEventListener('fetch', (event) => {
-        const request = event.request;
-        if (request.method === 'GET') {
-            const url = new URL(request.url);
-            if (isAppBundleRequest(appBundles, url.pathname)) {
-                event.respondWith(swScope.caches.open(qBuildCacheName).then((qBuildCache) => {
-                    prefetchWaterfall(appBundles, qBuildCache, swFetch, url);
-                    return cachedFetch(qBuildCache, swFetch, awaitingRequests, request);
-                }));
-            }
-        }
-    });
-};
-
-/** @public */
-const setupServiceWorker = () => {
-    if (typeof self !== 'undefined' && typeof appBundles !== 'undefined') {
-        setupServiceWorkerScope(self, appBundles, libraryBundleIds, linkBundles);
-    }
-};
+/**
+ * @deprecated This is no longer needed, Qwik now automatically embeds preloading logic into the
+ *   application.
+ *
+ *   If your service-worker.ts file contains no custom code, you should deploy to production until
+ *   you're sure that all users picked up the new version, then you can remove it and also remove
+ *   the `<ServiceWorkerRegister />` component from your `Root.tsx`.
+ *
+ *   If you do have custom service worker logic, you should keep the `service-worker.ts` file and
+ *   `<ServiceWorkerRegister />` component, but remove the `setupServiceWorker()` call.
+ * @public
+ */
+const setupServiceWorker = () => { };
 
 exports.setupServiceWorker = setupServiceWorker;

package/lib/service-worker.d.ts

@@ -1,4 +1,15 @@
-/** @public */
-export declare const setupServiceWorker: () => void;
-
-export { }
+/**
+ * @deprecated This is no longer needed, Qwik now automatically embeds preloading logic into the
+ *   application.
+ *
+ *   If your service-worker.ts file contains no custom code, you should deploy to production until
+ *   you're sure that all users picked up the new version, then you can remove it and also remove
+ *   the `<ServiceWorkerRegister />` component from your `Root.tsx`.
+ *
+ *   If you do have custom service worker logic, you should keep the `service-worker.ts` file and
+ *   `<ServiceWorkerRegister />` component, but remove the `setupServiceWorker()` call.
+ * @public
+ */
+export declare const setupServiceWorker: () => void;
+
+export { }