Fixed further deprecations. Updated dependencies.

pughpugh · pughpugh · commit 50a8bfa6ac8f · 2017-07-19T20:22:16.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 
-## 1.0.11
- * Fix deprecation warnings in React 15.5.0
+## 2.0.0
+ * Fix deprecation warnings in React 15.6.0
 
 ## 1.1.0 - Dec 30, 2016
   * Move to semantic versioning
diff --git a/build/react-countdown-clock.js b/build/react-countdown-clock.js
diff --git a/build/react-countdown-clock.js.map b/build/react-countdown-clock.js.map
diff --git a/coffee/react-countdown-clock.coffee b/coffee/react-countdown-clock.coffee
@@ -2,7 +2,7 @@ React  = require 'react'
 PropTypes = require 'prop-types'
 CreateReactClass = require 'create-react-class'
 
-module.exports = CreateReactClass
+ReactCountdownClock = CreateReactClass
   _seconds: 0
   _radius: null
   _fraction: null
@@ -12,32 +12,6 @@ module.exports = CreateReactClass
 
   displayName: 'ReactCountdownClock'
 
-  propTypes:
-    seconds: PropTypes.number
-    size: PropTypes.number
-    weight: PropTypes.number
-    color: PropTypes.string
-    fontSize: PropTypes.string
-    font: PropTypes.string
-    alpha: PropTypes.number
-    timeFormat: PropTypes.string
-    onComplete: PropTypes.func
-    onClick: PropTypes.func
-    showMilliseconds: PropTypes.bool
-    paused: PropTypes.bool
-    pausedText: PropTypes.string
-
-  getDefaultProps: ->
-    seconds: 60
-    size: 300
-    color: '#000'
-    alpha: 1
-    timeFormat: 'hms'
-    fontSize: 'auto'
-    font: 'Arial'
-    showMilliseconds: true
-    paused: false
-
   componentDidUpdate: (props) ->
     if props.seconds != @props.seconds
       @_seconds = props.seconds
@@ -200,3 +174,31 @@ module.exports = CreateReactClass
       <canvas ref='background' style={ position: 'absolute' } width={@props.size} height={@props.size}></canvas>
       <canvas ref='timer' style={ position: 'absolute' } width={@props.size} height={@props.size}></canvas>
     </div>
+
+ReactCountdownClock.propTypes =
+  seconds: PropTypes.number
+  size: PropTypes.number
+  weight: PropTypes.number
+  color: PropTypes.string
+  fontSize: PropTypes.string
+  font: PropTypes.string
+  alpha: PropTypes.number
+  timeFormat: PropTypes.string
+  onComplete: PropTypes.func
+  onClick: PropTypes.func
+  showMilliseconds: PropTypes.bool
+  paused: PropTypes.bool
+  pausedText: PropTypes.string
+
+ReactCountdownClock.defaultProps =
+  seconds: 60
+  size: 300
+  color: '#000'
+  alpha: 1
+  timeFormat: 'hms'
+  fontSize: 'auto'
+  font: 'Arial'
+  showMilliseconds: true
+  paused: false
+
+module.exports = ReactCountdownClock
diff --git a/index.html b/index.html
@@ -19,8 +19,9 @@
 </head>
 <body>
   <div id="parappa"></div>
-  <script src="http://cdnjs.cloudflare.com/ajax/libs/react/15.3.0/react.js"></script>
-  <script src="http://cdnjs.cloudflare.com/ajax/libs/react/15.3.0/react-dom.js"></script>
+  <script src="http://cdnjs.cloudflare.com/ajax/libs/react/15.6.0/react.js"></script>
+  <script src="http://cdnjs.cloudflare.com/ajax/libs/react/15.6.0/react-dom.js"></script>
+  <script src="https://unpkg.com/create-react-class/create-react-class.js"></script>
   <script src="./build/react-countdown-clock.js"></script>
   <script>
     var MAX = 120;
@@ -34,7 +35,7 @@
       return '#' + ( Math.random() * 0xFFFFFF << 0 ).toString(16);
     }
 
-    var Demo = React.createClass({
+    var Demo = createReactClass({
       displayName: 'Demo',
       getState: function(){
         return { 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-countdown-clock",
-  "version": "1.0.11",
+  "version": "2.0.0",
   "description": "HTML5 canvas countdown clock React component",
   "main": "build/react-countdown-clock.js",
   "repository": {
@@ -21,14 +21,14 @@
   },
   "homepage": "https://github.com/pughpugh/react-countdown-clock",
   "devDependencies": {
-    "cjsx-loader": "^2.1.0",
+    "cjsx-loader": "^3.0.0",
     "coffee-loader": "^0.7.2",
     "coffee-script": "^1.8.0",
-    "webpack": "^1.13.1",
-    "react": "^15.5.0"
+    "webpack": "^3.3.0",
+    "react": "^15.6.0"
   },
   "peerDependencies": {
-    "react": "^15.5.0"
+    "react": "^15.6.0"
   },
   "dependencies": {
     "create-react-class": "^15.5.2",
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,10 +1,12 @@
+var path = require('path');
+
 module.exports = {
   cache: true,
   context: __dirname + '/coffee',
   entry: './react-countdown-clock.coffee',
   output: {
-    path: './build',
-    publicPath: '/build/',
+    path: path.join(__dirname, 'build'),
+    publicPath: path.join(__dirname, 'build'),
     filename: 'react-countdown-clock.js',
     library: 'ReactCountdownClock',
     libraryTarget: 'umd'
@@ -22,7 +24,7 @@ module.exports = {
     loaders: [
       { 
         test: /\.coffee$/, 
-        loader: 'coffee!cjsx' 
+        loader: 'coffee-loader!cjsx-loader' 
       }
     ]
   }

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,12 @@`
	`1`	`+var path = require('path');`
	`2`	`+`
`1`	`3`	`module.exports = {`
`2`	`4`	`cache: true,`
`3`	`5`	`context: __dirname + '/coffee',`
`4`	`6`	`entry: './react-countdown-clock.coffee',`
`5`	`7`	`output: {`
`6`		`- path: './build',`
`7`		`- publicPath: '/build/',`
	`8`	`+ path: path.join(__dirname, 'build'),`
	`9`	`+ publicPath: path.join(__dirname, 'build'),`
`8`	`10`	`filename: 'react-countdown-clock.js',`
`9`	`11`	`library: 'ReactCountdownClock',`
`10`	`12`	`libraryTarget: 'umd'`
`@@ -22,7 +24,7 @@ module.exports = {`
`22`	`24`	`loaders: [`
`23`	`25`	`{`
`24`	`26`	`test: /\.coffee$/,`
`25`		`- loader: 'coffee!cjsx'`
	`27`	`+ loader: 'coffee-loader!cjsx-loader'`
`26`	`28`	`}`
`27`	`29`	`]`
`28`	`30`	`}`