diff --git a/.changeset/big-poems-build.md b/.changeset/big-poems-build.md new file mode 100644 index 00000000000..8b138c05c03 --- /dev/null +++ b/.changeset/big-poems-build.md @@ -0,0 +1,6 @@ +--- +'@graphql-tools/stitch': patch +'@graphql-tools/wrap': patch +--- + +enhance(HoistFields): allow arguments diff --git a/.changeset/friendly-bugs-tan.md b/.changeset/friendly-bugs-tan.md new file mode 100644 index 00000000000..7c87199221f --- /dev/null +++ b/.changeset/friendly-bugs-tan.md @@ -0,0 +1,5 @@ +--- +'@graphql-tools/import': patch +--- + +feat(import): support specifiedBy builtin directive diff --git a/.changeset/grumpy-ducks-clean.md b/.changeset/grumpy-ducks-clean.md new file mode 100644 index 00000000000..0bf787e1eae --- /dev/null +++ b/.changeset/grumpy-ducks-clean.md @@ -0,0 +1,6 @@ +--- +'@graphql-tools/merge': patch +'@graphql-tools/utils': patch +--- + +Fix duplication of scalar directives in merge diff --git a/.changeset/little-penguins-tan.md b/.changeset/little-penguins-tan.md new file mode 100644 index 00000000000..09196f7604b --- /dev/null +++ b/.changeset/little-penguins-tan.md @@ -0,0 +1,5 @@ +--- +'@graphql-tools/merge': patch +--- + +Support scalar extensions by merging directives diff --git a/.changeset/ninety-ducks-sleep.md b/.changeset/ninety-ducks-sleep.md new file mode 100644 index 00000000000..b3534cb0570 --- /dev/null +++ b/.changeset/ninety-ducks-sleep.md @@ -0,0 +1,6 @@ +--- +'@graphql-tools/delegate': patch +'@graphql-tools/stitch': patch +--- + +enhance(stitching): improve error message for unknown types diff --git a/.changeset/yellow-camels-nail.md b/.changeset/yellow-camels-nail.md index 80bb11e7720..9b5fcf2486a 100644 --- a/.changeset/yellow-camels-nail.md +++ b/.changeset/yellow-camels-nail.md @@ -27,7 +27,6 @@ '@graphql-tools/load-files': patch '@graphql-tools/utils': patch '@graphql-tools/webpack-loader-runtime': patch -'@graphql-tools/website': patch --- Bump all packages to allow adjustments diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 931ff986f36..ad7bea90036 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -1,17 +1,15 @@ name: Canary Release on: - push: - branches: - - master pull_request: branches: - master + jobs: publish-canary: name: Publish Canary runs-on: ubuntu-latest - if: contains(github.actor, 'dependabot') == false + if: github.event.pull_request.head.repo.full_name == github.repository steps: - name: Checkout Master uses: actions/checkout@v1 @@ -19,6 +17,15 @@ jobs: uses: actions/setup-node@v1 with: node-version: '14.x' + - name: Configure Git Credentials + run: | + git config --global user.email "theguild-bot@users.noreply.github.com" + git config --global user.name "theguild-bot" + echo "machine github.com login theguild-bot password ${{secrets.GH_API_TOKEN}}" > ~/.netrc + - name: Setup NPM credentials + run: echo "//registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN" >> ~/.npmrc + env: + NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }} - name: Get yarn cache id: yarn-cache run: echo "::set-output name=dir::$(yarn cache dir)" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b1309f643d0..5451ef0d28a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,8 @@ -name: NPM Release +name: Release on: - release: - types: [published] + push: + branches: + - master jobs: build: runs-on: ubuntu-latest diff --git a/patches/@changesets+cli+2.10.2.patch b/patches/@changesets+cli+2.10.3.patch similarity index 99% rename from patches/@changesets+cli+2.10.2.patch rename to patches/@changesets+cli+2.10.3.patch index c43c10999b8..59426d31e00 100644 --- a/patches/@changesets+cli+2.10.2.patch +++ b/patches/@changesets+cli+2.10.3.patch @@ -5,10 +5,10 @@ index 2805efd..a1822ea 100644 @@ -488,7 +488,7 @@ async function version(cwd, options, config) { // @ts-ignore var isCI = !!(isCI$1 || process.env.GITHUB_ACTIONS); - + -const npmRequestLimit = pLimit(40); +const npmRequestLimit = pLimit(3); - + function jsonParse(input) { try { diff --git a/node_modules/@changesets/cli/dist/cli.cjs.prod.js b/node_modules/@changesets/cli/dist/cli.cjs.prod.js @@ -16,11 +16,11 @@ index e07a234..1bb957d 100644 --- a/node_modules/@changesets/cli/dist/cli.cjs.prod.js +++ b/node_modules/@changesets/cli/dist/cli.cjs.prod.js @@ -311,7 +311,7 @@ async function version(cwd, options, config) { - + var isCI = !(!isCI$1 && !process.env.GITHUB_ACTIONS); - + -const npmRequestLimit = pLimit(40); +const npmRequestLimit = pLimit(3); - + function jsonParse(input) { try { diff --git a/yarn.lock b/yarn.lock index 5db03d0fb30..93023bb4712 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2918,14 +2918,6 @@ "@typescript-eslint/typescript-estree" "4.3.0" debug "^4.1.1" -"@typescript-eslint/scope-manager@4.2.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.2.0.tgz#d10e6854a65e175b22a28265d372a97c8cce4bfc" - integrity sha512-Tb402cxxObSxWIVT+PnBp5ruT2V/36yj6gG4C9AjkgRlZpxrLAzWDk3neen6ToMBGeGdxtnfFLoJRUecGz9mYQ== - dependencies: - "@typescript-eslint/types" "4.2.0" - "@typescript-eslint/visitor-keys" "4.2.0" - "@typescript-eslint/scope-manager@4.3.0": version "4.3.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.3.0.tgz#c743227e087545968080d2362cfb1273842cb6a7" @@ -2934,30 +2926,11 @@ "@typescript-eslint/types" "4.3.0" "@typescript-eslint/visitor-keys" "4.3.0" -"@typescript-eslint/types@4.2.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.2.0.tgz#6f6b094329e72040f173123832397c7c0b910fc8" - integrity sha512-xkv5nIsxfI/Di9eVwN+G9reWl7Me9R5jpzmZUch58uQ7g0/hHVuGUbbn4NcxcM5y/R4wuJIIEPKPDb5l4Fdmwg== - "@typescript-eslint/types@4.3.0": version "4.3.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.3.0.tgz#1f0b2d5e140543e2614f06d48fb3ae95193c6ddf" integrity sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw== -"@typescript-eslint/typescript-estree@4.2.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.2.0.tgz#9d746240991c305bf225ad5e96cbf57e7fea0551" - integrity sha512-iWDLCB7z4MGkLipduF6EOotdHNtgxuNKnYD54nMS/oitFnsk4S3S/TE/UYXQTra550lHtlv9eGmp+dvN9pUDtA== - dependencies: - "@typescript-eslint/types" "4.2.0" - "@typescript-eslint/visitor-keys" "4.2.0" - debug "^4.1.1" - globby "^11.0.1" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^7.3.2" - tsutils "^3.17.1" - "@typescript-eslint/typescript-estree@4.3.0": version "4.3.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz#0edc1068e6b2e4c7fdc54d61e329fce76241cee8" @@ -2972,14 +2945,6 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/visitor-keys@4.2.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.2.0.tgz#ae13838e3a260b63ae51021ecaf1d0cdea8dbba5" - integrity sha512-WIf4BNOlFOH2W+YqGWa6YKLcK/EB3gEj2apCrqLw6mme1RzBy0jtJ9ewJgnrZDB640zfnv8L+/gwGH5sYp/rGw== - dependencies: - "@typescript-eslint/types" "4.2.0" - eslint-visitor-keys "^2.0.0" - "@typescript-eslint/visitor-keys@4.3.0": version "4.3.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.3.0.tgz#0e5ab0a09552903edeae205982e8521e17635ae0"