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: run prettier on everything #12653

Merged
merged 9 commits into from
Apr 12, 2022
Merged

chore: run prettier on everything #12653

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c3ee8cb
Lint everything
fisker Apr 8, 2022
8d77911
Run Prettier
fisker Apr 8, 2022
635f9c9
Fix
fisker Apr 8, 2022
378789d
Don't ignore dot files on ESLint
fisker Apr 8, 2022
9938923
Update .eslintignore
fisker Apr 8, 2022
e6ed1a2
Add `.md` back
fisker Apr 8, 2022
3037782
Ignore `dist`
fisker Apr 8, 2022
e1ecd12
Merge branch 'prettier' of github.com:fisker/jest into prettier
fisker Apr 8, 2022
e769fc2
Fix ESLint script
fisker Apr 8, 2022
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
8 changes: 8 additions & 0 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
.idea
.DS_STORE
.eslintcache
*.swp
*~
api-extractor.json
coverage

Expand All @@ -9,3 +14,6 @@ coverage
/website/backers.json
/website/build
/website/versions.json

**/.yarn
**/.pnp.*
12 changes: 6 additions & 6 deletions e2e/coverage-handlebars/greet.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* LICENSE file in the root directory of this source tree.
}}
<p>Good
{{#if am}}
morning
{{else}}
evening
{{/if}}
{{name}}!</p>
{{#if am}}
morning
{{else}}
evening
{{/if}}
{{name}}!</p>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looks like a bug in Prettier, it removed the final new line.

Copy link
Member

Choose a reason for hiding this comment

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

this is the failing test as well btw, changed the coverage report. Can add an ignore comment so we can land this PR?

2 changes: 1 addition & 1 deletion examples/angular/.babelrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ module.exports = {
},
],
'@babel/preset-typescript',
]
],
Copy link
Member

Choose a reason for hiding this comment

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

Not the biggest diff in the end 😀

};
2 changes: 1 addition & 1 deletion examples/react-native/.watchmanconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{}
{}
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@
"jest-jasmine-ci": "yarn jest-jasmine --color --config jest.config.ci.js",
"jest-coverage": "yarn jest --coverage",
"lint": "eslint . --cache --ext js,jsx,cjs,mjs,ts,tsx,md",
"lint:prettier": "prettier '**/*.{json,md,yml,yaml}' 'website/**/*.{css,js}' --write",
"lint:prettier:ci": "prettier '**/*.{json,md,yml,yaml}' 'website/**/*.{css,js}' --check",
"lint:prettier": "prettier . --write",
"lint:prettier:ci": "prettier . --check",
"remove-examples": "node ./scripts/remove-examples.mjs",
"test-types": "yarn jest --config jest.config.tsd.js",
"test-ci-partial": "yarn test-ci-partial:parallel -i",
Expand Down
Loading