Upgrade wp-prettier to 2.6.2 - #40542
Merged
Merged
Conversation
jsnajdr
requested review from
adamziel,
ajitbohra,
alexstine,
atimmer,
cameronvoell,
dmsnell,
draganescu,
ellatrix,
geriux,
getdave,
gziolo,
kevin940726,
mkaz,
mmtr,
nerrad,
noahtallen,
noisysocks,
ntwb,
oandregal,
ryanwelcher,
talldan and
tellthemachines
as code owners
April 22, 2022 10:39
|
Size Change: +63 B (0%) Total Size: 1.24 MB
ℹ️ View Unchanged
|
dmsnell
approved these changes
Apr 22, 2022
dmsnell
left a comment
dmsnell
left a comment
Member
There was a problem hiding this comment.
Couldn't review any changes on this page because GitHub kept freezing the browser when trying to show the diff, but the changes to the parser code look good 👍
ntwb
reviewed
Apr 23, 2022
Member
There was a problem hiding this comment.
Took a little while,eventually got through all the files, the vast majorjty, 99% are line length changes, shorter, or longer
Used the hide whitespace view to review https://github.com/WordPress/gutenberg/pull/40542/files?w=1
I commented on 4 file changes out of the 568 files, so looks pretty good to me
| @@ -36,7 +36,8 @@ const TRANSLATION_FUNCTIONS = new Set( [ '__', '_x', '_n', '_nx' ] ); | |||
| * | |||
| * @type {RegExp} | |||
| */ | |||
| const REGEXP_SPRINTF_PLACEHOLDER = /%(((\d+)\$)|(\(([$_a-zA-Z][$_a-zA-Z0-9]*)\)))?[ +0#-]*\d*(\.(\d+|\*))?(ll|[lhqL])?([cduxXefgsp%])/g; | |||
| const REGEXP_SPRINTF_PLACEHOLDER = | |||
Member
There was a problem hiding this comment.
The regex explainer comments alignment below this line can be fixed in a follow up PR
Member
Author
There was a problem hiding this comment.
Fixed in an extra commit, thanks for spotting this 👍
Comment on lines
-71
to
+74
| return createElement( icon, ( { | ||
| return createElement( icon, { | ||
| size, | ||
| ...additionalProps, | ||
| } as unknown ) as P ); | ||
| } as unknown as P ); |
Member
Author
There was a problem hiding this comment.
Yes, that's what the updated Prettier does to all TypeScript X as Y as Z expressions. There are no longer any parens.
Member
Author
gziolo
reviewed
Apr 25, 2022
| const isWPPrettier = prettierPackage.name === 'wp-prettier'; | ||
| const customOptions = isWPPrettier | ||
| ? { parenSpacing: true, jsxBracketSameLine: false } | ||
| ? { parenSpacing: true, bracketSameLine: false } |
Member
There was a problem hiding this comment.
bracketSameLine is the same now in both cases so we can move it to the config object.
jsnajdr
force-pushed
the
update/prettier-2.6
branch
from
April 25, 2022 08:02
cd140a0 to
a58ee6e
Compare
jsnajdr
force-pushed
the
update/prettier-2.6
branch
from
April 25, 2022 08:25
a58ee6e to
2eae7d2
Compare
Member
|
Can we add the merge commit to |
Member
Author
Will do! Thanks for mentioning this, I didn't know that |
gziolo
added
[Tool] WP Scripts
Member
|
This PR requires another Prettier run to format files changed in the |
jsnajdr
force-pushed
the
update/prettier-2.6
branch
from
June 5, 2022 14:08
f4237c7 to
af5ae53
Compare
jsnajdr
changed the title
gziolo
approved these changes
Jun 14, 2022
Member
There was a problem hiding this comment.
Let's move forward with this Prettier fork's upgrade. It will require another rebase and Prettier formatting run before landing.
Can we add the merge commit to .git-blame-ignore-revs once merged?
https://github.com/WordPress/gutenberg/blob/trunk/.git-blame-ignore-revs
Let's remember about the follow-up suggested by @noisysocks.
1 task
Member
Added with d25c39d. I have just noticed triple |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
I updated the
wp-prettierfork to be in sync with the latest upstream version, Prettier 2.6.2, and published it aswp-prettier@2.6.2.This PR updates the Gutenberg dependency and reformats the codebase.