Skip to content

Commit

Permalink
Merge pull request #1091 from c2corg/prettier
Browse files Browse the repository at this point in the history
Use prettier for formatting
  • Loading branch information
brunobesson committed May 15, 2020
2 parents 2e04769 + 564c5f0 commit bd64d06
Show file tree
Hide file tree
Showing 327 changed files with 14,786 additions and 14,371 deletions.
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules/
tools/
src/assets/font-awesome-custom/
71 changes: 3 additions & 68 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
"env": {
"node": true
},
"extends": [
"plugin:vue/recommended",
"eslint:recommended",
"@vue/standard"
],
"extends": ["plugin:vue/recommended", "@vue/prettier"],
"rules": {
"no-unused-vars": "warn",
"no-console": "warn",
Expand All @@ -19,70 +15,9 @@
"vue/no-use-v-if-with-v-for": "error",
"vue/prop-name-casing": ["error", "camelCase"],
"eqeqeq": "warn",
"camelcase": "off",

"no-trailing-spaces": "off",
"semi": [
"error",
"always"
],
"quotes": "off",
"object-curly-spacing": "warn",
"brace-style": [
"warn",
"1tbs",
{
"allowSingleLine": false
}
],
"space-before-function-paren": [
"warn",
"never"
],
"object-shorthand": [
"error",
"always"
],
"no-var": "error",
"prefer-const": "error",
"no-multi-assign": "error",
"space-infix-ops": "warn",
"indent": [
"off",
2
],
"vue/html-indent": [
"off",
2
],
"vue/script-indent": [
"off",
2,
{
"baseIndent": 1
}
],
"vue/no-multi-spaces": "warn",
"vue/max-attributes-per-line": ["warn", {
"singleline": 4,
"multiline": {
"max": 1,
"allowFirstLine": false
}
}],
"vue/html-closing-bracket-newline": "off",
"vue/html-closing-bracket-spacing": "off",
"array-bracket-spacing": "off",
"vue/multiline-html-element-content-newline": "off",
"vue/singleline-html-element-content-newline": "off",
"quote-props": "off",
"object-curly-newline": "off",
"dot-notation": "off",
"vue/no-spaces-around-equal-signs-in-attribute": "off",
"lines-between-class-members": "off",
"keyword-spacing": "off"
"camelcase": "off"
},
"parserOptions": {
"parser": "babel-eslint"
}
}
}
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
src/assets/font-awesome-custom/
src/translations/
7 changes: 7 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"semi": true,
"vueIndentScriptAndStyle": false,
"endOfLine": "lf",
"singleQuote": true,
"printWidth": 120
}
21 changes: 9 additions & 12 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
module.exports = {
presets: [
['@vue/cli-plugin-babel/preset', {
// see https://cli.vuejs.org/guide/browser-compatibility.html#usebuiltins-usage
// those are set only for IE11 and can be dropped when abandonned
polyfills: [
'es6.promise',
'es6.symbol',
'es6.array.from',
'es6.object.assign',
'es7.object.values'
]
}]
]
[
'@vue/cli-plugin-babel/preset',
{
// see https://cli.vuejs.org/guide/browser-compatibility.html#usebuiltins-usage
// those are set only for IE11 and can be dropped when abandonned
polyfills: ['es6.promise', 'es6.symbol', 'es6.array.from', 'es6.object.assign', 'es7.object.values'],
},
],
],
};

0 comments on commit bd64d06

Please sign in to comment.