Skip to content
This repository was archived by the owner on Feb 24, 2023. It is now read-only.

Commit 566e7e2

Browse files
author
Łukasz Florczak
authored
Merge branch 'develop' into master
2 parents 48316c8 + 49e6d66 commit 566e7e2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+8103
-4830
lines changed

‎.babelrc‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.browserslistrc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
> 1%
2+
last 2 versions
3+
not ie <= 8

‎.editorconfig‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
# editorconfig.org
12
root = true
23

34
[*]
4-
charset = utf-8
55
indent_style = space
66
indent_size = 2
77
end_of_line = lf
8-
insert_final_newline = true
8+
charset = utf-8
99
trim_trailing_whitespace = true
10+
insert_final_newline = true
11+
12+
[*.md]
13+
trim_trailing_whitespace = false

‎.eslintignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
build/*.js
2-
config/*.js
1+
demo/*.js
2+
demo/*.vue

‎.eslintrc.js‎

Lines changed: 68 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,70 @@
1-
// http://eslint.org/docs/user-guide/configuring
2-
31
module.exports = {
4-
root: true,
5-
parser: 'babel-eslint',
6-
parserOptions: {
7-
sourceType: 'module'
8-
},
9-
env: {
10-
browser: true,
11-
},
12-
// https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
13-
extends: 'standard',
14-
// required to lint *.vue files
15-
plugins: [
16-
'html'
17-
],
18-
// add your custom rules here
19-
'rules': {
20-
// 4 spaces indend
21-
'indent': [2, 4],
22-
// single quotes
23-
'quotes': [2, 'single'],
24-
// allow paren-less arrow functions
25-
'arrow-parens': 0,
26-
// allow async-await
27-
'generator-star-spacing': 0,
28-
// allow debugger during development
29-
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
30-
}
2+
root: true,
3+
env: {
4+
node: true
5+
},
6+
'extends': [
7+
'plugin:vue/essential',
8+
'@vue/standard'
9+
],
10+
rules: {
11+
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
12+
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
13+
'no-multiple-empty-lines': [2, { 'max': 2, 'maxEOF': 1 }],
14+
'no-tabs': 0,
15+
// 'indent': [2, 'tab'],
16+
'indent': 'off',
17+
'vue/script-indent': ['error', 'tab', {
18+
'baseIndent': 1,
19+
'switchCase': 1
20+
}],
21+
'vue/html-indent': ['error', 'tab', {
22+
'attribute': 0,
23+
'baseIndent': 1,
24+
'closeBracket': 0,
25+
'alignAttributesVertically': false,
26+
'ignores': []
27+
}],
28+
// single quotes
29+
'quotes': [2, 'single'],
30+
// allow paren-less arrow functions
31+
'arrow-parens': 0,
32+
// allow async-await
33+
'generator-star-spacing': 0,
34+
35+
'vue/order-in-components': ['error', {
36+
'order': [
37+
'el',
38+
'name',
39+
'parent',
40+
'functional',
41+
['delimiters', 'comments'],
42+
['components', 'directives', 'filters'],
43+
'extends',
44+
'mixins',
45+
'inheritAttrs',
46+
'model',
47+
['props', 'propsData'],
48+
'data',
49+
'computed',
50+
'watch',
51+
'beforeCreate',
52+
'created',
53+
'beforeMount',
54+
'mounted',
55+
'beforeUpdate',
56+
'updated',
57+
'activated',
58+
'deactivated',
59+
'beforeDestroy',
60+
'destroyed',
61+
'methods',
62+
['template', 'render'],
63+
'renderError'
64+
]
65+
}]
66+
},
67+
parserOptions: {
68+
parser: 'babel-eslint'
69+
}
3170
}

‎.gitignore‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
.DS_Store
2-
node_modules/
3-
.idea/
4-
npm-debug.log
5-
yarn-error.log
6-
dist/
2+
node_modules
3+
/dist
4+
5+
# local env files
6+
.env.local
7+
.env.*.local
8+
9+
# Log files
10+
npm-debug.log*
11+
yarn-debug.log*
12+
yarn-error.log*
13+
14+
# Editor directories and files
15+
.idea
16+
.vscode
17+
*.suo
18+
*.ntvs*
19+
*.njsproj
20+
*.sln
21+
*.sw?

‎.npmignore‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
1-
.DS_Store
2-
node_modules/
3-
npm-debug.log
4-
yarn-error.log
5-
.babelrc
6-
.editorconfig
7-
.eslintrc.js
8-
.gitignore
91
demo/
102
docs/
11-
gh-pages/
12-
static/
13-
build/
14-
.eslintignore
3+
node_modules/
4+
.idea/
5+
tests/
6+
public/

‎LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2017 CePixel
3+
Copyright (c) 2017 Łukasz Florczak
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
21+
SOFTWARE.

0 commit comments

Comments
 (0)