Skip to content

Commit bd4fadf

Browse files
authored
Merge pull request #25 from Relequestual/develop
Short share URLs!
2 parents 7bb4e31 + f72a880 commit bd4fadf

16 files changed

+3388
-3255
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ yarn-error.log*
2020
*.sln
2121
*.sw*
2222
*.sublime-workspace
23-
*.sublime-project
23+
*.sublime-project
24+
json-schema-check.code-workspace

.prettierrc

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
trailingComma: "es5"
2+
tabWidth: 2
3+
singleQuote: true
4+
requirePragma: false
5+
bracketSpacing: true

package.json

+21-9
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"bootstrap-vue": "^2.0.0-rc.12",
1919
"file": "^0.2.2",
2020
"jsonlint": "^1.6.3",
21-
"lodash": "^4.17.11",
21+
"lodash": "^4.17.13",
2222
"lz-string": "^1.4.4",
2323
"lzma": "^2.3.2",
2424
"style-loader": "^0.23.1",
@@ -27,32 +27,44 @@
2727
"vue-analytics": "^5.16.4",
2828
"vue-clipboard2": "^0.3.0",
2929
"vue-codemirror": "^4.0.6",
30-
"vue-router": "^3.0.6"
30+
"vue-loading-overlay": "^3.2.0",
31+
"vue-router": "^3.0.6",
32+
"yourls": "^1.0.2"
3133
},
3234
"devDependencies": {
33-
"@vue/cli-plugin-babel": "^3.4.0",
34-
"@vue/cli-plugin-eslint": "^3.4.0",
35-
"@vue/cli-service": "^3.4.0",
35+
"@vue/cli-plugin-babel": "^4.1.2",
36+
"@vue/cli-plugin-eslint": "^4.1.2",
37+
"@vue/cli-service": "^4.1.2",
3638
"babel-eslint": "^10.0.1",
37-
"eslint": "^5.16.0",
38-
"eslint-plugin-vue": "^5.2.2",
39+
"eslint": "^6.8.0",
40+
"eslint-config-prettier": "^6.9.0",
41+
"eslint-plugin-vue": "^6.1.2",
42+
"prettier": "^1.18.2",
3943
"vue-template-compiler": "^2.5.21"
4044
},
4145
"eslintConfig": {
4246
"root": true,
4347
"env": {
4448
"node": true
4549
},
50+
"plugins": [
51+
"vue"
52+
],
4653
"extends": [
4754
"plugin:vue/essential",
4855
"plugin:vue/recommended",
49-
"eslint:recommended"
56+
"eslint:recommended",
57+
"prettier"
5058
],
5159
"rules": {
5260
"vue/max-attributes-per-line": [
5361
"error",
5462
{
55-
"singleline": 2
63+
"singleline": 5,
64+
"multiline": {
65+
"max": 1,
66+
"allowFirstLine": true
67+
}
5668
}
5769
]
5870
},

0 commit comments

Comments
 (0)