Skip to content

Commit 000d7d9

Browse files
authored
Merge branch '20.1.x' into mkirkova/fix-16156-master
2 parents 9f614bb + 06c0c62 commit 000d7d9

File tree

157 files changed

+3842
-2783
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+3842
-2783
lines changed

angular.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,8 @@
213213
"lintFilePatterns": [
214214
"projects/igniteui-angular/**/*.ts",
215215
"projects/igniteui-angular/**/*.html"
216-
]
216+
],
217+
"eslintConfig": "projects/igniteui-angular/eslint.config.mjs"
217218
}
218219
},
219220
"cypress-run": {
@@ -306,8 +307,8 @@
306307
{
307308
"type": "bundle",
308309
"name": "styles",
309-
"maximumWarning": "450kb",
310-
"maximumError": "480kb"
310+
"maximumWarning": "500kb",
311+
"maximumError": "550kb"
311312
},
312313
{
313314
"type": "anyComponentStyle",

eslint.config.mjs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ export default [{
2323
],
2424
}, ...compat.extends(
2525
"plugin:@angular-eslint/recommended",
26-
"plugin:@angular-eslint/template/process-inline-templates",
2726
).map(config => ({
2827
...config,
2928
files: ["**/*.ts"],
@@ -34,16 +33,6 @@ export default [{
3433
"@typescript-eslint": typescriptEslint,
3534
},
3635

37-
languageOptions: {
38-
ecmaVersion: 5,
39-
sourceType: "script",
40-
41-
parserOptions: {
42-
project: ["tsconfig.json"],
43-
createDefaultProgram: true,
44-
},
45-
},
46-
4736
rules: {
4837
"no-shadow": "off",
4938
"no-prototype-builtins": "off",
@@ -83,6 +72,7 @@ export default [{
8372
}],
8473

8574
"@angular-eslint/no-input-rename": "off",
75+
"@angular-eslint/prefer-inject": "warn",
8676

8777
"brace-style": ["error", "1tbs"],
8878
"id-blacklist": "off",

0 commit comments

Comments
 (0)