From c995b5a8db8f6f6da73cee2fc2f420097e8ffb50 Mon Sep 17 00:00:00 2001
From: ThaUnknown <6506529+ThaUnknown@users.noreply.github.com>
Date: Tue, 13 Feb 2024 21:03:51 +0100
Subject: [PATCH] chore: update types

---
 .eslintrc            |  3 +++
 common/jsconfig.json |  8 +++++++-
 jsconfig.json        |  8 +++++++-
 web/jsconfig.json    |  8 ++++++--
 web/tsconfig.json    | 29 -----------------------------
 5 files changed, 23 insertions(+), 33 deletions(-)
 delete mode 100644 web/tsconfig.json

diff --git a/.eslintrc b/.eslintrc
index e4c3485..8e9403a 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -15,6 +15,9 @@
     "node": true,
     "serviceworker": true
   },
+  "rules": {
+    "n/no-callback-literal": 0
+  },
   "extends": ["plugin:svelte/recommended", "standard"],
   "plugins": ["svelte"],
   "parser": "@typescript-eslint/parser",
diff --git a/common/jsconfig.json b/common/jsconfig.json
index 30c0f54..887f71f 100644
--- a/common/jsconfig.json
+++ b/common/jsconfig.json
@@ -3,6 +3,8 @@
     "baseUrl": "./",
     "paths": {
       "@/*": ["./*"],
+      "three": ["./types.d.ts"],
+      "rxjs": ["./types.d.ts"],
     },
     "checkJs": true,
     "target": "ESNext",
@@ -17,5 +19,9 @@
     "types": ["./types.d.ts"],
     "allowSyntheticDefaultImports": true
   },
-  "exclude": ["node_modules", "dist", "build", "git_modules", ".svelte-kit", "**/node_modules", "**/dist", "**/build", "**/git_modules", "**/.svelte-kit", "**/node_modules/*", "**/dist/*", "**/build/*", "**/git_modules/*", "**/.svelte-kit/*"]
+  "exclude": [
+    "node_modules", "dist", "build", "git_modules", ".svelte-kit", "public", "android", "@types/three",
+    "**/node_modules", "**/dist", "**/build", "**/git_modules", "**/.svelte-kit", "**/public", "**/android", "**/@types/three",
+    "**/node_modules/*", "**/dist/*", "**/build/*", "**/git_modules/*", "**/.svelte-kit/*", "**/public/*", "**/android/*", "**@types/three/*.d.ts"
+  ]
 }
\ No newline at end of file
diff --git a/jsconfig.json b/jsconfig.json
index 33d54d4..1f511ca 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -13,8 +13,14 @@
     "skipLibCheck": true,
     "paths": {
       "@/*": ["./common/*"],
+      "three": ["./types.d.ts"],
+      "rxjs": ["./types.d.ts"],
     },
     "types": ["@cloudflare/workers-types", "./types.d.ts"],
   },
-  "exclude": ["node_modules", "dist", "build", "git_modules", ".svelte-kit", "**/node_modules", "**/dist", "**/build", "**/git_modules", "**/.svelte-kit", "**/node_modules/*", "**/dist/*", "**/build/*", "**/git_modules/*", "**/.svelte-kit/*"]
+  "exclude": [
+    "node_modules", "dist", "build", "git_modules", ".svelte-kit", "public", "android", "@types/three",
+    "**/node_modules", "**/dist", "**/build", "**/git_modules", "**/.svelte-kit", "**/public", "**/android", "**/@types/three",
+    "**/node_modules/*", "**/dist/*", "**/build/*", "**/git_modules/*", "**/.svelte-kit/*", "**/public/*", "**/android/*", "**@types/three/*.d.ts"
+]
 }
\ No newline at end of file
diff --git a/web/jsconfig.json b/web/jsconfig.json
index f997b75..dc794b5 100644
--- a/web/jsconfig.json
+++ b/web/jsconfig.json
@@ -18,10 +18,14 @@
     "target": "ESNext",
     "moduleResolution": "node",
     "module": "ESNext",
-    "types": ["./types.d.ts"],
+    "types": [],
     "allowSyntheticDefaultImports": true
 	},
-  "exclude": ["node_modules", "dist", "build", "git_modules", "**/node_modules", "**/dist", "**/build", "**/git_modules",]
+  "exclude": [
+    "node_modules", "dist", "build", "git_modules", ".svelte-kit", "public", "android", "@types/three",
+    "**/node_modules", "**/dist", "**/build", "**/git_modules", "**/.svelte-kit", "**/public", "**/android", "**/@types/three",
+    "**/node_modules/*", "**/dist/*", "**/build/*", "**/git_modules/*", "**/.svelte-kit/*", "**/public/*", "**/android/*", "**@types/three/*.d.ts"
+	]
 	// Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias and https://kit.svelte.dev/docs/configuration#files
 	//
 	// If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
diff --git a/web/tsconfig.json b/web/tsconfig.json
deleted file mode 100644
index f997b75..0000000
--- a/web/tsconfig.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"extends": "./.svelte-kit/tsconfig.json",
-	"compilerOptions": {
-		"allowJs": true,
-    "baseUrl": "./",
-    "paths": {
-      "@/*": ["../common/*"],
-			"$lib":["./src/lib"],   
-			"$lib/*":["./src/lib/*"]
-    },
-		"checkJs": true,
-		"esModuleInterop": true,
-		"forceConsistentCasingInFileNames": true,
-		"resolveJsonModule": true,
-		"skipLibCheck": true,
-		"sourceMap": true,
-		"strict": true,
-    "target": "ESNext",
-    "moduleResolution": "node",
-    "module": "ESNext",
-    "types": ["./types.d.ts"],
-    "allowSyntheticDefaultImports": true
-	},
-  "exclude": ["node_modules", "dist", "build", "git_modules", "**/node_modules", "**/dist", "**/build", "**/git_modules",]
-	// Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias and https://kit.svelte.dev/docs/configuration#files
-	//
-	// If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
-	// from the referenced tsconfig.json - TypeScript does not merge them in
-}