Skip to content

Commit 3ea9f2c

Browse files
authored
Merge pull request #130 from durandom/prettier
prettier
2 parents 06665f8 + 54816fb commit 3ea9f2c

29 files changed

+9236
-8608
lines changed

.eslintrc.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
env:
22
browser: true
33
es2021: true
4-
extends: plugin:react/recommended
4+
extends:
5+
- plugin:react/recommended
6+
- eslint:recommended
7+
- prettier
8+
- react-app
59
parserOptions:
610
ecmaFeatures:
711
jsx: true
812
ecmaVersion: latest
913
sourceType: module
1014
plugins:
1115
- react
16+
- prettier
1217
rules: {}

.pre-commit-config.yaml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,49 @@
11
---
22
repos:
33
- repo: https://github.com/Lucas-C/pre-commit-hooks
4-
rev: v1.1.10
4+
rev: v1.1.11
55
hooks:
66
- id: remove-tabs
77
exclude: Makefile
88

99
- repo: https://github.com/pre-commit/mirrors-eslint
10-
rev: "v8.0.0-beta.0"
10+
rev: v8.13.0
1111
hooks:
1212
- id: eslint
1313
args:
1414
- --fix
1515
additional_dependencies:
1616
- eslint
17-
- eslint-config-prettier
18-
- eslint-config-stylelint
17+
- "@typescript-eslint/eslint-plugin"
18+
- "@typescript-eslint/parser"
19+
- typescript
20+
- eslint-plugin-react
1921
- eslint-plugin-prettier
22+
- eslint-config-stylelint
23+
- eslint-config-react-app
24+
- eslint-config-prettier
2025
- babel-eslint
2126
- prettier
22-
- eslint-plugin-react
27+
28+
- repo: https://github.com/pre-commit/mirrors-prettier
29+
rev: v2.6.2
30+
hooks:
31+
- id: prettier
32+
files: \.(js|ts|tsx)$
2333

2434
- repo: https://github.com/pre-commit/pre-commit-hooks
25-
rev: v4.0.1
35+
rev: v4.1.0
2636
hooks:
2737
- id: trailing-whitespace
2838
- id: check-merge-conflict
2939
- id: end-of-file-fixer
3040
- id: check-added-large-files
3141
- id: check-case-conflict
32-
- id: check-json
33-
- id: check-symlinks
3442
- id: detect-private-key
3543

44+
- id: check-yaml
45+
args: [--allow-multiple-documents]
46+
3647
- repo: https://github.com/adrienverge/yamllint.git
3748
rev: v1.26.2
3849
hooks:

gatsby-config.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ module.exports = {
44
siteUrl: `https://operate-first.cloud/`,
55
},
66
plugins: [
7-
87
{
98
resolve: `@lekoarts/gatsby-theme-minimal-blog-core`,
109
options: {
11-
basePath: '/blog'
10+
basePath: '/blog',
1211
},
1312
},
1413

@@ -44,8 +43,8 @@ module.exports = {
4443
{
4544
resolve: `gatsby-plugin-manifest`,
4645
options: {
47-
icon: `src/assets/opf-logo.png`
46+
icon: `src/assets/opf-logo.png`,
4847
},
4948
},
5049
],
51-
}
50+
};

0 commit comments

Comments
 (0)