Skip to content

Commit

Permalink
feat(schematics): better support @angular/cli 12.1 (#591)
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesHenry committed Jul 11, 2021
1 parent 3bea308 commit c5da07b
Show file tree
Hide file tree
Showing 13 changed files with 1,389 additions and 1,000 deletions.
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
]
},
"devDependencies": {
"@angular-devkit/architect": "0.1200.0",
"@angular-devkit/build-angular": "12.0.0",
"@angular/cli": "12.0.0",
"@angular/compiler": "12.0.0",
"@angular/compiler-cli": "12.0.0",
"@angular-devkit/architect": "0.1201.1",
"@angular-devkit/build-angular": "12.1.1",
"@angular/cli": "12.1.1",
"@angular/compiler": "12.1.1",
"@angular/compiler-cli": "12.1.1",
"@commitlint/cli": "^8.1.0",
"@commitlint/config-conventional": "^8.1.0",
"@nrwl/cli": "12.5.7",
Expand All @@ -69,8 +69,8 @@
"@types/jest": "^26.0.15",
"@types/node": "14.14.33",
"@types/prettier": "^1.19.0",
"@typescript-eslint/eslint-plugin": "4.23.0",
"@typescript-eslint/parser": "4.23.0",
"@typescript-eslint/eslint-plugin": "4.28.2",
"@typescript-eslint/parser": "4.28.2",
"eslint": "^7.26.0",
"eslint-config-prettier": "8.1.0",
"execa": "^5.1.1",
Expand All @@ -86,6 +86,6 @@
"terser": "^4.0.0",
"ts-jest": "27.0.3",
"ts-node": "^9.1.1",
"typescript": "~4.2.3"
"typescript": "~4.3.5"
}
}
2 changes: 1 addition & 1 deletion packages/eslint-plugin-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"LICENSE"
],
"dependencies": {
"@typescript-eslint/experimental-utils": "4.23.0",
"@typescript-eslint/experimental-utils": "4.28.2",
"aria-query": "^4.2.2",
"axobject-query": "^2.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"LICENSE"
],
"dependencies": {
"@typescript-eslint/experimental-utils": "4.23.0"
"@typescript-eslint/experimental-utils": "4.28.2"
},
"devDependencies": {
"@angular-eslint/utils": "12.2.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "12.2.2",
"private": true,
"dependencies": {
"@angular/cli": "~12.0.0"
"@angular/cli": "~12.1.1"
},
"peerDependencies": {
"eslint": "*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ __ROOT__/v1123-multi-project-manual-config/src/app/app.component.ts
__ROOT__/v1123-multi-project-manual-config/src/app/example.component.ts
4:13 error Strings must use singlequote @typescript-eslint/quotes
12:3 error Use @Input rather than the \`inputs\` metadata property (https://angular.io/styleguide#style-05-12) @angular-eslint/no-inputs-metadata-property
13:3 error Use `@Output` rather than the \`outputs\` metadata property (https://angular.io/styleguide#style-05-12) @angular-eslint/no-outputs-metadata-property
13:3 error Use \`@Output\` rather than the \`outputs\` metadata property (https://angular.io/styleguide#style-05-12) @angular-eslint/no-outputs-metadata-property
14:3 error Use @HostBinding or @HostListener rather than the \`host\` metadata property (https://angular.io/styleguide#style-06-03) @angular-eslint/no-host-metadata-property
18:13 error Output bindings, including aliases, should not be named \\"on\\", nor prefixed with it (https://angular.io/guide/styleguide#style-05-16) @angular-eslint/no-output-on-prefix
6:35 error Invalid binding syntax. Use [(expr)] instead @angular-eslint/template/banana-in-box
Expand All @@ -35,7 +35,10 @@ __ROOT__/v1123-multi-project-manual-config/src/app/multiple-inline-templates.pag
6:35 error Invalid binding syntax. Use [(expr)] instead @angular-eslint/template/banana-in-box
14:48 error Invalid binding syntax. Use [(expr)] instead @angular-eslint/template/banana-in-box
✖ 19 problems (19 errors, 0 warnings)
__ROOT__/v1123-multi-project-manual-config/src/test.ts
13:5 error Member call should be declared before all method definitions @typescript-eslint/member-ordering
✖ 20 problems (20 errors, 0 warnings)
12 errors and 0 warnings potentially fixable with the \`--fix\` option.
Expand Down Expand Up @@ -87,47 +90,74 @@ __ROOT__/v1123-multi-project-manual-config/projects/another-app/src/app/app.comp
__ROOT__/v1123-multi-project-manual-config/projects/another-app/src/app/app.component.spec.ts
19:6 error Strings must use singlequote @typescript-eslint/quotes
✖ 42 problems (42 errors, 0 warnings)
__ROOT__/v1123-multi-project-manual-config/projects/another-app/src/test.ts
13:5 error Member call should be declared before all method definitions @typescript-eslint/member-ordering
✖ 43 problems (43 errors, 0 warnings)
1 error and 0 warnings potentially fixable with the \`--fix\` option.
Linting \\"horse-plants\\"...
All files pass linting.
__ROOT__/v1123-multi-project-manual-config/projects/horse-plants/src/test.ts
13:5 error Member call should be declared before all method definitions @typescript-eslint/member-ordering
✖ 1 problem (1 error, 0 warnings)
Linting \\"allergies-fusion\\"...
All files pass linting.
__ROOT__/v1123-multi-project-manual-config/projects/allergies-fusion/src/test.ts
13:5 error Member call should be declared before all method definitions @typescript-eslint/member-ordering
✖ 1 problem (1 error, 0 warnings)
Linting \\"breakfast-cat\\"...
All files pass linting.
__ROOT__/v1123-multi-project-manual-config/projects/breakfast-cat/src/test.ts
13:5 error Member call should be declared before all method definitions @typescript-eslint/member-ordering
✖ 1 problem (1 error, 0 warnings)
Linting \\"prints-soda\\"...
All files pass linting.
__ROOT__/v1123-multi-project-manual-config/projects/prints-soda/src/test.ts
13:5 error Member call should be declared before all method definitions @typescript-eslint/member-ordering
✖ 1 problem (1 error, 0 warnings)
Linting \\"ice-cream-monster\\"...
All files pass linting.
__ROOT__/v1123-multi-project-manual-config/projects/ice-cream-monster/src/test.ts
13:5 error Member call should be declared before all method definitions @typescript-eslint/member-ordering
✖ 1 problem (1 error, 0 warnings)
Linting \\"shoe-prints\\"...
All files pass linting.
__ROOT__/v1123-multi-project-manual-config/projects/shoe-prints/src/test.ts
13:5 error Member call should be declared before all method definitions @typescript-eslint/member-ordering
✖ 1 problem (1 error, 0 warnings)
Linting \\"websites-system\\"...
All files pass linting.
__ROOT__/v1123-multi-project-manual-config/projects/websites-system/src/test.ts
13:5 error Member call should be declared before all method definitions @typescript-eslint/member-ordering
✖ 1 problem (1 error, 0 warnings)
Linting \\"robot-websites\\"...
All files pass linting.
__ROOT__/v1123-multi-project-manual-config/projects/robot-websites/src/test.ts
13:5 error Member call should be declared before all method definitions @typescript-eslint/member-ordering
✖ 1 problem (1 error, 0 warnings)
"
`;
Original file line number Diff line number Diff line change
Expand Up @@ -190,16 +190,25 @@ exports[`v1123-multi-project-yarn-auto-convert it should pass linting after conv
"
Linting \\"v1123-multi-project-yarn-auto-convert\\"...
All files pass linting.
__ROOT__/v1123-multi-project-yarn-auto-convert/src/test.ts
13:5 error Member call should be declared before all method definitions @typescript-eslint/member-ordering
✖ 1 problem (1 error, 0 warnings)
Linting \\"another-app\\"...
All files pass linting.
__ROOT__/v1123-multi-project-yarn-auto-convert/projects/another-app/src/test.ts
13:5 error Member call should be declared before all method definitions @typescript-eslint/member-ordering
✖ 1 problem (1 error, 0 warnings)
Linting \\"another-lib\\"...
All files pass linting.
__ROOT__/v1123-multi-project-yarn-auto-convert/projects/another-lib/src/test.ts
14:5 error Member call should be declared before all method definitions @typescript-eslint/member-ordering
✖ 1 problem (1 error, 0 warnings)
"
`;
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ exports[`v1123-single-project-yarn-auto-convert it should pass linting after con
"
Linting \\"v1123-single-project-yarn-auto-convert\\"...
All files pass linting.
__ROOT__/v1123-single-project-yarn-auto-convert/src/test.ts
13:5 error Member call should be declared before all method definitions @typescript-eslint/member-ordering
✖ 1 problem (1 error, 0 warnings)
"
`;
Original file line number Diff line number Diff line change
Expand Up @@ -190,16 +190,25 @@ exports[`v1123-strict-multi-project-auto-convert it should pass linting after co
"
Linting \\"v1123-strict-multi-project-auto-convert\\"...
All files pass linting.
__ROOT__/v1123-strict-multi-project-auto-convert/src/test.ts
13:5 error Member call should be declared before all method definitions @typescript-eslint/member-ordering
✖ 1 problem (1 error, 0 warnings)
Linting \\"another-lib\\"...
All files pass linting.
__ROOT__/v1123-strict-multi-project-auto-convert/projects/another-lib/src/test.ts
14:5 error Member call should be declared before all method definitions @typescript-eslint/member-ordering
✖ 1 problem (1 error, 0 warnings)
Linting \\"another-app\\"...
All files pass linting.
__ROOT__/v1123-strict-multi-project-auto-convert/projects/another-app/src/test.ts
13:5 error Member call should be declared before all method definitions @typescript-eslint/member-ordering
✖ 1 problem (1 error, 0 warnings)
"
`;
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@

exports[`v12-new-workspace it should pass linting after creating a new workspace from scratch using @angular-eslint 2`] = `
Object {
"@angular-devkit/build-angular": "~12.0.0",
"@angular-devkit/build-angular": "~12.1.1",
"@angular-eslint/builder": "9999.0.1-local-integration-tests",
"@angular-eslint/eslint-plugin": "9999.0.1-local-integration-tests",
"@angular-eslint/eslint-plugin-template": "9999.0.1-local-integration-tests",
"@angular-eslint/schematics": "9999.0.1-local-integration-tests",
"@angular-eslint/template-parser": "9999.0.1-local-integration-tests",
"@angular/cli": "~12.0.0",
"@angular/compiler-cli": "~12.0.0",
"@angular/cli": "~12.1.1",
"@angular/compiler-cli": "~12.1.1",
"@types/jasmine": "~3.6.0",
"@types/node": "^12.11.1",
"@typescript-eslint/eslint-plugin": "4.23.0",
"@typescript-eslint/parser": "4.23.0",
"@typescript-eslint/eslint-plugin": "4.28.2",
"@typescript-eslint/parser": "4.28.2",
"eslint": "^7.26.0",
"jasmine-core": "~3.7.0",
"karma": "~6.3.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage": "~2.0.3",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"ng-packagr": "^12.0.0",
"typescript": "~4.2.3",
"ng-packagr": "^12.1.0",
"typescript": "~4.3.2",
}
`;

Expand Down
2 changes: 1 addition & 1 deletion packages/schematics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"devDependencies": {
"@types/tmp": "0.2.0",
"@typescript-eslint/experimental-utils": "4.23.0",
"@typescript-eslint/experimental-utils": "4.28.2",
"eslint": "^7.26.0",
"tslint-to-eslint-config": "^2.4.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ describe('update-12-0-0', () => {
"@angular-eslint/eslint-plugin": "^12.0.0",
"@angular-eslint/eslint-plugin-template": "^12.0.0",
"@angular-eslint/template-parser": "^12.0.0",
"@typescript-eslint/eslint-plugin": "4.23.0",
"@typescript-eslint/experimental-utils": "4.23.0",
"@typescript-eslint/parser": "4.23.0",
"@typescript-eslint/eslint-plugin": "4.28.2",
"@typescript-eslint/experimental-utils": "4.28.2",
"@typescript-eslint/parser": "4.28.2",
"eslint": "^7.26.0",
},
}
Expand Down
2 changes: 1 addition & 1 deletion packages/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
"typescript": "*"
},
"dependencies": {
"@typescript-eslint/experimental-utils": "4.23.0"
"@typescript-eslint/experimental-utils": "4.28.2"
}
}
Loading

0 comments on commit c5da07b

Please sign in to comment.