Skip to content

Commit 2f6d862

Browse files
authored
Merge branch '12.0.x' into hanastasov/fix-rowtype-interface-strictmode-m
2 parents 165fccc + 30d3269 commit 2f6d862

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"test:lib:watch": "ng test igniteui-angular",
2424
"test:schematics": "ts-node --project projects/igniteui-angular/migrations/tsconfig.json ./node_modules/jasmine/bin/jasmine.js ./projects/igniteui-angular/migrations/**/*.spec.ts ./projects/igniteui-angular/schematics/**/*.spec.ts",
2525
"test:styles": "ts-node --skip-project ./node_modules/jasmine/bin/jasmine.js ./projects/igniteui-angular/src/lib/core/styles/spec/tests.ts",
26-
"build:lib": "ng build igniteui-angular --prod && gulp buildStyle",
26+
"build:lib": "ng build igniteui-angular --configuration production && gulp buildStyle",
2727
"build:style": "gulp buildStyle",
2828
"build:migration": "gulp copyMigrations && tsc --listEmittedFiles --project ./projects/igniteui-angular/migrations/tsconfig.json",
2929
"build:schematics": "gulp copySchematics && tsc --listEmittedFiles --project ./projects/igniteui-angular/schematics/tsconfig.json",

projects/igniteui-angular/src/lib/expansion-panel/expansion-panel.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import {
3333
IgxExpansionPanelBodyComponent,
3434
IgxExpansionPanelDescriptionDirective,
3535
IgxExpansionPanelTitleDirective,
36-
IgxExpansionPanelIconDirective
36+
IgxExpansionPanelIconDirective
3737
],
3838
imports: [
3939
CommonModule,

projects/igniteui-angular/src/lib/slider/slider.component.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1451,15 +1451,14 @@ export class IgxSliderComponent implements
14511451
IgxSliderThumbComponent,
14521452
IgxThumbLabelComponent,
14531453
IgxTicksComponent,
1454-
IgxTickLabelsPipe],
1454+
IgxTickLabelsPipe
1455+
],
14551456
exports: [
14561457
IgxSliderComponent,
14571458
IgxThumbFromTemplateDirective,
14581459
IgxThumbToTemplateDirective,
1459-
IgxTickLabelTemplateDirective,
1460-
IgxSliderThumbComponent,
1461-
IgxThumbLabelComponent,
1462-
IgxTicksComponent],
1460+
IgxTickLabelTemplateDirective
1461+
],
14631462
imports: [CommonModule, FormsModule]
14641463
})
14651464
export class IgxSliderModule {

0 commit comments

Comments
 (0)