Skip to content

Commit

Permalink
Merge pull request #301 from erikmom/feat-support-angular-16
Browse files Browse the repository at this point in the history
chore: fixes for eslint after angular 16 upgrade
  • Loading branch information
maxime1992 committed Jul 6, 2023
2 parents 936e017 + 5d7b79c commit 43dede0
Show file tree
Hide file tree
Showing 5 changed files with 11,709 additions and 15,678 deletions.
10 changes: 2 additions & 8 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@
"project": ["tsconfig.json", "e2e/tsconfig.json"],
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/ng-cli-compat",
"plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
"plugin:@angular-eslint/template/process-inline-templates",
"prettier"
],
"extends": ["plugin:@angular-eslint/template/process-inline-templates", "prettier"],
"rules": {
// @todo: restore this one once the one below to turn it off temporarily is there
// "@typescript-eslint/consistent-type-definitions": "error",
Expand All @@ -38,8 +33,7 @@
"object-shorthand": "off",
"@typescript-eslint/no-empty-interface": "off",
"prefer-const": "off",
"arrow-body-style": "off",
"@typescript-eslint/consistent-type-definitions": "off"
"arrow-body-style": "off"
}
},
{
Expand Down
13 changes: 7 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ Please note we have a code of conduct, please follow it in all your interactions
6. Make your changes
7. Edit, remove or add relevant tests (either unit/integration or E2E with cypress)
8. Run the tests locally by running `yarn run lib:test:watch` and `yarn run demo:test:e2e:watch`
9. Update the `README.md` accordingly to your changes if needed
10. Run `Prettier` on the project: `yarn run prettier:write`
11. Once you're done and ready to make a commit, please follow those conventions: https://github.com/angular/angular/blob/master/CONTRIBUTING.md#commit and don't forget to close the related issue either in your commit or the pull request header by writting `This closes cloudnc/ngx-sub-form#X` where `X` is the issue number
12. Push your branch to your own repository
13. Raise a pull request on `ngx-sub-form`
14. If any change is asked on the pull request, try to keep a clean history as much as possible by either using `git rebase` or `git commit --amend` (talk to us on your pull request if you're unsure)
9. Run linting by running `yarn run lint`
10. Update the `README.md` accordingly to your changes if needed
11. Run `Prettier` on the project: `yarn run prettier:write`
12. Once you're done and ready to make a commit, please follow those conventions: https://github.com/angular/angular/blob/master/CONTRIBUTING.md#commit and don't forget to close the related issue either in your commit or the pull request header by writting `This closes cloudnc/ngx-sub-form#X` where `X` is the issue number
13. Push your branch to your own repository
14. Raise a pull request on `ngx-sub-form`
15. If any change is asked on the pull request, try to keep a clean history as much as possible by either using `git rebase` or `git commit --amend` (talk to us on your pull request if you're unsure)

## Code of Conduct

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ npm i ngx-sub-form
**Note about the versions:**

| `@angular` version | `ngx-sub-form` version |
|----------------------|------------------------------------------------------|
| -------------------- | ---------------------------------------------------- |
| v <= `7` | v <= `2.7.1` |
| `8.x` | `4.x` |
| `9.x` <= v <= `12.x` | `5.1.2` |
Expand Down
1 change: 0 additions & 1 deletion projects/ngx-sub-form/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
},
"extends": ["prettier"],
"rules": {
"@typescript-eslint/consistent-type-definitions": "error",
"@typescript-eslint/dot-notation": "off",
"@typescript-eslint/explicit-member-accessibility": [
"off",
Expand Down
Loading

0 comments on commit 43dede0

Please sign in to comment.