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.

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

chore: bump Prettier and Prettier accessories to 2.x #2387

Merged
merged 3 commits into from
May 24, 2021
Merged

chore: bump Prettier and Prettier accessories to 2.x #2387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5aa2035
chore: bump Prettier and Prettier accessories to 2.x
May 23, 2021
a6a05c1
Undid .md, .mdx changes
May 24, 2021
97fa025
Undid site/CHANGELOG.md changes too
May 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
test:
name: "Tests on ${{matrix.platform}}"
name: 'Tests on ${{matrix.platform}}'
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -194,5 +194,3 @@ jobs:
run: yarn lint:check
- name: TypeScript
run: cd packages/${{ matrix.package }} && yarn test:typescript


14 changes: 8 additions & 6 deletions .prettierrc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
arrowParens: avoid
semi: false
singleQuote: true
trailingComma: none
Comment on lines +1 to +4
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Personally I agree with the Prettier defaults here, but for the sake of touching fewer files added the overrides to preserve this repo's old behavior. Thoughts?

Suggested change
arrowParens: avoid
semi: false
singleQuote: true
trailingComma: none
semi: false
singleQuote: true

Copy link
Member

Choose a reason for hiding this comment

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

Ye, keeping the output as close to what we have in the repo currently is preferable (although I also agree that we could switch defaults of those 2 later on)

overrides:
- files: "docs/*.md"
options:
printWidth: 60
- files: "*.js"
options:
parser: flow
- files: 'docs/*.md'
options:
printWidth: 60
- files: '*.js'
options:
parser: flow
24 changes: 12 additions & 12 deletions CODE_OF_CONDUCT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ orientation.
Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
- The use of sexualized language or imagery and unwelcome sexual attention or
advances
- Trolling, insulting/derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
- Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities
Expand Down Expand Up @@ -71,4 +71,4 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage], versi
available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
[version]: http://contributor-covenant.org/version/1/4/
8 changes: 4 additions & 4 deletions codecov.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
comment: # https://docs.codecov.io/docs/pull-request-comments
layout: "files"
layout: 'files'
behavior: once
require_changes: true # if true: only post the comment if coverage changes
require_base: no # [yes :: must have a base report to post]
require_head: yes # [yes :: must have a head report to post]
require_changes: true # if true: only post the comment if coverage changes
require_base: no # [yes :: must have a base report to post]
require_head: yes # [yes :: must have a head report to post]
branches: null
6 changes: 3 additions & 3 deletions flow-typed/npm/jest-glamor-react_vx.x.x.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
* https://github.com/flowtype/flow-typed
*/

import type {JestSnapshotSerializer} from 'jest'

import type { JestSnapshotSerializer } from 'jest'

interface GlamorStyleSheet {
tags: Array<HTMLStyleElement>;
}
declare module 'jest-glamor-react' {
declare module.exports: JestSnapshotSerializer & (sheet: GlamorStyleSheet) => JestSnapshotSerializer
declare module.exports: JestSnapshotSerializer &
((sheet: GlamorStyleSheet) => JestSnapshotSerializer)
}
Loading