fix: sync with gpa

PSDTools · Feb 21, 2024 · b6d81cd · b6d81cd
1 parent 3d583ef
commit b6d81cd
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 19 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/eslint.config.js b/eslint.config.js
@@ -1,33 +1,34 @@
-// @ts-check
 import { sheriff } from "eslint-config-sheriff";
 import { defineFlatConfig } from "eslint-define-config";
 
+/**
+ * @type import("@sherifforg/types").SheriffSettings
+ */
 const sheriffOptions = {
   react: false,
   lodash: false,
   next: false,
   playwright: false,
   jest: false,
   vitest: false,
+  // astro: false, // THIS DOESN'T DO ANYTHING!
   pathsOveriddes: {
     tsconfigLocation: [
       "./tsconfig.json",
       "./tsconfig.sw.json",
       "./tsconfig.eslint.json",
     ],
-    ignores: [
-      "**/node_modules/**",
-      "**/dist/**",
-      "**/dev-dist/**",
-      "**/build/**",
-      "**/.yarn/**",
-      "**/.pnp.*",
-    ],
   },
 };
 
+/**
+ * @type import("eslint-define-config").FlatESLintConfig[]
+ */
+// @ts-expect-error: null and undefined are different.
+const sheriffRules = sheriff(sheriffOptions);
+
 export default defineFlatConfig([
-  ...sheriff(sheriffOptions),
+  ...sheriffRules,
   {
     files: ["**/*.ts"],
     rules: {
@@ -47,6 +48,10 @@ export default defineFlatConfig([
         { "ts-expect-error": true, "ts-check": false },
       ],
       "import/no-unresolved": [2, { ignore: ["^virtual:"] }],
+      "@typescript-eslint/prefer-function-type": "warn",
+      "@typescript-eslint/explicit-function-return-type": "warn",
+      "@typescript-eslint/promise-function-async": "warn",
+      "@typescript-eslint/strict-boolean-expressions": "warn",
     },
   },
 ]);
diff --git a/package.json b/package.json
@@ -30,7 +30,6 @@
     "@fortawesome/free-solid-svg-icons": "^6.5.1",
     "idb-keyval": "^6.2.1",
     "pathfinding": "^0.4.18",
-    "turbo": "^1.12.0",
     "unstorage": "^1.10.1",
     "workbox-build": "^7.0.0",
     "workbox-core": "^7.0.0",
@@ -41,6 +40,7 @@
   "devDependencies": {
     "@eslint-types/typescript-eslint": "^6.21.0",
     "@eslint-types/unicorn": "^51.0.1",
+    "@sherifforg/types": "^3.0.0",
     "@types/bun": "^1.0.5",
     "@types/eslint": "^8.56.2",
     "@types/pathfinding": "^0.0.9",
@@ -51,6 +51,7 @@
     "eslint-define-config": "^2.1.0",
     "lightningcss": "^1.23.0",
     "prettier": "3.2.5",
+    "turbo": "^1.12.4",
     "typescript": "^5.3.3",
     "vite": "^5.1.1",
     "vite-plugin-pwa": "^0.18.1",

diff --git a/src/script.ts b/src/script.ts
@@ -341,15 +341,15 @@ async function locateCourses(profNum: number): Promise<void> {
   profiles[profNum] = [];
   profiles[0] = profiles[0] ?? [undefined, ""];
 
-  profiles[0]![profNum] = (
+  profiles[0][profNum] = (
     document.getElementById(`nameProf${profNum}`) as HTMLInputElement
   ).value;
   for (const [i] of document.querySelectorAll(`.prof${profNum}`).entries()) {
     profiles[profNum]![i] = [];
-    (profiles[profNum]![i] as string[])![0] = (
+    (profiles[profNum]![i] as string[])[0] = (
       document.getElementById(`rmnum${i + 1}${prof}txt`) as HTMLInputElement
     ).value;
-    (profiles[profNum]![i] as string[])![1] = (
+    (profiles[profNum]![i] as string[])[1] = (
       document.getElementById(`cl${i + 1}${prof}txt`) as HTMLInputElement
     ).value;
   }

diff --git a/src/sw.ts b/src/sw.ts
@@ -3,4 +3,4 @@ import { precacheAndRoute } from "workbox-precaching";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-expect-error: __WB_MANIFEST is a placeholder that workbox-precaching will inject at compile time.
 // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-precacheAndRoute(self.__WB_MANIFEST || []);
+precacheAndRoute(self.__WB_MANIFEST ?? []);
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
@@ -2,6 +2,8 @@
   "extends": "./tsconfig.json",
   "include": ["vite.config.ts", "eslint.config.js"],
   "compilerOptions": {
-    "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.extra.json"
+    "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.extra.json",
+    "allowJs": true,
+    "checkJs": true
   }
 }
diff --git a/turbo.json b/turbo.json
@@ -22,8 +22,8 @@
     },
     "lint": {
       "inputs": [
-        "src/**",
-        "vite.config.ts"
+        "**/*.ts",
+        "eslint.config.js"
       ]
     },
     "typecheck": {

diff --git a/vite.config.ts b/vite.config.ts
@@ -19,7 +19,7 @@ export default defineConfig({
       },
     },
     target: browserslistToEsbuild(browsersList),
-    cssMinify: "lightningcss",
+    // cssMinify: "lightningcss",
   },
   css: {
     transformer: "lightningcss",