Skip to content

Commit 0471751

Browse files
m4rrc0GatsbyJS Bot
authored and
GatsbyJS Bot
committed
fix(gatsby): Fix flatMap import in schema/print.js (#19208)
* fix(gatsby): Fix flatMap import in schema/print.js * add array.prototype.flatmap dependency to gatsby * require flatMap from array.prototype.flatmap instead of graphql polyfills * fix linting error * update lock file
1 parent 6061831 commit 0471751

File tree

3 files changed

+50
-3
lines changed

3 files changed

+50
-3
lines changed

packages/gatsby/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"@typescript-eslint/eslint-plugin": "^2.6.0",
2525
"@typescript-eslint/parser": "^2.6.0",
2626
"address": "1.1.2",
27+
"array.prototype.flatmap": "^1.2.2",
2728
"autoprefixer": "^9.7.0",
2829
"axios": "^0.19.0",
2930
"babel-core": "7.0.0-bridge.0",

packages/gatsby/src/schema/print.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ const {
185185
DEFAULT_DEPRECATION_REASON,
186186
} = require(`graphql`)
187187
const { printBlockString } = require(`graphql/language/blockString`)
188-
const { flatMap } = require(`graphql/polyfills/flatMap`)
188+
const flatMap = require(`array.prototype.flatmap`)
189189

190190
const printScalarType = tc => {
191191
const type = tc.getType()

yarn.lock

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4110,6 +4110,15 @@ array-unique@^0.3.2:
41104110
version "0.3.2"
41114111
resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
41124112

4113+
array.prototype.flatmap@^1.2.2:
4114+
version "1.2.2"
4115+
resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.2.tgz#28d621d351c19a62b84331b01669395ef6cef4c4"
4116+
integrity sha512-ZZtPLE74KNE+0XcPv/vQmcivxN+8FhwOLvt2udHauO0aDEpsXDQrmd5HuJGpgPVyaV8HvkDPWnJ2iaem0oCKtA==
4117+
dependencies:
4118+
define-properties "^1.1.3"
4119+
es-abstract "^1.15.0"
4120+
function-bind "^1.1.1"
4121+
41134122
arraybuffer.slice@~0.0.7:
41144123
version "0.0.7"
41154124
resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
@@ -6926,7 +6935,7 @@ csstype@^2.2.0, csstype@^2.5.7:
69266935
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.5.tgz#1cd1dff742ebf4d7c991470ae71e12bb6751e034"
69276936
integrity sha512-JsTaiksRsel5n7XwqPAfB0l3TFKdpjW/kgAELf9vrb5adGA7UCPLajKK5s3nFrcFm3Rkyp/Qkgl73ENc1UY3cA==
69286937

6929-
"csstype@github:rtsao/csstype#c4e709f":
6938+
csstype@rtsao/csstype#c4e709f:
69306939
version "2.6.4"
69316940
resolved "https://codeload.github.com/rtsao/csstype/tar.gz/c4e709f5e047e9cacb721e437f53f0b84d6ada84"
69326941

@@ -8018,6 +8027,22 @@ es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.4.3, es-abstract@^1.5.1
80188027
is-regex "^1.0.4"
80198028
object-keys "^1.0.12"
80208029

8030+
es-abstract@^1.15.0:
8031+
version "1.16.0"
8032+
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.0.tgz#d3a26dc9c3283ac9750dca569586e976d9dcc06d"
8033+
integrity sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==
8034+
dependencies:
8035+
es-to-primitive "^1.2.0"
8036+
function-bind "^1.1.1"
8037+
has "^1.0.3"
8038+
has-symbols "^1.0.0"
8039+
is-callable "^1.1.4"
8040+
is-regex "^1.0.4"
8041+
object-inspect "^1.6.0"
8042+
object-keys "^1.1.1"
8043+
string.prototype.trimleft "^2.1.0"
8044+
string.prototype.trimright "^2.1.0"
8045+
80218046
es-to-primitive@^1.2.0:
80228047
version "1.2.0"
80238048
resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
@@ -15318,6 +15343,11 @@ object-hash@^1.1.4:
1531815343
version "1.3.0"
1531915344
resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.0.tgz#76d9ba6ff113cf8efc0d996102851fe6723963e2"
1532015345

15346+
object-inspect@^1.6.0:
15347+
version "1.6.0"
15348+
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
15349+
integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
15350+
1532115351
object-inspect@~1.4.0:
1532215352
version "1.4.1"
1532315353
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
@@ -19650,6 +19680,22 @@ string.prototype.repeat@^0.2.0:
1965019680
version "0.2.0"
1965119681
resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz#aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf"
1965219682

19683+
string.prototype.trimleft@^2.1.0:
19684+
version "2.1.0"
19685+
resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634"
19686+
integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==
19687+
dependencies:
19688+
define-properties "^1.1.3"
19689+
function-bind "^1.1.1"
19690+
19691+
string.prototype.trimright@^2.1.0:
19692+
version "2.1.0"
19693+
resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58"
19694+
integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==
19695+
dependencies:
19696+
define-properties "^1.1.3"
19697+
function-bind "^1.1.1"
19698+
1965319699
[email protected], string_decoder@~0.10.x:
1965419700
version "0.10.31"
1965519701
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
@@ -19923,7 +19969,7 @@ supports-hyperlinks@^1.0.1:
1992319969
has-flag "^2.0.0"
1992419970
supports-color "^5.0.0"
1992519971

19926-
[email protected], svgo@^1.0.0, svgo@^1.3.0:
19972+
[email protected], svgo@^1.0.0:
1992719973
version "1.3.0"
1992819974
resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.0.tgz#bae51ba95ded9a33a36b7c46ce9c359ae9154313"
1992919975
integrity sha512-MLfUA6O+qauLDbym+mMZgtXCGRfIxyQoeH6IKVcFslyODEe/ElJNwr0FohQ3xG4C6HK6bk3KYPPXwHVJk3V5NQ==

0 commit comments

Comments
 (0)