From 135a92e6fdc124ef6029825b7127ae0fb736ee6c Mon Sep 17 00:00:00 2001 From: Adam Rybinski Date: Wed, 20 Mar 2019 14:41:25 +0100 Subject: [PATCH 1/4] Move react and react-dom to peerDependencies --- packages/react/package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/react/package.json b/packages/react/package.json index b4b56ef9ff..85ba073351 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -28,9 +28,11 @@ "homepage": "https://github.com/IBM/carbon-charts#readme", "dependencies": { "@carbon/charts": "^0.11.0", - "react": "16.6.3", - "react-dom": "16.6.3" }, + "peerDependencies": { + "react": "16.6.3", + "react-dom": "16.6.3" + }, "devDependencies": { "@storybook/addon-options": "4.0.7", "@storybook/react": "4.0.7", From 3848bd2dd46a50575794769a6dd055cd02882246 Mon Sep 17 00:00:00 2001 From: Adam Rybinski Date: Wed, 20 Mar 2019 14:59:58 +0100 Subject: [PATCH 2/4] Add fixed versions to devDependencies --- packages/react/package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/react/package.json b/packages/react/package.json index 85ba073351..1b55d85807 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -30,8 +30,8 @@ "@carbon/charts": "^0.11.0", }, "peerDependencies": { - "react": "16.6.3", - "react-dom": "16.6.3" + "react": "^16.6.3", + "react-dom": "^16.6.3" }, "devDependencies": { "@storybook/addon-options": "4.0.7", @@ -49,6 +49,8 @@ "css-loader": "0.28.7", "img-loader": "2.0.0", "node-sass": "4.10.0", + "react": "16.6.3", + "react-dom": "16.6.3" "rollup": "0.67.3", "rollup-plugin-babel": "3.0.4", "rollup-plugin-commonjs": "9.2.0", From 5e1bc69d8368e761d76c94d02289dbbdc617fa3a Mon Sep 17 00:00:00 2001 From: Adam Rybinski Date: Wed, 20 Mar 2019 15:00:48 +0100 Subject: [PATCH 3/4] Fix typo --- packages/react/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/package.json b/packages/react/package.json index 1b55d85807..2320fea331 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -50,7 +50,7 @@ "img-loader": "2.0.0", "node-sass": "4.10.0", "react": "16.6.3", - "react-dom": "16.6.3" + "react-dom": "16.6.3", "rollup": "0.67.3", "rollup-plugin-babel": "3.0.4", "rollup-plugin-commonjs": "9.2.0", From fe0ff956d37da49c4eaddd74bf84a0d8ec088bf4 Mon Sep 17 00:00:00 2001 From: Callum Smith <1744185+cal-smith@users.noreply.github.com> Date: Wed, 20 Mar 2019 15:12:41 +0100 Subject: [PATCH 4/4] Apply suggestions from code review Co-Authored-By: arybinski --- packages/react/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/package.json b/packages/react/package.json index 2320fea331..52ac7d654c 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -27,7 +27,7 @@ }, "homepage": "https://github.com/IBM/carbon-charts#readme", "dependencies": { - "@carbon/charts": "^0.11.0", + "@carbon/charts": "^0.11.0" }, "peerDependencies": { "react": "^16.6.3",