chore: use eslint directly

nodejs · Nov 13, 2024 · 789dacc · 789dacc
1 parent cc2b8df
commit 789dacc
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 102 deletions.
diff --git a/package.json b/package.json
@@ -468,8 +468,8 @@
     "predev:incremental": "node-gyp configure build -C test --debug",
     "dev:incremental": "node test",
     "doc": "doxygen doc/Doxyfile",
-    "lint": "node tools/eslint-format && node tools/clang-format",
-    "lint:fix": "node tools/clang-format --fix && node tools/eslint-format --fix"
+    "lint": "eslint && node tools/clang-format",
+    "lint:fix": "eslint --fix && node tools/clang-format --fix"
   },
   "pre-commit": "lint",
   "version": "8.2.2",

diff --git a/test/array_buffer.js b/test/array_buffer.js
@@ -58,7 +58,7 @@ function test (binding) {
     'ArrayBuffer updates data pointer and length when detached',
     () => {
       // Detach the ArrayBuffer in JavaScript.
-      // eslint-disable-next-line no-undef
+
       const mem = new WebAssembly.Memory({ initial: 1 });
       binding.arraybuffer.checkDetachUpdatesData(mem.buffer, () => mem.grow(1));
 

diff --git a/test/async_context.js b/test/async_context.js
@@ -73,7 +73,7 @@ async function makeCallbackWithResource (binding) {
         {
           eventName: 'init',
           type: 'async_context_test',
-          triggerAsyncId: triggerAsyncId,
+          triggerAsyncId,
           resource: { foo: 'foo' }
         },
         { eventName: 'before' },
@@ -95,7 +95,7 @@ async function makeCallbackWithoutResource (binding) {
         {
           eventName: 'init',
           type: 'async_context_no_res_test',
-          triggerAsyncId: triggerAsyncId,
+          triggerAsyncId,
           resource: { }
         },
         { eventName: 'before' },

diff --git a/test/async_progress_queue_worker.js b/test/async_progress_queue_worker.js
@@ -42,7 +42,7 @@ async function asyncProgressWorkerCallbackOverloads (bindingFunction) {
         {
           eventName: 'init',
           type: 'cbResources',
-          triggerAsyncId: triggerAsyncId,
+          triggerAsyncId,
           resource: {}
         },
         { eventName: 'before' },
@@ -90,7 +90,7 @@ async function asyncProgressWorkerRecvOverloads (bindingFunction) {
           {
             eventName: 'init',
             type: asyncResName,
-            triggerAsyncId: triggerAsyncId,
+            triggerAsyncId,
             resource: asyncResObject
           },
           { eventName: 'before' },
@@ -131,7 +131,7 @@ async function asyncProgressWorkerNoCbOverloads (bindingFunction) {
           {
             eventName: 'init',
             type: asyncResName,
-            triggerAsyncId: triggerAsyncId,
+            triggerAsyncId,
             resource: asyncResObject
           },
           { eventName: 'before' },

diff --git a/test/async_progress_worker.js b/test/async_progress_worker.js
@@ -44,7 +44,7 @@ async function asyncProgressWorkerCallbackOverloads (bindingFunction) {
         {
           eventName: 'init',
           type: 'cbResources',
-          triggerAsyncId: triggerAsyncId,
+          triggerAsyncId,
           resource: {}
         },
         { eventName: 'before' },
@@ -92,7 +92,7 @@ async function asyncProgressWorkerRecvOverloads (bindingFunction) {
           {
             eventName: 'init',
             type: asyncResName,
-            triggerAsyncId: triggerAsyncId,
+            triggerAsyncId,
             resource: asyncResObject
           },
           { eventName: 'before' },
@@ -133,7 +133,7 @@ async function asyncProgressWorkerNoCbOverloads (bindingFunction) {
           {
             eventName: 'init',
             type: asyncResName,
-            triggerAsyncId: triggerAsyncId,
+            triggerAsyncId,
             resource: asyncResObject
           },
           { eventName: 'before' },

diff --git a/test/async_worker.js b/test/async_worker.js
@@ -139,7 +139,7 @@ async function test (binding) {
         {
           eventName: 'init',
           type: 'TestResource',
-          triggerAsyncId: triggerAsyncId,
+          triggerAsyncId,
           resource: { foo: 'fooBar' }
         },
         { eventName: 'before' },
@@ -167,7 +167,7 @@ async function test (binding) {
         {
           eventName: 'init',
           type: 'TestResource',
-          triggerAsyncId: triggerAsyncId,
+          triggerAsyncId,
           resource: { }
         },
         { eventName: 'before' },
@@ -194,7 +194,7 @@ async function test (binding) {
         {
           eventName: 'init',
           type: 'TestResource',
-          triggerAsyncId: triggerAsyncId,
+          triggerAsyncId,
           resource: { foo: 'foo' }
         },
         { eventName: 'before' },
@@ -224,7 +224,7 @@ async function test (binding) {
         {
           eventName: 'init',
           type: 'TestResource',
-          triggerAsyncId: triggerAsyncId,
+          triggerAsyncId,
           resource: { foo: 'foo' }
         },
         { eventName: 'before' },
@@ -252,7 +252,7 @@ async function test (binding) {
         {
           eventName: 'init',
           type: 'TestResource',
-          triggerAsyncId: triggerAsyncId,
+          triggerAsyncId,
           resource: { foo: 'foo' }
         },
         { eventName: 'before' },

diff --git a/test/function.js b/test/function.js
@@ -18,7 +18,7 @@ function test (binding) {
 
   assert.deepStrictEqual(binding.valueCallback(), { foo: 'bar' });
 
-  /* eslint-disable-next-line no-new, new-cap */
+  /* eslint-disable-next-line new-cap */
   assert.strictEqual(new binding.newTargetCallback(), binding.newTargetCallback);
   assert.strictEqual(binding.newTargetCallback(), undefined);
 

diff --git a/test/function_reference.js b/test/function_reference.js
@@ -95,7 +95,7 @@ async function canCallAsyncFunctionWithDifferentOverloads (binding) {
     {
       eventName: 'init',
       type: 'func_ref_resources',
-      triggerAsyncId: triggerAsyncId,
+      triggerAsyncId,
       resource: {}
     },
     { eventName: 'before' },
@@ -113,7 +113,7 @@ async function canCallAsyncFunctionWithDifferentOverloads (binding) {
     {
       eventName: 'init',
       type: 'func_ref_resources',
-      triggerAsyncId: triggerAsyncId,
+      triggerAsyncId,
       resource: {}
     },
     { eventName: 'before' },

diff --git a/test/type_taggable.js b/test/type_taggable.js
@@ -53,8 +53,7 @@ function testTypeTaggable ({ typeTaggedInstance, checkTypeTag }) {
   assert.strictEqual(checkTypeTag(4, obj3), false);
 }
 
-// eslint-disable-next-line camelcase
-function test ({ type_taggable }) {
-  testTypeTaggable(type_taggable.external);
-  testTypeTaggable(type_taggable.object);
+function test (binding) {
+  testTypeTaggable(binding.type_taggable.external);
+  testTypeTaggable(binding.type_taggable.object);
 }
diff --git a/tools/eslint-format.js b/tools/eslint-format.js