Skip to content

Commit d021fc3

Browse files
authored
Merge pull request #3203 from IgniteUI/vNext
Promote production
2 parents 007dd8e + 6433c6b commit d021fc3

111 files changed

Lines changed: 1989 additions & 3164 deletions

File tree

Some content is hidden

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

gulpfile.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const submodule = "igniteui-live-editing-samples";
1818

1919
gulp.task("generate-live-editing", async () => {
2020
var appDv = argv.appDv !== undefined && argv.appDv.toLowerCase().trim() === "true";
21-
const liveEditingOptions = appDv ?
21+
const liveEditingOptions = appDv ?
2222
{
2323
platform: 'angular',
2424
projectDir: "./projects/app-lob",
@@ -30,7 +30,7 @@ gulp.task("generate-live-editing", async () => {
3030
}
3131
:
3232
{
33-
platform: 'angular',
33+
platform: 'angular',
3434
samplesDir: "./src/assets",
3535
configGeneratorPath: "./live-editing/generators/ConfigGenerators.ts",
3636
module: {
@@ -231,4 +231,4 @@ const cleanupAngularDemosLob = (cb) => {
231231
cb();
232232
}
233233
exports.repositoryfyAngularDemos = repositoryfyAngularDemos = gulp.series(cleanupAngularDemos, processDemosWithScss);
234-
exports.repositoryfyAngularDemosLob = repositoryfyAngularDemosLob = gulp.series(cleanupAngularDemosLob, processDemosLobWithScss);
234+
exports.repositoryfyAngularDemosLob = repositoryfyAngularDemosLob = gulp.series(cleanupAngularDemosLob, processDemosLobWithScss);

package-lock.json

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

package.json

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -40,37 +40,37 @@
4040
"url": "git://github.com/IgniteUI/igniteui-angular-samples/repository.git"
4141
},
4242
"dependencies": {
43-
"@angular/animations": "^15.0.0",
44-
"@angular/cdk": "^15.0.0",
45-
"@angular/common": "^15.0.0",
46-
"@angular/compiler": "^15.0.0",
47-
"@angular/core": "^15.0.0",
48-
"@angular/forms": "^15.0.0",
49-
"@angular/localize": "^15.0.0",
50-
"@angular/material": "^15.0.0",
51-
"@angular/platform-browser": "^15.0.0",
52-
"@angular/platform-browser-dynamic": "^15.0.0",
53-
"@angular/router": "^15.0.0",
43+
"@angular/animations": "^15.0.2",
44+
"@angular/cdk": "^15.0.1",
45+
"@angular/common": "^15.0.2",
46+
"@angular/compiler": "^15.0.2",
47+
"@angular/core": "^15.0.2",
48+
"@angular/forms": "^15.0.2",
49+
"@angular/localize": "^15.0.2",
50+
"@angular/material": "^15.0.1",
51+
"@angular/platform-browser": "^15.0.2",
52+
"@angular/platform-browser-dynamic": "^15.0.2",
53+
"@angular/router": "^15.0.2",
5454
"@igniteui/material-icons-extended": "^2.10.0",
5555
"@microsoft/signalr": "^5.0.11",
5656
"@ng-bootstrap/ng-bootstrap": "^13.1.1",
5757
"@popperjs/core": "2.11.6",
5858
"@types/file-saver": "^2.0.2",
5959
"@types/hammerjs": "^2.0.39",
6060
"angular-in-memory-web-api": "0.9.0",
61-
"bootstrap": "^5.2.1",
61+
"bootstrap": "^5.2.3",
6262
"core-js": "2.6.2",
6363
"domino": "^2.1.4",
6464
"file-saver": "^2.0.2",
6565
"hammerjs": "^2.0.8",
66-
"igniteui-angular": "^15.0.0",
66+
"igniteui-angular": "^15.0.2",
6767
"igniteui-angular-charts": "^14.0.0",
6868
"igniteui-angular-core": "^14.0.0",
6969
"igniteui-angular-i18n": "^14.2.0",
70-
"igniteui-dockmanager": "^1.8.0",
70+
"igniteui-dockmanager": "^1.11.3",
7171
"igniteui-live-editing": "^2.0.5",
7272
"igniteui-theming": "^1.1.4",
73-
"igniteui-webcomponents": "^3.4.0",
73+
"igniteui-webcomponents": "^4.0.0",
7474
"immediate": "^3.2.3",
7575
"intl": "^1.2.5",
7676
"minireset.css": "0.0.6",
@@ -81,23 +81,22 @@
8181
"zone.js": "~0.11.4"
8282
},
8383
"devDependencies": {
84-
"@angular-devkit/build-angular": "^15.0.0",
85-
"@angular-eslint/builder": "^15.0.0",
86-
"@angular-eslint/eslint-plugin": "^15.0.0",
87-
"@angular-eslint/eslint-plugin-template": "^15.0.0",
88-
"@angular-eslint/schematics": "^15.0.0",
89-
"@angular-eslint/template-parser": "^15.0.0",
90-
"@angular/cli": "^15.0.0",
91-
"@angular/compiler-cli": "^15.0.0",
92-
"@angular/language-service": "^15.0.0",
84+
"@angular-devkit/build-angular": "^15.0.2",
85+
"@angular-eslint/builder": "^15.1.0",
86+
"@angular-eslint/eslint-plugin": "^15.1.0",
87+
"@angular-eslint/eslint-plugin-template": "^15.1.0",
88+
"@angular-eslint/schematics": "^15.1.0",
89+
"@angular-eslint/template-parser": "^15.1.0",
90+
"@angular/cli": "^15.0.2",
91+
"@angular/compiler-cli": "^15.0.2",
92+
"@angular/language-service": "^15.0.2",
9393
"@igniteui/angular-schematics": "15.0.1100",
9494
"@juggle/resize-observer": "^3.3.1",
9595
"@types/jasmine": "^3.10.2",
9696
"@types/jasminewd2": "^2.0.9",
9797
"@types/node": "^13.13.52",
9898
"@typescript-eslint/eslint-plugin": "^5.29.0",
9999
"@typescript-eslint/parser": "^5.29.0",
100-
"codelyzer": "^6.0.2",
101100
"eslint": "^8.18.0",
102101
"eslint-plugin-import": "2.26.0",
103102
"eslint-plugin-jsdoc": "39.3.3",
@@ -108,8 +107,6 @@
108107
"jasmine-core": "~4.2.0",
109108
"karma": "^6.4.0",
110109
"karma-chrome-launcher": "~3.1.0",
111-
"karma-cli": "~2.0.0",
112-
"karma-coverage-istanbul-reporter": "^3.0.3",
113110
"karma-jasmine": "~5.1.0",
114111
"karma-jasmine-html-reporter": "^2.0.0",
115112
"sass-embedded": "^1.52.2",
@@ -118,4 +115,4 @@
118115
"typescript": "4.8.4",
119116
"webpack-bundle-analyzer": "^4.5.0"
120117
}
121-
}
118+
}

projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ $custom-badge-theme: badge-theme(
5656
.selected {
5757
igx-badge {
5858
& {
59-
@include badge($custom-badge-theme);
59+
@include css-vars($custom-badge-theme);
6060
}
6161

6262
position: absolute;

projects/app-lob/src/app/grid-finjs/controllers.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@
3737
~{{volume/5}} records updated.</span>
3838
</div>
3939
<igx-toast #toast (onClosed)="handleHidden()"></igx-toast>
40-
</div>
40+
</div>

projects/app-lob/src/app/grid-finjs/grid-finjs.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979

8080
.changePos2 {
8181
.igx-grid__td-text {
82-
--igx-success-l: 40%;
82+
--ig-success-l: 40%;
8383
border-inline-end: rem(4px) solid color(null, 'success', 500, .5);
8484
padding-inline-end: rem(15px);
8585
}

projects/app-lob/src/app/grid-finjs/main.component.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,15 @@ export class FinJSDemoComponent implements OnDestroy, AfterViewInit {
2424
};
2525

2626
@HostBinding('class.dark-theme')
27-
public darkTheme = false;
28-
27+
public darkTheme = false;
2928

3029
public properties = ['price', 'country'];
3130
public chartData: Stock[] = [];
3231
public volume = 1000;
3332
public frequency = 500;
3433
private _timer: ReturnType<typeof setInterval>;
3534

36-
35+
3736
public onSwitchChanged(event: { action: string; value: boolean }): void {
3837
switch (event.action) {
3938
case 'toolbar': {

projects/app-lob/src/app/grid/grid-boston-marathon/grid.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ $progressBar-sample-theme: progress-linear-theme(
1616

1717
::ng-deep .default-theme {
1818
.grid__wrapper {
19-
@include grid($grid-sample-theme);
20-
@include progress-linear($progressBar-sample-theme);
19+
@include css-vars($grid-sample-theme);
20+
@include css-vars($progressBar-sample-theme);
2121
}
2222
}
2323

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
::ng-deep {
22
.custom-body {
3-
color: var(--igx-surface-500-contrast);
4-
background: hsla(var(--igx-surface-500));
3+
color: var(--ig-surface-500-contrast);
4+
background: hsla(var(--ig-surface-500));
55
}
66
}

projects/app-lob/src/app/treegrid-finjs/tree-grid-finjs-sample.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
background: color(null, 'surface', 500);
1313
}
1414
}
15-
15+
1616
.finjs-icons {
1717
display: flex;
1818
align-items: center;

0 commit comments

Comments
 (0)