-
Notifications
You must be signed in to change notification settings - Fork 22
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
prettierx: Merge Prettier 2.3.0 updates - draft 1 #549
Closed
adalinesimonian
wants to merge
838
commits into
brodycj:dev-update-from-prettier-2.3.0
from
adalinesimonian:adalinesimonian/merge-prettier-2.3.0
Closed
prettierx: Merge Prettier 2.3.0 updates - draft 1 #549
adalinesimonian
wants to merge
838
commits into
brodycj:dev-update-from-prettier-2.3.0
from
adalinesimonian:adalinesimonian/merge-prettier-2.3.0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Renovate Bot <[email protected]>
…odycj#500) Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Renovate Bot <[email protected]>
and update a test snapshot
Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Renovate Bot <[email protected]>
do not enable code coverage in .github/workflows/dev-test.yml
Co-authored-by: Renovate Bot <[email protected]>
(should avoid some security warnings reported by GitHub)
…rodycj#374) Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.1.2 to 2.6.1. - [Release notes](https://github.com/bitinn/node-fetch/releases) - [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md) - [Commits](node-fetch/node-fetch@v2.1.2...v2.6.1) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renovate Bot <[email protected]>
…odycj#510) Co-authored-by: Renovate Bot <[email protected]>
(seems to remove an extra semver entry from yarn.lock as well) to avoid an extra dependency warning effectively reverts 44343c4 (PR brodycj#515)
* remove jest-watch-typeahead from devDependencies * remove snapshot-diff from devDependencies * remove jest from devDependencies * remove babel-loader from devDependencies * remove terser-webpack-plugin from devDependencies * remove webpack from devDependencies * add jest (version 26.6.3) to devDependencies * add jest-watch-typeahead (version 0.6.2) to devDependencies * add snapshot-diff (version 0.8.1) to devDependencies * add [email protected] to devDependencies * add babel-loader (version 8.2.2) to devDependencies * add [email protected] to devDependencies
Co-authored-by: Renovate Bot <[email protected]>
…odycj#521) Co-authored-by: Renovate Bot <[email protected]>
8 tasks
Didn't realise renaming the branch would close this PR. Superceded by #569 |
brodycj
added a commit
that referenced
this pull request
Jun 15, 2021
(with limited updates needed in src/language-js/needs-parens.js) based on some updates from: - #549 - #569 TODO items: - include test updates from prettierX dev branch - update documentation Co-authored-by: Adaline Valentina Simonian <[email protected]> Co-authored-by: Christopher J. Brody <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 15, 2021
(with limited updates needed in src/language-js/needs-parens.js) based on some updates from: - #549 - #569 TODO items: - include test updates from prettierX dev branch - update documentation Co-authored-by: Adaline Valentina Simonian <[email protected]> Co-authored-by: Christopher J. Brody <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 15, 2021
(with limited updates needed in src/language-js/needs-parens.js) based on some updates from: - #549 - #569 TODO items: - include test updates from prettierX dev branch - update documentation Co-authored-by: Adaline Valentina Simonian <[email protected]> Co-authored-by: Christopher J. Brody <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 15, 2021
to be more consistent with prettierX 0.18.x including some updates from: - #549 - #569 Co-authored-by: Christopher J. Brody <[email protected]> Co-authored-by: Adaline Valentina Simonian <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 15, 2021
to be more consistent with prettierX 0.18.x including some updates from: - #549 - #569 Co-authored-by: Christopher J. Brody <[email protected]> Co-authored-by: Adaline Valentina Simonian <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 16, 2021
with some help from updates proposed in: - #549 - #569 Co-authored-by: Christopher J. Brody <[email protected]> Co-authored-by: Adaline Valentina Simonian <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 17, 2021
(in prettierx-update-branch-001) based on some updates from: - #549 - #569 (with very limited update needed in src/language-js/needs-parens.js) TODO items: - include test updates from prettierX dev branch - update documentation Co-authored-by: Adaline Valentina Simonian <[email protected]> Co-authored-by: Christopher J. Brody <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 17, 2021
(in prettierx-update-branch-001) based on some updates from: - #549 - #569 (with very limited update needed in src/language-js/needs-parens.js) TODO items: - include test updates from prettierX dev branch - update documentation Co-authored-by: Adaline Valentina Simonian <[email protected]> Co-authored-by: Christopher J. Brody <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 17, 2021
to be more consistent with prettierX 0.18.x including some updates from: - #549 - #569 Co-authored-by: Christopher J. Brody <[email protected]> Co-authored-by: Adaline Valentina Simonian <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 17, 2021
to be more consistent with prettierX 0.18.x including some updates from: - #549 - #569 Co-authored-by: Christopher J. Brody <[email protected]> Co-authored-by: Adaline Valentina Simonian <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 17, 2021
to be more consistent with prettierX 0.18.x including some updates from: - #549 - #569 Co-authored-by: Christopher J. Brody <[email protected]> Co-authored-by: Adaline Valentina Simonian <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 22, 2021
(in prettierx-update-branch-0010) based on some updates from: - #549 - #569 (with very limited update needed in src/language-js/needs-parens.js) TODO items: - include test updates from prettierX dev branch - update documentation Co-authored-by: Adaline Valentina Simonian <[email protected]> Co-authored-by: Christopher J. Brody <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 22, 2021
to be more consistent with prettierX 0.18.x including some updates from: - #549 - #569 Co-authored-by: Christopher J. Brody <[email protected]> Co-authored-by: Adaline Valentina Simonian <[email protected]>
brodycj
changed the title
prettierx: Merge Prettier 2.3.0 updates
prettierx: Merge Prettier 2.3.0 updates - draft 1
Jun 22, 2021
brodycj
added a commit
that referenced
this pull request
Jun 22, 2021
to be more consistent with prettierX 0.18.x including some updates from: - #549 - #569 Co-authored-by: Christopher J. Brody <[email protected]> Co-authored-by: Adaline Valentina Simonian <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 22, 2021
to be more consistent with prettierX 0.18.x including some updates from: - #549 - #569 Co-authored-by: Christopher J. Brody <[email protected]> Co-authored-by: Adaline Valentina Simonian <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 28, 2021
into prettierx-rebase-branch-001 based on some updates from: - #549 - #569 - #603 (with very limited update needed in src/language-js/needs-parens.js) **tested** with prettierX-specific test cases from prettierX 0.18.x TODO items: - include test updates from prettierX dev branch - update documentation Co-authored-by: Adaline Valentina Simonian <[email protected]> Co-authored-by: Christopher J. Brody <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 29, 2021
into prettierx-rebase-branch-001 based on some updates from: - #549 - #569 - #603 (with a very limited update needed in src/language-js/needs-parens.js) **tested** with prettierX-specific test cases from prettierX 0.18.x TODO items: - include test updates from prettierX dev branch - update documentation Co-authored-by: Adaline Valentina Simonian <[email protected]> Co-authored-by: Christopher J. Brody <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 29, 2021
to be more consistent with prettierX 0.18.x including some updates from: - #549 - #569 - #603 Co-authored-by: Christopher J. Brody <[email protected]> Co-authored-by: Adaline Valentina Simonian <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 29, 2021
to be more consistent with prettierX 0.18.x including some updates from: - #549 - #569 - #603 Co-authored-by: Christopher J. Brody <[email protected]> Co-authored-by: Adaline Valentina Simonian <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 29, 2021
into prettierx-rebase-branch-001 based on some updates from: - #549 - #569 - #603 (with a very limited update needed in src/language-js/needs-parens.js) **tested** with prettierX-specific formatting test cases from prettierX 0.18.x (discovered a very limited number of changes from prettierX 0.18.x) TODO items: - include test updates from prettierX dev branch - update documentation Co-authored-by: Adaline Valentina Simonian <[email protected]> Co-authored-by: Christopher J. Brody <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 29, 2021
into prettierx-rebase-branch-001 based on some updates from: - #549 - #569 - #603 (with a very limited update needed in src/language-js/needs-parens.js) **tested** with prettierX-specific formatting test cases from prettierX 0.18.x (discovered a very limited number of changes from prettierX 0.18.x) TODO items: - include test updates from prettierX dev branch - update documentation Co-authored-by: Adaline Valentina Simonian <[email protected]> Co-authored-by: Christopher J. Brody <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 29, 2021
to be more consistent with prettierX 0.18.x including some updates from: - #549 - #569 - #603 Co-authored-by: Christopher J. Brody <[email protected]> Co-authored-by: Adaline Valentina Simonian <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 29, 2021
into prettierx-rebase-branch-001 based on some updates from: - #549 - #569 - #603 with a very limited update needed in src/language-js/needs-parens.js and with comments where the updates are NO LONGER NEEDED in src/language-js/needs-parens.js tested with prettierX-specific formatting test cases from prettierX 0.18.x (discovered a very limited number of deviations) TODO items: - include test updates from prettierX dev branch - update documentation Co-authored-by: Adaline Valentina Simonian <[email protected]> Co-authored-by: Christopher J. Brody <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 30, 2021
into prettierx-rebase-branch-001 based on some updates from: - #549 - #569 - #603 with a very limited update needed in src/language-js/needs-parens.js and with comments where the updates are NO LONGER NEEDED in src/language-js/needs-parens.js tested with prettierX-specific formatting test cases from prettierX 0.18.x (discovered a very limited number of deviations) TODO items: - include test updates from prettierX dev branch - update documentation Co-authored-by: Adaline Valentina Simonian <[email protected]> Co-authored-by: Christopher J. Brody <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jun 30, 2021
into prettierx 0.19.0-01-update-branch based on some updates from: - #549 - #569 - #603 with a very limited update needed in src/language-js/needs-parens.js and with comments where updates from 0.18.x are NO LONGER NEEDED in src/language-js/needs-parens.js tested with prettierX-specific formatting test cases from prettierX 0.18.x (discovered a very limited number of deviations) TODO items: - include test updates from prettierX dev branch - update documentation Co-authored-by: Adaline Valentina Simonian <[email protected]> Co-authored-by: Christopher J. Brody <[email protected]>
brodycj
added a commit
that referenced
this pull request
Jul 1, 2021
into prettierx 0.19.0-01-update-branch based on some updates from: - #549 - #569 - #603 with a very limited update needed in src/language-js/needs-parens.js and with comments where updates from 0.18.x are NO LONGER NEEDED in src/language-js/needs-parens.js tested with prettierX-specific formatting test cases from prettierX 0.18.x (discovered a very limited number of deviations) TODO items: - include test updates from prettierX dev branch - update documentation Co-authored-by: Adaline Valentina Simonian <[email protected]> Co-authored-by: Christopher J. Brody <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #548
Closes #414
Many, many hours of work later, this is starting to look good! Still needs work, though.
Merge conflicts have been resolved, moving the appropriate changes in prettierx into their corresponding new locations with the multiple refactors made upstream.
However, about 374 out of 1189 test suites are failing - one, for example, because parentheses are not correctly being printed around multi-line conditionals.These failing tests shouldn't be that hard to resolve; it seems that in most of the cases, at least from a cursory glance, multiple tests are failing due to the same sets of bugs created from the merge. It will take a bit of effort and time to resolve but then again, so does merging a massive amount of changes into a fork and, well, at least that's mostly done now!Tests now pass (at least locally)!Actually, it turns out there are 4 test suites that still fail - I hadn't run them because I was unaware of theTest failures resolved.FULL_TEST
flag.I've enabled edits by maintainers so if y'all would like to have a crack at anything, please, be my guest. In the meantime, I'll keep trying to iron this stuff out.