From 48115c618ca20f952fb510d115cf5d21cda709fa Mon Sep 17 00:00:00 2001
From: GZolla <43836485+GZolla@users.noreply.github.com>
Date: Tue, 5 Nov 2024 15:28:39 -0800
Subject: [PATCH 1/2] fix: Update to eslint9

---
 .eslintrc.json      |  3 ---
 eslint.config.mjs   | 23 +++++++++++++++++++++++
 package.json        |  9 ++++++---
 test/.eslintrc.json |  3 ---
 4 files changed, 29 insertions(+), 9 deletions(-)
 delete mode 100644 .eslintrc.json
 create mode 100644 eslint.config.mjs
 delete mode 100644 test/.eslintrc.json

diff --git a/.eslintrc.json b/.eslintrc.json
deleted file mode 100644
index d5cc9f3..0000000
--- a/.eslintrc.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "brightspace/lit-config"
-}
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 0000000..97f839c
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,23 @@
+import { fileURLToPath } from 'node:url';
+import { FlatCompat } from '@eslint/eslintrc';
+import { includeIgnoreFile } from '@eslint/compat';
+import js from '@eslint/js';
+import path from 'node:path';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+	baseDirectory: __dirname,
+	recommendedConfig: js.configs.recommended,
+	allConfig: js.configs.all
+});
+const gitignorePath = path.resolve(__dirname, '.gitignore');
+
+export default [
+	includeIgnoreFile(gitignorePath),
+	...compat.extends('brightspace/lit-config'),
+	...compat.extends('brightspace/testing-config').map(config => ({
+		...config,
+		files: ['test/**/*'],
+	})),
+];
diff --git a/package.json b/package.json
index aab6251..536ceaa 100644
--- a/package.json
+++ b/package.json
@@ -18,8 +18,11 @@
   "devDependencies": {
     "@babel/core": "^7",
     "@brightspace-ui/testing": "^1",
-    "eslint": "^8",
-    "eslint-config-brightspace": "^1.0",
-    "sinon": "^19"
+    "eslint": "^9",
+    "eslint-config-brightspace": "^1.2.1",
+    "sinon": "^19",
+    "@eslint/compat": "^1",
+    "@eslint/eslintrc": "^3",
+    "@eslint/js": "^9"
   }
 }
diff --git a/test/.eslintrc.json b/test/.eslintrc.json
deleted file mode 100644
index 9c6a0b6..0000000
--- a/test/.eslintrc.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"extends": "brightspace/testing-config"
-}

From 66a23d979471c6e59a244d01b1cae1853aad9167 Mon Sep 17 00:00:00 2001
From: GZolla <43836485+GZolla@users.noreply.github.com>
Date: Mon, 25 Nov 2024 11:15:34 -0800
Subject: [PATCH 2/2] Use updated shared configs

---
 eslint.config.mjs | 30 +++++++-----------------------
 package.json      |  7 ++-----
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index 97f839c..b7109a0 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -1,23 +1,7 @@
-import { fileURLToPath } from 'node:url';
-import { FlatCompat } from '@eslint/eslintrc';
-import { includeIgnoreFile } from '@eslint/compat';
-import js from '@eslint/js';
-import path from 'node:path';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const compat = new FlatCompat({
-	baseDirectory: __dirname,
-	recommendedConfig: js.configs.recommended,
-	allConfig: js.configs.all
-});
-const gitignorePath = path.resolve(__dirname, '.gitignore');
-
-export default [
-	includeIgnoreFile(gitignorePath),
-	...compat.extends('brightspace/lit-config'),
-	...compat.extends('brightspace/testing-config').map(config => ({
-		...config,
-		files: ['test/**/*'],
-	})),
-];
+import { litConfig, setDirectoryConfigs, testingConfig } from 'eslint-config-brightspace';
+export default setDirectoryConfigs(
+	litConfig,
+	{
+		test: testingConfig
+	}
+);
diff --git a/package.json b/package.json
index 536ceaa..195be00 100644
--- a/package.json
+++ b/package.json
@@ -19,10 +19,7 @@
     "@babel/core": "^7",
     "@brightspace-ui/testing": "^1",
     "eslint": "^9",
-    "eslint-config-brightspace": "^1.2.1",
-    "sinon": "^19",
-    "@eslint/compat": "^1",
-    "@eslint/eslintrc": "^3",
-    "@eslint/js": "^9"
+    "eslint-config-brightspace": "^2",
+    "sinon": "^19"
   }
 }