From cc3e50e4d993c059bbfe203c079ebbdfa4828f05 Mon Sep 17 00:00:00 2001 From: James Henry Date: Mon, 5 Apr 2021 18:04:45 +0400 Subject: [PATCH] chore(angular): update @angular-eslint dependencies to latest --- package.json | 6 +- packages/angular/migrations.json | 17 +++ .../convert-tslint-to-eslint.spec.ts.snap | 12 +- packages/angular/src/utils/versions.ts | 2 +- yarn.lock | 113 +++++++++--------- 5 files changed, 83 insertions(+), 67 deletions(-) diff --git a/package.json b/package.json index f5b02edc9a..f746a638c7 100644 --- a/package.json +++ b/package.json @@ -32,9 +32,9 @@ "@angular-devkit/build-webpack": "~0.1102.0", "@angular-devkit/core": "~11.2.0", "@angular-devkit/schematics": "~11.2.0", - "@angular-eslint/eslint-plugin": "~1.0.0", - "@angular-eslint/eslint-plugin-template": "~1.0.0", - "@angular-eslint/template-parser": "~1.0.0", + "@angular-eslint/eslint-plugin": "~2.0.2", + "@angular-eslint/eslint-plugin-template": "~2.0.2", + "@angular-eslint/template-parser": "~2.0.2", "@angular/cli": "~11.2.0", "@angular/common": "~11.2.0", "@angular/compiler": "~11.2.0", diff --git a/packages/angular/migrations.json b/packages/angular/migrations.json index ca368def21..cb194c563e 100644 --- a/packages/angular/migrations.json +++ b/packages/angular/migrations.json @@ -394,6 +394,23 @@ "alwaysAddToPackageJson": false } } + }, + "11.6.2": { + "version": "11.6.2-beta.0", + "packages": { + "@angular-eslint/eslint-plugin": { + "version": "~2.0.2", + "alwaysAddToPackageJson": false + }, + "@angular-eslint/eslint-plugin-template": { + "version": "~2.0.2", + "alwaysAddToPackageJson": false + }, + "@angular-eslint/template-parser": { + "version": "~2.0.2", + "alwaysAddToPackageJson": false + } + } } } } diff --git a/packages/angular/src/generators/convert-tslint-to-eslint/__snapshots__/convert-tslint-to-eslint.spec.ts.snap b/packages/angular/src/generators/convert-tslint-to-eslint/__snapshots__/convert-tslint-to-eslint.spec.ts.snap index dea0b1744f..8c825a1a55 100644 --- a/packages/angular/src/generators/convert-tslint-to-eslint/__snapshots__/convert-tslint-to-eslint.spec.ts.snap +++ b/packages/angular/src/generators/convert-tslint-to-eslint/__snapshots__/convert-tslint-to-eslint.spec.ts.snap @@ -4,9 +4,9 @@ exports[`convert-tslint-to-eslint should work for Angular applications 1`] = ` Object { "dependencies": Object {}, "devDependencies": Object { - "@angular-eslint/eslint-plugin": "~1.0.0", - "@angular-eslint/eslint-plugin-template": "~1.0.0", - "@angular-eslint/template-parser": "~1.0.0", + "@angular-eslint/eslint-plugin": "~2.0.2", + "@angular-eslint/eslint-plugin-template": "~2.0.2", + "@angular-eslint/template-parser": "~2.0.2", "@nrwl/eslint-plugin-nx": "*", "@nrwl/linter": "*", "@typescript-eslint/eslint-plugin": "4.19.0", @@ -356,9 +356,9 @@ exports[`convert-tslint-to-eslint should work for Angular libraries 1`] = ` Object { "dependencies": Object {}, "devDependencies": Object { - "@angular-eslint/eslint-plugin": "~1.0.0", - "@angular-eslint/eslint-plugin-template": "~1.0.0", - "@angular-eslint/template-parser": "~1.0.0", + "@angular-eslint/eslint-plugin": "~2.0.2", + "@angular-eslint/eslint-plugin-template": "~2.0.2", + "@angular-eslint/template-parser": "~2.0.2", "@nrwl/eslint-plugin-nx": "*", "@nrwl/linter": "*", "@typescript-eslint/eslint-plugin": "4.19.0", diff --git a/packages/angular/src/utils/versions.ts b/packages/angular/src/utils/versions.ts index f9d675f223..3afd2d881a 100644 --- a/packages/angular/src/utils/versions.ts +++ b/packages/angular/src/utils/versions.ts @@ -5,4 +5,4 @@ export const angularJsVersion = '1.7.9'; export const ngrxVersion = '^11.0.0'; export const rxjsVersion = '~6.6.3'; export const jestPresetAngularVersion = '8.3.2'; -export const angularEslintVersion = '~1.0.0'; +export const angularEslintVersion = '~2.0.2'; diff --git a/yarn.lock b/yarn.lock index ec3d497824..9694ada057 100644 --- a/yarn.lock +++ b/yarn.lock @@ -159,26 +159,26 @@ ora "5.3.0" rxjs "6.6.3" -"@angular-eslint/eslint-plugin-template@~1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-1.0.0.tgz#a969070b4df0628aed8e30164fb86a8002c0385c" - integrity sha512-+LrAypsGUaW98aoDb/ITWWDKYHYp6UcJraJU7/bih7AQOJyDs6AnpbMPLscTcxkcCP2ylmJ31pEzYz4ItNKRTQ== +"@angular-eslint/eslint-plugin-template@~2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-2.0.2.tgz#1d874e08c70f31c77218d8ff92b8ba55ccf0b5b6" + integrity sha512-STk9bTVSJwX8ctHFNx7G+HanbMfpeX5B3hmaUQ7qloM+JPihk+b7BmXT8BjOnXOT+yN8r3NHF9agekyAiYGRkg== dependencies: - "@typescript-eslint/experimental-utils" "4.3.0" + "@typescript-eslint/experimental-utils" "4.16.1" aria-query "^4.2.2" axobject-query "^2.2.0" -"@angular-eslint/eslint-plugin@~1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin/-/eslint-plugin-1.0.0.tgz#741a98c351ee02edb7d7f70473da699ee2eafa09" - integrity sha512-oar+5WhqFMVrK8ywTAJAnnisIQyG6I2STHHwVURx4rPyzjk3pZN10c3KgJuOF5FExfO2bewwr8FBy1CEZsh90w== +"@angular-eslint/eslint-plugin@~2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin/-/eslint-plugin-2.0.2.tgz#58be0c864cb84c7ee024f2be6af04e90ba14c97f" + integrity sha512-/hJNXUjPEXwsmXeWneAW7X3Jg+JwsMavQ8eQ4UevcaKx4Ozthh09n6oyegqc82Y48Adcce7KyalGCKmWY19piA== dependencies: - "@typescript-eslint/experimental-utils" "4.3.0" + "@typescript-eslint/experimental-utils" "4.16.1" -"@angular-eslint/template-parser@~1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@angular-eslint/template-parser/-/template-parser-1.0.0.tgz#e4d431db36e64bf14cca90e19f40eb48c3c20402" - integrity sha512-M7rj907yOoEzq10FO5BDX7Ylw24V+YfdsYfyEi/TzzQtNGxCwQhbEwXc1PAZgsQ+P1wbGFbg9mb3yFkps7/LEA== +"@angular-eslint/template-parser@~2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@angular-eslint/template-parser/-/template-parser-2.0.2.tgz#ca1abafdbfd7a59679ff2b5e0ca1dc00aa617b81" + integrity sha512-oMXNAokWWnJF/Jp4fJwm5F/tv+9sShc5yio5cELHFCsn8l1wetTmHMe9xqbwS7aFosJ7BnGj6aSq3WpckWzXTg== dependencies: eslint-scope "^5.1.0" @@ -4269,6 +4269,18 @@ semver "^7.3.2" tsutils "^3.17.1" +"@typescript-eslint/experimental-utils@4.16.1": + version "4.16.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz#da7a396dc7d0e01922acf102b76efff17320b328" + integrity sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ== + dependencies: + "@types/json-schema" "^7.0.3" + "@typescript-eslint/scope-manager" "4.16.1" + "@typescript-eslint/types" "4.16.1" + "@typescript-eslint/typescript-estree" "4.16.1" + eslint-scope "^5.0.0" + eslint-utils "^2.0.0" + "@typescript-eslint/experimental-utils@4.17.0", "@typescript-eslint/experimental-utils@^4.3.0": version "4.17.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.17.0.tgz#762c44aaa1a6a3c05b6d63a8648fb89b89f84c80" @@ -4281,18 +4293,6 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/experimental-utils@4.3.0": - version "4.3.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.3.0.tgz#3f3c6c508e01b8050d51b016e7f7da0e3aefcb87" - integrity sha512-cmmIK8shn3mxmhpKfzMMywqiEheyfXLV/+yPDnOTvQX/ztngx7Lg/OD26J8gTZfkLKUmaEBxO2jYP3keV7h2OQ== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.3.0" - "@typescript-eslint/types" "4.3.0" - "@typescript-eslint/typescript-estree" "4.3.0" - eslint-scope "^5.0.0" - eslint-utils "^2.0.0" - "@typescript-eslint/parser@^4.3.0": version "4.17.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.17.0.tgz#141b647ffc72ebebcbf9b0fe6087f65b706d3215" @@ -4303,6 +4303,14 @@ "@typescript-eslint/typescript-estree" "4.17.0" debug "^4.1.1" +"@typescript-eslint/scope-manager@4.16.1": + version "4.16.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz#244e2006bc60cfe46987e9987f4ff49c9e3f00d5" + integrity sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw== + dependencies: + "@typescript-eslint/types" "4.16.1" + "@typescript-eslint/visitor-keys" "4.16.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" @@ -4311,23 +4319,28 @@ "@typescript-eslint/types" "4.17.0" "@typescript-eslint/visitor-keys" "4.17.0" -"@typescript-eslint/scope-manager@4.3.0": - version "4.3.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.3.0.tgz#c743227e087545968080d2362cfb1273842cb6a7" - integrity sha512-cTeyP5SCNE8QBRfc+Lgh4Xpzje46kNUhXYfc3pQWmJif92sjrFuHT9hH4rtOkDTo/si9Klw53yIr+djqGZS1ig== - dependencies: - "@typescript-eslint/types" "4.3.0" - "@typescript-eslint/visitor-keys" "4.3.0" +"@typescript-eslint/types@4.16.1": + version "4.16.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.16.1.tgz#5ba2d3e38b1a67420d2487519e193163054d9c15" + integrity sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA== "@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.3.0": - version "4.3.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.3.0.tgz#1f0b2d5e140543e2614f06d48fb3ae95193c6ddf" - integrity sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw== +"@typescript-eslint/typescript-estree@4.16.1": + version "4.16.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz#c2fc46b05a48fbf8bbe8b66a63f0a9ba04b356f1" + integrity sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg== + dependencies: + "@typescript-eslint/types" "4.16.1" + "@typescript-eslint/visitor-keys" "4.16.1" + debug "^4.1.1" + globby "^11.0.1" + is-glob "^4.0.1" + semver "^7.3.2" + tsutils "^3.17.1" "@typescript-eslint/typescript-estree@4.17.0": version "4.17.0" @@ -4342,19 +4355,13 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/typescript-estree@4.3.0": - version "4.3.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz#0edc1068e6b2e4c7fdc54d61e329fce76241cee8" - integrity sha512-ZAI7xjkl+oFdLV/COEz2tAbQbR3XfgqHEGy0rlUXzfGQic6EBCR4s2+WS3cmTPG69aaZckEucBoTxW9PhzHxxw== +"@typescript-eslint/visitor-keys@4.16.1": + version "4.16.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz#d7571fb580749fae621520deeb134370bbfc7293" + integrity sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w== dependencies: - "@typescript-eslint/types" "4.3.0" - "@typescript-eslint/visitor-keys" "4.3.0" - debug "^4.1.1" - globby "^11.0.1" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^7.3.2" - tsutils "^3.17.1" + "@typescript-eslint/types" "4.16.1" + eslint-visitor-keys "^2.0.0" "@typescript-eslint/visitor-keys@4.17.0": version "4.17.0" @@ -4364,14 +4371,6 @@ "@typescript-eslint/types" "4.17.0" eslint-visitor-keys "^2.0.0" -"@typescript-eslint/visitor-keys@4.3.0": - version "4.3.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.3.0.tgz#0e5ab0a09552903edeae205982e8521e17635ae0" - integrity sha512-xZxkuR7XLM6RhvLkgv9yYlTcBHnTULzfnw4i6+z2TGBLy9yljAypQaZl9c3zFvy7PNI7fYWyvKYtohyF8au3cw== - dependencies: - "@typescript-eslint/types" "4.3.0" - eslint-visitor-keys "^2.0.0" - "@verdaccio/commons-api@9.7.1", "@verdaccio/commons-api@^9.7.1": version "9.7.1" resolved "https://registry.yarnpkg.com/@verdaccio/commons-api/-/commons-api-9.7.1.tgz#816f08eb6cb0dbe345f2546428c837be6804796d"