From 9fc6bd513ae6ab0cf6ad203567ccaf5139755232 Mon Sep 17 00:00:00 2001 From: Andrew Smith Date: Thu, 8 Mar 2018 18:52:11 +0100 Subject: [PATCH 1/5] Include React 16 in peer dependencies. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bf6b827..d50ea16 100644 --- a/package.json +++ b/package.json @@ -60,6 +60,6 @@ "sinon": "^1.10.3" }, "peerDependencies": { - "react": "^15.0.2" + "react": "^15.0.2 || ^16" } } From 4ec01c80a605ffad1796f32d938a9767df82a93a Mon Sep 17 00:00:00 2001 From: Andrew Smith Date: Thu, 8 Mar 2018 18:58:40 +0100 Subject: [PATCH 2/5] Try adding react-dom as well to fix the build. --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index d50ea16..2b5c3e0 100644 --- a/package.json +++ b/package.json @@ -60,6 +60,7 @@ "sinon": "^1.10.3" }, "peerDependencies": { - "react": "^15.0.2 || ^16" + "react": "^15.0.2 || ^16.0.0", + "react-dom": "^15.0.2 || ^16.0.0" } } From 4906939febda46c98a9641b0a120b22180dcd47a Mon Sep 17 00:00:00 2001 From: Andrew Smith Date: Thu, 8 Mar 2018 19:05:45 +0100 Subject: [PATCH 3/5] Upgrade react-dom dependency. --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 2b5c3e0..8727885 100644 --- a/package.json +++ b/package.json @@ -56,11 +56,10 @@ "matchdep": "^0.3.0", "mocha": "latest", "q": "^1.0.1", - "react-dom": "^15.0.2", + "react-dom": "^15.0.2 || ^16.0.0", "sinon": "^1.10.3" }, "peerDependencies": { - "react": "^15.0.2 || ^16.0.0", - "react-dom": "^15.0.2 || ^16.0.0" + "react": "^15.0.2 || ^16.0.0" } } From a7fe5d2f9e0615edfbe7260a565810bf6ebe2a80 Mon Sep 17 00:00:00 2001 From: Andrew Ewing Date: Tue, 8 May 2018 14:47:05 -0700 Subject: [PATCH 4/5] Use React 16 for Travis CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5a7d38f..6b91a3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ env: - secure: B0emLHNPO7BVpq2lT/KAPW1miUOhgODa/qoVqYbFspcdoBVfJmO1FpcgEppE8fuEecaOv9QfSI3hwGOUkzm9kp8HFde8ZenR5beauhfploXMQB/bbNjd0cBz0ORRMwzsTFg9GeWcnStr+9H05833W84K3N1oy3ShT68kYRWObh4= - secure: LZNuke26p3RYq5jbSB1oDlG8AeCY1fm8uBoVWmCdKKmmgV/+nKXDgdYygE/yeAPm39XnZ8jGH64ctHVixpgc8TQDa9ZCwOr1q3SWVL+dVAwhKm7WQ9/v2yW/c/zOEuYzvGqr1ylAC8PfwqYA6ShGUnSWAua7TIOeYqdtAjGbU1k= matrix: - - REACT_VERSION="15" + - REACT_VERSION="16" before_install: - "export DISPLAY=:99.0" From 1d119186507ab211961d304bfe2165a118bb5ed9 Mon Sep 17 00:00:00 2001 From: Andrew Ewing Date: Tue, 8 May 2018 15:18:30 -0700 Subject: [PATCH 5/5] Use React 15* in Travis CI and install react-dom --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6b91a3c..7e92c6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,14 +8,14 @@ env: - secure: B0emLHNPO7BVpq2lT/KAPW1miUOhgODa/qoVqYbFspcdoBVfJmO1FpcgEppE8fuEecaOv9QfSI3hwGOUkzm9kp8HFde8ZenR5beauhfploXMQB/bbNjd0cBz0ORRMwzsTFg9GeWcnStr+9H05833W84K3N1oy3ShT68kYRWObh4= - secure: LZNuke26p3RYq5jbSB1oDlG8AeCY1fm8uBoVWmCdKKmmgV/+nKXDgdYygE/yeAPm39XnZ8jGH64ctHVixpgc8TQDa9ZCwOr1q3SWVL+dVAwhKm7WQ9/v2yW/c/zOEuYzvGqr1ylAC8PfwqYA6ShGUnSWAua7TIOeYqdtAjGbU1k= matrix: - - REACT_VERSION="16" + - REACT_VERSION="15" before_install: - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" before_script: - - "npm install react@$REACT_VERSION" + - "npm install react@$REACT_VERSION react-dom@$REACT_VERSION" script: - npm test