From ae665d6ad7123bf6eb5d4babba696494c9821405 Mon Sep 17 00:00:00 2001 From: JounQin Date: Tue, 23 Mar 2021 16:12:37 +0800 Subject: [PATCH 1/2] fix: check is eslint-plugin-react available --- .eslintrc.js | 4 +- README.md | 3 +- package.json | 3 +- packages/eslint-mdx/README.md | 3 +- packages/eslint-mdx/package.json | 2 +- packages/eslint-plugin-mdx/README.md | 3 +- .../eslint-plugin-mdx/src/configs/index.ts | 2 - .../src/configs/overrides.ts | 32 +- .../src/configs/recommended.ts | 33 +- .../src/{configs => }/helpers.ts | 0 packages/eslint-plugin-mdx/src/index.ts | 1 + test/__snapshots__/fixtures.test.ts.snap | 8 +- tsconfig.base.json | 1 + tsconfig.json | 3 - yarn.lock | 289 +++++++++--------- 15 files changed, 213 insertions(+), 174 deletions(-) rename packages/eslint-plugin-mdx/src/{configs => }/helpers.ts (100%) diff --git a/.eslintrc.js b/.eslintrc.js index a5073c36..09a2bc8f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -24,16 +24,14 @@ module.exports = { { files: '**/*.{md,mdx}/**', rules: { - 'prettier/prettier': 0, 'unicorn/filename-case': 0, }, }, { files: '*.{md,mdx}', - // related to https://github.com/eslint/eslint/issues/14207 rules: { - 'prettier/prettier': 0, 'react/no-unescaped-entities': 1, + // related to https://github.com/eslint/eslint/issues/14207 'unicorn/filename-case': 0, }, settings: { diff --git a/README.md b/README.md index 6d2ed39d..5d119d4f 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,7 @@ See [#251](https://github.com/mdx-js/eslint-mdx/issues/251#issuecomment-73613922 3. If you're using `eslint@^5.0.0`, you need to enable this parser/plugin manually, because `eslint@5` does not support `extends` for `overrides` property in its configuration: ```js - const { configs } = require('eslint-plugin-mdx') + const configs = require('eslint-plugin-mdx/lib/configs') module.exports = { extends: ['plugin:mdx/recommended'], @@ -251,7 +251,6 @@ Detailed changes for each release are documented in [CHANGELOG.md](./CHANGELOG.m [1stg.me]: https://www.1stg.me [cosmiconfig]: https://github.com/davidtheclark/cosmiconfig [eslint]: https://eslint.org -[eslint-plugin-react]: https://github.com/yannickcr/eslint-plugin-react [jounqin]: https://GitHub.com/JounQin [lerna]: https://github.com/lerna/lerna [mdx]: https://github.com/mdx-js/mdx diff --git a/package.json b/package.json index b14e648e..33d2fb70 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "typecov": "type-coverage" }, "devDependencies": { - "@1stg/lib-config": "^1.2.0", + "@1stg/lib-config": "^1.2.1", "@1stg/tslint-config": "^1.2.0", "@types/eslint": "^7.2.7", "@types/jest": "^26.0.20", @@ -45,6 +45,7 @@ }, "resolutions": { "@babel/core": "^7.13.10", + "eslint-plugin-react": "~7.22.0", "prettier": "^2.2.1", "tslib": "^2.1.0" }, diff --git a/packages/eslint-mdx/README.md b/packages/eslint-mdx/README.md index 6d2ed39d..5d119d4f 100644 --- a/packages/eslint-mdx/README.md +++ b/packages/eslint-mdx/README.md @@ -133,7 +133,7 @@ See [#251](https://github.com/mdx-js/eslint-mdx/issues/251#issuecomment-73613922 3. If you're using `eslint@^5.0.0`, you need to enable this parser/plugin manually, because `eslint@5` does not support `extends` for `overrides` property in its configuration: ```js - const { configs } = require('eslint-plugin-mdx') + const configs = require('eslint-plugin-mdx/lib/configs') module.exports = { extends: ['plugin:mdx/recommended'], @@ -251,7 +251,6 @@ Detailed changes for each release are documented in [CHANGELOG.md](./CHANGELOG.m [1stg.me]: https://www.1stg.me [cosmiconfig]: https://github.com/davidtheclark/cosmiconfig [eslint]: https://eslint.org -[eslint-plugin-react]: https://github.com/yannickcr/eslint-plugin-react [jounqin]: https://GitHub.com/JounQin [lerna]: https://github.com/lerna/lerna [mdx]: https://github.com/mdx-js/mdx diff --git a/packages/eslint-mdx/package.json b/packages/eslint-mdx/package.json index a7ee3058..69bad104 100644 --- a/packages/eslint-mdx/package.json +++ b/packages/eslint-mdx/package.json @@ -11,7 +11,7 @@ "author": "JounQin ", "license": "MIT", "engines": { - "node": ">=7.0.0" + "node": ">=10.0.0" }, "main": "lib/cjs", "module": "lib", diff --git a/packages/eslint-plugin-mdx/README.md b/packages/eslint-plugin-mdx/README.md index 6d2ed39d..5d119d4f 100644 --- a/packages/eslint-plugin-mdx/README.md +++ b/packages/eslint-plugin-mdx/README.md @@ -133,7 +133,7 @@ See [#251](https://github.com/mdx-js/eslint-mdx/issues/251#issuecomment-73613922 3. If you're using `eslint@^5.0.0`, you need to enable this parser/plugin manually, because `eslint@5` does not support `extends` for `overrides` property in its configuration: ```js - const { configs } = require('eslint-plugin-mdx') + const configs = require('eslint-plugin-mdx/lib/configs') module.exports = { extends: ['plugin:mdx/recommended'], @@ -251,7 +251,6 @@ Detailed changes for each release are documented in [CHANGELOG.md](./CHANGELOG.m [1stg.me]: https://www.1stg.me [cosmiconfig]: https://github.com/davidtheclark/cosmiconfig [eslint]: https://eslint.org -[eslint-plugin-react]: https://github.com/yannickcr/eslint-plugin-react [jounqin]: https://GitHub.com/JounQin [lerna]: https://github.com/lerna/lerna [mdx]: https://github.com/mdx-js/mdx diff --git a/packages/eslint-plugin-mdx/src/configs/index.ts b/packages/eslint-plugin-mdx/src/configs/index.ts index 79cf2708..b4cd8c0e 100644 --- a/packages/eslint-plugin-mdx/src/configs/index.ts +++ b/packages/eslint-plugin-mdx/src/configs/index.ts @@ -5,8 +5,6 @@ import { codeBlocks } from './code-blocks' import { overrides } from './overrides' import { recommended } from './recommended' -export * from './helpers' - export { base, codeBlocks, overrides, recommended } export const configs = { diff --git a/packages/eslint-plugin-mdx/src/configs/overrides.ts b/packages/eslint-plugin-mdx/src/configs/overrides.ts index bdc64557..7c719c42 100644 --- a/packages/eslint-plugin-mdx/src/configs/overrides.ts +++ b/packages/eslint-plugin-mdx/src/configs/overrides.ts @@ -1,20 +1,38 @@ import type { Linter } from 'eslint' +import { arrayify } from 'eslint-mdx' import { base } from './base' +let isReactPluginAvailable = false + +try { + // eslint-disable-next-line node/no-extraneous-require + require.resolve('eslint-plugin-react') + isReactPluginAvailable = true +} catch {} + export const overrides: Linter.Config = { ...base, globals: { - React: 'readonly', + React: false, }, + plugins: arrayify( + base.plugins, + /* istanbul ignore next */ + isReactPluginAvailable ? 'react' : null, + ), rules: { 'lines-between-class-members': 0, // See https://github.com/mdx-js/mdx/issues/195 - 'react/jsx-no-undef': [ - 2, - { - allowGlobals: true, - }, - ], + 'react/jsx-no-undef': + /* istanbul ignore next */ + isReactPluginAvailable + ? [ + 2, + { + allowGlobals: true, + }, + ] + : 0, 'react/react-in-jsx-scope': 0, }, } diff --git a/packages/eslint-plugin-mdx/src/configs/recommended.ts b/packages/eslint-plugin-mdx/src/configs/recommended.ts index 19789c8a..3d3f74b1 100644 --- a/packages/eslint-plugin-mdx/src/configs/recommended.ts +++ b/packages/eslint-plugin-mdx/src/configs/recommended.ts @@ -39,17 +39,30 @@ if (minorVersion >= OVERRIDES_AVAILABLE_VERSION) { require.resolve('prettier') // eslint-disable-next-line node/no-extraneous-require require.resolve('eslint-plugin-prettier') - overrides.push({ - files: '*.md', - rules: { - 'prettier/prettier': [ - 2, - { - parser: 'markdown', - }, - ], + overrides.push( + { + files: '*.md', + rules: { + 'prettier/prettier': [ + 2, + { + parser: 'markdown', + }, + ], + }, }, - }) + { + files: '*.mdx', + rules: { + 'prettier/prettier': [ + 2, + { + parser: 'mdx', + }, + ], + }, + }, + ) } catch {} Object.assign(recommended, { overrides, diff --git a/packages/eslint-plugin-mdx/src/configs/helpers.ts b/packages/eslint-plugin-mdx/src/helpers.ts similarity index 100% rename from packages/eslint-plugin-mdx/src/configs/helpers.ts rename to packages/eslint-plugin-mdx/src/helpers.ts diff --git a/packages/eslint-plugin-mdx/src/index.ts b/packages/eslint-plugin-mdx/src/index.ts index 226c8346..a0e2177a 100644 --- a/packages/eslint-plugin-mdx/src/index.ts +++ b/packages/eslint-plugin-mdx/src/index.ts @@ -1,3 +1,4 @@ export * from './configs' +export * from './helpers' export * from './processors' export * from './rules' diff --git a/test/__snapshots__/fixtures.test.ts.snap b/test/__snapshots__/fixtures.test.ts.snap index 494296f5..ffe3a0ca 100644 --- a/test/__snapshots__/fixtures.test.ts.snap +++ b/test/__snapshots__/fixtures.test.ts.snap @@ -123,8 +123,8 @@ Array [ "endLine": 27, "fix": Object { "range": Array [ - 548, - 563, + 550, + 565, ], "text": "# Hello, world!", }, @@ -160,8 +160,8 @@ Array [ "endLine": 35, "fix": Object { "range": Array [ - 651, - 686, + 653, + 688, ], "text": "# Here's a text gradient shortcode!", }, diff --git a/tsconfig.base.json b/tsconfig.base.json index f31a9c92..3d67d3d6 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1,6 +1,7 @@ { "extends": "./node_modules/@1stg/tsconfig/lib.json", "compilerOptions": { + "module": "CommonJS", "strictFunctionTypes": false, "strictNullChecks": false } diff --git a/tsconfig.json b/tsconfig.json index 644326c7..e931e294 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,9 +4,6 @@ "noEmit": true }, "ts-node": { - "compilerOptions": { - "module": "CommonJS" - }, "transpileOnly": true }, "references": [ diff --git a/yarn.lock b/yarn.lock index 8d5147a5..9955a34e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,15 +2,15 @@ # yarn lockfile v1 -"@1stg/babel-preset@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@1stg/babel-preset/-/babel-preset-1.5.0.tgz#2639d596831061bf0a4223459f3c1aef2892984c" - integrity sha512-/SnuMXYEdGDp9hvciyqUrGjh309ctKWnj3DfkP7czrFYZfT8dGxBtnFAVjc3REo/JIHrb9461VFcjdyspOD7Bw== +"@1stg/babel-preset@^1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@1stg/babel-preset/-/babel-preset-1.6.0.tgz#3f6dc7c3a08f2ccffd339a8a3054ec646d688bf5" + integrity sha512-8mFWtpz8KZKRdpO2sIk5i9EtYe3+grZT4hVnYrp6f7tRJIQ+DEGF2QXKRyAUr2A9V6G5W0anD56gcLwLNDTMkg== dependencies: "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-proposal-class-properties" "^7.13.0" "@babel/plugin-proposal-decorators" "^7.13.5" - "@babel/preset-env" "^7.13.10" + "@babel/preset-env" "^7.13.12" "@babel/preset-react" "^7.12.13" "@babel/preset-typescript" "^7.13.0" "@pkgr/utils" "^0.6.0" @@ -20,7 +20,7 @@ babel-plugin-transform-async-to-promises "^0.8.15" babel-plugin-transform-react-remove-prop-types "^0.4.24" babel-plugin-transform-remove-console "^6.9.4" - babel-plugin-transform-typescript-metadata "^0.3.1" + babel-plugin-transform-typescript-metadata "^0.3.2" babel-preset-proposal-typescript "^2.0.0" core-js "^3.9.1" fast-async "^7.0.6" @@ -34,17 +34,17 @@ "@commitlint/config-lerna-scopes" "^12.0.1" "@pkgr/utils" "^0.6.0" -"@1stg/common-config@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@1stg/common-config/-/common-config-1.3.0.tgz#e6c50e1a55688ab7250354b77c483ebf4234c049" - integrity sha512-uZWLnArphnueFi0nnpYJ48Gb6RtjqlQRNY/p3EBsnt/P+k0cvXNC4Pot4ZFORdXCu1SfDp0czIRorL9SF/PNlg== +"@1stg/common-config@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@1stg/common-config/-/common-config-1.3.1.tgz#e88a46c966e68cdc5575bfead2e6c95d964584c8" + integrity sha512-ACtkxsOOPLlg3QfIQt2nXOUpaqQA8yPC1Ll341MNc8ecCO+Mc1fu53OHVf0Fw9md2XBvKtC3DuE7nSRd0Q19tg== dependencies: - "@1stg/babel-preset" "^1.5.0" + "@1stg/babel-preset" "^1.6.0" "@1stg/commitlint-config" "^1.0.3" - "@1stg/eslint-config" "^1.9.0" + "@1stg/eslint-config" "^1.10.0" "@1stg/husky-config" "^1.0.2" - "@1stg/lint-staged" "^1.2.0" - "@1stg/prettier-config" "^1.5.0" + "@1stg/lint-staged" "^1.2.1" + "@1stg/prettier-config" "^1.6.0" "@1stg/remark-config" "^1.1.0" "@1stg/tsconfig" "^1.2.0" "@babel/core" "^7.13.10" @@ -54,17 +54,17 @@ prettier "^2.2.1" tslib "^2.1.0" -"@1stg/eslint-config@^1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@1stg/eslint-config/-/eslint-config-1.9.0.tgz#d54fdaab485e9c7568e217dbbe21a48b64ec557d" - integrity sha512-hCW6LT4H/NwqqqTdzWrDvZ+iLimNIuoF6yjB1zI9RPMVzn6BJITTaKZRRFnobHqdhsoxgFvl93/1Nv687xMd4Q== +"@1stg/eslint-config@^1.10.0": + version "1.10.0" + resolved "https://registry.yarnpkg.com/@1stg/eslint-config/-/eslint-config-1.10.0.tgz#a7fa81ed79439b6b081bf7b432ddd9e8f6cfa7f8" + integrity sha512-0wyU4FZXrcEGm45Ztp/LaG2kRmJWoffxMNoe+/SDxuWT2Y3xoDGvo+Fq8e3KHAXUPQGyKv2IdeyOkouksIXGNg== dependencies: "@babel/eslint-parser" "^7.13.10" "@babel/eslint-plugin" "^7.13.10" "@pkgr/utils" "^0.6.0" - "@typescript-eslint/eslint-plugin" "^4.17.0" - "@typescript-eslint/eslint-plugin-tslint" "^4.17.0" - "@typescript-eslint/parser" "^4.17.0" + "@typescript-eslint/eslint-plugin" "^4.19.0" + "@typescript-eslint/eslint-plugin-tslint" "^4.19.0" + "@typescript-eslint/parser" "^4.19.0" eslint-config-prettier "^8.1.0" eslint-config-standard "^16.0.2" eslint-config-standard-jsx "^10.0.0" @@ -73,18 +73,18 @@ eslint-import-resolver-typescript "^2.4.0" eslint-plugin-eslint-comments "^3.2.0" eslint-plugin-import "^2.22.1" - eslint-plugin-jest "^24.3.1" - eslint-plugin-mdx "^1.9.1" + eslint-plugin-jest "^24.3.2" + eslint-plugin-mdx "^1.11.1" eslint-plugin-node "^11.1.0" - eslint-plugin-prettier "^3.3.1" + eslint-plugin-prettier "npm:@rxts/eslint-plugin-prettier@^3.4.0-1" eslint-plugin-promise "^4.3.1" - eslint-plugin-react "^7.22.0" + eslint-plugin-react "^7.23.0" eslint-plugin-react-hooks "^4.2.0" eslint-plugin-sonar "^0.4.0" eslint-plugin-sonarjs "^0.6.0" eslint-plugin-svelte "^1.1.2" - eslint-plugin-unicorn "^28.0.2" - eslint-plugin-vue "^7.7.0" + eslint-plugin-unicorn "^29.0.0" + eslint-plugin-vue "^7.8.0" "@1stg/husky-config@^1.0.2": version "1.0.2" @@ -93,32 +93,32 @@ dependencies: "@commitlint/cli" "^12.0.1" -"@1stg/lib-config@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@1stg/lib-config/-/lib-config-1.2.0.tgz#75c569e137cfcc497ca5feaaef74ff27bde4c6ae" - integrity sha512-JFPykG0Du/zaD6QzpUgWoTfTUjrVET+cl7NzblqhZog9RQQnoLn//e9JH9tP2DJIu1NxpMDtqJT+gZPmpdbQSA== +"@1stg/lib-config@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@1stg/lib-config/-/lib-config-1.2.1.tgz#f990c59c702852423e75aa52228ec62080df85e1" + integrity sha512-tfyug6VRGRy8lLXOvbF4hShsDGSRYcEQHnpeB6W4KUuMPzT3S+9Sr4Ke2dCI9BuqR3fpEgIFqWPLiJpVHDKSiQ== dependencies: - "@1stg/common-config" "^1.3.0" + "@1stg/common-config" "^1.3.1" "@pkgr/rollup" "^0.11.3" jest "^26.6.3" -"@1stg/lint-staged@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@1stg/lint-staged/-/lint-staged-1.2.0.tgz#4c220975a35514afa9fef653b659222629839608" - integrity sha512-KL+K3dgHs5XHMFmCgfql7qmedCpeCAtPEGeNArJ9xNzg7/O0GiW6uMfp+KfI1UpYinlSDlPqXVofloCVlXhRYw== +"@1stg/lint-staged@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@1stg/lint-staged/-/lint-staged-1.2.1.tgz#2953aec4147423ffb7c635b45669788c68fd5de8" + integrity sha512-q0zzeJ3FAEP+FhIUurmz1fOrXOqxcr/qKUxKrK+EolTKhXde2O0dcFADIliJDfFQ+ueL5Z3FDK0lWSGUfezdQQ== dependencies: - "@1stg/prettier-config" "^1.5.0" + "@1stg/prettier-config" "^1.6.0" "@pkgr/utils" "^0.6.0" cross-env "^7.0.3" prettier "^2.2.1" -"@1stg/prettier-config@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@1stg/prettier-config/-/prettier-config-1.5.0.tgz#9f0253210ce0fc36c28dbf5e0db08ef6a8eb8364" - integrity sha512-ZZjg5mZQlNTtSJlRslZlVRfnhO2yw5R+o43TBi22+xzfXaYbLW/kAv8FFEDwrdqZ2UeOlftoAIF9S5xHQKfDUA== +"@1stg/prettier-config@^1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@1stg/prettier-config/-/prettier-config-1.6.0.tgz#35244cbe3ff5b7648a9b2b6adb76c621f6941c99" + integrity sha512-/OAKnWYPjQEKqebeIKSHGIg/Oj/jcNnGqxVqtvrNADzzT7rrdHYNYJ6ZTME6yIk1rUKGSzeg3v8ljmvZm5HtWQ== dependencies: "@prettier/plugin-pug" "^1.13.5" - "@prettier/plugin-ruby" "^1.5.3" + "@prettier/plugin-ruby" "^1.5.4" "@prettier/plugin-xml" "^0.13.1" prettier-plugin-pkg "^0.8.0" prettier-plugin-sh "^0.6.0" @@ -187,10 +187,10 @@ dependencies: "@babel/highlight" "^7.12.13" -"@babel/compat-data@^7.13.0", "@babel/compat-data@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.8.tgz#5b783b9808f15cef71547f1b691f34f8ff6003a6" - integrity sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog== +"@babel/compat-data@^7.13.0", "@babel/compat-data@^7.13.12", "@babel/compat-data@^7.13.8": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.12.tgz#a8a5ccac19c200f9dd49624cac6e19d7be1236a1" + integrity sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ== "@babel/core@7.12.9", "@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.16", "@babel/core@^7.13.10", "@babel/core@^7.7.5": version "7.13.10" @@ -457,6 +457,15 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.10.tgz#8f8f9bf7b3afa3eabd061f7a5bcdf4fec3c48409" integrity sha512-0s7Mlrw9uTWkYua7xWr99Wpk2bnGa0ANleKfksYAES8LpWH4gW1OUr42vqKNf0us5UQNfru2wPqMqRITzq/SIQ== +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz#a3484d84d0b549f3fc916b99ee4783f26fabad2a" + integrity sha512-d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ== + dependencies: + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" + "@babel/plugin-proposal-optional-chaining" "^7.13.12" + "@babel/plugin-proposal-async-generator-functions@^7.13.8": version "7.13.8" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz#87aacb574b3bc4b5603f6fe41458d72a5a2ec4b1" @@ -592,10 +601,10 @@ "@babel/helper-plugin-utils" "^7.13.0" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.12.7", "@babel/plugin-proposal-optional-chaining@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz#e39df93efe7e7e621841babc197982e140e90756" - integrity sha512-hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ== +"@babel/plugin-proposal-optional-chaining@^7.12.7", "@babel/plugin-proposal-optional-chaining@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz#ba9feb601d422e0adea6760c2bd6bbb7bfec4866" + integrity sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ== dependencies: "@babel/helper-plugin-utils" "^7.13.0" "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" @@ -1126,15 +1135,16 @@ "@babel/helper-create-regexp-features-plugin" "^7.12.13" "@babel/helper-plugin-utils" "^7.12.13" -"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.13.10": - version "7.13.10" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.10.tgz#b5cde31d5fe77ab2a6ab3d453b59041a1b3a5252" - integrity sha512-nOsTScuoRghRtUsRr/c69d042ysfPHcu+KOB4A9aAO9eJYqrkat+LF8G1yp1HD18QiwixT2CisZTr/0b3YZPXQ== +"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.12.tgz#6dff470478290582ac282fb77780eadf32480237" + integrity sha512-JzElc6jk3Ko6zuZgBtjOd01pf9yYDEIH8BcqVuYIuOkzOwDesoa/Nz4gIo4lBG6K861KTV9TvIgmFuT6ytOaAA== dependencies: - "@babel/compat-data" "^7.13.8" + "@babel/compat-data" "^7.13.12" "@babel/helper-compilation-targets" "^7.13.10" "@babel/helper-plugin-utils" "^7.13.0" "@babel/helper-validator-option" "^7.12.17" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.13.12" "@babel/plugin-proposal-async-generator-functions" "^7.13.8" "@babel/plugin-proposal-class-properties" "^7.13.0" "@babel/plugin-proposal-dynamic-import" "^7.13.8" @@ -1145,7 +1155,7 @@ "@babel/plugin-proposal-numeric-separator" "^7.12.13" "@babel/plugin-proposal-object-rest-spread" "^7.13.8" "@babel/plugin-proposal-optional-catch-binding" "^7.13.8" - "@babel/plugin-proposal-optional-chaining" "^7.13.8" + "@babel/plugin-proposal-optional-chaining" "^7.13.12" "@babel/plugin-proposal-private-methods" "^7.13.0" "@babel/plugin-proposal-unicode-property-regex" "^7.12.13" "@babel/plugin-syntax-async-generators" "^7.8.4" @@ -1193,7 +1203,7 @@ "@babel/plugin-transform-unicode-escapes" "^7.12.13" "@babel/plugin-transform-unicode-regex" "^7.12.13" "@babel/preset-modules" "^0.1.4" - "@babel/types" "^7.13.0" + "@babel/types" "^7.13.12" babel-plugin-polyfill-corejs2 "^0.1.4" babel-plugin-polyfill-corejs3 "^0.1.3" babel-plugin-polyfill-regenerator "^0.1.2" @@ -1262,10 +1272,10 @@ globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.17", "@babel/types@^7.13.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.0.tgz#74424d2816f0171b4100f0ab34e9a374efdf7f80" - integrity sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA== +"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.17", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.12.tgz#edbf99208ef48852acdff1c8a681a1e4ade580cd" + integrity sha512-K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA== dependencies: "@babel/helper-validator-identifier" "^7.12.11" lodash "^4.17.19" @@ -2565,10 +2575,10 @@ dependencies: pug-lexer "^5.0.0" -"@prettier/plugin-ruby@^1.5.3": - version "1.5.3" - resolved "https://registry.yarnpkg.com/@prettier/plugin-ruby/-/plugin-ruby-1.5.3.tgz#04c1058fce59651c38c02ace39faa7a0daa4264b" - integrity sha512-YXXf0PGsUOMk40UlfnjDeF3NuRmKE4ddN4L2drFaskhqcB/P9jNGabz5FsGJdJt+ibPxfRsqx05gfxGLZo1wHg== +"@prettier/plugin-ruby@^1.5.4": + version "1.5.4" + resolved "https://registry.yarnpkg.com/@prettier/plugin-ruby/-/plugin-ruby-1.5.4.tgz#2a46dadfb845534324923184cfe42f3181892fce" + integrity sha512-HSMEuhKcU7utIb8kZuiMr3qm9NXsWSaxi4DaJDsBy0u5VC7hprq0fSYJwE5EQr7ajmygrl2dB3i4av6Ek+TfAA== dependencies: prettier ">=1.10" @@ -2893,21 +2903,21 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin-tslint@^4.17.0": - version "4.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.17.0.tgz#71887ea0dc27f3371c90021cf460547d13b78d1b" - integrity sha512-Ja/6sSAJhmGubj0Y+rMiTspUDkT15h9O4rmwzqv1wUHkjJ27zxZW/nZ1qdaeKtZ4SiLHUwur4Gcsr4xx7z+z4w== +"@typescript-eslint/eslint-plugin-tslint@^4.19.0": + version "4.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.19.0.tgz#f3ba0f4d027d009f367c1f0befad139281e77758" + integrity sha512-R3bQWzke18wsN+oMMXjaHH1cm44Q9BbZAzlSd5qrPc8wjDvF54F9yXmVtM/uJwZSY5Wf0+VnmeuiMcCWpsfNkQ== dependencies: - "@typescript-eslint/experimental-utils" "4.17.0" + "@typescript-eslint/experimental-utils" "4.19.0" lodash "^4.17.15" -"@typescript-eslint/eslint-plugin@^4.0.0", "@typescript-eslint/eslint-plugin@^4.17.0": - version "4.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.17.0.tgz#6f856eca4e6a52ce9cf127dfd349096ad936aa2d" - integrity sha512-/fKFDcoHg8oNan39IKFOb5WmV7oWhQe1K6CDaAVfJaNWEhmfqlA24g+u1lqU5bMH7zuNasfMId4LaYWC5ijRLw== +"@typescript-eslint/eslint-plugin@^4.0.0", "@typescript-eslint/eslint-plugin@^4.19.0": + version "4.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.19.0.tgz#56f8da9ee118fe9763af34d6a526967234f6a7f0" + integrity sha512-CRQNQ0mC2Pa7VLwKFbrGVTArfdVDdefS+gTw0oC98vSI98IX5A8EVH4BzJ2FOB0YlCmm8Im36Elad/Jgtvveaw== dependencies: - "@typescript-eslint/experimental-utils" "4.17.0" - "@typescript-eslint/scope-manager" "4.17.0" + "@typescript-eslint/experimental-utils" "4.19.0" + "@typescript-eslint/scope-manager" "4.19.0" debug "^4.1.1" functional-red-black-tree "^1.0.1" lodash "^4.17.15" @@ -2915,60 +2925,60 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@4.17.0", "@typescript-eslint/experimental-utils@^4.0.0", "@typescript-eslint/experimental-utils@^4.0.1": - version "4.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.17.0.tgz#762c44aaa1a6a3c05b6d63a8648fb89b89f84c80" - integrity sha512-ZR2NIUbnIBj+LGqCFGQ9yk2EBQrpVVFOh9/Kd0Lm6gLpSAcCuLLe5lUCibKGCqyH9HPwYC0GIJce2O1i8VYmWA== +"@typescript-eslint/experimental-utils@4.19.0", "@typescript-eslint/experimental-utils@^4.0.0", "@typescript-eslint/experimental-utils@^4.0.1": + version "4.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.19.0.tgz#9ca379919906dc72cb0fcd817d6cb5aa2d2054c6" + integrity sha512-9/23F1nnyzbHKuoTqFN1iXwN3bvOm/PRIXSBR3qFAYotK/0LveEOHr5JT1WZSzcD6BESl8kPOG3OoDRKO84bHA== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.17.0" - "@typescript-eslint/types" "4.17.0" - "@typescript-eslint/typescript-estree" "4.17.0" + "@typescript-eslint/scope-manager" "4.19.0" + "@typescript-eslint/types" "4.19.0" + "@typescript-eslint/typescript-estree" "4.19.0" eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/parser@^4.0.0", "@typescript-eslint/parser@^4.17.0": - version "4.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.17.0.tgz#141b647ffc72ebebcbf9b0fe6087f65b706d3215" - integrity sha512-KYdksiZQ0N1t+6qpnl6JeK9ycCFprS9xBAiIrw4gSphqONt8wydBw4BXJi3C11ywZmyHulvMaLjWsxDjUSDwAw== +"@typescript-eslint/parser@^4.0.0", "@typescript-eslint/parser@^4.19.0": + version "4.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.19.0.tgz#4ae77513b39f164f1751f21f348d2e6cb2d11128" + integrity sha512-/uabZjo2ZZhm66rdAu21HA8nQebl3lAIDcybUoOxoI7VbZBYavLIwtOOmykKCJy+Xq6Vw6ugkiwn8Js7D6wieA== dependencies: - "@typescript-eslint/scope-manager" "4.17.0" - "@typescript-eslint/types" "4.17.0" - "@typescript-eslint/typescript-estree" "4.17.0" + "@typescript-eslint/scope-manager" "4.19.0" + "@typescript-eslint/types" "4.19.0" + "@typescript-eslint/typescript-estree" "4.19.0" debug "^4.1.1" -"@typescript-eslint/scope-manager@4.17.0": - version "4.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.17.0.tgz#f4edf94eff3b52a863180f7f89581bf963e3d37d" - integrity sha512-OJ+CeTliuW+UZ9qgULrnGpPQ1bhrZNFpfT/Bc0pzNeyZwMik7/ykJ0JHnQ7krHanFN9wcnPK89pwn84cRUmYjw== +"@typescript-eslint/scope-manager@4.19.0": + version "4.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.19.0.tgz#5e0b49eca4df7684205d957c9856f4e720717a4f" + integrity sha512-GGy4Ba/hLXwJXygkXqMzduqOMc+Na6LrJTZXJWVhRrSuZeXmu8TAnniQVKgj8uTRKe4igO2ysYzH+Np879G75g== dependencies: - "@typescript-eslint/types" "4.17.0" - "@typescript-eslint/visitor-keys" "4.17.0" + "@typescript-eslint/types" "4.19.0" + "@typescript-eslint/visitor-keys" "4.19.0" -"@typescript-eslint/types@4.17.0": - version "4.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.17.0.tgz#f57d8fc7f31b348db946498a43050083d25f40ad" - integrity sha512-RN5z8qYpJ+kXwnLlyzZkiJwfW2AY458Bf8WqllkondQIcN2ZxQowAToGSd9BlAUZDB5Ea8I6mqL2quGYCLT+2g== +"@typescript-eslint/types@4.19.0": + version "4.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.19.0.tgz#5181d5d2afd02e5b8f149ebb37ffc8bd7b07a568" + integrity sha512-A4iAlexVvd4IBsSTNxdvdepW0D4uR/fwxDrKUa+iEY9UWvGREu2ZyB8ylTENM1SH8F7bVC9ac9+si3LWNxcBuA== -"@typescript-eslint/typescript-estree@4.17.0": - version "4.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.17.0.tgz#b835d152804f0972b80dbda92477f9070a72ded1" - integrity sha512-lRhSFIZKUEPPWpWfwuZBH9trYIEJSI0vYsrxbvVvNyIUDoKWaklOAelsSkeh3E2VBSZiNe9BZ4E5tYBZbUczVQ== +"@typescript-eslint/typescript-estree@4.19.0": + version "4.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.19.0.tgz#8a709ffa400284ab72df33376df085e2e2f61147" + integrity sha512-3xqArJ/A62smaQYRv2ZFyTA+XxGGWmlDYrsfZG68zJeNbeqRScnhf81rUVa6QG4UgzHnXw5VnMT5cg75dQGDkA== dependencies: - "@typescript-eslint/types" "4.17.0" - "@typescript-eslint/visitor-keys" "4.17.0" + "@typescript-eslint/types" "4.19.0" + "@typescript-eslint/visitor-keys" "4.19.0" debug "^4.1.1" globby "^11.0.1" is-glob "^4.0.1" semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/visitor-keys@4.17.0": - version "4.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.17.0.tgz#9c304cfd20287c14a31d573195a709111849b14d" - integrity sha512-WfuMN8mm5SSqXuAr9NM+fItJ0SVVphobWYkWOwQ1odsfC014Vdxk/92t4JwS1Q6fCA/ABfCKpa3AVtpUKTNKGQ== +"@typescript-eslint/visitor-keys@4.19.0": + version "4.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.19.0.tgz#cbea35109cbd9b26e597644556be4546465d8f7f" + integrity sha512-aGPS6kz//j7XLSlgpzU2SeTqHPsmRYxFztj2vPuMMFJXZudpRSehE3WCV+BaxwZFvfAqMoSd86TEuM0PQ59E/A== dependencies: - "@typescript-eslint/types" "4.17.0" + "@typescript-eslint/types" "4.19.0" eslint-visitor-keys "^2.0.0" "@vue/babel-helper-vue-jsx-merge-props@^1.2.1": @@ -3491,10 +3501,10 @@ babel-plugin-transform-remove-console@^6.9.4: resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz#b980360c067384e24b357a588d807d3c83527780" integrity sha1-uYA2DAZzhOJLNXpYjYB9PINSd4A= -babel-plugin-transform-typescript-metadata@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-typescript-metadata/-/babel-plugin-transform-typescript-metadata-0.3.1.tgz#d86599b7139131ba5e917f5f568d0c824a5cdfc3" - integrity sha512-thOuACZReULfLy7vh2o3/joYkkRerMKLBDmXy3ImCnkNUnxBmNw0uVa05JhhX0slluaEkio6OIFa7zPgaJdk6g== +babel-plugin-transform-typescript-metadata@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-typescript-metadata/-/babel-plugin-transform-typescript-metadata-0.3.2.tgz#7a327842d8c36ffe07ee1b5276434e56c297c9b7" + integrity sha512-mWEvCQTgXQf48yDqgN7CH50waTyYBeP2Lpqx4nNWab9sxEpdXVeKgfj1qYI2/TgUPQtNFZ85i3PemRtnXVYYJg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -3910,6 +3920,11 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== +ci-info@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.1.1.tgz#9a32fcefdf7bcdb6f0a7e1c0f8098ec57897b80a" + integrity sha512-kdRWLBIJwdsYJWYJFtAFFYxybguqeF91qpZaggjG5Nf8QKdizFG2hjqvaTXbxFIcYbSaD74KpAXv6BSm17DHEQ== + cjs-module-lexer@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f" @@ -5057,10 +5072,10 @@ eslint-plugin-import@^2.22.1: resolve "^1.17.0" tsconfig-paths "^3.9.0" -eslint-plugin-jest@^24.3.1: - version "24.3.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.1.tgz#c8df037847b83397940bef7fbc2cc168ab466bcc" - integrity sha512-RQt59rfMSHyvedImT72iaf8JcvCcR4P7Uq499dALtjY8mrCjbwWrFi1UceG4sid2wVIeDi+0tjxXZ8CZEVO7Zw== +eslint-plugin-jest@^24.3.2: + version "24.3.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.2.tgz#30a8b2dea6278d0da1d6fb9d6cd530aaf58050a1" + integrity sha512-cicWDr+RvTAOKS3Q/k03+Z3odt3VCiWamNUHWd6QWbVQWcYJyYgUTu8x0mx9GfeDEimawU5kQC+nQ3MFxIM6bw== dependencies: "@typescript-eslint/experimental-utils" "^4.0.1" @@ -5080,10 +5095,10 @@ eslint-plugin-node@^11.1.0: resolve "^1.10.1" semver "^6.1.0" -eslint-plugin-prettier@^3.3.1: - 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== +"eslint-plugin-prettier@npm:@rxts/eslint-plugin-prettier@^3.4.0-1": + version "3.4.0-1" + resolved "https://registry.yarnpkg.com/@rxts/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0-1.tgz#1424fa92dc128182485ebdc7e01af2bf3c5dbbf3" + integrity sha512-9zWM6JeGE/otF8a/umqOCgNsRTqMUVggUOJRufdVxkiiuitMA4z/CcUlgTzIEDygGpp1a8tASMaw235hAPLiQw== dependencies: prettier-linter-helpers "^1.0.0" @@ -5097,7 +5112,7 @@ eslint-plugin-react-hooks@^4.2.0: resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556" integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ== -eslint-plugin-react@^7.22.0: +eslint-plugin-react@^7.23.0, eslint-plugin-react@~7.22.0: version "7.22.0" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz#3d1c542d1d3169c45421c1215d9470e341707269" integrity sha512-p30tuX3VS+NWv9nQot9xIGAHBXR0+xJVaZriEsHoJrASGCJZDJ8JLNM0YqKqI0AKm6Uxaa1VUHoNEibxRCMQHA== @@ -5145,29 +5160,29 @@ eslint-plugin-svelte@^1.1.2: dependencies: eslint-plugin-svelte3 "^3.1.2" -eslint-plugin-unicorn@^28.0.2: - version "28.0.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-28.0.2.tgz#ab9884ebae04590ecd9c1c294330d889a74b7c37" - integrity sha512-k4AoFP7n8/oq6lBXkdc9Flid6vw2B8j7aXFCxgzJCyKvmaKrCUFb1TFPhG9eSJQFZowqmymMPRtl8oo9NKLUbw== +eslint-plugin-unicorn@^29.0.0: + version "29.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-29.0.0.tgz#7c97cdb5afe932e9f8dc34108e4a5a2a2fbb1906" + integrity sha512-R9jGLKb2p6LuOixviByGlH2mkfY72EBELXAPeUufveebN0M2Woa7B7dUO3gN2xPn/+eGjrIm4I2u7dDtr9G4iA== dependencies: - ci-info "^2.0.0" + ci-info "^3.1.1" clean-regexp "^1.0.0" - eslint-template-visitor "^2.2.2" + eslint-template-visitor "^2.3.2" eslint-utils "^2.1.0" eslint-visitor-keys "^2.0.0" import-modules "^2.1.0" lodash "^4.17.20" pluralize "^8.0.0" read-pkg-up "^7.0.1" - regexp-tree "^0.1.22" + regexp-tree "^0.1.23" reserved-words "^0.1.2" safe-regex "^2.1.1" semver "^7.3.4" -eslint-plugin-vue@^7.7.0: - version "7.7.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.7.0.tgz#a90df4595e670821bf243bd2750ededdb74948b8" - integrity sha512-mYz4bpLGv5jx6YG/GvKkqbGSfV7uma2u1P3mLA41Q5vQl8W1MeuTneB8tfsLq6xxxesFubcrOC0BZBJ5R+eaCQ== +eslint-plugin-vue@^7.8.0: + version "7.8.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.8.0.tgz#cb0e85d65b65fa8d15e783fbb03c049d2c4cfdae" + integrity sha512-OGrnPz+PuYL2HmVyBHxm4mRjxW2kfFCQE6Hw9G6qOHs/Pcu0srOlCCW0FMa8SLzIEqxl8WuKoBSPcMnrjUG2vw== dependencies: eslint-utils "^2.1.0" natural-compare "^1.4.0" @@ -5195,7 +5210,7 @@ eslint-scope@^5.0.0, eslint-scope@^5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-template-visitor@^2.2.2: +eslint-template-visitor@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/eslint-template-visitor/-/eslint-template-visitor-2.3.2.tgz#b52f96ff311e773a345d79053ccc78275bbc463d" integrity sha512-3ydhqFpuV7x1M9EK52BPNj6V0Kwu0KKkcIAfpUhwHbR8ocRln/oUHgfxQupY8O1h4Qv/POHDumb/BwwNfxbtnA== @@ -9610,7 +9625,7 @@ regexp-to-ast@0.5.0: resolved "https://registry.yarnpkg.com/regexp-to-ast/-/regexp-to-ast-0.5.0.tgz#56c73856bee5e1fef7f73a00f1473452ab712a24" integrity sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw== -regexp-tree@^0.1.22, regexp-tree@~0.1.1: +regexp-tree@^0.1.23, regexp-tree@~0.1.1: version "0.1.23" resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.23.tgz#8a8ce1cc5e971acef62213a7ecdb1f6e18a1f1b2" integrity sha512-+7HWfb4Bvu8Rs2eQTUIpX9I/PlQkYOuTNbRpKLJlQpSgwSkzFYh+pUj0gtvglnOZLKB6YgnIgRuJ2/IlpL48qw== From 17c103bf879f2e4f64e5c2c20a5a716310f6f4c1 Mon Sep 17 00:00:00 2001 From: JounQin Date: Wed, 24 Mar 2021 00:23:27 +0800 Subject: [PATCH 2/2] chore: migrate husky to simple-git-hooks --- .huskyrc.js | 1 - .simple-git-hooks.js | 1 + package.json | 11 +- test/__snapshots__/fixtures.test.ts.snap | 8 + test/helpers.test.ts | 2 +- yarn.lock | 245 ++++++++++------------- 6 files changed, 119 insertions(+), 149 deletions(-) delete mode 100644 .huskyrc.js create mode 100644 .simple-git-hooks.js diff --git a/.huskyrc.js b/.huskyrc.js deleted file mode 100644 index 29b2f075..00000000 --- a/.huskyrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@1stg/husky-config') diff --git a/.simple-git-hooks.js b/.simple-git-hooks.js new file mode 100644 index 00000000..abd85eca --- /dev/null +++ b/.simple-git-hooks.js @@ -0,0 +1 @@ +module.exports = require('@1stg/simple-git-hooks') diff --git a/package.json b/package.json index 33d2fb70..7a49a06d 100644 --- a/package.json +++ b/package.json @@ -17,17 +17,17 @@ "lint": "run-p lint:*", "lint:es": "cross-env PARSER_NO_WATCH=true eslint . --cache --ext js,md,ts -f friendly", "lint:ts": "tslint -p . -t stylish", - "postinstall": "yarn-deduplicate --strategy fewer || exit 0", + "postinstall": "simple-git-hooks && yarn-deduplicate --strategy fewer || exit 0", "prerelease": "yarn build", "release": "lerna publish --conventional-commits --create-release github --yes", "test": "jest", "typecov": "type-coverage" }, "devDependencies": { - "@1stg/lib-config": "^1.2.1", + "@1stg/lib-config": "^1.2.4", "@1stg/tslint-config": "^1.2.0", "@types/eslint": "^7.2.7", - "@types/jest": "^26.0.20", + "@types/jest": "^26.0.21", "@types/node": "^14.14.35", "@types/react": "^17.0.3", "@types/unist": "^2.0.3", @@ -35,8 +35,8 @@ "eslint-plugin-mdx": "link:packages/eslint-plugin-mdx/src", "lerna": "^4.0.0", "npm-run-all": "^4.1.5", - "react": "^17.0.1", - "ts-jest": "^26.5.3", + "react": "^17.0.2", + "ts-jest": "^26.5.4", "ts-node": "^9.1.1", "tslint": "^6.1.3", "type-coverage": "^2.17.0", @@ -45,7 +45,6 @@ }, "resolutions": { "@babel/core": "^7.13.10", - "eslint-plugin-react": "~7.22.0", "prettier": "^2.2.1", "tslib": "^2.1.0" }, diff --git a/test/__snapshots__/fixtures.test.ts.snap b/test/__snapshots__/fixtures.test.ts.snap index ffe3a0ca..3fa8109e 100644 --- a/test/__snapshots__/fixtures.test.ts.snap +++ b/test/__snapshots__/fixtures.test.ts.snap @@ -140,6 +140,7 @@ Array [ "endLine": 31, "line": 31, "message": "'Tweet' is not defined.", + "messageId": "undefined", "nodeType": "JSXIdentifier", "ruleId": "react/jsx-no-undef", "severity": 2, @@ -150,6 +151,7 @@ Array [ "endLine": 33, "line": 33, "message": "'TextGradient' is not defined.", + "messageId": "undefined", "nodeType": "JSXIdentifier", "ruleId": "react/jsx-no-undef", "severity": 2, @@ -175,6 +177,7 @@ Array [ "column": 7, "line": 35, "message": "\`'\` can be escaped with \`'\`, \`‘\`, \`'\`, \`’\`.", + "messageId": "unescapedEntityAlts", "nodeType": "JSXText", "ruleId": "react/no-unescaped-entities", "severity": 1, @@ -185,6 +188,7 @@ Array [ "endLine": 41, "line": 41, "message": "'YouTube' is not defined.", + "messageId": "undefined", "nodeType": "JSXIdentifier", "ruleId": "react/jsx-no-undef", "severity": 2, @@ -237,6 +241,7 @@ Array [ "column": 290, "line": 3, "message": "\`'\` can be escaped with \`'\`, \`‘\`, \`'\`, \`’\`.", + "messageId": "unescapedEntityAlts", "nodeType": "JSXText", "ruleId": "react/no-unescaped-entities", "severity": 1, @@ -245,6 +250,7 @@ Array [ "column": 5, "line": 5, "message": "\`'\` can be escaped with \`'\`, \`‘\`, \`'\`, \`’\`.", + "messageId": "unescapedEntityAlts", "nodeType": "JSXText", "ruleId": "react/no-unescaped-entities", "severity": 1, @@ -266,6 +272,7 @@ Array [ "column": 8, "line": 2, "message": "\`>\` can be escaped with \`>\`.", + "messageId": "unescapedEntityAlts", "nodeType": "JSXText", "ruleId": "react/no-unescaped-entities", "severity": 1, @@ -274,6 +281,7 @@ Array [ "column": 13, "line": 5, "message": "\`>\` can be escaped with \`>\`.", + "messageId": "unescapedEntityAlts", "nodeType": "JSXText", "ruleId": "react/no-unescaped-entities", "severity": 1, diff --git a/test/helpers.test.ts b/test/helpers.test.ts index 0c22657e..4246790e 100644 --- a/test/helpers.test.ts +++ b/test/helpers.test.ts @@ -40,7 +40,7 @@ describe('Helpers', () => { }) it('should resolve package correctly', () => { - expect(requirePkg('@1stg/config', 'husky')).toBeDefined() + expect(requirePkg('@1stg/config', 'commitlint')).toBeDefined() expect(requirePkg('lint', 'remark')).toBeDefined() expect(requirePkg('remark-parse', 'non existed')).toBeDefined() expect( diff --git a/yarn.lock b/yarn.lock index 9955a34e..76746000 100644 --- a/yarn.lock +++ b/yarn.lock @@ -34,30 +34,31 @@ "@commitlint/config-lerna-scopes" "^12.0.1" "@pkgr/utils" "^0.6.0" -"@1stg/common-config@^1.3.1": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@1stg/common-config/-/common-config-1.3.1.tgz#e88a46c966e68cdc5575bfead2e6c95d964584c8" - integrity sha512-ACtkxsOOPLlg3QfIQt2nXOUpaqQA8yPC1Ll341MNc8ecCO+Mc1fu53OHVf0Fw9md2XBvKtC3DuE7nSRd0Q19tg== +"@1stg/common-config@^1.3.4": + version "1.3.4" + resolved "https://registry.yarnpkg.com/@1stg/common-config/-/common-config-1.3.4.tgz#4afa614b11cb496fcf0d7ea00aceb876091f6a9c" + integrity sha512-tu5PhvxbdwYKUeYxCWoN9JB4D1uhPS2BPnnLQBkHrj2oRs2vUqIZ7pBhm50ZXkt2WkJjhHZ7fjrHD8QhjApK+g== dependencies: "@1stg/babel-preset" "^1.6.0" "@1stg/commitlint-config" "^1.0.3" - "@1stg/eslint-config" "^1.10.0" - "@1stg/husky-config" "^1.0.2" + "@1stg/eslint-config" "^1.10.1" "@1stg/lint-staged" "^1.2.1" "@1stg/prettier-config" "^1.6.0" "@1stg/remark-config" "^1.1.0" + "@1stg/simple-git-hooks" "^0.1.2" "@1stg/tsconfig" "^1.2.0" "@babel/core" "^7.13.10" + "@commitlint/cli" "^12.1.0" eslint "^7.22.0" - husky "^4.3.8" lint-staged "^10.5.4" prettier "^2.2.1" + simple-git-hooks "^2.2.0" tslib "^2.1.0" -"@1stg/eslint-config@^1.10.0": - version "1.10.0" - resolved "https://registry.yarnpkg.com/@1stg/eslint-config/-/eslint-config-1.10.0.tgz#a7fa81ed79439b6b081bf7b432ddd9e8f6cfa7f8" - integrity sha512-0wyU4FZXrcEGm45Ztp/LaG2kRmJWoffxMNoe+/SDxuWT2Y3xoDGvo+Fq8e3KHAXUPQGyKv2IdeyOkouksIXGNg== +"@1stg/eslint-config@^1.10.1": + version "1.10.1" + resolved "https://registry.yarnpkg.com/@1stg/eslint-config/-/eslint-config-1.10.1.tgz#6e7b3b9ffe9c335d6c93f06efc87b53868f89045" + integrity sha512-5xWg8YeXm0z7XInfLUFPWQoanCw5kb8bXRCeX0HicCBMflZUEC9JtQ0CB7XaK84eD1mBFFYD79tqlqXKZMhz3Q== dependencies: "@babel/eslint-parser" "^7.13.10" "@babel/eslint-plugin" "^7.13.10" @@ -86,19 +87,12 @@ eslint-plugin-unicorn "^29.0.0" eslint-plugin-vue "^7.8.0" -"@1stg/husky-config@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@1stg/husky-config/-/husky-config-1.0.2.tgz#4123f168ca6c16840cfbf01049d3b629346784aa" - integrity sha512-5PHZjTL2Pz+7t07C05mzcbbjkUnQ1Bts9Bstxba5Y2/AFf9F5m8l8tvbgsRrqU8C4vLpdhtqGYK7frsZThP1ZQ== - dependencies: - "@commitlint/cli" "^12.0.1" - -"@1stg/lib-config@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@1stg/lib-config/-/lib-config-1.2.1.tgz#f990c59c702852423e75aa52228ec62080df85e1" - integrity sha512-tfyug6VRGRy8lLXOvbF4hShsDGSRYcEQHnpeB6W4KUuMPzT3S+9Sr4Ke2dCI9BuqR3fpEgIFqWPLiJpVHDKSiQ== +"@1stg/lib-config@^1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@1stg/lib-config/-/lib-config-1.2.4.tgz#5f18cffaac637ca640bb65d0750c195ae2bf1aa6" + integrity sha512-s7Ite0Sf5RJnNSeu6/ew1erY4knvAtgp/AuSUWRqeJQC0B/hfNAx6yCKwg9KnQrcTKOoFRetmn1FNXVZKcnDJA== dependencies: - "@1stg/common-config" "^1.3.1" + "@1stg/common-config" "^1.3.4" "@pkgr/rollup" "^0.11.3" jest "^26.6.3" @@ -136,6 +130,11 @@ remark-preset-lint-recommended "^5.0.0" remark-preset-prettier "^0.4.1" +"@1stg/simple-git-hooks@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@1stg/simple-git-hooks/-/simple-git-hooks-0.1.2.tgz#082f514d2645242c0139cadb9f6c2c322189fe09" + integrity sha512-nRoA/bSca+Rrzzg2YpL/lEPaqeIb99pSV37cRXcQh2VexaABOiaGnTOIN71tUlcAEfv6OePKJuLPTDxYof6G/w== + "@1stg/tsconfig@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@1stg/tsconfig/-/tsconfig-1.2.0.tgz#45f869feaac35f40134ef7318ffadcdfb6eb8b6f" @@ -1294,15 +1293,15 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@commitlint/cli@^12.0.1": - version "12.0.1" - resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-12.0.1.tgz#8960e34e8f1aed8b2ea50f223ee817fdf2264ffb" - integrity sha512-V+cMYNHJOr40XT9Kvz3Vrz1Eh7QE1rjQrUbifawDAqcOrBJFuoXwU2SAcRtYFCSqFy9EhbreQGhZFs8dYb90KA== +"@commitlint/cli@^12.1.0": + version "12.1.0" + resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-12.1.0.tgz#6f960b7f89a15ffdbabb2cbecc45514944218906" + integrity sha512-VjDjQ0kSQASvTjk1pKaigHPXCw99hye/laPbOjpX4AVJXJjMm6oV1EitZHatINImDUgVLVLpG2Y9DI/bLcVjcg== dependencies: "@commitlint/format" "^12.0.1" - "@commitlint/lint" "^12.0.1" - "@commitlint/load" "^12.0.1" - "@commitlint/read" "^12.0.1" + "@commitlint/lint" "^12.1.0" + "@commitlint/load" "^12.1.0" + "@commitlint/read" "^12.1.0" "@commitlint/types" "^12.0.1" get-stdin "8.0.0" lodash "^4.17.19" @@ -1348,28 +1347,28 @@ "@commitlint/types" "^12.0.1" chalk "^4.0.0" -"@commitlint/is-ignored@^12.0.1": - version "12.0.1" - resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-12.0.1.tgz#0e59b0524e16300b1d9d62f8c138f083f22ebf9a" - integrity sha512-AplfLn5mX/kWTIiSolcOhTYcgphuGLX8FUr+HmyHBEqUkO36jt0z9caysH47fqU71ePtH63v1DWm+RYQ5RPDjg== +"@commitlint/is-ignored@^12.1.0": + version "12.1.0" + resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-12.1.0.tgz#26f0d9fb14dff50e66f6ffedc9408dee513783ac" + integrity sha512-q8urjMNTKqvQzKOn4qLUp30vM6TK8Bxeu7lUfOrevmxuAGsIN5dr/preeFvFstP4hYIEIzrr8A2ZADCp6RSd9A== dependencies: "@commitlint/types" "^12.0.1" semver "7.3.4" -"@commitlint/lint@^12.0.1": - version "12.0.1" - resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-12.0.1.tgz#a88b01c81cb6ca1867bd3d8fd288ba30017c2b7d" - integrity sha512-1lKyRCq4ahJrY+Xxo8LsqCbALeJkodtEfpmYHeA5HpPMnK7lRSplLqOLcTCjoPfd4vO+gl6aDEZN+ow3YGQBOg== +"@commitlint/lint@^12.1.0": + version "12.1.0" + resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-12.1.0.tgz#11b1d72982a67575ea2f666ec1fd88c3f193e925" + integrity sha512-RZEdLZKx+JIBMG4HOemlgU04JQGHU9FZALbjscHZYBofnFfxr95izdP6n5sVIK542/BYpcwXWhqQ06jS8f7U5g== dependencies: - "@commitlint/is-ignored" "^12.0.1" - "@commitlint/parse" "^12.0.1" - "@commitlint/rules" "^12.0.1" + "@commitlint/is-ignored" "^12.1.0" + "@commitlint/parse" "^12.1.0" + "@commitlint/rules" "^12.1.0" "@commitlint/types" "^12.0.1" -"@commitlint/load@^12.0.1": - version "12.0.1" - resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-12.0.1.tgz#4d180fc88e5b4cfcb476a245d899f85154137502" - integrity sha512-dX8KdCWn7w0bTkkk3zKQpe9X8vsTRa5EM+1ffF313wCX9b6tGa9vujhEHCkSzKAbbE2tFV64CHZygE7rtlHdIA== +"@commitlint/load@^12.1.0": + version "12.1.0" + resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-12.1.0.tgz#ac18ad1b80e239551ad63209d660a04f3950cb58" + integrity sha512-dMQainAoKsqFFY6+BdeoCSqiiG9Y9xsqCUJfICkOUx+kzrRrlANpT/Leyd8M5RYmZiIIrxGVUKfa1c/DTaOakQ== dependencies: "@commitlint/execute-rule" "^12.0.1" "@commitlint/resolve-extends" "^12.0.1" @@ -1379,24 +1378,24 @@ lodash "^4.17.19" resolve-from "^5.0.0" -"@commitlint/message@^12.0.1": - version "12.0.1" - resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-12.0.1.tgz#caff6743db78c30a063809501cf4b835c3ce7fa6" - integrity sha512-fXuoxRC+NT1wEQi6p8oHfT7wvWIRgTk+udlRJnWTjmMpiYzVnMmmZfasdShirWr4TtxQtMyL+5DVgh7Y98kURw== +"@commitlint/message@^12.1.0": + version "12.1.0" + resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-12.1.0.tgz#661d92715dafa2251d9c46563a243acc2bbd286c" + integrity sha512-5kc4MYWJUV2npn4QQnDWr8B1osB8o/QEPnWxjnCc2JD/PMDR8svt2ja+dyjZQcLC+9Ta1G2Tu6dy1LLhyTsghw== -"@commitlint/parse@^12.0.1": - version "12.0.1" - resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-12.0.1.tgz#ba8641f53e15b523808ba2eaa48c1bf0129c91c4" - integrity sha512-7oEGASmzBnHir5jSIR7KephXrKh7rIi9a6RpH1tOT+CIENYvhe8EDtIy29qMt+RLa2LlaPF7YrAgaJRfzG0YDQ== +"@commitlint/parse@^12.1.0": + version "12.1.0" + resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-12.1.0.tgz#0bb7169e261af070190077a4aca367373c37f7a0" + integrity sha512-n3y6MxsbmsXo/eCDheN1hVsNrhQ7v9vREdLkX7MWnjnrZhD4jyMQ1DfWpd6Fo5ss0gzpfeS/HTXTgkU1S2V8DQ== dependencies: "@commitlint/types" "^12.0.1" conventional-changelog-angular "^5.0.11" conventional-commits-parser "^3.0.0" -"@commitlint/read@^12.0.1": - version "12.0.1" - resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-12.0.1.tgz#41f3295ed9f451d4c65223cd37ddd59ef714bddb" - integrity sha512-baa0YeD4QOctEuthLpExQSi9xPiw0kDPfUVHqp8I88iuIXJECeS8S1+1GBiz89e8dLN9zmEE+sN9vtJHdAp9YA== +"@commitlint/read@^12.1.0": + version "12.1.0" + resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-12.1.0.tgz#5d691e7fdc6397dd3dbc1ee8cb16b4d4f25a55d2" + integrity sha512-BXD0U/qFwPQtSOOZpD46pdhDGJ5eCVLwt41So8FdLidb28YWKA1O7Zb9CWCirG/eN42axfSNhz7XY1mD5gNa3Q== dependencies: "@commitlint/top-level" "^12.0.1" "@commitlint/types" "^12.0.1" @@ -1413,13 +1412,13 @@ resolve-from "^5.0.0" resolve-global "^1.0.0" -"@commitlint/rules@^12.0.1": - version "12.0.1" - resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-12.0.1.tgz#1c81345f468597656141338a493d5e426e44dab9" - integrity sha512-A5O0ubNGugZR9WWxk5IVOLo07lpdUwhG5WkAW2lYpgZ7Z/2U4PLob9b4Ih1eHbQu+gnVeFr91k7F0DrpM7B8EQ== +"@commitlint/rules@^12.1.0": + version "12.1.0" + resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-12.1.0.tgz#da612ffda4992ac1c30589f777f92b73f97460cd" + integrity sha512-jVuF/l60u+FBde2tto0iiFsAj0RVlKDkeENEQ6hQjdYNAxeOV7dUBndTY9vmhmCfL928sHBqRGTicdLwHHgSvA== dependencies: "@commitlint/ensure" "^12.0.1" - "@commitlint/message" "^12.0.1" + "@commitlint/message" "^12.1.0" "@commitlint/to-lines" "^12.0.1" "@commitlint/types" "^12.0.1" @@ -2802,10 +2801,10 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jest@^26.0.20": - version "26.0.20" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.20.tgz#cd2f2702ecf69e86b586e1f5223a60e454056307" - integrity sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA== +"@types/jest@^26.0.21": + version "26.0.21" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.21.tgz#3a73c2731e7e4f0fbaea56ce7ff8c79cf812bd24" + integrity sha512-ab9TyM/69yg7eew9eOwKMUmvIZAKEGZYlq/dhe5/0IMUd/QLJv5ldRMdddSn+u22N13FP3s5jYyktxuBwY0kDA== dependencies: jest-diff "^26.0.0" pretty-format "^26.0.0" @@ -3298,7 +3297,7 @@ array-ify@^1.0.0: resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4= -array-includes@^3.1.1, array-includes@^3.1.2: +array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a" integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A== @@ -3328,7 +3327,7 @@ array.prototype.flat@^1.2.3: define-properties "^1.1.3" es-abstract "^1.18.0-next.1" -array.prototype.flatmap@^1.2.3: +array.prototype.flatmap@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz#94cfd47cc1556ec0747d97f7c7738c58122004c9" integrity sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q== @@ -4161,11 +4160,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" @@ -5112,22 +5106,23 @@ eslint-plugin-react-hooks@^4.2.0: resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556" integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ== -eslint-plugin-react@^7.23.0, eslint-plugin-react@~7.22.0: - version "7.22.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz#3d1c542d1d3169c45421c1215d9470e341707269" - integrity sha512-p30tuX3VS+NWv9nQot9xIGAHBXR0+xJVaZriEsHoJrASGCJZDJ8JLNM0YqKqI0AKm6Uxaa1VUHoNEibxRCMQHA== +eslint-plugin-react@^7.23.0: + version "7.23.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.23.1.tgz#f1a2e844c0d1967c822388204a8bc4dee8415b11" + integrity sha512-MvFGhZjI8Z4HusajmSw0ougGrq3Gs4vT/0WgwksZgf5RrLrRa2oYAw56okU4tZJl8+j7IYNuTM+2RnFEuTSdRQ== dependencies: - array-includes "^3.1.1" - array.prototype.flatmap "^1.2.3" + array-includes "^3.1.3" + array.prototype.flatmap "^1.2.4" doctrine "^2.1.0" has "^1.0.3" jsx-ast-utils "^2.4.1 || ^3.0.0" - object.entries "^1.1.2" - object.fromentries "^2.0.2" - object.values "^1.1.1" + minimatch "^3.0.4" + object.entries "^1.1.3" + object.fromentries "^2.0.4" + object.values "^1.1.3" prop-types "^15.7.2" - resolve "^1.18.1" - string.prototype.matchall "^4.0.2" + resolve "^2.0.0-next.3" + string.prototype.matchall "^4.0.4" eslint-plugin-sonar@^0.4.0: version "0.4.0" @@ -5608,13 +5603,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" @@ -6149,22 +6137,6 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -husky@^4.3.8: - 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" - iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -8381,7 +8353,7 @@ object.assign@^4.1.0, object.assign@^4.1.1, object.assign@^4.1.2: has-symbols "^1.0.1" object-keys "^1.1.1" -object.entries@^1.1.2: +object.entries@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6" integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg== @@ -8391,7 +8363,7 @@ object.entries@^1.1.2: es-abstract "^1.18.0-next.1" has "^1.0.3" -object.fromentries@^2.0.2: +object.fromentries@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz#26e1ba5c4571c5c6f0890cef4473066456a120b8" integrity sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ== @@ -8417,7 +8389,7 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.1.0, object.values@^1.1.1: +object.values@^1.1.0, object.values@^1.1.1, object.values@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz#eaa8b1e17589f02f698db093f7c62ee1699742ee" integrity sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw== @@ -8449,11 +8421,6 @@ open@^7.0.4: 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== - optionator@^0.8.1: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" @@ -8839,13 +8806,6 @@ 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" - 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" @@ -9401,10 +9361,10 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== -react@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127" - integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w== +react@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" + integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -10468,6 +10428,14 @@ resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13 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" + restore-cursor@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" @@ -10670,11 +10638,6 @@ semver-dsl@^1.0.1: dependencies: semver "^5.3.0" -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.3.0, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -10783,6 +10746,11 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== +simple-git-hooks@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/simple-git-hooks/-/simple-git-hooks-2.2.0.tgz#97fd946dba9c9c31db495f4f335094d0c3988425" + integrity sha512-bxXq98GQvXAORuugWDhL0ZcydpWE6384nS/qTpqZ5NTd4GECx+HtvaqfU0wu+PHhBQT+HhektpZEpTM5b3VuBA== + simple-swizzle@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" @@ -11093,7 +11061,7 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" -string.prototype.matchall@^4.0.2: +string.prototype.matchall@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz#608f255e93e072107f5de066f81a2dfb78cf6b29" integrity sha512-pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ== @@ -11532,10 +11500,10 @@ trough@^1.0.0: resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== -ts-jest@^26.5.3: - version "26.5.3" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.3.tgz#a6ee00ba547be3b09877550df40a1465d0295554" - integrity sha512-nBiiFGNvtujdLryU7MiMQh1iPmnZ/QvOskBbD2kURiI1MwqvxlxNnaAB/z9TbslMqCsSbu5BXvSSQPc5tvHGeA== +ts-jest@^26.5.4: + version "26.5.4" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.4.tgz#207f4c114812a9c6d5746dd4d1cdf899eafc9686" + integrity sha512-I5Qsddo+VTm94SukBJ4cPimOoFZsYTeElR2xy6H2TOVs+NsvgYglW8KuQgKoApOKuaU/Ix/vrF9ebFZlb5D2Pg== dependencies: bs-logger "0.x" buffer-from "1.x" @@ -12152,11 +12120,6 @@ which-module@^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.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"