diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b80a3ae4d..2146b1af3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Use generated Typescript types via client:codegen [#1016](https://github.com/apollographql/apollo-tooling/pull/1016) - Remove default `--tag=current` for some client commands that used it [#1062](https://github.com/apollographql/apollo-tooling/pull/1062) - Add missing dependency `@oclif/errors` [#1068](https://github.com/apollographql/apollo-tooling/pull/1068) + - The keyword "type" is escaped when generating scala.js via client:codegen [#1066](https://github.com/apollographql/apollo-tooling/pull/1066) # `apollo@2.5.3` diff --git a/packages/apollo-codegen-scala/src/language.ts b/packages/apollo-codegen-scala/src/language.ts index 9392714290..d8f49864b3 100644 --- a/packages/apollo-codegen-scala/src/language.ts +++ b/packages/apollo-codegen-scala/src/language.ts @@ -189,6 +189,7 @@ const reservedKeywords = new Set([ "trait", "true", "try", + "type", "until", "val", "var",