Merge branch 'dev-react-17'

Author: xidedix

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [3.4.0-beta.0](https://github.com/coreui/coreui-react/compare/3.3.6...3.4.0-beta.0)
+
+> 10 December 2020
+
+- test: enzyme-adapter-react-17 temp fix [`9a93f26`](https://github.com/coreui/coreui-react/commit/9a93f2610254f5584eb5e8f70b34a8456b3a2dc8)
+- chore: update to React 17 and dependencies [`dc7e219`](https://github.com/coreui/coreui-react/commit/dc7e219546b6c2a41a060042ce619e84fb1140ae)
+- test(CToast): use act() from react-dom/test-utils [`fce83f8`](https://github.com/coreui/coreui-react/commit/fce83f810768ed67a27acc2f9b10c4e845d91092)
+- fix(stories): className [`ab3348a`](https://github.com/coreui/coreui-react/commit/ab3348a5aac8eb008c23a5cc6292a7836353a311)
+- test(CDataTable): snap update className fix [`d6e58d5`](https://github.com/coreui/coreui-react/commit/d6e58d5003426184e632071d9a8fe2e38b73baad)
+- fix(CWidgetBrand): addHeaderClass bad PropTypes [`937a713`](https://github.com/coreui/coreui-react/commit/937a71394614d8bd66524900fdd415d8dc6f5918)
+
 #### [3.3.6](https://github.com/coreui/coreui-react/compare/3.3.5...3.3.6)
 
 > 10 December 2020

README.md

@@ -2,13 +2,15 @@
 
 [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=CoreUI%20-%20Free%20Vue%20Admin%20Template%20&url=http://coreui.io/react/&hashtags=bootstrap,admin,template,dashboard,panel,free,angular,react,vue)  
 [![npm_latest][npm-coreui-react-badge-latest]][npm-coreui-react]
+[![npm next][npm-coreui-react-badge-next]][npm-coreui-react]
 [![NPM downloads][npm-coreui-react-download]][npm-coreui-react]
 [![Build](https://img.shields.io/github/workflow/status/coreui/coreui-react/Project%20check?style=flat-square)][coreui]  
-[![react](https://img.shields.io/badge/react-^16.14.0-lightgrey.svg?style=flat-square&logo=react)][coreui]
+[![react](https://img.shields.io/badge/react-^17.0.1-lightgrey.svg?style=flat-square&logo=react)][coreui]
 
 [npm-coreui-react-download]: https://img.shields.io/npm/dm/@coreui/react.svg?style=flat-square
 [npm-coreui-react]: https://www.npmjs.com/package/@coreui/react
 [npm-coreui-react-badge-latest]: https://img.shields.io/npm/v/@coreui/react/latest?style=flat-square
+[npm-coreui-react-badge-next]: https://img.shields.io/npm/v/@coreui/react/next?style=flat-square
 [coreui]: https://coreui.io/react
 
 ##### @coreui/react v3 for [CoreUI 3 for React](https://coreui.io/react/)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coreui/react",
-  "version": "3.3.6",
-  "description": "CoreUI React Bootstrap 4 components",
+  "version": "3.4.0-beta.0",
+  "description": "CoreUI 3 React 17 Bootstrap 4 components",
   "license": "MIT",
   "author": {
     "name": "CoreUI",
@@ -57,8 +57,8 @@
     "tippy.js": "^6.2.7"
   },
   "peerDependencies": {
-    "react": "^16.14.0",
-    "react-dom": "^16.14.0",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1",
     "react-router-dom": "^5.2.0"
   },
   "devDependencies": {
@@ -72,35 +72,36 @@
     "@babel/preset-react": "^7.12.7",
     "@coreui/coreui": "^3.4.0",
     "@rollup/plugin-babel": "^5.2.2",
-    "@rollup/plugin-commonjs": "^15.1.0",
-    "@rollup/plugin-node-resolve": "^9.0.0",
+    "@rollup/plugin-commonjs": "^17.0.0",
+    "@rollup/plugin-node-resolve": "^10.0.0",
     "@rollup/plugin-replace": "^2.3.4",
     "@storybook/addon-knobs": "^6.1.10",
     "@storybook/addon-storysource": "^6.1.10",
     "@storybook/react": "^6.1.10",
+    "@wojtekmaj/enzyme-adapter-react-17": "^0.3.2",
     "auto-changelog": "~2.2.1",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^26.6.3",
     "babel-loader": "^8.2.2",
     "cross-env": "^7.0.3",
     "del-cli": "^3.0.1",
     "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.5",
     "enzyme-to-json": "^3.6.1",
     "eslint": "^7.15.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-react": "^7.21.5",
     "expect": "^26.6.2",
     "jest": "^26.6.3",
-    "react": "^16.14.0",
+    "postcss": "^8.2.1",
+    "react": "^17.0.1",
     "react-app-polyfill": "^2.0.0",
-    "react-dom": "^16.14.0",
+    "react-dom": "^17.0.1",
     "react-router-dom": "^5.2.0",
-    "react-test-renderer": "^16.14.0",
+    "react-test-renderer": "^17.0.1",
     "rollup": "^2.34.2",
     "rollup-plugin-peer-deps-external": "~2.2.4",
-    "rollup-plugin-postcss": "~3.1.8",
-    "sinon": "^9.2.1",
+    "rollup-plugin-postcss": "^4.0.0",
+    "sinon": "^9.2.2",
     "webpack": "^4.44.2"
   },
   "repository": {

src/alert/tests/CAlert.test.js

@@ -1,7 +1,7 @@
 import React from 'react'
 //import { renderHook, act } from '@testing-library/react-hooks'
 import { configure, mount, shallow } from 'enzyme'
-import Adapter from 'enzyme-adapter-react-16'
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17'
 import renderer from 'react-test-renderer';
 
 import CAlert from '../CAlert'
@@ -66,4 +66,4 @@ describe('CAlert', () => {
     jest.advanceTimersByTime(1000)
     expect(onClose).toHaveBeenCalledTimes(2);
   })
-})
+})

src/badge/tests/CBadge.test.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { configure, mount } from 'enzyme'
-import Adapter from 'enzyme-adapter-react-16'
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17'
 import renderer from 'react-test-renderer';
 
 import CBadge from '../CBadge'
@@ -27,4 +27,4 @@ describe('CBadge', () => {
     let tree = componentCustomized.toJSON();
     expect(tree).toMatchSnapshot()
   })
-})
+})

src/breadcrumb/tests/CBreadcrumb.test.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { configure, mount } from 'enzyme'
-import Adapter from 'enzyme-adapter-react-16'
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17'
 import renderer from 'react-test-renderer';
 
 import CBreadcrumb from '../CBreadcrumb'
@@ -30,4 +30,4 @@ describe('CBreadcrumb', () => {
     let tree = componentCustomized.toJSON();
     expect(tree).toMatchSnapshot()
   })
-})
+})

src/button/tests/CButton.test.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { configure, mount } from 'enzyme'
-import Adapter from 'enzyme-adapter-react-16'
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17'
 import renderer from 'react-test-renderer';
 
 import CButton from '../CButton'
@@ -69,4 +69,4 @@ describe('CButton', () => {
     expect(closeFn).toHaveBeenCalledTimes(1);
   })
 
-})
+})

src/button/tests/CButtonClose.test.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { configure, mount } from 'enzyme'
-import Adapter from 'enzyme-adapter-react-16'
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17'
 import renderer from 'react-test-renderer';
 
 import CButtonClose from '../CButtonClose'
@@ -24,4 +24,4 @@ describe('CButtonClose', () => {
     let tree = componentCustomized.toJSON();
     expect(tree).toMatchSnapshot()
   })
-})
+})

src/button/tests/CButtonGroup.test.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { configure, mount } from 'enzyme'
-import Adapter from 'enzyme-adapter-react-16'
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17'
 import renderer from 'react-test-renderer';
 
 import CButtonGroup from '../CButtonGroup'
@@ -40,4 +40,4 @@ describe('CButtonGroup', () => {
     let tree = componentCustomized.toJSON();
     expect(tree).toMatchSnapshot()
   })
-})
+})

src/button/tests/CButtonToolbar.test.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { configure, mount } from 'enzyme'
-import Adapter from 'enzyme-adapter-react-16'
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17'
 import renderer from 'react-test-renderer';
 
 import CButtonToolbar from '../CButtonToolbar'
@@ -25,4 +25,4 @@ describe('CButtonToolbar', () => {
     let tree = componentCustomized.toJSON();
     expect(tree).toMatchSnapshot()
   })
-})
+})