Update to our global eslint and other dependencies (#274)

* Update to our global eslint

* Ignore node modules

* Update lock

* Update to node 20

* Update package log

* Use node 22

* Update node actions

* Update dependabot to update actions

Author: jonathanKingston

.eslintignore

@@ -11,3 +11,10 @@ updates:
         eslint:
             patterns:
                 - 'eslint*'
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+        interval: 'weekly'
+    target-branch: 'main'
+    labels:
+        - 'dependencies'

.eslintrc

@@ -14,17 +14,12 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-version: [16]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+    - uses: actions/checkout@v4
+    - name: Use Node.js
+      uses: actions/setup-node@v4
       with:
-        node-version: ${{ matrix.node-version }}
+        node-version-file: '.nvmrc'
     - run: npm ci --ignore-scripts
     - run: npm run build --if-present
     - run: npm test

.github/dependabot.yml

@@ -1 +1 @@
-16
+22

.github/workflows/node.js.yml

@@ -6,7 +6,7 @@ function fireConvertPingStatus (status) {
     window.dispatchEvent(new CustomEvent('resourceLoad', {
         detail: {
             url: pixelUrl.href,
-            status: status
+            status
         }
     }));
 }

.nvmrc

@@ -32,7 +32,7 @@ function getAdUrl (id, hostname) {
     adUrl.searchParams.append('ID', id)
 
     if (customRedirect) {
-        adUrl.searchParams.append('customRedirect', ads[id]['customRedirect']);
+        adUrl.searchParams.append('customRedirect', ads[id].customRedirect);
     }
 
     // Build Search Redirection URL
@@ -72,7 +72,7 @@ function getAdUrl (id, hostname) {
     }
 
     if (customRedirect) {
-        searchUrl.searchParams.append('customRedirect', ads[id]['customRedirect']);
+        searchUrl.searchParams.append('customRedirect', ads[id].customRedirect);
     }
 
     // normal URLs use a different param, but we use 'u' here to avoid conflict with other params.
@@ -264,6 +264,7 @@ export function initializeBoilerplate () {
     const convertPixelUrl = new URL('/ping.gif', convertScriptUrl);
     const trackingPixelUrl = new URL('/ping.gif', trackingScriptUrl);
 
+    // eslint-disable-next-line no-new
     new FinishObserver([
         {
             url: convertScriptUrl,
@@ -332,7 +333,7 @@ export class FinishObserver {
         for (const resource of resources) {
             addUnique(resource.url);
             if (resource.subresources) {
-                resource.subresources.every(subresource => {
+                resource.subresources.forEach(subresource => {
                     addUnique(subresource.url);
                     if ('subresources' in subresource) {
                         throw new Error('Child subresources are not supported');
@@ -344,7 +345,7 @@ export class FinishObserver {
 
         this.observer = new PerformanceObserver((list) => {
             const entries = list.getEntries();
-            entries.map((entry) => {
+            entries.forEach((entry) => {
                 // WebKit doesn't seem to support serverTiming for cross-origin loads
                 if (entry.serverTiming && !isSafariOrDDG()) {
                     if (entry.serverTiming.length === 0) {

adClickFlow/ad/convert.js

@@ -0,0 +1,52 @@
+import globals from 'globals';
+import ddgConfig from '@duckduckgo/eslint-config';
+import html from "@html-eslint/eslint-plugin";
+
+const htmlRulesToDisable = Object.fromEntries(
+    ddgConfig.flatMap(config => Object.keys(config.rules).map(rule => [rule, "off"]))
+);
+
+export default [
+    {
+        ignores: [
+            "privacy-protections/fingerprinting/helpers/diff.js",
+            "node_modules/",
+        ]
+    },
+    ...ddgConfig,
+    {
+        files: ["**/*.html"],
+        plugins: {
+            html,
+        },
+        language: "html/html",
+        rules: {
+            ...htmlRulesToDisable
+        }
+    },
+    {
+        files: [
+            "helpers/idb-wrapper.js",
+            "privacy-protections/storage-partitioning/helpers/common.js",
+            "privacy-protections/storage-partitioning/helpers/tests.js",
+            "privacy-protections/fingerprinting/helpers/constants.js",
+            "privacy-protections/storage-blocking/helpers/commonTests.js",
+            "privacy-protections/storage-blocking/helpers/globals.js",
+            "privacy-protections/fingerprinting/main.js",
+            "privacy-protections/fingerprinting/helpers/canvas.js"
+        ],
+        languageOptions: {
+            sourceType: "script",
+        },
+    },
+    {
+        languageOptions: {
+            globals: {
+                ...globals.commonjs,
+                ...globals.browser,
+                ...globals.jasmine,
+                ...globals.node,
+            },
+        },
+    }
+];