Resolve conflicts (package.json)

Author: rakieta2015

.eslintrc.js

@@ -8,7 +8,7 @@ module.exports = {
     'eslint:recommended'
   ],
   rules: {
-    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'no-console': 'off',
     'vue/return-in-computed-property': 'off',
   },
   parserOptions: {

.github/workflows/daily-project-check.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [8.x, 10.x, 12.x]
+        node-version: [10.x, 12.x]
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:

.github/workflows/project-check.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [8.x, 10.x, 12.x]
+        node-version: [10.x, 12.x]
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:

CHANGELOG.md

@@ -5,7 +5,7 @@
 [![Downloads](https://img.shields.io/npm/dm/@coreui/vue.svg?style=flat-square)][coreui]
 [![Build](https://img.shields.io/github/workflow/status/coreui/coreui-vue/Project%20check?style=flat-square)][coreui]
 [![License](https://img.shields.io/npm/l/@coreui/vue?style=flat-square)][coreui]
-[![Coverage](https://img.shields.io/badge/test%20coverage%203.0.11%20version-100%25-yellowgreen)][coreui]
+[![Coverage](https://img.shields.io/badge/test%20coverage%203.0.12%20version-100%25-yellowgreen)][coreui]
 
 [npm-coreui-vue]: https://www.npmjs.com/package/@coreui/vue
 [npm-coreui-vue-badge-latest]: https://img.shields.io/npm/v/@coreui/vue/latest?style=flat-square&color=brightgreen  

README.md

@@ -5,16 +5,23 @@ const classes = getTypesClasses(types)
 function getTypesClasses (types) {
   let classes = {}
   const rawClasses = types.replace(/(\n|\r)/ig, '')
-                          .match(/(export declare|declare class).*?(})/g)
+                          .split('declare')
+                          .filter(rawClass => rawClass.includes('class'))
+
   rawClasses.forEach(rawClass => {
-    const name = rawClass.match(/(?<=class\s+).*?(?=\s+extends)/gs)[0]
+    const name = rawClass.match(/(?<=class\s+).*?(?=\s+)/gs)[0]
+
+    const propsRaw = rawClass
+      .substring(rawClass.indexOf('{') + 1, rawClass.lastIndexOf('}'))
+      .replace(/{(()([^}]))+}/ig, 'custom')
+
 
-    const propsRaw = rawClass.substring(rawClass.indexOf('{') + 1, rawClass.indexOf('}'))
     let props = propsRaw.match(/([a-zA-Z?]+:).*?(?=[a-zA-Z?]+:|$)/g)
-    if (props) {
-      props = props.map(prop => prop.trim())
-    }
 
+    if (props) {
+      props = props.map(prop => prop.trim().replace('?', ''))
+    }        
+    
     classes[name] = {
       isExported: rawClass.includes('export'),
       extend: rawClass.match(/(?<=extends\s+).*?(?=\s+{)/gs)[0],
@@ -24,7 +31,8 @@ function getTypesClasses (types) {
   Object.entries(classes).forEach(([key, value]) => {
     if (value.extend !== 'Vue') {
       const props = classes[key].props || []
-      classes[key].props = [...props, ...(classes[value.extend].props)]
+      const extend = classes[value.extend].props || []
+      classes[key].props = [...props, ...extend]
     }
   })
   return classes