Merge branch 'master' into fix/fragment-struct-namespace

Author: RobinDaugherty

.circleci/config.yml

@@ -5,9 +5,9 @@ version: 2.1
 orbs:
   # `oss` is a local reference to the package.  The source for Apollo Orbs can
   # be found at http://github.com/apollographql/CircleCI-Orbs.
-  oss: apollo/[email protected].19
+  oss: apollo/[email protected].20
   # win is a windows orb provided by circleci
-  win: circleci/[email protected].0
+  win: circleci/[email protected].1
 
 commands:
   # These are the steps used for each version of Node which we're testing
@@ -30,7 +30,7 @@ jobs:
   # Platform tests, each with the same tests but different platform or version.
   NodeJS 12:
     docker:
-      - image: cimg/node:12.22.3
+      - image: cimg/node:12.22.7
     steps:
       - common_test_steps
 
@@ -41,7 +41,7 @@ jobs:
       # Note: This is a no-op at the second, but bear with me on this.  If this
       # comment is not removed by 2021-06-30 remove it along with the next line.
       # renovate: datasource=github-tags depName=nodejs/node versioning=node
-      NODE_VERSION: 14.16.1
+      NODE_VERSION: 14.17.5
       NPM_VERSION: 7.10.0
     steps:
       - run: git config --global core.autocrlf false
@@ -81,7 +81,7 @@ jobs:
 
   NodeJS 14:
     docker:
-      - image: cimg/node:14.17.3
+      - image: cimg/node:14.18.1
     steps:
       - common_test_steps
       # We will save the results of this one particular invocation to use in
@@ -96,13 +96,13 @@ jobs:
 
   NodeJS 16:
     docker:
-      - image: cimg/node:16.0.0
+      - image: cimg/node:16.13.0
     steps:
       - common_test_steps
 
   Publish GitHub Release:
     docker:
-      - image: cimg/go:1.16.6
+      - image: cimg/go:1.17.3
     steps:
       - attach_workspace:
           # Must be absolute path or relative path from working_directory
@@ -121,7 +121,7 @@ jobs:
   # Other tests, unrelated to typical code tests.
   Linting:
     docker:
-      - image: cimg/node:12.22.3
+      - image: cimg/node:12.22.7
     steps:
       - oss/install_specific_npm_version:
           version: '7'
@@ -132,7 +132,7 @@ jobs:
 
   Query Check:
     docker:
-      - image: cimg/node:12.22.3
+      - image: cimg/node:12.22.7
     steps:
       - oss/install_specific_npm_version:
           version: '7'
@@ -149,7 +149,7 @@ jobs:
 
   Generated Types Check:
     docker:
-      - image: cimg/node:12.22.3
+      - image: cimg/node:12.22.7
     steps:
       - oss/install_specific_npm_version:
           version: '7'

CHANGELOG.md

@@ -1,67 +1,73 @@
-# Changelog
+# CHANGELOG
 
 > **Note:** Apollo's GraphQL VSCode extension is no longer housed in this repository. It is now maintained separately in [this repo](https://github.com/apollographql/vscode-graphql).
 
