From 6f710643c5d80b3c1920ff656d1bb230a2f4c9a6 Mon Sep 17 00:00:00 2001 From: ismay <7355199+ismay@users.noreply.github.com> Date: Wed, 11 May 2022 16:46:22 +0200 Subject: [PATCH 1/5] ci: replace semantic commit checks with new workflow --- .github/semantic.yml | 4 - .github/workflows/dhis2-verify-commits.yml | 32 + package.json | 2 +- yarn.lock | 927 +++++++++++++++------ 4 files changed, 725 insertions(+), 240 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 555c025..0000000 --- a/.github/semantic.yml +++ /dev/null @@ -1,4 +0,0 @@ -titleOnly: false -commitsOnly: false -titleAndCommits: true -allowMergeCommits: false diff --git a/.github/workflows/dhis2-verify-commits.yml b/.github/workflows/dhis2-verify-commits.yml new file mode 100644 index 0000000..ae7831b --- /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 cff73e9..997e41a 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ }, "devDependencies": { "@dhis2/cli-app-scripts": "^6.0.1", - "@dhis2/cli-style": "^7.3.0" + "@dhis2/cli-style": "^10.4.1" }, "dependencies": { "@dhis2/app-runtime": "^2.8.0", diff --git a/yarn.lock b/yarn.lock index 9b82564..c373fb6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1187,141 +1187,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" @@ -1427,7 +1428,7 @@ parse-gitignore "^1.0.1" styled-jsx "<3.3.3" -"@dhis2/cli-helpers-engine@2.1.1", "@dhis2/cli-helpers-engine@^2.1.1": +"@dhis2/cli-helpers-engine@^2.1.1": version "2.1.1" resolved "https://registry.yarnpkg.com/@dhis2/cli-helpers-engine/-/cli-helpers-engine-2.1.1.tgz#34a15866b1bc16ae5c4997d79256ee787b40c11a" integrity sha512-7HrpYwenDzPFUMRsIuStQRu7SzwVRq6NCy4k8CbZ4/VTFaWnpkncTAz+C8ztkEQQSYTW7mDLLenJ9qpkhXgoTA== @@ -1440,29 +1441,44 @@ update-notifier "^3.0.0" yargs "^13.1.0" -"@dhis2/cli-style@^7.3.0": - version "7.3.0" - resolved "https://registry.yarnpkg.com/@dhis2/cli-style/-/cli-style-7.3.0.tgz#7c314616f4d42604ba63350274ed93f2fbabdddd" - integrity sha512-wnwCQeYIgx+JrPKApXr5Lrj2gW4HV03whvl3C3odG7WUF1qvlu849lyo8JldxdoWPsR47cT1f/0Dw8Z+gZqHWQ== +"@dhis2/cli-helpers-engine@^3.0.0": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@dhis2/cli-helpers-engine/-/cli-helpers-engine-3.2.1.tgz#80d3f5b50ae223e5ed3f91550c81c30c3d7741a7" + integrity sha512-8VRM7KMuiGudogiKmpD7dfjp4Y9aSmmh1dGnTq57kdIQLw/o3CqGqz61BSw41SN/t9hxZvYAy8fBaujPAgL1sQ== dependencies: - "@commitlint/cli" "^11.0.0" - "@commitlint/config-conventional" "^11.0.0" - "@dhis2/cli-helpers-engine" "2.1.1" - babel-eslint "^10.1.0" + chalk "^3.0.0" cross-spawn "^7.0.3" - eslint "^7.12.1" - eslint-config-prettier "^6.15.0" + find-up "^5.0.0" + fs-extra "^8.0.1" + inquirer "^7.3.3" + request "^2.88.0" + tar "^4.4.8" + update-notifier "^3.0.0" + yargs "^13.1.0" + +"@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" "^12.1.4" + "@commitlint/config-conventional" "^13.1.0" + "@dhis2/cli-helpers-engine" "^3.0.0" + "@ls-lint/ls-lint" "^1.10.0" + babel-eslint "^10.1.0" + eslint "^7.32.0" + eslint-config-prettier "^8.3.0" eslint-plugin-import "^2.22.1" - eslint-plugin-prettier "^3.1.4" - eslint-plugin-react "^7.21.5" - fast-glob "^3.2.4" + eslint-plugin-react "^7.26.0" + fast-glob "^3.2.5" find-up "^5.0.0" - fs-extra "^9.0.1" - husky "^4.3.0" + fs-extra "^10.0.0" + husky "^7.0.2" + micromatch "^4.0.4" perfy "^1.1.5" - prettier "^2.1.2" - semver "^7.3.2" - yargs "^16.1.0" + prettier "^2.4.1" + semver "^7.3.5" + yargs "^16.2.0" "@dhis2/d2-i18n@^1.1.0": version "1.1.0" @@ -1567,6 +1583,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" @@ -1599,6 +1630,20 @@ dependencies: "@hapi/hoek" "^8.3.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" @@ -1934,6 +1979,11 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" +"@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== + "@nodelib/fs.scandir@2.1.4": version "2.1.4" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" @@ -2833,6 +2883,16 @@ ajv@^7.0.2: require-from-string "^2.0.2" uri-js "^4.2.2" +ajv@^8.0.1: + version "8.11.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" + integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -2892,6 +2952,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" @@ -3029,6 +3094,17 @@ array-includes@^3.1.1, array-includes@^3.1.2: 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" @@ -3070,6 +3146,16 @@ array.prototype.flatmap@^1.2.3: 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" @@ -3620,7 +3706,7 @@ braces@^2.3.1, braces@^2.3.2: split-string "^3.0.2" to-regex "^3.0.1" -braces@^3.0.1, braces@~3.0.2: +braces@^3.0.1, braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -3977,14 +4063,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, chalk@^4.0.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" @@ -3993,6 +4071,14 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chalk@^4.0.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" + change-emitter@^0.1.2: version "0.1.6" resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515" @@ -4305,11 +4391,6 @@ compare-func@^2.0.0: array-ify "^1.0.0" dot-prop "^5.1.0" -compare-versions@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" - integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA== - component-emitter@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" @@ -4416,10 +4497,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" @@ -4508,7 +4589,7 @@ core-js@^2.4.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== -core-js@^3.6.1, core-js@^3.6.5: +core-js@^3.6.5: version "3.9.0" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.9.0.tgz#790b1bb11553a2272b36e2625c7179db345492f8" integrity sha512-PyFBJaLq93FlyYdsndE5VaueA9K5cNB7CGzeCj191YYLhkQM0gdZR2SKihM70oF0wdqKSKClv/tEBOpoRmdOVQ== @@ -5034,6 +5115,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" @@ -5508,6 +5597,42 @@ es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2: string.prototype.trimend "^1.0.3" string.prototype.trimstart "^1.0.3" +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-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" @@ -5563,6 +5688,11 @@ escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +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@^1.14.1, escodegen@^1.9.1: version "1.14.3" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" @@ -5575,12 +5705,10 @@ escodegen@^1.14.1, escodegen@^1.9.1: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@^6.15.0: - version "6.15.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz#7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9" - integrity sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw== - dependencies: - get-stdin "^6.0.0" +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" @@ -5656,13 +5784,6 @@ eslint-plugin-jsx-a11y@^6.3.1: jsx-ast-utils "^3.1.0" language-tags "^1.0.5" -eslint-plugin-prettier@^3.1.4: - version "3.3.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7" - integrity sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ== - dependencies: - prettier-linter-helpers "^1.0.0" - eslint-plugin-react-hooks@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556" @@ -5685,6 +5806,26 @@ eslint-plugin-react@^7.21.5: resolve "^1.18.1" string.prototype.matchall "^4.0.2" +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" @@ -5736,7 +5877,7 @@ eslint-webpack-plugin@^2.5.2: micromatch "^4.0.2" schema-utils "^3.0.0" -eslint@^7.11.0, eslint@^7.12.1: +eslint@^7.11.0: version "7.20.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.20.0.tgz#db07c4ca4eda2e2316e7aa57ac7fc91ec550bdc7" integrity sha512-qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw== @@ -5779,6 +5920,52 @@ eslint@^7.11.0, eslint@^7.12.1: 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" @@ -5817,6 +6004,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" @@ -6046,17 +6238,12 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= -fast-deep-equal@^3.1.1: +fast-deep-equal@^3.1.1, 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-diff@^1.1.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" - integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== - -fast-glob@^3.1.1, fast-glob@^3.2.4: +fast-glob@^3.1.1: version "3.2.5" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== @@ -6068,6 +6255,17 @@ fast-glob@^3.1.1, fast-glob@^3.2.4: micromatch "^4.0.2" picomatch "^2.2.1" +fast-glob@^3.2.5: + version "3.2.11" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" + integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" @@ -6124,7 +6322,7 @@ figures@^3.0.0: dependencies: escape-string-regexp "^1.0.5" -file-entry-cache@^6.0.0: +file-entry-cache@^6.0.0, file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== @@ -6241,13 +6439,6 @@ find-up@^5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" -find-versions@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz#3c57e573bf97769b8cb8df16934b627915da4965" - integrity sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ== - dependencies: - semver-regex "^3.1.2" - flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" @@ -6357,6 +6548,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" @@ -6440,11 +6640,26 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +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" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= +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" @@ -6481,16 +6696,6 @@ 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: - version "8.0.0" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" - integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg== - -get-stdin@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b" - integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g== - get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" @@ -6510,6 +6715,14 @@ get-stream@^5.0.0, get-stream@^5.1.0: dependencies: pump "^3.0.0" +get-symbol-description@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" + integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -6557,6 +6770,13 @@ 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: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + glob-stream@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4" @@ -6620,6 +6840,13 @@ globals@^12.1.0: dependencies: type-fest "^0.8.1" +globals@^13.6.0, 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" @@ -6753,6 +6980,11 @@ harmony-reflect@^1.4.6: resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.1.tgz#c108d4f2bb451efef7a37861fdbdae72c9bdefa9" integrity sha512-WJTeyp0JzGtHcuMsi7rw2VwtkvLa+JyfEKJCFyfcS0+CDkjQ5lHPu7zEhFZP+PDSRrEgXa5Ah0l1MbgbE41XjA== +has-bigints@^1.0.1, 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" @@ -6763,11 +6995,30 @@ 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" integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== +has-symbols@^1.0.2, 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" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -7060,21 +7311,10 @@ human-signals@^1.1.1: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== -husky@^4.3.0: - version "4.3.8" - resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d" - integrity sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow== - dependencies: - chalk "^4.0.0" - ci-info "^2.0.0" - compare-versions "^3.6.0" - cosmiconfig "^7.0.0" - find-versions "^4.0.0" - opencollective-postinstall "^2.0.2" - pkg-dir "^5.0.0" - please-upgrade-node "^3.2.0" - slash "^3.0.0" - which-pm-runs "^1.0.0" +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== hyphenate-style-name@^1.0.2: version "1.0.4" @@ -7398,6 +7638,13 @@ is-arrayish@^0.3.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== +is-bigint@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" + is-binary-path@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" @@ -7412,6 +7659,14 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" +is-boolean-object@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -7422,6 +7677,11 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.2: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== +is-callable@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== + is-ci@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" @@ -7564,11 +7824,23 @@ 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" integrity sha512-wsigDr1Kkschp2opC4G3yA6r9EgVA6NjRpWzIi9axXqeIaAATPRJc4uLujXe3Nd9uO8KoDyA4MD6aZSeXTADhA== +is-number-object@^1.0.4: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" + integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== + dependencies: + has-tostringtag "^1.0.0" + is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -7642,6 +7914,14 @@ is-regex@^1.0.4, is-regex@^1.1.1: call-bind "^1.0.2" has-symbols "^1.0.1" +is-regex@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + is-regexp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" @@ -7664,6 +7944,13 @@ is-root@2.1.0: resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg== +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.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -7679,6 +7966,13 @@ is-string@^1.0.5: resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== +is-string@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" + is-svg@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75" @@ -7693,6 +7987,13 @@ is-symbol@^1.0.2: dependencies: has-symbols "^1.0.1" +is-symbol@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== + dependencies: + has-symbols "^1.0.2" + is-text-path@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e" @@ -7722,6 +8023,13 @@ 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.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== + dependencies: + call-bind "^1.0.2" + is-windows@^1.0.1, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -9113,7 +9421,7 @@ lodash.memoize@^4.1.2: resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= -lodash.merge@^4.6.0: +lodash.merge@^4.6.0, 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== @@ -9143,6 +9451,11 @@ lodash.throttle@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ= +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + lodash.union@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" @@ -9393,6 +9706,14 @@ micromatch@^4.0.2: braces "^3.0.1" picomatch "^2.0.5" +micromatch@^4.0.4: + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== + dependencies: + braces "^3.0.2" + picomatch "^2.3.1" + miller-rabin@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" @@ -9465,6 +9786,13 @@ minimatch@3.0.4, 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" @@ -9894,6 +10222,11 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" +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== + object-inspect@^1.8.0, object-inspect@^1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a" @@ -9939,6 +10272,15 @@ object.entries@^1.1.0, object.entries@^1.1.2: 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.2: version "2.0.4" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz#26e1ba5c4571c5c6f0890cef4473066456a120b8" @@ -9949,6 +10291,15 @@ object.fromentries@^2.0.2: 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, object.getownpropertydescriptors@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz#1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7" @@ -9958,6 +10309,14 @@ object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0 define-properties "^1.1.3" es-abstract "^1.18.0-next.2" +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" @@ -9975,6 +10334,15 @@ object.values@^1.1.0, object.values@^1.1.1: 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" + obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" @@ -10014,11 +10382,6 @@ open@^7.0.2, open@^7.3.1: is-docker "^2.0.0" is-wsl "^2.1.1" -opencollective-postinstall@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259" - integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q== - opn@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" @@ -10397,6 +10760,11 @@ picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== +picomatch@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + picomodal@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/picomodal/-/picomodal-3.0.0.tgz#facd30f4fbf34a809c1e04ea525f004f399c0b82" @@ -10457,13 +10825,6 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -pkg-dir@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760" - integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA== - dependencies: - find-up "^5.0.0" - pkg-up@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" @@ -10471,13 +10832,6 @@ pkg-up@3.1.0: dependencies: find-up "^3.0.0" -please-upgrade-node@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" - integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== - dependencies: - semver-compare "^1.0.0" - pn@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" @@ -11195,17 +11549,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-linter-helpers@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" - integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== - dependencies: - fast-diff "^1.1.2" - -prettier@^2.1.2: - version "2.2.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" - integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== +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: version "5.6.0" @@ -11291,6 +11638,15 @@ prop-types@^15, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop 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" @@ -11864,6 +12220,15 @@ regexp.prototype.flags@^1.2.0, 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, regexpp@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" @@ -12112,6 +12477,14 @@ resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.1 is-core-module "^2.2.0" path-parse "^1.0.6" +resolve@^2.0.0-next.3: + version "2.0.0-next.3" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46" + integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -12372,11 +12745,6 @@ selfsigned@^1.10.8: dependencies: node-forge "^0.10.0" -semver-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= - semver-diff@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36" @@ -12384,11 +12752,6 @@ semver-diff@^2.0.0: dependencies: semver "^5.0.3" -semver-regex@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.2.tgz#34b4c0d361eef262e07199dbef316d0f2ab11807" - integrity sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA== - "semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -12404,6 +12767,13 @@ 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: + 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" @@ -12416,6 +12786,13 @@ semver@^7.2.1, semver@^7.3.2: dependencies: lru-cache "^6.0.0" +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" + send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -12961,6 +13338,15 @@ string-width@^4.1.0, string-width@^4.2.0: 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.2: version "4.0.4" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz#608f255e93e072107f5de066f81a2dfb78cf6b29" @@ -12974,6 +13360,20 @@ string.prototype.matchall@^4.0.2: 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.trimend@^1.0.1, string.prototype.trimend@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" @@ -12982,6 +13382,15 @@ string.prototype.trimend@^1.0.1, string.prototype.trimend@^1.0.3: 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.trimstart@^1.0.1, string.prototype.trimstart@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" @@ -12990,6 +13399,15 @@ string.prototype.trimstart@^1.0.1, string.prototype.trimstart@^1.0.3: 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" @@ -13041,6 +13459,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" @@ -13215,6 +13640,17 @@ table@^6.0.4: slice-ansi "^4.0.0" string-width "^4.2.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" @@ -13636,6 +14072,11 @@ type-fest@^0.18.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw== +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + type-fest@^0.3.0, type-fest@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1" @@ -13701,6 +14142,16 @@ uglify-js@^3.1.4: resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.8.tgz#a82e6e53c9be14f7382de3d068ef1e26e7d4aaf8" integrity sha512-fvBeuXOsvqjecUtF/l1dwsrrf5y2BCUk9AOJGzGcm6tE7vegku5u/YvqjyDaAGr422PLoLnrxg3EnRvTqsdC1w== +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" @@ -14290,16 +14741,22 @@ whatwg-url@^8.0.0: tr46 "^2.0.2" webidl-conversions "^6.1.0" +which-boxed-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== + dependencies: + is-bigint "^1.0.1" + is-boolean-object "^1.1.0" + is-number-object "^1.0.4" + is-string "^1.0.5" + is-symbol "^1.0.3" + which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which-pm-runs@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" - integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= - which@^1.2.9, which@^1.3.0, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -14664,7 +15121,7 @@ yargs@^13.1.0, yargs@^13.3.0, yargs@^13.3.2: y18n "^4.0.0" yargs-parser "^13.1.2" -yargs@^15.1.0, yargs@^15.4.1: +yargs@^15.4.1: version "15.4.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== @@ -14681,7 +15138,7 @@ yargs@^15.1.0, yargs@^15.4.1: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^16.1.0, yargs@^16.2.0: +yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== From 30fbd20d472acb9f425921cc8e0dd18f78a0f13d Mon Sep 17 00:00:00 2001 From: ismay <7355199+ismay@users.noreply.github.com> Date: Thu, 12 May 2022 15:29:35 +0200 Subject: [PATCH 2/5] style: fix prettier errors --- .huskyrc.js | 2 +- src/actions/index.js | 42 +++++++++---------- .../dialog/ConfirmDeleteKeyDialog.js | 4 +- .../dialog/ConfirmDeleteNamespaceDialog.js | 4 +- .../dialog/ConfirmNavigationDialog.js | 6 +-- src/components/dialog/DialogRoot.js | 5 ++- src/components/dialog/DialogRouter.js | 4 +- src/components/dialog/ErrorDialog.js | 2 +- src/components/dialog/NewKeyDialog.js | 4 +- src/components/dialog/NewNamespaceDialog.js | 6 +-- src/components/display/edit/EditArea.js | 2 +- src/components/display/edit/EditDisplay.js | 4 +- src/components/display/edit/EditToolbar.js | 8 ++-- src/components/hoc/DisplayAreaHOC.js | 4 +- src/components/hoc/SidebarAreaHOC.js | 2 +- src/components/sidebar/KeyItem.js | 3 +- src/components/sidebar/KeyItemMenu.js | 2 +- src/components/sidebar/NamespaceItem.js | 6 +-- src/components/sidebar/NamespaceItemMenu.js | 2 +- src/components/sidebar/NamespaceList.js | 8 ++-- src/components/sidebar/Searchbar.js | 8 ++-- src/components/sidebar/Sidebar.js | 4 +- src/components/utils/JSONEditor.js | 8 ++-- src/components/utils/JSONSearchBar.js | 2 +- src/components/utils/Snackbar.js | 4 +- src/reducers/sidebarReducer.js | 8 ++-- src/utils/api.js | 4 +- src/utils/utils.js | 10 +++-- src/utils/validation.js | 6 ++- 29 files changed, 90 insertions(+), 84 deletions(-) diff --git a/.huskyrc.js b/.huskyrc.js index 1406b09..07192bf 100644 --- a/.huskyrc.js +++ b/.huskyrc.js @@ -1,7 +1,7 @@ const { config } = require('@dhis2/cli-style') const husky = require(config.husky) -const tasks = arr => arr.join(' && ') +const tasks = (arr) => arr.join(' && ') module.exports = { hooks: { diff --git a/src/actions/index.js b/src/actions/index.js index 7220070..ab99c78 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -374,15 +374,15 @@ export function emptySnackbar() { * @return {object} Action thunk */ export function fetchAndToggleNamespace(namespace, openNamespace = false) { - return dispatch => { + return (dispatch) => { dispatch(requestKeys(namespace)) return api .getKeys(namespace) - .then(keys => { + .then((keys) => { dispatch(receiveKeys(namespace, keys)) }) .then(() => dispatch(toggleNamespace(namespace, openNamespace))) - .catch(error => { + .catch((error) => { if (error.httpStatusCode === 404) { // If not found, we remove the namespace from UI return dispatch(receiveDeleteNamespace(namespace)) @@ -392,7 +392,7 @@ export function fetchAndToggleNamespace(namespace, openNamespace = false) { } return null }) - .catch(error => { + .catch((error) => { dispatch(rejectKeys(namespace, error)) }) } @@ -408,15 +408,15 @@ export function fetchAndToggleNamespace(namespace, openNamespace = false) { * @return {object} Action thunk */ export function fetchAndDisplayKeyValue(namespace, key) { - return dispatch => { + return (dispatch) => { dispatch(requestValue(namespace, key)) return api .getValue(namespace, key) - .then(value => { + .then((value) => { dispatch(receiveValue(namespace, key, value)) dispatch(selectKey(namespace, key, value.value)) }) - .catch(error => dispatch(rejectValue(namespace, key, error))) + .catch((error) => dispatch(rejectValue(namespace, key, error))) } } @@ -426,14 +426,14 @@ export function fetchAndDisplayKeyValue(namespace, key) { * @returns action thunk */ export function fetchNamespaces() { - return dispatch => { + return (dispatch) => { dispatch(requestNamespaces()) return api .getNamespaces() - .then(namespaces => { + .then((namespaces) => { dispatch(receiveNamespaces(namespaces)) }) - .catch(error => dispatch(rejectNamespaces(error))) + .catch((error) => dispatch(rejectNamespaces(error))) } } @@ -450,7 +450,7 @@ export function fetchNamespaces() { * @return {string} Action thunk */ export function createValue(namespace, key, value) { - return dispatch => { + return (dispatch) => { dispatch(requestCreateValue(namespace, key, value)) return api .createValue(namespace, key, value) @@ -469,11 +469,11 @@ export function createValue(namespace, key, value) { * @return {object} Action thunk */ export function createAndDisplayValue(namespace, key) { - return dispatch => { + return (dispatch) => { dispatch(createValue(namespace, key, {})) .then(() => hashHistory.push(`/edit/${namespace}/${key}`)) .then(() => dispatch(fetchAndToggleNamespace(namespace, true))) - .catch(error => + .catch((error) => dispatch({ type: actions.CREATE_VALUE_REJECTED, namespace, @@ -492,9 +492,9 @@ export function createAndDisplayValue(namespace, key) { * @return {object} Action thunk */ export function fetchKeys(namespace) { - return dispatch => { + return (dispatch) => { dispatch(requestKeys(namespace)) - return api.getKeys(namespace).then(keys => { + return api.getKeys(namespace).then((keys) => { if (keys.length < 1) { return Promise.reject({ status: 404 }) } @@ -512,7 +512,7 @@ export function fetchKeys(namespace) { * @return {object} Action thunk */ export function updateValue(namespace, key, value) { - return dispatch => { + return (dispatch) => { dispatch(requestUpdateValue(namespace, key, value)) return api .updateValue(namespace, key, value) @@ -536,7 +536,7 @@ export function deleteKey(namespace, key) { return api .deleteValue(namespace, key) .then(() => dispatch(receiveDeleteKey(namespace, key))) - .then(res => { + .then((res) => { if (getState().display.key == key) { dispatch(navigationAction.setIgnoreNextNavigationConfirm()) hashHistory.push('/') @@ -544,7 +544,7 @@ export function deleteKey(namespace, key) { return res }) .then(() => dispatch(fetchKeys(namespace))) - .catch(error => { + .catch((error) => { if (error.httpStatusCode === 404) { // If not found, we remove the namespace from UI dispatch(receiveDeleteNamespace(namespace)) @@ -556,7 +556,7 @@ export function deleteKey(namespace, key) { dispatch(toggleNamespace(namespace, true)) } }) - .catch(error => { + .catch((error) => { dispatch(rejectDeleteKey(namespace, key, error)) }) } @@ -574,7 +574,7 @@ export function deleteNamespace(namespace) { dispatch(requestDeleteNamespace(namespace)) return api .deleteNamespace(namespace) - .then(success => { + .then((success) => { dispatch(receiveDeleteNamespace(namespace)) if (getState().display.namespace === namespace) { dispatch(navigationAction.setIgnoreNextNavigationConfirm()) @@ -582,7 +582,7 @@ export function deleteNamespace(namespace) { } return success }) - .catch(err => { + .catch((err) => { console.log(err) dispatch(rejectDeleteNamespace(namespace)) }) diff --git a/src/components/dialog/ConfirmDeleteKeyDialog.js b/src/components/dialog/ConfirmDeleteKeyDialog.js index 1d1bc70..24188fa 100644 --- a/src/components/dialog/ConfirmDeleteKeyDialog.js +++ b/src/components/dialog/ConfirmDeleteKeyDialog.js @@ -45,13 +45,13 @@ ConfirmDeleteKeyDialog.propTypes = { namespaceStore: PropTypes.any, } -const mapStateToProps = state => ({ +const mapStateToProps = (state) => ({ namespace: state.dialog.namespace, keyValue: state.dialog.key, namespaceStore: state.sidebar.namespaces, }) -const mapDispatchToProps = dispatch => ({ +const mapDispatchToProps = (dispatch) => ({ deleteKeyInNamespace(namespace, key) { dispatch(deleteKey(namespace, key)) }, diff --git a/src/components/dialog/ConfirmDeleteNamespaceDialog.js b/src/components/dialog/ConfirmDeleteNamespaceDialog.js index c3445de..074852a 100644 --- a/src/components/dialog/ConfirmDeleteNamespaceDialog.js +++ b/src/components/dialog/ConfirmDeleteNamespaceDialog.js @@ -33,11 +33,11 @@ ConfirmDeleteNamespaceDialog.propTypes = { deleteNamespace: PropTypes.func, } -const mapStateToProps = state => ({ +const mapStateToProps = (state) => ({ namespace: state.dialog.namespace, }) -const mapDispatchToProps = dispatch => ({ +const mapDispatchToProps = (dispatch) => ({ deleteNamespace(namespace) { dispatch(deleteNamespace(namespace)) }, diff --git a/src/components/dialog/ConfirmNavigationDialog.js b/src/components/dialog/ConfirmNavigationDialog.js index 7f32e01..fde3f0c 100644 --- a/src/components/dialog/ConfirmNavigationDialog.js +++ b/src/components/dialog/ConfirmNavigationDialog.js @@ -55,7 +55,7 @@ export class ConfirmNavigationDialog extends Component { } } - routerWillLeave = nextLocation => { + routerWillLeave = (nextLocation) => { if (this.state.confirmed) { this.setState({ ...this.state, @@ -109,11 +109,11 @@ ConfirmNavigationDialog.propTypes = { setIgnoreNext: PropTypes.any, } -const mapStateToProps = state => ({ +const mapStateToProps = (state) => ({ ignoreNext: state.navigation.ignoreNextConfirm, }) -const mapDispatchToProps = dispatch => ({ +const mapDispatchToProps = (dispatch) => ({ setIgnoreNext(ignoreNext) { dispatch(navigationActions.setIgnoreNextNavigationConfirm(ignoreNext)) }, diff --git a/src/components/dialog/DialogRoot.js b/src/components/dialog/DialogRoot.js index c242828..e422de2 100644 --- a/src/components/dialog/DialogRoot.js +++ b/src/components/dialog/DialogRoot.js @@ -36,7 +36,7 @@ class DialogRoot extends Component { cancelLabel || 'Cancel' ) ) - if (approveAction) + if (approveAction) { actions.push( DialogRoot.buildButton( finalAction, @@ -44,6 +44,7 @@ class DialogRoot extends Component { true ) ) + } return ( ({ +const mapDispatchToProps = (dispatch) => ({ defaultCloseDialog() { dispatch(closeDialog()) }, diff --git a/src/components/dialog/DialogRouter.js b/src/components/dialog/DialogRouter.js index 9f52bc2..394c40c 100644 --- a/src/components/dialog/DialogRouter.js +++ b/src/components/dialog/DialogRouter.js @@ -3,7 +3,7 @@ import React, { Component } from 'react' import { connect } from 'react-redux' class DialogRouter extends Component { - matchDialog = dialogRoute => + matchDialog = (dialogRoute) => dialogRoute.props.name === this.props.dialogType render() { @@ -23,7 +23,7 @@ DialogRouter.propTypes = { dialogType: PropTypes.string, } -const mapStateToProps = state => ({ +const mapStateToProps = (state) => ({ dialogType: state.dialog.dialogType, }) diff --git a/src/components/dialog/ErrorDialog.js b/src/components/dialog/ErrorDialog.js index 5349cdd..4012158 100644 --- a/src/components/dialog/ErrorDialog.js +++ b/src/components/dialog/ErrorDialog.js @@ -21,7 +21,7 @@ ErrorDialog.propTypes = { message: PropTypes.string, } -const mapStateToProps = state => ({ +const mapStateToProps = (state) => ({ message: state.dialog.message, }) diff --git a/src/components/dialog/NewKeyDialog.js b/src/components/dialog/NewKeyDialog.js index 8ac3def..74e4acf 100644 --- a/src/components/dialog/NewKeyDialog.js +++ b/src/components/dialog/NewKeyDialog.js @@ -83,11 +83,11 @@ NamespaceDialog.propTypes = { createNamespace: PropTypes.func, } -const mapStateToProps = state => ({ +const mapStateToProps = (state) => ({ namespace: state.dialog.namespace, }) -const mapDispatchToProps = dispatch => ({ +const mapDispatchToProps = (dispatch) => ({ createNamespace(namespace, key) { dispatch(createAndDisplayValue(namespace, key)) }, diff --git a/src/components/dialog/NewNamespaceDialog.js b/src/components/dialog/NewNamespaceDialog.js index 8eb4347..406bb94 100644 --- a/src/components/dialog/NewNamespaceDialog.js +++ b/src/components/dialog/NewNamespaceDialog.js @@ -18,7 +18,7 @@ export class NewNamespaceDialog extends Component { } } - handleNamespaceInput = event => { + handleNamespaceInput = (event) => { const val = event.target.value this.setState({ namespaceError: validateKeyOrNamespace(val).message, @@ -26,7 +26,7 @@ export class NewNamespaceDialog extends Component { }) } - handleKeyInput = event => { + handleKeyInput = (event) => { const val = event.target.value this.setState({ keyError: validateKeyOrNamespace(val).message, @@ -94,7 +94,7 @@ NewNamespaceDialog.propTypes = { createNamespace: PropTypes.func, } -const mapDispatchToProps = dispatch => ({ +const mapDispatchToProps = (dispatch) => ({ createNamespace(namespace, key) { dispatch(createAndDisplayValue(namespace, key)) }, diff --git a/src/components/display/edit/EditArea.js b/src/components/display/edit/EditArea.js index 717e2c9..cbb2cd8 100644 --- a/src/components/display/edit/EditArea.js +++ b/src/components/display/edit/EditArea.js @@ -5,7 +5,7 @@ import JSONEditor from '../../utils/JSONEditor' import styles from '../Display.module.css' export class EditArea extends Component { - handleDataChange = editor => { + handleDataChange = (editor) => { try { // throws error if not valid json const data = editor.get() diff --git a/src/components/display/edit/EditDisplay.js b/src/components/display/edit/EditDisplay.js index cf4e64e..f96941e 100644 --- a/src/components/display/edit/EditDisplay.js +++ b/src/components/display/edit/EditDisplay.js @@ -144,7 +144,7 @@ EditDisplay.propTypes = { }), } -const mapStateToProps = state => ({ +const mapStateToProps = (state) => ({ value: state.display.value, selectedKey: state.display.key, namespace: state.display.namespace, @@ -152,7 +152,7 @@ const mapStateToProps = state => ({ fetchedNamespaces: state.sidebar.fetched, }) -const mapDispatchToProps = dispatch => ({ +const mapDispatchToProps = (dispatch) => ({ getValue(namespace, key) { dispatch(fetchAndDisplayKeyValue(namespace, key)) }, diff --git a/src/components/display/edit/EditToolbar.js b/src/components/display/edit/EditToolbar.js index cea6834..6448e03 100644 --- a/src/components/display/edit/EditToolbar.js +++ b/src/components/display/edit/EditToolbar.js @@ -62,12 +62,12 @@ export class EditToolbar extends React.Component { this.props.jsonChangeMode(mode) } - handleJsonSearch = value => { + handleJsonSearch = (value) => { //debounce search if (this.state.debounced) { this.state.debounced(value) } else { - const debounced = debounce(val => { + const debounced = debounce((val) => { this.props.jsonSearchAction(val) }, 250) this.setState({ ...this.state, debounced }) @@ -212,13 +212,13 @@ EditToolbar.propTypes = { jsonChangeMode: PropTypes.func, } -const mapStateToProps = state => ({ +const mapStateToProps = (state) => ({ mode: state.jsonEditor.mode, jsonEditor: state.jsonEditor, saving: state.jsonEditor.saving, }) -const mapDispatchToProps = dispatch => ({ +const mapDispatchToProps = (dispatch) => ({ jsonSearchAction(value) { dispatch(searchJSON(value)) }, diff --git a/src/components/hoc/DisplayAreaHOC.js b/src/components/hoc/DisplayAreaHOC.js index cb39cac..36f0308 100644 --- a/src/components/hoc/DisplayAreaHOC.js +++ b/src/components/hoc/DisplayAreaHOC.js @@ -4,7 +4,7 @@ import { connect } from 'react-redux' import ErrorArea from '../display/ErrorArea' import LoadingArea from '../display/LoadingArea' -const DisplayAreaHOC = Area => { +const DisplayAreaHOC = (Area) => { class DisplayAreaBase extends Component { renderLoading = () => { return @@ -35,7 +35,7 @@ const DisplayAreaHOC = Area => { loading: PropTypes.bool, } - const mapStateToProps = state => ({ + const mapStateToProps = (state) => ({ loading: state.display.fetching, error: state.display.error, errorMessage: state.display.errorMessage, diff --git a/src/components/hoc/SidebarAreaHOC.js b/src/components/hoc/SidebarAreaHOC.js index 3576e76..009deef 100644 --- a/src/components/hoc/SidebarAreaHOC.js +++ b/src/components/hoc/SidebarAreaHOC.js @@ -54,7 +54,7 @@ const SidebarAreaHOC = (Area, errorRefresh) => { loading: PropTypes.bool, } - const mapStateToProps = state => ({ + const mapStateToProps = (state) => ({ loading: state.sidebar.fetching, error: state.sidebar.error, }) diff --git a/src/components/sidebar/KeyItem.js b/src/components/sidebar/KeyItem.js index 4c1c44b..36338e9 100644 --- a/src/components/sidebar/KeyItem.js +++ b/src/components/sidebar/KeyItem.js @@ -2,8 +2,7 @@ import { PropTypes } from '@dhis2/prop-types' import { ListItem } from 'material-ui/List' import EditorInsertDriveFile from 'material-ui/svg-icons/editor/insert-drive-file' import React, { Component } from 'react' -import { hashHistory } from 'react-router' -import { withRouter } from 'react-router' +import { hashHistory, withRouter } from 'react-router' import KeyItemMenu from './KeyItemMenu' const styles = { diff --git a/src/components/sidebar/KeyItemMenu.js b/src/components/sidebar/KeyItemMenu.js index 33b5806..ea1470c 100644 --- a/src/components/sidebar/KeyItemMenu.js +++ b/src/components/sidebar/KeyItemMenu.js @@ -56,7 +56,7 @@ KeyItemMenu.propTypes = { namespace: PropTypes.string, } -const mapDispatchToProps = dispatch => ({ +const mapDispatchToProps = (dispatch) => ({ deleteKeyInNamespace(namespace, key) { dispatch(openDialog(dialog.CONFIRM_DELETE_KEY, { namespace, key })) }, diff --git a/src/components/sidebar/NamespaceItem.js b/src/components/sidebar/NamespaceItem.js index fb286d4..1ea974c 100644 --- a/src/components/sidebar/NamespaceItem.js +++ b/src/components/sidebar/NamespaceItem.js @@ -44,8 +44,8 @@ export class NamespaceItem extends Component { // Get a list of elements, filter on search-prop const list = Object.keys(this.props.namespace.keys) - .filter(key => !search || key.toLowerCase().includes(search)) - .map(key => ) + .filter((key) => !search || key.toLowerCase().includes(search)) + .map((key) => ) let leftIcon = if (!fetching) { @@ -78,7 +78,7 @@ NamespaceItem.propTypes = { }), } -const mapDispatchToProps = dispatch => ({ +const mapDispatchToProps = (dispatch) => ({ openNamespace(namespace) { dispatch(fetchAndToggleNamespace(namespace)) }, diff --git a/src/components/sidebar/NamespaceItemMenu.js b/src/components/sidebar/NamespaceItemMenu.js index 9bb5323..1a43262 100644 --- a/src/components/sidebar/NamespaceItemMenu.js +++ b/src/components/sidebar/NamespaceItemMenu.js @@ -64,7 +64,7 @@ NamespaceItemMenu.propTypes = { newKey: PropTypes.func, } -const mapDispatchToProps = dispatch => ({ +const mapDispatchToProps = (dispatch) => ({ deleteNamespace(namespace) { dispatch(openDialog(dialog.CONFIRM_DELETE_NAMESPACE, { namespace })) }, diff --git a/src/components/sidebar/NamespaceList.js b/src/components/sidebar/NamespaceList.js index 2172ee0..e393969 100644 --- a/src/components/sidebar/NamespaceList.js +++ b/src/components/sidebar/NamespaceList.js @@ -15,7 +15,7 @@ const listStyle = { } export class NamespaceList extends Component { - filterNamespaces = item => { + filterNamespaces = (item) => { const searchValue = this.props.search.toLowerCase() || '' if (!searchValue) { return true @@ -51,9 +51,9 @@ export class NamespaceList extends Component { return ( {Object.keys(items) - .filter(item => this.filterNamespaces(item)) + .filter((item) => this.filterNamespaces(item)) .sort() - .map(item => ( + .map((item) => ( ({ +const mapStateToProps = (state) => ({ search: state.sidebar.searchValue, }) diff --git a/src/components/sidebar/Searchbar.js b/src/components/sidebar/Searchbar.js index e20bcd7..6fea274 100644 --- a/src/components/sidebar/Searchbar.js +++ b/src/components/sidebar/Searchbar.js @@ -5,7 +5,7 @@ import { connect } from 'react-redux' import { searchSidebarChange } from '../../actions/sidebarActions' export class Searchbar extends Component { - handleKeys = event => { + handleKeys = (event) => { if (event.key === 'Enter') { this.searchField.blur() } @@ -25,7 +25,7 @@ export class Searchbar extends Component { onChange={({ target: { value } }) => searchChanged(value)} onFocus={() => searchChanged('')} onKeyUp={this.handleKeys} - ref={searchField => { + ref={(searchField) => { this.searchField = searchField }} /> @@ -33,13 +33,13 @@ export class Searchbar extends Component { } } -const mapDispatchToProps = dispatch => ({ +const mapDispatchToProps = (dispatch) => ({ searchChanged(value) { dispatch(searchSidebarChange(value)) }, }) -const mapStateToProps = state => ({ +const mapStateToProps = (state) => ({ searchValue: state.sidebar.searchValue, }) diff --git a/src/components/sidebar/Sidebar.js b/src/components/sidebar/Sidebar.js index 554d5fc..756d203 100644 --- a/src/components/sidebar/Sidebar.js +++ b/src/components/sidebar/Sidebar.js @@ -56,11 +56,11 @@ Sidebar.propTypes = { openNamespaceDialog: PropTypes.func, } -const mapStateToProps = state => ({ +const mapStateToProps = (state) => ({ items: state.sidebar.namespaces, }) -const mapDispatchToProps = dispatch => ({ +const mapDispatchToProps = (dispatch) => ({ openNamespaceDialog() { dispatch(openDialog(dialog.NEW_NAMESPACE)) }, diff --git a/src/components/utils/JSONEditor.js b/src/components/utils/JSONEditor.js index ffe514a..ca28afd 100644 --- a/src/components/utils/JSONEditor.js +++ b/src/components/utils/JSONEditor.js @@ -86,7 +86,7 @@ export class JSONEditor extends Component { } } - handleJsonEditor = props => { + handleJsonEditor = (props) => { const { jsonSearchValue, collapse, @@ -165,7 +165,7 @@ export class JSONEditor extends Component {
(this.editorContainer = container)} + ref={(container) => (this.editorContainer = container)} >
) } @@ -177,11 +177,11 @@ JSONEditor.propTypes = { value: PropTypes.any, } -const mapStateToProps = state => ({ +const mapStateToProps = (state) => ({ jsonEditor: state.jsonEditor, }) -const mapDispatchToProps = dispatch => ({ +const mapDispatchToProps = (dispatch) => ({ jsonChangeMode(mode) { dispatch(jsonEditorChangeMode(mode)) }, diff --git a/src/components/utils/JSONSearchBar.js b/src/components/utils/JSONSearchBar.js index 528177b..edc593d 100644 --- a/src/components/utils/JSONSearchBar.js +++ b/src/components/utils/JSONSearchBar.js @@ -40,7 +40,7 @@ export class JSONSearchBar extends React.Component { style={this.props.style} onKeyUp={this.handleKeys} underlineStyle={{ maxWidth: '150px' }} - ref={searchField => { + ref={(searchField) => { this.searchField = searchField }} {...fieldProps} diff --git a/src/components/utils/Snackbar.js b/src/components/utils/Snackbar.js index e62b1e2..3443674 100644 --- a/src/components/utils/Snackbar.js +++ b/src/components/utils/Snackbar.js @@ -22,11 +22,11 @@ Snackbar.propTypes = { message: PropTypes.string, } -const mapStateToProps = state => ({ +const mapStateToProps = (state) => ({ message: state.snackbar.message, }) -const mapDispatchToProps = dispatch => ({ +const mapDispatchToProps = (dispatch) => ({ emptySnackbar() { dispatch(emptySnackbar()) }, diff --git a/src/reducers/sidebarReducer.js b/src/reducers/sidebarReducer.js index 698ec97..03402e9 100644 --- a/src/reducers/sidebarReducer.js +++ b/src/reducers/sidebarReducer.js @@ -15,8 +15,8 @@ const initialState = { const updateNamespaces = (currentNamespaces, newNamespaces) => { const namespaces = {} currentNamespaces - .filter(key => typeof newNamespaces[key] === 'undefined') - .forEach(key => { + .filter((key) => typeof newNamespaces[key] === 'undefined') + .forEach((key) => { namespaces[key] = { name: key, open: false, @@ -26,9 +26,9 @@ const updateNamespaces = (currentNamespaces, newNamespaces) => { return namespaces } -const createKeysFromArray = arrayOfKeys => { +const createKeysFromArray = (arrayOfKeys) => { const keys = {} - arrayOfKeys.forEach(key => { + arrayOfKeys.forEach((key) => { keys[key] = { key, } diff --git a/src/utils/api.js b/src/utils/api.js index ba58890..dbc3b80 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -45,14 +45,14 @@ class Api { return d2.dataStore.getAll() } - deleteNamespace = async namespace => { + deleteNamespace = async (namespace) => { const d2 = await getInstance() const response = await d2.dataStore.delete(namespace) this.cache.clearNamespace(namespace) return response } - getKeys = async namespace => { + getKeys = async (namespace) => { const d2 = await getInstance() const resName = await d2.dataStore.get(namespace) return resName.getKeys() diff --git a/src/utils/utils.js b/src/utils/utils.js index cd028b9..878d9d8 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -5,16 +5,20 @@ export function debounce(func, wait, immediate) { args = arguments var later = function () { timeout = null - if (!immediate) func.apply(context, args) + if (!immediate) { + func.apply(context, args) + } } var callNow = immediate && !timeout clearTimeout(timeout) timeout = setTimeout(later, wait) - if (callNow) func.apply(context, args) + if (callNow) { + func.apply(context, args) + } } } -export const sortObjectKeys = obj => { +export const sortObjectKeys = (obj) => { if (!obj || typeof obj !== 'object') { return obj } diff --git a/src/utils/validation.js b/src/utils/validation.js index dca7b44..c2e62c0 100644 --- a/src/utils/validation.js +++ b/src/utils/validation.js @@ -10,10 +10,12 @@ export function validateKeyOrNamespace(value) { message: '', } - if (!value) return invalid + if (!value) { + return invalid + } let matchedChar = '' - invalidSymbols.forEach(symb => { + invalidSymbols.forEach((symb) => { if (value.includes(symb)) { matchedChar = symb } From a007d5eb063fc89597f196d613f5ba9a4b50d8bc Mon Sep 17 00:00:00 2001 From: ismay <7355199+ismay@users.noreply.github.com> Date: Thu, 19 May 2022 12:08:13 +0200 Subject: [PATCH 3/5] ci: fix lint script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 997e41a..a125c7b 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "build": "d2-app-scripts build", "start": "d2-app-scripts start", "test": "d2-app-scripts test", - "lint:js": "d2-style js check", + "lint:js": "d2-style check js", "lint:text": "d2-style text check", "lint:staged": "yarn lint:js --staged && yarn lint:text --staged", "lint": "yarn lint:js && yarn lint:text", From 8af8fef8708bcebb6aa1365ec3e1a149618fd2f3 Mon Sep 17 00:00:00 2001 From: ismay <7355199+ismay@users.noreply.github.com> Date: Thu, 19 May 2022 13:19:54 +0200 Subject: [PATCH 4/5] ci: fix d2-style script --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a125c7b..1668359 100644 --- a/package.json +++ b/package.json @@ -9,11 +9,11 @@ "start": "d2-app-scripts start", "test": "d2-app-scripts test", "lint:js": "d2-style check js", - "lint:text": "d2-style text check", + "lint:text": "d2-style check text", "lint:staged": "yarn lint:js --staged && yarn lint:text --staged", "lint": "yarn lint:js && yarn lint:text", - "format:js": "d2-style js apply", - "format:text": "d2-style text apply", + "format:js": "d2-style apply js", + "format:text": "d2-style apply text", "format:staged": "yarn format:js --staged && yarn format:text --staged", "format": "yarn format:js && yarn format:text" }, From 6e079f5a4a4f92ae29de945c387e37ea42de80e3 Mon Sep 17 00:00:00 2001 From: ismay <7355199+ismay@users.noreply.github.com> Date: Mon, 23 May 2022 14:55:31 +0200 Subject: [PATCH 5/5] style: fix eslint errors --- src/App.js | 6 ++--- src/actions/dialogActions.js | 2 +- src/actions/index.js | 6 ++--- src/actions/jsonEditorActions.js | 2 +- src/actions/navigationActions.js | 2 +- src/actions/sidebarActions.js | 2 +- src/components/app/AppContainer.js | 10 ++++---- src/components/app/Layout.js | 20 ++++++++-------- .../dialog/ConfirmDeleteKeyDialog.js | 4 ++-- .../dialog/ConfirmDeleteNamespaceDialog.js | 4 ++-- .../dialog/ConfirmNavigationDialog.js | 4 ++-- src/components/dialog/DialogRoot.js | 2 +- src/components/dialog/ErrorDialog.js | 2 +- src/components/dialog/NewKeyDialog.js | 6 ++--- src/components/dialog/NewNamespaceDialog.js | 6 ++--- src/components/display/DisplayToolbarTitle.js | 6 ++--- src/components/display/ErrorArea.js | 2 +- src/components/display/LoadingArea.js | 2 +- src/components/display/edit/EditArea.js | 4 ++-- src/components/display/edit/EditDisplay.js | 8 +++---- src/components/display/edit/EditToolbar.js | 24 +++++++++---------- src/components/display/empty/EmptyArea.js | 4 ++-- src/components/display/empty/EmptyDisplay.js | 4 ++-- src/components/hoc/DisplayAreaHOC.js | 4 ++-- src/components/hoc/SidebarAreaHOC.js | 4 ++-- src/components/sidebar/KeyItem.js | 4 ++-- src/components/sidebar/KeyItemMenu.js | 8 +++---- src/components/sidebar/NamespaceItem.js | 17 +++++++------ src/components/sidebar/NamespaceItemMenu.js | 10 ++++---- src/components/sidebar/NamespaceList.js | 4 ++-- src/components/sidebar/Searchbar.js | 2 +- src/components/sidebar/Sidebar.js | 12 +++++----- src/components/sidebar/SidebarHeader.js | 2 +- src/components/utils/IconButtonElement.js | 4 ++-- src/components/utils/Icons.js | 4 ++-- src/components/utils/JSONEditor.js | 8 +++---- src/components/utils/Snackbar.js | 2 +- src/reducers/dialogReducer.js | 2 +- src/reducers/displayReducer.js | 4 ++-- src/reducers/index.js | 12 +++++----- src/reducers/jsonEditorReducer.js | 4 ++-- src/reducers/navigationReducer.js | 2 +- src/reducers/sidebarReducer.js | 2 +- src/reducers/snackbarReducer.js | 2 +- src/store/index.js | 2 +- src/utils/cache.test.js | 2 +- src/utils/theme.js | 6 ++--- 47 files changed, 129 insertions(+), 126 deletions(-) diff --git a/src/App.js b/src/App.js index 40c5f44..2ebadbd 100644 --- a/src/App.js +++ b/src/App.js @@ -1,8 +1,8 @@ import { useD2 } from '@dhis2/app-runtime-adapter-d2' import React from 'react' -import AppContainer from './components/app/AppContainer' -import store from './store' -import './locales' +import AppContainer from './components/app/AppContainer.js' +import store from './store/index.js' +import './locales/index.js' const App = () => { const { d2 } = useD2() diff --git a/src/actions/dialogActions.js b/src/actions/dialogActions.js index 943ffb3..22ebfab 100644 --- a/src/actions/dialogActions.js +++ b/src/actions/dialogActions.js @@ -1,4 +1,4 @@ -import * as actions from '../constants/actionTypes' +import * as actions from '../constants/actionTypes.js' /** * openDialog - Action creator helper method for creating dialogs diff --git a/src/actions/index.js b/src/actions/index.js index ab99c78..82cbfe8 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -1,7 +1,7 @@ import { hashHistory } from 'react-router' -import * as actions from '../constants/actionTypes' -import api from '../utils/api' -import * as navigationAction from './navigationActions' +import * as actions from '../constants/actionTypes.js' +import api from '../utils/api.js' +import * as navigationAction from './navigationActions.js' /** * receiveNamespaces - Deliver namespaces returned from request diff --git a/src/actions/jsonEditorActions.js b/src/actions/jsonEditorActions.js index 7655118..18af431 100644 --- a/src/actions/jsonEditorActions.js +++ b/src/actions/jsonEditorActions.js @@ -1,4 +1,4 @@ -import * as actions from '../constants/jsonEditorTypes' +import * as actions from '../constants/jsonEditorTypes.js' /** * searchJSON - Search action in json editor diff --git a/src/actions/navigationActions.js b/src/actions/navigationActions.js index baf382e..de227ba 100644 --- a/src/actions/navigationActions.js +++ b/src/actions/navigationActions.js @@ -1,4 +1,4 @@ -import { SET_IGNORE_NEXT_CONFIRM_NAVIGATION } from '../constants/actionTypes' +import { SET_IGNORE_NEXT_CONFIRM_NAVIGATION } from '../constants/actionTypes.js' export function setIgnoreNextNavigationConfirm() { return { diff --git a/src/actions/sidebarActions.js b/src/actions/sidebarActions.js index d2fc38a..104add1 100644 --- a/src/actions/sidebarActions.js +++ b/src/actions/sidebarActions.js @@ -1,4 +1,4 @@ -import * as actions from '../constants/actionTypes' +import * as actions from '../constants/actionTypes.js' /** * searchSidebarChange - signal search bar in sidebar change diff --git a/src/components/app/AppContainer.js b/src/components/app/AppContainer.js index caa3d93..81913b5 100644 --- a/src/components/app/AppContainer.js +++ b/src/components/app/AppContainer.js @@ -1,12 +1,12 @@ import { PropTypes } from '@dhis2/prop-types' -import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider' +import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider.js' import React, { Component } from 'react' import { Provider } from 'react-redux' import { Router, Route, hashHistory, IndexRoute } from 'react-router' -import Theme from '../../utils/theme' -import EditDisplay from '../display/edit/EditDisplay' -import EmptyDisplay from '../display/empty/EmptyDisplay' -import Layout from './Layout' +import Theme from '../../utils/theme.js' +import EditDisplay from '../display/edit/EditDisplay.js' +import EmptyDisplay from '../display/empty/EmptyDisplay.js' +import Layout from './Layout.js' class AppContainer extends Component { shouldComponentUpdate() { diff --git a/src/components/app/Layout.js b/src/components/app/Layout.js index 7b6d2c5..72087b3 100644 --- a/src/components/app/Layout.js +++ b/src/components/app/Layout.js @@ -1,15 +1,15 @@ import { PropTypes } from '@dhis2/prop-types' import React, { Component } from 'react' -import * as dialog from '../../constants/dialogTypes' -import ConfirmDeleteKeyDialog from '../dialog/ConfirmDeleteKeyDialog' -import ConfirmDeleteNamespaceDialog from '../dialog/ConfirmDeleteNamespaceDialog' -import DialogRoute from '../dialog/DialogRoute' -import DialogRouter from '../dialog/DialogRouter' -import ErrorDialog from '../dialog/ErrorDialog' -import NewKeyDialog from '../dialog/NewKeyDialog' -import NewNamespaceDialog from '../dialog/NewNamespaceDialog' -import Sidebar from '../sidebar/Sidebar' -import Snackbar from '../utils/Snackbar' +import * as dialog from '../../constants/dialogTypes.js' +import ConfirmDeleteKeyDialog from '../dialog/ConfirmDeleteKeyDialog.js' +import ConfirmDeleteNamespaceDialog from '../dialog/ConfirmDeleteNamespaceDialog.js' +import DialogRoute from '../dialog/DialogRoute.js' +import DialogRouter from '../dialog/DialogRouter.js' +import ErrorDialog from '../dialog/ErrorDialog.js' +import NewKeyDialog from '../dialog/NewKeyDialog.js' +import NewNamespaceDialog from '../dialog/NewNamespaceDialog.js' +import Sidebar from '../sidebar/Sidebar.js' +import Snackbar from '../utils/Snackbar.js' import styles from './Layout.module.css' class Layout extends Component { diff --git a/src/components/dialog/ConfirmDeleteKeyDialog.js b/src/components/dialog/ConfirmDeleteKeyDialog.js index 24188fa..5e1c2a9 100644 --- a/src/components/dialog/ConfirmDeleteKeyDialog.js +++ b/src/components/dialog/ConfirmDeleteKeyDialog.js @@ -1,8 +1,8 @@ import { PropTypes } from '@dhis2/prop-types' import React, { Component } from 'react' import { connect } from 'react-redux' -import { deleteKey } from '../../actions' -import DialogRoot from './DialogRoot' +import { deleteKey } from '../../actions/index.js' +import DialogRoot from './DialogRoot.js' export class ConfirmDeleteKeyDialog extends Component { handleConfirmed = () => { diff --git a/src/components/dialog/ConfirmDeleteNamespaceDialog.js b/src/components/dialog/ConfirmDeleteNamespaceDialog.js index 074852a..ab5b1cd 100644 --- a/src/components/dialog/ConfirmDeleteNamespaceDialog.js +++ b/src/components/dialog/ConfirmDeleteNamespaceDialog.js @@ -1,8 +1,8 @@ import { PropTypes } from '@dhis2/prop-types' import React, { Component } from 'react' import { connect } from 'react-redux' -import { deleteNamespace } from '../../actions' -import DialogRoot from './DialogRoot' +import { deleteNamespace } from '../../actions/index.js' +import DialogRoot from './DialogRoot.js' export class ConfirmDeleteNamespaceDialog extends Component { handleConfirmed = () => { diff --git a/src/components/dialog/ConfirmNavigationDialog.js b/src/components/dialog/ConfirmNavigationDialog.js index fde3f0c..783f5d7 100644 --- a/src/components/dialog/ConfirmNavigationDialog.js +++ b/src/components/dialog/ConfirmNavigationDialog.js @@ -2,8 +2,8 @@ import { PropTypes } from '@dhis2/prop-types' import Dialog from 'material-ui/Dialog' import React, { Component } from 'react' import { connect } from 'react-redux' -import * as navigationActions from '../../actions/navigationActions' -import DialogRoot from './DialogRoot' +import * as navigationActions from '../../actions/navigationActions.js' +import DialogRoot from './DialogRoot.js' export class ConfirmNavigationDialog extends Component { constructor() { diff --git a/src/components/dialog/DialogRoot.js b/src/components/dialog/DialogRoot.js index e422de2..4081741 100644 --- a/src/components/dialog/DialogRoot.js +++ b/src/components/dialog/DialogRoot.js @@ -3,7 +3,7 @@ import Dialog from 'material-ui/Dialog' import FlatButton from 'material-ui/FlatButton' import React, { Component } from 'react' import { connect } from 'react-redux' -import { closeDialog } from '../../actions/dialogActions' +import { closeDialog } from '../../actions/dialogActions.js' class DialogRoot extends Component { static buildButton(action, text, primary = false) { diff --git a/src/components/dialog/ErrorDialog.js b/src/components/dialog/ErrorDialog.js index 4012158..edd970a 100644 --- a/src/components/dialog/ErrorDialog.js +++ b/src/components/dialog/ErrorDialog.js @@ -1,7 +1,7 @@ import { PropTypes } from '@dhis2/prop-types' import React, { Component } from 'react' import { connect } from 'react-redux' -import DialogRoot from './DialogRoot' +import DialogRoot from './DialogRoot.js' export class ErrorDialog extends Component { render() { diff --git a/src/components/dialog/NewKeyDialog.js b/src/components/dialog/NewKeyDialog.js index 74e4acf..a946757 100644 --- a/src/components/dialog/NewKeyDialog.js +++ b/src/components/dialog/NewKeyDialog.js @@ -2,9 +2,9 @@ import { PropTypes } from '@dhis2/prop-types' import TextField from 'material-ui/TextField' import React, { Component } from 'react' import { connect } from 'react-redux' -import { createAndDisplayValue } from '../../actions' -import { validateKeyOrNamespace } from '../../utils/validation' -import DialogRoot from './DialogRoot' +import { createAndDisplayValue } from '../../actions/index.js' +import { validateKeyOrNamespace } from '../../utils/validation.js' +import DialogRoot from './DialogRoot.js' export class NamespaceDialog extends Component { constructor(props) { diff --git a/src/components/dialog/NewNamespaceDialog.js b/src/components/dialog/NewNamespaceDialog.js index 406bb94..27522b3 100644 --- a/src/components/dialog/NewNamespaceDialog.js +++ b/src/components/dialog/NewNamespaceDialog.js @@ -2,9 +2,9 @@ import { PropTypes } from '@dhis2/prop-types' import TextField from 'material-ui/TextField' import React, { Component } from 'react' import { connect } from 'react-redux' -import { createAndDisplayValue } from '../../actions' -import { validateKeyOrNamespace } from '../../utils/validation' -import DialogRoot from './DialogRoot' +import { createAndDisplayValue } from '../../actions/index.js' +import { validateKeyOrNamespace } from '../../utils/validation.js' +import DialogRoot from './DialogRoot.js' export class NewNamespaceDialog extends Component { constructor(props) { diff --git a/src/components/display/DisplayToolbarTitle.js b/src/components/display/DisplayToolbarTitle.js index 6d761d1..f60c79d 100644 --- a/src/components/display/DisplayToolbarTitle.js +++ b/src/components/display/DisplayToolbarTitle.js @@ -1,8 +1,8 @@ import { PropTypes } from '@dhis2/prop-types' -import ChevronRight from 'material-ui/svg-icons/navigation/chevron-right' +import ChevronRight from 'material-ui/svg-icons/navigation/chevron-right.js' import React, { Component } from 'react' -import Theme from '../../utils/theme' -import BreadcrumbHistoryButton from '../utils/BreadcrumbHistoryButton' +import Theme from '../../utils/theme.js' +import BreadcrumbHistoryButton from '../utils/BreadcrumbHistoryButton.js' import styles from './DisplayToolbarTitle.module.css' class DisplayToolbarTitle extends Component { diff --git a/src/components/display/ErrorArea.js b/src/components/display/ErrorArea.js index be81ca5..b8321a7 100644 --- a/src/components/display/ErrorArea.js +++ b/src/components/display/ErrorArea.js @@ -1,7 +1,7 @@ import i18n from '@dhis2/d2-i18n' import { PropTypes } from '@dhis2/prop-types' import React, { Component } from 'react' -import { ErrorIconWithText } from '../utils/Icons' +import { ErrorIconWithText } from '../utils/Icons.js' class ErrorArea extends Component { render() { diff --git a/src/components/display/LoadingArea.js b/src/components/display/LoadingArea.js index 9d07c42..50f5a54 100644 --- a/src/components/display/LoadingArea.js +++ b/src/components/display/LoadingArea.js @@ -1,6 +1,6 @@ import Paper from 'material-ui/Paper' import React, { Component } from 'react' -import { Spinner } from '../utils/Loaders' +import { Spinner } from '../utils/Loaders.js' import styles from './Display.module.css' const alignmentStyle = { diff --git a/src/components/display/edit/EditArea.js b/src/components/display/edit/EditArea.js index cbb2cd8..aea468d 100644 --- a/src/components/display/edit/EditArea.js +++ b/src/components/display/edit/EditArea.js @@ -1,7 +1,7 @@ import { PropTypes } from '@dhis2/prop-types' import React, { Component } from 'react' -import DisplayAreaHOC from '../../hoc/DisplayAreaHOC' -import JSONEditor from '../../utils/JSONEditor' +import DisplayAreaHOC from '../../hoc/DisplayAreaHOC.js' +import JSONEditor from '../../utils/JSONEditor.js' import styles from '../Display.module.css' export class EditArea extends Component { diff --git a/src/components/display/edit/EditDisplay.js b/src/components/display/edit/EditDisplay.js index f96941e..67deaf8 100644 --- a/src/components/display/edit/EditDisplay.js +++ b/src/components/display/edit/EditDisplay.js @@ -9,11 +9,11 @@ import { updateValue, valueChange, rejectUpdateValue, -} from '../../../actions' -import ConfirmNavigationDialog from '../../dialog/ConfirmNavigationDialog' +} from '../../../actions/index.js' +import ConfirmNavigationDialog from '../../dialog/ConfirmNavigationDialog.js' import styles from '../Display.module.css' -import EditArea from './EditArea' -import EditToolbar from './EditToolbar' +import EditArea from './EditArea.js' +import EditToolbar from './EditToolbar.js' /* eslint-disable react/prop-types */ /* eslint-disable react/sort-prop-types */ diff --git a/src/components/display/edit/EditToolbar.js b/src/components/display/edit/EditToolbar.js index 6448e03..cb890c2 100644 --- a/src/components/display/edit/EditToolbar.js +++ b/src/components/display/edit/EditToolbar.js @@ -3,13 +3,13 @@ import DropDownMenu from 'material-ui/DropDownMenu' import IconButton from 'material-ui/IconButton' import MenuItem from 'material-ui/MenuItem' import Paper from 'material-ui/Paper' -import RedoIcon from 'material-ui/svg-icons/content/redo' -import SaveIcon from 'material-ui/svg-icons/content/save' -import UndoIcon from 'material-ui/svg-icons/content/undo' -import FormatAlignJustifyIcon from 'material-ui/svg-icons/editor/format-align-justify' -import FormatAlignLeftIcon from 'material-ui/svg-icons/editor/format-align-left' -import ExpandLessIcon from 'material-ui/svg-icons/navigation/expand-less' -import ExpandMoreIcon from 'material-ui/svg-icons/navigation/expand-more' +import RedoIcon from 'material-ui/svg-icons/content/redo.js' +import SaveIcon from 'material-ui/svg-icons/content/save.js' +import UndoIcon from 'material-ui/svg-icons/content/undo.js' +import FormatAlignJustifyIcon from 'material-ui/svg-icons/editor/format-align-justify.js' +import FormatAlignLeftIcon from 'material-ui/svg-icons/editor/format-align-left.js' +import ExpandLessIcon from 'material-ui/svg-icons/navigation/expand-less.js' +import ExpandMoreIcon from 'material-ui/svg-icons/navigation/expand-more.js' import { Toolbar, ToolbarGroup } from 'material-ui/Toolbar' import React from 'react' import { connect } from 'react-redux' @@ -22,11 +22,11 @@ import { jsonEditorChangeMode, jsonEditorCompact, jsonEditorFormat, -} from '../../../actions/jsonEditorActions' -import { debounce } from '../../../utils/utils' -import JSONSearchBar from '../../utils/JSONSearchBar' -import { Spinner } from '../../utils/Loaders' -import DisplayToolbarTitle from '../DisplayToolbarTitle' +} from '../../../actions/jsonEditorActions.js' +import { debounce } from '../../../utils/utils.js' +import JSONSearchBar from '../../utils/JSONSearchBar.js' +import { Spinner } from '../../utils/Loaders.js' +import DisplayToolbarTitle from '../DisplayToolbarTitle.js' /* eslint-disable react/sort-prop-types */ /* eslint-disable react/prop-types */ diff --git a/src/components/display/empty/EmptyArea.js b/src/components/display/empty/EmptyArea.js index fab9c06..ad31b78 100644 --- a/src/components/display/empty/EmptyArea.js +++ b/src/components/display/empty/EmptyArea.js @@ -1,6 +1,6 @@ import React, { Component } from 'react' -import DisplayAreaHOC from '../../hoc/DisplayAreaHOC' -import { ModeCommentIconWithText } from '../../utils/Icons' +import DisplayAreaHOC from '../../hoc/DisplayAreaHOC.js' +import { ModeCommentIconWithText } from '../../utils/Icons.js' import styles from '../Display.module.css' export class EmptyArea extends Component { diff --git a/src/components/display/empty/EmptyDisplay.js b/src/components/display/empty/EmptyDisplay.js index 8445be1..fc5b5b1 100644 --- a/src/components/display/empty/EmptyDisplay.js +++ b/src/components/display/empty/EmptyDisplay.js @@ -1,8 +1,8 @@ import Paper from 'material-ui/Paper' import React, { Component } from 'react' import styles from '../Display.module.css' -import EmptyArea from './EmptyArea' -import EmptyToolbar from './EmptyToolbar' +import EmptyArea from './EmptyArea.js' +import EmptyToolbar from './EmptyToolbar.js' class EmptyDisplay extends Component { render() { diff --git a/src/components/hoc/DisplayAreaHOC.js b/src/components/hoc/DisplayAreaHOC.js index 36f0308..1d42404 100644 --- a/src/components/hoc/DisplayAreaHOC.js +++ b/src/components/hoc/DisplayAreaHOC.js @@ -1,8 +1,8 @@ import { PropTypes } from '@dhis2/prop-types' import React, { Component } from 'react' import { connect } from 'react-redux' -import ErrorArea from '../display/ErrorArea' -import LoadingArea from '../display/LoadingArea' +import ErrorArea from '../display/ErrorArea.js' +import LoadingArea from '../display/LoadingArea.js' const DisplayAreaHOC = (Area) => { class DisplayAreaBase extends Component { diff --git a/src/components/hoc/SidebarAreaHOC.js b/src/components/hoc/SidebarAreaHOC.js index 009deef..432b704 100644 --- a/src/components/hoc/SidebarAreaHOC.js +++ b/src/components/hoc/SidebarAreaHOC.js @@ -1,10 +1,10 @@ import { PropTypes } from '@dhis2/prop-types' import IconButton from 'material-ui/IconButton' -import NavigationRefresh from 'material-ui/svg-icons/navigation/refresh' +import NavigationRefresh from 'material-ui/svg-icons/navigation/refresh.js' import React, { Component } from 'react' import { connect } from 'react-redux' import styles from '../sidebar/Sidebar.module.css' -import { Spinner } from '../utils/Loaders' +import { Spinner } from '../utils/Loaders.js' const containerStyle = { alignItems: 'center', diff --git a/src/components/sidebar/KeyItem.js b/src/components/sidebar/KeyItem.js index 36338e9..1337657 100644 --- a/src/components/sidebar/KeyItem.js +++ b/src/components/sidebar/KeyItem.js @@ -1,9 +1,9 @@ import { PropTypes } from '@dhis2/prop-types' import { ListItem } from 'material-ui/List' -import EditorInsertDriveFile from 'material-ui/svg-icons/editor/insert-drive-file' +import EditorInsertDriveFile from 'material-ui/svg-icons/editor/insert-drive-file.js' import React, { Component } from 'react' import { hashHistory, withRouter } from 'react-router' -import KeyItemMenu from './KeyItemMenu' +import KeyItemMenu from './KeyItemMenu.js' const styles = { primaryText: { diff --git a/src/components/sidebar/KeyItemMenu.js b/src/components/sidebar/KeyItemMenu.js index ea1470c..9716f41 100644 --- a/src/components/sidebar/KeyItemMenu.js +++ b/src/components/sidebar/KeyItemMenu.js @@ -1,12 +1,12 @@ import { PropTypes } from '@dhis2/prop-types' import IconMenu from 'material-ui/IconMenu' import MenuItem from 'material-ui/MenuItem' -import Delete from 'material-ui/svg-icons/action/delete' +import Delete from 'material-ui/svg-icons/action/delete.js' import React, { Component } from 'react' import { connect } from 'react-redux' -import { openDialog } from '../../actions/dialogActions' -import * as dialog from '../../constants/dialogTypes' -import IconButtonElement from '../utils/IconButtonElement' +import { openDialog } from '../../actions/dialogActions.js' +import * as dialog from '../../constants/dialogTypes.js' +import IconButtonElement from '../utils/IconButtonElement.js' const anchorOrigin = { vertical: 'bottom', diff --git a/src/components/sidebar/NamespaceItem.js b/src/components/sidebar/NamespaceItem.js index 1ea974c..54b2271 100644 --- a/src/components/sidebar/NamespaceItem.js +++ b/src/components/sidebar/NamespaceItem.js @@ -1,14 +1,17 @@ import { PropTypes } from '@dhis2/prop-types' import { ListItem } from 'material-ui/List' -import ErrorIcon from 'material-ui/svg-icons/alert/error' -import FileFolder from 'material-ui/svg-icons/file/folder' -import FileFolderOpen from 'material-ui/svg-icons/file/folder-open' +import ErrorIcon from 'material-ui/svg-icons/alert/error.js' +import FileFolderOpen from 'material-ui/svg-icons/file/folder-open.js' +import FileFolder from 'material-ui/svg-icons/file/folder.js' import React, { Component } from 'react' import { connect } from 'react-redux' -import { fetchAndToggleNamespace, toggleNamespace } from '../../actions' -import { Spinner } from '../utils/Loaders' -import KeyItem from './KeyItem' -import NamespaceItemMenu from './NamespaceItemMenu' +import { + fetchAndToggleNamespace, + toggleNamespace, +} from '../../actions/index.js' +import { Spinner } from '../utils/Loaders.js' +import KeyItem from './KeyItem.js' +import NamespaceItemMenu from './NamespaceItemMenu.js' /* eslint-disable react/sort-prop-types */ diff --git a/src/components/sidebar/NamespaceItemMenu.js b/src/components/sidebar/NamespaceItemMenu.js index 1a43262..93154f3 100644 --- a/src/components/sidebar/NamespaceItemMenu.js +++ b/src/components/sidebar/NamespaceItemMenu.js @@ -1,13 +1,13 @@ import { PropTypes } from '@dhis2/prop-types' import IconMenu from 'material-ui/IconMenu' import MenuItem from 'material-ui/MenuItem' -import Delete from 'material-ui/svg-icons/action/delete' -import NoteAdd from 'material-ui/svg-icons/action/note-add' +import Delete from 'material-ui/svg-icons/action/delete.js' +import NoteAdd from 'material-ui/svg-icons/action/note-add.js' import React, { Component } from 'react' import { connect } from 'react-redux' -import { openDialog } from '../../actions/dialogActions' -import * as dialog from '../../constants/dialogTypes' -import IconButtonElement from '../utils/IconButtonElement' +import { openDialog } from '../../actions/dialogActions.js' +import * as dialog from '../../constants/dialogTypes.js' +import IconButtonElement from '../utils/IconButtonElement.js' const anchorOrigin = { vertical: 'bottom', diff --git a/src/components/sidebar/NamespaceList.js b/src/components/sidebar/NamespaceList.js index e393969..d4d46cf 100644 --- a/src/components/sidebar/NamespaceList.js +++ b/src/components/sidebar/NamespaceList.js @@ -2,8 +2,8 @@ import { PropTypes } from '@dhis2/prop-types' import { List } from 'material-ui/List' import React, { Component } from 'react' import { connect } from 'react-redux' -import Theme from '../../utils/theme' -import NamespaceItem from './NamespaceItem' +import Theme from '../../utils/theme.js' +import NamespaceItem from './NamespaceItem.js' const listStyle = { overflowY: 'auto', diff --git a/src/components/sidebar/Searchbar.js b/src/components/sidebar/Searchbar.js index 6fea274..c3fca85 100644 --- a/src/components/sidebar/Searchbar.js +++ b/src/components/sidebar/Searchbar.js @@ -2,7 +2,7 @@ import { PropTypes } from '@dhis2/prop-types' import TextField from 'material-ui/TextField' import React, { Component } from 'react' import { connect } from 'react-redux' -import { searchSidebarChange } from '../../actions/sidebarActions' +import { searchSidebarChange } from '../../actions/sidebarActions.js' export class Searchbar extends Component { handleKeys = (event) => { diff --git a/src/components/sidebar/Sidebar.js b/src/components/sidebar/Sidebar.js index 756d203..a140c37 100644 --- a/src/components/sidebar/Sidebar.js +++ b/src/components/sidebar/Sidebar.js @@ -2,13 +2,13 @@ import { PropTypes } from '@dhis2/prop-types' import RaisedButton from 'material-ui/RaisedButton' import React, { Component } from 'react' import { connect } from 'react-redux' -import { fetchNamespaces } from '../../actions' -import { openDialog } from '../../actions/dialogActions' -import * as dialog from '../../constants/dialogTypes' -import SidebarAreaHOC from '../hoc/SidebarAreaHOC' -import NamespaceList from './NamespaceList' +import { openDialog } from '../../actions/dialogActions.js' +import { fetchNamespaces } from '../../actions/index.js' +import * as dialog from '../../constants/dialogTypes.js' +import SidebarAreaHOC from '../hoc/SidebarAreaHOC.js' +import NamespaceList from './NamespaceList.js' import styles from './Sidebar.module.css' -import SidebarHeader from './SidebarHeader' +import SidebarHeader from './SidebarHeader.js' export class Sidebar extends Component { constructor(props) { diff --git a/src/components/sidebar/SidebarHeader.js b/src/components/sidebar/SidebarHeader.js index 0c3ef54..bdcdc3a 100644 --- a/src/components/sidebar/SidebarHeader.js +++ b/src/components/sidebar/SidebarHeader.js @@ -2,7 +2,7 @@ import { PropTypes } from '@dhis2/prop-types' import Paper from 'material-ui/Paper' import { Toolbar, ToolbarGroup } from 'material-ui/Toolbar' import React, { Component } from 'react' -import Searchbar from './Searchbar' +import Searchbar from './Searchbar.js' class SidebarHeader extends Component { render() { diff --git a/src/components/utils/IconButtonElement.js b/src/components/utils/IconButtonElement.js index b2178dc..bc11324 100644 --- a/src/components/utils/IconButtonElement.js +++ b/src/components/utils/IconButtonElement.js @@ -1,7 +1,7 @@ import IconButton from 'material-ui/IconButton' -import MoreVertIcon from 'material-ui/svg-icons/navigation/more-vert' +import MoreVertIcon from 'material-ui/svg-icons/navigation/more-vert.js' import React, { Component } from 'react' -import Theme from '../../utils/theme' +import Theme from '../../utils/theme.js' // This needs to stay as a class as it is passed a ref by a Material UI // component and functional components do not support refs diff --git a/src/components/utils/Icons.js b/src/components/utils/Icons.js index 6cdd4cf..a353ea2 100644 --- a/src/components/utils/Icons.js +++ b/src/components/utils/Icons.js @@ -1,6 +1,6 @@ import { PropTypes } from '@dhis2/prop-types' -import ErrorIcon from 'material-ui/svg-icons/alert/error' -import ModeComment from 'material-ui/svg-icons/editor/mode-comment' +import ErrorIcon from 'material-ui/svg-icons/alert/error.js' +import ModeComment from 'material-ui/svg-icons/editor/mode-comment.js' import React, { Component } from 'react' import styles from '../display/Display.module.css' diff --git a/src/components/utils/JSONEditor.js b/src/components/utils/JSONEditor.js index ca28afd..882cd31 100644 --- a/src/components/utils/JSONEditor.js +++ b/src/components/utils/JSONEditor.js @@ -3,11 +3,11 @@ import { PropTypes } from '@dhis2/prop-types' import JSEditor from 'jsoneditor/dist/jsoneditor.min.js' import React, { Component } from 'react' import { connect } from 'react-redux' -import { openDialog } from '../../actions/dialogActions' -import { jsonEditorChangeMode } from '../../actions/jsonEditorActions' -import * as dialogTypes from '../../constants/dialogTypes' +import { openDialog } from '../../actions/dialogActions.js' +import { jsonEditorChangeMode } from '../../actions/jsonEditorActions.js' +import * as dialogTypes from '../../constants/dialogTypes.js' import 'jsoneditor/dist/jsoneditor.min.css' -import { sortObjectKeys } from '../../utils/utils' +import { sortObjectKeys } from '../../utils/utils.js' /* eslint-disable react/prop-types */ diff --git a/src/components/utils/Snackbar.js b/src/components/utils/Snackbar.js index 3443674..da5799a 100644 --- a/src/components/utils/Snackbar.js +++ b/src/components/utils/Snackbar.js @@ -2,7 +2,7 @@ import { PropTypes } from '@dhis2/prop-types' import SnackbarUI from 'material-ui/Snackbar' import React, { Component } from 'react' import { connect } from 'react-redux' -import { emptySnackbar } from '../../actions' +import { emptySnackbar } from '../../actions/index.js' export class Snackbar extends Component { render() { diff --git a/src/reducers/dialogReducer.js b/src/reducers/dialogReducer.js index c4136ef..72e6514 100644 --- a/src/reducers/dialogReducer.js +++ b/src/reducers/dialogReducer.js @@ -1,4 +1,4 @@ -import * as actions from '../constants/actionTypes' +import * as actions from '../constants/actionTypes.js' const emptyDialog = { dialogType: null } const initialState = { diff --git a/src/reducers/displayReducer.js b/src/reducers/displayReducer.js index 6360d9d..e555aa9 100644 --- a/src/reducers/displayReducer.js +++ b/src/reducers/displayReducer.js @@ -1,5 +1,5 @@ -import * as actions from '../constants/actionTypes' -import * as jsonEditorActions from '../constants/jsonEditorTypes' +import * as actions from '../constants/actionTypes.js' +import * as jsonEditorActions from '../constants/jsonEditorTypes.js' const fetchedState = { fetching: false, fetched: true, error: false } const fetchingState = { fetching: true, fetched: false, error: false } diff --git a/src/reducers/index.js b/src/reducers/index.js index 8ec570b..fae2a05 100644 --- a/src/reducers/index.js +++ b/src/reducers/index.js @@ -1,10 +1,10 @@ import { combineReducers } from 'redux' -import dialog from './dialogReducer' -import display from './displayReducer' -import jsonEditor from './jsonEditorReducer' -import navigation from './navigationReducer' -import sidebar from './sidebarReducer' -import snackbar from './snackbarReducer' +import dialog from './dialogReducer.js' +import display from './displayReducer.js' +import jsonEditor from './jsonEditorReducer.js' +import navigation from './navigationReducer.js' +import sidebar from './sidebarReducer.js' +import snackbar from './snackbarReducer.js' export default combineReducers({ display, diff --git a/src/reducers/jsonEditorReducer.js b/src/reducers/jsonEditorReducer.js index debd5b7..971cb7a 100644 --- a/src/reducers/jsonEditorReducer.js +++ b/src/reducers/jsonEditorReducer.js @@ -1,5 +1,5 @@ -import * as displayActions from '../constants/actionTypes' -import * as actions from '../constants/jsonEditorTypes' +import * as displayActions from '../constants/actionTypes.js' +import * as actions from '../constants/jsonEditorTypes.js' const initialState = { mode: 'tree', diff --git a/src/reducers/navigationReducer.js b/src/reducers/navigationReducer.js index 214d4f0..af48048 100644 --- a/src/reducers/navigationReducer.js +++ b/src/reducers/navigationReducer.js @@ -1,4 +1,4 @@ -import * as actions from '../constants/actionTypes' +import * as actions from '../constants/actionTypes.js' const initalState = { ignoreNextConfirm: false } diff --git a/src/reducers/sidebarReducer.js b/src/reducers/sidebarReducer.js index 03402e9..1c53f2b 100644 --- a/src/reducers/sidebarReducer.js +++ b/src/reducers/sidebarReducer.js @@ -1,4 +1,4 @@ -import * as actions from '../constants/actionTypes' +import * as actions from '../constants/actionTypes.js' const fetchedState = { fetching: false, fetched: true, error: false } const fetchingState = { fetching: true, fetched: false, error: false } diff --git a/src/reducers/snackbarReducer.js b/src/reducers/snackbarReducer.js index ffd34b0..b9d6fc5 100644 --- a/src/reducers/snackbarReducer.js +++ b/src/reducers/snackbarReducer.js @@ -1,4 +1,4 @@ -import * as actions from '../constants/actionTypes' +import * as actions from '../constants/actionTypes.js' const emptySnackbar = { snackbarMessage: { message: '' } } const initialState = {} diff --git a/src/store/index.js b/src/store/index.js index 1fdda82..50a808f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1,5 +1,5 @@ import { createStore, applyMiddleware } from 'redux' import thunk from 'redux-thunk' -import reducers from '../reducers' +import reducers from '../reducers/index.js' export default createStore(reducers, applyMiddleware(thunk)) diff --git a/src/utils/cache.test.js b/src/utils/cache.test.js index c5968d6..fecf819 100644 --- a/src/utils/cache.test.js +++ b/src/utils/cache.test.js @@ -1,4 +1,4 @@ -import { Cache } from './api' +import { Cache } from './api.js' describe('Cache', () => { it('should be possible to set and get namespace/key combinations', () => { diff --git a/src/utils/theme.js b/src/utils/theme.js index af0035f..537c412 100644 --- a/src/utils/theme.js +++ b/src/utils/theme.js @@ -9,9 +9,9 @@ import { white, darkBlack, fullBlack, -} from 'material-ui/styles/colors' -import getMuiTheme from 'material-ui/styles/getMuiTheme' -import { fade } from 'material-ui/utils/colorManipulator' +} from 'material-ui/styles/colors.js' +import getMuiTheme from 'material-ui/styles/getMuiTheme.js' +import { fade } from 'material-ui/utils/colorManipulator.js' export default getMuiTheme({ palette: {