Skip to content

Commit

Permalink
Merge pull request #208 from watson-developer-cloud/react-16
Browse files Browse the repository at this point in the history
feat: Add support for React 16 and fix #200
  • Loading branch information
germanattanasio authored Aug 16, 2018
2 parents 20226dd + fdfc4ce commit 714e121
Show file tree
Hide file tree
Showing 8 changed files with 252 additions and 181 deletions.
7 changes: 4 additions & 3 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ rules:
no-console: 0
import/extensions: 0
global-require: 0
react/no-array-index-key: 1
react/jsx-no-bind: 1
jsx-a11y/href-no-hash: 0
jsx-a11y/label-has-for: 0
react/no-this-in-sfc: 0
react/jsx-one-expression-per-line: 0
react/no-deprecated: 0
react/no-deprecated: 0
react/destructuring-assignment: 0
react/no-array-index-key: 0
react/jsx-no-bind: 0
114 changes: 52 additions & 62 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,30 +47,30 @@
"dotenv": "^6.0.0",
"express": "^4.16.3",
"express-browserify": "^1.0.2",
"express-rate-limit": "^2.11.0",
"express-rate-limit": "^2.12.2",
"express-react-views": "^0.10.5",
"express-secure-only": "^0.2.1",
"helmet": "^3.12.1",
"helmet": "^3.13.0",
"prop-types": "^15.6.2",
"react": "^15.6.2",
"react-dom": "^15.6.2",
"react-dropzone": "^4.2.13",
"react": "^16.4.2",
"react-dom": "^16.4.2",
"react-dropzone": "^4.3.0",
"uglifyify": "^5.0.1",
"watson-developer-cloud": "^3.7.0",
"watson-react-components": "^0.6.16",
"watson-developer-cloud": "^3.9.0",
"watson-react-components": "^0.6.17",
"watson-speech": "^0.36.0",
"whatwg-fetch": "^2.0.4"
},
"devDependencies": {
"casperjs": "^1.1.4",
"codecov": "^3.0.4",
"eslint": "^5.1.0",
"eslint-config-airbnb": "^17.0.0",
"eslint-plugin-import": "^2.13.0",
"eslint": "^5.3.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jsx-a11y": "^6.1.1",
"eslint-plugin-react": "^7.10.0",
"eslint-plugin-react": "^7.11.1",
"mocha": "^5.2.0",
"nock": "^9.4.2",
"nock": "^9.6.1",
"phantomjs-prebuilt": "^2.1.16",
"supertest": "^3.1.0"
},
Expand Down
Loading

0 comments on commit 714e121

Please sign in to comment.