From 2fa7b3356e50c8d35f30ae3c0b2c66177c317232 Mon Sep 17 00:00:00 2001 From: ismay <7355199+ismay@users.noreply.github.com> Date: Wed, 11 May 2022 16:13:27 +0200 Subject: [PATCH 1/2] ci: replace semantic commit checks with new workflow --- .github/semantic.yml | 4 - .github/workflows/dhis2-verify-commits.yml | 32 + package.json | 2 +- yarn.lock | 673 ++++++++++++++++----- 4 files changed, 554 insertions(+), 157 deletions(-) delete mode 100644 .github/semantic.yml create mode 100644 .github/workflows/dhis2-verify-commits.yml diff --git a/.github/semantic.yml b/.github/semantic.yml deleted file mode 100644 index 756b8b5aa..000000000 --- a/.github/semantic.yml +++ /dev/null @@ -1,4 +0,0 @@ -titleOnly: true -commitsOnly: false -titleAndCommits: false -allowMergeCommits: false diff --git a/.github/workflows/dhis2-verify-commits.yml b/.github/workflows/dhis2-verify-commits.yml new file mode 100644 index 000000000..ae7831b56 --- /dev/null +++ b/.github/workflows/dhis2-verify-commits.yml @@ -0,0 +1,32 @@ +name: 'dhis2: verify (commits)' + +on: + pull_request: + types: ['opened', 'edited', 'reopened', 'synchronize'] + +jobs: + lint-pr-title: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: c-hive/gha-yarn-cache@v1 + - run: yarn install --frozen-lockfile + - id: commitlint + run: echo ::set-output name=config_path::$(node -e "process.stdout.write(require('@dhis2/cli-style').config.commitlint)") + - uses: JulienKode/pull-request-name-linter-action@v0.5.0 + with: + configuration-path: ${{ steps.commitlint.outputs.config_path }} + + lint-commits: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - uses: c-hive/gha-yarn-cache@v1 + - run: yarn install --frozen-lockfile + - id: commitlint + run: echo ::set-output name=config_path::$(node -e "process.stdout.write(require('@dhis2/cli-style').config.commitlint)") + - uses: wagoid/commitlint-github-action@v4 + with: + configFile: ${{ steps.commitlint.outputs.config_path }} diff --git a/package.json b/package.json index 604cff8c7..d66ccb55c 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@dhis2/cli-app-scripts": "^8.0.1", - "@dhis2/cli-style": "^9.0.1", + "@dhis2/cli-style": "^10.4.1", "@dhis2/cli-utils-cypress": "^9.0.2", "@dhis2/cypress-commands": "^9.0.2", "@dhis2/cypress-plugins": "^9.0.2", diff --git a/yarn.lock b/yarn.lock index f040ce3ba..0328a0f56 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3561,141 +3561,142 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@commitlint/cli@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-11.0.0.tgz#698199bc52afed50aa28169237758fa14a67b5d3" - integrity sha512-YWZWg1DuqqO5Zjh7vUOeSX76vm0FFyz4y0cpGMFhrhvUi5unc4IVfCXZ6337R9zxuBtmveiRuuhQqnRRer+13g== - dependencies: - "@babel/runtime" "^7.11.2" - "@commitlint/format" "^11.0.0" - "@commitlint/lint" "^11.0.0" - "@commitlint/load" "^11.0.0" - "@commitlint/read" "^11.0.0" - chalk "4.1.0" - core-js "^3.6.1" - get-stdin "8.0.0" +"@commitlint/cli@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-12.1.4.tgz#af4d9dd3c0122c7b39a61fa1cd2abbad0422dbe0" + integrity sha512-ZR1WjXLvqEffYyBPT0XdnSxtt3Ty1TMoujEtseW5o3vPnkA1UNashAMjQVg/oELqfaiAMnDw8SERPMN0e/0kLg== + dependencies: + "@commitlint/format" "^12.1.4" + "@commitlint/lint" "^12.1.4" + "@commitlint/load" "^12.1.4" + "@commitlint/read" "^12.1.4" + "@commitlint/types" "^12.1.4" lodash "^4.17.19" resolve-from "5.0.0" resolve-global "1.0.0" - yargs "^15.1.0" + yargs "^16.2.0" -"@commitlint/config-conventional@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-11.0.0.tgz#3fa300a1b639273946de3c3f15e1cda518333422" - integrity sha512-SNDRsb5gLuDd2PL83yCOQX6pE7gevC79UPFx+GLbLfw6jGnnbO9/tlL76MLD8MOViqGbo7ZicjChO9Gn+7tHhA== +"@commitlint/config-conventional@^13.1.0": + version "13.2.0" + resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-13.2.0.tgz#2ad24fecc56ae9619dbe0934b98a98b18ace0bec" + integrity sha512-7u7DdOiF+3qSdDlbQGfpvCH8DCQdLFvnI2+VucYmmV7E92iD6t9PBj+UjIoSQCaMAzYp27Vkall78AkcXBh6Xw== dependencies: conventional-changelog-conventionalcommits "^4.3.1" -"@commitlint/ensure@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-11.0.0.tgz#3e796b968ab5b72bc6f8a6040076406306c987fb" - integrity sha512-/T4tjseSwlirKZdnx4AuICMNNlFvRyPQimbZIOYujp9DSO6XRtOy9NrmvWujwHsq9F5Wb80QWi4WMW6HMaENug== +"@commitlint/ensure@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-12.1.4.tgz#287ae2dcc5ccb086e749705b1bd9bdb99773056f" + integrity sha512-MxHIBuAG9M4xl33qUfIeMSasbv3ktK0W+iygldBxZOL4QSYC2Gn66pZAQMnV9o3V+sVFHoAK2XUKqBAYrgbEqw== dependencies: - "@commitlint/types" "^11.0.0" + "@commitlint/types" "^12.1.4" lodash "^4.17.19" -"@commitlint/execute-rule@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-11.0.0.tgz#3ed60ab7a33019e58d90e2d891b75d7df77b4b4d" - integrity sha512-g01p1g4BmYlZ2+tdotCavrMunnPFPhTzG1ZiLKTCYrooHRbmvqo42ZZn4QMStUEIcn+jfLb6BRZX3JzIwA1ezQ== +"@commitlint/execute-rule@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-12.1.4.tgz#9973b02e9779adbf1522ae9ac207a4815ec73de1" + integrity sha512-h2S1j8SXyNeABb27q2Ok2vD1WfxJiXvOttKuRA9Or7LN6OQoC/KtT3844CIhhWNteNMu/wE0gkTqGxDVAnJiHg== -"@commitlint/format@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-11.0.0.tgz#ac47b0b9ca46540c0082c721b290794e67bdc51b" - integrity sha512-bpBLWmG0wfZH/svzqD1hsGTpm79TKJWcf6EXZllh2J/LSSYKxGlv967lpw0hNojme0sZd4a/97R3qA2QHWWSLg== +"@commitlint/format@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-12.1.4.tgz#db2d46418a6ae57c90e5f7f65dff46f0265d9f24" + integrity sha512-h28ucMaoRjVvvgS6Bdf85fa/+ZZ/iu1aeWGCpURnQV7/rrVjkhNSjZwGlCOUd5kDV1EnZ5XdI7L18SUpRjs26g== dependencies: - "@commitlint/types" "^11.0.0" + "@commitlint/types" "^12.1.4" chalk "^4.0.0" -"@commitlint/is-ignored@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-11.0.0.tgz#7b803eda56276dbe7fec51eb1510676198468f39" - integrity sha512-VLHOUBN+sOlkYC4tGuzE41yNPO2w09sQnOpfS+pSPnBFkNUUHawEuA44PLHtDvQgVuYrMAmSWFQpWabMoP5/Xg== +"@commitlint/is-ignored@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-12.1.4.tgz#4c430bc3b361aa9be5cd4ddb252c1559870ea7bc" + integrity sha512-uTu2jQU2SKvtIRVLOzMQo3KxDtO+iJ1p0olmncwrqy4AfPLgwoyCP2CiULq5M7xpR3+dE3hBlZXbZTQbD7ycIw== dependencies: - "@commitlint/types" "^11.0.0" - semver "7.3.2" + "@commitlint/types" "^12.1.4" + semver "7.3.5" + +"@commitlint/lint@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-12.1.4.tgz#856b7fd2b2e6367b836cb84a12f1c1b3c0e40d22" + integrity sha512-1kZ8YDp4to47oIPFELUFGLiLumtPNKJigPFDuHt2+f3Q3IKdQ0uk53n3CPl4uoyso/Og/EZvb1mXjFR/Yce4cA== + dependencies: + "@commitlint/is-ignored" "^12.1.4" + "@commitlint/parse" "^12.1.4" + "@commitlint/rules" "^12.1.4" + "@commitlint/types" "^12.1.4" -"@commitlint/lint@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-11.0.0.tgz#01e062cd1b0e7c3d756aa2c246462e0b6a3348a4" - integrity sha512-Q8IIqGIHfwKr8ecVZyYh6NtXFmKw4YSEWEr2GJTB/fTZXgaOGtGFZDWOesCZllQ63f1s/oWJYtVv5RAEuwN8BQ== - dependencies: - "@commitlint/is-ignored" "^11.0.0" - "@commitlint/parse" "^11.0.0" - "@commitlint/rules" "^11.0.0" - "@commitlint/types" "^11.0.0" - -"@commitlint/load@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-11.0.0.tgz#f736562f0ffa7e773f8808fea93319042ee18211" - integrity sha512-t5ZBrtgvgCwPfxmG811FCp39/o3SJ7L+SNsxFL92OR4WQxPcu6c8taD0CG2lzOHGuRyuMxZ7ps3EbngT2WpiCg== - dependencies: - "@commitlint/execute-rule" "^11.0.0" - "@commitlint/resolve-extends" "^11.0.0" - "@commitlint/types" "^11.0.0" - chalk "4.1.0" +"@commitlint/load@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-12.1.4.tgz#e3c2dbc0e7d8d928f57a6878bd7219909fc0acab" + integrity sha512-Keszi0IOjRzKfxT+qES/n+KZyLrxy79RQz8wWgssCboYjKEp+wC+fLCgbiMCYjI5k31CIzIOq/16J7Ycr0C0EA== + dependencies: + "@commitlint/execute-rule" "^12.1.4" + "@commitlint/resolve-extends" "^12.1.4" + "@commitlint/types" "^12.1.4" + chalk "^4.0.0" cosmiconfig "^7.0.0" lodash "^4.17.19" resolve-from "^5.0.0" -"@commitlint/message@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-11.0.0.tgz#83554c3cbbc884fd07b473593bc3e94bcaa3ee05" - integrity sha512-01ObK/18JL7PEIE3dBRtoMmU6S3ecPYDTQWWhcO+ErA3Ai0KDYqV5VWWEijdcVafNpdeUNrEMigRkxXHQLbyJA== +"@commitlint/message@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-12.1.4.tgz#3895edcc0709deca5945f3d55f5ea95a9f1f446d" + integrity sha512-6QhalEKsKQ/Y16/cTk5NH4iByz26fqws2ub+AinHPtM7Io0jy4e3rym9iE+TkEqiqWZlUigZnTwbPvRJeSUBaA== -"@commitlint/parse@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-11.0.0.tgz#d18b08cf67c35d02115207d7009306a2e8e7c901" - integrity sha512-DekKQAIYWAXIcyAZ6/PDBJylWJ1BROTfDIzr9PMVxZRxBPc1gW2TG8fLgjZfBP5mc0cuthPkVi91KQQKGri/7A== +"@commitlint/parse@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-12.1.4.tgz#ba03d54d24ef84f6fd2ff31c5e9998b22d7d0aa1" + integrity sha512-yqKSAsK2V4X/HaLb/yYdrzs6oD/G48Ilt0EJ2Mp6RJeWYxG14w/Out6JrneWnr/cpzemyN5hExOg6+TB19H/Lw== dependencies: - conventional-changelog-angular "^5.0.0" + "@commitlint/types" "^12.1.4" + conventional-changelog-angular "^5.0.11" conventional-commits-parser "^3.0.0" -"@commitlint/read@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-11.0.0.tgz#f24240548c63587bba139fa5a364cab926077016" - integrity sha512-37V0V91GSv0aDzMzJioKpCoZw6l0shk7+tRG8RkW1GfZzUIytdg3XqJmM+IaIYpaop0m6BbZtfq+idzUwJnw7g== +"@commitlint/read@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-12.1.4.tgz#552fda42ef185d5b578beb6f626a5f8b282de3a6" + integrity sha512-TnPQSJgD8Aod5Xeo9W4SaYKRZmIahukjcCWJ2s5zb3ZYSmj6C85YD9cR5vlRyrZjj78ItLUV/X4FMWWVIS38Jg== dependencies: - "@commitlint/top-level" "^11.0.0" + "@commitlint/top-level" "^12.1.4" + "@commitlint/types" "^12.1.4" fs-extra "^9.0.0" git-raw-commits "^2.0.0" -"@commitlint/resolve-extends@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-11.0.0.tgz#158ecbe27d4a2a51d426111a01478e216fbb1036" - integrity sha512-WinU6Uv6L7HDGLqn/To13KM1CWvZ09VHZqryqxXa1OY+EvJkfU734CwnOEeNlSCK7FVLrB4kmodLJtL1dkEpXw== +"@commitlint/resolve-extends@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-12.1.4.tgz#e758ed7dcdf942618b9f603a7c28a640f6a0802a" + integrity sha512-R9CoUtsXLd6KSCfsZly04grsH6JVnWFmVtWgWs1KdDpdV+G3TSs37tColMFqglpkx3dsWu8dsPD56+D9YnJfqg== dependencies: import-fresh "^3.0.0" lodash "^4.17.19" resolve-from "^5.0.0" resolve-global "^1.0.0" -"@commitlint/rules@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-11.0.0.tgz#bdb310cc6fc55c9f8d7d917a22b69055c535c375" - integrity sha512-2hD9y9Ep5ZfoNxDDPkQadd2jJeocrwC4vJ98I0g8pNYn/W8hS9+/FuNpolREHN8PhmexXbkjrwyQrWbuC0DVaA== +"@commitlint/rules@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-12.1.4.tgz#0e141b08caa3d7bdc48aa784baa8baff3efd64db" + integrity sha512-W8m6ZSjg7RuIsIfzQiFHa48X5mcPXeKT9yjBxVmjHvYfS2FDBf1VxCQ7vO0JTVIdV4ohjZ0eKg/wxxUuZHJAZg== dependencies: - "@commitlint/ensure" "^11.0.0" - "@commitlint/message" "^11.0.0" - "@commitlint/to-lines" "^11.0.0" - "@commitlint/types" "^11.0.0" + "@commitlint/ensure" "^12.1.4" + "@commitlint/message" "^12.1.4" + "@commitlint/to-lines" "^12.1.4" + "@commitlint/types" "^12.1.4" -"@commitlint/to-lines@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-11.0.0.tgz#86dea151c10eea41e39ea96fa4de07839258a7fe" - integrity sha512-TIDTB0Y23jlCNubDROUVokbJk6860idYB5cZkLWcRS9tlb6YSoeLn1NLafPlrhhkkkZzTYnlKYzCVrBNVes1iw== +"@commitlint/to-lines@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-12.1.4.tgz#caa582dbf121f377a0588bb64e25c4854843cd25" + integrity sha512-TParumvbi8bdx3EdLXz2MaX+e15ZgoCqNUgqHsRLwyqLUTRbqCVkzrfadG1UcMQk8/d5aMbb327ZKG3Q4BRorw== -"@commitlint/top-level@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-11.0.0.tgz#bb2d1b6e5ed3be56874633b59e1f7de118c32783" - integrity sha512-O0nFU8o+Ws+py5pfMQIuyxOtfR/kwtr5ybqTvR+C2lUPer2x6lnQU+OnfD7hPM+A+COIUZWx10mYQvkR3MmtAA== +"@commitlint/top-level@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-12.1.4.tgz#96d5c715bfc1bdf86dfcf11b67fc2cf7658c7a6e" + integrity sha512-d4lTJrOT/dXlpY+NIt4CUl77ciEzYeNVc0VFgUQ6VA+b1rqYD2/VWFjBlWVOrklxtSDeKyuEhs36RGrppEFAvg== dependencies: find-up "^5.0.0" -"@commitlint/types@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@commitlint/types/-/types-11.0.0.tgz#719cf05fcc1abb6533610a2e0f5dd1e61eac14fe" - integrity sha512-VoNqai1vR5anRF5Tuh/+SWDFk7xi7oMwHrHrbm1BprYXjB2RJsWLhUrStMssDxEl5lW/z3EUdg8RvH/IUBccSQ== +"@commitlint/types@^12.1.4": + version "12.1.4" + resolved "https://registry.yarnpkg.com/@commitlint/types/-/types-12.1.4.tgz#9618a5dc8991fb58e6de6ed89d7bf712fa74ba7e" + integrity sha512-KRIjdnWNUx6ywz+SJvjmNCbQKcKP6KArhjZhY2l+CWKxak0d77SOjggkMwFTiSgLODOwmuLTbarR2ZfWPiPMlw== + dependencies: + chalk "^4.0.0" "@csstools/convert-colors@^1.4.0": version "1.4.0" @@ -4401,28 +4402,28 @@ update-notifier "^3.0.0" yargs "^13.1.0" -"@dhis2/cli-style@^9.0.1": - version "9.0.1" - resolved "https://registry.yarnpkg.com/@dhis2/cli-style/-/cli-style-9.0.1.tgz#919bb978362ed9aeb7a253a3b58d6f25e3c09bd9" - integrity sha512-CGZQebdhh3EtpjyQGeQEbwVE0vmSqzz8TWrVEkuo9bVxBu7Gjpok5mnsFE0wXLP0kqga9zBuwfeIbY8iAoO1kA== +"@dhis2/cli-style@^10.4.1": + version "10.4.1" + resolved "https://registry.yarnpkg.com/@dhis2/cli-style/-/cli-style-10.4.1.tgz#1186d79f4b4ef2802832a116562041ae50c596dc" + integrity sha512-4INZ2T67kZXkykUuNr9TqL0B88HYRYvtc2ctDV0IemK5bSNiwoQrgM6lqMIFHE5T48DEaFTQ3rvrd0nLjsW6Ng== dependencies: - "@commitlint/cli" "^11.0.0" - "@commitlint/config-conventional" "^11.0.0" + "@commitlint/cli" "^12.1.4" + "@commitlint/config-conventional" "^13.1.0" "@dhis2/cli-helpers-engine" "^3.0.0" - "@ls-lint/ls-lint" "^1.9.2" + "@ls-lint/ls-lint" "^1.10.0" babel-eslint "^10.1.0" - eslint "^7.18.0" - eslint-config-prettier "^7.2.0" + eslint "^7.32.0" + eslint-config-prettier "^8.3.0" eslint-plugin-import "^2.22.1" - eslint-plugin-react "^7.22.0" + eslint-plugin-react "^7.26.0" fast-glob "^3.2.5" find-up "^5.0.0" - fs-extra "^9.1.0" - husky "^5.2.0" + fs-extra "^10.0.0" + husky "^7.0.2" micromatch "^4.0.4" perfy "^1.1.5" - prettier "^2.2.1" - semver "^7.3.4" + prettier "^2.4.1" + semver "^7.3.5" yargs "^16.2.0" "@dhis2/cli-utils-cypress@^9.0.2": @@ -4575,6 +4576,21 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@eslint/eslintrc@^0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" + integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^13.9.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^3.13.1" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + "@hapi/address@2.x.x": version "2.1.4" resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" @@ -4619,6 +4635,20 @@ dependencies: "@hapi/hoek" "^9.0.0" +"@humanwhocodes/config-array@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" + integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg== + dependencies: + "@humanwhocodes/object-schema" "^1.2.0" + debug "^4.1.1" + minimatch "^3.0.4" + +"@humanwhocodes/object-schema@^1.2.0": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -4993,10 +5023,10 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@ls-lint/ls-lint@^1.9.2": - version "1.9.2" - resolved "https://registry.yarnpkg.com/@ls-lint/ls-lint/-/ls-lint-1.9.2.tgz#689f1f4c06072823a726802ba167340efcefe19c" - integrity sha512-sugEjWjSSy9OHF6t1ZBLZCAROj52cZthB9dIePmzZzzMwmWwy3qAEMSdJheHeS1FOwDZI7Ipm1H/bWgzJNnSAw== +"@ls-lint/ls-lint@^1.10.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@ls-lint/ls-lint/-/ls-lint-1.11.0.tgz#fff074121e72bbbf6f1e5da05b916196039479df" + integrity sha512-YwVzEaGDM5LvRN7fn+8hYLTgcXsyksAr3V1x76/V3mWyaqKUAo4llcCd8lYoBCo4bxVgFq2pzPDQpeunZejLQg== "@mdn/browser-compat-data@^2.0.7": version "2.0.7" @@ -6374,6 +6404,11 @@ ansi-regex@^5.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -6545,6 +6580,17 @@ array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3: get-intrinsic "^1.1.1" is-string "^1.0.5" +array-includes@^3.1.4: + version "3.1.5" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz#2c320010db8d31031fd2a5f6b3bbd4b1aad31bdb" + integrity sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.19.5" + get-intrinsic "^1.1.1" + is-string "^1.0.7" + array-union@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" @@ -6594,6 +6640,16 @@ array.prototype.flatmap@^1.2.4: es-abstract "^1.18.0-next.1" function-bind "^1.1.1" +array.prototype.flatmap@^1.2.5: + version "1.3.0" + resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz#a7e8ed4225f4788a70cd910abcf0791e76a5534f" + integrity sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.2" + es-shim-unscopables "^1.0.0" + arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -7856,14 +7912,6 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - chalk@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" @@ -8459,10 +8507,10 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -conventional-changelog-angular@^5.0.0: - version "5.0.12" - resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz#c979b8b921cbfe26402eb3da5bbfda02d865a2b9" - integrity sha512-5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw== +conventional-changelog-angular@^5.0.11: + version "5.0.13" + resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz#896885d63b914a70d4934b59d2fe7bde1832b28c" + integrity sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA== dependencies: compare-func "^2.0.0" q "^1.5.1" @@ -8590,11 +8638,6 @@ core-js@^2.4.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== -core-js@^3.6.1: - version "3.9.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.9.1.tgz#cec8de593db8eb2a85ffb0dbdeb312cb6e5460ae" - integrity sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg== - core-js@^3.6.5: version "3.9.0" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.9.0.tgz#790b1bb11553a2272b36e2625c7179db345492f8" @@ -9305,6 +9348,14 @@ define-properties@^1.1.2, define-properties@^1.1.3: dependencies: object-keys "^1.0.12" +define-properties@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" + integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== + dependencies: + has-property-descriptors "^1.0.0" + object-keys "^1.1.1" + define-property@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" @@ -10005,11 +10056,47 @@ es-abstract@^1.18.5: string.prototype.trimstart "^1.0.4" unbox-primitive "^1.0.1" +es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5: + version "1.20.0" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.0.tgz#b2d526489cceca004588296334726329e0a6bfb6" + integrity sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA== + dependencies: + call-bind "^1.0.2" + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + function.prototype.name "^1.1.5" + get-intrinsic "^1.1.1" + get-symbol-description "^1.0.0" + has "^1.0.3" + has-property-descriptors "^1.0.0" + has-symbols "^1.0.3" + internal-slot "^1.0.3" + is-callable "^1.2.4" + is-negative-zero "^2.0.2" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.2" + is-string "^1.0.7" + is-weakref "^1.0.2" + object-inspect "^1.12.0" + object-keys "^1.1.1" + object.assign "^4.1.2" + regexp.prototype.flags "^1.4.1" + string.prototype.trimend "^1.0.5" + string.prototype.trimstart "^1.0.5" + unbox-primitive "^1.0.2" + es-module-lexer@^0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.7.1.tgz#c2c8e0f46f2df06274cdaf0dd3f3b33e0a0b267d" integrity sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw== +es-shim-unscopables@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" + integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w== + dependencies: + has "^1.0.3" + es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -10065,6 +10152,11 @@ escape-string-regexp@2.0.0, escape-string-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + escodegen@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" @@ -10077,10 +10169,10 @@ escodegen@^2.0.0: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz#f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9" - integrity sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg== +eslint-config-prettier@^8.3.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" + integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q== eslint-config-react-app@^6.0.0: version "6.0.0" @@ -10184,7 +10276,7 @@ eslint-plugin-react-hooks@^4.2.0: resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556" integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ== -eslint-plugin-react@^7.21.5, eslint-plugin-react@^7.22.0: +eslint-plugin-react@^7.21.5: version "7.23.2" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz#2d2291b0f95c03728b55869f01102290e792d494" integrity sha512-AfjgFQB+nYszudkxRkTFu0UR1zEQig0ArVMPloKhxwlwkzaw/fBiH0QWcBBhZONlXqQC51+nfqFrkn4EzHcGBw== @@ -10202,6 +10294,26 @@ eslint-plugin-react@^7.21.5, eslint-plugin-react@^7.22.0: resolve "^2.0.0-next.3" string.prototype.matchall "^4.0.4" +eslint-plugin-react@^7.26.0: + version "7.29.4" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.29.4.tgz#4717de5227f55f3801a5fd51a16a4fa22b5914d2" + integrity sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ== + dependencies: + array-includes "^3.1.4" + array.prototype.flatmap "^1.2.5" + doctrine "^2.1.0" + estraverse "^5.3.0" + jsx-ast-utils "^2.4.1 || ^3.0.0" + minimatch "^3.1.2" + object.entries "^1.1.5" + object.fromentries "^2.0.5" + object.hasown "^1.1.0" + object.values "^1.1.5" + prop-types "^15.8.1" + resolve "^2.0.0-next.3" + semver "^6.3.0" + string.prototype.matchall "^4.0.6" + eslint-plugin-testing-library@^3.9.2: version "3.10.1" resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-3.10.1.tgz#4dd02306d601c3238fdabf1d1dbc5f2a8e85d531" @@ -10266,7 +10378,7 @@ eslint-webpack-plugin@^2.5.2: micromatch "^4.0.2" schema-utils "^3.0.0" -eslint@^7.11.0, eslint@^7.18.0: +eslint@^7.11.0: version "7.26.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.26.0.tgz#d416fdcdcb3236cd8f282065312813f8c13982f6" integrity sha512-4R1ieRf52/izcZE7AlLy56uIHHDLT74Yzz2Iv2l6kDaYvEu9x+wMB5dZArVL8SYGXSYV2YAg70FcW5Y5nGGNIg== @@ -10309,6 +10421,52 @@ eslint@^7.11.0, eslint@^7.18.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" +eslint@^7.32.0: + version "7.32.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" + integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== + dependencies: + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.3" + "@humanwhocodes/config-array" "^0.5.0" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.0.1" + doctrine "^3.0.0" + enquirer "^2.3.5" + escape-string-regexp "^4.0.0" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.1" + esquery "^1.4.0" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + functional-red-black-tree "^1.0.1" + glob-parent "^5.1.2" + globals "^13.6.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.0.4" + natural-compare "^1.4.0" + optionator "^0.9.1" + progress "^2.0.0" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" + table "^6.0.9" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + espree@^7.3.0, espree@^7.3.1: version "7.3.1" resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" @@ -10354,6 +10512,11 @@ estraverse@^5.1.0, estraverse@^5.2.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== +estraverse@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== + estree-walker@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362" @@ -10656,6 +10819,11 @@ fast-deep-equal@^3.1.1: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== +fast-deep-equal@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + fast-glob@^3.1.1, fast-glob@^3.2.5: version "3.2.5" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" @@ -10969,6 +11137,15 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== +fs-extra@^10.0.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" + integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs-extra@^7.0.0: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" @@ -11071,6 +11248,16 @@ function.prototype.name@^1.1.3: es-abstract "^1.18.0-next.1" functions-have-names "^1.2.1" +function.prototype.name@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621" + integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.0" + functions-have-names "^1.2.2" + functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" @@ -11086,6 +11273,11 @@ functions-have-names@^1.2.1: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.2.tgz#98d93991c39da9361f8e50b337c4f6e41f120e21" integrity sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA== +functions-have-names@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" + integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== + gaze@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a" @@ -11137,7 +11329,7 @@ get-package-type@^0.1.0: resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== -get-stdin@8.0.0, get-stdin@^8.0.0: +get-stdin@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg== @@ -11240,7 +11432,7 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0: dependencies: is-glob "^4.0.1" -glob-parent@~5.1.2: +glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -11353,6 +11545,13 @@ globals@^13.6.0: dependencies: type-fest "^0.20.2" +globals@^13.9.0: + version "13.14.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.14.0.tgz#daf3ff9b4336527cf56e98330b6f64bea9aff9df" + integrity sha512-ERO68sOYwm5UuLvSJTY7w7NP2c8S4UcXs3X1GBX8cwOr+ShOcDBbCY5mH4zxz0jsYCdJ8ve8Mv9n2YGJMB1aeg== + dependencies: + type-fest "^0.20.2" + globby@11.0.1: version "11.0.1" resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357" @@ -11506,6 +11705,11 @@ has-bigints@^1.0.1: resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== +has-bigints@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" + integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== + has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -11516,6 +11720,13 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +has-property-descriptors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" + integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== + dependencies: + get-intrinsic "^1.1.1" + has-symbols@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" @@ -11526,6 +11737,11 @@ has-symbols@^1.0.2: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== +has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== + has-tostringtag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" @@ -11886,10 +12102,10 @@ human-signals@^2.1.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== -husky@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/husky/-/husky-5.2.0.tgz#fc5e1c2300d34855d47de4753607d00943fc0802" - integrity sha512-AM8T/auHXRBxlrfPVLKP6jt49GCM2Zz47m8G3FOMsLmTv8Dj/fKVWE0Rh2d4Qrvmy131xEsdQnb3OXRib67PGg== +husky@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535" + integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ== i18next-conv@^9: version "9.2.0" @@ -12495,6 +12711,11 @@ is-negative-zero@^2.0.1: resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== +is-negative-zero@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" + integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== + is-npm@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-3.0.0.tgz#ec9147bfb629c43f494cf67936a961edec7e8053" @@ -12653,6 +12874,13 @@ is-shared-array-buffer@^1.0.1: resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA== +is-shared-array-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" + integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== + dependencies: + call-bind "^1.0.2" + is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -12746,7 +12974,7 @@ is-valid-glob@^1.0.0: resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa" integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao= -is-weakref@^1.0.1: +is-weakref@^1.0.1, is-weakref@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== @@ -14246,6 +14474,11 @@ lodash.memoize@~3.0.3: resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f" integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8= +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + lodash.once@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" @@ -14731,6 +14964,13 @@ minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2: dependencies: brace-expansion "^1.1.7" +minimatch@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -15294,7 +15534,7 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.11.0: +object-inspect@^1.11.0, object-inspect@^1.12.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== @@ -15364,6 +15604,15 @@ object.entries@^1.1.2, object.entries@^1.1.3: es-abstract "^1.18.0-next.1" has "^1.0.3" +object.entries@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861" + integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + object.fromentries@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.3.tgz#13cefcffa702dc67750314a3305e8cb3fad1d072" @@ -15384,6 +15633,15 @@ object.fromentries@^2.0.4: es-abstract "^1.18.0-next.2" has "^1.0.3" +object.fromentries@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251" + integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649" @@ -15392,6 +15650,14 @@ object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0 define-properties "^1.1.3" es-abstract "^1.17.0-next.1" +object.hasown@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.1.tgz#ad1eecc60d03f49460600430d97f23882cf592a3" + integrity sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A== + dependencies: + define-properties "^1.1.4" + es-abstract "^1.19.5" + object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" @@ -15409,6 +15675,15 @@ object.values@^1.1.0, object.values@^1.1.1, object.values@^1.1.2, object.values@ es-abstract "^1.18.0-next.2" has "^1.0.3" +object.values@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" + integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + oblivious-set@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/oblivious-set/-/oblivious-set-1.0.0.tgz#c8316f2c2fb6ff7b11b6158db3234c49f733c566" @@ -16742,10 +17017,10 @@ prepend-http@^2.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= -prettier@^2.2.1: - version "2.3.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.0.tgz#b6a5bf1284026ae640f17f7ff5658a7567fc0d18" - integrity sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w== +prettier@^2.4.1: + version "2.6.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032" + integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew== pretty-bytes@^5.3.0, pretty-bytes@^5.6.0: version "5.6.0" @@ -16846,6 +17121,15 @@ prop-types@^15, prop-types@^15.6.2, prop-types@^15.7.2: object-assign "^4.1.1" react-is "^16.8.1" +prop-types@^15.8.1: + 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.5: version "2.0.6" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" @@ -17495,6 +17779,15 @@ regexp.prototype.flags@^1.3.1: call-bind "^1.0.2" define-properties "^1.1.3" +regexp.prototype.flags@^1.4.1: + version "1.4.3" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" + integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + functions-have-names "^1.2.2" + regexpp@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz#dd63982ee3300e67b41c1956f850aa680d9d330e" @@ -18189,15 +18482,22 @@ semver@7.3.2: resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== +semver@7.3.5, semver@^7.2.1, semver@^7.3.2: + 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.2.0, 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: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== +semver@^7.3.5: + version "7.3.7" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" + integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== dependencies: lru-cache "^6.0.0" @@ -18924,6 +19224,15 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string.prototype.matchall@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz#608f255e93e072107f5de066f81a2dfb78cf6b29" @@ -18937,6 +19246,20 @@ string.prototype.matchall@^4.0.4: regexp.prototype.flags "^1.3.1" side-channel "^1.0.4" +string.prototype.matchall@^4.0.6: + version "4.0.7" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz#8e6ecb0d8a1fb1fda470d81acecb2dba057a481d" + integrity sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + get-intrinsic "^1.1.1" + has-symbols "^1.0.3" + internal-slot "^1.0.3" + regexp.prototype.flags "^1.4.1" + side-channel "^1.0.4" + string.prototype.trim@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz#141233dff32c82bfad80684d7e5f0869ee0fb782" @@ -18962,6 +19285,15 @@ string.prototype.trimend@^1.0.4: call-bind "^1.0.2" define-properties "^1.1.3" +string.prototype.trimend@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0" + integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.19.5" + string.prototype.trimleft@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" @@ -18994,6 +19326,15 @@ string.prototype.trimstart@^1.0.4: call-bind "^1.0.2" define-properties "^1.1.3" +string.prototype.trimstart@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef" + integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.19.5" + string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -19050,6 +19391,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.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" @@ -19346,6 +19694,17 @@ table@^6.0.4, table@^6.6.0: string-width "^4.2.0" strip-ansi "^6.0.0" +table@^6.0.9: + version "6.8.0" + resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca" + integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA== + dependencies: + ajv "^8.0.1" + lodash.truncate "^4.4.2" + slice-ansi "^4.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + tapable@^1.0.0, tapable@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" @@ -19988,6 +20347,16 @@ unbox-primitive@^1.0.0, unbox-primitive@^1.0.1: has-symbols "^1.0.2" which-boxed-primitive "^1.0.2" +unbox-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" + integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== + dependencies: + call-bind "^1.0.2" + has-bigints "^1.0.2" + has-symbols "^1.0.3" + which-boxed-primitive "^1.0.2" + unc-path-regex@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" From 92a6a21279d98fa194427faba498315b7b946f1f Mon Sep 17 00:00:00 2001 From: ismay <7355199+ismay@users.noreply.github.com> Date: Thu, 12 May 2022 14:06:16 +0200 Subject: [PATCH 2/2] style: fix prettier errors --- .../add-route/create-parameter-jobs/index.js | 6 ++-- .../create-parameterless-jobs/index.js | 6 ++-- .../edit-route/delete-button/index.js | 11 +++--- .../edit-route/edit-parameter-jobs/index.js | 6 ++-- .../edit-parameterless-jobs/index.js | 6 ++-- .../list-route/filter-jobs/index.js | 4 +-- .../list-route/include-system-jobs/index.js | 6 ++-- .../list-route/job-toggle/index.js | 12 +++---- .../list-route/user-job-actions/index.js | 13 ++++--- .../view-route/back-to-all-jobs/index.js | 2 +- src/components/AuthWall/selectors.js | 2 +- src/components/FormErrorBox/FormErrorBox.js | 2 +- src/components/FormFields/CronField.js | 2 +- .../FormFields/DataIntegrityChecksField.js | 6 ++-- .../DataIntegrityReportTypeField.js | 2 +- src/components/FormFields/JobTypeField.js | 2 +- .../FormFields/SkipTableTypesField.js | 2 +- src/components/FormFields/formatters.js | 2 +- src/components/JobTable/JobTable.js | 2 +- src/components/JobTable/Status.test.js | 2 +- src/components/Modal/CronPresetModal.js | 2 +- src/components/Store/StoreContext.test.js | 2 +- src/components/Store/hooks.js | 16 ++++----- src/hooks/jobs/use-submit-job.js | 4 +-- src/hooks/jobs/use-submit-job.test.js | 2 +- src/hooks/jobs/use-update-job.js | 4 +-- src/hooks/jobs/use-update-job.test.js | 2 +- src/pages/JobList/JobList.test.js | 2 +- src/services/format-error/format-error.js | 4 +-- .../dataIntegrityChecks.js | 6 ++-- src/services/translate-cron/translate-cron.js | 2 +- src/services/validators/required-cron.js | 2 +- src/services/validators/validate-cron.js | 36 ++++++++++--------- test/cleanup.js | 4 +-- 34 files changed, 97 insertions(+), 87 deletions(-) diff --git a/cypress/integration/add-route/create-parameter-jobs/index.js b/cypress/integration/add-route/create-parameter-jobs/index.js index 73d3843e1..51f71e91c 100644 --- a/cypress/integration/add-route/create-parameter-jobs/index.js +++ b/cypress/integration/add-route/create-parameter-jobs/index.js @@ -4,13 +4,13 @@ import { Given, Then } from 'cypress-cucumber-preprocessor/steps' * Local helpers */ -const selectJob = jobName => { +const selectJob = (jobName) => { cy.get('[data-test="dhis2-uicore-singleselect"]').click() cy.findByText(jobName).click() } -const saveAndExpect = expected => { - cy.intercept({ pathname: /jobConfigurations$/, method: 'POST' }, req => { +const saveAndExpect = (expected) => { + cy.intercept({ pathname: /jobConfigurations$/, method: 'POST' }, (req) => { expect(req.body).to.deep.equal(expected) req.reply({ statusCode: 201 }) }) diff --git a/cypress/integration/add-route/create-parameterless-jobs/index.js b/cypress/integration/add-route/create-parameterless-jobs/index.js index 11892dc77..f6252b7bb 100644 --- a/cypress/integration/add-route/create-parameterless-jobs/index.js +++ b/cypress/integration/add-route/create-parameterless-jobs/index.js @@ -4,13 +4,13 @@ import { Given, Then } from 'cypress-cucumber-preprocessor/steps' * Local helpers */ -const selectJob = jobName => { +const selectJob = (jobName) => { cy.get('[data-test="dhis2-uicore-singleselect"]').click() cy.findByText(jobName).click() } -const saveAndExpect = expected => { - cy.intercept({ pathname: /jobConfigurations$/, method: 'POST' }, req => { +const saveAndExpect = (expected) => { + cy.intercept({ pathname: /jobConfigurations$/, method: 'POST' }, (req) => { expect(req.body).to.deep.equal(expected) req.reply({ statusCode: 201 }) }) diff --git a/cypress/integration/edit-route/delete-button/index.js b/cypress/integration/edit-route/delete-button/index.js index 31df17bad..37fd88b6a 100644 --- a/cypress/integration/edit-route/delete-button/index.js +++ b/cypress/integration/edit-route/delete-button/index.js @@ -17,10 +17,13 @@ When('the user clicks the delete job button', () => { }) Then('the job will be deleted upon confirmation', () => { - cy.intercept({ pathname: /jobConfigurations$/, method: 'DELETE' }, req => { - expect(req.url.endsWith('jobConfigurations/lnWRZN67iDU')).to.be.true - req.reply({ statusCode: 200 }) - }) + cy.intercept( + { pathname: /jobConfigurations$/, method: 'DELETE' }, + (req) => { + expect(req.url.endsWith('jobConfigurations/lnWRZN67iDU')).to.be.true + req.reply({ statusCode: 200 }) + } + ) cy.findByText('Are you sure you want to delete this job?').should('exist') cy.findByRole('button', { name: 'Delete' }).click() diff --git a/cypress/integration/edit-route/edit-parameter-jobs/index.js b/cypress/integration/edit-route/edit-parameter-jobs/index.js index 975415ed9..e97c04704 100644 --- a/cypress/integration/edit-route/edit-parameter-jobs/index.js +++ b/cypress/integration/edit-route/edit-parameter-jobs/index.js @@ -4,15 +4,15 @@ import { Given, Then } from 'cypress-cucumber-preprocessor/steps' * Local helpers */ -const selectJob = jobName => { +const selectJob = (jobName) => { cy.get('[data-test="dhis2-uicore-singleselect"]').click() cy.findByText(jobName).click() } -const saveAndExpect = expected => { +const saveAndExpect = (expected) => { cy.intercept( { pathname: /jobConfigurations\/lnWRZN67iDU$/, method: 'PUT' }, - req => { + (req) => { expect(req.body).to.deep.equal(expected) req.reply({ statusCode: 201 }) } diff --git a/cypress/integration/edit-route/edit-parameterless-jobs/index.js b/cypress/integration/edit-route/edit-parameterless-jobs/index.js index 701059262..c10629784 100644 --- a/cypress/integration/edit-route/edit-parameterless-jobs/index.js +++ b/cypress/integration/edit-route/edit-parameterless-jobs/index.js @@ -4,15 +4,15 @@ import { Given, Then } from 'cypress-cucumber-preprocessor/steps' * Local helpers */ -const selectJob = jobName => { +const selectJob = (jobName) => { cy.get('[data-test="dhis2-uicore-singleselect"]').click() cy.findByText(jobName).click() } -const saveAndExpect = expected => { +const saveAndExpect = (expected) => { cy.intercept( { pathname: /jobConfigurations\/lnWRZN67iDU$/, method: 'PUT' }, - req => { + (req) => { expect(req.body).to.deep.equal(expected) req.reply({ statusCode: 201 }) } diff --git a/cypress/integration/list-route/filter-jobs/index.js b/cypress/integration/list-route/filter-jobs/index.js index 30be827c1..5f2f2ab0d 100644 --- a/cypress/integration/list-route/filter-jobs/index.js +++ b/cypress/integration/list-route/filter-jobs/index.js @@ -30,7 +30,7 @@ Given('the user enables the include-system-jobs-in-list toggle', () => { ] cy.findByRole('checkbox', { name: 'Include system jobs in list' }).click() - expected.forEach(name => { + expected.forEach((name) => { cy.findByRole('rowheader', { name }).should('exist') }) }) @@ -46,7 +46,7 @@ Then('only user jobs that match the filter will be shown', () => { Then('only jobs that match the filter will be shown', () => { const expected = ['Job 1', 'System Job 1'] - expected.forEach(name => { + expected.forEach((name) => { cy.findByRole('rowheader', { name }).should('exist') }) }) diff --git a/cypress/integration/list-route/include-system-jobs/index.js b/cypress/integration/list-route/include-system-jobs/index.js index 1be33bcaa..28971e7c7 100644 --- a/cypress/integration/list-route/include-system-jobs/index.js +++ b/cypress/integration/list-route/include-system-jobs/index.js @@ -34,7 +34,7 @@ When('the user checks the include-system-jobs-in-list checkbox', () => { Then('system jobs are not shown', () => { const systemJobs = ['System Job 1', 'System Job 2', 'System Job 3'] - systemJobs.forEach(name => { + systemJobs.forEach((name) => { cy.findByRole('rowheader', { name }).should('not.exist') }) }) @@ -42,7 +42,7 @@ Then('system jobs are not shown', () => { Then('system jobs are shown', () => { const systemJobs = ['System Job 1', 'System Job 2', 'System Job 3'] - systemJobs.forEach(name => { + systemJobs.forEach((name) => { cy.findByRole('rowheader', { name }).should('be.visible') }) }) @@ -50,7 +50,7 @@ Then('system jobs are shown', () => { Then('user jobs are shown', () => { const userJobs = ['Job 1', 'Job 2', 'Job 3'] - userJobs.forEach(name => { + userJobs.forEach((name) => { cy.findByRole('rowheader', { name }).should('be.visible') }) }) diff --git a/cypress/integration/list-route/job-toggle/index.js b/cypress/integration/list-route/job-toggle/index.js index 4af1743f5..9ac37f4f9 100644 --- a/cypress/integration/list-route/job-toggle/index.js +++ b/cypress/integration/list-route/job-toggle/index.js @@ -11,15 +11,15 @@ import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps' Given('a disabled user job exists', () => { const responses = [] - cy.fixture('list-route/disabled-user-job').then(fixture => { + cy.fixture('list-route/disabled-user-job').then((fixture) => { responses.push(fixture) }) - cy.fixture('list-route/enabled-user-job').then(fixture => { + cy.fixture('list-route/enabled-user-job').then((fixture) => { responses.push(fixture) }) - cy.intercept({ pathname: /jobConfigurations$/ }, req => { + cy.intercept({ pathname: /jobConfigurations$/ }, (req) => { const fixture = responses.shift() req.reply(200, fixture) }) @@ -28,15 +28,15 @@ Given('a disabled user job exists', () => { Given('an enabled user job exists', () => { const responses = [] - cy.fixture('list-route/enabled-user-job').then(fixture => { + cy.fixture('list-route/enabled-user-job').then((fixture) => { responses.push(fixture) }) - cy.fixture('list-route/disabled-user-job').then(fixture => { + cy.fixture('list-route/disabled-user-job').then((fixture) => { responses.push(fixture) }) - cy.intercept({ pathname: /jobConfigurations$/ }, req => { + cy.intercept({ pathname: /jobConfigurations$/ }, (req) => { const fixture = responses.shift() req.reply(200, fixture) }) diff --git a/cypress/integration/list-route/user-job-actions/index.js b/cypress/integration/list-route/user-job-actions/index.js index 79eab8641..6a3f62c94 100644 --- a/cypress/integration/list-route/user-job-actions/index.js +++ b/cypress/integration/list-route/user-job-actions/index.js @@ -29,7 +29,7 @@ When('the user clicks the run manually button', () => { }) Then('the job will be executed upon confirmation', () => { - cy.intercept({ pathname: /execute$/, method: 'GET' }, req => { + cy.intercept({ pathname: /execute$/, method: 'GET' }, (req) => { expect(req.url.endsWith('jobConfigurations/lnWRZN67iDU/execute')).to.be .true req.reply({ statusCode: 200 }) @@ -54,10 +54,13 @@ When('the user clicks the delete button', () => { }) Then('the job will be deleted upon confirmation', () => { - cy.intercept({ pathname: /jobConfigurations$/, method: 'DELETE' }, req => { - expect(req.url.endsWith('jobConfigurations/lnWRZN67iDU')).to.be.true - req.reply({ statusCode: 200 }) - }) + cy.intercept( + { pathname: /jobConfigurations$/, method: 'DELETE' }, + (req) => { + expect(req.url.endsWith('jobConfigurations/lnWRZN67iDU')).to.be.true + req.reply({ statusCode: 200 }) + } + ) cy.findByText('Are you sure you want to delete this job?').should('exist') cy.findByRole('button', { name: 'Delete' }).click() diff --git a/cypress/integration/view-route/back-to-all-jobs/index.js b/cypress/integration/view-route/back-to-all-jobs/index.js index 8a708dff9..a7bf3f8ca 100644 --- a/cypress/integration/view-route/back-to-all-jobs/index.js +++ b/cypress/integration/view-route/back-to-all-jobs/index.js @@ -17,7 +17,7 @@ Given('the user navigated to the view job page', () => { Then('there are two links to the job list page', () => { cy.findAllByRole('link', { name: 'Back to all jobs' }) .should('have.length', 2) - .each(link => { + .each((link) => { expect(link).to.have.attr('href', '#/') }) }) diff --git a/src/components/AuthWall/selectors.js b/src/components/AuthWall/selectors.js index 0300140fb..4a40b79e3 100644 --- a/src/components/AuthWall/selectors.js +++ b/src/components/AuthWall/selectors.js @@ -1,4 +1,4 @@ -export const getAuthorized = me => { +export const getAuthorized = (me) => { const { authorities } = me if (!authorities) { diff --git a/src/components/FormErrorBox/FormErrorBox.js b/src/components/FormErrorBox/FormErrorBox.js index f562b04e2..3319fb912 100644 --- a/src/components/FormErrorBox/FormErrorBox.js +++ b/src/components/FormErrorBox/FormErrorBox.js @@ -17,7 +17,7 @@ const FormErrorBox = ({ submitError }) => { title={i18n.t('Something went wrong whilst creating your job')} > diff --git a/src/components/FormFields/CronField.js b/src/components/FormFields/CronField.js index 04c12963d..8f8e7d067 100644 --- a/src/components/FormFields/CronField.js +++ b/src/components/FormFields/CronField.js @@ -32,7 +32,7 @@ const CronField = () => { form.change(FIELD_NAME, cron) + (cron) => form.change(FIELD_NAME, cron) } small /> diff --git a/src/components/FormFields/DataIntegrityChecksField.js b/src/components/FormFields/DataIntegrityChecksField.js index 1f3a1aae6..7f084b93e 100644 --- a/src/components/FormFields/DataIntegrityChecksField.js +++ b/src/components/FormFields/DataIntegrityChecksField.js @@ -20,7 +20,7 @@ import styles from './DataIntegrityChecksField.module.css' const { Field, useField } = ReactFinalForm -const VALIDATOR = value => { +const VALIDATOR = (value) => { // should not validate when null or undefined // means "Run all" is selected if (!value == null) { @@ -42,7 +42,7 @@ const DataIntegrityChecksField = ({ label, name }) => { const [runSelected, setRunSelected] = useState(hasValue) const translatedOptions = options - .map(option => ({ + .map((option) => ({ ...option, value: option.name, label: getCheckName(option.name), @@ -114,7 +114,7 @@ const LabelComponent = ({ label, severity, highlighted, disabled }) => ( LabelComponent.propTypes = TransferOption.propTypes -const renderOption = option => ( +const renderOption = (option) => ( } /> ) diff --git a/src/components/FormFields/DataIntegrityReportTypeField.js b/src/components/FormFields/DataIntegrityReportTypeField.js index bbbc6ac45..7e0f1221d 100644 --- a/src/components/FormFields/DataIntegrityReportTypeField.js +++ b/src/components/FormFields/DataIntegrityReportTypeField.js @@ -14,7 +14,7 @@ const DataIntegrityReportTypeField = ({ name, constants }) => { return null } - const labeledOptions = constants.map(type => ({ + const labeledOptions = constants.map((type) => ({ value: type, label: getReportTypeLabel(type), })) diff --git a/src/components/FormFields/JobTypeField.js b/src/components/FormFields/JobTypeField.js index 79f809154..46fd93c9e 100644 --- a/src/components/FormFields/JobTypeField.js +++ b/src/components/FormFields/JobTypeField.js @@ -23,7 +23,7 @@ const JobTypeField = () => { value: jobType, label: jobTypesMap[jobType], })) - .filter(job => !!job.label) + .filter((job) => !!job.label) .sort((job1, job2) => job1.label.localeCompare(job2.label)) return ( diff --git a/src/components/FormFields/SkipTableTypesField.js b/src/components/FormFields/SkipTableTypesField.js index 4b079f983..8d93823ed 100644 --- a/src/components/FormFields/SkipTableTypesField.js +++ b/src/components/FormFields/SkipTableTypesField.js @@ -20,7 +20,7 @@ const SkipTableTypesField = ({ label, name, parameterName }) => { ) } - const translatedOptions = options.map(option => ({ + const translatedOptions = options.map((option) => ({ value: option, label: analyticsTableTypes[option] || option, })) diff --git a/src/components/FormFields/formatters.js b/src/components/FormFields/formatters.js index a0c2f6ac9..40e750828 100644 --- a/src/components/FormFields/formatters.js +++ b/src/components/FormFields/formatters.js @@ -3,7 +3,7 @@ * inputs expect and return a string, so we're formatting them to strings */ -export const formatToString = value => { +export const formatToString = (value) => { if (typeof value === 'number') { return value.toString() } diff --git a/src/components/JobTable/JobTable.js b/src/components/JobTable/JobTable.js index 15fe34435..c32436e89 100644 --- a/src/components/JobTable/JobTable.js +++ b/src/components/JobTable/JobTable.js @@ -31,7 +31,7 @@ const JobTable = ({ jobs }) => ( {i18n.t('No jobs to display')} ) : ( - jobs.map(job => ) + jobs.map((job) => ) )} diff --git a/src/components/JobTable/Status.test.js b/src/components/JobTable/Status.test.js index 2a13f0f69..89f3b066e 100644 --- a/src/components/JobTable/Status.test.js +++ b/src/components/JobTable/Status.test.js @@ -13,7 +13,7 @@ const statuses = [ ] describe('', () => { - it.each(statuses)('renders without errors for %s status', status => { + it.each(statuses)('renders without errors for %s status', (status) => { shallow() }) diff --git a/src/components/Modal/CronPresetModal.js b/src/components/Modal/CronPresetModal.js index 0249a4e8d..c28cd73fe 100644 --- a/src/components/Modal/CronPresetModal.js +++ b/src/components/Modal/CronPresetModal.js @@ -41,7 +41,7 @@ const CronPresetModal = ({ setCron, hideModal }) => { {i18n.t('Choose a preset time/interval')} - {cronPresets.map(preset => ( + {cronPresets.map((preset) => ( { expectRenderError( - {store => store.refetchJobs()} + {(store) => store.refetchJobs()} , message ) diff --git a/src/components/Store/hooks.js b/src/components/Store/hooks.js index ec43abde5..ab892d543 100644 --- a/src/components/Store/hooks.js +++ b/src/components/Store/hooks.js @@ -48,11 +48,11 @@ export const useJobListJobs = () => { const jobs = useAllJobs() // Filter jobs by the current jobFilter - const applyJobFilter = job => + const applyJobFilter = (job) => job.displayName.toLowerCase().includes(jobFilter.toLowerCase()) // Filter jobs depending on the current showSystemJobs - const applyShowSystemJobs = job => + const applyShowSystemJobs = (job) => // Jobs that are configurable are user jobs showSystemJobs ? true : job.configurable @@ -60,19 +60,19 @@ export const useJobListJobs = () => { } // Finds a job by id -export const useJob = id => { +export const useJob = (id) => { const jobs = useAllJobs() - return jobs.find(job => job.id === id) + return jobs.find((job) => job.id === id) } // Finds a jobType by the jobType string -export const useJobType = jobType => { +export const useJobType = (jobType) => { const jobTypes = useAllJobTypes() - return jobTypes.find(job => job.jobType === jobType) + return jobTypes.find((job) => job.jobType === jobType) } // Returns an array with all parameters for a certain jobType -export const useJobTypeParameters = jobType => { +export const useJobTypeParameters = (jobType) => { const selectedJobType = useJobType(jobType) const hasParameters = 'jobParameters' in selectedJobType @@ -84,7 +84,7 @@ export const useJobTypeParameters = jobType => { } // Returns the parameter options for a given parameter -export const useParameterOptions = parameter => { +export const useParameterOptions = (parameter) => { const parameterOptions = useAllParameterOptions() return parameterOptions[parameter] } diff --git a/src/hooks/jobs/use-submit-job.js b/src/hooks/jobs/use-submit-job.js index d950cc74f..0fb4a9d27 100644 --- a/src/hooks/jobs/use-submit-job.js +++ b/src/hooks/jobs/use-submit-job.js @@ -13,14 +13,14 @@ const mutation = { const useSubmitJob = () => { const { refetchJobs } = useContext(StoreContext) const engine = useDataEngine() - const submitJob = job => + const submitJob = (job) => engine .mutate(mutation, { variables: { job } }) .then(() => { history.push('/') refetchJobs() }) - .catch(error => { + .catch((error) => { const isValidationError = error.type === 'access' // Potential validation error, return it in a format final-form can handle diff --git a/src/hooks/jobs/use-submit-job.test.js b/src/hooks/jobs/use-submit-job.test.js index 2d019b47c..2fa5dc2e4 100644 --- a/src/hooks/jobs/use-submit-job.test.js +++ b/src/hooks/jobs/use-submit-job.test.js @@ -46,7 +46,7 @@ describe('useSubmitJob', () => { mutate: () => Promise.reject(error), } useDataEngine.mockImplementation(() => engine) - formatError.mockImplementation(error => error) + formatError.mockImplementation((error) => error) const [submitJob] = useSubmitJob() diff --git a/src/hooks/jobs/use-update-job.js b/src/hooks/jobs/use-update-job.js index 4376f7134..e16c8708c 100644 --- a/src/hooks/jobs/use-update-job.js +++ b/src/hooks/jobs/use-update-job.js @@ -14,14 +14,14 @@ const mutation = { const useUpdateJob = ({ id }) => { const { refetchJobs } = useContext(StoreContext) const engine = useDataEngine() - const updateJob = job => + const updateJob = (job) => engine .mutate(mutation, { variables: { job, id } }) .then(() => { history.push('/') refetchJobs() }) - .catch(error => { + .catch((error) => { const isValidationError = error.type === 'access' // Potential validation error, return it in a format final-form can handle diff --git a/src/hooks/jobs/use-update-job.test.js b/src/hooks/jobs/use-update-job.test.js index 93137f10a..705d8f6cf 100644 --- a/src/hooks/jobs/use-update-job.test.js +++ b/src/hooks/jobs/use-update-job.test.js @@ -46,7 +46,7 @@ describe('useUpdateJob', () => { mutate: () => Promise.reject(error), } useDataEngine.mockImplementation(() => engine) - formatError.mockImplementation(error => error) + formatError.mockImplementation((error) => error) const [updateJob] = useUpdateJob({ id: 'id' }) diff --git a/src/pages/JobList/JobList.test.js b/src/pages/JobList/JobList.test.js index ea96b439d..7fd22b075 100644 --- a/src/pages/JobList/JobList.test.js +++ b/src/pages/JobList/JobList.test.js @@ -2,7 +2,7 @@ import React from 'react' import { mount } from 'enzyme' import JobList from './JobList' -jest.mock('react-router-dom', () => ({ Link: props => })) +jest.mock('react-router-dom', () => ({ Link: (props) => })) jest.mock('../../components/JobTable', () => ({ JobTable: () => null })) diff --git a/src/services/format-error/format-error.js b/src/services/format-error/format-error.js index e685b54e4..d1d457bf1 100644 --- a/src/services/format-error/format-error.js +++ b/src/services/format-error/format-error.js @@ -6,7 +6,7 @@ const { FORM_ERROR } = FinalForm * Formats the errors returned by our backend to a format that final-form can parse */ -const formatError = error => { +const formatError = (error) => { const { details: { response }, } = error @@ -19,7 +19,7 @@ const formatError = error => { const genericErrors = [] if (response.errorReports && response.errorReports.length) { - response.errorReports.forEach(report => { + response.errorReports.forEach((report) => { /** * errorProperty is how the backend indicates the field that the error * is related to. If we know this, return it as a field specific error diff --git a/src/services/server-translations/dataIntegrityChecks.js b/src/services/server-translations/dataIntegrityChecks.js index 5423887da..e41c1bb06 100644 --- a/src/services/server-translations/dataIntegrityChecks.js +++ b/src/services/server-translations/dataIntegrityChecks.js @@ -107,7 +107,7 @@ const reportTypeMap = { DETAILS: i18n.t('Details'), } -const snakeCaseToHumanReadable = string => { +const snakeCaseToHumanReadable = (string) => { const split = string.split('_') const [first, ...rest] = split return first[0] @@ -116,8 +116,8 @@ const snakeCaseToHumanReadable = string => { .concat(` ${rest.join(' ')}`) } -export const getCheckName = name => +export const getCheckName = (name) => dataIntegrityChecksMap[name] || snakeCaseToHumanReadable(name) -export const getReportTypeLabel = type => +export const getReportTypeLabel = (type) => reportTypeMap[type] || snakeCaseToHumanReadable(type) diff --git a/src/services/translate-cron/translate-cron.js b/src/services/translate-cron/translate-cron.js index 0aa7e3806..6e2c5ec1a 100644 --- a/src/services/translate-cron/translate-cron.js +++ b/src/services/translate-cron/translate-cron.js @@ -4,7 +4,7 @@ import { validateCron } from '../validators' const fallback = 'en' -const translateCron = cron => { +const translateCron = (cron) => { const locale = i18n.language || fallback const isValid = cron && validateCron(cron) diff --git a/src/services/validators/required-cron.js b/src/services/validators/required-cron.js index 0a9af24ec..9e129ac15 100644 --- a/src/services/validators/required-cron.js +++ b/src/services/validators/required-cron.js @@ -1,7 +1,7 @@ import i18n from '@dhis2/d2-i18n' import validateCron from './validate-cron' -const requiredCron = value => { +const requiredCron = (value) => { const isString = typeof value === 'string' const isFilled = isString && value.length > 0 diff --git a/src/services/validators/validate-cron.js b/src/services/validators/validate-cron.js index b4e760aba..86e46ff10 100644 --- a/src/services/validators/validate-cron.js +++ b/src/services/validators/validate-cron.js @@ -14,14 +14,16 @@ const MONTHS = [ 'DEC', ] -const isValidFields = fields => fields && fields.length === 6 +const isValidFields = (fields) => fields && fields.length === 6 const isValidNumber = (number, x, y) => number >= x && number <= y -const isWildcard = field => field === '*' -const isUndefined = field => field === '?' +const isWildcard = (field) => field === '*' +const isUndefined = (field) => field === '?' const isValidNumberRange = (range, x, y) => { const boundaries = range.split('-') - if (!boundaries || boundaries.length !== 2) return false + if (!boundaries || boundaries.length !== 2) { + return false + } return ( isValidNumber(boundaries[0], x, y) && @@ -32,7 +34,9 @@ const isValidNumberRange = (range, x, y) => { const isValidFraction = (fraction, x, y) => { const components = fraction.split('/') - if (!components || components.length !== 2) return false + if (!components || components.length !== 2) { + return false + } /* istanbul ignore next */ return ( @@ -41,18 +45,18 @@ const isValidFraction = (fraction, x, y) => { ) } -const isAlphabeticWeekday = field => { +const isAlphabeticWeekday = (field) => { const weekdays = field.split('-') - const [firstDay, secondDay] = weekdays.map(c => WEEKDAYS.indexOf(c)) + const [firstDay, secondDay] = weekdays.map((c) => WEEKDAYS.indexOf(c)) return ( (firstDay !== -1 && secondDay === undefined) || (firstDay !== -1 && secondDay !== -1 && firstDay <= secondDay) ) } -const isAlphabeticMonth = field => { +const isAlphabeticMonth = (field) => { const months = field.split('-') - const [firstMonth, secondMonth] = months.map(m => MONTHS.indexOf(m)) + const [firstMonth, secondMonth] = months.map((m) => MONTHS.indexOf(m)) /* istanbul ignore next */ return ( @@ -67,14 +71,14 @@ const isValidWithinRange = (field, x, y) => isValidNumberRange(field, x, y) || isValidFraction(field, x, y) -const isValidSecondField = field => isValidWithinRange(field, 0, 59) -const isValidMinuteField = field => isValidWithinRange(field, 0, 59) -const isValidHourField = field => isValidWithinRange(field, 0, 23) -const isValidDayField = field => +const isValidSecondField = (field) => isValidWithinRange(field, 0, 59) +const isValidMinuteField = (field) => isValidWithinRange(field, 0, 59) +const isValidHourField = (field) => isValidWithinRange(field, 0, 23) +const isValidDayField = (field) => isValidWithinRange(field, 0, 31) || isUndefined(field) -const isValidMonthField = field => +const isValidMonthField = (field) => isValidWithinRange(field, 1, 12) || isAlphabeticMonth(field) -const isValidWeekdayField = field => +const isValidWeekdayField = (field) => isValidWithinRange(field, 1, 7) || isAlphabeticWeekday(field) || isUndefined(field) @@ -86,7 +90,7 @@ const isValidWeekdayField = field => * Documentation: https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/scheduling/support/CronSequenceGenerator.html */ -const validateCron = exp => { +const validateCron = (exp) => { if (!exp) { return false } diff --git a/test/cleanup.js b/test/cleanup.js index 2de42a559..2c338c2d0 100644 --- a/test/cleanup.js +++ b/test/cleanup.js @@ -8,7 +8,7 @@ import reactDOM from 'react-dom' const attachments = [] -export const makeAdapter = Adapter => { +export const makeAdapter = (Adapter) => { class ReactAdapterWithMountTracking extends Adapter { constructor(...args) { super(...args) @@ -30,7 +30,7 @@ export const makeAdapter = Adapter => { } export const cleanup = () => { - attachments.forEach(node => { + attachments.forEach((node) => { // Unmount react component after each test reactDOM.unmountComponentAtNode(node) })