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

[backport v6.x] tools: update ESLint to 4.2.0 #14859

Merged
merged 0 commits into from
Aug 16, 2017

Conversation

Trott
Copy link
Member

@Trott Trott commented Aug 16, 2017

@MylesBorins Hopefully you can swap this in for 80029b4 and then the rest of the commits that are already on v6.x-staging will unroll over it nicely?

ESLint 4.2.0 contains a fix for a bug that is blocking us from moving to
the non-legacy stricter indentation linting. Update to 4.2.0 to remove
the blocking issue.

PR-URL: #14155
Ref: eslint/eslint#8882
Ref:://github.com/eslint/eslint/pull/8885
Reviewed-By: Colin Ihrig cjihrig@gmail.com
Reviewed-By: Michaël Zasso targos@protonmail.com
Reviewed-By: Gibson Fahnestock gibfahn@gmail.com
Reviewed-By: Refael Ackermann refack@gmail.com

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines
Affected core subsystem(s)

@nodejs-github-bot nodejs-github-bot added tools Issues and PRs related to the tools directory. v6.x labels Aug 16, 2017
@Trott Trott mentioned this pull request Aug 16, 2017
@aqrln
Copy link
Contributor

aqrln commented Aug 16, 2017

Missing " https" in the third line of metadata in the commit message:

Ref:://github.com/eslint/eslint/pull/8885

@Trott
Copy link
Member Author

Trott commented Aug 16, 2017

Thanks, @aqrln! Copy/paste error fixed.

And just in case anyone is noticing all the conflicts: This should apply to 3bd0c7c, not to HEAD of the v6.x-staging branch.

@MylesBorins
Copy link
Contributor

MylesBorins commented Aug 16, 2017 via email

@Trott
Copy link
Member Author

Trott commented Aug 16, 2017

Hey @Trott. What is the difference between this backport and the version I
landed?

Not sure. Version you landed was a cherry-pick from master, I imagine. For whatever reason, make jslint fails after that gets cherry-picked over to v6.x-staging.

For this, I rewound to the immediately prior commit on v6.x-staging and updated manually to ESLint 4.2.0 and...oh I see I downgraded the markdown plugin linter from 1.0.0-beta.7 to 1.0.0-beta.4. Maybe that was the problem? Maybe the commit you cherry-picked has to land before the commit that updates the markdown plugin linter to 1.0.0-beta.7 (e5ca046)?

@MylesBorins MylesBorins merged commit 54ec97f into nodejs:v6.x-staging Aug 16, 2017
MylesBorins pushed a commit that referenced this pull request Aug 16, 2017
ESLint 4.2.0 contains a fix for a bug that is blocking us from moving to
the non-legacy stricter indentation linting. Update to 4.2.0 to remove
the blocking issue.

Backport-PR-URL: #14859
PR-URL: #14155
Ref: eslint/eslint#8882
Ref: eslint/eslint#8885
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@MylesBorins
Copy link
Contributor

landed 1

MylesBorins pushed a commit that referenced this pull request Sep 5, 2017
ESLint 4.2.0 contains a fix for a bug that is blocking us from moving to
the non-legacy stricter indentation linting. Update to 4.2.0 to remove
the blocking issue.

Backport-PR-URL: #14859
PR-URL: #14155
Ref: eslint/eslint#8882
Ref: eslint/eslint#8885
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
@Trott Trott deleted the backport-14155 branch January 13, 2022 22:46
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.

4 participants