Skip to content

Commit bd71506

Browse files
chore(): run format & lint
1 parent 3e525f0 commit bd71506

File tree

53 files changed

+219
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+219
-208
lines changed

.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
packages/tests/**
1+
packages/**/tests/**

.eslintrc.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
module.exports = {
22
parser: '@typescript-eslint/parser',
33
parserOptions: {
4-
project: 'tsconfig.json',
4+
project: 'packages/tsconfig.build.json',
55
sourceType: 'module',
66
},
77
plugins: ['@typescript-eslint/eslint-plugin'],
88
extends: [
99
'plugin:@typescript-eslint/eslint-recommended',
1010
'plugin:@typescript-eslint/recommended',
11-
'prettier',
12-
'prettier/@typescript-eslint',
11+
'plugin:prettier/recommended',
1312
],
1413
root: true,
1514
env: {
@@ -24,5 +23,6 @@ module.exports = {
2423
'@typescript-eslint/no-unused-vars': 'off',
2524
'@typescript-eslint/explicit-module-boundary-types': 'off',
2625
'@typescript-eslint/ban-types': 'off',
26+
'@typescript-eslint/no-empty-function': 'off'
2727
},
2828
};

package.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"build": "tsc -b -v packages",
1313
"changelog": "lerna-changelog",
1414
"clean": "tsc -b --clean packages",
15-
"format": "prettier **/**/*.ts --ignore-path ./.prettierignore --write",
16-
"lint": "eslint 'lib/**/*.ts' --fix",
15+
"format": "prettier {packages,tests}/**/*.ts --ignore-path ./.prettierignore --write",
16+
"lint": "eslint '{packages,tests}/**/*.ts' --fix",
1717
"prepublish:npm": "npm run build && npm run changelog | pbcopy",
1818
"publish:npm": "lerna publish --conventional-commits",
1919
"prepublish:next": "npm run build",
@@ -27,19 +27,20 @@
2727
"devDependencies": {
2828
"@commitlint/cli": "15.0.0",
2929
"@commitlint/config-angular": "15.0.0",
30-
"@typescript-eslint/eslint-plugin": "5.7.0",
31-
"@typescript-eslint/parser": "5.7.0",
3230
"@types/graphql": "14.5.0",
3331
"@types/jest": "27.0.3",
3432
"@types/node": "17.0.0",
3533
"@types/node-fetch": "3.0.3",
3634
"@types/normalize-path": "3.0.0",
3735
"@types/ws": "8.2.2",
36+
"@typescript-eslint/eslint-plugin": "5.7.0",
37+
"@typescript-eslint/parser": "5.7.0",
3838
"class-transformer": "0.5.1",
3939
"class-validator": "0.13.2",
4040
"eslint": "8.6.0",
4141
"eslint-config-prettier": "8.3.0",
4242
"eslint-plugin-import": "2.25.4",
43+
"eslint-plugin-prettier": "^4.0.0",
4344
"graphql": "15.8.0",
4445
"graphql-subscriptions": "2.0.0",
4546
"husky": "7.0.4",
@@ -68,7 +69,8 @@
6869
},
6970
"lint-staged": {
7071
"*.ts": [
71-
"prettier --write"
72+
"prettier --write",
73+
"eslint --fix"
7274
]
7375
},
7476
"husky": {

packages/apollo/tests/e2e/graphql-federation.spec.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ describe('GraphQL Federation', () => {
109109
{
110110
id: '1',
111111
title: 'HELLO WORLD',
112-
body:
113-
'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
112+
body: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
114113
},
115114
],
116115
},
@@ -141,8 +140,7 @@ describe('GraphQL Federation', () => {
141140
{
142141
id: '1',
143142
title: 'HELLO WORLD',
144-
body:
145-
'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
143+
body: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
146144
user: {
147145
id: '5',
148146
},
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/*
32
* -------------------------------------------------------
43
* THIS FILE WAS AUTOMATICALLY GENERATED (DO NOT MODIFY)
@@ -8,10 +7,10 @@
87
/* tslint:disable */
98
/* eslint-disable */
109
export interface Foo {
11-
a: string[];
12-
b?: Nullable<string[]>;
13-
c: Nullable<string>[];
14-
d?: Nullable<Nullable<string>[]>;
10+
a: string[];
11+
b?: Nullable<string[]>;
12+
c: Nullable<string>[];
13+
d?: Nullable<Nullable<string>[]>;
1514
}
1615

1716
type Nullable<T> = T | null;

packages/apollo/tests/generated-definitions/custom-header.fixture.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/*
32
* -------------------------------------------------------
43
* THIS FILE WAS AUTOMATICALLY GENERATED (DO NOT MODIFY)

packages/apollo/tests/generated-definitions/custom-scalar-default-type.fixture.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/*
32
* -------------------------------------------------------
43
* THIS FILE WAS AUTOMATICALLY GENERATED (DO NOT MODIFY)

packages/apollo/tests/generated-definitions/custom-scalar-type-mapping.fixture.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/*
32
* -------------------------------------------------------
43
* THIS FILE WAS AUTOMATICALLY GENERATED (DO NOT MODIFY)

packages/apollo/tests/generated-definitions/custom-scalar.fixture.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/*
32
* -------------------------------------------------------
43
* THIS FILE WAS AUTOMATICALLY GENERATED (DO NOT MODIFY)
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/*
32
* -------------------------------------------------------
43
* THIS FILE WAS AUTOMATICALLY GENERATED (DO NOT MODIFY)
@@ -7,5 +6,5 @@
76

87
/* tslint:disable */
98
/* eslint-disable */
10-
export type Foobar = "Foo" | "Bar" | "Baz";
9+
export type Foobar = 'Foo' | 'Bar' | 'Baz';
1110
type Nullable<T> = T | null;

0 commit comments

Comments
 (0)