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.

Sign up for GitHub

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

Jump to bottom

prettierx: Merge Prettier 2.3.0 updates - draft 1 #549

Closed

adalinesimonian wants to merge 838 commits into brodybits:dev-update-from-prettier-2.3.0 from adalinesimonian:adalinesimonian/merge-prettier-2.3.0

Contributor

adalinesimonian commented May 23, 2021 •

edited

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 the FULL_TEST flag.~~ Test failures resolved.

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.

Make test suites pass
- 374 failing → 0 failing
Write any new tests, if necessary
Make sure that dependency changes in prettierx, such as flow being optional, are still in effect if possible to keep
Ensure CI/workflows are valid
Conform changes to lint rules
Document changes
Clean-up

renovate bot and others added 30 commits

March 22, 2021 21:32


          prettierx: Update eslint -> 7.22.0 - devDependency (brodybits#498)

40c92b5

Co-authored-by: Renovate Bot <bot@renovateapp.com>


          prettierx: Update @rollup/plugin-replace -> 2.4.2 - devDependency (br…

ae334ac

…odybits#500)

Co-authored-by: Renovate Bot <bot@renovateapp.com>


          prettierx: Update execa -> 5.0.0 - devDependency (brodybits#485)

a9bfe7e

Co-authored-by: Renovate Bot <bot@renovateapp.com>


          prettierx: Update tempy -> 1.0.1 - devDependency (brodybits#491)

35e38a3

Co-authored-by: Renovate Bot <bot@renovateapp.com>


          prettierx: update @babel/core -> 7.13.15 --dev

e984cf9


          prettierx: update @babel/preset-env -> 7.13.15 --dev

de86fb3


          prettierx: update eslint -> 7.24.0 --dev

abad553


          prettierx: update eslint-plugin-react -> 7.23.2 --dev

a9fa6f3


          prettierx: update jest-watch-typeahead -> 0.6.2 --dev

e9a1092


          prettierx: update @babel/code-frame -> 7.12.13 (...)

d1d4b76

and update a test snapshot


          prettierx: Update ci-info -> 3.1.1 - dependency (brodybits#480)

98aa7b3

Co-authored-by: Renovate Bot <bot@renovateapp.com>


          prettierx: Update diff -> 5.0.0 - dependency (brodybits#482)

70a73ff

Co-authored-by: Renovate Bot <bot@renovateapp.com>


          prettierx: Update globby -> 11.0.3 - dependency (brodybits#499)

d2ea597

Co-authored-by: Renovate Bot <bot@renovateapp.com>


          prettierx: Update mem -> 8.1.0 - dependency (brodybits#486)

9ac0586

Co-authored-by: Renovate Bot <bot@renovateapp.com>


          prettierx: Update postcss-less -> 4.0.1 - dependency (brodybits#487)

148baca

Co-authored-by: Renovate Bot <bot@renovateapp.com>


          prettierx: Update semver -> 7.3.5 - dependency (brodybits#508)

af9e719

Co-authored-by: Renovate Bot <bot@renovateapp.com>


          prettierx: Update rollup -> 2.45.1 - devDependency (brodybits#507)

4be76fe

Co-authored-by: Renovate Bot <bot@renovateapp.com>


          prettierx: no code coverage in GitHub action

bb0d7f3

do not enable code coverage in .github/workflows/dev-test.yml


          prettierx: Update resolve -> 1.20.0 - dependency (brodybits#465)

3c88783

Co-authored-by: Renovate Bot <bot@renovateapp.com>


          prettierx: remove Prettier website code

aa12c04

(should avoid some security warnings reported by GitHub)


          build(deps): bump node-fetch from 2.1.2 to 2.6.1 in /scripts/release (b…

66f3499

…rodybits#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] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          prettierx: Update tslib -> 2.2.0 - dependency (brodybits#515)

44343c4

Co-authored-by: Renovate Bot <bot@renovateapp.com>


          prettierx: Update eslint-plugin-unicorn -> 29.0.0 - devDependency (br…

ca0120d

…odybits#510)

Co-authored-by: Renovate Bot <bot@renovateapp.com>


          prettierx: tslib back to 1.14.1

faf2593

(seems to remove an extra semver entry from yarn.lock as well)

to avoid an extra dependency warning

effectively reverts 44343c4
(PR brodybits#515)


          prettierx: update dependencies notes in package.json

c5ef079


          prettierx: update yarn.lock --dev (brodybits#519)

5749c8b

* 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 webpack@4.46.0 to devDependencies
* add babel-loader (version 8.2.2) to devDependencies
* add terser-webpack-plugin@4.2.3 to devDependencies


          prettierx: version 0.18.0

ec29f1c


          prettierx: start 0.18.1-dev

b2b1aab


          prettierx: Update rollup -> 2.45.2 - devDependency (brodybits#520)

1580da4

Co-authored-by: Renovate Bot <bot@renovateapp.com>


          prettierx: Update eslint-config-prettier -> 8.2.0 - devDependency (br…

c7a9032

…odybits#521)

Co-authored-by: Renovate Bot <bot@renovateapp.com>

adalinesimonian mentioned this pull request

prettierx: Merge Prettier 2.3.1 updates - draft 2 #569

Closed

8 tasks

Contributor Author

adalinesimonian commented Jun 7, 2021

Didn't realise renaming the branch would close this PR. Superceded by #569

brodybits added a commit that referenced this pull request


          prettierx: apply language-js features based on Prettier 2.3.1

f0cdfe9

(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 <adalinesimonian@gmail.com>
Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>

brodybits added a commit that referenced this pull request


          prettierx: apply language-js features based on Prettier 2.3.1

cdbf995

(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 <adalinesimonian@gmail.com>
Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>

brodybits added a commit that referenced this pull request


          prettierx: apply language-js features based on Prettier 2.3.1

c1fc6fc

(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 <adalinesimonian@gmail.com>
Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>

brodybits added a commit that referenced this pull request


          [prettierx-update-branch-001] rename bin & test config items

f41b6b2

to be more consistent with prettierX 0.18.x

including some updates from:

- #549
- #569

Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>
Co-authored-by: Adaline Valentina Simonian <adalinesimonian@gmail.com>

brodybits added a commit that referenced this pull request


          [prettierx-update-branch-001] rename bin & test config items

cddc5c1

to be more consistent with prettierX 0.18.x

including some updates from:

- #549
- #569

Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>
Co-authored-by: Adaline Valentina Simonian <adalinesimonian@gmail.com>

brodybits added a commit that referenced this pull request


          Merge branch 'prettierx-update-branch-001' into dev

with some help from updates proposed in:

- #549
- #569

Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>
Co-authored-by: Adaline Valentina Simonian <adalinesimonian@gmail.com>

brodybits added a commit that referenced this pull request


          prettierx: apply language-js features based on Prettier 2.3.1

ccca565

(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 <adalinesimonian@gmail.com>
Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>

brodybits added a commit that referenced this pull request


          prettierx: apply language-js features based on Prettier 2.3.1

ed93030

(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 <adalinesimonian@gmail.com>
Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>

brodybits added a commit that referenced this pull request


          [prettierx-update-branch-001] rename bin & test config items

10cf5bf

to be more consistent with prettierX 0.18.x

including some updates from:

- #549
- #569

Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>
Co-authored-by: Adaline Valentina Simonian <adalinesimonian@gmail.com>

brodybits added a commit that referenced this pull request


          [prettierx-update-branch-0010] rename bin & test config items

ec3378a

to be more consistent with prettierX 0.18.x

including some updates from:

- #549
- #569

Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>
Co-authored-by: Adaline Valentina Simonian <adalinesimonian@gmail.com>

brodybits added a commit that referenced this pull request


          [prettierx-update-branch-0010] rename bin & test config items

ecd9c38

to be more consistent with prettierX 0.18.x

including some updates from:

- #549
- #569

Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>
Co-authored-by: Adaline Valentina Simonian <adalinesimonian@gmail.com>

brodybits added a commit that referenced this pull request


          prettierx: apply language-js features based on Prettier 2.3.1

de2ebc9

(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 <adalinesimonian@gmail.com>
Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>

brodybits added a commit that referenced this pull request


          [prettierx-update-branch-0010] rename bin & test config items

e9f8a0e

to be more consistent with prettierX 0.18.x

including some updates from:

- #549
- #569

Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>
Co-authored-by: Adaline Valentina Simonian <adalinesimonian@gmail.com>

brodybits changed the title ~~prettierx: Merge Prettier 2.3.0 updates~~ prettierx: Merge Prettier 2.3.0 updates - draft 1

brodybits added a commit that referenced this pull request


          [prettierx-update-branch-0010] rename bin & test config items

d7ebc3b

to be more consistent with prettierX 0.18.x

including some updates from:

- #549
- #569

Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>
Co-authored-by: Adaline Valentina Simonian <adalinesimonian@gmail.com>

brodybits added a commit that referenced this pull request


          [prettierx-update-branch-0010] rename bin & test config items

f747ea0

to be more consistent with prettierX 0.18.x

including some updates from:

- #549
- #569

Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>
Co-authored-by: Adaline Valentina Simonian <adalinesimonian@gmail.com>

brodybits added a commit that referenced this pull request


          prettierx: apply language-js features (...)

c60d42b

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 <adalinesimonian@gmail.com>
Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>

brodybits added a commit that referenced this pull request


          [prettierx] feat: apply language-js features (...)

b87a3ef

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 <adalinesimonian@gmail.com>
Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>

brodybits added a commit that referenced this pull request


          [prettierx-rebase-branch-001] rename bin & test config items

e42ece5

to be more consistent with prettierX 0.18.x

including some updates from:

- #549
- #569
- #603

Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>
Co-authored-by: Adaline Valentina Simonian <adalinesimonian@gmail.com>

brodybits added a commit that referenced this pull request


          [prettierx-rebase-branch-001] rename bin & test config items

ca18f6c

to be more consistent with prettierX 0.18.x

including some updates from:

- #549
- #569
- #603

Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>
Co-authored-by: Adaline Valentina Simonian <adalinesimonian@gmail.com>

brodybits added a commit that referenced this pull request


          [prettierx] feat: apply language-js features (...)

d95da0c

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 <adalinesimonian@gmail.com>
Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>

brodybits added a commit that referenced this pull request


          [prettierx] feat: apply language-js features (...)

e6c00cd

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 <adalinesimonian@gmail.com>
Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>

brodybits added a commit that referenced this pull request


          [prettierx-rebase-branch-001] rename bin & test config items

c4c4fc8

to be more consistent with prettierX 0.18.x

including some updates from:

- #549
- #569
- #603

Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>
Co-authored-by: Adaline Valentina Simonian <adalinesimonian@gmail.com>

brodybits added a commit that referenced this pull request


          [prettierx] feat: apply language-js features (...)

be48e8d

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 <adalinesimonian@gmail.com>
Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>

brodybits added a commit that referenced this pull request


          [prettierx] feat: apply language-js features (...)

d75b72e

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 <adalinesimonian@gmail.com>
Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>

brodybits added a commit that referenced this pull request


          [prettierx] feat: apply language-js features (...)

ba43d77

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 <adalinesimonian@gmail.com>
Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>

brodybits added a commit that referenced this pull request


          [prettierx] feat: apply language-js features (...)

a0eb2be

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 <adalinesimonian@gmail.com>
Co-authored-by: Christopher J. Brody <chris.brody+brodybits@gmail.com>

adalinesimonian mentioned this pull request

Merge additional changes from adalinesimonian/merge-prettier-2.3.1 #603

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment