From 73d85e39405d554f82ff6a9e95662c4ee9bf5771 Mon Sep 17 00:00:00 2001 From: Lynn Romich Date: Sat, 2 Mar 2024 16:09:23 +0100 Subject: [PATCH] feat: remove GraphQL functionality --- package.json | 2 - src/graphql/index.ts | 14 ---- src/graphql/resolvers.ts | 30 -------- src/graphql/schema.graphql | 75 -------------------- src/index.ts | 4 -- src/internal/types.ts | 2 - src/modules/QuotesModule.ts | 24 ------- src/modules/index.ts | 4 -- src/utils/graphql.ts | 5 -- yarn.lock | 138 +----------------------------------- 10 files changed, 3 insertions(+), 295 deletions(-) delete mode 100644 src/graphql/index.ts delete mode 100644 src/graphql/resolvers.ts delete mode 100644 src/graphql/schema.graphql delete mode 100644 src/utils/graphql.ts diff --git a/package.json b/package.json index 8d8aec0..ef980aa 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,6 @@ "deep-object-diff": "^1.1.0", "discord.js": "^14.14.1", "form-data": "^4.0.0", - "graphql": "^16.1.0", - "graphql-tools": "^8.2.0", "kubernetes-client": "^9.0.0", "lodash": "^4.17.21", "mime-types": "^2.1.30", diff --git a/src/graphql/index.ts b/src/graphql/index.ts deleted file mode 100644 index a3e5320..0000000 --- a/src/graphql/index.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { ApolloServer } from "apollo-server"; -import { readFileSync } from "fs"; -import * as path from "path"; -import { resolvers as moduleResolvers } from "../modules"; -import { mergeResolverDefinitions } from "../utils/graphql"; -import appResolvers from "./resolvers"; - -const typeDefs = readFileSync(path.join(__dirname, "schema.graphql")).toString( - "utf-8" -); - -const resolvers = mergeResolverDefinitions([appResolvers, moduleResolvers]); - -export const server = new ApolloServer({ typeDefs, resolvers }); diff --git a/src/graphql/resolvers.ts b/src/graphql/resolvers.ts deleted file mode 100644 index 841094b..0000000 --- a/src/graphql/resolvers.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Guild } from "discord.js"; -import { GraphQLFieldResolver } from "graphql"; -import { IResolvers } from "@graphql-tools/utils"; -import client from "../client"; - -interface AppResolvers extends IResolvers { - Query: { - guilds: GraphQLFieldResolver; - guild: GraphQLFieldResolver; - }; - Guild: { - members: GraphQLFieldResolver; - }; -} - -const resolvers: AppResolvers = { - Query: { - guilds: () => [...client.guilds.cache.values()], - guild: async (_, args) => await client.guilds.fetch(args.id), - }, - Guild: { - members: async (parent, args) => [ - ...( - await parent.members.search({ query: args.query, limit: args.limit }) - ).values(), - ], - }, -}; - -export default resolvers; diff --git a/src/graphql/schema.graphql b/src/graphql/schema.graphql deleted file mode 100644 index 1b84eea..0000000 --- a/src/graphql/schema.graphql +++ /dev/null @@ -1,75 +0,0 @@ -type QuoteMessageAttachment { - id: String! - url: String! -} - -type QuoteMessageAuthor { - id: String! - avatar: String - discriminator: String! - username: String! -} - -type QuoteMessageChannel { - id: String! -} - -type QuoteMessageGuild { - id: String! - name: String! -} - -type QuoteMessageMember { - nickname: String -} - -type QuoteMessage { - id: String! - attachments: [QuoteMessageAttachment] - author: QuoteMessageAuthor! - channel: QuoteMessageChannel! - content: String! - createdAt: String! - guild: QuoteMessageGuild! - member: QuoteMessageMember! -} - -type Quote { - id: Int! - guildId: String! - userId: String! - messageId: String - message: QuoteMessage! -} - -input QuoteSearchInput { - guildId: String! - query: String - userId: String -} - -type User { - id: String! - username: String! - discriminator: String! - avatar: String -} - -type GuildMember { - user: User - nick: String -} - -type Guild { - id: String! - name: String! - icon: String - - members(query: String!, limit: Int = 1): [GuildMember] -} - -type Query { - quotes(searchInput: QuoteSearchInput): [Quote] - guilds: [Guild] - guild(id: String!): Guild -} diff --git a/src/index.ts b/src/index.ts index 47e0258..3cee27d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,7 +1,6 @@ import logger from "./logger"; import environment from "./environment"; import client from "./client"; -import { server as graphqlServer } from "./graphql"; import * as Sentry from "@sentry/node"; import "@sentry/tracing"; @@ -13,9 +12,6 @@ Sentry.init({ const main = async () => { logger.info("Starting client..."); await client.login(environment.TOKEN); - - logger.info("Starting GraphQL server..."); - await graphqlServer.listen(); }; main(); diff --git a/src/internal/types.ts b/src/internal/types.ts index b1c00f3..533fe8a 100644 --- a/src/internal/types.ts +++ b/src/internal/types.ts @@ -1,6 +1,5 @@ import { CronJob } from "cron"; import { ClientEvents, Snowflake } from "discord.js"; -import { IResolvers } from "@graphql-tools/utils"; import { AppEventHandler } from "../emitter"; import { Command } from "./command"; @@ -15,7 +14,6 @@ export interface HandlerCollection { export interface Module { commands: Command[]; handlers: HandlerCollection; - resolvers?: IResolvers; appEventHandlers?: AppEventHandler[]; cronJobs?: CronJob[]; } diff --git a/src/modules/QuotesModule.ts b/src/modules/QuotesModule.ts index a0276f0..246c86a 100644 --- a/src/modules/QuotesModule.ts +++ b/src/modules/QuotesModule.ts @@ -18,7 +18,6 @@ import logger from "../logger"; import config from "../config"; import { Command, CommandSubCommand } from "../internal/command"; import { Module, SerializableMessage } from "../internal/types"; -import { GraphQLFieldResolver } from "graphql"; import { buildUsernameString } from "../utils/strings"; import { Channel } from "diagnostics_channel"; @@ -335,24 +334,6 @@ class QuotesCommand extends Command { } } -const quotesResolver: GraphQLFieldResolver< - any, - any, - { searchInput: { guildId: string; query?: string; userId?: string } } -> = async (_, args) => { - const { searchInput } = args; - - const results = await searchQuotes({ - returnAll: true, - guildId: searchInput.guildId, - query: searchInput.query, - userId: searchInput.userId, - fetchMembers: true, - }); - - return results; -}; - const buildEmbedForQuotedMessage = async ( message: SerializableMessage, quoteId: number @@ -531,11 +512,6 @@ const searchQuotes = async (input: SearchInput) => { const QuotesModule: Module = { commands: [new QuotesCommand()], handlers: {}, - resolvers: { - Query: { - quotes: quotesResolver, - }, - }, }; export default QuotesModule; diff --git a/src/modules/index.ts b/src/modules/index.ts index 750ba29..2aa890c 100644 --- a/src/modules/index.ts +++ b/src/modules/index.ts @@ -1,6 +1,5 @@ import { flatten } from "lodash"; import emitter from "../emitter"; -import { mergeResolverDefinitions } from "../utils/graphql"; import { mergeHandlerCollections } from "../utils/modules"; import BotAdministrationModule from "./BotAdministrationModule"; import FunModule from "./FunModule"; @@ -60,6 +59,3 @@ for (const module of modules) { export const commands = flatten(modules.map((m) => m.commands)); export const handlers = mergeHandlerCollections(modules.map((m) => m.handlers)); -export const resolvers = mergeResolverDefinitions( - modules.map((m) => m.resolvers ?? {}) -); diff --git a/src/utils/graphql.ts b/src/utils/graphql.ts deleted file mode 100644 index 3749571..0000000 --- a/src/utils/graphql.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { merge } from "lodash"; - -export const mergeResolverDefinitions = (definitions: any[]) => { - return merge({}, ...definitions); -}; diff --git a/yarn.lock b/yarn.lock index b71857b..a9d4ce3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,25 +2,6 @@ # yarn lockfile v1 -"@apollo/client@~3.2.5 || ~3.3.0 || ~3.4.0 || ~3.5.0 || ~3.6.0 || ~3.7.0": - version "3.7.17" - resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.7.17.tgz#1d2538729fd8ef138aa301a7cf62704474e57b72" - integrity sha512-0EErSHEtKPNl5wgWikHJbKFAzJ/k11O0WO2QyqZSHpdxdAnw7UWHY4YiLbHCFG7lhrD+NTQ3Z/H9Jn4rcikoJA== - dependencies: - "@graphql-typed-document-node/core" "^3.1.1" - "@wry/context" "^0.7.0" - "@wry/equality" "^0.5.0" - "@wry/trie" "^0.4.0" - graphql-tag "^2.12.6" - hoist-non-react-statics "^3.3.2" - optimism "^0.16.2" - prop-types "^15.7.2" - response-iterator "^0.2.6" - symbol-observable "^4.0.0" - ts-invariant "^0.10.3" - tslib "^2.3.0" - zen-observable-ts "^1.2.5" - "@apollo/protobufjs@1.2.6": version "1.2.6" resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.6.tgz#d601e65211e06ae1432bf5993a1a0105f2862f27" @@ -701,34 +682,6 @@ resolved "https://registry.yarnpkg.com/@vladfrangu/async_event_emitter/-/async_event_emitter-2.2.4.tgz#d3537432c6db6444680a596271dff8ea407343b3" integrity sha512-ButUPz9E9cXMLgvAW8aLAKKJJsPu1dY1/l/E8xzLFuysowXygs6GBcyunK9rnGC4zTsnIc2mQo71rGw9U+Ykug== -"@wry/context@^0.7.0": - version "0.7.4" - resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.7.4.tgz#e32d750fa075955c4ab2cfb8c48095e1d42d5990" - integrity sha512-jmT7Sb4ZQWI5iyu3lobQxICu2nC/vbUhP0vIdd6tHC9PTfenmRmuIFqktc6GH9cgi+ZHnsLWPvfSvc4DrYmKiQ== - dependencies: - tslib "^2.3.0" - -"@wry/equality@^0.5.0": - version "0.5.7" - resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.5.7.tgz#72ec1a73760943d439d56b7b1e9985aec5d497bb" - integrity sha512-BRFORjsTuQv5gxcXsuDXx6oGRhuVsEGwZy6LOzRRfgu+eSfxbhUQ9L9YtSEIuIjY/o7g3iWFjrc5eSY1GXP2Dw== - dependencies: - tslib "^2.3.0" - -"@wry/trie@^0.3.0": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@wry/trie/-/trie-0.3.2.tgz#a06f235dc184bd26396ba456711f69f8c35097e6" - integrity sha512-yRTyhWSls2OY/pYLfwff867r8ekooZ4UI+/gxot5Wj8EFwSf2rG+n+Mo/6LoLQm1TKA4GRj2+LCpbfS937dClQ== - dependencies: - tslib "^2.3.0" - -"@wry/trie@^0.4.0": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@wry/trie/-/trie-0.4.3.tgz#077d52c22365871bf3ffcbab8e95cb8bc5689af4" - integrity sha512-I6bHwH0fSf6RqQcnnXLJKhkSXG45MFral3GxPaY4uAl0LYDZM+YDVDAiU9bYwjTuysy1S0IeecWtmq1SZA3M1w== - dependencies: - tslib "^2.3.0" - abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -1598,28 +1551,13 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graphql-tag@^2.11.0, graphql-tag@^2.12.6: +graphql-tag@^2.11.0: version "2.12.6" resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1" integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg== dependencies: tslib "^2.1.0" -graphql-tools@^8.2.0: - version "8.3.20" - resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-8.3.20.tgz#d6b7ff46d30bf89b1963418fa481ee3326ac6fff" - integrity sha512-x3VkXkaGyPaZu1G0Vr2x/7yxTiuTB6xpY3RbH2uTjBv01Z+985J3//B81fooTtEf2eySBiyPplMYwFmAybOIrQ== - dependencies: - "@graphql-tools/schema" "^9.0.18" - tslib "^2.4.0" - optionalDependencies: - "@apollo/client" "~3.2.5 || ~3.3.0 || ~3.4.0 || ~3.5.0 || ~3.6.0 || ~3.7.0" - -graphql@^16.1.0: - version "16.8.1" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.8.1.tgz#1930a965bef1170603702acdb68aedd3f3cf6f07" - integrity sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw== - har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -1667,13 +1605,6 @@ help-me@^5.0.0: resolved "https://registry.yarnpkg.com/help-me/-/help-me-5.0.0.tgz#b1ebe63b967b74060027c2ac61f9be12d354a6f6" integrity sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg== -hoist-non-react-statics@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" - integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== - dependencies: - react-is "^16.7.0" - http-cache-semantics@^4.0.0: version "4.1.1" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" @@ -1807,11 +1738,6 @@ joycon@^3.1.1: resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03" integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw== -"js-tokens@^3.0.0 || ^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - js-yaml@^3.13.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" @@ -1916,13 +1842,6 @@ long@^4.0.0: resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== -loose-envify@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" - integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== - dependencies: - js-tokens "^3.0.0 || ^4.0.0" - lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" @@ -2100,7 +2019,7 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@^4, object-assign@^4.1.1: +object-assign@^4: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== @@ -2154,14 +2073,6 @@ openid-client@^3.14.0: oidc-token-hash "^5.0.0" p-any "^3.0.0" -optimism@^0.16.2: - version "0.16.2" - resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.16.2.tgz#519b0c78b3b30954baed0defe5143de7776bf081" - integrity sha512-zWNbgWj+3vLEjZNIh/okkY2EUfX+vB9TJopzIZwT1xxaMqC5hRLLraePod4c5n4He08xuXNH+zhKFFCu390wiQ== - dependencies: - "@wry/context" "^0.7.0" - "@wry/trie" "^0.3.0" - p-any@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-any/-/p-any-3.0.0.tgz#79847aeed70b5d3a10ea625296c0c3d2e90a87b9" @@ -2295,15 +2206,6 @@ process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== -prop-types@^15.7.2: - version "15.8.1" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" - integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== - dependencies: - loose-envify "^1.4.0" - object-assign "^4.1.1" - react-is "^16.13.1" - proxy-addr@~2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" @@ -2379,11 +2281,6 @@ raw-body@2.5.2: iconv-lite "0.4.24" unpipe "1.0.0" -react-is@^16.13.1, react-is@^16.7.0: - version "16.13.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" - integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== - readable-stream@^4.0.0: version "4.5.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.5.2.tgz#9e7fc4c45099baeed934bff6eb97ba6cf2729e09" @@ -2449,11 +2346,6 @@ resolve@^1.1.6: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -response-iterator@^0.2.6: - version "0.2.6" - resolved "https://registry.yarnpkg.com/response-iterator/-/response-iterator-0.2.6.tgz#249005fb14d2e4eeb478a3f735a28fd8b4c9f3da" - integrity sha512-pVzEEzrsg23Sh053rmDUvLSkGXluZio0qu8VT6ukrYuvtjVfCbDZH9d6PGXb8HZfzdNZt8feXv/jvUzlhRgLnw== - responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -2658,11 +2550,6 @@ sylvester@^0.0.12: resolved "https://registry.yarnpkg.com/sylvester/-/sylvester-0.0.12.tgz#5a884415cd2d002c57e7a3aac99462a75ce9fdb4" integrity sha512-SzRP5LQ6Ts2G5NyAa/jg16s8e3R7rfdFjizy1zeoecYWw+nGL+YA1xZvW/+iJmidBGSdLkuvdwTYEyJEb+EiUw== -symbol-observable@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-4.0.0.tgz#5b425f192279e87f2f9b937ac8540d1984b39205" - integrity sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ== - thread-stream@^2.0.0: version "2.4.1" resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-2.4.1.tgz#6d588b14f0546e59d3f306614f044bc01ce43351" @@ -2712,13 +2599,6 @@ tr46@~0.0.3: resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== -ts-invariant@^0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.10.3.tgz#3e048ff96e91459ffca01304dbc7f61c1f642f6c" - integrity sha512-uivwYcQaxAucv1CzRp2n/QdYPo4ILf9VXgH19zEIjFx2EJufV16P0JtJVpYHy89DItG6Kwj2oIUjrcK5au+4tQ== - dependencies: - tslib "^2.1.0" - ts-mixer@^6.0.3: version "6.0.4" resolved "https://registry.yarnpkg.com/ts-mixer/-/ts-mixer-6.0.4.tgz#1da39ceabc09d947a82140d9f09db0f84919ca28" @@ -2743,7 +2623,7 @@ ts-node@^10.4.0: v8-compile-cache-lib "^3.0.1" yn "3.1.1" -tslib@2.6.2, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0, tslib@^2.6.2: +tslib@2.6.2, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== @@ -2935,15 +2815,3 @@ yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== - -zen-observable-ts@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.2.5.tgz#6c6d9ea3d3a842812c6e9519209365a122ba8b58" - integrity sha512-QZWQekv6iB72Naeake9hS1KxHlotfRpe+WGNbNx5/ta+R3DNjVO2bswf63gXlWDcs+EMd7XY8HfVQyP1X6T4Zg== - dependencies: - zen-observable "0.8.15" - -zen-observable@0.8.15: - version "0.8.15" - resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15" - integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==