Merge pull request #245 from yamafaktory/master

Update PropTypes to get in sync with React v15.5.4

examples/tweet/content.js

@@ -1,7 +1,8 @@
 import { createElement } from '../../src/react' // eslint-disable-line no-unused-vars
 /** @jsx createElement */
 
-import React, { PropTypes } from 'react' //eslint-disable-line no-unused-vars
+import PropTypes from 'prop-types'
+import React from 'react'
 import { merge, select } from '../../src'
 import { vars } from '../../src/react'
 
@@ -13,7 +14,7 @@ export class Content extends React.Component {
     text: PropTypes.string
   }
   styles = {
-    text: merge({ 
+    text: merge({
       fontSize: '1.25rem',
       fontWeight: 300,
       lineHeight: '1.5em',
@@ -35,7 +36,7 @@ export class Content extends React.Component {
   }
   render() {
     let { media, text } = this.props
-    let styles = this.styles 
+    let styles = this.styles
     return <div>
       <p css={styles.text} dangerouslySetInnerHTML={{ __html: text }} />
       <a css={styles.media} href={media.expanded_url}>
@@ -44,4 +45,3 @@ export class Content extends React.Component {
     </div>
   }
 }
-

examples/tweet/footer.js

@@ -1,7 +1,8 @@
 import { createElement } from '../../src/react' // eslint-disable-line no-unused-vars
 /** @jsx createElement */
 
-import React, { Component, PropTypes } from 'react' // eslint-disable-line no-unused-vars
+import PropTypes from 'prop-types'
+import React, { Component } from 'react' // eslint-disable-line no-unused-vars
 
 import { reply, retweet, like, more } from './svgs'
 
@@ -68,7 +69,7 @@ export class Footer extends Component {
       flexGrow: 1,
       justifyContent: 'center',
       textAlign: 'center',
-      
+
       background: 'none',
       border: 'none',
       color: 'inherit',
@@ -81,7 +82,7 @@ export class Footer extends Component {
       color: this.props.vars.animation
     }
   }
-  
+
   handleClick = () => {
     this.setState({
       liked: !this.state.liked
@@ -91,7 +92,7 @@ export class Footer extends Component {
   render() {
     const { createdAt, favoriteCount, retweetCount } = this.props
     const { liked } = this.state
-    let { styles } = this 
+    let { styles } = this
 
     return (
       <div>
@@ -116,7 +117,7 @@ export class Footer extends Component {
             {retweet}
           </div>
           <button css={styles.button} onClick={this.handleClick}>
-            {like(liked && style(styles.liked))}          
+            {like(liked && style(styles.liked))}
           </button>
           <div css={styles.icon}>
             {more}

examples/tweet/header.js

@@ -3,7 +3,8 @@ import { createElement } from '../../src/react' // eslint-disable-line no-unused
 
 
 // @value primary, secondary from 'styles/colors.css';
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 import { merge, select, before } from '../../src'
 import { vars } from '../../src/react'
 
@@ -70,7 +71,6 @@ export class Header extends React.Component {
           <span css={styles.screenName}>@{screenName}</span>
         </a>
       </div>
-    </div>  
+    </div>
   }
 }
-

examples/tweet/tweet.js

@@ -1,8 +1,8 @@
 import { createElement } from '../../src/react' // eslint-disable-line no-unused-vars
 /** @jsx createElement */
 
-
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react' // eslint-disable-line no-unused-vars
 
 import { Header } from './header'
 import { Content } from './content'

package.json

@@ -83,9 +83,9 @@
     "preact": "^7.1.0",
     "preact-compat": "^3.9.4",
     "pug": "^2.0.0-beta6",
-    "react": "^15.4.1",
-    "react-addons-css-transition-group": "^15.4.1",
-    "react-dom": "^15.4.1",
+    "react": "^15.5.4",
+    "react-addons-css-transition-group": "^15.5.2",
+    "react-dom": "^15.5.4",
     "rimraf": "^2.5.4",
     "stylelint": "^7.7.0",
     "stylelint-config-standard": "^15.0.1",
@@ -117,6 +117,7 @@
   "dependencies": {
     "babel-runtime": "^6.18.0",
     "fbjs": "^0.8.8",
-    "object-assign": "^4.1.0"
+    "object-assign": "^4.1.0",
+    "prop-types": "^15.5.8"
   }
 }

src/react.js

@@ -1,9 +1,10 @@
 import assign from 'object-assign'
-import React, { PropTypes } from 'react'
+import PropTypes from 'prop-types'
+import React from 'react'
 import { isLikeRule, style, merge } from './index.js'
 
 if(process.env.NODE_ENV === 'development' || !process.env.NODE_ENV) {
-  console.warn('[Deprecation] In glamor v3 this file will be published as a standalone package: "glamor-react". See https://github.com/threepointone/glamor/issues/204 for more information.')
+  console.warn('[Deprecation] In glamor v3 this file will be published as a standalone package: "glamor-react". See https://github.com/threepointone/glamor/issues/204 for more information.') // eslint-disable-line no-console
 }
 
 export * from './index.js' // convenience
@@ -125,7 +126,7 @@ export function propMerge(mergeStyle, props) {
   }
 
   if (glamorStyleKeys.length > 1) {
-    console.warn('[glamor] detected multiple data attributes on an element. This may lead to unexpected style because of css insertion order.');
+    console.warn('[glamor] detected multiple data attributes on an element. This may lead to unexpected style because of css insertion order.') // eslint-disable-line no-console
 
     // just append "mergeStyle" to props, because we dunno in which order glamor styles were added to props
     return {