Merge branch 'master' of github.com:carbon-design-system/carbon into …

…storybook-prop-rendering
carbon-design-system · Nov 18, 2020 · a0aabb5 · a0aabb5
2 parents ce6b5b5 + fae7d82
commit a0aabb5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/packages/icons-react/package.json b/packages/icons-react/package.json
@@ -32,8 +32,12 @@
     "build": "yarn clean && node tasks/build.js",
     "clean": "rimraf es lib umd"
   },
+  "peerDependencies": {
+    "react": ">=16"
+  },
   "dependencies": {
-    "@carbon/icon-helpers": "^10.9.0"
+    "@carbon/icon-helpers": "^10.9.0",
+    "prop-types": "^15.7.2"
   },
   "devDependencies": {
     "@carbon/icon-build-helpers": "^0.11.0",

diff --git a/packages/pictograms-react/package.json b/packages/pictograms-react/package.json
@@ -32,8 +32,12 @@
     "build": "yarn clean && node tasks/build.js",
     "clean": "rimraf es lib umd"
   },
+  "peerDependencies": {
+    "react": ">=16"
+  },
   "dependencies": {
-    "@carbon/icon-helpers": "^10.9.0"
+    "@carbon/icon-helpers": "^10.9.0",
+    "prop-types": "^15.7.2"
   },
   "devDependencies": {
     "@carbon/icon-build-helpers": "^0.11.0",

diff --git a/yarn.lock b/yarn.lock
@@ -20740,7 +20740,7 @@ react-docgen@^5.0.0:
 
 react-dom@^16.6.0, react-dom@^16.8.3, react-dom@^16.8.6, react-dom@^16.9.0, react-dom@~16.9.0:
   version "16.9.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962"
+  resolved "https://registry.npmjs.org/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962"
   integrity sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ==
   dependencies:
     loose-envify "^1.1.0"
@@ -20828,7 +20828,7 @@ react-inspector@^4.0.0:
 
 react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.2, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0, react-is@^17.0.1, react-is@~16.9.0:
   version "16.9.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb"
+  resolved "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb"
   integrity sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==
 
 react-lifecycles-compat@^3.0.4:
@@ -20894,7 +20894,7 @@ react-syntax-highlighter@^11.0.2:
 
 react-test-renderer@^16.0.0-0, react-test-renderer@^16.8.6, react-test-renderer@~16.9.0:
   version "16.9.0"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.9.0.tgz#7ed657a374af47af88f66f33a3ef99c9610c8ae9"
+  resolved "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.9.0.tgz#7ed657a374af47af88f66f33a3ef99c9610c8ae9"
   integrity sha512-R62stB73qZyhrJo7wmCW9jgl/07ai+YzvouvCXIJLBkRlRqLx4j9RqcLEAfNfU3OxTGucqR2Whmn3/Aad6L3hQ==
   dependencies:
     object-assign "^4.1.1"
@@ -20922,7 +20922,7 @@ react-transition-group@^2.2.1:
 
 react@^16.6.0, react@^16.8.3, react@^16.8.6, react@^16.9.0, react@~16.9.0:
   version "16.9.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz#40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa"
+  resolved "https://registry.npmjs.org/react/-/react-16.9.0.tgz#40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa"
   integrity sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==
   dependencies:
     loose-envify "^1.1.0"