Merge branch 'v4-next' into main-merge-next

Author: mrholek

.eslintrc.js

@@ -18,7 +18,7 @@ module.exports = {
     'plugin:react/recommended',
     'plugin:@typescript-eslint/recommended',
     'plugin:prettier/recommended',
-    "plugin:unicorn/recommended",
+    'plugin:unicorn/recommended',
   ],
   parser: '@typescript-eslint/parser',
   parserOptions: {
@@ -36,12 +36,37 @@ module.exports = {
     },
   },
   rules: {
-    "unicorn/filename-case": "off",
-    "unicorn/no-array-for-each": "off",
-    "unicorn/no-null": "off",
-    "unicorn/prefer-dom-node-append": "off",
-    "unicorn/prefer-export-from": "off",
-    "unicorn/prefer-query-selector": "off",
-    "unicorn/prevent-abbreviations": "off",
-  }
+    'unicorn/filename-case': 'off',
+    'unicorn/no-array-for-each': 'off',
+    'unicorn/no-null': 'off',
+    'unicorn/prefer-dom-node-append': 'off',
+    'unicorn/prefer-export-from': 'off',
+    'unicorn/prefer-query-selector': 'off',
+    'unicorn/prevent-abbreviations': 'off',
+  },
+  overrides: [
+    {
+      files: ['packages/docs/build/**'],
+      env: {
+        browser: false,
+        node: true,
+      },
+      parserOptions: {
+        sourceType: 'script',
+      },
+      rules: {
+        '@typescript-eslint/no-var-requires': 'off',
+        'no-console': 'off',
+        'unicorn/prefer-module': 'off',
+        'unicorn/prefer-top-level-await': 'off',
+      },
+    },
+    {
+      files: ['packages/docs/**'],
+      rules: {
+        '@typescript-eslint/no-var-requires': 'off',
+        'unicorn/prefer-module': 'off',
+      },
+    },
+  ],
 }

README.md

@@ -46,7 +46,7 @@
 
 Several quick start options are available:
 
-- [Download the latest release](https://github.com/coreui/coreui-react/archive/v4.8.0.zip)
+- [Download the latest release](https://github.com/coreui/coreui-react/archive/v4.9.0-beta.2.zip)
 - Clone the repo: `git clone https://github.com/coreui/coreui-react.git`
 - Install with [npm](https://www.npmjs.com/): `npm install @coreui/react`
 - Install with [yarn](https://yarnpkg.com/): `yarn add @coreui/react`

lerna.json

@@ -1,8 +1,6 @@
 {
   "npmClient": "yarn",
-  "packages": [
-    "packages/*"
-  ],
-  "useWorkspaces": true,
-  "version": "4.2.2"
+  "packages": ["packages/*"],
+  "version": "4.9.0-beta.2",
+  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

package.json

@@ -22,16 +22,24 @@
     "test:update": "npm-run-all charts:test:update icons:test:update lib:test:update"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.55.0",
-    "@typescript-eslint/parser": "^5.55.0",
-    "eslint": "8.36.0",
-    "eslint-config-prettier": "^8.7.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.11",
+    "@typescript-eslint/parser": "^5.59.11",
+    "eslint": "8.43.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-unicorn": "^46.0.0",
-    "lerna": "^6.5.1",
+    "eslint-plugin-unicorn": "^47.0.0",
+    "lerna": "^7.1.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.8.4"
+    "prettier": "^2.8.8"
+  },
+  "overrides": {
+    "gatsby-remark-external-links": {
+      "unist-util-find": "1.0.2"
+    }
+  },
+  "resolutions": {
+    "**/gatsby-remark-external-links/unist-util-find": "1.0.2"
   }
-}
+}

packages/coreui-react/README.md

@@ -46,7 +46,7 @@
 
 Several quick start options are available:
 
-- [Download the latest release](https://github.com/coreui/coreui-react/archive/v4.8.0.zip)
+- [Download the latest release](https://github.com/coreui/coreui-react/archive/v4.9.0-beta.2.zip)
 - Clone the repo: `git clone https://github.com/coreui/coreui-react.git`
 - Install with [npm](https://www.npmjs.com/): `npm install @coreui/react`
 - Install with [yarn](https://yarnpkg.com/): `yarn add @coreui/react`

packages/coreui-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coreui/react",
-  "version": "4.8.0",
+  "version": "4.9.0-beta.2",
   "description": "UI Components Library for React.js",
   "keywords": [
     "react",
@@ -37,15 +37,15 @@
     "test:update": "jest --coverage --updateSnapshot"
   },
   "devDependencies": {
-    "@popperjs/core": "^2.11.6",
-    "@rollup/plugin-commonjs": "^24.0.1",
-    "@rollup/plugin-node-resolve": "^15.0.1",
-    "@rollup/plugin-typescript": "^11.0.0",
+    "@popperjs/core": "^2.11.8",
+    "@rollup/plugin-commonjs": "^25.0.1",
+    "@rollup/plugin-node-resolve": "^15.1.0",
+    "@rollup/plugin-typescript": "^11.1.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
-    "@types/react": "18.0.28",
-    "@types/react-dom": "^18.0.11",
-    "@types/react-transition-group": "^4.4.5",
+    "@types/react": "18.2.12",
+    "@types/react-dom": "^18.2.5",
+    "@types/react-transition-group": "^4.4.6",
     "classnames": "^2.3.2",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
@@ -54,12 +54,13 @@
     "react-dom": "^18.2.0",
     "react-popper": "^2.3.0",
     "react-transition-group": "^4.4.5",
-    "rollup": "^3.19.1",
-    "tslib": "^2.5.0",
-    "ts-jest": "^29.0.5",
+    "rollup": "^3.25.1",
+    "ts-jest": "^29.1.0",
+    "tslib": "^2.5.3",
     "typescript": "^4.9.5"
   },
   "peerDependencies": {
+    "@coreui/coreui": "4.2.6",
     "react": ">=17",
     "react-dom": ">=17"
   }

packages/coreui-react/src/components/accordion/__tests__/__snapshots__/CAccordionCollapse.spec.tsx.snap

@@ -4,10 +4,4 @@ import { CAccordionButton } from './CAccordionButton'
 import { CAccordionHeader } from './CAccordionHeader'
 import { CAccordionItem } from './CAccordionItem'
 
-export {
-  CAccordion,
-  CAccordionBody,
-  CAccordionButton,
-  CAccordionHeader,
-  CAccordionItem,
-}
+export { CAccordion, CAccordionBody, CAccordionButton, CAccordionHeader, CAccordionItem }