@qwik.dev/router 2.0.0-alpha.9 → 2.0.0-beta.10

package/lib/middleware/vercel-edge/index.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const w=require("@qwik.dev/core/server"),o=require("@qwik.dev/router/middleware/request-handler"),g="x-vercel-ip-country",_="x-real-ip",v="__vdpl",y="VERCEL_SKEW_PROTECTION_ENABLED",S="VERCEL_DEPLOYMENT_ID",T="BASE_URL";function l(n){n.qwikCityPlan&&!n.qwikRouterConfig&&(console.warn("qwikCityPlan is deprecated. Simply remove it."),n.qwikRouterConfig=n.qwikCityPlan),n.manifest&&w.setServerPlatform(n.manifest);async function d(e){try{const t=new URL(e.url);if(o.isStaticPath(e.method,t))return new Response(null,{headers:{"x-middleware-next":"1"}});const E=globalThis.process,s={mode:"server",locale:void 0,url:t,request:e,env:{get(r){return E.env[r]}},getWritableStream:(r,a,c,h)=>{const{readable:R,writable:m}=new TransformStream;if(s.env.get(y)){const C=s.env.get(S)||"",f=s.env.get(T)||"/";e.headers.has("Sec-Fetch-Dest")&&c.set(v,C,{path:f,secure:!0,sameSite:!0,httpOnly:!0})}const p=new Response(R,{status:r,headers:o.mergeHeadersCookies(a,c)});return h(p),m},platform:{},getClientConn:()=>({ip:e.headers.get(_)??void 0,country:e.headers.get(g)??void 0})},i=await o.requestHandler(s,n);if(i){i.completion.then(a=>{a&&console.error(a)});const r=await i.response;if(r)return r}const u=!e.headers.get("accept")?.includes("text/html")||o.isStaticPath(e.method||"GET",t)?"Not Found":o.getNotFound(t.pathname);return new Response(u,{status:404,headers:{"Content-Type":"text/html; charset=utf-8","X-Not-Found":t.pathname}})}catch(t){return console.error(t),new Response(String(t||"Error"),{status:500,headers:{"Content-Type":"text/plain; charset=utf-8","X-Error":"vercel-edge"}})}}return d}const L=l;exports.createQwikCity=L;exports.createQwikRouter=l;

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/middleware/vercel-edge/index.mjs

