Merge pull request #810 from eliashaeussler/renovate/eslint-9.x

eliashaeussler · Aug 1, 2024 · 5160252 · 5160252
2 parents f570783 + 951ef65
commit 5160252
Show file tree

Hide file tree

Showing 10 changed files with 13,534 additions and 6,849 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.github/workflows/cgl.yaml b/.github/workflows/cgl.yaml
@@ -27,7 +27,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: 'yarn'
+          cache: 'npm'
 
       # Validation
       - name: Validate composer.json
@@ -37,31 +37,31 @@ jobs:
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
       - name: Install node modules
-        run: yarn --frozen-lockfile
+        run: npm ci
 
       # Audit packages
       - name: Audit Composer dependencies
         run: composer audit
       - name: Audit Frontend dependencies
-        run: yarn audit
+        run: npm audit
 
       # Check dependencies
       - name: Check dependencies
         run: composer-require-checker check
       - name: Check for unused Composer dependencies
         run: composer-unused --excludePackage=symfony/css-selector
       - name: Check for unused Frontend dependencies
-        run: yarn check-dependencies
+        run: npm run check-dependencies
 
       # Linting
       - name: Lint composer.json
         run: composer lint:composer
       - name: Lint PHP
         run: composer lint:php
       - name: Lint CSS
-        run: yarn lint:css
+        run: npm run lint:css
       - name: Lint JavaScript
-        run: yarn lint:js
+        run: npm run lint:js
 
       # SCA
       - name: SCA PHP

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -31,25 +31,25 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: 'yarn'
+          cache: 'npm'
 
       # Install dependencies
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
         with:
           composer-options: --no-dev --optimize-autoloader
       - name: Install node modules
-        run: yarn --frozen-lockfile
+        run: npm ci
 
       # Audit packages
       - name: Audit Composer dependencies
         run: composer audit
       - name: Audit Frontend dependencies
-        run: yarn audit
+        run: npm audit
 
       # Build Frontend
       - name: Build Frontend dist files
-        run: yarn build
+        run: npm run build
 
       # Deploy to production
       - name: Deploy
@@ -86,19 +86,19 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          cache: 'yarn'
+          cache: 'npm'
 
       # Install dependencies
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
         with:
           composer-options: --no-dev --optimize-autoloader
       - name: Install node modules
-        run: yarn --frozen-lockfile
+        run: npm ci
 
       # Build Frontend
       - name: Build Frontend dist files
-        run: yarn build
+        run: npm run build
 
       # Deploy to production
       - name: Deploy

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -28,17 +28,17 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: 'yarn'
+          cache: 'npm'
 
       # Install dependencies
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
       - name: Install node modules
-        run: yarn --frozen-lockfile
+        run: npm ci
 
       # Build Frontend assets (necessary for application tests)
       - name: Build Frontend assets
-        run: yarn build
+        run: npm run build
 
       # Run tests
       - name: Build coverage directory

diff --git a/assets/js/badge/codeTabs.js b/assets/js/badge/codeTabs.js
@@ -24,6 +24,8 @@
  * @license GPL-3.0-or-later
  */
 export default class CodeTabs {
+  ARIA_SELECTED = 'aria-selected';
+
   static observer;
 
   static currentLanguage;
@@ -46,7 +48,7 @@ export default class CodeTabs {
 
     // Observe all tab sync triggers
     [...syncTriggers].forEach((trigger) => {
-      CodeTabs.observer.observe(trigger, { attributeFilter: ['aria-selected'] });
+      CodeTabs.observer.observe(trigger, { attributeFilter: [self.ARIA_SELECTED] });
     });
   }
 
@@ -68,8 +70,8 @@ export default class CodeTabs {
 
     // Early return if mutation is unsupported
     if (mutation.type !== 'attributes'
-      || mutation.attributeName !== 'aria-selected'
-      || target.getAttribute('aria-selected') !== 'true'
+      || mutation.attributeName !== self.ARIA_SELECTED
+      || target.getAttribute(self.ARIA_SELECTED) !== 'true'
     ) {
       return;
     }

diff --git a/deploy.php b/deploy.php
@@ -44,13 +44,13 @@
         '/.depcheckrc.json',
         '/.editorconfig',
         '/.env.test',
-        '/.eslintrc.js',
         '/.gitattributes',
         '/.gitignore',
         '/.php-cs-fixer.dist.php',
         '.stylelintrc.json',
         'CODEOWNERS',
         'deploy.php',
+        'eslint.config.js',
         'phpstan.php',
         'phpunit.xml',
         'postcss.config.js',

diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,19 @@
+const globals = require('globals');
+const js = require('@eslint/js');
+const sonarjs = require('eslint-plugin-sonarjs');
+
+module.exports = [
+  js.configs.recommended,
+  sonarjs.configs.recommended,
+  {
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+      },
+      parserOptions: {
+        ecmaVersion: 13,
+        sourceType: 'module',
+      },
+    },
+  },
+];