From 9cf60cb1e7929884039c7d67317b0713aad50031 Mon Sep 17 00:00:00 2001 From: JounQin Date: Sun, 3 Jul 2022 00:00:48 +0800 Subject: [PATCH] fix: auto try extensions (#126) --- .changeset/strong-beans-allow.md | 5 + .eslintignore | 1 + .github/workflows/pkg-size.yml | 2 +- .github/workflows/release.yml | 4 +- README.md | 14 ++ package.json | 34 +++- src/index.ts | 12 +- yarn.lock | 285 ++++++++++++++++--------------- 8 files changed, 210 insertions(+), 147 deletions(-) create mode 100644 .changeset/strong-beans-allow.md diff --git a/.changeset/strong-beans-allow.md b/.changeset/strong-beans-allow.md new file mode 100644 index 0000000..cfdd55b --- /dev/null +++ b/.changeset/strong-beans-allow.md @@ -0,0 +1,5 @@ +--- +"eslint-import-resolver-typescript": patch +--- + +fix: auto try extensions diff --git a/.eslintignore b/.eslintignore index 97131f9..6ccff0e 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,3 +1,4 @@ +dist lib CHANGELOG.md !/.*.cjs diff --git a/.github/workflows/pkg-size.yml b/.github/workflows/pkg-size.yml index 3938ef4..9593d90 100644 --- a/.github/workflows/pkg-size.yml +++ b/.github/workflows/pkg-size.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 16 cache: yarn - name: Package Size Report diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9d5464e..960ef0a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,10 +16,10 @@ jobs: # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits fetch-depth: 0 - - name: Setup Node.js 16.x + - name: Setup Node.js 16 uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 16 cache: yarn - name: Install Dependencies diff --git a/README.md b/README.md index 15f800b..189ba5f 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,8 @@ This means you can: - [Installation](#installation) - [Configuration](#configuration) - [Contributing](#contributing) +- [Sponsors](#sponsors) +- [Backers](#backers) - [Changelog](#changelog) - [License](#license) @@ -109,6 +111,18 @@ We have [GitHub Actions](https://github.com/import-js/eslint-import-resolver-typ If either fails, we won't be able to merge your PR until it's fixed. +## Sponsors + +| 1stG | RxTS | UnTS | +| ---------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | +| [![1stG Open Collective backers and sponsors](https://opencollective.com/1stG/organizations.svg)](https://opencollective.com/1stG) | [![RxTS Open Collective backers and sponsors](https://opencollective.com/rxts/organizations.svg)](https://opencollective.com/rxts) | [![UnTS Open Collective backers and sponsors](https://opencollective.com/unts/organizations.svg)](https://opencollective.com/unts) | + +## Backers + +| 1stG | RxTS | UnTS | +| -------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | +| [![1stG Open Collective backers and sponsors](https://opencollective.com/1stG/individuals.svg)](https://opencollective.com/1stG) | [![RxTS Open Collective backers and sponsors](https://opencollective.com/rxts/individuals.svg)](https://opencollective.com/rxts) | [![UnTS Open Collective backers and sponsors](https://opencollective.com/unts/individuals.svg)](https://opencollective.com/unts) | + ## Changelog Detailed changes for each release are documented in [CHANGELOG.md](./CHANGELOG.md). diff --git a/package.json b/package.json index d4e0c2f..005f3db 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,38 @@ "contributors": [ "JounQin (https://www.1stG.me) " ], + "donate": { + "recipients": [ + { + "name": "unts", + "platform": "opencollective", + "address": "https://opencollective.com/unts", + "weight": 60 + }, + { + "name": "rxts", + "platform": "opencollective", + "address": "https://opencollective.com/rxts", + "weight": 20 + }, + { + "name": "1stG", + "email": "i@1stg.me", + "weight": 20, + "platforms": [ + { + "platform": "opencollective", + "address": "https://opencollective.com/1stG" + }, + { + "platform": "patreon", + "address": "https://www.patreon.com/1stG" + } + ] + } + ] + }, + "funding": "https://opencollective.com/unts", "license": "ISC", "packageManager": "yarn@1.22.19", "engines": { @@ -71,7 +103,7 @@ "synckit": "^0.7.1" }, "devDependencies": { - "@1stg/lib-config": "^7.2.0", + "@1stg/lib-config": "^7.2.3", "@changesets/changelog-github": "^0.4.5", "@changesets/cli": "^2.23.0", "@mozilla/glean": "^1.0.0", diff --git a/src/index.ts b/src/index.ts index 25ad554..6e9c746 100644 --- a/src/index.ts +++ b/src/index.ts @@ -252,6 +252,7 @@ const isFile = (path?: string | undefined): path is string => { * @param {string} file the importing file's full path; i.e. '/usr/local/bin/file.js' * @returns The mapped path of the module or undefined */ +// eslint-disable-next-line sonarjs/cognitive-complexity function getMappedPath( source: string, file: string, @@ -265,7 +266,16 @@ function getMappedPath( paths = [resolved] } } else { - paths = mappers!.flatMap(mapper => mapper?.(source)).filter(isFile) + paths = mappers! + .map(mapper => + mapper?.(source).map(item => + path.extname(item) + ? item + : ['ts', 'tsx', '.d.ts', 'js'].map(ext => `${item}.${ext}`), + ), + ) + .flat(2) + .filter(isFile) } if (retry && paths.length === 0) { diff --git a/yarn.lock b/yarn.lock index e82d11d..0fc7f25 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,17 +2,17 @@ # yarn lockfile v1 -"@1stg/babel-preset@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@1stg/babel-preset/-/babel-preset-3.1.0.tgz#d190a891b77524e32f1f640d1033e27d662d1c9b" - integrity sha512-rWMZvb2wwcK4b/n7uLlGgl4flsnNAE4X7bU2F/2xlL0Rm/4iZoYz8AXSkoR1kS3da5HShaKiL/SDdbtTcNVaoQ== +"@1stg/babel-preset@^3.1.2": + version "3.1.2" + resolved "https://registry.yarnpkg.com/@1stg/babel-preset/-/babel-preset-3.1.2.tgz#fb1a7bb326e246123cbe5c929126d156d473f463" + integrity sha512-OyGJtz6mFvaluQF9qYW30CZgfkDZ/1NWJwj/299k4BCup6Pw50OCtPhgtmk/BuRmYlfY6BOMqCqSYo6ZGx2faA== dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-proposal-class-properties" "^7.17.12" - "@babel/plugin-proposal-decorators" "^7.18.2" - "@babel/preset-env" "^7.18.2" - "@babel/preset-react" "^7.17.12" - "@babel/preset-typescript" "^7.17.12" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-proposal-class-properties" "^7.18.6" + "@babel/plugin-proposal-decorators" "^7.18.6" + "@babel/preset-env" "^7.18.6" + "@babel/preset-react" "^7.18.6" + "@babel/preset-typescript" "^7.18.6" "@pkgr/utils" "^2.2.0" "@vue/babel-helper-vue-jsx-merge-props" "^1.2.1" "@vue/babel-plugin-jsx" "^1.1.1" @@ -23,35 +23,35 @@ babel-plugin-transform-remove-console "^6.9.4" babel-plugin-transform-typescript-metadata "^0.3.2" babel-preset-proposal-typescript "^2.2.0" - core-js "^3.23.2" + core-js "^3.23.3" fast-async "^7.0.6" -"@1stg/commitlint-config@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@1stg/commitlint-config/-/commitlint-config-3.1.0.tgz#31e75875fb18c057ecf6daa41a3b11f9cec409a9" - integrity sha512-Rdbe99G5G++Yv3Ji9dqvAf491FbwDCb5ive8usJOW8UYIE0qtUxv8UTtmR7l2zXOaZR9XIbe0mEDXv8Y+2pWTg== +"@1stg/commitlint-config@^3.1.2": + version "3.1.2" + resolved "https://registry.yarnpkg.com/@1stg/commitlint-config/-/commitlint-config-3.1.2.tgz#24f3e5e8b76c140d134592e989290b36c2059bd3" + integrity sha512-+i32MEB6huNHUytgSWfih7UwIR/bVUJpilJEiLkz3YawonK4eSDPSO48h8FUQOxSvViINlPJVgZTHhuvhlD+ZQ== dependencies: "@commitlint/config-conventional" "^17.0.3" "@commitlint/config-lerna-scopes" "^17.0.2" "@pkgr/utils" "^2.2.0" -"@1stg/common-config@^5.2.0": - version "5.2.0" - resolved "https://registry.yarnpkg.com/@1stg/common-config/-/common-config-5.2.0.tgz#7cdbf741eee9bf2137fd104bca3cd6e99eb966e6" - integrity sha512-0RxOHVVNWvfwBbQUjVPvUG9By1zadcx6qQrBvufMdAsnd8vvNGUaGHCsCN3ZzMVsYVHSQ/DzOXnVu8JN8n2znw== - dependencies: - "@1stg/babel-preset" "^3.1.0" - "@1stg/commitlint-config" "^3.1.0" - "@1stg/eslint-config" "^5.2.0" - "@1stg/lint-staged" "^3.1.0" - "@1stg/markuplint-config" "^2.1.0" - "@1stg/prettier-config" "^3.3.0" - "@1stg/remark-config" "^4.0.0" - "@1stg/simple-git-hooks" "^0.1.2" - "@1stg/tsconfig" "^2.2.0" +"@1stg/common-config@^5.2.3": + version "5.2.3" + resolved "https://registry.yarnpkg.com/@1stg/common-config/-/common-config-5.2.3.tgz#fd735c72be6390c3d27f9dae3291a8bfa31e459a" + integrity sha512-G5/r8/sJM7X8cs/IickBNE5p9+woeTm2QhF69ib3cwVWftVKpzn0V8EZ0LlMsf8xke0sw0tXNxqnmyoFEu3zBw== + dependencies: + "@1stg/babel-preset" "^3.1.2" + "@1stg/commitlint-config" "^3.1.2" + "@1stg/eslint-config" "^5.2.3" + "@1stg/lint-staged" "^3.1.3" + "@1stg/markuplint-config" "^2.1.2" + "@1stg/prettier-config" "^3.4.2" + "@1stg/remark-config" "^4.0.2" + "@1stg/simple-git-hooks" "^0.1.4" + "@1stg/tsconfig" "^2.2.2" "@babel/core" "^7.18.6" "@commitlint/cli" "^17.0.3" - eslint "^8.18.0" + eslint "^8.19.0" lint-staged "^13.0.3" npm-run-all "^4.1.5" prettier "^2.7.1" @@ -59,10 +59,10 @@ tslib "^2.4.0" yarn-deduplicate "^5.0.0" -"@1stg/eslint-config@^5.2.0": - version "5.2.0" - resolved "https://registry.yarnpkg.com/@1stg/eslint-config/-/eslint-config-5.2.0.tgz#3b7d0d2384c9b87c3977e9ce851e846b994a5e79" - integrity sha512-5esuP8ooR0CD31EgCQ5GZHB+PMPSbBfgAE1u6Q9vbdfzPDXlk9IVediJc8c8VlqMRybzOmyTbkttTNB/s1I72w== +"@1stg/eslint-config@^5.2.3": + version "5.2.3" + resolved "https://registry.yarnpkg.com/@1stg/eslint-config/-/eslint-config-5.2.3.tgz#9d7a2de4fb7c0484fdc5244f4ceb1ece798bc242" + integrity sha512-vw2JXTYKEoVLClU/C/fAVUnW12Nordsm3hjSQmOhIUsbBMaMbBaLkSfeRwDTq3LEWKKK0ssKxPWTH2nPMRnYtA== dependencies: "@angular-eslint/eslint-plugin" "^14.0.0" "@angular-eslint/eslint-plugin-template" "^14.0.0" @@ -70,15 +70,15 @@ "@babel/eslint-parser" "^7.18.2" "@babel/eslint-plugin" "^7.17.7" "@pkgr/utils" "^2.2.0" - "@typescript-eslint/eslint-plugin" "^5.30.0" - "@typescript-eslint/parser" "^5.30.0" + "@typescript-eslint/eslint-plugin" "^5.30.3" + "@typescript-eslint/parser" "^5.30.3" angular-eslint-template-parser "^0.1.1" eslint-config-prettier "^8.5.0" eslint-config-standard "^17.0.0" eslint-config-standard-jsx "^11.0.0" eslint-config-standard-react "^11.0.1" eslint-formatter-friendly "^7.0.0" - eslint-import-resolver-typescript "^3.1.3" + eslint-import-resolver-typescript "^3.1.4" eslint-plugin-css "^0.6.0" eslint-plugin-es-x "^5.2.1" eslint-plugin-eslint-comments "^3.2.0" @@ -104,53 +104,53 @@ eslint-plugin-vue "^9.1.1" eslint-plugin-yml "^1.0.0" -"@1stg/lib-config@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@1stg/lib-config/-/lib-config-7.2.0.tgz#3da634e06863731360d77b64dbeed2e02a2217df" - integrity sha512-v9haDSDK48TjhAj2+oJk+AxQY6IeAKTs+vWDvPsSsDXBIaJdj516hK/WpJP+jl3c5SJcDOnUKJniynaMflWD3w== +"@1stg/lib-config@^7.2.3": + version "7.2.3" + resolved "https://registry.yarnpkg.com/@1stg/lib-config/-/lib-config-7.2.3.tgz#f6ffadfaeaaa5b5b99a7845edb992197189cb56d" + integrity sha512-eWgcHfkYNtahuM4LM7sUJBPyNKcf57f9AxEMlxiUdKCjlq7edGflgsKN1YHBVa/7s84bdV9JOZG1jRxaCUwNRA== dependencies: - "@1stg/common-config" "^5.2.0" + "@1stg/common-config" "^5.2.3" "@pkgr/rollup" "^3.1.2" jest "^28.1.2" -"@1stg/lint-staged@^3.1.0": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@1stg/lint-staged/-/lint-staged-3.1.1.tgz#05a945e7b3ec3c4ca9aa222fba97ea6391fd5f81" - integrity sha512-/wgkp7OoqqDxvYhA7+6HQ/5261z0MylJejjaVVvopxPDrWJKiH6WyLkDHTY8iUY3RgQtgUrYjduP/rLyE3QlXg== +"@1stg/lint-staged@^3.1.3": + version "3.1.3" + resolved "https://registry.yarnpkg.com/@1stg/lint-staged/-/lint-staged-3.1.3.tgz#2295bdf750015208842bff04115605fa61bab0c4" + integrity sha512-4iCUv6l5xJTWBrnJgb+N79XPCwUOT6yIO+sSlu1D1l0TuqiPAnu+I5Mj0ButNXZJ7n3QWVx8HeCDPFLs4XVU1g== dependencies: - "@1stg/prettier-config" "^3.4.0" - "@1stg/tsconfig" "^2.2.0" + "@1stg/prettier-config" "^3.4.2" + "@1stg/tsconfig" "^2.2.2" "@pkgr/utils" "^2.2.0" cross-env "^7.0.3" prettier "^2.7.1" -"@1stg/markuplint-config@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@1stg/markuplint-config/-/markuplint-config-2.1.0.tgz#d488799ab4fea45809f1cd711cbab98017986f22" - integrity sha512-VuO/H4k6jiJQuwcwL9j4T1cUJubbUHyhmmgKDPzlkX65cxq6gq/Hwj35nH+c2kCICFb5J2+U9lqhaREozuXYTQ== +"@1stg/markuplint-config@^2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@1stg/markuplint-config/-/markuplint-config-2.1.2.tgz#e6d86d4ba8970facf4b866ff71d002835f806af5" + integrity sha512-0JC9UTOkAXzpdEIvS8Zas//hM5lUSQhXoizrFFLFG5Z4AG4e0hyQSo5cteT76sl/cEFoJc3hrJw1KhBMTty+mQ== dependencies: "@markuplint/vue-parser" "^2.3.1" "@markuplint/vue-spec" "^2.1.0" markuplint-angular-parser "^1.1.2" -"@1stg/prettier-config@^3.3.0", "@1stg/prettier-config@^3.4.0": - version "3.4.0" - resolved "https://registry.yarnpkg.com/@1stg/prettier-config/-/prettier-config-3.4.0.tgz#e56dcd8ddecf3e0ebd6e28d539c7a63f3633d451" - integrity sha512-7t22zqcA9yQyVwdYgbAi0Pxq3Te4eIZEVlaHhW2iQ1iXc0fetkbze/zgcs/HKulFuaxrCo7rw3L6rO+r/QGH1g== +"@1stg/prettier-config@^3.4.2": + version "3.4.2" + resolved "https://registry.yarnpkg.com/@1stg/prettier-config/-/prettier-config-3.4.2.tgz#a4ec004cd8d10b07636c5644f0f841ac45a3a9b1" + integrity sha512-1EqirgrHhQ+OU/iw2hNz2CJyHcvUCngyvgtgehwDVIlb6oafbkMzm05NzCf+dy2TSBj7cARK+B4sCR5ixzCNXw== dependencies: "@prettier/plugin-pug" "^2.1.1" "@prettier/plugin-ruby" "^3.1.2" "@prettier/plugin-xml" "^2.2.0" - prettier-plugin-pkg "^0.14.1" - prettier-plugin-sh "^0.12.4" - prettier-plugin-stylus "^0.0.1-beta.1" + prettier-plugin-pkg "^0.15.0" + prettier-plugin-sh "^0.12.5" + prettier-plugin-stylus "^0.0.1-beta.3" prettier-plugin-svelte "^2.7.0" prettier-plugin-toml "^0.3.1" -"@1stg/remark-config@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@1stg/remark-config/-/remark-config-4.0.0.tgz#5948a55c82b1e783710ca72998ded0e924bc9b75" - integrity sha512-tl6OkyymnEeWqRh7AoCXb4oW9QJqi53j02Zz7sNMr6g3QfXa6hJrSUAJqwLODxvLftQihd6Bw0whOy9yJjzpcg== +"@1stg/remark-config@^4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@1stg/remark-config/-/remark-config-4.0.2.tgz#95f9bbf5e0081e2f31e998cb19430c4b0da2c8ed" + integrity sha512-Yk+hdLzKGhnKy3o35vYFbL6Zu+ZUvGgG6oHGT6mUwD4NPqKd0bZfdBJb6t76DopjmFk86BzR9Asw+hNsAMmBvg== dependencies: remark-frontmatter "^4.0.1" remark-gfm "^3.0.1" @@ -163,15 +163,15 @@ remark-preset-prettier "^1.0.1" remark-validate-links "^12.0.0" -"@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/simple-git-hooks@^0.1.4": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@1stg/simple-git-hooks/-/simple-git-hooks-0.1.4.tgz#94a80d8246c446c9681288f1fc9b9b35fc0baba9" + integrity sha512-qLPZ5OuuaUd3Z84AxBgqVOcRnksMC/aBK5HK1gFW709z6yZNUoW55OL+YlWAuOdfFXFqJypDbudNlIIBDsgiZw== -"@1stg/tsconfig@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@1stg/tsconfig/-/tsconfig-2.2.0.tgz#c2cae408f50d93453bee3d711edccdada4ad7558" - integrity sha512-E0Pc01vJv3E+RhsXW/AmtX+itUR83Q/W9NL6XehScwcFaWXdEQG7d3D3eRdnZaYg9fMJYHgms0/vxurtKfxrGw== +"@1stg/tsconfig@^2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@1stg/tsconfig/-/tsconfig-2.2.2.tgz#7fb403562b112d74d5c7dca8ff56a8f28f6262b5" + integrity sha512-gIx7pB0HvbISmZ8AdlYwLdJlZW99B9P9JaCsGtzt1dzHfhjUN6yuegND/y1+QMZzgCN1+kgTBSpzsACecolsTQ== "@ampproject/remapping@^2.1.0": version "2.2.0" @@ -407,7 +407,7 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.17.12", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.6.tgz#9448974dd4fb1d80fefe72e8a0af37809cd30d6d" integrity sha512-gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg== @@ -532,7 +532,7 @@ "@babel/helper-remap-async-to-generator" "^7.18.6" "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.17.12", "@babel/plugin-proposal-class-properties@^7.18.6": +"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3" integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ== @@ -549,7 +549,7 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-proposal-decorators@^7.18.2": +"@babel/plugin-proposal-decorators@^7.18.2", "@babel/plugin-proposal-decorators@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.6.tgz#68e9fd0f022b944f84a8824bb28bfaee724d2595" integrity sha512-gAdhsjaYmiZVxx5vTMiRfj31nB7LhwBJFMSLzeDxc7X4tKLixup0+k9ughn0RcpBrv9E3PBaXJW7jF5TCihAOg== @@ -1211,7 +1211,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/preset-env@^7.18.2": +"@babel/preset-env@^7.18.2", "@babel/preset-env@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.6.tgz#953422e98a5f66bc56cd0b9074eaea127ec86ace" integrity sha512-WrthhuIIYKrEFAwttYzgRNQ5hULGmwTj+D6l7Zdfsv5M7IWV/OZbUfbeL++Qrzx1nVJwWROIFhCHRYQV4xbPNw== @@ -1303,7 +1303,7 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/preset-react@^7.17.12": +"@babel/preset-react@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.18.6.tgz#979f76d6277048dc19094c217b507f3ad517dd2d" integrity sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg== @@ -1315,7 +1315,7 @@ "@babel/plugin-transform-react-jsx-development" "^7.18.6" "@babel/plugin-transform-react-pure-annotations" "^7.18.6" -"@babel/preset-typescript@^7.17.12": +"@babel/preset-typescript@^7.17.12", "@babel/preset-typescript@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz#ce64be3e63eddc44240c6358daefac17b3186399" integrity sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ== @@ -2761,14 +2761,14 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^5.30.0": - version "5.30.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.30.1.tgz#21a960285f0ce00cc82f09f536ead755ec6017bd" - integrity sha512-Ffa9FZqZUVJKwCL8PMHTJCkO7IKA3/x0mYy5qcqcwcmjPdpJ1FnWdZQAqKGJolZ1ymLxygcdrNR9yzNIh/bZtQ== +"@typescript-eslint/eslint-plugin@^5.30.3": + version "5.30.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.30.3.tgz#2f293e56b73c4f281e48d253af4a17f21a55d54c" + integrity sha512-QEgE1uahnDbWEkZlidq7uKB630ny1NN8KbLPmznX+8hYsYpoV1/quG1Nzvs141FVuumuS7O0EpqYw3RB4AVzRg== dependencies: - "@typescript-eslint/scope-manager" "5.30.1" - "@typescript-eslint/type-utils" "5.30.1" - "@typescript-eslint/utils" "5.30.1" + "@typescript-eslint/scope-manager" "5.30.3" + "@typescript-eslint/type-utils" "5.30.3" + "@typescript-eslint/utils" "5.30.3" debug "^4.3.4" functional-red-black-tree "^1.0.1" ignore "^5.2.0" @@ -2776,14 +2776,14 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/parser@^5.30.0": - version "5.30.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.30.1.tgz#d25d3630fcb4f48417db96b26800e9c15e63f54a" - integrity sha512-mRcFvIWhIx4QpMVu7JLPm3qDwY8qhRVRKzbgaUKToI5qVEWqUWu+6I1ZY//xymDMN3QKBOIWSvxcgng1lyu8jw== +"@typescript-eslint/parser@^5.30.3": + version "5.30.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.30.3.tgz#d288c7dbeadf22403112c773dd53e0700f6dd6d5" + integrity sha512-ddwGEPC3E49DduAUC8UThQafHRE5uc1NE8jdOgl+w8/NrYF50MJQNeD3u4JZrqAXdY9rJz0CdQ9HpNME20CzkA== dependencies: - "@typescript-eslint/scope-manager" "5.30.1" - "@typescript-eslint/types" "5.30.1" - "@typescript-eslint/typescript-estree" "5.30.1" + "@typescript-eslint/scope-manager" "5.30.3" + "@typescript-eslint/types" "5.30.3" + "@typescript-eslint/typescript-estree" "5.30.3" debug "^4.3.4" "@typescript-eslint/scope-manager@5.29.0": @@ -2794,20 +2794,20 @@ "@typescript-eslint/types" "5.29.0" "@typescript-eslint/visitor-keys" "5.29.0" -"@typescript-eslint/scope-manager@5.30.1": - version "5.30.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.30.1.tgz#a4370aae94db80c689178e4420c1afe82557d421" - integrity sha512-L57F9W0Zr9mF8UyHQweSbfo7Jac7KfkLl+CcYr4VP+d44KBHflTpyvwLwv1A/Ff1hxqKWHYHsc5TcjHB+ZIZtg== +"@typescript-eslint/scope-manager@5.30.3": + version "5.30.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.30.3.tgz#de7edb0b59efd71975a82cbf3f1b97c5c90769f0" + integrity sha512-yVJIIUXeo/vv6Alj6lKBvsqnRs5hcxUpN3Dg3aD9Zv6r7p6Nn106jJcr5rnpRHAReEb/aMI2RWrt3JmL17eCVA== dependencies: - "@typescript-eslint/types" "5.30.1" - "@typescript-eslint/visitor-keys" "5.30.1" + "@typescript-eslint/types" "5.30.3" + "@typescript-eslint/visitor-keys" "5.30.3" -"@typescript-eslint/type-utils@5.30.1": - version "5.30.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.30.1.tgz#91c3231ff7ec22736f421931e85dc8cc6356615e" - integrity sha512-N8ZYmXzFXvnSbD4v4mwDNxkfjp5qVu3PfP4uW9bAfsJHhL/05YBL8chs0oP7+UGIdcJBPwzB6s1EyUbRfjxZAQ== +"@typescript-eslint/type-utils@5.30.3": + version "5.30.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.30.3.tgz#1bb4efcfc8de38086d50096709b2cccf72684515" + integrity sha512-IIzakE7OXOqdwPaXhRiPnaZ8OuJJYBLufOffd9fqzkI4IMFIYq8KC7bghdnF7QUJTirURRErQFrJ/w5UpwIqaw== dependencies: - "@typescript-eslint/utils" "5.30.1" + "@typescript-eslint/utils" "5.30.3" debug "^4.3.4" tsutils "^3.21.0" @@ -2816,10 +2816,10 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.29.0.tgz#7861d3d288c031703b2d97bc113696b4d8c19aab" integrity sha512-X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg== -"@typescript-eslint/types@5.30.1": - version "5.30.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.30.1.tgz#02729ffafd0702be6a77177b268ba0f263902c4f" - integrity sha512-YL6O8aH4Iw8PPewfX0PGap5exJ96hFi/n+zOIjb08ba9gghXFlpChzCxvZbEXc0V0dQYjuxRThcOxHkGmqiHAw== +"@typescript-eslint/types@5.30.3": + version "5.30.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.30.3.tgz#8ef6313dcec2e297b167dd25ef363e36857c49ff" + integrity sha512-vshU3pjSTgBPNgfd55JLYngHkXuwQP68fxYFUAg1Uq+JrR3xG/XjvL9Dmv28CpOERtqwkaR4QQ3mD0NLZcE2Xw== "@typescript-eslint/typescript-estree@5.29.0": version "5.29.0" @@ -2834,13 +2834,13 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@5.30.1": - version "5.30.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.30.1.tgz#e02d6146f49d2d885cebba270fc0cc8619cd49a0" - integrity sha512-8pxRQco97J+rYsjN6P0+e+rmPOHyRx0xrOZ21Z3zMG+CfX0bo7ieh8Z+bvXn4N3zoNRc37VyD2zvzX3YTebXGw== +"@typescript-eslint/typescript-estree@5.30.3": + version "5.30.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.30.3.tgz#d5ff918499dd56039864c157a898b1322d7bff8c" + integrity sha512-jqVh5N9AJx6+7yRgoA+ZelAFrHezgI9pzI9giv7s84DDOmtpFwTgURcpICDHyz9x6vAeOu91iACZ4dBTVfzIyA== dependencies: - "@typescript-eslint/types" "5.30.1" - "@typescript-eslint/visitor-keys" "5.30.1" + "@typescript-eslint/types" "5.30.3" + "@typescript-eslint/visitor-keys" "5.30.3" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -2859,15 +2859,15 @@ eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/utils@5.30.1", "@typescript-eslint/utils@^5.10.0": - version "5.30.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.30.1.tgz#d4cd13a9ec39833d74588edea7620fe11aed1df9" - integrity sha512-0kR4AKO9iT1qKEqxqIfqOubJouRdUkpdLi4iWOu/cG2m0BpcYBpRNXETSpugpycta76CC/7hHrzieyq/qrU+5Q== +"@typescript-eslint/utils@5.30.3", "@typescript-eslint/utils@^5.10.0": + version "5.30.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.30.3.tgz#be2ebaef73e5610c866c4f29ed33669acc89e3fc" + integrity sha512-OEaBXGxxdIy35H+jyXfYAMQ66KMJczK9hEhL3gR6IRbWe5PyK+bPDC9zbQNVII6rNFTfF/Mse0z21NlEU+vOMw== dependencies: "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.30.1" - "@typescript-eslint/types" "5.30.1" - "@typescript-eslint/typescript-estree" "5.30.1" + "@typescript-eslint/scope-manager" "5.30.3" + "@typescript-eslint/types" "5.30.3" + "@typescript-eslint/typescript-estree" "5.30.3" eslint-scope "^5.1.1" eslint-utils "^3.0.0" @@ -2879,12 +2879,12 @@ "@typescript-eslint/types" "5.29.0" eslint-visitor-keys "^3.3.0" -"@typescript-eslint/visitor-keys@5.30.1": - version "5.30.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.30.1.tgz#989039d1e0ec5e7d76138cbdc0ca21f3e0d36b46" - integrity sha512-Ag9rdIwoMUqX8euF/BoQzC57eUmcqNfWPVBnGTJKAHu8oMGXGH75q4HyXjHD1JBnyKBqBpS97tqbcjxleqLMLw== +"@typescript-eslint/visitor-keys@5.30.3": + version "5.30.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.30.3.tgz#2c5f7a16c36748d1c51ea5a9c29bfb64780ce466" + integrity sha512-ep2xtHOhnSRt6fDP9DSSxrA/FqZhdMF7/Y9fYsxrKss2uWJMbzJyBJ/We1fKc786BJ10pHwrzUlhvpz8i7XzBg== dependencies: - "@typescript-eslint/types" "5.30.1" + "@typescript-eslint/types" "5.30.3" eslint-visitor-keys "^3.3.0" "@vue/babel-helper-vue-jsx-merge-props@^1.2.1": @@ -3873,7 +3873,7 @@ core-js-compat@^3.21.0, core-js-compat@^3.22.1: browserslist "^4.21.0" semver "7.0.0" -core-js@^3.23.1, core-js@^3.23.2: +core-js@^3.23.1, core-js@^3.23.3: version "3.23.3" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.3.tgz#3b977612b15da6da0c9cc4aec487e8d24f371112" integrity sha512-oAKwkj9xcWNBAvGbT//WiCdOMpb9XQG92/Fe3ABFM/R16BsHgePG00mFOgKf7IsCtfj8tA1kHtf/VwErhriz5Q== @@ -4629,8 +4629,9 @@ eslint-import-resolver-node@^0.3.6: debug "^3.2.7" resolve "^1.20.0" -eslint-import-resolver-typescript@^3.1.3: +eslint-import-resolver-typescript@^3.1.4: version "0.0.0" + uid "" "eslint-import-resolver-typescript@link:.": version "0.0.0" @@ -4997,10 +4998,10 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.1.0, eslint-visitor-keys@^3.3 resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint@^8.18.0: - version "8.18.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.18.0.tgz#78d565d16c993d0b73968c523c0446b13da784fd" - integrity sha512-As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA== +eslint@^8.19.0: + version "8.19.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.19.0.tgz#7342a3cbc4fbc5c106a1eefe0fd0b50b6b1a7d28" + integrity sha512-SXOPj3x9VKvPe81TjjUJCYlV4oJjQw68Uek+AM0X4p+33dj2HY5bpTZOgnQHcG2eAm1mtCU9uNMnJi7exU/kYw== dependencies: "@eslint/eslintrc" "^1.3.0" "@humanwhocodes/config-array" "^0.9.2" @@ -8707,22 +8708,22 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier-plugin-pkg@^0.14.1: - version "0.14.1" - resolved "https://registry.yarnpkg.com/prettier-plugin-pkg/-/prettier-plugin-pkg-0.14.1.tgz#1497d5f521186b401accd3f4c56a5a27e0102d92" - integrity sha512-kZpzhngToaUOudqZ2drGCbJbfSitMbTRv3i5eUVWXphqk1vn3PC90RFe1q3jsZOXRy0bELsFrwAxzq6a+wDNDQ== +prettier-plugin-pkg@^0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/prettier-plugin-pkg/-/prettier-plugin-pkg-0.15.0.tgz#5a8ef642187749e87ad6505c1cce369675144fd5" + integrity sha512-HhscJxwM0Jc4Wp/a0kr4yvOwcUtoQVC/1KEPGByUNEv/pdXFY3Ih4/uLF4cEUYM9HkmCQ/PiIoLasc8qWUA9Fg== -prettier-plugin-sh@^0.12.4: - version "0.12.4" - resolved "https://registry.yarnpkg.com/prettier-plugin-sh/-/prettier-plugin-sh-0.12.4.tgz#39d57b2345111de8fc8a3f28975fa92369502f65" - integrity sha512-s0SK0hdng0Qv44Gs5yjUyk/j+LEmgoCpvEZ4LS0GglkeTyCR4gqgCrJ/ksbK+1ZuHB6UJ8e2ReOoln0Qfu2T9w== +prettier-plugin-sh@^0.12.5: + version "0.12.6" + resolved "https://registry.yarnpkg.com/prettier-plugin-sh/-/prettier-plugin-sh-0.12.6.tgz#7d0f184c3106a387817afaa136429958a0d1a64a" + integrity sha512-Tqzj6mDW/+8umOgZO/qfLcpWYZFnRKYC3T9uK3t5aKpxeIspB7rT70TS3IFjUnYNQOLUM542HRW18L6Imj+uYQ== dependencies: mvdan-sh "^0.10.1" -prettier-plugin-stylus@^0.0.1-beta.1: - version "0.0.1-beta.1" - resolved "https://registry.yarnpkg.com/prettier-plugin-stylus/-/prettier-plugin-stylus-0.0.1-beta.1.tgz#12ff379a80e5d8394e66fd261748db2f4d7658eb" - integrity sha512-3Nql0NP4MDeg3yeQQ+Xwkg+9EuFVwcSfTnxh1yMZpPzhI4pyKh78o9wLYUVO9A4uiME27Ti2OEa9p7IUJrPrbQ== +prettier-plugin-stylus@^0.0.1-beta.3: + version "0.0.1-beta.3" + resolved "https://registry.yarnpkg.com/prettier-plugin-stylus/-/prettier-plugin-stylus-0.0.1-beta.3.tgz#7025e03aae1f8cd937b627304d5bae9037ccf5fa" + integrity sha512-/Y5yKdUTUtAtI7JRzyA+w+JQWy5xUEeWKPOunMW5X+m8QHzhrFmOncHw643Y2BAgpUaQgO5zSJT+aZiYzvb+sA== dependencies: prettier "^2.6.2" stylus "^0.57.0"