Skip to content

Commit

Permalink
chore: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
nodkz committed May 11, 2021
1 parent 644c983 commit 53751f0
Show file tree
Hide file tree
Showing 4 changed files with 204 additions and 210 deletions.
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = {
preset: 'ts-jest',
globals: {
'ts-jest': {
tsConfig: '<rootDir>/tsconfig.json',
tsconfig: '<rootDir>/tsconfig.json',
isolatedModules: true,
diagnostics: false,
},
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,21 @@
"@types/glob": "7.1.3",
"@types/jest": "26.0.23",
"@types/lodash.sortby": "^4.7.6",
"@types/node": "15.0.1",
"@typescript-eslint/eslint-plugin": "4.22.0",
"@typescript-eslint/parser": "4.22.0",
"apollo-server": "2.23.0",
"eslint": "7.25.0",
"@types/node": "15.0.2",
"@typescript-eslint/eslint-plugin": "4.23.0",
"@typescript-eslint/parser": "4.23.0",
"apollo-server": "2.24.0",
"eslint": "7.26.0",
"eslint-config-prettier": "8.3.0",
"eslint-plugin-prettier": "3.4.0",
"graphql": "15.5.0",
"graphql-compose": "8.0.1",
"graphql-compose": "8.1.0",
"jest": "26.6.3",
"lodash.sortby": "^4.7.0",
"prettier": "2.2.1",
"prettier": "2.3.0",
"rimraf": "3.0.2",
"semantic-release": "17.4.2",
"ts-jest": "26.5.5",
"ts-jest": "26.5.6",
"ts-node": "9.1.1",
"typescript": "4.2.4"
},
Expand Down
30 changes: 15 additions & 15 deletions src/__tests__/astMerge-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,27 @@ describe('astMerge', () => {
const schema = astToSchema(mergedAst);

expect(schema.toSDL()).toMatchInlineSnapshot(`
"type Mutation {
"type Query {
\\"\\"\\"B.query.me\\"\\"\\"
me: String
tasks: QueryTasks
}
type Mutation {
\\"\\"\\"A.mutation.createTask\\"\\"\\"
createTask: String
}
type Query {
\\"\\"\\"B.query.me\\"\\"\\"
me: String
tasks: QueryTasks
type Subscription {
\\"\\"\\"B.subscription.events\\"\\"\\"
events: String
}
\\"\\"\\"
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.
\\"\\"\\"
scalar String
type QueryTasks {
\\"\\"\\"B.query.tasks.byId\\"\\"\\"
byId: String
Expand All @@ -36,16 +46,6 @@ describe('astMerge', () => {
\\"\\"\\"B.query.tasks.byIds\\"\\"\\"
byIds: String
}
\\"\\"\\"
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.
\\"\\"\\"
scalar String
type Subscription {
\\"\\"\\"B.subscription.events\\"\\"\\"
events: String
}"
`);
});
Expand Down
Loading

0 comments on commit 53751f0

Please sign in to comment.