Merge pull request #176 from brigade/6.0.0

6.0.0
civiccc · Apr 11, 2017 · b23770d · b23770d
2 parents 74bfb3f + c56445a
commit b23770d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## master (unreleased)
 
+## 6.0.0
+
+- Add `prop-types` as a peer dependency to remove deprecation warnings when
+  running on React 15.5
+
 ## 5.3.1
 
 - Remove the `prop-types` peer dependency. This was an accidental breaking

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-waypoint",
-  "version": "5.3.1",
+  "version": "6.0.0",
   "description": "A React component to execute a function whenever you scroll to an element.",
   "main": "build/waypoint.js",
   "types": "index.d.ts",
@@ -28,7 +28,8 @@
   "author": "Brigade Engineering",
   "license": "MIT",
   "peerDependencies": {
-    "react": "^0.14.0 || ^15.0.0"
+    "react": "^0.14.0 || ^15.0.0",
+    "prop-types": "^15.0.0"
   },
   "devDependencies": {
     "@types/react": "^15.0.21",

diff --git a/src/waypoint.jsx b/src/waypoint.jsx
@@ -1,5 +1,6 @@
 import { addEventListener, removeEventListener } from 'consolidated-events';
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 import computeOffsetPixels from './computeOffsetPixels';
 import constants from './constants';