Skip to content

Commit c87a60f

Browse files
committed
Merge branch 'ThRintelen-feature/support-angular-13' into develop
# Conflicts: # package-lock.json
2 parents 768ff06 + 8a0dfdd commit c87a60f

24 files changed

+23810
-6906
lines changed

.eslintrc.json

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"root": true,
3+
"ignorePatterns": [
4+
"projects/**/*"
5+
],
6+
"overrides": [
7+
{
8+
"files": [
9+
"*.ts"
10+
],
11+
"parserOptions": {
12+
"project": [
13+
"tsconfig.json",
14+
"e2e/tsconfig.json"
15+
],
16+
"createDefaultProgram": true
17+
},
18+
"extends": [
19+
"plugin:@angular-eslint/recommended",
20+
"plugin:@angular-eslint/template/process-inline-templates"
21+
],
22+
"rules": {
23+
"@angular-eslint/component-selector": [
24+
"error",
25+
{
26+
"prefix": "ngx",
27+
"style": "kebab-case",
28+
"type": "element"
29+
}
30+
],
31+
"@angular-eslint/directive-selector": [
32+
"error",
33+
{
34+
"prefix": "ngx",
35+
"style": "camelCase",
36+
"type": "attribute"
37+
}
38+
]
39+
}
40+
},
41+
{
42+
"files": [
43+
"*.html"
44+
],
45+
"extends": [
46+
"plugin:@angular-eslint/template/recommended"
47+
],
48+
"rules": {}
49+
}
50+
]
51+
}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ speed-measure-plugin*.json
3232
.history/*
3333

3434
# misc
35+
/.angular/cache
3536
/.sass-cache
3637
/connect.lock
3738
/coverage

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
### 8.0.0 (2022-01-13)
2+
3+
### Breaking Change
4+
5+
- Add angular v13 support and remove support for older versions
6+
17
### 7.0.6 (2021-10-17)
28

39
### Other

README.md

Lines changed: 249 additions & 240 deletions
Large diffs are not rendered by default.

angular.json

Lines changed: 14 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222
"main": "src/main.ts",
2323
"polyfills": "src/polyfills.ts",
2424
"tsConfig": "tsconfig.app.json",
25-
"assets": [
26-
"src/favicon.ico",
27-
"src/assets"
28-
],
25+
"assets": ["src/favicon.ico", "src/assets"],
2926
"styles": [
3027
"./node_modules/normalize.css/normalize.css",
3128
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
@@ -94,10 +91,7 @@
9491
"polyfills": "src/polyfills.ts",
9592
"tsConfig": "tsconfig.spec.json",
9693
"karmaConfig": "karma.conf.js",
97-
"assets": [
98-
"src/favicon.ico",
99-
"src/assets"
100-
],
94+
"assets": ["src/favicon.ico", "src/assets"],
10195
"styles": [
10296
"./node_modules/normalize.css/normalize.css",
10397
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
@@ -106,19 +100,6 @@
106100
"scripts": []
107101
}
108102
},
109-
"lint": {
110-
"builder": "@angular-devkit/build-angular:tslint",
111-
"options": {
112-
"tsConfig": [
113-
"tsconfig.app.json",
114-
"tsconfig.spec.json",
115-
"e2e/tsconfig.json"
116-
],
117-
"exclude": [
118-
"**/node_modules/**"
119-
]
120-
}
121-
},
122103
"e2e": {
123104
"builder": "@angular-devkit/build-angular:protractor",
124105
"options": {
@@ -160,14 +141,11 @@
160141
}
161142
},
162143
"lint": {
163-
"builder": "@angular-devkit/build-angular:tslint",
144+
"builder": "@angular-eslint/builder:lint",
164145
"options": {
165-
"tsConfig": [
166-
"projects/ngx-page-scroll-core/tsconfig.lib.json",
167-
"projects/ngx-page-scroll-core/tsconfig.spec.json"
168-
],
169-
"exclude": [
170-
"**/node_modules/**"
146+
"lintFilePatterns": [
147+
"projects/ngx-page-scroll-core/**/*.ts",
148+
"projects/ngx-page-scroll-core/**/*.html"
171149
]
172150
}
173151
}
@@ -200,19 +178,19 @@
200178
}
201179
},
202180
"lint": {
203-
"builder": "@angular-devkit/build-angular:tslint",
181+
"builder": "@angular-eslint/builder:lint",
204182
"options": {
205-
"tsConfig": [
206-
"projects/ngx-page-scroll/tsconfig.lib.json",
207-
"projects/ngx-page-scroll/tsconfig.spec.json"
208-
],
209-
"exclude": [
210-
"**/node_modules/**"
183+
"lintFilePatterns": [
184+
"projects/ngx-page-scroll/**/*.ts",
185+
"projects/ngx-page-scroll/**/*.html"
211186
]
212187
}
213188
}
214189
}
215190
}
216191
},
217-
"defaultProject": "ngx-page-scroll-demo"
192+
"defaultProject": "ngx-page-scroll-demo",
193+
"cli": {
194+
"defaultCollection": "@angular-eslint/schematics"
195+
}
218196
}

custom_tslint.json

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)