Revert "Upgrade to typescript-eslint v8, part 2."

This reverts commit 79e6339.
ajvincent · Aug 11, 2024 · 7f663af · 7f663af
1 parent 79e6339
commit 7f663af
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 141 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -3,19 +3,7 @@
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
 
-import {
-  projectDir,
-} from "#utilities/source/AsyncSpecModules.js";
-
 export default tseslint.config(
   eslint.configs.recommended,
-  ...tseslint.configs.recommendedTypeChecked,
-  {
-    languageOptions: {
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: projectDir
-      }
-    }
-  },
+  ...tseslint.configs.recommended,
 );
diff --git a/stage_1_snapshot/eslint.config.mjs b/stage_1_snapshot/eslint.config.mjs
@@ -3,21 +3,9 @@
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
 
-import {
-  projectDir,
-} from "#utilities/source/AsyncSpecModules.js";
-
 export default tseslint.config(
   eslint.configs.recommended,
-  ...tseslint.configs.recommendedTypeChecked,
-  {
-    languageOptions: {
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: projectDir
-      }
-    }
-  },
+  ...tseslint.configs.recommended,
   {
     "rules": {
       "@typescript-eslint/no-unused-vars": [

diff --git a/stage_2_generation/eslint.config.mjs b/stage_2_generation/eslint.config.mjs
@@ -3,19 +3,7 @@
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
 
-import {
-  projectDir,
-} from "#utilities/source/AsyncSpecModules.js";
-
 export default tseslint.config(
   eslint.configs.recommended,
-  ...tseslint.configs.recommendedTypeChecked,
-  {
-    languageOptions: {
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: projectDir
-      }
-    }
-  },
+  ...tseslint.configs.recommended,
 );
diff --git a/stage_2_integration/eslint.config.mjs b/stage_2_integration/eslint.config.mjs
@@ -3,19 +3,7 @@
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
 
-import {
-  projectDir,
-} from "#utilities/source/AsyncSpecModules.js";
-
 export default tseslint.config(
   eslint.configs.recommended,
-  ...tseslint.configs.recommendedTypeChecked,
-  {
-    languageOptions: {
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: projectDir
-      }
-    }
-  },
+  ...tseslint.configs.recommended,
 );
diff --git a/stage_2_snapshot/eslint.config.mjs b/stage_2_snapshot/eslint.config.mjs
@@ -3,21 +3,9 @@
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
 
-import {
-  projectDir,
-} from "#utilities/source/AsyncSpecModules.js";
-
 export default tseslint.config(
   eslint.configs.recommended,
-  ...tseslint.configs.recommendedTypeChecked,
-  {
-    languageOptions: {
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: projectDir
-      }
-    }
-  },
+  ...tseslint.configs.recommended,
   {
     "rules": {
       "@typescript-eslint/no-unused-vars": [

diff --git a/stage_3_generation/eslint.config.mjs b/stage_3_generation/eslint.config.mjs
@@ -3,19 +3,7 @@
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
 
-import {
-  projectDir,
-} from "#utilities/source/AsyncSpecModules.js";
-
 export default tseslint.config(
   eslint.configs.recommended,
-  ...tseslint.configs.recommendedTypeChecked,
-  {
-    languageOptions: {
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: projectDir
-      }
-    }
-  },
+  ...tseslint.configs.recommended,
 );
diff --git a/stage_3_integration/eslint.config.mjs b/stage_3_integration/eslint.config.mjs
@@ -3,19 +3,7 @@
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
 
-import {
-  projectDir,
-} from "#utilities/source/AsyncSpecModules.js";
-
 export default tseslint.config(
   eslint.configs.recommended,
-  ...tseslint.configs.recommendedTypeChecked,
-  {
-    languageOptions: {
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: projectDir
-      }
-    }
-  },
+  ...tseslint.configs.recommended,
 );
diff --git a/stage_3_snapshot/eslint.config.mjs b/stage_3_snapshot/eslint.config.mjs
@@ -3,19 +3,7 @@
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
 
-import {
-  projectDir,
-} from "#utilities/source/AsyncSpecModules.js";
-
 export default tseslint.config(
   eslint.configs.recommended,
-  ...tseslint.configs.recommendedTypeChecked,
-  {
-    languageOptions: {
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: projectDir
-      }
-    }
-  },
+  ...tseslint.configs.recommended,
 );
diff --git a/use-cases/eslint.config.mjs b/use-cases/eslint.config.mjs
@@ -3,19 +3,7 @@
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
 
-import {
-  projectDir,
-} from "#utilities/source/AsyncSpecModules.js";
-
 export default tseslint.config(
   eslint.configs.recommended,
-  ...tseslint.configs.recommendedTypeChecked,
-  {
-    languageOptions: {
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: projectDir
-      }
-    }
-  },
+  ...tseslint.configs.recommended,
 );