@@ -1,109 +1,74 @@
-// packages/qwik-router/src/middleware/vercel-edge/index.ts
-import { getNotFound } from "@qwik-router-not-found-paths";
-import { isStaticPath } from "@qwik-router-static-paths";
-import { _deserialize, _serialize, _verifySerializable } from "@qwik.dev/core/internal";
-import { setServerPlatform } from "@qwik.dev/core/server";
-import { mergeHeadersCookies, requestHandler } from "../request-handler/index.mjs";
-var COUNTRY_HEADER_NAME = "x-vercel-ip-country";
-var IP_HEADER_NAME = "x-real-ip";
-var VERCEL_COOKIE = "__vdpl";
-var VERCEL_SKEW_PROTECTION_ENABLED = "VERCEL_SKEW_PROTECTION_ENABLED";
-var VERCEL_DEPLOYMENT_ID = "VERCEL_DEPLOYMENT_ID";
-var BASE_URL = "BASE_URL";
-function createQwikRouter(opts) {
-  if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Use qwikRouterConfig instead.");
-    opts.qwikRouterConfig = opts.qwikCityPlan;
-  } else if (!opts.qwikRouterConfig) {
-    throw new Error("qwikRouterConfig is required.");
-  }
-  const qwikSerializer = {
-    _deserialize,
-    _serialize,
-    _verifySerializable
-  };
-  if (opts.manifest) {
-    setServerPlatform(opts.manifest);
-  }
-  async function onVercelEdgeRequest(request) {
+import { setServerPlatform as C } from "@qwik.dev/core/server";
+import { isStaticPath as c, mergeHeadersCookies as _, requestHandler as w, getNotFound as g } from "@qwik.dev/router/middleware/request-handler";
+const v = "x-vercel-ip-country", y = "x-real-ip", L = "__vdpl", N = "VERCEL_SKEW_PROTECTION_ENABLED", S = "VERCEL_DEPLOYMENT_ID", T = "BASE_URL";
+function O(n) {
+  n.qwikCityPlan && !n.qwikRouterConfig && (console.warn("qwikCityPlan is deprecated. Simply remove it."), n.qwikRouterConfig = n.qwikCityPlan), n.manifest && C(n.manifest);
+  async function l(e) {
     try {
-      const url = new URL(request.url);
-      if (isStaticPath(request.method, url)) {
+      const t = new URL(e.url);
+      if (c(e.method, t))
         return new Response(null, {
           headers: {
             "x-middleware-next": "1"
           }
         });
-      }
-      const p = (() => globalThis.process)();
-      const serverRequestEv = {
+      const E = globalThis.process, o = {
         mode: "server",
         locale: void 0,
-        url,
-        request,
+        url: t,
+        request: e,
         env: {
-          get(key) {
-            return p.env[key];
+          get(r) {
+            return E.env[r];
           }
         },
-        getWritableStream: (status, headers, cookies, resolve) => {
-          const { readable, writable } = new TransformStream();
-          if (serverRequestEv.env.get(VERCEL_SKEW_PROTECTION_ENABLED)) {
-            const deploymentId = serverRequestEv.env.get(VERCEL_DEPLOYMENT_ID) || "";
-            const baseUrl = serverRequestEv.env.get(BASE_URL) || "/";
-            if (request.headers.has("Sec-Fetch-Dest")) {
-              cookies.set(VERCEL_COOKIE, deploymentId, {
-                path: baseUrl,
-                secure: true,
-                sameSite: true,
-                httpOnly: true
-              });
-            }
+        getWritableStream: (r, s, i, u) => {
+          const { readable: m, writable: h } = new TransformStream();
+          if (o.env.get(N)) {
+            const R = o.env.get(S) || "", f = o.env.get(T) || "/";
+            e.headers.has("Sec-Fetch-Dest") && i.set(L, R, {
+              path: f,
+              secure: !0,
+              sameSite: !0,
+              httpOnly: !0
+            });
           }
-          const response = new Response(readable, {
-            status,
-            headers: mergeHeadersCookies(headers, cookies)
+          const p = new Response(m, {
+            status: r,
+            headers: _(s, i)
           });
-          resolve(response);
-          return writable;
+          return u(p), h;
         },
         platform: {},
-        getClientConn: () => {
-          return {
-            ip: request.headers.get(IP_HEADER_NAME) ?? void 0,
-            country: request.headers.get(COUNTRY_HEADER_NAME) ?? void 0
-          };
-        }
-      };
-      const handledResponse = await requestHandler(serverRequestEv, opts, qwikSerializer);
-      if (handledResponse) {
-        handledResponse.completion.then((v) => {
-          if (v) {
-            console.error(v);
-          }
+        getClientConn: () => ({
+          ip: e.headers.get(y) ?? void 0,
+          country: e.headers.get(v) ?? void 0
+        })
+      }, a = await w(o, n);
+      if (a) {
+        a.completion.then((s) => {
+          s && console.error(s);
         });
-        const response = await handledResponse.response;
-        if (response) {
-          return response;
-        }
+        const r = await a.response;
+        if (r)
+          return r;
       }
-      const notFoundHtml = isStaticPath(request.method || "GET", url) ? "Not Found" : getNotFound(url.pathname);
-      return new Response(notFoundHtml, {
+      const d = !e.headers.get("accept")?.includes("text/html") || c(e.method || "GET", t) ? "Not Found" : g(t.pathname);
+      return new Response(d, {
         status: 404,
-        headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": url.pathname }
+        headers: { "Content-Type": "text/html; charset=utf-8", "X-Not-Found": t.pathname }
       });
-    } catch (e) {
-      console.error(e);
-      return new Response(String(e || "Error"), {
+    } catch (t) {
+      return console.error(t), new Response(String(t || "Error"), {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "vercel-edge" }
       });
     }
   }
-  return onVercelEdgeRequest;
+  return l;
 }
-var createQwikCity = createQwikRouter;
+const x = O;
 export {
-  createQwikCity,
-  createQwikRouter
+  x as createQwikCity,
+  O as createQwikRouter
 };

package/lib/modules.d.ts

@@ -19,20 +19,12 @@ declare module '@qwik-city-plan' {
   export { default } from '@qwik-router-config';
 }
 
-declare module '@qwik-router-not-found-paths' {
-  function getNotFound(_pathname: string): string;
-  export { getNotFound };
-}
-
 declare module '@qwik-city-not-found-paths' {
-  export * from '@qwik-router-not-found-paths';
-}
-
-declare module '@qwik-router-static-paths' {
-  function isStaticPath(method: string, url: URL): boolean;
-  export { isStaticPath };
+  /** @deprecated Use `getNotFound` from `@qwik.dev/router/middleware/request-handler` instead. */
+  export { getNotFound } from '@qwik.dev/router/middleware/request-handler';
 }
 
 declare module '@qwik-city-static-paths' {
-  export * from '@qwik-router-static-paths';
+  /** @deprecated Use `isStaticPath` from `@qwik.dev/router/middleware/request-handler` instead. */
+  export { isStaticPath } from '@qwik.dev/router/middleware/request-handler';
 }

package/lib/service-worker.cjs

@@ -1,267 +1 @@
-'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);
-    }
-};
-
-exports.setupServiceWorker = setupServiceWorker;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=()=>{};exports.setupServiceWorker=e;

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 { }