Skip to content

Commit 7c49e27

Browse files
committed
chore: lint with prettier too
1 parent 83e89bc commit 7c49e27

File tree

7 files changed

+25
-52
lines changed

7 files changed

+25
-52
lines changed

Diff for: .eslintrc.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ const opts = {
1010
extends: [
1111
'eslint:recommended',
1212
'plugin:@typescript-eslint/recommended',
13-
'plugin:prettier/recommended',
13+
'prettier',
1414
],
15-
parser: '@typescript-eslint/parser',
16-
plugins: ['@typescript-eslint', 'prettier'],
1715
rules: {
1816
// unused vars will be handled by the TS compiler
1917
'@typescript-eslint/no-unused-vars': 'off',

Diff for: .prettierignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.yarn
2+
lib
3+
umd
4+
docs
5+
CHANGELOG.md
6+
implementations/*/README.md

Diff for: .yarnrc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ nodeLinker: node-modules
22

33
plugins:
44
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
5-
spec: "@yarnpkg/plugin-interactive-tools"
5+
spec: '@yarnpkg/plugin-interactive-tools'
66

77
yarnPath: .yarn/releases/yarn-3.2.4.cjs

Diff for: CODE_OF_CONDUCT.md

+13-13
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ appearance, race, religion, or sexual identity and orientation.
1414
Examples of behavior that contributes to creating a positive environment
1515
include:
1616

17-
* Using welcoming and inclusive language
18-
* Being respectful of differing viewpoints and experiences
19-
* Gracefully accepting constructive criticism
20-
* Focusing on what is best for the community
21-
* Showing empathy towards other community members
17+
- Using welcoming and inclusive language
18+
- Being respectful of differing viewpoints and experiences
19+
- Gracefully accepting constructive criticism
20+
- Focusing on what is best for the community
21+
- Showing empathy towards other community members
2222

2323
Examples of unacceptable behavior by participants include:
2424

25-
* The use of sexualized language or imagery and unwelcome sexual attention or
26-
advances
27-
* Trolling, insulting/derogatory comments, and personal or political attacks
28-
* Public or private harassment
29-
* Publishing others' private information, such as a physical or electronic
30-
address, without explicit permission
31-
* Other conduct which could reasonably be considered inappropriate in a
32-
professional setting
25+
- The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
- Trolling, insulting/derogatory comments, and personal or political attacks
28+
- Public or private harassment
29+
- Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
- Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
3333

3434
## Our Responsibilities
3535

Diff for: implementations/postgraphile/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ services:
2020
- ${PORT}:${PORT}
2121
entrypoint: postgraphile --host 0.0.0.0 --port ${PORT}
2222
healthcheck:
23-
test: "curl -f -H 'content-type: application/json' -d '{ \"query\": \"{ __typename }\" }' http://localhost:$$PORT/graphql || exit 1"
23+
test: 'curl -f -H "content-type: application/json" -d ''{ "query": "{ __typename }" }'' http://localhost:$$PORT/graphql || exit 1'
2424
interval: 3s
2525
timeout: 1s

Diff for: package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@
7272
},
7373
"scripts": {
7474
"gendocs": "typedoc --options typedoc.js src/",
75-
"lint": "eslint 'src'",
75+
"lint:eslint": "eslint 'src'",
76+
"lint:prettier": "prettier -c .",
77+
"lint": "yarn lint:eslint && yarn lint:prettier",
7678
"type-check": "tsc --noEmit",
7779
"test": "NODE_OPTIONS=--experimental-vm-modules jest",
7880
"build:esm": "tsc -b tsconfig.esm.json && node scripts/esm-post-process.mjs",
@@ -109,7 +111,6 @@
109111
"babel-jest": "^29.3.0",
110112
"eslint": "^8.27.0",
111113
"eslint-config-prettier": "^8.5.0",
112-
"eslint-plugin-prettier": "^4.2.1",
113114
"express": "^4.18.2",
114115
"fastify": "^4.9.2",
115116
"graphql": "^16.6.0",

Diff for: yarn.lock

-32
Original file line numberDiff line numberDiff line change
@@ -5998,21 +5998,6 @@ __metadata:
59985998
languageName: node
59995999
linkType: hard
60006000

6001-
"eslint-plugin-prettier@npm:^4.2.1":
6002-
version: 4.2.1
6003-
resolution: "eslint-plugin-prettier@npm:4.2.1"
6004-
dependencies:
6005-
prettier-linter-helpers: ^1.0.0
6006-
peerDependencies:
6007-
eslint: ">=7.28.0"
6008-
prettier: ">=2.0.0"
6009-
peerDependenciesMeta:
6010-
eslint-config-prettier:
6011-
optional: true
6012-
checksum: b9e839d2334ad8ec7a5589c5cb0f219bded260839a857d7a486997f9870e95106aa59b8756ff3f37202085ebab658de382b0267cae44c3a7f0eb0bcc03a4f6d6
6013-
languageName: node
6014-
linkType: hard
6015-
60166001
"eslint-scope@npm:^5.1.1":
60176002
version: 5.1.1
60186003
resolution: "eslint-scope@npm:5.1.1"
@@ -6323,13 +6308,6 @@ __metadata:
63236308
languageName: node
63246309
linkType: hard
63256310

6326-
"fast-diff@npm:^1.1.2":
6327-
version: 1.2.0
6328-
resolution: "fast-diff@npm:1.2.0"
6329-
checksum: 1b5306eaa9e826564d9e5ffcd6ebd881eb5f770b3f977fcbf38f05c824e42172b53c79920e8429c54eb742ce15a0caf268b0fdd5b38f6de52234c4a8368131ae
6330-
languageName: node
6331-
linkType: hard
6332-
63336311
"fast-glob@npm:^3.2.9":
63346312
version: 3.2.12
63356313
resolution: "fast-glob@npm:3.2.12"
@@ -6978,7 +6956,6 @@ __metadata:
69786956
babel-jest: ^29.3.0
69796957
eslint: ^8.27.0
69806958
eslint-config-prettier: ^8.5.0
6981-
eslint-plugin-prettier: ^4.2.1
69826959
express: ^4.18.2
69836960
fastify: ^4.9.2
69846961
graphql: ^16.6.0
@@ -10228,15 +10205,6 @@ __metadata:
1022810205
languageName: node
1022910206
linkType: hard
1023010207

10231-
"prettier-linter-helpers@npm:^1.0.0":
10232-
version: 1.0.0
10233-
resolution: "prettier-linter-helpers@npm:1.0.0"
10234-
dependencies:
10235-
fast-diff: ^1.1.2
10236-
checksum: 00ce8011cf6430158d27f9c92cfea0a7699405633f7f1d4a45f07e21bf78e99895911cbcdc3853db3a824201a7c745bd49bfea8abd5fb9883e765a90f74f8392
10237-
languageName: node
10238-
linkType: hard
10239-
1024010208
"prettier@npm:^2.7.1":
1024110209
version: 2.7.1
1024210210
resolution: "prettier@npm:2.7.1"

0 commit comments

Comments
 (0)