Skip to content

Commit c1d7a91

Browse files
committed
Merge branch 'develop' into feature/fix-chrome-ext
2 parents b100c4e + 4db92db commit c1d7a91

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+917
-500
lines changed

.all-contributorsrc

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,35 @@
9494
"avatar_url": "https://avatars3.githubusercontent.com/u/66570218?v=4",
9595
"profile": "https://github.com/connorProgrammes",
9696
"contributions": [
97-
"doc"
97+
"doc",
98+
"code"
99+
]
100+
},
101+
{
102+
"login": "JacobMGEvans",
103+
"name": "Jacob M-G Evans",
104+
"avatar_url": "https://avatars1.githubusercontent.com/u/27247160?v=4",
105+
"profile": "https://twitter.com/JacobMGEvans",
106+
"contributions": [
107+
"code"
108+
]
109+
},
110+
{
111+
"login": "sumeesh879",
112+
"name": "Sumeesh Nagisetty",
113+
"avatar_url": "https://avatars1.githubusercontent.com/u/20029120?v=4",
114+
"profile": "https://github.com/sumeesh879",
115+
"contributions": [
116+
"review"
117+
]
118+
},
119+
{
120+
"login": "flaviohenriquecbc",
121+
"name": "Flávio H Freitas",
122+
"avatar_url": "https://avatars0.githubusercontent.com/u/1553609?v=4",
123+
"profile": "http://www.linkedin.com/in/flaviohfreitas",
124+
"contributions": [
125+
"code"
98126
]
99127
}
100128
],

.babelrc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"presets": [
3-
"@babel/preset-react",
4-
"@babel/preset-env"
5-
],
2+
"presets": ["@babel/preset-react", "@babel/preset-env"],
63
"plugins": [
7-
["@babel/plugin-proposal-class-properties", {
8-
"loose": true
9-
}]
4+
[
5+
"@babel/plugin-proposal-class-properties",
6+
{
7+
"loose": true
8+
}
9+
]
1010
]
1111
}

.eslintrc.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ module.exports = {
44
'eslint:recommended',
55
'plugin:prettier/recommended',
66
'plugin:react/recommended',
7+
'plugin:react-hooks/recommended',
78
],
89
parserOptions: {
910
ecmaVersion: 2020,
@@ -21,6 +22,9 @@ module.exports = {
2122
jest: true,
2223
},
2324
rules: {
25+
'arrow-body-style': ['error', 'as-needed'],
26+
curly: 'error',
27+
2428
// I'll probably add some typescript types instead
2529
'react/prop-types': 'off',
2630
},

.github/ISSUE_TEMPLATE/1.bug.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
name: Bug report 🐛
33
about: Create a bug report for Testing Playground.
4+
labels: bug
45
---
56

67
<!--

.github/ISSUE_TEMPLATE/2.feature.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
name: Feature request 💄
33
about: Suggest a new idea for Testing Playground.
4+
labels: feature
45
---
56

67
<!--

.github/workflows/cd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
env:
99
APP_NAME: Testing Playground
10-
NODE_VERSION: "12.x"
10+
NODE_VERSION: '12.x'
1111

1212
jobs:
1313
create-release:
@@ -25,7 +25,7 @@ jobs:
2525

2626
- uses: actions/setup-node@v1
2727
with:
28-
node-version: "${{ env.NODE_VERSION }}"
28+
node-version: '${{ env.NODE_VERSION }}'
2929

3030
- name: Cache node modules
3131
id: cache

.github/workflows/ci.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,19 @@ on:
55
types: [opened, synchronize, reopened]
66

77
env:
8-
NODE_VERSION: "12.x"
8+
NODE_VERSION: '12.x'
99

1010
jobs:
11+
meta:
12+
runs-on: ubuntu-latest
13+
timeout-minutes: 5
14+
steps:
15+
- name: Assign PR to author
16+
uses: samspills/assign-pr-to-author@v1.0
17+
if: github.event_name == 'pull_request' && github.event.action == 'opened'
18+
with:
19+
repo-token: '${{ secrets.GITHUB_TOKEN }}'
20+
1121
setup:
1222
name: Setup
1323
runs-on: ubuntu-latest
@@ -17,7 +27,7 @@ jobs:
1727

1828
- uses: actions/setup-node@v1
1929
with:
20-
node-version: "${{ env.NODE_VERSION }}"
30+
node-version: '${{ env.NODE_VERSION }}'
2131

2232
- name: Cache node modules
2333
id: cache
@@ -42,7 +52,7 @@ jobs:
4252

4353
- uses: actions/setup-node@v1
4454
with:
45-
node-version: "${{ env.NODE_VERSION }}"
55+
node-version: '${{ env.NODE_VERSION }}'
4656

4757
- name: Fetch all branches
4858
run: |
@@ -67,7 +77,7 @@ jobs:
6777

6878
- uses: actions/setup-node@v1
6979
with:
70-
node-version: "${{ env.NODE_VERSION }}"
80+
node-version: '${{ env.NODE_VERSION }}'
7181

7282
- name: Cache node modules
7383
uses: actions/cache@v1
@@ -76,4 +86,4 @@ jobs:
7686
key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package-lock.json') }}
7787

7888
- name: Run Tests
79-
run: npm run ci:test
89+
run: npm run ci:test

.lintstagedrc.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@ module.exports = {
33
`eslint --quiet --fix ${files.join(' ')}`,
44
`jest --passWithNoTests`,
55
],
6-
'**/*.{md,js}': (files) => [`prettier --write ${files.join(' ')}`],
6+
'**/*.{md,js,json,yml,html,css,pcss}': (files) => [
7+
`prettier --write ${files.join(' ')}`,
8+
],
79
};

CODE_OF_CONDUCT.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ appearance, race, religion, or sexual identity and orientation.
1414
Examples of behavior that contributes to creating a positive environment
1515
include:
1616

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

2323
Examples of unacceptable behavior by participants include:
2424

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

3434
## Our Responsibilities
3535

MAINTAINING.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ to release. See the next section on Releases for more about that.
5050
Our releases are automatic. They happen whenever code lands into `master`. A
5151
netlify build gets kicked off, and when tagged a changelog is published on
5252
GitHub. The changelog is generated based on the git commit messages. With this
53-
in mind, **please brush up on [the commit message convention][commit] which
53+
in mind, **please brush up on [the commit message convention][commit] which
5454
drives our releases.**
5555

5656
> One important note about this: Please make sure that commit messages do NOT
@@ -63,5 +63,4 @@ drives our releases.**
6363

6464
Thank you so much for helping to maintain this project!
6565

66-
[commit]:
67-
https://github.com/conventional-changelog-archived-repos/conventional-changelog-angular/blob/ed32559941719a130bb0327f886d6a32a8cbc2ba/convention.md
66+
[commit]: https://github.com/conventional-changelog-archived-repos/conventional-changelog-angular/blob/ed32559941719a130bb0327f886d6a32a8cbc2ba/convention.md

0 commit comments

Comments
 (0)