Skip to content

Commit 0574c6b

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/codspeed-vitest
# Conflicts: # package.json
2 parents 0cc1c05 + 858aa32 commit 0574c6b

Some content is hidden

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

67 files changed

+2186
-666
lines changed

.husky/pre-commit

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
npm run precommit

.lintstagedrc.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"*.{js,ts}": [
3+
"eslint --max-warnings 0 --rulesdir resources/eslint-internal-rules/ --fix",
4+
"prettier --write"
5+
],
6+
"*.json": "prettier --write",
7+
"*.md": "prettier --write"
8+
}

integrationTests/ts/kitchenSink-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ new GraphQLScalarType({
88
name: 'SomeScalar',
99
serialize: undefined,
1010
parseValue: undefined,
11-
parseConstLiteral: undefined,
11+
coerceInputLiteral: undefined,
1212
});
1313

1414
new GraphQLError('test', { nodes: undefined });

0 commit comments

Comments
 (0)