diff --git a/utilities/eslint.config.mjs b/utilities/eslint.config.mjs
@@ -3,20 +3,8 @@
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
 
-import {
-  projectDir,
-} from "#utilities/source/AsyncSpecModules.js";
-
 export default tseslint.config(
   eslint.configs.recommended,
-  ...tseslint.configs.recommendedTypeChecked,
-  {
-    languageOptions: {
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: projectDir
-      }
-    }
-  },
+  ...tseslint.configs.recommended,
   //...tseslint.configs.strict,
 );
diff --git a/utilities/spec/AwaitedMap.ts b/utilities/spec/AwaitedMap.ts
@@ -4,17 +4,16 @@ import AwaitedMap, {
 
 describe("AwaitedMap", () => {
   it(".allSettled() converts promises to promise-settled results", async () => {
-    const rejectTwoError = new Error("reject two");
     const map = new AwaitedMap<string, number>([
       ["one", Promise.resolve(1)],
-      ["two", Promise.reject(rejectTwoError)],
+      ["two", Promise.reject("reject two")],
     ]);
 
     const results = await map.allSettled();
     const entries = Array.from(results.entries());
     expect(entries).toEqual([
       ["one", { status: "fulfilled", value: 1}],
-      ["two", { status: "rejected", reason: rejectTwoError}],
+      ["two", { status: "rejected", reason: "reject two"}],
     ]);
   });
 
@@ -34,12 +33,10 @@ describe("AwaitedMap", () => {
   });
 
   it(".allResolved() rejects with an AwaitedMapError for all errors that failed", async () => {
-    const rejectOneError = new Error("reject one");
-    const rejectThreeError = new Error("reject three");
     const map = new AwaitedMap<string, number>([
-      ["one", Promise.reject(rejectOneError)],
+      ["one", Promise.reject("reject one")],
       ["two", Promise.resolve(2)],
-      ["three", Promise.reject(rejectThreeError)],
+      ["three", Promise.reject("reject three")],
     ]);
 
     await expectAsync(map.allResolved()).toBeRejectedWithError(AwaitedMapError);
@@ -51,8 +48,8 @@ describe("AwaitedMap", () => {
         (ex as AwaitedMapError<string>).errorMap.entries()
       );
       expect(entries).toEqual([
-        ["one", rejectOneError],
-        ["three", rejectThreeError],
+        ["one", "reject one"],
+        ["three", "reject three"],
       ]);
     }
   });

diff --git a/utilities/spec/BuildPromise.ts b/utilities/spec/BuildPromise.ts
@@ -13,7 +13,6 @@ describe("BuildPromise.mts: ", () => {
     if (willResolve)
       spy.and.returnValue(Promise.resolve(value));
     else
-      //eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
       spy.and.returnValue(Promise.reject(value));
     return spy;
   }

diff --git a/utilities/spec/PromiseTypes/SingletonPromise.ts b/utilities/spec/PromiseTypes/SingletonPromise.ts
@@ -17,7 +17,7 @@ describe("PromiseTypes.SingletonPromise", () => {
   });
 
   it("rejects with the error we passed in", async () => {
-    const expected = new Error("rejection");
+    const expected = {};
     const spy = jasmine.createSpy();
     spy.and.returnValue(Promise.reject(expected));
     const x = new SingletonPromise<object>(spy);