From 62c74b8333066465e5bd295b8b102b35a506751d Mon Sep 17 00:00:00 2001 From: iCrawl Date: Tue, 11 Jan 2022 21:53:08 +0100 Subject: [PATCH] test(voice): fix tests --- .husky/pre-commit | 2 +- .lintstagedrc.json | 3 - package.json | 8 - packages/rest/tsconfig.json | 5 +- .../__tests__/fixtures => __mocks__}/rtp.ts | 0 .../audio => }/__tests__/AudioPlayer.test.ts | 18 +- .../__tests__/AudioReceiveStream.test.ts | 4 +- .../__tests__/AudioResource.test.ts | 8 +- .../receive => }/__tests__/SSRCMap.test.ts | 2 +- .../util => }/__tests__/Secretbox.test.ts | 2 +- .../__tests__/SpeakingMap.test.ts | 4 +- .../__tests__/TransformerGraph.test.ts | 2 +- .../__tests__/VoiceReceiver.test.ts | 12 +- .../__tests__/VoiceUDPSocket.test.ts | 2 +- .../__tests__/VoiceWebSocket.test.ts | 2 +- .../util => }/__tests__/abortAfter.test.ts | 2 +- .../util => }/__tests__/demuxProbe.test.ts | 4 +- .../util => }/__tests__/entersState.test.ts | 4 +- yarn.lock | 166 +----------------- 19 files changed, 44 insertions(+), 206 deletions(-) delete mode 100644 .lintstagedrc.json rename packages/voice/{src/receive/__tests__/fixtures => __mocks__}/rtp.ts (100%) rename packages/voice/{src/audio => }/__tests__/AudioPlayer.test.ts (96%) rename packages/voice/{src/receive => }/__tests__/AudioReceiveStream.test.ts (92%) rename packages/voice/{src/audio => }/__tests__/AudioResource.test.ts (95%) rename packages/voice/{src/receive => }/__tests__/SSRCMap.test.ts (96%) rename packages/voice/{src/util => }/__tests__/Secretbox.test.ts (76%) rename packages/voice/{src/receive => }/__tests__/SpeakingMap.test.ts (88%) rename packages/voice/{src/audio => }/__tests__/TransformerGraph.test.ts (98%) rename packages/voice/{src/receive => }/__tests__/VoiceReceiver.test.ts (95%) rename packages/voice/{src/networking => }/__tests__/VoiceUDPSocket.test.ts (98%) rename packages/voice/{src/networking => }/__tests__/VoiceWebSocket.test.ts (98%) rename packages/voice/{src/util => }/__tests__/abortAfter.test.ts (91%) rename packages/voice/{src/util => }/__tests__/demuxProbe.test.ts (97%) rename packages/voice/{src/util => }/__tests__/entersState.test.ts (93%) diff --git a/.husky/pre-commit b/.husky/pre-commit index 593e42b2a..2b61b577a 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,4 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" -yarn lint-staged && yarn lint:fix +yarn format diff --git a/.lintstagedrc.json b/.lintstagedrc.json deleted file mode 100644 index c9f2e3356..000000000 --- a/.lintstagedrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "*.{json,yml,yaml}": "prettier --write" -} diff --git a/package.json b/package.json index 7cd31bfe7..7a4fbeaf2 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "build": "turbo run build", "test": "turbo run test", "lint": "turbo run lint", - "lint:fix": "turbo run lint:fix", "format": "turbo run format", "fmt": "turbo run format", "postinstall": "is-ci || husky install", @@ -44,7 +43,6 @@ "@favware/npm-deprecate": "^1.0.4", "conventional-changelog-cli": "^2.2.2", "husky": "^7.0.4", - "lint-staged": "^12.1.7", "prettier": "^2.5.1", "turbo": "1.0.24" }, @@ -80,12 +78,6 @@ ], "outputs": [] }, - "lint:fix": { - "dependsOn": [ - "^build" - ], - "outputs": [] - }, "format": { "outputs": [] }, diff --git a/packages/rest/tsconfig.json b/packages/rest/tsconfig.json index f16300fa8..7a645f146 100644 --- a/packages/rest/tsconfig.json +++ b/packages/rest/tsconfig.json @@ -9,10 +9,7 @@ // Emit "outDir": "./dist", - "sourceRoot": "./", - - // Projects - "composite": true + "sourceRoot": "./" }, "include": ["src/**/*.ts"] } diff --git a/packages/voice/src/receive/__tests__/fixtures/rtp.ts b/packages/voice/__mocks__/rtp.ts similarity index 100% rename from packages/voice/src/receive/__tests__/fixtures/rtp.ts rename to packages/voice/__mocks__/rtp.ts diff --git a/packages/voice/src/audio/__tests__/AudioPlayer.test.ts b/packages/voice/__tests__/AudioPlayer.test.ts similarity index 96% rename from packages/voice/src/audio/__tests__/AudioPlayer.test.ts rename to packages/voice/__tests__/AudioPlayer.test.ts index f8cfce1df..145b55f0c 100644 --- a/packages/voice/src/audio/__tests__/AudioPlayer.test.ts +++ b/packages/voice/__tests__/AudioPlayer.test.ts @@ -1,18 +1,18 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/dot-notation */ -import { AudioResource } from '../../audio/AudioResource'; -import { createAudioPlayer, AudioPlayerStatus, AudioPlayer, SILENCE_FRAME } from '../AudioPlayer'; +import { AudioResource } from '../src/audio/AudioResource'; +import { createAudioPlayer, AudioPlayerStatus, AudioPlayer, SILENCE_FRAME } from '../src/audio/AudioPlayer'; import { Readable } from 'node:stream'; -import { addAudioPlayer, deleteAudioPlayer } from '../../DataStore'; -import { NoSubscriberBehavior } from '../..'; -import { VoiceConnection, VoiceConnectionStatus } from '../../VoiceConnection'; +import { addAudioPlayer, deleteAudioPlayer } from '../src/DataStore'; +import { NoSubscriberBehavior } from '../src'; +import { VoiceConnection, VoiceConnectionStatus } from '../src/VoiceConnection'; import { once } from 'node:events'; -import { AudioPlayerError } from '../AudioPlayerError'; +import { AudioPlayerError } from '../src/audio/AudioPlayerError'; -jest.mock('../../DataStore'); -jest.mock('../../VoiceConnection'); -jest.mock('../AudioPlayerError'); +jest.mock('../src/DataStore'); +jest.mock('../src/VoiceConnection'); +jest.mock('../src/audio/AudioPlayerError'); const addAudioPlayerMock = addAudioPlayer as unknown as jest.Mock; const deleteAudioPlayerMock = deleteAudioPlayer as unknown as jest.Mock; diff --git a/packages/voice/src/receive/__tests__/AudioReceiveStream.test.ts b/packages/voice/__tests__/AudioReceiveStream.test.ts similarity index 92% rename from packages/voice/src/receive/__tests__/AudioReceiveStream.test.ts rename to packages/voice/__tests__/AudioReceiveStream.test.ts index 88576eb57..14019e417 100644 --- a/packages/voice/src/receive/__tests__/AudioReceiveStream.test.ts +++ b/packages/voice/__tests__/AudioReceiveStream.test.ts @@ -1,5 +1,5 @@ -import { SILENCE_FRAME } from '../../audio/AudioPlayer'; -import { AudioReceiveStream, EndBehaviorType } from '../AudioReceiveStream'; +import { SILENCE_FRAME } from '../src/audio/AudioPlayer'; +import { AudioReceiveStream, EndBehaviorType } from '../src/receive/AudioReceiveStream'; const DUMMY_BUFFER = Buffer.allocUnsafe(16); diff --git a/packages/voice/src/audio/__tests__/AudioResource.test.ts b/packages/voice/__tests__/AudioResource.test.ts similarity index 95% rename from packages/voice/src/audio/__tests__/AudioResource.test.ts rename to packages/voice/__tests__/AudioResource.test.ts index fc7e1e3ea..49f1b1800 100644 --- a/packages/voice/src/audio/__tests__/AudioResource.test.ts +++ b/packages/voice/__tests__/AudioResource.test.ts @@ -1,12 +1,12 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ import { opus, VolumeTransformer } from 'prism-media'; import { PassThrough, Readable } from 'node:stream'; -import { SILENCE_FRAME } from '../AudioPlayer'; -import { AudioResource, createAudioResource, NO_CONSTRAINT, VOLUME_CONSTRAINT } from '../AudioResource'; -import { Edge, findPipeline as _findPipeline, StreamType, TransformerType } from '../TransformerGraph'; +import { SILENCE_FRAME } from '../src/audio/AudioPlayer'; +import { AudioResource, createAudioResource, NO_CONSTRAINT, VOLUME_CONSTRAINT } from '../src/audio/AudioResource'; +import { Edge, findPipeline as _findPipeline, StreamType, TransformerType } from '../src/audio/TransformerGraph'; jest.mock('prism-media'); -jest.mock('../TransformerGraph'); +jest.mock('../src/audio/TransformerGraph'); function wait() { return new Promise((resolve) => process.nextTick(resolve)); diff --git a/packages/voice/src/receive/__tests__/SSRCMap.test.ts b/packages/voice/__tests__/SSRCMap.test.ts similarity index 96% rename from packages/voice/src/receive/__tests__/SSRCMap.test.ts rename to packages/voice/__tests__/SSRCMap.test.ts index f5586728a..06d9797c9 100644 --- a/packages/voice/src/receive/__tests__/SSRCMap.test.ts +++ b/packages/voice/__tests__/SSRCMap.test.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import EventEmitter, { once } from 'node:events'; -import { SSRCMap, VoiceUserData } from '../SSRCMap'; +import { SSRCMap, VoiceUserData } from '../src/receive/SSRCMap'; function onceOrThrow(target: T, event: string, after: number) { return new Promise((resolve, reject) => { diff --git a/packages/voice/src/util/__tests__/Secretbox.test.ts b/packages/voice/__tests__/Secretbox.test.ts similarity index 76% rename from packages/voice/src/util/__tests__/Secretbox.test.ts rename to packages/voice/__tests__/Secretbox.test.ts index 1ef564632..9e09b33ef 100644 --- a/packages/voice/src/util/__tests__/Secretbox.test.ts +++ b/packages/voice/__tests__/Secretbox.test.ts @@ -1,4 +1,4 @@ -import { methods } from '../Secretbox'; +import { methods } from '../src/util/Secretbox'; jest.mock('tweetnacl'); diff --git a/packages/voice/src/receive/__tests__/SpeakingMap.test.ts b/packages/voice/__tests__/SpeakingMap.test.ts similarity index 88% rename from packages/voice/src/receive/__tests__/SpeakingMap.test.ts rename to packages/voice/__tests__/SpeakingMap.test.ts index cb867c830..5dda07327 100644 --- a/packages/voice/src/receive/__tests__/SpeakingMap.test.ts +++ b/packages/voice/__tests__/SpeakingMap.test.ts @@ -1,5 +1,5 @@ -import { noop } from '../../util/util'; -import { SpeakingMap } from '../SpeakingMap'; +import { noop } from '../src/util/util'; +import { SpeakingMap } from '../src/receive/SpeakingMap'; jest.useFakeTimers(); diff --git a/packages/voice/src/audio/__tests__/TransformerGraph.test.ts b/packages/voice/__tests__/TransformerGraph.test.ts similarity index 98% rename from packages/voice/src/audio/__tests__/TransformerGraph.test.ts rename to packages/voice/__tests__/TransformerGraph.test.ts index a7dcf2e59..656a485fe 100644 --- a/packages/voice/src/audio/__tests__/TransformerGraph.test.ts +++ b/packages/voice/__tests__/TransformerGraph.test.ts @@ -1,4 +1,4 @@ -import { Edge, findPipeline, StreamType, TransformerType } from '../TransformerGraph'; +import { Edge, findPipeline, StreamType, TransformerType } from '../src/audio/TransformerGraph'; const noConstraint = () => true; diff --git a/packages/voice/src/receive/__tests__/VoiceReceiver.test.ts b/packages/voice/__tests__/VoiceReceiver.test.ts similarity index 95% rename from packages/voice/src/receive/__tests__/VoiceReceiver.test.ts rename to packages/voice/__tests__/VoiceReceiver.test.ts index 44ee8fc33..9ebf4e376 100644 --- a/packages/voice/src/receive/__tests__/VoiceReceiver.test.ts +++ b/packages/voice/__tests__/VoiceReceiver.test.ts @@ -1,14 +1,14 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/dot-notation */ -import { VoiceReceiver } from '../VoiceReceiver'; -import { VoiceConnection as _VoiceConnection, VoiceConnectionStatus } from '../../VoiceConnection'; -import { RTP_PACKET_DESKTOP, RTP_PACKET_CHROME, RTP_PACKET_ANDROID } from './fixtures/rtp'; +import { VoiceReceiver } from '../src/receive/VoiceReceiver'; +import { VoiceConnection as _VoiceConnection, VoiceConnectionStatus } from '../src/VoiceConnection'; +import { RTP_PACKET_DESKTOP, RTP_PACKET_CHROME, RTP_PACKET_ANDROID } from '../__mocks__/rtp'; import { once } from 'node:events'; import { VoiceOpcodes } from 'discord-api-types/voice/v4'; -import { methods } from '../../util/Secretbox'; +import { methods } from '../src/util/Secretbox'; -jest.mock('../../VoiceConnection'); -jest.mock('../SSRCMap'); +jest.mock('../src/VoiceConnection'); +jest.mock('../src/receive/SSRCMap'); const openSpy = jest.spyOn(methods, 'open'); diff --git a/packages/voice/src/networking/__tests__/VoiceUDPSocket.test.ts b/packages/voice/__tests__/VoiceUDPSocket.test.ts similarity index 98% rename from packages/voice/src/networking/__tests__/VoiceUDPSocket.test.ts rename to packages/voice/__tests__/VoiceUDPSocket.test.ts index ed31c627f..97d0878eb 100644 --- a/packages/voice/src/networking/__tests__/VoiceUDPSocket.test.ts +++ b/packages/voice/__tests__/VoiceUDPSocket.test.ts @@ -3,7 +3,7 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ import { createSocket as _createSocket } from 'node:dgram'; import EventEmitter, { once } from 'node:events'; -import { VoiceUDPSocket } from '../VoiceUDPSocket'; +import { VoiceUDPSocket } from '../src/networking/VoiceUDPSocket'; jest.mock('node:dgram'); jest.useFakeTimers(); diff --git a/packages/voice/src/networking/__tests__/VoiceWebSocket.test.ts b/packages/voice/__tests__/VoiceWebSocket.test.ts similarity index 98% rename from packages/voice/src/networking/__tests__/VoiceWebSocket.test.ts rename to packages/voice/__tests__/VoiceWebSocket.test.ts index d9c6462ea..e46aac76c 100644 --- a/packages/voice/src/networking/__tests__/VoiceWebSocket.test.ts +++ b/packages/voice/__tests__/VoiceWebSocket.test.ts @@ -3,7 +3,7 @@ import { VoiceOpcodes } from 'discord-api-types/voice/v4'; import EventEmitter, { once } from 'node:events'; import WS from 'jest-websocket-mock'; -import { VoiceWebSocket } from '../VoiceWebSocket'; +import { VoiceWebSocket } from '../src/networking/VoiceWebSocket'; beforeEach(() => { WS.clean(); diff --git a/packages/voice/src/util/__tests__/abortAfter.test.ts b/packages/voice/__tests__/abortAfter.test.ts similarity index 91% rename from packages/voice/src/util/__tests__/abortAfter.test.ts rename to packages/voice/__tests__/abortAfter.test.ts index 35415584e..7b88c2954 100644 --- a/packages/voice/src/util/__tests__/abortAfter.test.ts +++ b/packages/voice/__tests__/abortAfter.test.ts @@ -1,4 +1,4 @@ -import { abortAfter } from '../abortAfter'; +import { abortAfter } from '../src/util/abortAfter'; jest.useFakeTimers(); diff --git a/packages/voice/src/util/__tests__/demuxProbe.test.ts b/packages/voice/__tests__/demuxProbe.test.ts similarity index 97% rename from packages/voice/src/util/__tests__/demuxProbe.test.ts rename to packages/voice/__tests__/demuxProbe.test.ts index e86d05cb5..f2a8f244a 100644 --- a/packages/voice/src/util/__tests__/demuxProbe.test.ts +++ b/packages/voice/__tests__/demuxProbe.test.ts @@ -1,10 +1,10 @@ /* eslint-disable @typescript-eslint/no-unsafe-call */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ -import { demuxProbe } from '../demuxProbe'; +import { demuxProbe } from '../src/util/demuxProbe'; import { opus as _opus } from 'prism-media'; import { Readable } from 'node:stream'; -import { StreamType } from '../../audio'; +import { StreamType } from '../src/audio'; import EventEmitter, { once } from 'node:events'; jest.mock('prism-media'); diff --git a/packages/voice/src/util/__tests__/entersState.test.ts b/packages/voice/__tests__/entersState.test.ts similarity index 93% rename from packages/voice/src/util/__tests__/entersState.test.ts rename to packages/voice/__tests__/entersState.test.ts index f81e0881e..2b472fc58 100644 --- a/packages/voice/src/util/__tests__/entersState.test.ts +++ b/packages/voice/__tests__/entersState.test.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import EventEmitter from 'node:events'; -import { VoiceConnection, VoiceConnectionStatus } from '../../VoiceConnection'; -import { entersState } from '../entersState'; +import { VoiceConnection, VoiceConnectionStatus } from '../src/VoiceConnection'; +import { entersState } from '../src/util/entersState'; function createFakeVoiceConnection(status = VoiceConnectionStatus.Signalling) { const vc = new EventEmitter() as any; diff --git a/yarn.lock b/yarn.lock index a2daff3e3..82daacf16 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1910,7 +1910,7 @@ ansi-escape-sequences@^4.0.0: dependencies: array-back "^3.0.1" -ansi-escapes@^4.2.1, ansi-escapes@^4.3.0: +ansi-escapes@^4.2.1: version "4.3.2" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== @@ -1932,11 +1932,6 @@ ansi-regex@^5.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== -ansi-regex@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" - integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== - ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -1961,11 +1956,6 @@ ansi-styles@^5.0.0: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== -ansi-styles@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.1.0.tgz#87313c102b8118abd57371afab34618bf7350ed3" - integrity sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ== - any-promise@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" @@ -2085,11 +2075,6 @@ astral-regex@^1.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== -astral-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" - integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== - asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -2505,22 +2490,6 @@ cli-cursor@^3.1.0: dependencies: restore-cursor "^3.1.0" -cli-truncate@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" - integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== - dependencies: - slice-ansi "^3.0.0" - string-width "^4.2.0" - -cli-truncate@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-3.1.0.tgz#3f23ab12535e3d73e839bb43e73c9de487db1389" - integrity sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA== - dependencies: - slice-ansi "^5.0.0" - string-width "^5.0.0" - cli-width@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" @@ -2600,7 +2569,7 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -colorette@^2.0.14, colorette@^2.0.16: +colorette@^2.0.14: version "2.0.16" resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g== @@ -2658,7 +2627,7 @@ commander@^4.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== -commander@^8.2.0, commander@^8.3.0: +commander@^8.2.0: version "8.3.0" resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== @@ -3022,7 +2991,7 @@ dateformat@^3.0.0: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== -debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3: +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: version "4.3.3" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== @@ -3250,11 +3219,6 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -emoji-regex@^9.2.2: - version "9.2.2" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" - integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== - encoding@^0.1.12: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" @@ -3736,7 +3700,7 @@ esutils@^2.0.2: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== -execa@^5.0.0, execa@^5.1.1: +execa@^5.0.0: version "5.1.1" resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== @@ -4578,11 +4542,6 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-fullwidth-code-point@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88" - integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ== - is-generator-fn@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" @@ -5441,7 +5400,7 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -lilconfig@2.0.4, lilconfig@^2.0.4: +lilconfig@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA== @@ -5458,39 +5417,6 @@ linkify-it@^2.0.0: dependencies: uc.micro "^1.0.1" -lint-staged@^12.1.7: - version "12.1.7" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-12.1.7.tgz#fe9137992ac18a456422bb8484dd30be0140629f" - integrity sha512-bltv/ejiLWtowExpjU+s5z8j1Byjg9AlmaAjMmqNbIicY69u6sYIwXGg0dCn0TlkrrY2CphtHIXAkbZ+1VoWQQ== - dependencies: - cli-truncate "^3.1.0" - colorette "^2.0.16" - commander "^8.3.0" - debug "^4.3.3" - execa "^5.1.1" - lilconfig "2.0.4" - listr2 "^3.13.5" - micromatch "^4.0.4" - normalize-path "^3.0.0" - object-inspect "^1.11.1" - string-argv "^0.3.1" - supports-color "^9.2.1" - yaml "^1.10.2" - -listr2@^3.13.5: - version "3.13.5" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.13.5.tgz#105a813f2eb2329c4aae27373a281d610ee4985f" - integrity sha512-3n8heFQDSk+NcwBn3CgxEibZGaRzx+pC64n3YjpMD1qguV4nWus3Al+Oo3KooqFKTQEJ1v7MmnbnyyNspgx3NA== - dependencies: - cli-truncate "^2.1.0" - colorette "^2.0.16" - log-update "^4.0.0" - p-map "^4.0.0" - rfdc "^1.3.0" - rxjs "^7.4.0" - through "^2.3.8" - wrap-ansi "^7.0.0" - load-json-file@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" @@ -5584,16 +5510,6 @@ log-symbols@^4.0.0: chalk "^4.1.0" is-unicode-supported "^0.1.0" -log-update@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1" - integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg== - dependencies: - ansi-escapes "^4.3.0" - cli-cursor "^3.1.0" - slice-ansi "^4.0.0" - wrap-ansi "^6.2.0" - lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -6052,7 +5968,7 @@ object-get@^2.1.0: resolved "https://registry.yarnpkg.com/object-get/-/object-get-2.1.1.tgz#1dad63baf6d94df184d1c58756cc9be55b174dac" integrity sha512-7n4IpLMzGGcLEMiQKsNR7vCe+N5E9LORFrtNUVy4sO3dj9a3HedZCxEL2T7QuLhcHN1NBuBsMOKaOsAYI9IIvg== -object-inspect@^1.11.0, object-inspect@^1.11.1, object-inspect@^1.9.0: +object-inspect@^1.11.0, object-inspect@^1.9.0: version "1.12.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== @@ -6699,11 +6615,6 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rfdc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" - integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== - rimraf@2: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" @@ -6751,13 +6662,6 @@ rxjs@^6.6.0: dependencies: tslib "^1.9.0" -rxjs@^7.4.0: - version "7.5.1" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.1.tgz#af73df343cbcab37628197f43ea0c8256f54b157" - integrity sha512-KExVEeZWxMZnZhUZtsJcFwz8IvPvgu4G2Z2QyqjZQzUGr32KDYuSxrEYO4w3tFFNbfLozcrKUTvTPi+E9ywJkQ== - dependencies: - tslib "^2.1.0" - safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" @@ -6873,32 +6777,6 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" -slice-ansi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" - integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - -slice-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" - integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - -slice-ansi@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a" - integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ== - dependencies: - ansi-styles "^6.0.0" - is-fullwidth-code-point "^4.0.0" - slide@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" @@ -7065,11 +6943,6 @@ stream-via@^1.0.4: resolved "https://registry.yarnpkg.com/stream-via/-/stream-via-1.0.4.tgz#8dccbb0ac909328eb8bc8e2a4bd3934afdaf606c" integrity sha512-DBp0lSvX5G9KGRDTkR/R+a29H+Wk2xItOF+MpZLLNDWbEV9tGPnqLPxHEYjmiz8xGtJHRIqmI+hCjmNzqoA4nQ== -string-argv@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" - integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== - string-length@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" @@ -7105,15 +6978,6 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string-width@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.0.1.tgz#0d8158335a6cfd8eb95da9b6b262ce314a036ffd" - integrity sha512-5ohWO/M4//8lErlUUtrFy3b11GtNOuMOU0ysKCDXFcfXuuvUXu95akgj/i8ofmaGdN0hCqyl6uu9i8dS/mQp5g== - dependencies: - emoji-regex "^9.2.2" - is-fullwidth-code-point "^4.0.0" - strip-ansi "^7.0.1" - string.prototype.trimend@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" @@ -7170,13 +7034,6 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" - integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== - dependencies: - ansi-regex "^6.0.1" - strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" @@ -7247,11 +7104,6 @@ supports-color@^8.0.0: dependencies: has-flag "^4.0.0" -supports-color@^9.2.1: - version "9.2.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-9.2.1.tgz#599dc9d45acf74c6176e0d880bab1d7d718fe891" - integrity sha512-Obv7ycoCTG51N7y175StI9BlAXrmgZrFhZOb0/PyjHBher/NmsdBgbbQ1Inhq+gIhz6+7Gb+jWF2Vqi7Mf1xnQ== - supports-hyperlinks@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" @@ -7426,7 +7278,7 @@ through2@^4.0.0: dependencies: readable-stream "3" -through@2, "through@>=2.2.7 <3", through@^2.3.6, through@^2.3.8: +through@2, "through@>=2.2.7 <3", through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= @@ -7561,7 +7413,7 @@ tslib@^1.13.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.1.0, tslib@^2.3.1: +tslib@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==