Merge ee07e4e72d into 6678ded2f9

apps/website/package.json

@@ -9,7 +9,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/cloudflare": "^11.0.1",
+    "@astrojs/cloudflare": "^11.0.4",
     "@astrojs/preact": "^3.5.1",
     "@astrojs/prefetch": "^0.2.1",
     "@astrojs/sitemap": "^3.1.6",
@@ -25,6 +25,7 @@
     "tailwindcss": "^3.3.1"
   },
   "devDependencies": {
+    "@cloudflare/workers-types": "^4.20240806.0",
     "autoprefixer": "^10.4.14",
     "cssnano": "^6.0.0",
     "postcss": "^8.4.21",

apps/website/src/env.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="astro/client" />
 
-type D1Database = import("@cloudflare/workers-types").D1Database;
+type Env = {
-type ENV = {
   GITHUB_APP_NAME: string;
   DISCORD_CLIENT_ID: string;
   DISCORD_CLIENT_SECRET: string;
@@ -10,7 +9,7 @@ type ENV = {
   DB: D1Database;
 };
 
-export interface Guild {
+/*export interface Guild {
   id: string;
   name: string;
   icon: string;
@@ -21,9 +20,9 @@ export interface Guild {
 export interface MutualeGuild {
   mutual: boolean;
   guild: Guild;
-}
+}*/
 
-type Runtime = import("@astrojs/cloudflare").Runtime<ENV>;
+type Runtime = import("@astrojs/cloudflare").Runtime<Env>;
 
 // https://github.com/withastro/astro/issues/7394#issuecomment-1975657601
 declare namespace App {

apps/website/tsconfig.json

@@ -1,12 +1,11 @@
 {
-  "extends": "astro/tsconfigs/strictest",
+  "extends": "astro/tsconfigs/strict",
   "compilerOptions": {
+    "types": ["@cloudflare/workers-types"],
     "strictNullChecks": true,
-    "allowJs": true,
     "baseUrl": ".",
     "paths": {
       "~/*": ["src/*"]
-    },
+    }
-    "types": ["./src/env.d.ts"]
   }
 }