From 03335eb3c23e4717319c79e0dc36e9df09bbd467 Mon Sep 17 00:00:00 2001 From: Ori Livni Date: Wed, 19 Apr 2017 11:56:16 +0300 Subject: [PATCH 1/5] updated NPM deps for prop-types installation --- package.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 9e2c323..02a0262 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,8 @@ "test": "karma start --single-run" }, "peerDependencies": { - "react": ">=15 || ^0.14.7" + "prop-types": "^15.5.8", + "react": ">=15" }, "dependencies": { "json2mq": "^0.2.0" @@ -48,8 +49,9 @@ "karma-webpack": "^2.0.1", "mocha": "^3.0.0", "pretty-bytes": "^4.0.2", - "react": "^15.4.1 || ^0.14.7", - "react-dom": "^15.3.0 || ^0.14.7", + "prop-types": "^15.5.8", + "react": "^15.4.1", + "react-dom": "^15.3.0", "readline-sync": "^1.4.4", "webpack": "^1.13.1" }, From 0d1e195cd0cef662ba1e5528e98c97a7650bee43 Mon Sep 17 00:00:00 2001 From: Ori Livni Date: Wed, 19 Apr 2017 11:57:21 +0300 Subject: [PATCH 2/5] import PropTypes from the new NPM package --- modules/Media.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/Media.js b/modules/Media.js index 8534072..ce5b65c 100644 --- a/modules/Media.js +++ b/modules/Media.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import PropTypes from 'prop-types' +import React from 'react' import json2mq from 'json2mq' const queryType = PropTypes.oneOfType([ From 4d135139994a6f6def66a484ea2a2abffa44c35d Mon Sep 17 00:00:00 2001 From: Ori Livni Date: Wed, 19 Apr 2017 11:58:07 +0300 Subject: [PATCH 3/5] Fixed Lint error of not having propType of defaultMatches --- modules/Media.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/Media.js b/modules/Media.js index ce5b65c..a9349c6 100644 --- a/modules/Media.js +++ b/modules/Media.js @@ -13,6 +13,7 @@ const queryType = PropTypes.oneOfType([ */ class Media extends React.Component { static propTypes = { + defaultMatches: PropTypes.bool, query: queryType, queries: PropTypes.objectOf(queryType), render: PropTypes.func, @@ -69,7 +70,7 @@ class Media extends React.Component { if (queries) { queries = Object.keys(queries).map(mq => ({ - name: mq, + name: mq, qs: json2mq(queries[mq]), })) this.queries = queries.map(mq => ({ From 56bb6c64cdcabea0e009f2c670885a15cd173c02 Mon Sep 17 00:00:00 2001 From: Ori Livni Date: Thu, 20 Apr 2017 21:29:23 +0300 Subject: [PATCH 4/5] peer dep of prop-type now has looser semver --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 02a0262..97f791f 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "test": "karma start --single-run" }, "peerDependencies": { - "prop-types": "^15.5.8", + "prop-types": ">=15", "react": ">=15" }, "dependencies": { From 3839634e447ebb139d38c03d97a367724de1ceda Mon Sep 17 00:00:00 2001 From: Ori Livni Date: Thu, 4 May 2017 11:59:36 +0300 Subject: [PATCH 5/5] Making it support React 14 again --- package.json | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 97f791f..8a06154 100644 --- a/package.json +++ b/package.json @@ -20,11 +20,11 @@ "test": "karma start --single-run" }, "peerDependencies": { - "prop-types": ">=15", - "react": ">=15" + "react": ">=15 || ^0.14.7" }, "dependencies": { - "json2mq": "^0.2.0" + "json2mq": "^0.2.0", + "prop-types": ">=15" }, "devDependencies": { "babel-cli": "^6.11.4", @@ -49,9 +49,8 @@ "karma-webpack": "^2.0.1", "mocha": "^3.0.0", "pretty-bytes": "^4.0.2", - "prop-types": "^15.5.8", - "react": "^15.4.1", - "react-dom": "^15.3.0", + "react": "^15.4.1 || ^0.14.7", + "react-dom": "^15.3.0 || ^0.14.7", "readline-sync": "^1.4.4", "webpack": "^1.13.1" },