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.13
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.14
Choose a head ref

Commits on Apr 18, 2021

  1. chore(deps): update dependency typedoc-plugin-markdown to v3.7.0 (#2850)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 18, 2021
    Copy the full SHA
    e5214d4 View commit details
  2. chore(deps): update dependency typedoc-plugin-markdown to v3.7.1 (#2851)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 18, 2021
    Copy the full SHA
    7c446e7 View commit details
  3. fix(deps): update dependency ws to v7.4.5 (#2852)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 18, 2021
    Copy the full SHA
    142470c View commit details

Commits on Apr 20, 2021

  1. Copy the full SHA
    33532a2 View commit details

Commits on Apr 21, 2021

  1. chore(deps): update babel monorepo (#2853)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 21, 2021
    Copy the full SHA
    baf96db View commit details
  2. Copy the full SHA
    1f7fcb1 View commit details
  3. chore(url-loader): Use compatible graphql-ws versioning (#2855)

    * chore(url-loader): use compatible graphq-ws versioning
    
    * chore(url-loader): patch
    enisdenjo authored Apr 21, 2021
    Copy the full SHA
    64663c4 View commit details
  4. chore(release): update monorepo packages versions (#2856)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored Apr 21, 2021
    Copy the full SHA
    f466954 View commit details

Commits on Apr 23, 2021

  1. chore(deps): update dependency typedoc to v0.20.36 (#2858)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 23, 2021
    Copy the full SHA
    b6caae1 View commit details

Commits on Apr 24, 2021

  1. chore(deps): update dependency eslint to v7.25.0 (#2861)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 24, 2021
    Copy the full SHA
    0b0348b View commit details
  2. chore(deps): update dependency graphql-scalars to v1.9.1 (#2863)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 24, 2021
    Copy the full SHA
    efc7e35 View commit details
  3. chore(deps): update dependency eslint-config-prettier to v8.3.0 (#2862)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 24, 2021
    Copy the full SHA
    bb55075 View commit details

Commits on Apr 25, 2021

  1. chore(deps): update dependency typedoc-plugin-markdown to v3.7.2 (#2864)

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

Commits on Apr 26, 2021

  1. new header integration (#2866)

    Alin Simoc authored Apr 26, 2021
    Copy the full SHA
    0c1dbf3 View commit details
  2. fix(deps): update dependency styled-components to v5.2.3 (#2867)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 26, 2021
    Copy the full SHA
    6a17ae9 View commit details
  3. Copy the full SHA
    03c579b View commit details
  4. chore(release): update monorepo packages versions (#2868)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored Apr 26, 2021
    Copy the full SHA
    fa525a9 View commit details
  5. chore(deps): update dependency @types/jest to v26.0.23 (#2869)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 26, 2021
    Copy the full SHA
    6c5346d View commit details
  6. Copy the full SHA
    94f185a View commit details
  7. chore(deps): update dependency @types/node to v14.14.42 (#2872)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 26, 2021
    Copy the full SHA
    2568c25 View commit details

Commits on Apr 27, 2021

  1. chore(deps): update dependency @types/ws to v7.4.2 (#2873)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 27, 2021
    Copy the full SHA
    baa71c6 View commit details
  2. chore(deps): update dependency @types/node to v14.14.43 (#2875)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 27, 2021
    Copy the full SHA
    8752936 View commit details
  3. chore(deps): update dependency graphql-scalars to v1.9.3 (#2876)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 27, 2021
    Copy the full SHA
    45fc541 View commit details
  4. handle executor errors (#2874)

    * Test showing issue with error propagation (#2859).
    
    When An executor is used to perform queries to
    microservices, errors thrown within the executor are
    not always propagated
    
    * fix
    
    * verify works with both batching settings
    
    Co-authored-by: Yaacov Rydzinski <yaacovCR@gmail.com>
    claudio-rizzo-privitar and yaacovCR authored Apr 27, 2021
    Copy the full SHA
    b202587 View commit details
  5. chore(release): update monorepo packages versions (#2877)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored Apr 27, 2021
    Copy the full SHA
    17a5e27 View commit details

Commits on Apr 28, 2021

  1. use value-or-promise (#2871)

    * use value-or-promise
    
    * finish changes
    
    * add changeset
    
    * add missing .resolve()
    yaacovCR authored Apr 28, 2021
    Copy the full SHA
    61da3e8 View commit details
  2. chore(deps): pin dependency value-or-promise to 1.0.5 (#2880)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 28, 2021
    Copy the full SHA
    d6012ec View commit details
  3. chore(release): update monorepo packages versions (#2881)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored Apr 28, 2021
    Copy the full SHA
    cf86207 View commit details

Commits on Apr 29, 2021

  1. chore(deps): update dependency graphql-helix to v1.4.0 (#2885)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 29, 2021
    Copy the full SHA
    2e20cc3 View commit details
  2. chore(deps): update babel monorepo to v7.14.0 (#2886)

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

Commits on Apr 30, 2021

  1. chore(deps): update dependency graphql-tag to v2.12.4 (#2887)

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

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e50b6b2 View commit details
  2. fix(visitResult): don't throw on encountering __typename in request (#…

    …2860)  (#2888)
    
    * Add reproduction for bug
    
    * fix
    
    * add changeset
    
    Co-authored-by: Yaacov Rydzinski <yaacovCR@gmail.com>
    uoa-noel and yaacovCR authored Apr 30, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    dbdb78e View commit details
  3. batch-delagate: create failing test for aliasing bug (#2879)

    * batch-delagate: create failing test for aliasing bug
    
    * batch-delagate: improve use case for failing test for aliasing bug
    
    * batch-delagate: fix failing test for aliasing bug
    
    * arcane returnType details
    
    The only thing that delegateToSchema and batchDelegateToSchema care about is whether the object is an object or a list or a list of lists, nonNull doesn't matter and can be dropped.
    
    Also, we should get into the habit of using the source schema (info.schema) in case there are custom scalars or enums that need to be parsed into internal representation
    
    * don't await the promise unnecessarily
    
    * pass all the context to make more generic
    
    * rename test file
    
    * add changeset
    
    Co-authored-by: Yaacov Rydzinski <yaacovCR@gmail.com>
    Brendan Ball and yaacovCR authored Apr 30, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    36f19dd 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
    a1baf77 View commit details
  5. chore(release): update monorepo packages versions (#2890)

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

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    acd861f View commit details
  6. fix(import): handle nested imports correctly (#2883)

    * Add failing test case. This proves assumption in #1591 (comment)
    
    * fix(import): handle nested imports correctly
    
    Co-authored-by: Arda TANRIKULU <ardatanrikulu@gmail.com>
    steponas and ardatan authored Apr 30, 2021

    Verified

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

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

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    cb36499 View commit details
  8. chore(deps): update dependency value-or-promise to v1.0.6 (#2891)

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

    Verified

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

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

    Verified

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

Commits on May 1, 2021

  1. feat(url-loader): add support for legacy subscription client (#2894)

    * feat(url-loader): add support for legacy subscription client
    
    * fix(url-loader): pass headers to subscription client
    
    * feat(url-loader): pass connectionParams into ws client creation instead of headers only
    
    * chore: cleanup
    
    * chore(url-loader): added unit test for legacy ws subscriber
    
    * chore: added changeset
    ntziolis authored May 1, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    854ce65 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
    947ccee View commit details
  3. chore(release): update monorepo packages versions (#2897)

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

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    556c7ee View commit details
  4. chore(deps): update dependency graphql-helix to v1.4.1 (#2896)

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

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    657d53a View commit details
  5. chore(deps): streamline pinning (#2900)

    * chore(deps): follow conventions
    
    on when to pin
    
    * update lock file
    
    * add changeset
    yaacovCR authored May 1, 2021

    Verified

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

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

    Verified

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

Commits on May 2, 2021

  1. Fixed type error for resolvers with typed arguments (#2899)

    * Fixed type error for resolvers with typed arguments
    
    * added changeset
    Idono87 authored May 2, 2021

    Verified

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

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

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1bb49c5 View commit details
  3. Add some options to UrlLoader (#2898)

    * Add some options to UrlLoader
    
    * multipart response support
    
    * changeset'
    
    * Fix polyfill
    
    * Bump
    
    * Try to fix withCancel
    
    * Align versions
    ardatan authored May 2, 2021

    Verified

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

Commits on May 3, 2021

  1. feat(url-loader): use fetch-event-source instead of sse-z (#2906)

    * feat(url-loader): use fetch-event-source instead of sse-z
    
    * Do not use Node URL
    
    * Cleanup
    
    * Small fixes
    ardatan authored May 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
    77d63ab View commit details
  2. chore(release): update monorepo packages versions (#2903)

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

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9f021f7 View commit details
Showing with 2,488 additions and 789 deletions.
  1. +117 −0 .github/labels.yml
  2. +3 −3 .github/workflows/canary.yml
  3. +18 −0 .github/workflows/github.yml
  4. +3 −3 .github/workflows/release.yml
  5. +10 −10 .github/workflows/tests.yml
  6. +3 −3 .github/workflows/website.yml
  7. +15 −15 package.json
  8. +4 −4 packages/batch-delegate/package.json
  9. +144 −0 packages/batch-delegate/tests/withTransforms.test.ts
  10. +12 −0 packages/batch-execute/CHANGELOG.md
  11. +3 −3 packages/batch-execute/package.json
  12. +10 −24 packages/batch-execute/src/createBatchingExecutor.ts
  13. +24 −0 packages/delegate/CHANGELOG.md
  14. +5 −5 packages/delegate/package.json
  15. +3 −10 packages/delegate/src/delegateToSchema.ts
  16. +9 −4 packages/delegate/src/externalObjects.ts
  17. +23 −46 packages/delegate/src/mergeFields.ts
  18. +3 −3 packages/graphql-tag-pluck/package.json
  19. +9 −1 packages/graphql-tools/CHANGELOG.md
  20. +5 −2 packages/graphql-tools/package.json
  21. +6 −0 packages/import/CHANGELOG.md
  22. +1 −1 packages/import/package.json
  23. +40 −19 packages/import/src/index.ts
  24. +5 −0 packages/import/tests/schema/fixtures/deep/a.graphql
  25. +13 −0 packages/import/tests/schema/fixtures/deep/b.graphql
  26. +23 −0 packages/import/tests/schema/import-schema.spec.ts
  27. +2 −2 packages/links/package.json
  28. +1 −1 packages/load/package.json
  29. +1 −1 packages/loaders/github/tests/schema-from-github.spec.ts
  30. +1 −1 packages/loaders/prisma/package.json
  31. +34 −0 packages/loaders/url/CHANGELOG.md
  32. +1 −1 packages/loaders/url/declarations.d.ts
  33. +14 −12 packages/loaders/url/package.json
  34. +245 −77 packages/loaders/url/src/index.ts
  35. +107 −58 packages/loaders/url/tests/url-loader.spec.ts
  36. +6 −0 packages/merge/CHANGELOG.md
  37. +1 −1 packages/merge/package.json
  38. +3 −3 packages/merge/src/typedefs-mergers/merge-named-type-array.ts
  39. +12 −0 packages/mock/CHANGELOG.md
  40. +1 −1 packages/mock/package.json
  41. +6 −0 packages/mock/src/MockStore.ts
  42. +77 −0 packages/mock/tests/addMocksToSchema.spec.ts
  43. +48 −31 packages/mock/tests/mocking-compatibility.spec.ts
  44. +14 −0 packages/resolvers-composition/CHANGELOG.md
  45. +2 −2 packages/resolvers-composition/package.json
  46. +9 −5 packages/resolvers-composition/src/resolvers-composition.ts
  47. +12 −0 packages/schema/CHANGELOG.md
  48. +4 −3 packages/schema/package.json
  49. +12 −21 packages/schema/src/addSchemaLevelResolver.ts
  50. +16 −0 packages/stitch/CHANGELOG.md
  51. +7 −6 packages/stitch/package.json
  52. +1 −0 packages/stitch/src/index.ts
  53. +2 −2 packages/stitch/src/stitchingInfo.ts
  54. +2 −2 packages/stitch/src/typeCandidates.ts
  55. +2 −21 packages/stitch/src/types.ts
  56. +84 −0 packages/stitch/tests/errors.test.ts
  57. +8 −7 packages/stitch/tests/fixtures/schemas.ts
  58. +2 −2 packages/stitching-directives/package.json
  59. +24 −0 packages/utils/CHANGELOG.md
  60. +2 −2 packages/utils/package.json
  61. +44 −39 packages/utils/src/getResolversFromSchema.ts
  62. +1 −0 packages/utils/src/index.ts
  63. +1 −1 packages/utils/src/isAsyncIterable.ts
  64. +2 −2 packages/utils/src/mapAsyncIterator.ts
  65. +3 −3 packages/utils/src/print-schema-with-directives.ts
  66. +2 −1 packages/utils/src/visitResult.ts
  67. +19 −0 packages/utils/src/withCancel.ts
  68. +23 −0 packages/utils/tests/directives.test.ts
  69. +16 −0 packages/utils/tests/visitResult.test.ts
  70. +26 −0 packages/wrap/CHANGELOG.md
  71. +9 −6 packages/wrap/package.json
  72. +4 −7 packages/wrap/src/introspect.ts
  73. +12 −10 packages/wrap/src/transforms/TransformQuery.ts
  74. +7 −7 packages/wrap/tests/fixtures/schemas.ts
  75. +6 −6 patches/{@changesets+apply-release-plan+4.2.0.patch → @changesets+apply-release-plan+5.0.0.patch}
  76. +4 −4 patches/{@changesets+cli+2.15.0.patch → @changesets+cli+2.16.0.patch}
  77. +2 −0 website/docs/documents-loading.md
  78. +2 −0 website/docs/loaders.md
  79. +13 −0 website/docs/mocking.md
  80. +2 −0 website/docs/schema-loading.md
  81. +1 −9 website/docs/server-setup.md
  82. +1 −1 website/docs/stitch-combining-schemas.md
  83. +2 −10 website/docusaurus.config.js
  84. +3 −1 website/package.json
  85. +21 −0 website/src/theme/Root.js
  86. +988 −264 yarn.lock
117 changes: 117 additions & 0 deletions .github/labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
- color: 1d76db
description: ''
name: automerge
- color: b60205
description: Prevents production or dev due to perf, bug, build error, etc..
name: blocking
- color: fc2929
description: ''
name: bug
- color: b60205
description: ''
name: bugfix
- color: 1f6d01
description: ''
name: chore
- color: 0366d6
description: Pull requests that update a dependency file
name: dependencies
- color: ededed
description: ''
name: design-limitation
- color: c2e0c6
description: Focuses on documentation changes
name: docs
- color: cccccc
description: ''
name: duplicate
- color: d4c5f9
description: ''
name: easy
- color: 84b6eb
description: ''
name: enhancement
- color: 0e8a16
description: ''
name: external-bug
- color: a2eeef
description: New addition or enhancement to existing solutions
name: feature
- color: ededed
description: ''
name: fixed
- color: 7057ff
description: Issues that are suitable for first-time contributors.
name: good first issue
- color: 7057ff
description: PR's that are suitable for first-time contributors to review.
name: good first review
- color: ededed
description: ''
name: greenkeeper
- color: 42f44e
description: ❤ Has a reproduction in a codesandbox or single minimal repository
name: has-reproduction
- color: '159818'
description: ''
name: help wanted
- color: c2e0c6
description: ''
name: import
- color: ededed
description: ''
name: in progress
- color: e6e6e6
description: ''
name: in progress by contributor
- color: e6e6e6
description: ''
name: invalid
- color: 1d76db
description: ''
name: loaders
- color: d93f0b
description: ''
name: needs-reproduction
- color: cc317c
description: ''
name: question
- color: ededed
description: ''
name: ready
- color: d13078
description: ''
name: repro-only-pr
- color: fbca04
description: ''
name: requires documentation fix
- color: 0052cc
description: ''
name: schema merging
- color: 5df492
description: ''
name: schema stitching
- color: 0e8a16
description: ''
name: testing
- color: ededed
description: ''
name: to do
- color: fff2c9
description: ''
name: v5
- color: 254faa
description: ''
name: v6
- color: b75409
description: ''
name: waiting for answer
- color: ffbae9
description: ''
name: waiting on contributor
- color: dfff8e
description: Fixed/resolved, and waiting for the next stable release
name: waiting-for-release
- color: ffffff
description: ''
name: wontfix
6 changes: 3 additions & 3 deletions .github/workflows/canary.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ jobs:
- name: Use Node
uses: actions/setup-node@v2
with:
node-version: '15.x'
node-version: 16
- name: Configure Git Credentials
run: |
git config --global user.email "theguild-bot@users.noreply.github.com"
@@ -32,9 +32,9 @@ jobs:
uses: actions/cache@v2
with:
path: '**/node_modules'
key: ${{ runner.os }}-15-15-yarn-${{ hashFiles('yarn.lock') }}
key: ${{ runner.os }}-16-16-yarn-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-15-15-yarn-
${{ runner.os }}-16-16-yarn-
- name: Install Dependencies using Yarn
run: yarn install --ignore-engines && git checkout yarn.lock
- name: Release Canary
18 changes: 18 additions & 0 deletions .github/workflows/github.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Sync labels
on:
push:
branches:
- master
paths:
- .github/labels.yml
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: micnncim/action-label-syncer@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
manifest: .github/labels.yml
prune: false
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ jobs:
- name: Use Node
uses: actions/setup-node@v2
with:
node-version: '15.x'
node-version: 16
- name: Setup NPM credentials
run: echo "//registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN" >> ~/.npmrc
env:
@@ -33,9 +33,9 @@ jobs:
uses: actions/cache@v2
with:
path: '**/node_modules'
key: ${{ runner.os }}-15-15-yarn-${{ hashFiles('yarn.lock') }}
key: ${{ runner.os }}-16-16-yarn-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-15-15-yarn-
${{ runner.os }}-16-16-yarn-
- name: Install Dependencies using Yarn
run: yarn install --ignore-engines && git checkout yarn.lock
- name: Build
20 changes: 10 additions & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -15,17 +15,17 @@ jobs:
steps:
- name: Checkout Master
uses: actions/checkout@v2
- name: Use Node 15
- name: Use Node
uses: actions/setup-node@master
with:
node-version: 15
node-version: 16
- name: Cache Yarn
uses: actions/cache@v2
with:
path: '**/node_modules'
key: ${{ runner.os }}-15-15-yarn-${{ hashFiles('yarn.lock') }}
key: ${{ runner.os }}-16-16-yarn-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-15-15-yarn
${{ runner.os }}-16-16-yarn
- name: Install Dependencies using Yarn
run: yarn install --ignore-engines && git checkout yarn.lock
- name: Lint
@@ -39,17 +39,17 @@ jobs:
steps:
- name: Checkout Master
uses: actions/checkout@v2
- name: Use Node 14
- name: Use Node
uses: actions/setup-node@master
with:
node-version: 15
node-version: 16
- name: Cache Yarn
uses: actions/cache@v2
with:
path: '**/node_modules'
key: ${{ runner.os }}-14-${{matrix.graphql_version}}-yarn-${{ hashFiles('yarn.lock') }}
key: ${{ runner.os }}-16-${{matrix.graphql_version}}-yarn-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-14-${{matrix.graphql_version}}-yarn
${{ runner.os }}-16-${{matrix.graphql_version}}-yarn
- name: Use GraphQL v${{matrix.graphql_version}}
run: node ./scripts/match-graphql.js ${{matrix.graphql_version}}
- name: Install Dependencies using Yarn
@@ -62,12 +62,12 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
node_version: [10, 15]
node_version: [10, 16]
graphql_version: [14, 15]
steps:
- name: Checkout Master
uses: actions/checkout@v2
- name: Use Node ${{matrix.node_version}}
- name: Use Node
uses: actions/setup-node@master
with:
node-version: ${{ matrix.node_version }}
6 changes: 3 additions & 3 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
@@ -27,14 +27,14 @@ jobs:
- name: Use Node
uses: actions/setup-node@v2
with:
node-version: '15.x'
node-version: 16
- name: Cache Yarn
uses: actions/cache@v2
with:
path: '**/node_modules'
key: ${{ runner.os }}-15-15-yarn-${{ hashFiles('yarn.lock') }}
key: ${{ runner.os }}-16-16-yarn-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-15-15-yarn-
${{ runner.os }}-16-16-yarn-
- name: Install Dependencies using Yarn
run: yarn install --ignore-engines && git checkout yarn.lock
- name: Deploy 🚀
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -42,36 +42,36 @@
},
"devDependencies": {
"@ardatan/bob-the-bundler": "1.2.2",
"@babel/core": "7.13.15",
"@babel/core": "7.14.0",
"@babel/plugin-proposal-class-properties": "7.13.0",
"@babel/preset-env": "7.13.15",
"@babel/preset-env": "7.14.1",
"@babel/preset-typescript": "7.13.0",
"@changesets/cli": "2.16.0",
"@types/jest": "26.0.22",
"@types/node": "14.14.41",
"@typescript-eslint/eslint-plugin": "4.22.0",
"@typescript-eslint/parser": "4.22.0",
"@types/jest": "26.0.23",
"@types/node": "14.14.44",
"@typescript-eslint/eslint-plugin": "4.23.0",
"@typescript-eslint/parser": "4.23.0",
"babel-jest": "26.6.3",
"concurrently": "6.0.2",
"eslint": "7.24.0",
"eslint-config-prettier": "8.2.0",
"concurrently": "6.1.0",
"eslint": "7.26.0",
"eslint-config-prettier": "8.3.0",
"eslint-config-standard": "16.0.2",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-promise": "5.1.0",
"eslint-plugin-standard": "5.0.0",
"graphql": "15.5.0",
"graphql-helix": "1.3.0",
"graphql-helix": "1.4.1",
"graphql-subscriptions": "1.2.1",
"husky": "6.0.0",
"jest": "26.6.3",
"lint-staged": "10.5.4",
"lint-staged": "11.0.0",
"nock": "13.0.11",
"patch-package": "6.4.7",
"prettier": "2.2.1",
"ts-jest": "26.5.5",
"typedoc": "0.20.35",
"typedoc-plugin-markdown": "3.6.1",
"prettier": "2.3.0",
"ts-jest": "26.5.6",
"typedoc": "0.20.36",
"typedoc-plugin-markdown": "3.8.0",
"typescript": "4.2.4"
},
"husky": {
8 changes: 4 additions & 4 deletions packages/batch-delegate/package.json
Original file line number Diff line number Diff line change
@@ -22,14 +22,14 @@
"input": "./src/index.ts"
},
"dependencies": {
"@graphql-tools/delegate": "^7.1.2",
"@graphql-tools/delegate": "^7.1.4",
"dataloader": "2.0.0",
"tslib": "~2.2.0"
},
"devDependencies": {
"@graphql-tools/schema": "7.1.3",
"@graphql-tools/stitch": "7.5.1",
"@graphql-tools/utils": "7.7.3"
"@graphql-tools/schema": "^7.1.4",
"@graphql-tools/stitch": "^7.5.2",
"@graphql-tools/utils": "^7.8.1"
},
"publishConfig": {
"access": "public",
Loading