Skip to content

Commit c4e8f72

Browse files
Merge pull request #64 from FriendsOfReactJS/develop
Merge: develop to master
2 parents 5736aef + c8e758a commit c4e8f72

File tree

4 files changed

+282
-160
lines changed

4 files changed

+282
-160
lines changed

.github/FUNDING.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# These are supported funding model platforms
2+
3+
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: unikka
5+
open_collective: # Replace with a single Open Collective username
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
custom: # Replace with a single custom sponsorship URL

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ cache:
77
notifications:
88
email: false
99
node_js:
10+
- '12'
1011
- '10'
11-
- '9'
1212
- '8'
1313
before_install:
1414
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.9.4

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,30 +32,30 @@
3232
"@semantic-release/changelog": "^3.0.2",
3333
"@semantic-release/git": "^7.0.7",
3434
"@semantic-release/release-notes-generator": "^7.1.4",
35-
"@types/react": "^16.8.1",
35+
"@types/react": "^16.8.18",
3636
"babel-cli": "^6.26.0",
3737
"babel-core": "^6.26.3",
3838
"babel-eslint": "^10.0.1",
3939
"babel-plugin-transform-decorators-legacy": "^1.3.5",
4040
"babel-preset-es2015": "^6.24.1",
4141
"babel-preset-react": "^6.24.1",
4242
"babel-preset-stage-0": "^6.24.1",
43-
"commitizen": "^3.0.5",
43+
"commitizen": "^3.1.1",
4444
"conventional-changelog-eslint": "^3.0.1",
4545
"cz-adapter-eslint": "^0.2.0",
46-
"eslint": "^5.13.0",
47-
"eslint-config-prettier": "^4.0.0",
48-
"eslint-plugin-prettier": "^3.0.1",
49-
"eslint-plugin-react": "^7.12.3",
46+
"eslint": "^5.16.0",
47+
"eslint-config-prettier": "^4.3.0",
48+
"eslint-plugin-prettier": "^3.1.0",
49+
"eslint-plugin-react": "^7.13.0",
5050
"fbjs": "^1.0.0",
5151
"jest": "^23.6.0",
52-
"jsdom": "^14.0.0",
53-
"prettier": "^1.16.4",
54-
"react": "^16.7.0",
55-
"react-dom": "^16.7.0",
52+
"jsdom": "^15.0.0",
53+
"prettier": "^1.17.1",
54+
"react": "^16.8.6",
55+
"react-dom": "^16.8.6",
5656
"rimraf": "^2.6.3",
57-
"semantic-release": "^15.13.2",
58-
"sinon": "^7.2.2",
57+
"semantic-release": "^15.13.12",
58+
"sinon": "^7.3.2",
5959
"travis-deploy-once": "^5.0.11"
6060
},
6161
"files": [

0 commit comments

Comments
 (0)