diff --git a/package.json b/package.json index 704b094..4de374a 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "graphql-tools": "2.21.0", "helmet": "3.12.0", "lru-cache": "4.1.2", - "merge-graphql-schemas": "1.5.0", + "merge-graphql-schemas": "1.5.4", "morgan": "^1.9.0", "pg-promise": "8.2.2", "prettier": "1.11.1", diff --git a/yarn.lock b/yarn.lock index d4f9450..637bea5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1797,9 +1797,9 @@ deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" -deepmerge@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.0.1.tgz#25c1c24f110fb914f80001b925264dd77f3f4312" +deepmerge@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768" default-require-extensions@^1.0.0: version "1.0.0" @@ -2489,6 +2489,17 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^7.1.3: + version "7.1.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + global-dirs@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" @@ -3876,12 +3887,12 @@ merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" -merge-graphql-schemas@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/merge-graphql-schemas/-/merge-graphql-schemas-1.5.0.tgz#d86278cb1102fe14bb308288136325971aecd86e" +merge-graphql-schemas@1.5.4: + version "1.5.4" + resolved "https://registry.yarnpkg.com/merge-graphql-schemas/-/merge-graphql-schemas-1.5.4.tgz#02829f71bd322374771753c5878522491b8945d2" dependencies: - deepmerge "^2.0.1" - glob "^7.1.2" + deepmerge "^2.1.1" + glob "^7.1.3" is-glob "^4.0.0" merge-stream@^1.0.1: @@ -4432,16 +4443,7 @@ pg-pool@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.3.tgz#c022032c8949f312a4f91fb6409ce04076be3257" -pg-promise@8.2.1: - version "8.2.1" - resolved "https://registry.yarnpkg.com/pg-promise/-/pg-promise-8.2.1.tgz#af11f4009a8d9d0e0d37d2915a5e7e0f66865838" - dependencies: - manakin "0.5.1" - pg "7.4.1" - pg-minify "0.5.4" - spex "2.0.2" - -pg-promise@^8.2.1: +pg-promise@8.2.2, pg-promise@^8.2.1: version "8.2.2" resolved "https://registry.yarnpkg.com/pg-promise/-/pg-promise-8.2.2.tgz#079a71eb358ef7f27f78f4bc3653a1f4bb9266e6" dependencies: