Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ardatan/graphql-tools
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v6.2.1
Choose a base ref
...
head repository: ardatan/graphql-tools
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v6.2.2
Choose a head ref
  • 17 commits
  • 39 files changed
  • 7 contributors

Commits on Sep 4, 2020

  1. v6.2.1

    theguild-bot committed Sep 4, 2020
    Copy the full SHA
    42a11d9 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9f7730f View commit details

Commits on Sep 5, 2020

  1. [deploy_website] enhance(docs) simplify merged interface docs (#2002)

    * simplify merged interfaces.
    
    * tweak wording.
    gmac authored Sep 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4b60627 View commit details

Commits on Sep 7, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8631aa6 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a166063 View commit details

Commits on Sep 8, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9f961e7 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    07ecd5b View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    62c4cb3 View commit details
  4. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ab82111 View commit details
  5. Wait for CI before automerge

    ardatan committed Sep 8, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    94d11f5 View commit details
  6. Temp disable no-unused-vars

    ardatan committed Sep 8, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    a4c5e18 View commit details

Commits on Sep 9, 2020

  1. Do not fail if it is fork

    ardatan committed Sep 9, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    414e963 View commit details
  2. revert

    ardatan committed Sep 9, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    0833425 View commit details

Commits on Sep 10, 2020

  1. Increase maxBuffer to 1MB (#2018)

    My `graphql.schema.json` grown to 1.5KB, and my schema validation broke. The error I'm getting is: 
    `Error: Unable to load file from git: RangeError [ERR_CHILD_PROCESS_STDIO_MAXBUFFER]: stdout maxBuffer length exceeded`
    
    Fix is easy: increase buffer size to 1MB (default value was 1KB)
    standy authored Sep 10, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    df6e0ae View commit details
  2. chore(deps-dev): bump @types/babel__traverse from 7.0.13 to 7.0.14 (#…

    …2014)
    
    Bumps [@types/babel__traverse](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/babel__traverse) from 7.0.13 to 7.0.14.
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/babel__traverse)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Sep 10, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    73f11c9 View commit details

Commits on Sep 11, 2020

  1. enhance(stitch) Test merge conflicts (#2006)

    * test merge conflicts.
    
    * fix linting error.
    
    * update test descriptions.
    gmac authored Sep 11, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    65b41f0 View commit details

Commits on Sep 12, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    30b638f View commit details
Showing with 395 additions and 331 deletions.
  1. +1 −1 .eslintrc.json
  2. +10 −0 .github/workflows/automerge.yml
  3. +5 −5 package.json
  4. +5 −5 packages/batch-delegate/package.json
  5. +4 −4 packages/delegate/package.json
  6. +4 −4 packages/graphql-tag-pluck/package.json
  7. +24 −24 packages/graphql-tools/package.json
  8. +2 −2 packages/import/package.json
  9. +3 −3 packages/links/package.json
  10. +2 −2 packages/load-files/package.json
  11. +4 −4 packages/load/package.json
  12. +2 −2 packages/loaders/apollo-engine/package.json
  13. +3 −3 packages/loaders/code-file/package.json
  14. +4 −4 packages/loaders/git/package.json
  15. +1 −1 packages/loaders/git/src/load-git.ts
  16. +4 −4 packages/loaders/github/package.json
  17. +3 −3 packages/loaders/graphql-file/package.json
  18. +2 −2 packages/loaders/json-file/package.json
  19. +2 −2 packages/loaders/module/package.json
  20. +4 −4 packages/loaders/prisma/package.json
  21. +4 −4 packages/loaders/url/package.json
  22. +3 −3 packages/merge/package.json
  23. +3 −3 packages/mock/package.json
  24. +3 −3 packages/node-require/package.json
  25. +3 −3 packages/relay-operation-optimizer/package.json
  26. +3 −3 packages/resolvers-composition/package.json
  27. +3 −3 packages/schema/package.json
  28. +7 −7 packages/stitch/package.json
  29. +81 −0 packages/stitch/tests/mergeConflicts.test.ts
  30. +3 −3 packages/utils/package.json
  31. +1 −2 packages/utils/src/prune.ts
  32. +18 −0 packages/utils/tests/prune.test.ts
  33. +1 −1 packages/webpack-loader-runtime/package.json
  34. +2 −2 packages/webpack-loader/package.json
  35. +5 −5 packages/wrap/package.json
  36. +1 −1 website/docs/server-setup.md
  37. +5 −63 website/docs/stitch-type-merging.md
  38. +3 −3 website/package.json
  39. +157 −143 yarn.lock
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
"no-dupe-class-members": "off",
"dot-notation": "off",
"no-use-before-define": "off",
"@typescript-eslint/no-unused-vars": ["error", {"args": "none"}],
"@typescript-eslint/no-unused-vars": "warn",
"@typescript-eslint/no-use-before-define": "off",
"@typescript-eslint/no-namespace": "off",
"@typescript-eslint/no-empty-interface": "off",
10 changes: 10 additions & 0 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -18,8 +18,18 @@ jobs:
automerge:
runs-on: ubuntu-latest
steps:
- name: 'Wait for status checks'
id: waitforstatuschecks
uses: 'WyriHaximus/github-action-wait-for-status@master'
with:
ignoreActions: automerge
checkInterval: 13
env:
GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
- name: automerge
uses: 'pascalgn/automerge-action@master'
if: steps.waitforstatuschecks.outputs.status == 'success'
env:
GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
MERGE_METHOD: 'squash'
LABELS: automerge
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "graphql-tools-monorepo",
"version": "6.2.0",
"version": "6.2.1",
"description": "Useful tools to create and manipulate GraphQL schemas.",
"private": true,
"scripts": {
@@ -42,8 +42,8 @@
"@types/fs-extra": "9.0.1",
"@types/jest": "26.0.13",
"@types/node": "14.6.4",
"@typescript-eslint/eslint-plugin": "4.0.1",
"@typescript-eslint/parser": "4.0.1",
"@typescript-eslint/eslint-plugin": "4.1.0",
"@typescript-eslint/parser": "4.1.0",
"@ardatan/bob-the-bundler": "1.2.2",
"eslint": "7.8.1",
"eslint-config-prettier": "6.11.0",
@@ -54,7 +54,7 @@
"eslint-plugin-standard": "4.0.1",
"fs-extra": "9.0.1",
"graphql": "15.3.0",
"husky": "4.2.5",
"husky": "4.3.0",
"jest": "26.4.2",
"lint-staged": "10.3.0",
"nock": "13.0.4",
@@ -85,4 +85,4 @@
"resolutions": {
"graphql": "15.3.0"
}
}
}
10 changes: 5 additions & 5 deletions packages/batch-delegate/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphql-tools/batch-delegate",
"version": "6.2.0",
"version": "6.2.1",
"description": "A set of utils for faster development of GraphQL tools",
"repository": "git@github.com:ardatan/graphql-tools.git",
"license": "MIT",
@@ -18,14 +18,14 @@
"input": "./src/index.ts"
},
"dependencies": {
"@graphql-tools/delegate": "6.2.0",
"@graphql-tools/delegate": "6.2.1",
"dataloader": "2.0.0",
"tslib": "~2.0.1"
},
"devDependencies": {
"@graphql-tools/schema": "6.2.0",
"@graphql-tools/stitch": "6.2.0",
"@graphql-tools/utils": "6.2.0"
"@graphql-tools/schema": "6.2.1",
"@graphql-tools/stitch": "6.2.1",
"@graphql-tools/utils": "6.2.1"
},
"publishConfig": {
"access": "public",
8 changes: 4 additions & 4 deletions packages/delegate/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphql-tools/delegate",
"version": "6.2.0",
"version": "6.2.1",
"description": "A set of utils for faster development of GraphQL tools",
"repository": "git@github.com:ardatan/graphql-tools.git",
"license": "MIT",
@@ -18,8 +18,8 @@
"input": "./src/index.ts"
},
"dependencies": {
"@graphql-tools/schema": "6.2.0",
"@graphql-tools/utils": "6.2.0",
"@graphql-tools/schema": "6.2.1",
"@graphql-tools/utils": "6.2.1",
"@ardatan/aggregate-error": "0.0.6",
"dataloader": "2.0.0",
"is-promise": "4.0.0",
@@ -29,4 +29,4 @@
"access": "public",
"directory": "dist"
}
}
}
8 changes: 4 additions & 4 deletions packages/graphql-tag-pluck/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphql-tools/graphql-tag-pluck",
"version": "6.2.0",
"version": "6.2.1",
"description": "Pluck graphql-tag template literals",
"license": "MIT",
"repository": "git@github.com:ardatan/graphql-tools.git",
@@ -18,18 +18,18 @@
"@babel/parser": "7.11.5",
"@babel/traverse": "7.11.5",
"@babel/types": "7.11.5",
"@graphql-tools/utils": "6.2.0",
"@graphql-tools/utils": "6.2.1",
"tslib": "~2.0.1"
},
"optionalDependencies": {
"vue-template-compiler": "^2.6.12"
},
"devDependencies": {
"@types/babel__traverse": "7.0.13",
"@types/babel__traverse": "7.0.14",
"vue-template-compiler": "2.6.12"
},
"publishConfig": {
"access": "public",
"directory": "dist"
}
}
}
48 changes: 24 additions & 24 deletions packages/graphql-tools/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "graphql-tools",
"version": "6.2.0",
"version": "6.2.1",
"description": "Useful tools to create and manipulate GraphQL schemas.",
"repository": "git@github.com:ardatan/graphql-tools.git",
"license": "MIT",
@@ -19,28 +19,28 @@
"directory": "dist"
},
"dependencies": {
"@graphql-tools/batch-delegate": "6.2.0",
"@graphql-tools/delegate": "6.2.0",
"@graphql-tools/graphql-tag-pluck": "6.2.0",
"@graphql-tools/import": "6.2.0",
"@graphql-tools/links": "6.2.0",
"@graphql-tools/load": "6.2.0",
"@graphql-tools/code-file-loader": "6.2.0",
"@graphql-tools/git-loader": "6.2.0",
"@graphql-tools/github-loader": "6.2.0",
"@graphql-tools/graphql-file-loader": "6.2.0",
"@graphql-tools/json-file-loader": "6.2.0",
"@graphql-tools/module-loader": "6.2.0",
"@graphql-tools/url-loader": "6.2.0",
"@graphql-tools/load-files": "6.2.0",
"@graphql-tools/merge": "6.2.0",
"@graphql-tools/mock": "6.2.0",
"@graphql-tools/relay-operation-optimizer": "6.2.0",
"@graphql-tools/resolvers-composition": "6.2.0",
"@graphql-tools/schema": "6.2.0",
"@graphql-tools/stitch": "6.2.0",
"@graphql-tools/utils": "6.2.0",
"@graphql-tools/wrap": "6.2.0",
"@graphql-tools/batch-delegate": "6.2.1",
"@graphql-tools/delegate": "6.2.1",
"@graphql-tools/graphql-tag-pluck": "6.2.1",
"@graphql-tools/import": "6.2.1",
"@graphql-tools/links": "6.2.1",
"@graphql-tools/load": "6.2.1",
"@graphql-tools/code-file-loader": "6.2.1",
"@graphql-tools/git-loader": "6.2.1",
"@graphql-tools/github-loader": "6.2.1",
"@graphql-tools/graphql-file-loader": "6.2.1",
"@graphql-tools/json-file-loader": "6.2.1",
"@graphql-tools/module-loader": "6.2.1",
"@graphql-tools/url-loader": "6.2.1",
"@graphql-tools/load-files": "6.2.1",
"@graphql-tools/merge": "6.2.1",
"@graphql-tools/mock": "6.2.1",
"@graphql-tools/relay-operation-optimizer": "6.2.1",
"@graphql-tools/resolvers-composition": "6.2.1",
"@graphql-tools/schema": "6.2.1",
"@graphql-tools/stitch": "6.2.1",
"@graphql-tools/utils": "6.2.1",
"@graphql-tools/wrap": "6.2.1",
"tslib": "~2.0.1"
}
}
}
4 changes: 2 additions & 2 deletions packages/import/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphql-tools/import",
"version": "6.2.0",
"version": "6.2.1",
"description": "A set of utils for faster development of GraphQL tools",
"repository": "git@github.com:ardatan/graphql-tools.git",
"author": "Dotan Simha <dotansimha@gmail.com>",
@@ -24,4 +24,4 @@
"resolve-from": "5.0.0",
"tslib": "~2.0.1"
}
}
}
6 changes: 3 additions & 3 deletions packages/links/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphql-tools/links",
"version": "6.2.0",
"version": "6.2.1",
"description": "A set of utils for faster development of GraphQL tools",
"repository": "git@github.com:ardatan/graphql-tools.git",
"license": "MIT",
@@ -23,7 +23,7 @@
"graphql-upload": "11.0.0"
},
"dependencies": {
"@graphql-tools/utils": "6.2.0",
"@graphql-tools/utils": "6.2.1",
"apollo-link": "1.2.14",
"apollo-upload-client": "14.1.1",
"cross-fetch": "3.0.5",
@@ -35,4 +35,4 @@
"access": "public",
"directory": "dist"
}
}
}
4 changes: 2 additions & 2 deletions packages/load-files/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphql-tools/load-files",
"version": "6.2.0",
"version": "6.2.1",
"description": "A set of utils for faster development of GraphQL tools",
"repository": "git@github.com:ardatan/graphql-tools.git",
"author": "Dotan Simha <dotansimha@gmail.com>",
@@ -25,4 +25,4 @@
"access": "public",
"directory": "dist"
}
}
}
8 changes: 4 additions & 4 deletions packages/load/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphql-tools/load",
"version": "6.2.0",
"version": "6.2.1",
"description": "A set of utils for faster development of GraphQL tools",
"repository": "git@github.com:ardatan/graphql-tools.git",
"author": "Dotan Simha <dotansimha@gmail.com>",
@@ -22,8 +22,8 @@
"graphql-type-json": "0.3.2"
},
"dependencies": {
"@graphql-tools/utils": "6.2.0",
"@graphql-tools/merge": "6.2.0",
"@graphql-tools/utils": "6.2.1",
"@graphql-tools/merge": "6.2.1",
"globby": "11.0.1",
"import-from": "3.0.0",
"is-glob": "4.0.1",
@@ -36,4 +36,4 @@
"access": "public",
"directory": "dist"
}
}
}
4 changes: 2 additions & 2 deletions packages/loaders/apollo-engine/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphql-tools/apollo-engine-loader",
"version": "6.2.0",
"version": "6.2.1",
"description": "A set of utils for faster development of GraphQL tools",
"repository": "git@github.com:ardatan/graphql-tools.git",
"author": "Dotan Simha <dotansimha@gmail.com>",
@@ -16,7 +16,7 @@
"graphql": "^14.0.0 || ^15.0.0"
},
"dependencies": {
"@graphql-tools/utils": "6.2.0",
"@graphql-tools/utils": "6.2.1",
"cross-fetch": "3.0.5",
"tslib": "~2.0.1"
},
6 changes: 3 additions & 3 deletions packages/loaders/code-file/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphql-tools/code-file-loader",
"version": "6.2.0",
"version": "6.2.1",
"description": "A set of utils for faster development of GraphQL tools",
"repository": "git@github.com:ardatan/graphql-tools.git",
"author": "Dotan Simha <dotansimha@gmail.com>",
@@ -16,8 +16,8 @@
"graphql": "^14.0.0 || ^15.0.0"
},
"dependencies": {
"@graphql-tools/utils": "6.2.0",
"@graphql-tools/graphql-tag-pluck": "6.2.0",
"@graphql-tools/utils": "6.2.1",
"@graphql-tools/graphql-tag-pluck": "6.2.1",
"fs-extra": "9.0.1",
"tslib": "~2.0.1"
},
8 changes: 4 additions & 4 deletions packages/loaders/git/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphql-tools/git-loader",
"version": "6.2.0",
"version": "6.2.1",
"description": "A set of utils for faster development of GraphQL tools",
"repository": "git@github.com:ardatan/graphql-tools.git",
"author": "Dotan Simha <dotansimha@gmail.com>",
@@ -16,12 +16,12 @@
"graphql": "^14.0.0 || ^15.0.0"
},
"dependencies": {
"@graphql-tools/utils": "6.2.0",
"@graphql-tools/graphql-tag-pluck": "6.2.0",
"@graphql-tools/utils": "6.2.1",
"@graphql-tools/graphql-tag-pluck": "6.2.1",
"tslib": "~2.0.1"
},
"publishConfig": {
"access": "public",
"directory": "dist"
}
}
}
2 changes: 1 addition & 1 deletion packages/loaders/git/src/load-git.ts
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ const createCommand = ({ ref, path }: Input) => {
export async function loadFromGit(input: Input): Promise<string | never> {
try {
return await new Promise((resolve, reject) => {
exec(createCommand(input), { encoding: 'utf-8' }, (error, stdout) => {
exec(createCommand(input), { encoding: 'utf-8', maxBuffer: 1024 * 1024 * 1024 }, (error, stdout) => {
if (error) {
reject(error);
} else {
8 changes: 4 additions & 4 deletions packages/loaders/github/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphql-tools/github-loader",
"version": "6.2.0",
"version": "6.2.1",
"description": "A set of utils for faster development of GraphQL tools",
"repository": "git@github.com:ardatan/graphql-tools.git",
"author": "Dotan Simha <dotansimha@gmail.com>",
@@ -16,13 +16,13 @@
"graphql": "^14.0.0 || ^15.0.0"
},
"dependencies": {
"@graphql-tools/utils": "6.2.0",
"@graphql-tools/graphql-tag-pluck": "6.2.0",
"@graphql-tools/utils": "6.2.1",
"@graphql-tools/graphql-tag-pluck": "6.2.1",
"cross-fetch": "3.0.5",
"tslib": "~2.0.1"
},
"publishConfig": {
"access": "public",
"directory": "dist"
}
}
}
Loading