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.

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

build: Eslint prettier conflict #1396

Merged
merged 3 commits into from
Jul 20, 2023
Merged

Conversation

foxyblocks
Copy link
Contributor

@foxyblocks foxyblocks commented Jul 20, 2023

Description

  • Resolve conflict between prettier and eslint b4c5fe8
  • Setup husky to auto-format files using pre-commit hook 732ad38
  • Fix all existing prettier violations in the whole codebase (this change touches a lot of files so probably best not to review all of them in this commit) 190668e

I noticed an issue with eslint having conflicts with the vscode prettier plugin with regards to how ternary statements are indented. An example of this problem can be seen when saving the components/atoms/Pill/pill.tsx component.

CleanShot 2023-07-20 at 10 23 26@2x

In order to resolve this I propose letting prettier handle all formatting. This is accomplished by using the eslint-plugin-prettier plugin. Now all prettier formatting violations will cause an eslint error and they will be auto-fixable by either prettier or the eslint --fix commands.

For those that aren't running a vscode plugin, i've also setup husky to run a pre-commit hook on any staged files to auto fix eslint issues.

What type of PR is this? (check all applicable)

  • 🍕 Feature
  • 🐛 Bug Fix
  • 📝 Documentation Update
  • 🎨 Style
  • 🧑‍💻 Code Refactor
  • 🔥 Performance Improvements
  • ✅ Test
  • 🤖 Build
  • 🔁 CI
  • 📦 Chore (Release)
  • ⏩ Revert

Related Tickets & Documents

Mobile & Desktop Screenshots/Recordings

Added tests?

  • 👍 yes
  • 🙅 no, because they aren't needed
  • 🙋 no, because I need help

Added to documentation?

  • 📜 README.md
  • 📓 docs.opensauced.pizza
  • 🍕 dev.to/opensauced
  • 📕 storybook
  • 🙅 no documentation needed

[optional] Are there any post-deployment tasks we need to perform?

[optional] What gif best describes this PR or how it makes you feel?

@netlify
Copy link

netlify bot commented Jul 20, 2023

Deploy Preview for design-insights ready!

Name Link
🔨 Latest commit 732ad38
🔍 Latest deploy log https://app.netlify.com/sites/design-insights/deploys/64b977d3ebe4b60008300e59
😎 Deploy Preview https://deploy-preview-1396--design-insights.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@netlify
Copy link

netlify bot commented Jul 20, 2023

Deploy Preview for oss-insights ready!

Name Link
🔨 Latest commit 732ad38
🔍 Latest deploy log https://app.netlify.com/sites/oss-insights/deploys/64b977d3cfb28100083c7d42
😎 Deploy Preview https://deploy-preview-1396--oss-insights.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@foxyblocks foxyblocks marked this pull request as ready for review July 20, 2023 18:10
@brandonroberts brandonroberts merged commit ac9b276 into beta Jul 20, 2023
@brandonroberts brandonroberts deleted the eslint-prettier-conflict branch July 20, 2023 18:13
github-actions bot pushed a commit that referenced this pull request Jul 23, 2023
## [1.57.0-beta.3](v1.57.0-beta.2...v1.57.0-beta.3) (2023-07-23)

### 🤖 Build System

* update eslint prettier config and setup commit hooks ([#1396](#1396)) ([ac9b276](ac9b276))

### 🍕 Features

* Add links to getting started docs ([#1395](#1395)) ([c58cc80](c58cc80))
* implement improved highlights form with ai auto-summarise ([#1381](#1381)) ([023f576](023f576))

### 🐛 Bug Fixes

* Move card image api route ([#1401](#1401)) ([d650161](d650161))
* update top contributors response data ([#1397](#1397)) ([9053091](9053091))

### 🔁 Continuous Integration

* disable husky for release ([2537649](2537649))
* fix husky command during release ([3e493a2](3e493a2))
@github-actions
Copy link
Contributor

🎉 This PR is included in version 1.57.0-beta.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

github-actions bot pushed a commit that referenced this pull request Jul 24, 2023
## [1.57.0](v1.56.0...v1.57.0) (2023-07-24)

### 🤖 Build System

* update eslint prettier config and setup commit hooks ([#1396](#1396)) ([ac9b276](ac9b276))

### 🔁 Continuous Integration

* disable husky for release ([2537649](2537649))
* fix husky command during release ([3e493a2](3e493a2))

### 🐛 Bug Fixes

* add `pullrequestLink` check into `HighlightInput` form `isDivFocused` condition ([#1406](#1406)) ([f3fda46](f3fda46))
* Auto-Scroll Not Triggered Upon Clicking 'Next Page' in Highlight… ([#1387](#1387)) ([77b161d](77b161d))
* flash of "test content" while loading in dashboard page ([#1409](#1409)) ([ad23f14](ad23f14))
* Improved the user experience of the highlights input form ([#1362](#1362)) ([2425dc4](2425dc4))
* Issue [#1374](#1374) All suggestions are being displayed with scroll area ([#1380](#1380)) ([1de56c7](1de56c7))
* Move card image api route ([#1401](#1401)) ([d650161](d650161))
* update top contributors response data ([#1397](#1397)) ([9053091](9053091))

### 🍕 Features

* add `[#100](https://github.com/open-sauced/insights/issues/100)DayOfOSS` challenge anouncement to feeds ([#1389](#1389)) ([751dbbf](751dbbf))
* add 404 page ([#1390](#1390)) ([37bd475](37bd475))
* add discord link to user profile ([#1370](#1370)) ([f94bc3b](f94bc3b))
* Add links to getting started docs ([#1395](#1395)) ([c58cc80](c58cc80))
* add upgrade access button to user settings page ([#1398](#1398)) ([671ebf4](671ebf4))
* implement improved highlights form with ai auto-summarise ([#1381](#1381)) ([023f576](023f576))
* implemented hover and highlight contribution graph ([#1404](#1404)) ([0453370](0453370))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants