Skip to content

Commit e348163

Browse files
committed
Merge branch 'master' into simeonoff/scoped-styles
2 parents 78b8506 + 4601665 commit e348163

File tree

108 files changed

+2847
-1889
lines changed

Some content is hidden

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

108 files changed

+2847
-1889
lines changed

ROADMAP.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,21 @@
22

33
# Current Milestone
44

5-
## Milestone 38, version 20.1 (Due by Sep, 2025)
6-
1. Grid cell merging feature [#3514](https://github.com/IgniteUI/igniteui-angular/issues/3514)
7-
2. “Clear Selection” button in Combo component is keyboard accessible [#15841](https://github.com/IgniteUI/igniteui-angular/issues/15841)
8-
3. Selecting a slide by index in the Carousel component [#16046](https://github.com/IgniteUI/igniteui-angular/issues/16046)
5+
## Milestone 40, version 20.1 (Due by Nov, 2025)
6+
1. Support for Angular 21
7+
2. AI Chat UI component [#16094](https://github.com/IgniteUI/igniteui-angular/issues/16094)
98

109
## Going down the road
1110

12-
1. AI Chat UI component [#16094](https://github.com/IgniteUI/igniteui-angular/issues/16094)
11+
1. Grids performance
1312

1413
# Previous Milestone
1514

15+
## Milestone 39, version 20.1 (Released Sep 25th, 2025)
16+
1. **[DONE]** Grid cell merging feature [#3514](https://github.com/IgniteUI/igniteui-angular/issues/3514)
17+
2. **[DONE]** “Clear Selection” button in Combo component is keyboard accessible [#15841](https://github.com/IgniteUI/igniteui-angular/issues/15841)
18+
3. **[DONE]** Selecting a slide by index in the Carousel component [#16046](https://github.com/IgniteUI/igniteui-angular/issues/16046)
19+
1620
## Milestone 38, version 20.0 (Released Jun 09th, 2025)
1721
1. **[DONE]** Support of Angular 20.0
1822

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)