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: @graphql-tools/merge@6.2.16
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: @graphql-tools/merge@6.2.17
Choose a head ref

Commits on Jul 28, 2021

  1. chore(deps): update dependency @types/react-dom to v17.0.9 (#3255)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Jul 28, 2021
    1
    Copy the full SHA
    8419357 View commit details

Commits on Jul 29, 2021

  1. [deploy_website] Fix API Docs

    ardatan committed Jul 29, 2021
    1
    Copy the full SHA
    26226b2 View commit details
  2. [deploy_website] Fix links

    ardatan committed Jul 29, 2021
    1
    Copy the full SHA
    b6849c6 View commit details
  3. 1
    Copy the full SHA
    45067e4 View commit details
  4. 1
    Copy the full SHA
    256193c View commit details
  5. 1
    Copy the full SHA
    3e9764e View commit details
  6. 1
    Copy the full SHA
    e1b331e View commit details
  7. 1
    Copy the full SHA
    40f5f54 View commit details
  8. 1
    Copy the full SHA
    489cb8f View commit details
  9. 1
    Copy the full SHA
    7ad6687 View commit details
  10. add crisp (#3269)

    PabloSzx authored Jul 29, 2021
    1
    Copy the full SHA
    e09aa6f View commit details
  11. chore(deps): update dependency esbuild to v0.12.17 (#3270)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Jul 29, 2021
    1
    Copy the full SHA
    ce1e51b View commit details
  12. fix(deps): update apollo graphql packages (#3271)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Jul 29, 2021
    1
    Copy the full SHA
    05a3154 View commit details

Commits on Jul 30, 2021

  1. 1
    Copy the full SHA
    8862792 View commit details
  2. 1
    Copy the full SHA
    819e62c View commit details
  3. chore(deps): update dependency @apollo/client to v3.4.1 (#3276)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Jul 30, 2021
    1
    Copy the full SHA
    fc8748f View commit details
  4. chore(deps): update dependency eslint to v7.32.0 (#3277)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Jul 30, 2021
    1
    Copy the full SHA
    4d3ac2d View commit details

Commits on Jul 31, 2021

  1. chore(deps): update dependency typedoc to v0.21.5 (#3280)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Jul 31, 2021
    1
    Copy the full SHA
    6a0edc1 View commit details
  2. fix(deps): update dependency @guild-docs/client to v0.2.23 (#3281)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Jul 31, 2021
    1
    Copy the full SHA
    2205cf7 View commit details
  3. fix(deps): update dependency @guild-docs/server to v0.2.23 (#3282)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Jul 31, 2021
    1
    Copy the full SHA
    89c6fd1 View commit details
  4. fix(deps): update dependency @guild-docs/client to v0.2.24 (#3283)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Jul 31, 2021
    1
    Copy the full SHA
    a744781 View commit details

Commits on Aug 1, 2021

  1. fix(deps): update babel monorepo to v7.14.9 (#3284)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Aug 1, 2021
    1
    Copy the full SHA
    4c14d54 View commit details
  2. chore(deps): update dependency @types/node to v14.17.7 (#3285)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Aug 1, 2021
    1
    Copy the full SHA
    8e3d51c View commit details

Commits on Aug 2, 2021

  1. 1
    Copy the full SHA
    bd3c800 View commit details
  2. chore(deps): update dependency @apollo/client to v3.4.2 (#3288)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Aug 2, 2021
    1
    Copy the full SHA
    4a3df1c View commit details
  3. chore(deps): update typescript-eslint monorepo to v4.29.0 (#3291)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Aug 2, 2021
    1
    Copy the full SHA
    c2dd58b View commit details
  4. chore(release): update monorepo packages versions (#3290)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored Aug 2, 2021
    1
    Copy the full SHA
    d13fb0c View commit details
  5. chore(deps): update dependency @apollo/client to v3.4.3 (#3293)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Aug 2, 2021
    1
    Copy the full SHA
    17a5cfd View commit details

Commits on Aug 3, 2021

  1. 1
    Copy the full SHA
    1680874 View commit details
  2. chore(release): update monorepo packages versions (#3297)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored Aug 3, 2021
    1
    Copy the full SHA
    b9f5ef9 View commit details
  3. chore(deps): update dependency @types/lodash to v4.14.172 (#3294)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Aug 3, 2021
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f8c6784 View commit details
  4. chore(deps): update dependency @apollo/client to v3.4.4 (#3299)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Aug 3, 2021
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8cb5f5e View commit details
  5. add test-esm script and fix prisma loader esm (#3300)

    * add test-esm script and fix prisma loader esm
    
    * pin root dev deps
    
    * use globby v11
    
    * fix esm test script
    
    * ignore node-require & links packages
    PabloSzx authored Aug 3, 2021
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    118b3ca View commit details
  6. chore(release): update monorepo packages versions (#3301)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored Aug 3, 2021
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    81326eb View commit details
  7. fix(deps): update apollo graphql packages (#3302)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Aug 3, 2021
    1

    Verified

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

Commits on Aug 4, 2021

  1. fix(deps): update dependency @guild-docs/server to v0.2.25 (#3304)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Aug 4, 2021
    1

    Verified

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

    Verified

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

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3f421e0 View commit details
  4. chore(release): update monorepo packages versions (#3305)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored Aug 4, 2021
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e5f4bf8 View commit details
Showing with 1,076 additions and 1,220 deletions.
  1. +0 −2 .github/workflows/release.yml
  2. +2 −0 .github/workflows/tests.yml
  3. +2 −0 .github/workflows/website.yml
  4. +1 −1 README.md
  5. +7 −0 benchmark/federation/CHANGELOG.md
  6. +5 −5 benchmark/federation/package.json
  7. +193 −507 benchmark/federation/yarn.lock
  8. +9 −7 package.json
  9. +8 −0 packages/batch-delegate/CHANGELOG.md
  10. +1 −1 packages/batch-delegate/README.md
  11. +5 −5 packages/batch-delegate/package.json
  12. +7 −0 packages/batch-execute/CHANGELOG.md
  13. +1 −1 packages/batch-execute/README.md
  14. +2 −2 packages/batch-execute/package.json
  15. +9 −0 packages/delegate/CHANGELOG.md
  16. +4 −4 packages/delegate/package.json
  17. +7 −0 packages/graphql-tag-pluck/CHANGELOG.md
  18. +5 −5 packages/graphql-tag-pluck/package.json
  19. +1 −1 packages/graphql-tools/package.json
  20. +8 −0 packages/links/CHANGELOG.md
  21. +5 −5 packages/links/package.json
  22. +14 −0 packages/load/CHANGELOG.md
  23. +3 −3 packages/load/package.json
  24. +1 −0 packages/load/src/schema.ts
  25. +7 −0 packages/loaders/apollo-engine/CHANGELOG.md
  26. +2 −2 packages/loaders/apollo-engine/package.json
  27. +8 −0 packages/loaders/code-file/CHANGELOG.md
  28. +3 −3 packages/loaders/code-file/package.json
  29. +8 −0 packages/loaders/git/CHANGELOG.md
  30. +3 −3 packages/loaders/git/package.json
  31. +8 −0 packages/loaders/github/CHANGELOG.md
  32. +3 −3 packages/loaders/github/package.json
  33. +7 −0 packages/loaders/graphql-file/CHANGELOG.md
  34. +2 −2 packages/loaders/graphql-file/package.json
  35. +7 −0 packages/loaders/json-file/CHANGELOG.md
  36. +2 −2 packages/loaders/json-file/package.json
  37. +7 −0 packages/loaders/module/CHANGELOG.md
  38. +2 −2 packages/loaders/module/package.json
  39. +14 −0 packages/loaders/prisma/CHANGELOG.md
  40. +3 −3 packages/loaders/prisma/package.json
  41. +4 −2 packages/loaders/prisma/src/prisma-yml/Cluster.ts
  42. +4 −2 packages/loaders/prisma/src/prisma-yml/Environment.ts
  43. +1 −1 packages/loaders/prisma/src/prisma-yml/PrismaDefinition.ts
  44. +9 −0 packages/loaders/url/CHANGELOG.md
  45. +4 −4 packages/loaders/url/package.json
  46. +8 −0 packages/merge/CHANGELOG.md
  47. +3 −3 packages/merge/package.json
  48. +9 −0 packages/mock/CHANGELOG.md
  49. +4 −4 packages/mock/package.json
  50. +9 −0 packages/node-require/CHANGELOG.md
  51. +4 −4 packages/node-require/package.json
  52. +13 −0 packages/relay-operation-optimizer/CHANGELOG.md
  53. +2 −2 packages/relay-operation-optimizer/package.json
  54. +8 −8 packages/relay-operation-optimizer/src/index.ts
  55. +3 −3 packages/relay-operation-optimizer/src/types.d.ts
  56. +7 −0 packages/resolvers-composition/CHANGELOG.md
  57. +3 −3 packages/resolvers-composition/package.json
  58. +8 −0 packages/schema/CHANGELOG.md
  59. +3 −3 packages/schema/package.json
  60. +12 −0 packages/stitch/CHANGELOG.md
  61. +1 −1 packages/stitch/README.md
  62. +7 −7 packages/stitch/package.json
  63. +8 −0 packages/stitching-directives/CHANGELOG.md
  64. +1 −1 packages/stitching-directives/README.md
  65. +4 −4 packages/stitching-directives/package.json
  66. +6 −0 packages/utils/CHANGELOG.md
  67. +1 −1 packages/utils/package.json
  68. +12 −2 packages/utils/src/AggregateError.ts
  69. +9 −0 packages/wrap/CHANGELOG.md
  70. +4 −4 packages/wrap/package.json
  71. +3 −2 scripts/build-api-docs.js
  72. +54 −0 scripts/test-esm.mjs
  73. +0 −35 scripts/typedoc-theme/theme.js
  74. +1 −1 website/docs/remote-schemas.mdx
  75. +2 −2 website/docs/schema-delegation.mdx
  76. +1 −1 website/docs/schema-loading.mdx
  77. +1 −1 website/docs/schema-merging.mdx
  78. +0 −96 website/docs/schema-stitching.mdx
  79. +7 −7 website/docs/schema-stitching/{stitch-5-api.mdx → stitch-api.mdx}
  80. +6 −6 website/docs/schema-stitching/{stitch-1-combining-schemas.mdx → stitch-combining-schemas.mdx}
  81. +6 −6 website/docs/schema-stitching/{stitch-3-directives-sdl.mdx → stitch-directives-sdl.mdx}
  82. +2 −8 website/docs/schema-stitching/{stitch-6-federation.mdx → stitch-federation.mdx}
  83. +4 −4 website/docs/schema-stitching/{stitch-4-schema-extensions.mdx → stitch-schema-extensions.mdx}
  84. +10 −11 website/docs/schema-stitching/{stitch-2-type-merging.mdx → stitch-type-merging.mdx}
  85. +2 −2 website/docs/schema-wrapping.mdx
  86. +79 −9 website/next.config.js
  87. +5 −5 website/package.json
  88. +9 −0 website/public/style.css
  89. +12 −0 website/routes.ts
  90. +1 −0 website/src/pages/_document.tsx
  91. +1 −1 website/src/pages/index.tsx
  92. +313 −395 yarn.lock
2 changes: 0 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -38,8 +38,6 @@ jobs:
${{ runner.os }}-16-16-yarn-
- name: Install Dependencies using Yarn
run: yarn install --ignore-engines && git checkout yarn.lock
- name: Build
run: yarn build
- name: Create Release Pull Request or Publish to npm
id: changesets
uses: changesets/action@master
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -97,3 +97,5 @@ jobs:
run: yarn test --ci
env:
CI: true
- name: Test ESM
run: yarn build && node scripts/test-esm.mjs
2 changes: 2 additions & 0 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
@@ -39,6 +39,8 @@ jobs:
run: node scripts/install-typedocs-typescript-version.js
- name: Install Dependencies using Yarn
run: yarn install --ignore-engines && git checkout yarn.lock
- name: Build API Docs
run: yarn build:api-docs
- name: Build Website
run: cd website/ && yarn build && yarn export && touch out/.nojekyll
- name: Deploy 🚀
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ This package provides a few useful ways to create a GraphQL schema:

1. Use the GraphQL schema language to [generate a schema](https://graphql-tools.com/docs/generate-schema) with full support for resolvers, interfaces, unions, and custom scalars. The schema produced is completely compatible with [GraphQL.js](https://github.com/graphql/graphql-js).
2. [Mock your GraphQL API](https://graphql-tools.com/docs/mocking) with fine-grained per-type mocking
3. Automatically [stitch multiple schemas together](https://www.graphql-tools.com/docs/schema-stitching/stitch-1-combining-schemas
3. Automatically [stitch multiple schemas together](https://www.graphql-tools.com/docs/stitch-combining-schemas
) into one larger API

## Documentation
7 changes: 7 additions & 0 deletions benchmark/federation/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# federation-benchmark

## 0.0.5

### Patch Changes

- @graphql-tools/stitch@8.0.4
- @graphql-tools/stitching-directives@2.0.4

## 0.0.4

### Patch Changes
10 changes: 5 additions & 5 deletions benchmark/federation/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "federation-benchmark",
"version": "0.0.4",
"version": "0.0.5",
"private": true,
"scripts": {
"start": "cross-env NODE_ENV=production node index.js",
@@ -9,10 +9,10 @@
"loadtest:monolith": "k6 -e ENDPOINT=monolith run k6.js"
},
"dependencies": {
"@apollo/gateway": "0.34.0",
"@apollo/federation": "0.27.0",
"@graphql-tools/stitch": "8.0.3",
"@graphql-tools/stitching-directives": "2.0.3",
"@apollo/gateway": "0.36.0",
"@apollo/federation": "0.28.0",
"@graphql-tools/stitch": "8.0.4",
"@graphql-tools/stitching-directives": "2.0.4",
"express": "4.17.1",
"graphql": "15.5.1",
"graphql-tag": "2.12.5",
Loading