Merge branch 'main' into test-toggle-bug

carbon-design-system · Nov 8, 2021 · cbcbe7d · cbcbe7d
2 parents 352525c + c06edfa
commit cbcbe7d
Show file tree

Hide file tree

Showing 80 changed files with 846 additions and 1,621 deletions.
diff --git a/.yarn/cache/@wojtekmaj-enzyme-adapter-react-17-npm-0.6.5-be29261ad7-110f9a8a59.zip b/.yarn/cache/@wojtekmaj-enzyme-adapter-react-17-npm-0.6.5-be29261ad7-110f9a8a59.zip
diff --git a/...tils-npm-1.14.0-3639386aab-a96a0a1bdf.zip → ...utils-npm-0.1.1-3f976b0aa2-dc3dd0c2da.zip b/...tils-npm-1.14.0-3639386aab-a96a0a1bdf.zip → ...utils-npm-0.1.1-3f976b0aa2-dc3dd0c2da.zip
diff --git a/.yarn/cache/airbnb-prop-types-npm-2.16.0-d794f5271c-393a5988b9.zip b/.yarn/cache/airbnb-prop-types-npm-2.16.0-d794f5271c-393a5988b9.zip
diff --git a/.yarn/cache/array.prototype.find-npm-2.1.1-12d8dac121-805574b144.zip b/.yarn/cache/array.prototype.find-npm-2.1.1-12d8dac121-805574b144.zip
diff --git a/.yarn/cache/enzyme-adapter-react-16-npm-1.15.6-4b0fcfdfcc-b0f31037c7.zip b/.yarn/cache/enzyme-adapter-react-16-npm-1.15.6-4b0fcfdfcc-b0f31037c7.zip
diff --git a/...ract-npm-1.18.3-d113127c45-6bbf526b5a.zip → ...ract-npm-1.19.1-885c72759a-b6be841067.zip b/...ract-npm-1.18.3-d113127c45-6bbf526b5a.zip → ...ract-npm-1.19.1-885c72759a-b6be841067.zip
diff --git a/.yarn/cache/get-symbol-description-npm-1.0.0-9c95a4bc1f-9ceff8fe96.zip b/.yarn/cache/get-symbol-description-npm-1.0.0-9c95a4bc1f-9ceff8fe96.zip
diff --git a/.yarn/cache/has-tostringtag-npm-1.0.0-b1fcf3ab55-cc12eb28cb.zip b/.yarn/cache/has-tostringtag-npm-1.0.0-b1fcf3ab55-cc12eb28cb.zip
diff --git a/.yarn/cache/is-callable-npm-1.2.3-2a68c9d549-084a732afd.zip b/.yarn/cache/is-callable-npm-1.2.3-2a68c9d549-084a732afd.zip
diff --git a/.yarn/cache/is-callable-npm-1.2.4-03fc17459c-1a28d57dc4.zip b/.yarn/cache/is-callable-npm-1.2.4-03fc17459c-1a28d57dc4.zip
diff --git a/.yarn/cache/is-regex-npm-1.1.3-5a00a17388-19a831a1ba.zip b/.yarn/cache/is-regex-npm-1.1.3-5a00a17388-19a831a1ba.zip
diff --git a/.yarn/cache/is-regex-npm-1.1.4-cca193ef11-362399b335.zip b/.yarn/cache/is-regex-npm-1.1.4-cca193ef11-362399b335.zip
diff --git a/.yarn/cache/is-shared-array-buffer-npm-1.0.1-84bc270861-2ffb92533e.zip b/.yarn/cache/is-shared-array-buffer-npm-1.0.1-84bc270861-2ffb92533e.zip
diff --git a/.yarn/cache/is-string-npm-1.0.6-2e7dbd354f-9990bf0abf.zip b/.yarn/cache/is-string-npm-1.0.6-2e7dbd354f-9990bf0abf.zip
diff --git a/.yarn/cache/is-string-npm-1.0.7-9f7066daed-323b3d0462.zip b/.yarn/cache/is-string-npm-1.0.7-9f7066daed-323b3d0462.zip
diff --git a/.yarn/cache/is-weakref-npm-1.0.1-152a166933-fdafb7b955.zip b/.yarn/cache/is-weakref-npm-1.0.1-152a166933-fdafb7b955.zip
diff --git a/...pect-npm-1.10.3-5aa499f036-9a56db2e01.zip → ...pect-npm-1.11.0-c9d4bd1487-8c64f89ce3.zip b/...pect-npm-1.10.3-5aa499f036-9a56db2e01.zip → ...pect-npm-1.11.0-c9d4bd1487-8c64f89ce3.zip
diff --git a/.yarn/cache/object.fromentries-npm-2.0.4-cc608f8739-1e8e991c43.zip b/.yarn/cache/object.fromentries-npm-2.0.4-cc608f8739-1e8e991c43.zip
diff --git a/.yarn/cache/object.fromentries-npm-2.0.5-68ed942fa7-61a0b565de.zip b/.yarn/cache/object.fromentries-npm-2.0.5-68ed942fa7-61a0b565de.zip
diff --git a/.yarn/cache/prop-types-exact-npm-1.2.0-4664209648-21676a16d5.zip b/.yarn/cache/prop-types-exact-npm-1.2.0-4664209648-21676a16d5.zip
diff --git a/.yarn/cache/react-dom-npm-16.9.0-676727ac16-a053a86f9b.zip b/.yarn/cache/react-dom-npm-16.9.0-676727ac16-a053a86f9b.zip
diff --git a/.yarn/cache/react-dom-npm-17.0.2-f551215af1-1c1eaa3bca.zip b/.yarn/cache/react-dom-npm-17.0.2-f551215af1-1c1eaa3bca.zip
diff --git a/.yarn/cache/react-is-npm-16.9.0-2891aafea9-7a13745053.zip b/.yarn/cache/react-is-npm-16.9.0-2891aafea9-7a13745053.zip
diff --git a/.yarn/cache/react-is-npm-17.0.2-091bbb8db6-9d6d111d89.zip b/.yarn/cache/react-is-npm-17.0.2-091bbb8db6-9d6d111d89.zip
diff --git a/.yarn/cache/react-npm-16.9.0-e480f74f7e-47346b9377.zip b/.yarn/cache/react-npm-16.9.0-e480f74f7e-47346b9377.zip
diff --git a/.yarn/cache/react-npm-17.0.2-99ba37d931-b254cc17ce.zip b/.yarn/cache/react-npm-17.0.2-99ba37d931-b254cc17ce.zip
diff --git a/.yarn/cache/react-shallow-renderer-npm-16.14.1-b8a4f845ff-f344c663c4.zip b/.yarn/cache/react-shallow-renderer-npm-16.14.1-b8a4f845ff-f344c663c4.zip
diff --git a/.yarn/cache/react-test-renderer-npm-16.9.0-39b08f2f78-fae8d354ed.zip b/.yarn/cache/react-test-renderer-npm-16.9.0-39b08f2f78-fae8d354ed.zip
diff --git a/.yarn/cache/react-test-renderer-npm-17.0.2-1086717127-e6b5c6ed2a.zip b/.yarn/cache/react-test-renderer-npm-17.0.2-1086717127-e6b5c6ed2a.zip
diff --git a/.yarn/cache/reflect.ownkeys-npm-0.2.0-e3d8f6e4f0-9530b16656.zip b/.yarn/cache/reflect.ownkeys-npm-0.2.0-e3d8f6e4f0-9530b16656.zip
diff --git a/.yarn/cache/scheduler-npm-0.15.0-1a95ff71f2-75920a8288.zip b/.yarn/cache/scheduler-npm-0.15.0-1a95ff71f2-75920a8288.zip
diff --git a/.yarn/cache/scheduler-npm-0.20.2-90beaecfba-c4b35cf967.zip b/.yarn/cache/scheduler-npm-0.20.2-90beaecfba-c4b35cf967.zip
diff --git a/config/jest-config-carbon/package.json b/config/jest-config-carbon/package.json
@@ -27,12 +27,12 @@
     "@babel/preset-env": "^7.14.7",
     "@babel/preset-react": "^7.14.5",
     "@babel/runtime": "^7.14.6",
