Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 0c62349

Browse filesBrowse files
rakieta2015rakieta2015
committed
Resolve conflicts (package.json)
2 parents 810f031 + 3c8c082 commit 0c62349
Copy full SHA for 0c62349

37 files changed

+2589
-3464
lines changed

‎.eslintrc.js

Copy file name to clipboardExpand all lines: .eslintrc.js
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
'eslint:recommended'
99
],
1010
rules: {
11-
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
11+
'no-console': 'off',
1212
'vue/return-in-computed-property': 'off',
1313
},
1414
parserOptions: {

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

Copy file name to clipboardExpand all lines: .github/workflows/daily-project-check.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
node-version: [8.x, 10.x, 12.x]
15+
node-version: [10.x, 12.x]
1616
os: [ubuntu-latest, windows-latest, macOS-latest]
1717

1818
steps:

‎.github/workflows/project-check.yml

Copy file name to clipboardExpand all lines: .github/workflows/project-check.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
node-version: [8.x, 10.x, 12.x]
14+
node-version: [10.x, 12.x]
1515
os: [ubuntu-latest, windows-latest, macOS-latest]
1616

1717
steps:

‎CHANGELOG.md

Copy file name to clipboardExpand all lines: CHANGELOG.md
+249-626Lines changed: 249 additions & 626 deletions
Large diffs are not rendered by default.

‎README.md

Copy file name to clipboardExpand all lines: README.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![Downloads](https://img.shields.io/npm/dm/@coreui/vue.svg?style=flat-square)][coreui]
66
[![Build](https://img.shields.io/github/workflow/status/coreui/coreui-vue/Project%20check?style=flat-square)][coreui]
77
[![License](https://img.shields.io/npm/l/@coreui/vue?style=flat-square)][coreui]
8-
[![Coverage](https://img.shields.io/badge/test%20coverage%203.0.11%20version-100%25-yellowgreen)][coreui]
8+
[![Coverage](https://img.shields.io/badge/test%20coverage%203.0.12%20version-100%25-yellowgreen)][coreui]
99

1010
[npm-coreui-vue]: https://www.npmjs.com/package/@coreui/vue
1111
[npm-coreui-vue-badge-latest]: https://img.shields.io/npm/v/@coreui/vue/latest?style=flat-square&color=brightgreen

‎build/buildVscodeHints.js

Copy file name to clipboardExpand all lines: build/buildVscodeHints.js
+15-7Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,23 @@ const classes = getTypesClasses(types)
55
function getTypesClasses (types) {
66
let classes = {}
77
const rawClasses = types.replace(/(\n|\r)/ig, '')
8-
.match(/(export declare|declare class).*?(})/g)
8+
.split('declare')
9+
.filter(rawClass => rawClass.includes('class'))
10+
911
rawClasses.forEach(rawClass => {
10-
const name = rawClass.match(/(?<=class\s+).*?(?=\s+extends)/gs)[0]
12+
const name = rawClass.match(/(?<=class\s+).*?(?=\s+)/gs)[0]
13+
14+
const propsRaw = rawClass
15+
.substring(rawClass.indexOf('{') + 1, rawClass.lastIndexOf('}'))
16+
.replace(/{(()([^}]))+}/ig, 'custom')
17+
1118

12-
const propsRaw = rawClass.substring(rawClass.indexOf('{') + 1, rawClass.indexOf('}'))
1319
let props = propsRaw.match(/([a-zA-Z?]+:).*?(?=[a-zA-Z?]+:|$)/g)
14-
if (props) {
15-
props = props.map(prop => prop.trim())
16-
}
1720

21+
if (props) {
22+
props = props.map(prop => prop.trim().replace('?', ''))
23+
}
24+
1825
classes[name] = {
1926
isExported: rawClass.includes('export'),
2027
extend: rawClass.match(/(?<=extends\s+).*?(?=\s+{)/gs)[0],
@@ -24,7 +31,8 @@ function getTypesClasses (types) {
2431
Object.entries(classes).forEach(([key, value]) => {
2532
if (value.extend !== 'Vue') {
2633
const props = classes[key].props || []
27-
classes[key].props = [...props, ...(classes[value.extend].props)]
34+
const extend = classes[value.extend].props || []
35+
classes[key].props = [...props, ...extend]
2836
}
2937
})
3038
return classes

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.