Skip to content

Merge: develop to master #64

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

Merged
merged 12 commits into from
May 26, 2019
Merged

Merge: develop to master #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ce5741f
Upgrade: update jsdom to version 15.0.0
greenkeeper[bot] Apr 21, 2019
5cd6834
chore(package): update lockfile yarn.lock
greenkeeper[bot] Apr 21, 2019
f359253
Merge pull request #61 from FriendsOfReactJS/greenkeeper/jsdom-15.0.0
markusguenther May 8, 2019
870a17b
Build: Adds Funding.yml
markusguenther May 24, 2019
3ab11f1
Build: uncomment patreon user
markusguenther May 24, 2019
16e7d9c
Upgrade: Updates sinon to version 7.3.2
markusguenther May 26, 2019
a129ea1
Upgrade: Updates linting packages
markusguenther May 26, 2019
fe217d0
Upgrade: Updates sematic-release to 15.13.12
markusguenther May 26, 2019
02cb135
Upgrade: Updates commitizen to 3.1.1
markusguenther May 26, 2019
33dd332
Upgrade: Updates to react 16.8.6
markusguenther May 26, 2019
6fac2ff
Build: Adjust nodejs versions in travis config
markusguenther May 26, 2019
c8e758a
Merge pull request #63 from markusguenther/develop
markusguenther May 26, 2019
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 .github/FUNDING.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: unikka
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
custom: # Replace with a single custom sponsorship URL
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ cache:
notifications:
email: false
node_js:
- '12'
- '10'
- '9'
- '8'
before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.9.4
Expand Down
24 changes: 12 additions & 12 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,30 +32,30 @@
"@semantic-release/changelog": "^3.0.2",
"@semantic-release/git": "^7.0.7",
"@semantic-release/release-notes-generator": "^7.1.4",
"@types/react": "^16.8.1",
"@types/react": "^16.8.18",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.3",
"babel-eslint": "^10.0.1",
"babel-plugin-transform-decorators-legacy": "^1.3.5",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"commitizen": "^3.0.5",
"commitizen": "^3.1.1",
"conventional-changelog-eslint": "^3.0.1",
"cz-adapter-eslint": "^0.2.0",
"eslint": "^5.13.0",
"eslint-config-prettier": "^4.0.0",
"eslint-plugin-prettier": "^3.0.1",
"eslint-plugin-react": "^7.12.3",
"eslint": "^5.16.0",
"eslint-config-prettier": "^4.3.0",
"eslint-plugin-prettier": "^3.1.0",
"eslint-plugin-react": "^7.13.0",
"fbjs": "^1.0.0",
"jest": "^23.6.0",
"jsdom": "^14.0.0",
"prettier": "^1.16.4",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"jsdom": "^15.0.0",
"prettier": "^1.17.1",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"rimraf": "^2.6.3",
"semantic-release": "^15.13.2",
"sinon": "^7.2.2",
"semantic-release": "^15.13.12",
"sinon": "^7.3.2",
"travis-deploy-once": "^5.0.11"
},
"files": [
Expand Down
Loading