+    "@wojtekmaj/enzyme-adapter-react-17": "^0.6.5",
     "accessibility-checker": "^3.1.9",
     "axe-core": "^4.3.2",
     "babel-jest": "^27.0.6",
     "chalk": "^4.1.1",
     "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.6",
     "enzyme-to-json": "^3.6.2",
     "jest-circus": "^27.0.6",
     "jest-watch-typeahead": "^0.6.4"

diff --git a/config/jest-config-carbon/setup/setup.js b/config/jest-config-carbon/setup/setup.js
@@ -18,7 +18,7 @@ global.requestAnimationFrame = function requestAnimationFrame(callback) {
 };
 
 const enzyme = jest.requireActual('enzyme');
-const Adapter = jest.requireActual('enzyme-adapter-react-16');
+const Adapter = jest.requireActual('@wojtekmaj/enzyme-adapter-react-17');
 
 enzyme.configure({ adapter: new Adapter() });
 

diff --git a/package.json b/package.json
@@ -30,10 +30,10 @@
   "resolutions": {
     "ast-types": "^0.14.0",
     "node-sass": "^6.0.0",
-    "react": "~16.9.0",
-    "react-dom": "~16.9.0",
-    "react-is": "~16.9.0",
-    "react-test-renderer": "~16.9.0"
+    "react": "~17.0.2",
+    "react-dom": "~17.0.2",
+    "react-is": "~17.0.2",
+    "react-test-renderer": "~17.0.2"
   },
   "devDependencies": {
     "@babel/core": "^7.14.6",
@@ -66,8 +66,8 @@
     "lint-staged": "^11.1.1",
     "node-gyp": "^7.1.2",
     "prettier": "^2.2.1",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
     "rimraf": "^3.0.0",
     "stylelint": "^13.13.1"
   },

