Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
javivelasco committed May 12, 2017
1 parent cd752ab commit b7fec0d
Show file tree
Hide file tree
Showing 8 changed files with 677 additions and 639 deletions.
3 changes: 1 addition & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
"valid-jsdoc": 2,
"react/jsx-uses-vars": 1,
"react/jsx-uses-react": 1,
"react/jsx-no-undef": 2,
"react/wrap-multilines": 2
"react/jsx-no-undef": 2
},
"plugins": [
"react"
Expand Down
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,26 @@
"invariant": "^2.2.1"
},
"devDependencies": {
"@types/react": "~15.0.4",
"babel-cli": "^6.7.7",
"babel-core": "^6.18.0",
"babel-eslint": "^7.1.1",
"@types/react": "^15.0.24",
"babel-cli": "^6.24.1",
"babel-core": "^6.24.1",
"babel-eslint": "^7.2.3",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-preset-es2015": "^6.18.0",
"babel-preset-react": "^6.5.0",
"babel-preset-stage-0": "^6.16.0",
"eslint": "^3.12.2",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"eslint": "^3.19.0",
"eslint-config-rackt": "^1.1.1",
"eslint-plugin-babel": "^4.0.0",
"eslint-plugin-react": "^6.8.0",
"eslint-plugin-babel": "^4.1.1",
"eslint-plugin-react": "^7.0.0",
"expect": "^1.18.0",
"fbjs": "^0.8.4",
"fbjs": "^0.8.12",
"jsdom": "^9.8.3",
"mocha": "^3.2.0",
"react": "^15.0.1",
"react-addons-test-utils": "^15.0.1",
"react-dom": "^15.3.2",
"rimraf": "^2.5.2",
"mocha": "^3.3.0",
"prop-types": "^15.5.9",
"react": "^15.5.4",
"react-dom": "^15.5.4",
"rimraf": "^2.6.1",
"sinon": "^1.17.6"
},
"files": [
Expand Down
3 changes: 2 additions & 1 deletion src/components/ThemeProvider.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Children, Component, PropTypes } from 'react'
import { Children, Component } from 'react'
import PropTypes from 'prop-types'
import themrShape from '../utils/themr-shape'

export default class ThemeProvider extends Component {
Expand Down
3 changes: 2 additions & 1 deletion src/components/themr.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import hoistNonReactStatics from 'hoist-non-react-statics'
import invariant from 'invariant'

Expand Down
2 changes: 1 addition & 1 deletion src/utils/themr-shape.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PropTypes } from 'react'
import PropTypes from 'prop-types'

export default PropTypes.shape({
theme: PropTypes.object.isRequired
Expand Down
5 changes: 3 additions & 2 deletions test/components/ThemeProvider.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { Component } from 'react'
import expect from 'expect'
import React, { PropTypes, Component } from 'react'
import TestUtils from 'react-addons-test-utils'
import PropTypes from 'prop-types'
import TestUtils from 'react-dom/test-utils'
import { ThemeProvider } from '../../src/index'

describe('ThemeProvider', () => {
Expand Down
5 changes: 3 additions & 2 deletions test/components/themr.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import expect from 'expect'
import React, { Children, PropTypes, Component } from 'react'
import TestUtils from 'react-addons-test-utils'
import React, { Children, Component } from 'react'
import PropTypes from 'prop-types'
import TestUtils from 'react-dom/test-utils'
import sinon from 'sinon'
import { render } from 'react-dom'
import shallowEqual from 'fbjs/lib/shallowEqual'
Expand Down
Loading

0 comments on commit b7fec0d

Please sign in to comment.