Skip to content

Commit 7373ea4

Browse files
author
Konstantin Dinev
authored
Merge branch 'master' into skrastev/pivot-grid-empy-enh
2 parents 4e8f64a + 09e3ffb commit 7373ea4

Some content is hidden

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

43 files changed

+619
-361
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ master, 19.0.x, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
16+
branches: [ master, 19.1.x, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ master, 19.0.x, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
19+
branches: [ master, 19.1.x, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
2020
schedule:
2121
- cron: '33 4 * * 4'
2222

.vscode/settings.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
"javascript.preferences.quoteStyle": "single",
44
"typescript.preferences.quoteStyle": "single",
55
"cSpell.words": [
6+
"aria-describedby",
7+
"aria-haspopup",
8+
"aria-labelledby",
69
"ghostclass",
10+
"groupable",
11+
"groupby",
12+
"maxlength",
713
"ungroup"
814
]
9-
}
15+
}

SECURITY.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
| Version | Supported |
66
| -------- | ------------------ |
7-
| 19.0.x | :white_check_mark: |
7+
| 19.1.x | :white_check_mark: |
8+
| 19.0.x | :x: |
89
| 18.2.x | :white_check_mark: |
910
| 18.1.x | :x: |
1011
| 18.0.x | :x: |

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"@types/source-map": "0.5.2",
7575
"express": "^4.21.1",
7676
"fflate": "^0.8.1",
77-
"igniteui-theming": "^15.1.1",
77+
"igniteui-theming": "^16.0.0",
7878
"igniteui-trial-watermark": "^3.0.2",
7979
"lodash-es": "^4.17.21",
8080
"rxjs": "^7.8.0",

projects/igniteui-angular/migrations/migration-collection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,11 @@
211211
"version": "19.1.0",
212212
"description": "Updates Ignite UI for Angular from v18.2.3 to v19.1.0",
213213
"factory": "./update-19_1_0"
214+
},
215+
"migration-43": {
216+
"version": "19.1.1",
217+
"description": "Updates Ignite UI for Angular from v19.1.0 to v19.1.1",
218+
"factory": "./update-19_1_1"
214219
}
215220
}
216221
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"$schema": "../../common/schema/theme-changes.schema.json",
3+
"changes": [
4+
{
5+
"name": "$progress-circle-color",
6+
"replaceWith": "$fill-color-default",
7+
"owner": "circular-theme",
8+
"type": "property"
9+
}
10+
]
11+
}
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
import * as path from 'path';
2+
3+
import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
4+
import { setupTestTree } from '../common/setup.spec';
5+
6+
const version = '19.1.1';
7+
const themes = [
8+
'circular-theme'
9+
];
10+
const testFilePath = '/testSrc/appPrefix/component/${theme}.component.scss';
11+
12+
describe(`Update to ${version}`, () => {
13+
let appTree: UnitTestTree;
14+
const schematicRunner = new SchematicTestRunner('ig-migrate', path.join(__dirname, '../migration-collection.json'));
15+
16+
beforeEach(() => {
17+
appTree = setupTestTree();
18+
});
19+
20+
const migrationName = 'migration-43';
21+
22+
themes.forEach(theme => {
23+
it('should rename the progress circle color property of the circular progress', async () => {
24+
appTree.create(
25+
testFilePath,
26+
`$custom-${theme}: ${theme}($progress-circle-color: red);`
27+
);
28+
29+
const tree = await schematicRunner.runSchematic(migrationName, {}, appTree);
30+
31+
expect(tree.readContent(testFilePath)).toEqual(
32+
`$custom-${theme}: ${theme}($fill-color-default: red);`
33+
);
34+
});
35+
});
36+
});
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import type {
2+
Rule,
3+
SchematicContext,
4+
Tree
5+
} from '@angular-devkit/schematics';
6+
import { UpdateChanges } from '../common/UpdateChanges';
7+
8+
const version = '19.1.1';
9+
10+
export default (): Rule => async (host: Tree, context: SchematicContext) => {
11+
context.logger.info(`Applying migration for Ignite UI for Angular to version ${version}`);
12+
const update = new UpdateChanges(__dirname, host, context);
13+
update.applyChanges();
14+
};

projects/igniteui-angular/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"tslib": "^2.3.0",
7474
"igniteui-trial-watermark": "^3.0.2",
7575
"lodash-es": "^4.17.21",
76-
"igniteui-theming": "^15.1.1",
76+
"igniteui-theming": "^16.0.0",
7777
"@igniteui/material-icons-extended": "^3.1.0"
7878
},
7979
"peerDependencies": {
@@ -93,7 +93,7 @@
9393
}
9494
},
9595
"igxDevDependencies": {
96-
"@igniteui/angular-schematics": "~19.0.1430"
96+
"@igniteui/angular-schematics": "~19.1.14315"
9797
},
9898
"ng-update": {
9999
"migrations": "./migrations/migration-collection.json",

0 commit comments

Comments
 (0)