diff --git a/packages/carbon-react/__tests__/index-test.js b/packages/carbon-react/__tests__/index-test.js
@@ -98,6 +98,8 @@ Array [
   "PaginationNav",
   "PaginationSkeleton",
   "PasswordInput",
+  "Popover",
+  "PopoverContent",
   "PrimaryButton",
   "ProgressIndicator",
   "ProgressIndicatorSkeleton",

diff --git a/packages/carbon-react/package.json b/packages/carbon-react/package.json
@@ -79,8 +79,8 @@
     "postcss-custom-properties": "^11.0.0",
     "postcss-loader": "4",
     "prop-types": "^15.7.2",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
     "rimraf": "^3.0.2",
     "rollup": "^2.46.0",
     "rollup-plugin-strip-banner": "^2.0.0",

diff --git a/packages/carbon-react/src/components/Popover/Popover.stories.js b/packages/carbon-react/src/components/Popover/Popover.stories.js
diff --git a/packages/carbon-react/src/components/Popover/index.js b/packages/carbon-react/src/components/Popover/index.js
diff --git a/packages/carbon-react/src/components/Popover/story.scss b/packages/carbon-react/src/components/Popover/story.scss
diff --git a/packages/carbon-react/src/index.js b/packages/carbon-react/src/index.js
@@ -199,6 +199,8 @@ export {
   unstable_HStack as HStack,
   unstable_Stack as Stack,
   unstable_VStack as VStack,
+  unstable_Popover as Popover,
+  unstable_PopoverContent as PopoverContent,
 } from 'carbon-components-react';
 
 export {

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -156,9 +156,9 @@
     "postcss-loader": "^3.0.0",
     "promise": "^8.0.1",
     "prop-types": "^15.6.0",
-    "react": "^16.8.6",
+    "react": "^17.0.2",
     "react-copy-to-clipboard": "^5.0.0",
-    "react-dom": "^16.8.6",
+    "react-dom": "^17.0.2",
     "react-ga": "^3.3.0",
     "rollup": "^2.46.0",
     "rollup-plugin-filesize": "^9.1.1",