diff --git a/.eslintrc.js b/.eslintrc.js
deleted file mode 100644
index b223c19..0000000
--- a/.eslintrc.js
+++ /dev/null
@@ -1,20 +0,0 @@
-module.exports = {
-    'env': {
-        'browser': true,
-        'es2021': true
-    },
-    'extends': [
-        'eslint:recommended',
-    ],
-    'parserOptions': {
-        'ecmaVersion': 12,
-        'sourceType': 'module'
-    },
-    'rules': {
-        'eol-last': ['error', 'always'],
-        'indent': ['error', 4],
-        'no-multi-spaces': ['error'],
-        'quotes': ['error', 'single'],
-        'semi': ['error', 'always', { 'omitLastInOneLineBlock': true }],
-    }
-};
diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml
index d848b37..31dbedf 100644
--- a/.github/workflows/test-suite.yaml
+++ b/.github/workflows/test-suite.yaml
@@ -24,7 +24,7 @@ jobs:
         run: npm run build --verbose
 
       - name: Lint JavaScript Files
-        run: npx eslint app/resources/js/**/*.js
+        run: npx eslint app/resources/js/
 
   coding-standards:
     name: Coding Standards
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 0000000..be190fa
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,26 @@
+import globals from 'globals';
+import js from '@eslint/js';
+
+export default [
+    js.configs.recommended,
+    {
+        files: ['**/*.js'],
+        languageOptions: {
+            ecmaVersion: 12,
+            sourceType: 'module',
+            globals: {
+                ...globals.amd,
+                ...globals.browser,
+                ...globals.commonjs,
+                ...globals.es2021,
+            }
+        },
+        'rules': {
+            'eol-last': ['error', 'always'],
+            'indent': ['error', 4],
+            'no-multi-spaces': ['error'],
+            'quotes': ['error', 'single'],
+            'semi': ['error', 'always', { 'omitLastInOneLineBlock': true }],
+        }
+    }
+];