Skip to content

Commit 890c2f5

Browse files
authored
Merge pull request #1 from mitoyarzun/feature/1.7.3-react-16
Upgrade to React v16
2 parents b2032bb + 6044514 commit 890c2f5

File tree

8 files changed

+1342
-1314
lines changed

8 files changed

+1342
-1314
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ build
22
lib
33
node_modules
44
npm-debug.log
5+
yarn-error.log

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"name": "react-css-themr",
2+
"name": "react-css-themr-legacy",
33
"description": "React CSS Themr",
4-
"homepage": "https://github.com/javivelasco/react-css-themr#readme",
5-
"version": "1.7.2",
4+
"homepage": "https://github.com/mitoyarzun/react-css-themr#readme",
5+
"version": "1.8.0",
66
"main": "./lib",
77
"author": {
88
"email": "javier.velasco86@gmail.com",
@@ -11,10 +11,10 @@
1111
},
1212
"repository": {
1313
"type": "git",
14-
"url": "git+https://github.com/javivelasco/react-css-themr.git"
14+
"url": "git+https://github.com/mitoyarzun/react-css-themr.git"
1515
},
1616
"bugs": {
17-
"url": "https://github.com/javivelasco/react-css-themr/issues"
17+
"url": "https://github.com/mitoyarzun/react-css-themr/issues"
1818
},
1919
"keywords": [
2020
"css-modules",
@@ -41,10 +41,10 @@
4141
"expect": "^1.18.0",
4242
"fbjs": "^0.8.4",
4343
"jsdom": "^9.8.3",
44-
"mocha": "^3.2.0",
45-
"react": "^15.0.1",
46-
"react-addons-test-utils": "^15.0.1",
47-
"react-dom": "^15.3.2",
44+
"mocha": "^5.2.0",
45+
"prop-types": "^15.6.1",
46+
"react": "^16.4.1",
47+
"react-dom": "^16.4.1",
4848
"rimraf": "^2.5.2",
4949
"sinon": "^1.17.6"
5050
},
@@ -62,7 +62,7 @@
6262
},
6363
"license": "MIT",
6464
"peerDependencies": {
65-
"react": "^0.14.0 || ^15.0.0-0"
65+
"react": "^16.4.0"
6666
},
6767
"typings": "./index.d.ts"
6868
}

src/components/ThemeProvider.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Children, Component, PropTypes } from 'react'
1+
import { Children, Component } from 'react'
2+
import PropTypes from 'prop-types'
23
import themrShape from '../utils/themr-shape'
34

45
export default class ThemeProvider extends Component {

src/components/themr.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { Component, PropTypes } from 'react'
1+
import React, { Component } from 'react'
2+
import PropTypes from 'prop-types'
23
import invariant from 'invariant'
34

45
/**

src/utils/themr-shape.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { PropTypes } from 'react'
1+
import PropTypes from 'prop-types'
22

33
export default PropTypes.shape({
44
theme: PropTypes.object.isRequired

test/components/ThemeProvider.spec.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import expect from 'expect'
2-
import React, { PropTypes, Component } from 'react'
3-
import TestUtils from 'react-addons-test-utils'
2+
import React, { Component } from 'react'
3+
import PropTypes from 'prop-types'
4+
import TestUtils from 'react-dom/test-utils'
45
import { ThemeProvider } from '../../src/index'
56

67
describe('ThemeProvider', () => {

test/components/themr.spec.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import expect from 'expect'
2-
import React, { Children, PropTypes, Component } from 'react'
3-
import TestUtils from 'react-addons-test-utils'
2+
import React, { Children, Component } from 'react'
3+
import PropTypes from 'prop-types'
4+
import TestUtils from 'react-dom/test-utils'
45
import sinon from 'sinon'
56
import { render } from 'react-dom'
67
import shallowEqual from 'fbjs/lib/shallowEqual'

0 commit comments

Comments
 (0)