Skip to content

Commit 71da49f

Browse files
authored
Merge pull request #55 from JohnCampionJr/prettier
Added Prettier to ESLint / VSCode
2 parents 0efe17f + 27becd3 commit 71da49f

25 files changed

+248
-590
lines changed

Diff for: AspNetCoreVueStarter.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<Copyright>MIT 2021 Software Ateliers</Copyright>
1414
<AssemblyName>AspNetCoreVueStarter</AssemblyName>
1515
<RootNamespace>AspNetCoreVueStarter</RootNamespace>
16-
<Version>3.0.0</Version>
17-
<AssemblyVersion>3.0.0.0</AssemblyVersion>
18-
<FileVersion>3.0.0.0</FileVersion>
16+
<Version>3.1.0</Version>
17+
<AssemblyVersion>3.1.0.0</AssemblyVersion>
18+
<FileVersion>3.1.0.0</FileVersion>
1919
</PropertyGroup>
2020

2121
<ItemGroup>

Diff for: ClientApp/.eslintrc.js

+20-2
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,34 @@ module.exports = {
22
env: {
33
node: true
44
},
5-
'extends': [
5+
/* ES Lint Standard config
6+
extends: [
67
'plugin:vue/essential',
78
'@vue/standard',
89
'@vue/typescript/recommended'
910
],
11+
*/
12+
/* ESLint + Prettier config */
13+
extends: [
14+
'plugin:vue/essential',
15+
'eslint:recommended',
16+
'@vue/typescript/recommended',
17+
'@vue/prettier',
18+
'@vue/prettier/@typescript-eslint'
19+
],
1020
parserOptions: {
1121
ecmaVersion: 2020
1222
},
1323
rules: {
1424
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
15-
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
25+
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
26+
'space-before-function-paren': [
27+
'error',
28+
{
29+
anonymous: 'always',
30+
named: 'never',
31+
asyncArrow: 'always'
32+
}
33+
]
1634
}
1735
}

Diff for: ClientApp/.prettierrc

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"trailingComma": "none",
3+
"tabWidth": 2,
4+
"semi": false,
5+
"singleQuote": true,
6+
"printWidth": 100,
7+
"endOfLine": "auto"
8+
}

Diff for: ClientApp/babel.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
presets: ['@vue/cli-plugin-babel/preset']
3-
};
2+
presets: ['@vue/cli-plugin-babel/preset']
3+
}

0 commit comments

Comments
 (0)