Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

update eslint's comma-dangle rule to always-multiline. #830

Merged
merged 2 commits into from
Feb 21, 2018

Conversation

lieut-data
Copy link
Member

Summary

update eslint's comma-dangle rule to always-multiline.

This includes the output of invoking yarn fix to fix everything. No
other changes are included.

Checklist

  • Ran make check-style to check for style errors (required for all pull requests)
  • Ran make test to ensure unit and component tests passed

@@ -45,7 +45,7 @@
"camelcase": [2, {"properties": "never"}],
"capitalized-comments": 0,
"class-methods-use-this": 0,
"comma-dangle": [2, "never"],
"comma-dangle": [2, "always-multiline"],
Copy link
Member Author

Choose a reason for hiding this comment

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

This is the only change of significance.

@lieut-data lieut-data added the Do Not Merge Should not be merged until this label is removed label Feb 16, 2018
@lieut-data
Copy link
Member Author

As part of this, I'm investigating the best way to streamline rebases for feature branches. Once I have a plan for that, I'll post here and unblock the review/merge.

@lieut-data
Copy link
Member Author

lieut-data commented Feb 16, 2018

To avoid merge conflicts, and assuming this commit goes in as COMMIT it should suffice to:

# Rebase as normal from the commit prior, resolving any necessary merge conflicts
git rebase COMMIT^
# Now rebase against the eslint changes, using a strategy that ignores 
# upstream changes when merge conflicts occur. Given the previous, 
# successful rebase, this should only be the newly added trailing commas.
git rebase --strategy-option=theirs COMMIT
# If any files were deleted in the local branch, the rebase may be interrupted
# and the files will need to be marked for deletion again.
git status --porcelain | awk '{if ($1=="UD") print $2}' | xargs git rm
git rebase --continue
# Once the rebase has finished, run another linting pass and commit
yarn fix
git add --all
git commit -m 'adopt updated eslint changes'
# The `master` branch will have moved on as well, so another normal 
# rebase against `master` is in order.
git rebase master

@lieut-data lieut-data added 2: Dev Review Requires review by a core commiter and removed Do Not Merge Should not be merged until this label is removed labels Feb 16, 2018
@jasonblais jasonblais added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core commiter labels Feb 21, 2018
@jasonblais jasonblais added this to the v4.8.0 milestone Feb 21, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation Tests/Not Needed Does not require new release tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants