diff --git a/packages/api/package.json b/packages/api/package.json index c7ed1be8c..d7aea4f75 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -68,7 +68,7 @@ "intercom-client": "^3.1.4", "jsonwebtoken": "^8.5.1", "jwks-rsa": "^2.0.3", - "knex": "0.21.12", + "knex": "2.4.2", "knex-stringcase": "^1.4.2", "linkedom": "^0.14.9", "luxon": "^3.2.1", diff --git a/packages/api/src/apollo.ts b/packages/api/src/apollo.ts index 075245092..0a8f49fb8 100644 --- a/packages/api/src/apollo.ts +++ b/packages/api/src/apollo.ts @@ -7,7 +7,7 @@ import { ContextFunction } from 'apollo-server-core' import { ClaimsToSet, ResolverContext } from './resolvers/types' import { SetClaimsRole } from './utils/dictionary' -import Knex, { Transaction } from 'knex' +import { Knex } from 'knex' import { ExpressContext } from 'apollo-server-express/dist/ApolloServer' import * as jwt from 'jsonwebtoken' import { kx } from './datalayer/knex_config' @@ -48,7 +48,7 @@ const contextFunc: ContextFunction = async ({ const claims = await getClaimsByToken(token) async function setClaims( - tx: Transaction, + tx: Knex.Transaction, uuid?: string, userRole?: string ): Promise { diff --git a/packages/api/src/datalayer/article/index.ts b/packages/api/src/datalayer/article/index.ts index 5ddb6f12a..f6235265a 100644 --- a/packages/api/src/datalayer/article/index.ts +++ b/packages/api/src/datalayer/article/index.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import { ArticleData, CreateSet, keys as modelKeys, UpdateSet } from './model' import DataModel from '../model' -import Knex from 'knex' +import { Knex } from 'knex' import { Table } from '../../utils/dictionary' import { logMethod } from '../helpers' diff --git a/packages/api/src/datalayer/article_saving_request/index.ts b/packages/api/src/datalayer/article_saving_request/index.ts index c753fcddb..c9d625622 100644 --- a/packages/api/src/datalayer/article_saving_request/index.ts +++ b/packages/api/src/datalayer/article_saving_request/index.ts @@ -1,11 +1,11 @@ import { + ArticleSavingRequestData, CreateSet, keys as modelKeys, UpdateSet, - ArticleSavingRequestData, } from './model' import DataModel from '../model' -import Knex from 'knex' +import { Knex } from 'knex' import { Table } from '../../utils/dictionary' import { logMethod } from '../helpers' diff --git a/packages/api/src/datalayer/helpers.ts b/packages/api/src/datalayer/helpers.ts index 65cd78ef0..7768d0667 100644 --- a/packages/api/src/datalayer/helpers.ts +++ b/packages/api/src/datalayer/helpers.ts @@ -5,7 +5,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import DataModel from './model' -import Knex, { Transaction } from 'knex' +import { Knex } from 'knex' import DataLoader from 'dataloader' import { snakeCase } from 'snake-case' import { buildLogger } from '../utils/logger' @@ -14,7 +14,7 @@ import { SetClaimsRole } from '../utils/dictionary' const logger = buildLogger('datalayer') export const setClaims = async ( - tx: Transaction, + tx: Knex.Transaction, uuid?: string, userRole?: string ): Promise => { diff --git a/packages/api/src/datalayer/highlight/index.ts b/packages/api/src/datalayer/highlight/index.ts index 1f7ac2fc5..8bd8fb06a 100644 --- a/packages/api/src/datalayer/highlight/index.ts +++ b/packages/api/src/datalayer/highlight/index.ts @@ -4,7 +4,7 @@ import DataModel, { DataModelError, MAX_RECORDS_LIMIT } from '../model' import { CreateSet, HighlightData, keys as modelKeys, UpdateSet } from './model' import { Table } from '../../utils/dictionary' -import Knex from 'knex' +import { Knex } from 'knex' import { ENABLE_DB_REQUEST_LOGGING, globalCounter } from '../helpers' import DataLoader from 'dataloader' @@ -26,7 +26,8 @@ class HighlightModel extends DataModel { } try { - const rows: HighlightData[] = await kx(this.tableName) + const rows: HighlightData[] = await kx + .table(this.tableName) .select(this.modelKeys) .whereIn('id', keys) .andWhere('deleted', false) @@ -60,7 +61,8 @@ class HighlightModel extends DataModel { ) } - const result = await this.kx(Table.HIGHLIGHT) + const result = await this.kx + .table(Table.HIGHLIGHT) .select(modelKeys) .whereIn('elasticPageId', articleIds) .andWhere('deleted', false) @@ -153,7 +155,8 @@ class HighlightModel extends DataModel { userId: string, articleId: string ): Promise { - const highlights = await this.kx(Table.HIGHLIGHT) + const highlights: HighlightData[] = await this.kx + .table(Table.HIGHLIGHT) .select(modelKeys) .where('user_id', userId) .andWhere('elastic_page_id', articleId) diff --git a/packages/api/src/datalayer/knex_config.ts b/packages/api/src/datalayer/knex_config.ts index 6758a4454..06ff66783 100644 --- a/packages/api/src/datalayer/knex_config.ts +++ b/packages/api/src/datalayer/knex_config.ts @@ -1,8 +1,8 @@ import { env } from '../env' -import Knex from 'knex' +import knex from 'knex' import knexStringcase from 'knex-stringcase' -export const kx = Knex( +export const kx = knex( knexStringcase({ client: 'pg', connection: { diff --git a/packages/api/src/datalayer/links/index.ts b/packages/api/src/datalayer/links/index.ts index ab8a36308..08ba9e266 100644 --- a/packages/api/src/datalayer/links/index.ts +++ b/packages/api/src/datalayer/links/index.ts @@ -12,7 +12,7 @@ import { UserFeedArticleData, } from './model' import DataModel, { MAX_RECORDS_LIMIT } from '../model' -import Knex from 'knex' +import { Knex } from 'knex' import { Table } from '../../utils/dictionary' import { Article, diff --git a/packages/api/src/datalayer/links/share_info.ts b/packages/api/src/datalayer/links/share_info.ts index 2646cfc57..cf1126eaa 100644 --- a/packages/api/src/datalayer/links/share_info.ts +++ b/packages/api/src/datalayer/links/share_info.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ -import Knex from 'knex' +import { Knex } from 'knex' import { LinkShareInfo } from '../../generated/graphql' import { DataModels } from '../../resolvers/types' import { getPageByParam } from '../../elastic/pages' diff --git a/packages/api/src/datalayer/model.ts b/packages/api/src/datalayer/model.ts index 98b3d5dac..f2ebfe2d2 100644 --- a/packages/api/src/datalayer/model.ts +++ b/packages/api/src/datalayer/model.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-floating-promises */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import DataLoader from 'dataloader' -import Knex from 'knex' +import { Knex } from 'knex' import { ENABLE_DB_REQUEST_LOGGING, globalCounter } from './helpers' export enum DataModelError { @@ -113,7 +113,7 @@ abstract class DataModel< tx: Knex.Transaction ): Promise { const rows: ModelData[] = await tx - .batchInsert(this.tableName, data) + .batchInsert(this.tableName, data as never) .returning('*') for (const row of rows) { this.loader.prime(row.id, row) diff --git a/packages/api/src/datalayer/reaction/index.ts b/packages/api/src/datalayer/reaction/index.ts index 2b1cec74c..6c77544f1 100644 --- a/packages/api/src/datalayer/reaction/index.ts +++ b/packages/api/src/datalayer/reaction/index.ts @@ -1,11 +1,11 @@ import { - globalCounter, ENABLE_DB_REQUEST_LOGGING, + globalCounter, logMethod, } from './../helpers' -import { CreateSet, keys as modelKeys, UpdateSet, ReactionData } from './model' +import { CreateSet, keys as modelKeys, ReactionData, UpdateSet } from './model' import DataModel, { DataModelError, MAX_RECORDS_LIMIT } from '../model' -import Knex from 'knex' +import { Knex } from 'knex' import { Table } from '../../utils/dictionary' import DataLoader from 'dataloader' diff --git a/packages/api/src/datalayer/reminders/index.ts b/packages/api/src/datalayer/reminders/index.ts index c910dc605..2b6e74728 100644 --- a/packages/api/src/datalayer/reminders/index.ts +++ b/packages/api/src/datalayer/reminders/index.ts @@ -6,7 +6,7 @@ import { UpdateSet, } from './model' import DataModel, { DataModelError } from '../model' -import Knex from 'knex' +import { Knex } from 'knex' import { Table } from '../../utils/dictionary' import { logMethod } from '../helpers' import { ArticleData } from '../article/model' diff --git a/packages/api/src/datalayer/report/index.ts b/packages/api/src/datalayer/report/index.ts index fbcbd8166..0906e281e 100644 --- a/packages/api/src/datalayer/report/index.ts +++ b/packages/api/src/datalayer/report/index.ts @@ -1,4 +1,4 @@ -import Knex from 'knex' +import { Knex } from 'knex' import { ReportType } from '../../generated/graphql' interface ReportItem { diff --git a/packages/api/src/datalayer/task/index.ts b/packages/api/src/datalayer/task/index.ts index 969f883dd..b0f31624d 100644 --- a/packages/api/src/datalayer/task/index.ts +++ b/packages/api/src/datalayer/task/index.ts @@ -1,6 +1,6 @@ -import { CreateSet, keys as modelKeys, UpdateSet, TaskData } from './model' +import { CreateSet, keys as modelKeys, TaskData, UpdateSet } from './model' import DataModel from '../model' -import Knex from 'knex' +import { Knex } from 'knex' import { logMethod } from '../helpers' class TaskModel extends DataModel { diff --git a/packages/api/src/datalayer/upload_files/index.ts b/packages/api/src/datalayer/upload_files/index.ts index 6a412b99f..6899d6309 100644 --- a/packages/api/src/datalayer/upload_files/index.ts +++ b/packages/api/src/datalayer/upload_files/index.ts @@ -7,7 +7,7 @@ import { UploadFileData, } from './model' import DataModel from '../model' -import Knex from 'knex' +import { Knex } from 'knex' import { Table } from '../../utils/dictionary' import { logMethod } from '../helpers' diff --git a/packages/api/src/datalayer/user/index.ts b/packages/api/src/datalayer/user/index.ts index a4f6058b2..5112c08b6 100644 --- a/packages/api/src/datalayer/user/index.ts +++ b/packages/api/src/datalayer/user/index.ts @@ -11,7 +11,7 @@ import { UserData, } from './model' import DataModel, { DataModelError, MAX_RECORDS_LIMIT } from '../model' -import Knex from 'knex' +import { Knex } from 'knex' import { ENABLE_DB_REQUEST_LOGGING, globalCounter, logMethod } from '../helpers' import { Table } from '../../utils/dictionary' import DataLoader from 'dataloader' diff --git a/packages/api/src/datalayer/user_friends/index.ts b/packages/api/src/datalayer/user_friends/index.ts index 15695261d..8ff18e0d8 100644 --- a/packages/api/src/datalayer/user_friends/index.ts +++ b/packages/api/src/datalayer/user_friends/index.ts @@ -6,7 +6,7 @@ import { UserFriendData, } from './model' import DataModel, { MAX_RECORDS_LIMIT } from '../model' -import Knex from 'knex' +import { Knex } from 'knex' import { Table } from '../../utils/dictionary' import { ENABLE_DB_REQUEST_LOGGING, globalCounter, logMethod } from '../helpers' import DataLoader from 'dataloader' diff --git a/packages/api/src/datalayer/user_personalization/index.ts b/packages/api/src/datalayer/user_personalization/index.ts index 1fd0894e0..424de749d 100644 --- a/packages/api/src/datalayer/user_personalization/index.ts +++ b/packages/api/src/datalayer/user_personalization/index.ts @@ -9,7 +9,7 @@ import { UserPersonalizationData, } from './model' import DataModel from '../model' -import Knex from 'knex' +import { Knex } from 'knex' import { Table } from '../../utils/dictionary' import { camelCase } from 'voca' import { logMethod } from '../helpers' diff --git a/packages/api/src/graphql.d.ts b/packages/api/src/graphql.d.ts index edc12ba67..6c4bc953c 100755 --- a/packages/api/src/graphql.d.ts +++ b/packages/api/src/graphql.d.ts @@ -8,7 +8,7 @@ declare module '*.graphql' { } declare module 'knex-stringcase' { - import * as Knex from 'knex' + import { Knex } from 'knex' type StringCase = | 'camelcase' diff --git a/packages/api/src/resolvers/types.ts b/packages/api/src/resolvers/types.ts index 00e11b978..5e7aa2d00 100644 --- a/packages/api/src/resolvers/types.ts +++ b/packages/api/src/resolvers/types.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/ban-types */ import { Context as ApolloContext } from 'apollo-server-core' import winston from 'winston' -import Knex from 'knex' +import { Knex } from 'knex' import UserModel from '../datalayer/user' import ArticleModel from '../datalayer/article' import UserArticleModel from '../datalayer/links' diff --git a/packages/api/src/resolvers/user_friends/index.ts b/packages/api/src/resolvers/user_friends/index.ts index ea13cc095..39da6e5d8 100644 --- a/packages/api/src/resolvers/user_friends/index.ts +++ b/packages/api/src/resolvers/user_friends/index.ts @@ -1,18 +1,18 @@ -import Knex from 'knex' +import { Knex } from 'knex' import { UserData } from '../../datalayer/user/model' import { - User, - ResolverFn, - SetFollowSuccess, - SetFollowError, - MutationSetFollowArgs, - SetFollowErrorCode, GetFollowersResult, GetFollowingResult, + MutationSetFollowArgs, QueryGetFollowersArgs, QueryGetFollowingArgs, + ResolverFn, + SetFollowError, + SetFollowErrorCode, + SetFollowSuccess, + User, } from '../../generated/graphql' -import { userDataToUser, authorized } from '../../utils/helpers' +import { authorized, userDataToUser } from '../../utils/helpers' import { DataModels, WithDataSourcesContext } from '../types' export const setFollowResolver = authorized< diff --git a/packages/api/src/server.ts b/packages/api/src/server.ts index bb15c3d3e..506046777 100755 --- a/packages/api/src/server.ts +++ b/packages/api/src/server.ts @@ -7,7 +7,7 @@ import { json, urlencoded } from 'body-parser' import cookieParser from 'cookie-parser' import express, { Express } from 'express' import { createServer, Server } from 'http' -import Knex from 'knex' +import { Knex } from 'knex' import { env } from './env' import * as Sentry from '@sentry/node' import * as lw from '@google-cloud/logging-winston' diff --git a/packages/api/src/services/save_file.ts b/packages/api/src/services/save_file.ts index da3e32f4f..64233aab6 100644 --- a/packages/api/src/services/save_file.ts +++ b/packages/api/src/services/save_file.ts @@ -1,4 +1,4 @@ -import Knex from 'knex' +import { Knex } from 'knex' import { PubsubClient } from '../datalayer/pubsub' import { UserData } from '../datalayer/user/model' import { homePageURL } from '../env' diff --git a/yarn.lock b/yarn.lock index f6fe25371..120d7e6b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11753,26 +11753,16 @@ color@3.0.x: color-convert "^1.9.1" color-string "^1.5.2" -colorette@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" - integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== +colorette@2.0.19, colorette@^2.0.10, colorette@^2.0.14, colorette@^2.0.16: + version "2.0.19" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" + integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== -colorette@^1.2.2: +colorette@^1.2.2, colorette@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== -colorette@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af" - integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w== - -colorette@^2.0.10, colorette@^2.0.14, colorette@^2.0.16: - version "2.0.16" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" - integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g== - colorspace@1.1.x: version "1.1.2" resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.2.tgz#e0128950d082b86a2168580796a0aa5d6c68d8c5" @@ -11836,6 +11826,11 @@ commander@^8.3.0: resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== +commander@^9.1.0: + version "9.5.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" + integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== + common-path-prefix@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0" @@ -12664,13 +12659,6 @@ debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, de dependencies: ms "2.1.2" -debug@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== - dependencies: - ms "^2.1.1" - debug@4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" @@ -14643,16 +14631,6 @@ findup-sync@^2.0.0: micromatch "^3.0.4" resolve-dir "^1.0.1" -findup-sync@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1" - integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg== - dependencies: - detect-file "^1.0.0" - is-glob "^4.0.0" - micromatch "^3.0.4" - resolve-dir "^1.0.1" - fined@^1.0.1: version "1.2.0" resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b" @@ -15184,10 +15162,10 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= -getopts@2.2.5: - version "2.2.5" - resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.2.5.tgz#67a0fe471cacb9c687d817cab6450b96dde8313b" - integrity sha512-9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA== +getopts@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.3.0.tgz#71e5593284807e03e2427449d4f6712a268666f4" + integrity sha512-5eDf9fuSXwxBL6q5HX+dhDj+dslFGWzU5thZ9kNKUkcPtaPdatmUFKwHFrLb/uf/WpA4BHET+AX3Scl56cAjpA== getos@^3.2.1: version "3.2.1" @@ -18377,23 +18355,25 @@ knex-stringcase@^1.4.2: dependencies: stringcase "^4.3.1" -knex@0.21.12: - version "0.21.12" - resolved "https://registry.yarnpkg.com/knex/-/knex-0.21.12.tgz#961bdb484311eb853030f6f49bd5bf9eca89dc51" - integrity sha512-AEyyiTM9p/x/Pb38TPZkvphKPmn8UWxP7MdIphzjAOielOfFFeU6pjP6y3M7UJ7rxrQsCrAYHwdonLQ3l1JCDw== +knex@2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/knex/-/knex-2.4.2.tgz#a34a289d38406dc19a0447a78eeaf2d16ebedd61" + integrity sha512-tMI1M7a+xwHhPxjbl/H9K1kHX+VncEYcvCx5K00M16bWvpYPKAZd6QrCu68PtHAdIZNQPWZn0GVhqVBEthGWCg== dependencies: - colorette "1.2.1" - commander "^5.1.0" - debug "4.1.1" + colorette "2.0.19" + commander "^9.1.0" + debug "4.3.4" + escalade "^3.1.1" esm "^3.2.25" - getopts "2.2.5" + get-package-type "^0.1.0" + getopts "2.3.0" interpret "^2.2.0" - liftoff "3.1.0" - lodash "^4.17.20" - pg-connection-string "2.3.0" - tarn "^3.0.1" + lodash "^4.17.21" + pg-connection-string "2.5.0" + rechoir "^0.8.0" + resolve-from "^5.0.0" + tarn "^3.0.2" tildify "2.0.0" - v8flags "^3.2.0" kuler@^2.0.0: version "2.0.0" @@ -18518,20 +18498,6 @@ lie@3.1.1: dependencies: immediate "~3.0.5" -liftoff@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-3.1.0.tgz#c9ba6081f908670607ee79062d700df062c52ed3" - integrity sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog== - dependencies: - extend "^3.0.0" - findup-sync "^3.0.0" - fined "^1.0.1" - flagged-respawn "^1.0.0" - is-plain-object "^2.0.4" - object.map "^1.0.0" - rechoir "^0.6.2" - resolve "^1.1.7" - liftoff@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec" @@ -21494,12 +21460,7 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -pg-connection-string@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.3.0.tgz#c13fcb84c298d0bfa9ba12b40dd6c23d946f55d6" - integrity sha512-ukMTJXLI7/hZIwTW7hGMZJ0Lj0S2XQBCJ4Shv4y1zgQ/vqVea+FLhzywvPj0ujSuofu+yA4MYHGZPTsgjBgJ+w== - -pg-connection-string@^2.5.0: +pg-connection-string@2.5.0, pg-connection-string@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34" integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ== @@ -23314,6 +23275,13 @@ rechoir@^0.7.0: dependencies: resolve "^1.9.0" +rechoir@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" + integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ== + dependencies: + resolve "^1.20.0" + redent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" @@ -25326,10 +25294,10 @@ tar@^6.0.2, tar@^6.1.0: mkdirp "^1.0.3" yallist "^4.0.0" -tarn@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/tarn/-/tarn-3.0.1.tgz#ebac2c6dbc6977d34d4526e0a7814200386a8aec" - integrity sha512-6usSlV9KyHsspvwu2duKH+FMUhqJnAh6J5J/4MITl8s94iSUQTLkJggdiewKv4RyARQccnigV48Z+khiuVZDJw== +tarn@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/tarn/-/tarn-3.0.2.tgz#73b6140fbb881b71559c4f8bfde3d9a4b3d27693" + integrity sha512-51LAVKUSZSVfI05vjPESNc5vwqqZpbXCsU+/+wxlOrUjk2SnFTt97v9ZgQrD4YmxYW1Px6w2KjaDitCfkvgxMQ== teeny-request@^7.0.0: version "7.1.1" @@ -26585,13 +26553,6 @@ v8flags@^2.0.10: dependencies: user-home "^1.1.1" -v8flags@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656" - integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg== - dependencies: - homedir-polyfill "^1.0.1" - valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200"