From 17844a323ae7faf0a536adb438f21123c627523b Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Wed, 22 Sep 2021 19:59:08 -0400 Subject: [PATCH 1/2] fix: remove flat polyfill, use Array.prototype.flat instead --- packages/apollo-graphql/package.json | 3 +-- .../src/schema/buildSchemaFromSDL.ts | 18 ++++++------------ .../apollo-graphql/src/types/core-js-pure.d.ts | 7 ------- 3 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 packages/apollo-graphql/src/types/core-js-pure.d.ts diff --git a/packages/apollo-graphql/package.json b/packages/apollo-graphql/package.json index cfe327ae13..0e6dfa0bbe 100644 --- a/packages/apollo-graphql/package.json +++ b/packages/apollo-graphql/package.json @@ -8,10 +8,9 @@ "author": "Apollo ", "license": "MIT", "engines": { - "node": ">=6" + "node": ">=12" }, "dependencies": { - "core-js-pure": "^3.10.2", "lodash.sortby": "^4.7.0", "sha.js": "^2.4.11" }, diff --git a/packages/apollo-graphql/src/schema/buildSchemaFromSDL.ts b/packages/apollo-graphql/src/schema/buildSchemaFromSDL.ts index 4cab05c6ef..f7ce56d071 100644 --- a/packages/apollo-graphql/src/schema/buildSchemaFromSDL.ts +++ b/packages/apollo-graphql/src/schema/buildSchemaFromSDL.ts @@ -26,11 +26,6 @@ import { GraphQLResolverMap } from "./resolverMap"; import { GraphQLSchemaValidationError } from "./GraphQLSchemaValidationError"; import { specifiedSDLRules } from "graphql/validation/specifiedRules"; -// TODO(Node.js 10): When we deprecate Node.js 10, remove this and switch -// to using `Array.prototype.flat`. When doing this, deleting the hand-rolled -// types in `./packages/apollo-gateway/src/types/` that go with it. -import flat from "core-js-pure/features/array/flat"; - import { KnownTypeNamesRule, UniqueDirectivesPerLocationRule, @@ -162,7 +157,7 @@ export function buildSchemaFromSDL( { kind: Kind.DOCUMENT, definitions: [ - ...flat(Object.values(definitionsMap)), + ...Object.values(definitionsMap).flat(), ...missingTypeDefinitions, ...directiveDefinitions ] @@ -176,7 +171,7 @@ export function buildSchemaFromSDL( schema, { kind: Kind.DOCUMENT, - definitions: flat(Object.values(extensionsMap)) + definitions: Object.values(extensionsMap).flat() }, { assumeValidSDL: true @@ -188,11 +183,10 @@ export function buildSchemaFromSDL( if (schemaDefinitions.length > 0 || schemaExtensions.length > 0) { operationTypeMap = {}; - const operationTypes = flat( - [...schemaDefinitions, ...schemaExtensions] - .map(node => node.operationTypes) - .filter(isNotNullOrUndefined) - ); + const operationTypes = [...schemaDefinitions, ...schemaExtensions] + .map(node => node.operationTypes) + .filter(isNotNullOrUndefined) + .flat(); for (const { operation, type } of operationTypes) { operationTypeMap[operation] = type.name.value; diff --git a/packages/apollo-graphql/src/types/core-js-pure.d.ts b/packages/apollo-graphql/src/types/core-js-pure.d.ts deleted file mode 100644 index 4b4a42f06d..0000000000 --- a/packages/apollo-graphql/src/types/core-js-pure.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -declare module "core-js-pure/features/array/flat" { - function flat( - array: A[], - ...args: Parameters - ): A; - export = flat; -} From db2ad4509073a77e1a8a01681ae3861cdf7bba69 Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Wed, 22 Sep 2021 20:20:16 -0400 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9b2a5fb42..d9aadaa870 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ - `apollo-env` - - `apollo-graphql` - - + - remove flat polyfill, use Array.prototype.flat instead [PR #2449](https://github.com/apollographql/apollo-tooling/pull/2449) - `apollo-language-server` - - `apollo-tools` @@ -33,7 +33,7 @@ ## apollo@2.33.5 -- 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) +- 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) ## apollo-tools@0.5.1