Merge remote-tracking branch 'origin/dev' into dev

src/lib/clickhouse.ts

@@ -112,7 +112,7 @@ async function parseFilters(websiteId: string, filters: QueryFilters = {}, optio
     params: {
       ...normalizeFilters(filters),
       websiteId,
-      startDate: maxDate(filters.startDate, website.resetAt),
+      startDate: maxDate(filters.startDate, new Date(website.resetAt)),
       websiteDomain: website.domain,
     },
   };

src/lib/middleware.ts

@@ -21,7 +21,7 @@ const log = debug('umami:middleware');
 export const useCors = createMiddleware(
   cors({
     // Cache CORS preflight request 24 hours by default
-    maxAge: process.env.CORS_MAX_AGE || 86400,
+    maxAge: Number(process.env.CORS_MAX_AGE) || 86400,
   }),
 );