From 09b071500ba6944c538b30f4c84dcd54154ff457 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 13 Jan 2022 14:26:23 -0800 Subject: [PATCH 1/6] tools: remove ESLint max-len rule Refs: https://github.com/nodejs/node/pull/41463#issuecomment-1010286737 Refs: https://github.com/nodejs/node/pull/41463#issuecomment-1012523009 --- .eslintrc.js | 11 ----------- test/es-module/test-esm-import-assertion-2.mjs | 2 +- test/parallel/test-http2-binding.js | 2 +- test/parallel/test-policy-integrity-flag.js | 2 +- test/parallel/test-readline-keys.js | 4 ++-- test/parallel/test-url-parse-format.js | 2 +- test/parallel/test-util-inspect.js | 4 ++-- 7 files changed, 8 insertions(+), 19 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 5f1d0894373cae..e8817fc1ab3da9 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -123,7 +123,6 @@ module.exports = { line: { // Ignore all lines that have less characters than 20 and all lines that // start with something that looks like a variable name or code. - // eslint-disable-next-line max-len ignorePattern: '.{0,20}$|[a-z]+ ?[0-9A-Z_.(/=:[#-]|std|http|ssh|ftp|(let|var|const) [a-z_A-Z0-9]+ =|[b-z] |[a-z]*[0-9].* ', ignoreInlineComments: true, ignoreConsecutiveComments: true, @@ -165,14 +164,6 @@ module.exports = { 'key-spacing': ['error', { mode: 'strict' }], 'keyword-spacing': 'error', 'linebreak-style': ['error', 'unix'], - 'max-len': ['error', { - code: 80, - ignorePattern: '^// Flags:', - ignoreRegExpLiterals: true, - ignoreTemplateLiterals: true, - ignoreUrls: true, - tabWidth: 2, - }], 'new-parens': 'error', 'no-async-promise-executor': 'error', 'no-case-declarations': 'error', @@ -215,7 +206,6 @@ module.exports = { 'no-proto': 'error', 'no-redeclare': ['error', { 'builtinGlobals': false }], 'no-restricted-modules': ['error', 'sys'], - /* eslint-disable max-len */ 'no-restricted-properties': [ 'error', { @@ -268,7 +258,6 @@ module.exports = { message: 'Use Number.isNaN() instead of the global isNaN() function.', }, ], - /* eslint-enable max-len */ 'no-return-await': 'error', 'no-self-assign': 'error', 'no-self-compare': 'error', diff --git a/test/es-module/test-esm-import-assertion-2.mjs b/test/es-module/test-esm-import-assertion-2.mjs index 3598f353a3f9d5..5b5a29344a636b 100644 --- a/test/es-module/test-esm-import-assertion-2.mjs +++ b/test/es-module/test-esm-import-assertion-2.mjs @@ -2,7 +2,7 @@ import '../common/index.mjs'; import { strictEqual } from 'assert'; -// eslint-disable-next-line max-len + import secret from '../fixtures/experimental.json' assert { type: 'json', unsupportedAssertion: 'should ignore' }; strictEqual(secret.ofLife, 42); diff --git a/test/parallel/test-http2-binding.js b/test/parallel/test-http2-binding.js index e81a58dfe8a5c1..29f2901e85e6e0 100644 --- a/test/parallel/test-http2-binding.js +++ b/test/parallel/test-http2-binding.js @@ -107,7 +107,7 @@ const expectedHeaderNames = { HTTP2_HEADER_ACCEPT_LANGUAGE: 'accept-language', HTTP2_HEADER_ACCEPT_RANGES: 'accept-ranges', HTTP2_HEADER_ACCEPT: 'accept', - HTTP2_HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS: 'access-control-allow-credentials', // eslint-disable-line max-len + HTTP2_HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS: 'access-control-allow-credentials', HTTP2_HEADER_ACCESS_CONTROL_ALLOW_HEADERS: 'access-control-allow-headers', HTTP2_HEADER_ACCESS_CONTROL_ALLOW_METHODS: 'access-control-allow-methods', HTTP2_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN: 'access-control-allow-origin', diff --git a/test/parallel/test-policy-integrity-flag.js b/test/parallel/test-policy-integrity-flag.js index ddcd02236d27c0..07dafb556ae622 100644 --- a/test/parallel/test-policy-integrity-flag.js +++ b/test/parallel/test-policy-integrity-flag.js @@ -21,7 +21,7 @@ const emptySRI = `sha512-${emptyHash.digest('base64')}`; const policyHash = crypto.createHash('sha512'); policyHash.update(fs.readFileSync(depPolicy)); -/* eslint-disable max-len */ + // When using \n only const nixPolicySRI = 'sha512-u/nXI6UacK5fKDC2bopcgnuQY4JXJKlK3dESO3GIKKxwogVHjJqpF9rgk7Zw+TJXIc96xBUWKHuUgOzic8/4tQ=='; // When \n is turned into \r\n diff --git a/test/parallel/test-readline-keys.js b/test/parallel/test-readline-keys.js index 8ae0d680d5f039..564d614fa6eeeb 100644 --- a/test/parallel/test-readline-keys.js +++ b/test/parallel/test-readline-keys.js @@ -136,7 +136,7 @@ addTest('a\x1baA\x1bA', [ ]); // xterm/gnome ESC [ letter (with modifiers) -/* eslint-disable max-len */ + addTest('\x1b[2P\x1b[3P\x1b[4P\x1b[5P\x1b[6P\x1b[7P\x1b[8P\x1b[3Q\x1b[8Q\x1b[3R\x1b[8R\x1b[3S\x1b[8S', [ { name: 'f1', sequence: '\x1b[2P', code: '[P', shift: true, meta: false, ctrl: false }, { name: 'f1', sequence: '\x1b[3P', code: '[P', shift: false, meta: true, ctrl: false }, @@ -250,7 +250,7 @@ addTest('\x1b[A\x1b[B\x1b[2A\x1b[2B', [ ]); // `rxvt` keys with modifiers. -// eslint-disable-next-line max-len + addTest('\x1b[20~\x1b[2$\x1b[2^\x1b[3$\x1b[3^\x1b[5$\x1b[5^\x1b[6$\x1b[6^\x1b[7$\x1b[7^\x1b[8$\x1b[8^', [ { name: 'f9', sequence: '\x1b[20~', code: '[20~' }, { name: 'insert', sequence: '\x1b[2$', code: '[2$', shift: true }, diff --git a/test/parallel/test-url-parse-format.js b/test/parallel/test-url-parse-format.js index 4fce198624a6fc..e1cf80a2778abd 100644 --- a/test/parallel/test-url-parse-format.js +++ b/test/parallel/test-url-parse-format.js @@ -844,7 +844,7 @@ const parseTests = { hostname: 'a.b', hash: null, pathname: '/%09bc%0Adr%0Def%20g%22hq%27j%3Ckl%3E', - path: '/%09bc%0Adr%0Def%20g%22hq%27j%3Ckl%3E?mn%5Cop%5Eq=r%6099%7Bst%7Cuv%7Dwz', // eslint-disable-line max-len + path: '/%09bc%0Adr%0Def%20g%22hq%27j%3Ckl%3E?mn%5Cop%5Eq=r%6099%7Bst%7Cuv%7Dwz', search: '?mn%5Cop%5Eq=r%6099%7Bst%7Cuv%7Dwz', query: 'mn%5Cop%5Eq=r%6099%7Bst%7Cuv%7Dwz', href: 'http://a.b/%09bc%0Adr%0Def%20g%22hq%27j%3Ckl%3E?mn%5Cop%5Eq=r%6099%7Bst%7Cuv%7Dwz' diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js index 34cc5cc56af48b..cb44242e6730aa 100644 --- a/test/parallel/test-util-inspect.js +++ b/test/parallel/test-util-inspect.js @@ -2689,7 +2689,7 @@ assert.strictEqual( expected = [ '[', - /* eslint-disable max-len */ + ' \u001b[33m0\u001b[39m, \u001b[33m1\u001b[39m, \u001b[33m2\u001b[39m, \u001b[33m3\u001b[39m,', ' \u001b[33m4\u001b[39m, \u001b[33m5\u001b[39m, \u001b[33m6\u001b[39m, \u001b[33m7\u001b[39m,', ' \u001b[33m8\u001b[39m, \u001b[33m9\u001b[39m, \u001b[33m10\u001b[39m, \u001b[33m11\u001b[39m,', @@ -3146,7 +3146,7 @@ assert.strictEqual( '[GeneratorFunction: generator] {\n' + ' [length]: 0,\n' + " [name]: 'generator',\n" + - " [prototype]: Object [Generator] { [Symbol(Symbol.toStringTag)]: 'Generator' },\n" + // eslint-disable-line max-len + " [prototype]: Object [Generator] { [Symbol(Symbol.toStringTag)]: 'Generator' },\n" + " [Symbol(Symbol.toStringTag)]: 'GeneratorFunction'\n" + '}' ); From 492fcae16d3e3413be677fea34a86315942ccdc9 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 13 Jan 2022 20:53:22 -0800 Subject: [PATCH 2/6] Update test/es-module/test-esm-import-assertion-2.mjs --- test/es-module/test-esm-import-assertion-2.mjs | 1 - 1 file changed, 1 deletion(-) diff --git a/test/es-module/test-esm-import-assertion-2.mjs b/test/es-module/test-esm-import-assertion-2.mjs index 5b5a29344a636b..70947fcf212d61 100644 --- a/test/es-module/test-esm-import-assertion-2.mjs +++ b/test/es-module/test-esm-import-assertion-2.mjs @@ -2,7 +2,6 @@ import '../common/index.mjs'; import { strictEqual } from 'assert'; - import secret from '../fixtures/experimental.json' assert { type: 'json', unsupportedAssertion: 'should ignore' }; strictEqual(secret.ofLife, 42); From d198466ede8a95082e15b750622c00597a8381c6 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 13 Jan 2022 20:53:53 -0800 Subject: [PATCH 3/6] Update test/parallel/test-policy-integrity-flag.js --- test/parallel/test-policy-integrity-flag.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/parallel/test-policy-integrity-flag.js b/test/parallel/test-policy-integrity-flag.js index 07dafb556ae622..0eb801c7e60aaa 100644 --- a/test/parallel/test-policy-integrity-flag.js +++ b/test/parallel/test-policy-integrity-flag.js @@ -21,7 +21,6 @@ const emptySRI = `sha512-${emptyHash.digest('base64')}`; const policyHash = crypto.createHash('sha512'); policyHash.update(fs.readFileSync(depPolicy)); - // When using \n only const nixPolicySRI = 'sha512-u/nXI6UacK5fKDC2bopcgnuQY4JXJKlK3dESO3GIKKxwogVHjJqpF9rgk7Zw+TJXIc96xBUWKHuUgOzic8/4tQ=='; // When \n is turned into \r\n From 69e4dbd0b322ab439171cbe0eb5a8e3c2d031117 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 13 Jan 2022 20:54:05 -0800 Subject: [PATCH 4/6] Update test/parallel/test-readline-keys.js --- test/parallel/test-readline-keys.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/parallel/test-readline-keys.js b/test/parallel/test-readline-keys.js index 564d614fa6eeeb..b89c125fdeda7f 100644 --- a/test/parallel/test-readline-keys.js +++ b/test/parallel/test-readline-keys.js @@ -136,7 +136,6 @@ addTest('a\x1baA\x1bA', [ ]); // xterm/gnome ESC [ letter (with modifiers) - addTest('\x1b[2P\x1b[3P\x1b[4P\x1b[5P\x1b[6P\x1b[7P\x1b[8P\x1b[3Q\x1b[8Q\x1b[3R\x1b[8R\x1b[3S\x1b[8S', [ { name: 'f1', sequence: '\x1b[2P', code: '[P', shift: true, meta: false, ctrl: false }, { name: 'f1', sequence: '\x1b[3P', code: '[P', shift: false, meta: true, ctrl: false }, From 94ae9396f932d76ae9732580e29be2fb30db7a25 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 13 Jan 2022 20:54:19 -0800 Subject: [PATCH 5/6] Update test/parallel/test-util-inspect.js --- test/parallel/test-util-inspect.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js index cb44242e6730aa..1dfb7cc61d3ab8 100644 --- a/test/parallel/test-util-inspect.js +++ b/test/parallel/test-util-inspect.js @@ -2689,7 +2689,6 @@ assert.strictEqual( expected = [ '[', - ' \u001b[33m0\u001b[39m, \u001b[33m1\u001b[39m, \u001b[33m2\u001b[39m, \u001b[33m3\u001b[39m,', ' \u001b[33m4\u001b[39m, \u001b[33m5\u001b[39m, \u001b[33m6\u001b[39m, \u001b[33m7\u001b[39m,', ' \u001b[33m8\u001b[39m, \u001b[33m9\u001b[39m, \u001b[33m10\u001b[39m, \u001b[33m11\u001b[39m,', From 286f92c5e35e638eface4095dae30da0f73fc51f Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 13 Jan 2022 20:54:58 -0800 Subject: [PATCH 6/6] Update test/parallel/test-readline-keys.js --- test/parallel/test-readline-keys.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/parallel/test-readline-keys.js b/test/parallel/test-readline-keys.js index b89c125fdeda7f..e2ae5bec50c0b6 100644 --- a/test/parallel/test-readline-keys.js +++ b/test/parallel/test-readline-keys.js @@ -249,7 +249,6 @@ addTest('\x1b[A\x1b[B\x1b[2A\x1b[2B', [ ]); // `rxvt` keys with modifiers. - addTest('\x1b[20~\x1b[2$\x1b[2^\x1b[3$\x1b[3^\x1b[5$\x1b[5^\x1b[6$\x1b[6^\x1b[7$\x1b[7^\x1b[8$\x1b[8^', [ { name: 'f9', sequence: '\x1b[20~', code: '[20~' }, { name: 'insert', sequence: '\x1b[2$', code: '[2$', shift: true },