gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat(tools): remove eslint-plugin-prettier for prettier (#42438)

Browse Source 
* feat: remove eslint-plugin-prettier for prettier

This removes the annoying lint warnings when all that needs to change is
formatting

* fix: use .js lint-staged config to ignore properly

* fix: lint everything if a lot of files are changed

It's faster than making lots of individual linter calls

* chore: apply prettier

* fix: ignore code in curriculum-file-structure
This commit is contained in:
Oliver Eyton-Williams
2021-10-06 17:32:21 +02:00
committed by GitHub
parent 8518079316
commit c8d7f0a782
152 changed files with 905 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
docs/how-to-open-a-pull-request.md
View File

@ -19,12 +19,12 @@ When opening a Pull Request(PR), you can use the below to determine the type, sc
**Type:**
| Type | When to select |
| :---- | :--------------------------------------------------------------------------- |
| Type | When to select |
| :---- | :------------------------------------------------------------------------------- |
| fix | Changed or updated/improved functionality, tests, the verbiage of a lesson, etc. |
| feat | Only if you are adding new functionality, tests, etc. |
| chore | Changes that are not related to code, tests, or verbiage of a lesson. |
| docs | Changes to `/docs` directory or the contributing guidelines, etc. |
| feat | Only if you are adding new functionality, tests, etc. |
| chore | Changes that are not related to code, tests, or verbiage of a lesson. |
| docs | Changes to `/docs` directory or the contributing guidelines, etc. |
**Scope:**
@ -135,37 +135,37 @@ When you are working on features for our upcoming curriculum `next-*` branches,
a. Either delete your local branch after taking a backup (if you still have it locally):
```console
git checkout <pr-branch-name>
```console
git checkout <pr-branch-name>
# example:
# git checkout feat/add-numpy-video-question
# example:
# git checkout feat/add-numpy-video-question
git checkout -b <backup-branch-name>
git checkout -b <backup-branch-name>
# example:
# git checkout -b backup-feat/add-numpy-video-question
# example:
# git checkout -b backup-feat/add-numpy-video-question
git branch -D <pr-branch-name>
```
git branch -D <pr-branch-name>
```
b. Or just a backup of your pr branch (if you do not have it locally):
```console
git checkout -b <backup-branch-name> origin/<pr-branch-name>
```console
git checkout -b <backup-branch-name> origin/<pr-branch-name>
# example:
# git checkout -b backup-feat/add-numpy-video-question origin/feat/add-numpy-video-question
```
# example:
# git checkout -b backup-feat/add-numpy-video-question origin/feat/add-numpy-video-question
```
4. Start off with a clean slate:
3. Start off with a clean slate:
```console
git checkout -b <pr-branch-name> next-python-projects
git cherry-pick <commit-hash>
```
5. Resolve any conflicts, and cleanup, install run tests
4. Resolve any conflicts, and cleanup, install run tests
```console
npm run clean
@ -179,7 +179,7 @@ When you are working on features for our upcoming curriculum `next-*` branches,
```
6. If everything looks good push back to the PR
5. If everything looks good push back to the PR
```console
git push --force origin <pr-branch-name>