diff --git a/package.json b/package.json index c4015106b5..0fa54b2997 100644 --- a/package.json +++ b/package.json @@ -48,12 +48,12 @@ "@babel/preset-env": "7.4.5", "@babel/preset-typescript": "7.3.3", "@babel/register": "7.4.4", - "@graphql-tools/delegate": "6.0.10", + "@graphql-tools/delegate": "^8.4.3", "@graphql-tools/graphql-file-loader": "^7.0.6", "@graphql-tools/load": "^7.1.9", - "@graphql-tools/schema": "^8.1.2", - "@graphql-tools/stitch": "^8.2.1", - "@graphql-tools/wrap": "^8.0.13", + "@graphql-tools/schema": "^8.3.1", + "@graphql-tools/stitch": "^8.4.3", + "@graphql-tools/wrap": "^8.3.2", "@heroku/foreman": "2.0.2", "@sentry/node": "5.18.1", "accounting": "0.4.1", diff --git a/src/lib/stitching2/kaws/v2/stitching.ts b/src/lib/stitching2/kaws/v2/stitching.ts index 439fef80a5..687c059ffb 100644 --- a/src/lib/stitching2/kaws/v2/stitching.ts +++ b/src/lib/stitching2/kaws/v2/stitching.ts @@ -44,7 +44,6 @@ export const kawsStitchingEnvironmentV2 = ( marketingCollections: { selectionSet: `{ internalID }`, resolve: ({ internalID: artistID }, args, context, info) => { - debugger return delegateToSchema({ schema: kawsSchema, operation: "query", @@ -61,14 +60,16 @@ export const kawsStitchingEnvironmentV2 = ( }, Fair: { marketingCollections: { - fragment: ` - ... on Fair { - kawsCollectionSlugs - } - `, + selectionSet: gql` + { + ... on Fair { + kawsCollectionSlugs + } + } + `, resolve: ({ kawsCollectionSlugs: slugs }, args, context, info) => { if (slugs.length === 0) return [] - return info.stitchingInfo.delegateToSchema({ + return delegateToSchema({ schema: kawsSchema, operation: "query", fieldName: "marketingCollections", @@ -85,11 +86,13 @@ export const kawsStitchingEnvironmentV2 = ( }, HomePage: { marketingCollectionsModule: { - fragment: gql` + selectionSet: gql` + { ... on HomePage { __typename } - `, + } + `, resolve: () => { return {} }, @@ -97,9 +100,11 @@ export const kawsStitchingEnvironmentV2 = ( }, HomePageMarketingCollectionsModule: { results: { - fragment: gql` - ... on HomePageMarketingCollectionsModule { - __typename + selectionSet: gql` + { + ... on HomePageMarketingCollectionsModule { + __typename + } } `, resolve: async (_source, _args, context, info) => { @@ -107,7 +112,7 @@ export const kawsStitchingEnvironmentV2 = ( // We hard-code the collections slugs here in MP so that the app // can display different collections based only on an MP change // (and not an app deploy). - return await info.mergeInfo.delegateToSchema({ + return delegateToSchema({ schema: kawsSchema, operation: "query", fieldName: "marketingCollections", @@ -132,17 +137,18 @@ export const kawsStitchingEnvironmentV2 = ( }, Viewer: { marketingCollections: { - fragment: gql` - ...on Viewer { - __typename + selectionSet: gql` + { + ... on Viewer { + __typename + } } `, resolve: async (_source, args, context, info) => { - return await info.mergeInfo.delegateToSchema({ + return delegateToSchema({ schema: kawsSchema, operation: "query", fieldName: "marketingCollections", - args, context, info, @@ -152,16 +158,17 @@ export const kawsStitchingEnvironmentV2 = ( }, MarketingCollection: { artworksConnection: { - fragment: ` + selectionSet: gql` fragment MarketingCollectionQuery on MarketingCollection { query { ${Object.keys(filterArtworksArgs).join("\n")} } } `, - resolve: (parent, _args, context, info) => { + resolve: (parent, args, context, info) => { const query = parent.query - const hasKeyword = Boolean(parent.query.keyword) + // debugger + const hasKeyword = Boolean(args.keyword) const existingLoader = context.unauthenticatedLoaders.filterArtworksLoader @@ -174,14 +181,14 @@ export const kawsStitchingEnvironmentV2 = ( // TODO: Should this really modify the context in place? context.unauthenticatedLoaders.filterArtworksLoader = newLoader - return info.mergeInfo.delegateToSchema({ + return delegateToSchema({ schema: localSchema, operation: "query", fieldName: "artworksConnection", args: { ...query, keywordMatchExact: hasKeyword, - ..._args, + ...args, }, context, info, @@ -189,12 +196,14 @@ export const kawsStitchingEnvironmentV2 = ( }, }, internalID: { - fragment: ` - fragment MarketingCollectionIDQuery on MarketingCollection { - id - } - `, - resolve: ({ id }, _args, _context, _info) => id, + selectionSet: gql` + fragment MarketingCollectionIDQuery on MarketingCollection { + id + } + `, + resolve: ({ id }, _args, _context, _info) => { + return id + }, }, }, }, diff --git a/yarn.lock b/yarn.lock index 509a424e78..92b69e7e44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -971,47 +971,37 @@ dependencies: dependency-graph "0.8.1" -"@graphql-tools/batch-delegate@8.0.12": - version "8.0.12" - resolved "https://registry.yarnpkg.com/@graphql-tools/batch-delegate/-/batch-delegate-8.0.12.tgz#77089a6ff5ea4c31c7612e5555418fa3cf2e9146" - integrity sha512-ThqBdrL4dMSTKPLK7XHBg0Uv1JmqiL/oWEQ6/PLiTz6llwNzcK5s1CTTRgerwvRjCLyXiQnidMpdVQADp0jCQg== +"@graphql-tools/batch-delegate@8.2.3": + version "8.2.3" + resolved "https://registry.yarnpkg.com/@graphql-tools/batch-delegate/-/batch-delegate-8.2.3.tgz#5651a9e5283d42088141337d24d9bb8798d87121" + integrity sha512-0205ujghXof7ZsKuBkhGJgie46ZKV4BSShWD4HI4H2O+5WSVzR/n5+jAl/KIMmJ9HomwxfXlYYfBHWTcIQ8s7g== dependencies: - "@graphql-tools/delegate" "^8.1.1" - "@graphql-tools/utils" "^8.1.2" + "@graphql-tools/delegate" "^8.4.3" + "@graphql-tools/utils" "^8.5.4" dataloader "2.0.0" tslib "~2.3.0" -"@graphql-tools/batch-execute@^8.0.5": - version "8.0.5" - resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.0.5.tgz#a0f8a9ff2c61209974c626faf3dd922a5c68d2b0" - integrity sha512-Zx+zs12BLGNvrQtfESIhitzwIkrWnKyKOkAfcaMNuOLGOO2pDmhwIRzbHj+6Jtq9V1/JTaVkSnm/4ozaCRck5A== +"@graphql-tools/batch-execute@^8.3.1": + version "8.3.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.3.1.tgz#0b74c54db5ac1c5b9a273baefc034c2343ebbb74" + integrity sha512-63kHY8ZdoO5FoeDXYHnAak1R3ysMViMPwWC2XUblFckuVLMUPmB2ONje8rjr2CvzWBHAW8c1Zsex+U3xhKtGIA== dependencies: - "@graphql-tools/utils" "^8.1.1" + "@graphql-tools/utils" "^8.5.1" dataloader "2.0.0" tslib "~2.3.0" - value-or-promise "1.0.10" + value-or-promise "1.0.11" -"@graphql-tools/delegate@6.0.10": - version "6.0.10" - resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-6.0.10.tgz#f2fe8eea6cd5ce23f1e8f3dacfa6e136cad157da" - integrity sha512-FBHrmpSI9QpNbvqc5D4wdQW0WrNVUA2ylFhzsNRk9yvlKzcVKqiTrOpb++j7TLB+tG06dpSkfAssPcgZvU60fw== +"@graphql-tools/delegate@^8.4.2", "@graphql-tools/delegate@^8.4.3": + version "8.4.3" + resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-8.4.3.tgz#ad73ed7cc3b4cad9242c6d4835a5ae0b640f7164" + integrity sha512-hKTJdJXJnKL0+2vpU+Kt7OHQTIXZ9mBmNBwHsYiG5WNArz/vNI7910r6TC2XMf/e7zhyyK+mXxMDBmDQkkJagA== dependencies: - "@graphql-tools/schema" "6.0.10" - "@graphql-tools/utils" "6.0.10" - aggregate-error "3.0.1" - tslib "~2.0.0" - -"@graphql-tools/delegate@^8.1.0", "@graphql-tools/delegate@^8.1.1": - version "8.1.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-8.1.1.tgz#d20e6d81a2900b1c8a69c2c0a3a8a0df2f9030c2" - integrity sha512-Vttd0nfYTqRnRMKLvk8s4cIi9U+OMXGc9CMZAlKkHrBJ6dGXjdSM+4n3p9rfWZc/FtbVk1FnNS4IFyMeKwFuxA== - dependencies: - "@graphql-tools/batch-execute" "^8.0.5" - "@graphql-tools/schema" "^8.1.2" - "@graphql-tools/utils" "^8.1.2" + "@graphql-tools/batch-execute" "^8.3.1" + "@graphql-tools/schema" "^8.3.1" + "@graphql-tools/utils" "^8.5.4" dataloader "2.0.0" tslib "~2.3.0" - value-or-promise "1.0.10" + value-or-promise "1.0.11" "@graphql-tools/graphql-file-loader@^7.0.6": version "7.0.6" @@ -1042,7 +1032,7 @@ p-limit "3.1.0" tslib "~2.3.0" -"@graphql-tools/merge@^8.0.2", "@graphql-tools/merge@^8.0.3": +"@graphql-tools/merge@^8.0.2": version "8.0.3" resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.0.3.tgz#56c844bc5d7d833456695c8e5eda4f1a0d5be873" integrity sha512-lVMyW9cREs+nQYbUvMaaqSl+pRCezl2RafNMFi/04akjvOtjVefdi7n3pArpSqPhLHPJDyQRlI8CK8cmOZ9jTA== @@ -1050,15 +1040,15 @@ "@graphql-tools/utils" "^8.1.2" tslib "~2.3.0" -"@graphql-tools/schema@6.0.10": - version "6.0.10" - resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-6.0.10.tgz#69b36fad35ea5780f8539c92e776f9e83d929575" - integrity sha512-g8iy36dgf/Cpyz7bHSE2axkE8PdM5VYdS2tntmytLvPaN3Krb8IxBpZBJhmiICwyAAkruQE7OjDfYr8vP8jY4A== +"@graphql-tools/merge@^8.2.1": + version "8.2.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.2.1.tgz#bf83aa06a0cfc6a839e52a58057a84498d0d51ff" + integrity sha512-Q240kcUszhXiAYudjuJgNuLgy9CryDP3wp83NOZQezfA6h3ByYKU7xI6DiKrdjyVaGpYN3ppUmdj0uf5GaXzMA== dependencies: - "@graphql-tools/utils" "6.0.10" - tslib "~2.0.0" + "@graphql-tools/utils" "^8.5.1" + tslib "~2.3.0" -"@graphql-tools/schema@8.1.2", "@graphql-tools/schema@^8.1.2": +"@graphql-tools/schema@8.1.2": version "8.1.2" resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.1.2.tgz#913879da1a7889a9488e9b7dc189e7c83eff74be" integrity sha512-rX2pg42a0w7JLVYT+f/yeEKpnoZL5PpLq68TxC3iZ8slnNBNjfVfvzzOn8Q8Q6Xw3t17KP9QespmJEDfuQe4Rg== @@ -1068,26 +1058,28 @@ tslib "~2.3.0" value-or-promise "1.0.10" -"@graphql-tools/stitch@^8.2.1": - version "8.2.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/stitch/-/stitch-8.2.1.tgz#19f174e642b6e4ae16064215706acd59d71f6520" - integrity sha512-QZ4qu++9XwrSVL51DpmwRSpPkdS7ScbyTkHOtudAwQv/rti6RP+qlAaRwMLao1WZfjZDnNJj/JeXqnPHjHTj8w== +"@graphql-tools/schema@^8.3.1": + version "8.3.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.3.1.tgz#1ee9da494d2da457643b3c93502b94c3c4b68c74" + integrity sha512-3R0AJFe715p4GwF067G5i0KCr/XIdvSfDLvTLEiTDQ8V/hwbOHEKHKWlEBHGRQwkG5lwFQlW1aOn7VnlPERnWQ== dependencies: - "@graphql-tools/batch-delegate" "8.0.12" - "@graphql-tools/delegate" "^8.1.1" - "@graphql-tools/merge" "^8.0.3" - "@graphql-tools/schema" "^8.1.2" - "@graphql-tools/utils" "^8.1.2" - "@graphql-tools/wrap" "^8.0.13" + "@graphql-tools/merge" "^8.2.1" + "@graphql-tools/utils" "^8.5.1" + tslib "~2.3.0" + value-or-promise "1.0.11" + +"@graphql-tools/stitch@^8.4.3": + version "8.4.3" + resolved "https://registry.yarnpkg.com/@graphql-tools/stitch/-/stitch-8.4.3.tgz#c5fd3cab23f72cc659e03b0127cbbb9aa7af8835" + integrity sha512-IOgKgMu/TeB0ZHOFHW147I/9LUo4NgRs7vqTqmTPVutiTR1YPYDdBWoQh+rhDBQN6gvxKq6EI/RcMGslbOMLvQ== + dependencies: + "@graphql-tools/batch-delegate" "8.2.3" + "@graphql-tools/delegate" "^8.4.3" + "@graphql-tools/merge" "^8.2.1" + "@graphql-tools/schema" "^8.3.1" + "@graphql-tools/utils" "^8.5.4" + "@graphql-tools/wrap" "^8.3.1" tslib "~2.3.0" - -"@graphql-tools/utils@6.0.10": - version "6.0.10" - resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-6.0.10.tgz#ed15110a20acc5474a8dda5c0b99f970ba696c75" - integrity sha512-1s3vBnYUIDLBGEaV1VF3lv1Xq54lT8Oz7tNNypv7K7cv3auKX7idRtjP8RM6hKpGod46JNZgu3NNOshMUEyEyA== - dependencies: - aggregate-error "3.0.1" - camel-case "4.1.1" "@graphql-tools/utils@^8.1.1", "@graphql-tools/utils@^8.1.2": version "8.1.2" @@ -1096,16 +1088,23 @@ dependencies: tslib "~2.3.0" -"@graphql-tools/wrap@^8.0.13": - version "8.0.13" - resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-8.0.13.tgz#17a4096efbc64e15b27a74135d920c8bd3e5385a" - integrity sha512-GTkHbN+Zgs+D7bFniFx3/YqNIDv8ET17prM7FewmU8LNRc2P48y6d4/dkQLcwQmryy1TZF87es6yA9FMNfQtWg== +"@graphql-tools/utils@^8.5.1", "@graphql-tools/utils@^8.5.3", "@graphql-tools/utils@^8.5.4": + version "8.5.5" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.5.5.tgz#019ddb99719feb19602afdb537c06e463df674a9" + integrity sha512-y7zRXWIUI73X+9/rf/0KzrNFMlpRKFfzLiwdbIeWwgLs+NV9vfUOoVkX8luXX6LwQxhSypHATMiwZGM2ro/wJA== dependencies: - "@graphql-tools/delegate" "^8.1.0" - "@graphql-tools/schema" "^8.1.2" - "@graphql-tools/utils" "^8.1.1" tslib "~2.3.0" - value-or-promise "1.0.10" + +"@graphql-tools/wrap@^8.3.1", "@graphql-tools/wrap@^8.3.2": + version "8.3.2" + resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-8.3.2.tgz#d3bcecb7529d071e4ecc4dfc75b9566e3da79d4f" + integrity sha512-7DcOBFB+Dd84x9dxSm7qS4iJONMyfLnCJb8A19vGPffpu4SMJ3sFcgwibKFu5l6mMUiigKgXna2RRgWI+02bKQ== + dependencies: + "@graphql-tools/delegate" "^8.4.2" + "@graphql-tools/schema" "^8.3.1" + "@graphql-tools/utils" "^8.5.3" + tslib "~2.3.0" + value-or-promise "1.0.11" "@heroku/foreman@2.0.2": version "2.0.2" @@ -2086,14 +2085,6 @@ agent-base@5: resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c" integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g== -aggregate-error@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0" - integrity sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA== - dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" - ajv@^5.1.0: version "5.5.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.0.tgz#eb2840746e9dc48bd5e063a36e3fd400c5eab5a9" @@ -2958,14 +2949,6 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3" integrity sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw== -camel-case@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz#1fc41c854f00e2f7d0139dfeba1542d6896fe547" - integrity sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q== - dependencies: - pascal-case "^3.1.1" - tslib "^1.10.0" - camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" @@ -3099,11 +3082,6 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -clean-stack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" - integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== - cli-cursor@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" @@ -5511,11 +5489,6 @@ indent-string@^3.0.0: resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== - inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -7099,13 +7072,6 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1: dependencies: js-tokens "^3.0.0" -lower-case@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7" - integrity sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ== - dependencies: - tslib "^1.10.0" - lru-cache@^4.0.1: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" @@ -7534,14 +7500,6 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -no-case@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz#c21b434c1ffe48b39087e86cfb4d2582e9df18f8" - integrity sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw== - dependencies: - lower-case "^2.0.1" - tslib "^1.10.0" - node-cleanup@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/node-cleanup/-/node-cleanup-2.1.2.tgz#7ac19abd297e09a7f72a71545d951b517e4dde2c" @@ -8134,14 +8092,6 @@ parseurl@~1.3.2: resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M= -pascal-case@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz#5ac1975133ed619281e88920973d2cd1f279de5f" - integrity sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA== - dependencies: - no-case "^3.0.3" - tslib "^1.10.0" - pascalcase@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" @@ -10045,11 +9995,6 @@ tsconfig-paths@^3.9.0: minimist "^1.2.0" strip-bom "^3.0.0" -tslib@^1.10.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" - integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== - tslib@^1.8.1: version "1.10.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" @@ -10060,11 +10005,6 @@ tslib@^1.9.0, tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== -tslib@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3" - integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g== - tslib@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" @@ -10333,6 +10273,11 @@ value-or-promise@1.0.10: resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.10.tgz#5bf041f1e9a8e7043911875547636768a836e446" integrity sha512-1OwTzvcfXkAfabk60UVr5NdjtjJ0Fg0T5+B1bhxtrOEwSH2fe8y4DnLgoksfCyd8yZCOQQHB0qLMQnwgCjbXLQ== +value-or-promise@1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140" + integrity sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg== + vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"