From d2c102b50f0b15a89a2a66334923798b267ddeea Mon Sep 17 00:00:00 2001 From: xidedix Date: Thu, 10 Dec 2020 21:05:26 +0100 Subject: [PATCH 1/4] fix(CWidgetBrand): addHeaderClass bad PropTypes --- src/toast/tests/CToast.test.js | 17 +++++++++++------ src/widgets/CWidgetBrand.js | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/toast/tests/CToast.test.js b/src/toast/tests/CToast.test.js index 73555a2c..a5407a26 100644 --- a/src/toast/tests/CToast.test.js +++ b/src/toast/tests/CToast.test.js @@ -1,7 +1,8 @@ import React from 'react' import { configure, mount } from 'enzyme' import Adapter from 'enzyme-adapter-react-16' -import renderer from 'react-test-renderer'; +import { create } from 'react-test-renderer'; +import { act } from 'react-dom/test-utils'; import CToast from '../CToast' import CToaster from '../CToaster' @@ -10,12 +11,12 @@ configure({ adapter: new Adapter() }) describe('CToast', () => { it('renders basic wrapper correctly', () => { - const component = renderer.create(); + const component = create(); let tree = component.toJSON(); expect(tree).toMatchSnapshot() }) it('renders customized wrapper correctly', () => { - const componentCustomized = renderer.create( + const componentCustomized = create( { ); - jest.runAllTimers() + act(() => { + jest.runAllTimers() + }) console.log(component.html()); expect(component.find()).toHaveLength(0); }) @@ -64,8 +67,10 @@ describe('CToast', () => { ); - jest.runAllTimers() + act(() => { + jest.runAllTimers() + }) console.log(component.html()); expect(component.find()).toHaveLength(0); }) -}) \ No newline at end of file +}) diff --git a/src/widgets/CWidgetBrand.js b/src/widgets/CWidgetBrand.js index 0ea0894c..0f9932e2 100644 --- a/src/widgets/CWidgetBrand.js +++ b/src/widgets/CWidgetBrand.js @@ -73,7 +73,7 @@ CWidgetBrand.propTypes = { rightFooter: PropTypes.string, leftHeader: PropTypes.string, leftFooter: PropTypes.string, - addHeaderClasses: PropTypes.oneOfType([String, Array, Object]), + addHeaderClasses: PropTypes.oneOfType([PropTypes.string, PropTypes.array, PropTypes.object]), bodySlot: PropTypes.node }; From 7fc09a343da9b623548ebc99cddd5fe9bf40c956 Mon Sep 17 00:00:00 2001 From: xidedix Date: Thu, 10 Dec 2020 21:18:16 +0100 Subject: [PATCH 2/4] 3.3.6 version release --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6b05b97..38a1cad1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. Dates are displayed in UTC. +#### [3.3.6](https://github.com/coreui/coreui-react/compare/3.3.5...3.3.6) + +> 10 December 2020 + +- fix(CWidgetBrand): addHeaderClass bad PropTypes [`d2c102b`](https://github.com/coreui/coreui-react/commit/d2c102b50f0b15a89a2a66334923798b267ddeea) +- fix(stories): className [`ab3348a`](https://github.com/coreui/coreui-react/commit/ab3348a5aac8eb008c23a5cc6292a7836353a311) + #### [3.3.5](https://github.com/coreui/coreui-react/compare/3.3.4...3.3.5) > 9 December 2020 diff --git a/package.json b/package.json index cfdeef55..eefe37fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@coreui/react", - "version": "3.3.5", + "version": "3.3.6", "description": "CoreUI React Bootstrap 4 components", "license": "MIT", "author": { From 8b7abe8716aec3aa3757a1e25067931253c14c6f Mon Sep 17 00:00:00 2001 From: xidedix Date: Fri, 11 Dec 2020 21:13:09 +0100 Subject: [PATCH 3/4] chore: dependencies update --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 342bfa49..aefeea6e 100644 --- a/package.json +++ b/package.json @@ -78,6 +78,7 @@ "@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", @@ -85,7 +86,6 @@ "cross-env": "^7.0.3", "del-cli": "^3.0.1", "enzyme": "^3.11.0", - "@wojtekmaj/enzyme-adapter-react-17": "^0.3.2", "enzyme-to-json": "^3.6.1", "eslint": "^7.15.0", "eslint-plugin-import": "^2.22.1", @@ -101,7 +101,7 @@ "rollup": "^2.34.2", "rollup-plugin-peer-deps-external": "~2.2.4", "rollup-plugin-postcss": "^4.0.0", - "sinon": "^9.2.1", + "sinon": "^9.2.2", "webpack": "^4.44.2" }, "repository": { From ddaea52b12d05825e56f79275e30132b14b8db2b Mon Sep 17 00:00:00 2001 From: xidedix Date: Fri, 11 Dec 2020 21:40:01 +0100 Subject: [PATCH 4/4] chore: 3.4.0 version release for React 17 --- CHANGELOG.md | 6 ++++++ package.json | 4 ++-- src/README.md | 23 ++++++++++++++--------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14664d8f..6375b471 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. Dates are displayed in UTC. +#### [3.4.0](https://github.com/coreui/coreui-react/compare/3.4.0-beta.0...3.4.0) + +> 11 December 2020 + +- chore: dependencies update [`8b7abe8`](https://github.com/coreui/coreui-react/commit/8b7abe8716aec3aa3757a1e25067931253c14c6f) + #### [3.4.0-beta.0](https://github.com/coreui/coreui-react/compare/3.3.6...3.4.0-beta.0) > 10 December 2020 diff --git a/package.json b/package.json index aefeea6e..117b5b08 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@coreui/react", - "version": "3.4.0-beta.0", - "description": "CoreUI 3 React 17 Bootstrap 4 components", + "version": "3.4.0", + "description": "CoreUI React 17 Bootstrap 4 components", "license": "MIT", "author": { "name": "CoreUI", diff --git a/src/README.md b/src/README.md index 9e36d455..00e07c57 100644 --- a/src/README.md +++ b/src/README.md @@ -1,14 +1,19 @@ ## @coreui/react v3 for [CoreUI 3 for React](https://coreui.io/react/) -[![npm package][npm-badge]][npm] -[![npm next][npm-next]][npm] -[![NPM downloads][npm-download]][npm] +[![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-^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 -[npm-badge]: https://img.shields.io/npm/v/@coreui/react.png?style=flat-square -[npm-next]: https://img.shields.io/npm/v/@coreui/react/next.png?style=flat-square -[npm]: https://www.npmjs.com/package/@coreui/react -[npm-download]: https://img.shields.io/npm/dm/@coreui/react.svg?style=flat-square ```bash -npm install @coreui/react@next -``` \ No newline at end of file +npm install @coreui/react +```