From 8be8f97f6a9afbaf1724a4e1b5774844f3b3c83b Mon Sep 17 00:00:00 2001 From: Travis Mathis Date: Thu, 20 Apr 2017 08:06:10 -0400 Subject: [PATCH 1/4] updates react to 15.5 and fixes webpack unmet peer dependencies --- package.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 6d95d39..823e3be 100644 --- a/package.json +++ b/package.json @@ -15,13 +15,15 @@ "babel-preset-react": "^6.23.0", "babel-preset-stage-0": "^6.22.0", "babel-register": "^6.24.1", + "create-react-class": "^15.5.0", "enzyme": "^2.8.0", "enzyme-to-json": "^1.5.0", "identity-obj-proxy": "^3.0.0", "jest": "^19.0.2", - "react": "15.4.2", - "react-addons-test-utils": "15.4.2", - "react-dom": "15.4.2" + "react": "^15.5.0", + "react-addons-test-utils": "^15.5.0", + "react-dom": "^15.5.0", + "webpack": "^2.4.1" }, "scripts": { "build": "./node_modules/.bin/babel ReactFileReader.js -o index.js", From eb0a95ef0e696580a02d78984036a0329dbcf895 Mon Sep 17 00:00:00 2001 From: Travis Mathis Date: Thu, 20 Apr 2017 08:06:51 -0400 Subject: [PATCH 2/4] bumps verions number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 823e3be..ce306fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-file-reader", - "version": "1.0.2", + "version": "1.0.3", "description": "A flexible ReactJS component for handling styled HTML file inputs.", "main": "index.js", "repository": "git@github.com:GrillWork/react-file-reader.git", From 81bcf19bd666107817deefaa981bd457efee1496 Mon Sep 17 00:00:00 2001 From: Travis Mathis Date: Thu, 20 Apr 2017 08:09:18 -0400 Subject: [PATCH 3/4] updates README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8dbcf21..82484ab 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,8 @@ npm install react-file-reader --save ``` ## ChangeLog + - 1.0.3 + - bumps React version to 15.5 and fixes UNMET peer dependency with webpack - 1.0.2 - fixed an issue w/ prop-types not being available - 1.0.1 From cb4443752bbca45dd40368e36be7c9767411a749 Mon Sep 17 00:00:00 2001 From: Travis Mathis Date: Thu, 20 Apr 2017 08:14:55 -0400 Subject: [PATCH 4/4] pins prop-types dependency to matching versions --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ce306fe..a9a1f45 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,6 @@ }, "dependencies": { "uuid4": "^1.0.0", - "prop-types": "^15.5.4" + "prop-types": "^15.5.0" } }