-## Upcoming
-
-- `apollo`
-  - <First `apollo` related entry goes here>
-- `apollo-codegen-flow`
-  - <First `apollo-codegen-flow` related entry goes here>
-- `apollo-codegen-scala`
-  - <First `apollo-codegen-scala` related entry goes here>
+## vNEXT
 - `apollo-codegen-swift`
   - Add namespace when a fragment struct is referenced (Fixes #2396) [PR #2397](https://github.com/apollographql/apollo-tooling/pull/2397)
-- `apollo-codegen-typescript`
-  - <First `apollo-codegen-typescript` related entry goes here>
-- `apollo-codegen-core`
-  - <First `apollo-codegen-core` related entry goes here>
-- `apollo-env`
-  - <First `apollo-env` related entry goes here>
-- `apollo-graphql`
-  - <First `apollo-graphql` related entry goes here>
-- `apollo-language-server`
-  - <First `apollo-language-server` related entry goes here>
-- `apollo-tools`
-  - <First `apollo-tools` related entry goes here>
 
-## [email protected]
-- Remove dependency on `apollo-env`, so using this package no longer installs polyfills.
+## `[email protected]`
 
-## [email protected]
-- Complex directive arguments don't break `transformSchema` (Fixes #2162) [PR #2335](https://github.com/apollographql/apollo-tooling/pull/2335)
+- `[email protected]` / `[email protected]`
+  - Adjust `apollo-codegen-core` to use the same `withTypenameFieldAddedWhereNeeded` utility as `apollo-language-server`, to make sure modified operations align between codegen and anything leveraging the language server utility functions (like the `client:push` command). <br/>
+  [@hwillson](https://github.com/hwillson) in [#2473](https://github.com/apollographql/apollo-tooling/pull/2473)
 
-## [email protected].2
+## `[email protected].8`
 
-- Add a deprecation message to all `apollo service:*` commands, pointing people towards the [Apollo Rover CLI migration guide](https://go.apollo.dev/t/migration). <br/>
-  [@hwillson](https://github.com/hwillson) in [#2308](https://github.com/apollographql/apollo-tooling/pull/2308)
+- `[email protected]`
+  - Export useful operation sanitization transforms [PR #2057](https://github.com/apollographql/apollo-tooling/pull/2057)
+  - Preserve directive usages on SchemaDefinition nodes in `buildSchemaFromSDL` [PR #2457](https://github.com/apollographql/apollo-tooling/pull/2457)
+
+## `[email protected]`
+
+- `[email protected]`
+  - Add support for interface on interfaces to transformSchema. [PR #2456](https://github.com/apollographql/apollo-tooling/pull/2456)
+
+## `[email protected]`
 
-## [email protected]
+- `[email protected]`
+  - Removed the use of the `tty` npm package which has been removed from npm. [PR #2406](https://github.com/apollographql/apollo-tooling/pull/2406) [Issue #2407](https://github.com/apollographql/apollo-tooling/issues/2407)
 
-- deps: Updated `node-fetch` to v2.6.1
+## `[email protected]`
 
-## [email protected]
+- `[email protected]`
+  - Adds support for àpollo.config.cjs`files allowing `package.json` files with `type: "module"` [Issue #2342](https://github.com/apollographql/apollo-tooling/issues/2342) [PR #2381](https://github.com/apollographql/apollo-tooling/pull/2381)
 
-- Add missing `sha.js` dependency [PR #2283](https://github.com/apollographql/apollo-tooling/pull/2283)
+- `[email protected]`
+  - Remove dependency on `apollo-env`, so using this package no longer installs polyfills.
 
-## [email protected]
+- `[email protected]`
+  - Complex directive arguments don't break `transformSchema` (Fixes #2162) [PR #2335](https://github.com/apollographql/apollo-tooling/pull/2335)
 
-- The following utility functions are no longer exported from `apollo-env` and can now be found in the `apollo-graphql` library:
+## `[email protected]`
+
+- `[email protected]`
+  - Add a deprecation message to all `apollo service:*` commands, pointing people towards the [Apollo Rover CLI migration guide](https://go.apollo.dev/t/migration). <br/>
+  [@hwillson](https://github.com/hwillson) in [#2308](https://github.com/apollographql/apollo-tooling/pull/2308)
+
+- `[email protected]`
+  - deps: Updated `node-fetch` to v2.6.1
+
+- `[email protected]`
+  - Add missing `sha.js` dependency [PR #2283](https://github.com/apollographql/apollo-tooling/pull/2283)
+
+- `[email protected]`
+  - The following utility functions are no longer exported from `apollo-env` and can now be found in the `apollo-graphql` library:
     - `createHash`
     - `isNodeLike`
     - `mapValues`
     - `isNotNullOrDefined`
 
-## [email protected]
-
-- This package no longer depends on `apollo-env` to avoid the side-effects of its polyfills.
+- `[email protected]`
+  - This package no longer depends on `apollo-env` to avoid the side-effects of its polyfills.
 
 ## `[email protected]`
 
 - `[email protected]`
+
   - Bump version of `env-ci` [#1754](https://github.com/apollographql/apollo-tooling/pull/1754) [Issue #2219](https://github.com/apollographql/apollo-tooling/issues/2219)
 
-    Due to human error during the release process, the following packages also had their versions bumped, despite having no known significant changes.  (Apologies, from that human.)
+    Due to human error during the release process, the following packages also had their versions bumped, despite having no known significant changes. (Apologies, from that human.)
 
     - `[email protected]`
     - `[email protected]`
@@ -76,14 +82,18 @@
 
 ## `[email protected]`
 
-- This version should not be used as it was published without depended-on packages.  Please use `[email protected]` instead.
+- This version should not be used as it was published without depended-on packages. Please use `[email protected]` instead.
+
 ## `[email protected]`
 
 - This version was not actually published.
+
 ## `[email protected]`
 
 - This version was not actually published.
+
 ## `[email protected]`
+
 - `apollo-codegen-swift`
   - Fix issue where a query referencing many fragments caused type checking for `queryDocument` to time out [#2198](https://github.com/apollographql/apollo-tooling/pull/2198)
 
@@ -95,19 +105,19 @@
 ## `[email protected]`
 
 - `apollo-codegen-swift`
-   - Fix bug in generated compound type names that lead to structName being inconsistent throughout codegen [#2170](https://github.com/apollographql/apollo-tooling/pull/2170)
+  - Fix bug in generated compound type names that lead to structName being inconsistent throughout codegen [#2170](https://github.com/apollographql/apollo-tooling/pull/2170)
 
 ## `[email protected]`
 
-  - Update CLI default API domain from `engine-graphql.apollographql.com` to `graphql.api.apollographql.com`.
-    Users that have set up support for corporate proxies or firewalls may need to update configurations.
-  - Accept GitLab remote URLs when fetching git info for service:check and service:push [#2104](https://github.com/apollographql/apollo-tooling/pull/2104)
-  - `--commitId` in `service:check` and `service:push` overrides the current commit ID otherwise read through [env-ci](https://www.npmjs.com/package/env-ci).
-  - `service:push` now takes `--author` and `--branch` matching `service:check`.
+- Update CLI default API domain from `engine-graphql.apollographql.com` to `graphql.api.apollographql.com`.
+  Users that have set up support for corporate proxies or firewalls may need to update configurations.
+- Accept GitLab remote URLs when fetching git info for service:check and service:push [#2104](https://github.com/apollographql/apollo-tooling/pull/2104)
+- `--commitId` in `service:check` and `service:push` overrides the current commit ID otherwise read through [env-ci](https://www.npmjs.com/package/env-ci).
+- `service:push` now takes `--author` and `--branch` matching `service:check`.
 
 ## `[email protected]`
 
-  - Rename `defaultEngineReportingSignature` to `defaultUsageReportingSignature`; the old name continues to be exported as well.
+- Rename `defaultEngineReportingSignature` to `defaultUsageReportingSignature`; the old name continues to be exported as well.
 
 ## `[email protected]`
 
@@ -117,7 +127,7 @@
 ## `[email protected]`
 
 - `[email protected]`
-    - Generate JSON file including fragments when --operationIds option is provided [#2017](https://github.com/apollographql/apollo-tooling/pull/2017)
+  - Generate JSON file including fragments when --operationIds option is provided [#2017](https://github.com/apollographql/apollo-tooling/pull/2017)
 
 ## `[email protected]`