Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools: update ESLint from 7.2.0 to 7.3.0 #34000

Closed
wants to merge 0 commits into from
Closed

Conversation

Trott
Copy link
Member

@Trott Trott commented Jun 21, 2020

Lots of files changed this time, but it's mostly deletions.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines

@nodejs-github-bot nodejs-github-bot added the tools Issues and PRs related to the tools directory. label Jun 21, 2020
Copy link
Member

@ZYSzys ZYSzys left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RSLGTM

@Trott Trott added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Jun 21, 2020
Copy link
Member

@trivikr trivikr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RSLGTM

@ZYSzys
Copy link
Member

ZYSzys commented Jun 23, 2020

Since we are here, I've noted that eslint v7.3.1 was just released, maybe update to v7.3.1 directly.

@Trott
Copy link
Member Author

Trott commented Jun 23, 2020

Since we are here, I've noted that eslint v7.3.1 was just released, maybe update to v7.3.1 directly.

The entire diff between 7.3.1 and 7.3.0 is below. No dependencies changed. I think it's OK to update this branch for 7.3.1 and land.

diff --git a/tools/node_modules/eslint/lib/cli-engine/config-array-factory.js b/tools/node_modules/eslint/lib/cli-engine/config-array-factory.js
index 6d0992151a..39f62bb6da 100644
--- a/tools/node_modules/eslint/lib/cli-engine/config-array-factory.js
+++ b/tools/node_modules/eslint/lib/cli-engine/config-array-factory.js
@@ -722,7 +722,12 @@ class ConfigArrayFactory {
          *
          * Refer https://github.com/eslint/eslint/issues/12592
          */
-        const clonedRulesConfig = rules && JSON.parse(JSON.stringify((rules)));
+        const clonedRulesConfig = rules && JSON.parse(
+            JSON.stringify(
+                rules,
+                (key, value) => (value === Infinity ? Number.MAX_SAFE_INTEGER : value)
+            )
+        );
 
         // Flatten `extends`.
         for (const extendName of extendList.filter(Boolean)) {
diff --git a/tools/node_modules/eslint/package.json b/tools/node_modules/eslint/package.json
index ab91e08db2..8f7acd95eb 100644
--- a/tools/node_modules/eslint/package.json
+++ b/tools/node_modules/eslint/package.json
@@ -153,5 +153,5 @@
     "test:cli": "mocha",
     "webpack": "node Makefile.js webpack"
   },
-  "version": "7.3.0"
+  "version": "7.3.1"
 }
\ No newline at end of file

Trott added a commit that referenced this pull request Jun 23, 2020
PR-URL: #34000
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Trott added a commit that referenced this pull request Jun 23, 2020
PR-URL: #34000
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
@Trott
Copy link
Member Author

Trott commented Jun 23, 2020

Landed in db0e991...076e4ed

@Trott Trott closed this Jun 23, 2020
@Trott Trott deleted the eslint-7.3.0 branch June 23, 2020 12:25
@codebytere
Copy link
Member

@Trott for some reason removing the comment in that test file fails on v14.x:

node on git:v14.x-staging ❯ make lint                                         11:22AM
Running JS linter...

/Users/codebytere/Developer/node/test/known_issues/test-crypto-authenticated-stream.js
  5:16  error  Please add a hasCrypto check to allow this test to be skipped when Node is built "--without-ssl"  node-core/crypto-check

✖ 1 problem (1 error, 0 warnings)

make[1]: *** [lint-js] Error 1
make[1]: Nothing to be done for `lint-cpp'.
make[1]: Nothing to be done for `lint-addon-docs'.
make[1]: Nothing to be done for `lint-md'.
make: *** [lint] Error 2

Any idea what might be up?

@addaleax
Copy link
Member

@codebytere Have you tried to backport #33981? That is the PR for which that error has been fixed on master.

@codebytere
Copy link
Member

@addaleax ah gotcha - that one'll need a manual backport (just requested one) so i'll mark these blocked on that for now!

@targos targos added dont-land-on-v14.x and removed author ready PRs that have at least one approval, no pending requests for changes, and a CI started. backport-blocked-v14.x labels Apr 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tools Issues and PRs related to the tools directory.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants