From 326969246ba3cd6e5d62951e9890207aa845f8e7 Mon Sep 17 00:00:00 2001 From: zereight <42544600+zereight@users.noreply.github.com> Date: Wed, 21 Jul 2021 18:12:09 +0900 Subject: [PATCH] =?UTF-8?q?[FE][=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80]=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EA=B3=B5=EB=B0=B1=20=EB=AC=B8=EC=9E=90=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=20=EC=98=88=EC=99=B8=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?(#186)=20(#240)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: jest 환경 설정 * feat: 공백 제거 유틸함수 추가 및 테스트코드 작성 * fix: 프로젝트 명 공백 입력 오류 수정 - autoFocus추가 * refactor: ol 태그 외부에있는 p 태그 제거 * refactor: 함수명과 내부 동작 불일치된 부분 수정 * refactor: 어색한 코드 라인 수정 및 프로젝트 이름 중복체크 기능 추가 --- frontend/manage/jest.config.json | 10 + frontend/manage/package.json | 6 + .../src/__test__/unit/isEmptyString.test.ts | 32 +++ .../components/pages/NewProjectPage/index.tsx | 19 +- .../components/templates/NewProject/index.tsx | 35 +++- .../templates/ScriptPublishing/index.tsx | 14 +- .../templates/ScriptPublishing/styles.ts | 6 +- frontend/manage/src/constants/regex.ts | 1 + frontend/manage/src/styles/palette.ts | 12 +- frontend/manage/src/utils/validation.ts | 3 + frontend/manage/yarn.lock | 184 +++++++++++++++--- 11 files changed, 259 insertions(+), 63 deletions(-) create mode 100644 frontend/manage/jest.config.json create mode 100644 frontend/manage/src/__test__/unit/isEmptyString.test.ts create mode 100644 frontend/manage/src/constants/regex.ts create mode 100644 frontend/manage/src/utils/validation.ts diff --git a/frontend/manage/jest.config.json b/frontend/manage/jest.config.json new file mode 100644 index 000000000..346f0035e --- /dev/null +++ b/frontend/manage/jest.config.json @@ -0,0 +1,10 @@ +{ + "preset": "ts-jest", + "moduleDirectories": ["node_modules", "src"], + "transform": { + "node_modules/variables/.+\\.(j|t)sx?$": "ts-jest", + ".+\\.(svg|css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$": "jest-transform-stub" + }, + "coveragePathIgnorePatterns": ["/node_modules/", "/jest"], + "testEnvironment": "jsdom" +} diff --git a/frontend/manage/package.json b/frontend/manage/package.json index 2c7e16749..a67b65673 100644 --- a/frontend/manage/package.json +++ b/frontend/manage/package.json @@ -18,7 +18,9 @@ "@storybook/addon-links": "^6.3.2", "@storybook/react": "^6.3.2", "@testing-library/dom": "^8.1.0", + "@testing-library/jest-dom": "^5.14.1", "@testing-library/react": "^12.0.0", + "@types/jest": "^26.0.24", "@types/react": "^17.0.13", "@types/react-dom": "^17.0.8", "@types/react-router-dom": "^5.1.7", @@ -31,8 +33,11 @@ "file-loader": "^6.2.0", "html-webpack-plugin": "^5.3.2", "jest": "^27.0.6", + "jest-transform-stub": "^2.0.0", + "jsdom": "^16.6.0", "prettier": "^2.3.2", "react-refresh": "^0.10.0", + "ts-jest": "^27.0.3", "type-fest": "^1.2.2", "typescript": "^4.3.5", "url-loader": "^4.1.1", @@ -53,6 +58,7 @@ "scripts": { "start": "webpack server", "build": "webpack", + "test": "jest", "storybook": "start-storybook -p 6006", "build-storybook": "build-storybook" } diff --git a/frontend/manage/src/__test__/unit/isEmptyString.test.ts b/frontend/manage/src/__test__/unit/isEmptyString.test.ts new file mode 100644 index 000000000..c6d538054 --- /dev/null +++ b/frontend/manage/src/__test__/unit/isEmptyString.test.ts @@ -0,0 +1,32 @@ +import { isEmptyString } from "../../utils/validation"; + +describe("isEmptyString", () => { + test("문자열을 인자로 넣을 시, 해당 문자열이 공백 또는 개행으로만 이루어져 있는지 여부를 반환한다.", () => { + const fixture = [ + { + input: " ", + expectedOutput: true + }, + { + input: " \n \n \n ", + expectedOutput: true + }, + { + input: "a", + expectedOutput: false + }, + { + input: " a a a \na a \nna\n ", + expectedOutput: false + }, + { + input: "\n\n\n\n\n\n ", + expectedOutput: true + } + ]; + + fixture.forEach(({ input, expectedOutput }) => { + expect(isEmptyString(input)).toEqual(expectedOutput); + }); + }); +}); diff --git a/frontend/manage/src/components/pages/NewProjectPage/index.tsx b/frontend/manage/src/components/pages/NewProjectPage/index.tsx index ff5b39be8..0bad37a0c 100644 --- a/frontend/manage/src/components/pages/NewProjectPage/index.tsx +++ b/frontend/manage/src/components/pages/NewProjectPage/index.tsx @@ -1,23 +1,10 @@ -import { FormEvent } from "react"; -import { useHistory } from "react-router-dom"; -import { ROUTE } from "../../../constants"; -import { useCreateProject, useInput } from "../../../hooks"; +import { useGetAllProjects } from "../../../hooks"; import NewProject from "../../templates/NewProject"; const NewProjectPage = () => { - const history = useHistory(); - const { createProject } = useCreateProject(); - const { value: projectName, onChange: onChangeProjectName } = useInput(""); + const { projects } = useGetAllProjects(); - const onSubmit = async (event: FormEvent) => { - event.preventDefault(); - - const project = await createProject(projectName); - - history.push(ROUTE.GET_SCRIPT_PUBLISHING(project.id)); - }; - - return ; + return ; }; export default NewProjectPage; diff --git a/frontend/manage/src/components/templates/NewProject/index.tsx b/frontend/manage/src/components/templates/NewProject/index.tsx index b815a2b05..4b79ce5aa 100644 --- a/frontend/manage/src/components/templates/NewProject/index.tsx +++ b/frontend/manage/src/components/templates/NewProject/index.tsx @@ -1,22 +1,47 @@ import { ChangeEvent, FormEvent } from "react"; +import { useCreateProject, useInput } from "../../../hooks"; import { PALETTE } from "../../../styles/palette"; import ScreenContainer from "../../../styles/ScreenContainer"; import { Container, Form, Input, Label, SubmitButton, Title } from "./styles"; +import { useHistory } from "react-router-dom"; +import { isEmptyString } from "../../../utils/validation"; +import { ROUTE } from "../../../constants"; +import { Project } from "../../../types/project"; export interface Props { - projectName: string; - onChangeProjectName: (event: ChangeEvent) => void; - onSubmit: (event: FormEvent) => void; + projects: Project[] | undefined; } -const NewProject = ({ onSubmit, projectName, onChangeProjectName }: Props) => { +const NewProject = ({ projects }: Props) => { + const history = useHistory(); + const { createProject } = useCreateProject(); + const { value: projectName, onChange: onChangeProjectName } = useInput(""); + + const onSubmit = async (event: FormEvent) => { + event.preventDefault(); + + try { + const isDuplicatedProjectName = projects?.some(project => project.name === projectName.trim()); + + if (isEmptyString(projectName)) throw new Error("프로젝트 이름을 입력해주세요."); + if (isDuplicatedProjectName) throw new Error("중복된 프로젝트 이름입니다. 다시 입력해주세요."); + + const project = await createProject(projectName.trim()); + + history.push(ROUTE.GET_SCRIPT_PUBLISHING(project.id)); + } catch (error) { + alert(error.message); + console.error(error.message); + } + }; + return ( 새 프로젝트 만들기
- + 등록
diff --git a/frontend/manage/src/components/templates/ScriptPublishing/index.tsx b/frontend/manage/src/components/templates/ScriptPublishing/index.tsx index ba373f64f..e5cae119d 100644 --- a/frontend/manage/src/components/templates/ScriptPublishing/index.tsx +++ b/frontend/manage/src/components/templates/ScriptPublishing/index.tsx @@ -2,7 +2,7 @@ import SyntaxHighlighter from "react-syntax-highlighter"; import { xcode } from "react-syntax-highlighter/dist/esm/styles/hljs"; import { useCopyButton } from "../../../hooks"; import ScreenContainer from "../../../styles/ScreenContainer"; -import { B, CodeBlockWrapper, Container, Content, CopyButton, P, Section, Title } from "./styles"; +import { B, CodeBlockWrapper, Container, Content, CopyButton, P, Ol, Section, Title } from "./styles"; const scriptCode = (projectSecretKey: string) => ` @@ -65,13 +65,11 @@ const ScriptPublishing = ({ projectSecretKey }: Props) => { 다라쓰는 아래의 최신 브라우저 사용을 권장합니다. 구형 브라우저에서는 일부 기능이 동작하지 않을 수 있습니다.

-

-

    -
  1. Chrome
    2. -
  2. Safari
    3. -
  3. Samsung browser
    4. -
-

+
    +
  1. Chrome
    2. +
  2. Safari
    3. +
  3. Samsung browser
    4. +
diff --git a/frontend/manage/src/components/templates/ScriptPublishing/styles.ts b/frontend/manage/src/components/templates/ScriptPublishing/styles.ts index 4078f41cb..b798980ac 100644 --- a/frontend/manage/src/components/templates/ScriptPublishing/styles.ts +++ b/frontend/manage/src/components/templates/ScriptPublishing/styles.ts @@ -57,4 +57,8 @@ const P = styled.p` word-break: keep-all; `; -export { Container, Section, Title, CodeBlockWrapper, Content, B, P, CopyButton }; +const Ol = styled.ol` + font-size: 1.4rem; +`; + +export { Container, Section, Title, CodeBlockWrapper, Content, B, P, Ol, CopyButton }; diff --git a/frontend/manage/src/constants/regex.ts b/frontend/manage/src/constants/regex.ts new file mode 100644 index 000000000..9ea7310d6 --- /dev/null +++ b/frontend/manage/src/constants/regex.ts @@ -0,0 +1 @@ +export const allSpaces = /(\s*)/g; diff --git a/frontend/manage/src/styles/palette.ts b/frontend/manage/src/styles/palette.ts index 6159b7a94..776fb3e37 100644 --- a/frontend/manage/src/styles/palette.ts +++ b/frontend/manage/src/styles/palette.ts @@ -1,8 +1,8 @@ export enum PALETTE { - "PRIMARY"= "#10DF99", - "SECONDARY" = "#0BC586", - "TERTIARY" = "#FFE200", - "WHITE" = "#FFFFFF", - "BLACK_700" = "#303030", + "PRIMARY" = "#10DF99", + "SECONDARY" = "#0BC586", + "TERTIARY" = "#FFE200", + "WHITE" = "#FFFFFF", + "BLACK_700" = "#303030", + "RED_600" = "#E41E1E" } - diff --git a/frontend/manage/src/utils/validation.ts b/frontend/manage/src/utils/validation.ts new file mode 100644 index 000000000..920907b8b --- /dev/null +++ b/frontend/manage/src/utils/validation.ts @@ -0,0 +1,3 @@ +import { allSpaces } from "../constants/regex"; + +export const isEmptyString = (str: string) => str.replace(allSpaces, "").length === 0; diff --git a/frontend/manage/yarn.lock b/frontend/manage/yarn.lock index 2b2fd3208..ec79c33ee 100644 --- a/frontend/manage/yarn.lock +++ b/frontend/manage/yarn.lock @@ -1100,6 +1100,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.9.2": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446" + integrity sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.12.7", "@babel/template@^7.14.5", "@babel/template@^7.3.3": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" @@ -2394,6 +2401,21 @@ lz-string "^1.4.4" pretty-format "^27.0.2" +"@testing-library/jest-dom@^5.14.1": + version "5.14.1" + resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.14.1.tgz#8501e16f1e55a55d675fe73eecee32cdaddb9766" + integrity sha512-dfB7HVIgTNCxH22M1+KU6viG5of2ldoA5ly8Ar8xkezKHKXjRvznCdbMbqjYGgO2xjRbwnR+rR8MLUIqF3kKbQ== + dependencies: + "@babel/runtime" "^7.9.2" + "@types/testing-library__jest-dom" "^5.9.1" + aria-query "^4.2.2" + chalk "^3.0.0" + css "^3.0.0" + css.escape "^1.5.1" + dom-accessibility-api "^0.5.6" + lodash "^4.17.15" + redent "^3.0.0" + "@testing-library/react@^12.0.0": version "12.0.0" resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.0.0.tgz#9aeb2264521522ab9b68f519eaf15136148f164a" @@ -2557,6 +2579,14 @@ dependencies: "@types/istanbul-lib-report" "*" +"@types/jest@*", "@types/jest@^26.0.24": + version "26.0.24" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.24.tgz#943d11976b16739185913a1936e0de0c4a7d595a" + integrity sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w== + dependencies: + jest-diff "^26.0.0" + pretty-format "^26.0.0" + "@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7": version "7.0.8" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818" @@ -2727,6 +2757,13 @@ resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310" integrity sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ== +"@types/testing-library__jest-dom@^5.9.1": + version "5.14.1" + resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.1.tgz#014162a5cee6571819d48e999980694e2f657c3c" + integrity sha512-Gk9vaXfbzc5zCXI9eYE9BI5BNHEp4D3FWjgqBE/ePGYElLAP+KvxBcsdkwfIVvezs605oiyd/VrpiHe3Oeg+Aw== + dependencies: + "@types/jest" "*" + "@types/uglify-js@*": version "3.13.1" resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.1.tgz#5e889e9e81e94245c75b6450600e1c5ea2878aea" @@ -3964,6 +4001,13 @@ browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6: escalade "^3.1.1" node-releases "^1.1.71" +bs-logger@0.x: + version "0.2.6" + resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8" + integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog== + dependencies: + fast-json-stable-stringify "2.x" + bser@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" @@ -3971,7 +4015,7 @@ bser@2.1.1: dependencies: node-int64 "^0.4.0" -buffer-from@^1.0.0: +buffer-from@1.x, buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== @@ -4760,6 +4804,20 @@ css-what@^5.0.0: resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad" integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg== +css.escape@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb" + integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s= + +css@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d" + integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ== + dependencies: + inherits "^2.0.4" + source-map "^0.6.1" + source-map-resolve "^0.6.0" + cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" @@ -4985,6 +5043,11 @@ detect-port@^1.3.0: address "^1.0.1" debug "^2.6.0" +diff-sequences@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" + integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q== + diff-sequences@^27.0.6: version "27.0.6" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.6.tgz#3305cb2e55a033924054695cc66019fd7f8e5723" @@ -5754,7 +5817,7 @@ fast-json-parse@^1.0.3: resolved "https://registry.yarnpkg.com/fast-json-parse/-/fast-json-parse-1.0.3.tgz#43e5c61ee4efa9265633046b770fb682a7577c4d" integrity sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw== -fast-json-stable-stringify@^2.0.0: +fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== @@ -7437,6 +7500,16 @@ jest-config@^27.0.6: micromatch "^4.0.4" pretty-format "^27.0.6" +jest-diff@^26.0.0: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394" + integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA== + dependencies: + chalk "^4.0.0" + diff-sequences "^26.6.2" + jest-get-type "^26.3.0" + pretty-format "^26.6.2" + jest-diff@^27.0.6: version "27.0.6" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.6.tgz#4a7a19ee6f04ad70e0e3388f35829394a44c7b5e" @@ -7490,6 +7563,11 @@ jest-environment-node@^27.0.6: jest-mock "^27.0.6" jest-util "^27.0.6" +jest-get-type@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" + integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== + jest-get-type@^27.0.6: version "27.0.6" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.6.tgz#0eb5c7f755854279ce9b68a9f1a4122f69047cfe" @@ -7746,6 +7824,11 @@ jest-snapshot@^27.0.6: pretty-format "^27.0.6" semver "^7.3.2" +jest-transform-stub@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/jest-transform-stub/-/jest-transform-stub-2.0.0.tgz#19018b0851f7568972147a5d60074b55f0225a7d" + integrity sha512-lspHaCRx/mBbnm3h4uMMS3R5aZzMwyNpNIJLXj4cEsV0mIUtS4IjYJLSoyjRCtnxb6RIGJ4NL2quZzfIeNhbkg== + jest-util@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1" @@ -7758,7 +7841,7 @@ jest-util@^26.6.2: is-ci "^2.0.0" micromatch "^4.0.2" -jest-util@^27.0.6: +jest-util@^27.0.0, jest-util@^27.0.6: version "27.0.6" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.6.tgz#e8e04eec159de2f4d5f57f795df9cdc091e50297" integrity sha512-1JjlaIh+C65H/F7D11GNkGDDZtDfMEM8EBXsvd+l/cxtgQ6QhxuloOaiayt89DxUvDarbVhqI98HhgrM1yliFQ== @@ -7918,6 +8001,13 @@ json3@^3.3.3: resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== +json5@2.x, json5@^2.1.2, json5@^2.1.3: + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== + dependencies: + minimist "^1.2.5" + json5@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" @@ -7925,13 +8015,6 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2, json5@^2.1.3: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== - dependencies: - minimist "^1.2.5" - jsonfile@^2.1.0: version "2.4.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" @@ -8111,7 +8194,7 @@ lodash.uniq@4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0: +lodash@4.x, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -8177,6 +8260,11 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: dependencies: semver "^6.0.0" +make-error@1.x: + version "1.3.6" + resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" + integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== + makeerror@1.0.x: version "1.0.11" resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" @@ -8503,6 +8591,11 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" +mkdirp@1.x, mkdirp@^1.0.3, mkdirp@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" @@ -8510,11 +8603,6 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5: dependencies: minimist "^1.2.5" -mkdirp@^1.0.3, mkdirp@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" @@ -9433,6 +9521,16 @@ pretty-error@^3.0.4: lodash "^4.17.20" renderkid "^2.0.6" +pretty-format@^26.0.0, pretty-format@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" + integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg== + dependencies: + "@jest/types" "^26.6.2" + ansi-regex "^5.0.0" + ansi-styles "^4.0.0" + react-is "^17.0.1" + pretty-format@^27.0.2, pretty-format@^27.0.6: version "27.0.6" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.6.tgz#ab770c47b2c6f893a21aefc57b75da63ef49a11f" @@ -9987,6 +10085,14 @@ recursive-readdir@2.2.2: dependencies: minimatch "3.0.4" +redent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" + integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg== + dependencies: + indent-string "^4.0.0" + strip-indent "^3.0.0" + refractor@^3.1.0, refractor@^3.2.0: version "3.4.0" resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.4.0.tgz#62bd274b06c942041f390c371b676eb67cb0a678" @@ -10407,18 +10513,18 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.2.1, semver@^7.3.2, semver@^7.3.4: +semver@7.x, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" +semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -10677,6 +10783,14 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" +source-map-resolve@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2" + integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" @@ -11383,6 +11497,22 @@ ts-essentials@^2.0.3: resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745" integrity sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w== +ts-jest@^27.0.3: + version "27.0.3" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.0.3.tgz#808492f022296cde19390bb6ad627c8126bf93f8" + integrity sha512-U5rdMjnYam9Ucw+h0QvtNDbc5+88nxt7tbIvqaZUhFrfG4+SkWhMXjejCLVGcpILTPuV+H3W/GZDZrnZFpPeXw== + dependencies: + bs-logger "0.x" + buffer-from "1.x" + fast-json-stable-stringify "2.x" + jest-util "^27.0.0" + json5 "2.x" + lodash "4.x" + make-error "1.x" + mkdirp "1.x" + semver "7.x" + yargs-parser "20.x" + ts-pnp@^1.1.6: version "1.2.0" resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" @@ -12269,6 +12399,11 @@ yaml@^1.10.0, yaml@^1.7.2: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== +yargs-parser@20.x, yargs-parser@^20.2.2, yargs-parser@^20.2.7: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + yargs-parser@^13.1.2: version "13.1.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" @@ -12277,11 +12412,6 @@ yargs-parser@^13.1.2: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^20.2.2, yargs-parser@^20.2.7: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - yargs@^13.3.2: version "13.3.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"