Skip to content

Commit 53751f0

Browse files
committed
chore: update dependencies
1 parent 644c983 commit 53751f0

File tree

4 files changed

+204
-210
lines changed

4 files changed

+204
-210
lines changed

jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module.exports = {
22
preset: 'ts-jest',
33
globals: {
44
'ts-jest': {
5-
tsConfig: '<rootDir>/tsconfig.json',
5+
tsconfig: '<rootDir>/tsconfig.json',
66
isolatedModules: true,
77
diagnostics: false,
88
},

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@
2121
"@types/glob": "7.1.3",
2222
"@types/jest": "26.0.23",
2323
"@types/lodash.sortby": "^4.7.6",
24-
"@types/node": "15.0.1",
25-
"@typescript-eslint/eslint-plugin": "4.22.0",
26-
"@typescript-eslint/parser": "4.22.0",
27-
"apollo-server": "2.23.0",
28-
"eslint": "7.25.0",
24+
"@types/node": "15.0.2",
25+
"@typescript-eslint/eslint-plugin": "4.23.0",
26+
"@typescript-eslint/parser": "4.23.0",
27+
"apollo-server": "2.24.0",
28+
"eslint": "7.26.0",
2929
"eslint-config-prettier": "8.3.0",
3030
"eslint-plugin-prettier": "3.4.0",
3131
"graphql": "15.5.0",
32-
"graphql-compose": "8.0.1",
32+
"graphql-compose": "8.1.0",
3333
"jest": "26.6.3",
3434
"lodash.sortby": "^4.7.0",
35-
"prettier": "2.2.1",
35+
"prettier": "2.3.0",
3636
"rimraf": "3.0.2",
3737
"semantic-release": "17.4.2",
38-
"ts-jest": "26.5.5",
38+
"ts-jest": "26.5.6",
3939
"ts-node": "9.1.1",
4040
"typescript": "4.2.4"
4141
},

src/__tests__/astMerge-test.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,27 @@ describe('astMerge', () => {
1616
const schema = astToSchema(mergedAst);
1717

1818
expect(schema.toSDL()).toMatchInlineSnapshot(`
19-
"type Mutation {
19+
"type Query {
20+
\\"\\"\\"B.query.me\\"\\"\\"
21+
me: String
22+
tasks: QueryTasks
23+
}
24+
25+
type Mutation {
2026
\\"\\"\\"A.mutation.createTask\\"\\"\\"
2127
createTask: String
2228
}
2329
24-
type Query {
25-
\\"\\"\\"B.query.me\\"\\"\\"
26-
me: String
27-
tasks: QueryTasks
30+
type Subscription {
31+
\\"\\"\\"B.subscription.events\\"\\"\\"
32+
events: String
2833
}
2934
35+
\\"\\"\\"
36+
The \`String\` scalar type represents textual data, represented as UTF-8 character sequences. The String type is most often used by GraphQL to represent free-form human-readable text.
37+
\\"\\"\\"
38+
scalar String
39+
3040
type QueryTasks {
3141
\\"\\"\\"B.query.tasks.byId\\"\\"\\"
3242
byId: String
@@ -36,16 +46,6 @@ describe('astMerge', () => {
3646
3747
\\"\\"\\"B.query.tasks.byIds\\"\\"\\"
3848
byIds: String
39-
}
40-
41-
\\"\\"\\"
42-
The \`String\` scalar type represents textual data, represented as UTF-8 character sequences. The String type is most often used by GraphQL to represent free-form human-readable text.
43-
\\"\\"\\"
44-
scalar String
45-
46-
type Subscription {
47-
\\"\\"\\"B.subscription.events\\"\\"\\"
48-
events: String
4949
}"
5050
`);
5151
});

0 commit comments

Comments
 (0)