Merge pull request #37 from NumberAI/master

Update ALL imports of PropTypes

example/AudioPlayer.jsx

@@ -1,5 +1,6 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
 import ReactDOM, { findDOMNode } from 'react-dom'
+import PropTypes from 'prop-types'
 import { Media, Player, controls, utils } from '../src/react-media-player'
 import PlayPause from './PlayPause'
 import MuteUnmute from './MuteUnmute'

example/CirclePlayer.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import CircleProgress from './CircleProgress'
 import { Media, Player } from '../src/react-media-player'
 

example/Fullscreen.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { withMediaProps } from '../src/react-media-player'
 
 class Fullscreen extends Component {

example/MediaPlayer.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Media, Player, controls, utils } from '../src/react-media-player'
 import PlayPause from './PlayPause'
 import MuteUnmute from './MuteUnmute'

example/MuteUnmute.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { withMediaProps } from '../src/react-media-player'
 import Transition from 'react-motion-ui-pack'
 

example/PlayPause.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { withMediaProps } from '../src/react-media-player'
 import Transition from 'react-motion-ui-pack'
 

example/Repeat.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class Repeat extends Component {
   render() {

example/VideoPlayer.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Media, Player, withMediaProps, withKeyboardControls, controls } from '../src/react-media-player'
 import PlayPause from './PlayPause'
 import MuteUnmute from './MuteUnmute'

example/index.jsx

@@ -1,5 +1,6 @@
-import React, { Component, PropTypes, createElement } from 'react'
+import React, { Component, createElement } from 'react'
 import ReactDOM from 'react-dom'
+import PropTypes from 'prop-types'
 import MediaPlayer from './MediaPlayer'
 import VideoPlayer from './VideoPlayer'
 import AudioPlayer from './AudioPlayer'

package.json

@@ -3,7 +3,10 @@
   "version": "0.6.2",
   "description": "React media player.",
   "main": "lib/react-media-player.js",
-  "files": ["dist", "lib"],
+  "files": [
+    "dist",
+    "lib"
+  ],
   "scripts": {
     "build:lib": "babel src --out-dir lib",
     "build": "npm run build:lib && NODE_ENV=production webpack --config webpack.prod.config.js",

src/Media.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes, Children } from 'react'
+import React, { Component, Children } from 'react'
+import PropTypes from 'prop-types';
 import ReactDOM, { findDOMNode } from 'react-dom'
 import contextTypes from './context-types'
 import requestFullscreen from './utils/request-fullscreen'

src/Player.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes, createElement } from 'react'
+import React, { Component, createElement } from 'react'
+import PropTypes from 'prop-types'
 import contextTypes from './context-types'
 import getVendor from './utils/get-vendor'
 

src/controls/CurrentTime.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import withMediaProps from '../decorators/with-media-props'
 import formatTime from '../utils/format-time'
 

src/controls/Duration.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import withMediaProps from '../decorators/with-media-props'
 import formatTime from '../utils/format-time'
 

src/controls/Fullscreen.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import withMediaProps from '../decorators/with-media-props'
 
 class Fullscreen extends Component {

src/controls/MuteUnmute.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import withMediaProps from '../decorators/with-media-props'
 
 class MuteUnmute extends Component {

src/controls/PlayPause.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import withMediaProps from '../decorators/with-media-props'
 
 class PlayPause extends Component {

src/controls/Progress.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import withMediaProps from '../decorators/with-media-props'
 
 class Progress extends Component {

src/controls/SeekBar.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import withMediaProps from '../decorators/with-media-props'
 
 class SeekBar extends Component {

src/controls/Volume.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import withMediaProps from '../decorators/with-media-props'
 
 class Volume extends Component {

src/vendors/HTML5.jsx

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes, createElement } from 'react'
+import React, { Component, createElement } from 'react'
+import PropTypes from 'prop-types'
 import { findDOMNode } from 'react-dom'
 import vendorPropTypes from './vendor-prop-types'