Skip to content

Commit d0bbc05

Browse files
kdinevkdinev
authored
Merge branch 'master' into randriova/localization-fr-fix-master
2 parents f2e5c78 + 418254c commit d0bbc05

18 files changed

+5745
-23575
lines changed

‎package-lock.json

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

‎package.json

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -53,46 +53,44 @@
5353
},
5454
"private": true,
5555
"dependencies": {
56-
"@angular/animations": "^15.1.0",
57-
"@angular/common": "^15.1.0",
58-
"@angular/compiler": "^15.1.0",
59-
"@angular/core": "^15.1.0",
60-
"@angular/forms": "^15.1.0",
61-
"@angular/platform-browser": "^15.1.0",
62-
"@angular/platform-browser-dynamic": "^15.1.0",
63-
"@angular/router": "^15.1.0",
56+
"@angular/animations": "^15.1.3",
57+
"@angular/common": "^15.1.3",
58+
"@angular/compiler": "^15.1.3",
59+
"@angular/core": "^15.1.3",
60+
"@angular/forms": "^15.1.3",
61+
"@angular/platform-browser": "^15.1.3",
62+
"@angular/platform-browser-dynamic": "^15.1.3",
63+
"@angular/router": "^15.1.3",
6464
"@igniteui/material-icons-extended": "^2.10.0",
6565
"@types/hammerjs": "^2.0.40",
6666
"@types/source-map": "0.5.2",
67-
"core-js": "^3.27.1",
6867
"fflate": "^0.7.3",
6968
"hammerjs": "^2.0.8",
7069
"igniteui-theming": "^1.4.1",
7170
"igniteui-trial-watermark": "^1.0.3",
72-
"karma-junit-reporter": "^2.0.1",
7371
"lodash-es": "^4.17.21",
7472
"rxjs": "^6.6.7",
7573
"tslib": "^2.3.0",
7674
"uuid": "^9.0.0",
7775
"zone.js": "~0.12.0"
7876
},
7977
"devDependencies": {
80-
"@angular-devkit/build-angular": "^15.1.1",
81-
"@angular-devkit/schematics": "^15.1.1",
78+
"@angular-devkit/build-angular": "^15.1.4",
79+
"@angular-devkit/schematics": "^15.1.4",
8280
"@angular-eslint/builder": "^15.2.0",
8381
"@angular-eslint/eslint-plugin": "^15.2.0",
8482
"@angular-eslint/eslint-plugin-template": "^15.2.0",
8583
"@angular-eslint/schematics": "^15.2.0",
8684
"@angular-eslint/template-parser": "^15.2.0",
87-
"@angular/cli": "^15.1.1",
88-
"@angular/compiler-cli": "^15.1.0",
89-
"@angular/language-service": "^15.1.0",
85+
"@angular/cli": "^15.1.4",
86+
"@angular/compiler-cli": "^15.1.3",
87+
"@angular/language-service": "^15.1.3",
9088
"@angularclass/hmr": "^3.0.0",
9189
"@cypress/schematic": "^2.4.0",
9290
"@types/estree": "^1.0.0",
9391
"@types/jasmine": "^4.3.1",
9492
"@types/jasminewd2": "^2.0.10",
95-
"@types/node": "^18.11.18",
93+
"@types/node": "^18.11.19",
9694
"@types/sass-true": "^6.0.2",
9795
"@types/webpack-env": "^1.16.3",
9896
"@typescript-eslint/eslint-plugin": "^5.48.1",
@@ -101,9 +99,6 @@
10199
"cypress": "^12.3.0",
102100
"del": "^6.0.0",
103101
"eslint": "^8.32.0",
104-
"eslint-plugin-import": "2.25.2",
105-
"eslint-plugin-jsdoc": "37.9.1",
106-
"eslint-plugin-prefer-arrow": "1.2.2",
107102
"gulp": "^4.0.2",
108103
"gulp-cached": "^1.1.1",
109104
"gulp-concat": "^2.6.1",
@@ -116,26 +111,27 @@
116111
"hammer-simulator": "0.0.1",
117112
"ig-typedoc-theme": "^4.2.0",
118113
"igniteui-sassdoc-theme": "^1.1.4",
119-
"igniteui-webcomponents": "^4.1.1",
114+
"igniteui-webcomponents": "^4.2.1",
120115
"jasmine": "^4.5.0",
121116
"jasmine-core": "~4.5.0",
122117
"karma": "^6.3.11",
123118
"karma-chrome-launcher": "~3.1.0",
124119
"karma-coverage": "^2.0.3",
125120
"karma-jasmine": "~5.1.0",
121+
"karma-junit-reporter": "^2.0.1",
126122
"karma-parallel": "^0.3.1",
127-
"karma-spec-reporter": "^0.0.34",
123+
"karma-spec-reporter": "^0.0.36",
128124
"ng-packagr": "^15.1.1",
129125
"postcss-scss": "^4.0.6",
130-
"sass": "^1.56.0",
126+
"sass": "^1.58.1",
131127
"sass-true": "^6.0.1",
132128
"sassdoc": "^2.7.4",
133129
"sassdoc-plugin-localization": "^1.4.3",
134-
"stylelint": "^14.16.1",
130+
"stylelint": "^15.1.0",
135131
"stylelint-scss": "^4.1.0",
136132
"ts-node": "^10.8.1",
137133
"typedoc": "^0.23.24",
138134
"typedoc-plugin-localization": "^2.4.0",
139-
"typescript": "4.8.4"
135+
"typescript": "4.9.5"
140136
}
141137
}

‎projects/igniteui-angular/karma.conf.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Karma configuration file, see link for more information
22
// https://karma-runner.github.io/1.0/config/configuration-file.html
33

4+
// process.env.CHROME_BIN = require('puppeteer').executablePath();
5+
46
module.exports = function (config) {
57
config.set({
68
basePath: '',

‎projects/igniteui-angular/src/lib/action-strip/action-strip.component.spec.ts

Lines changed: 18 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { wait } from '../test-utils/ui-interactions.spec';
88
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
99
import { IgxToggleModule } from '../directives/toggle/toggle.directive';
1010
import { IgxActionStripModule } from './action-strip.module';
11-
import { IgxDropDownModule } from '../drop-down/public_api';
1211

1312
const ACTION_STRIP_CONTAINER_CSS = 'igx-action-strip__actions';
1413
const DROP_DOWN_LIST = 'igx-drop-down__list';
@@ -20,19 +19,24 @@ describe('igxActionStrip', () => {
2019
let parentContainer: ElementRef;
2120
let innerContainer: ViewContainerRef;
2221

23-
describe('Unit tests: ', () => {
24-
25-
configureTestSuite(() => {
26-
return TestBed.configureTestingModule({
27-
declarations: [
28-
IgxActionStripComponent
29-
],
30-
imports: [
31-
NoopAnimationsModule,
32-
IgxDropDownModule
33-
]
34-
});
22+
configureTestSuite(() => {
23+
return TestBed.configureTestingModule({
24+
declarations: [
25+
IgxActionStripComponent,
26+
IgxActionStripTestingComponent,
27+
IgxActionStripMenuTestingComponent,
28+
IgxActionStripCombinedMenuTestingComponent
29+
],
30+
imports: [
31+
NoopAnimationsModule,
32+
IgxActionStripModule,
33+
IgxIconModule,
34+
IgxToggleModule
35+
]
3536
});
37+
});
38+
39+
describe('Unit tests: ', () => {
3640

3741
it('should properly show and hide using API', () => {
3842
fixture = TestBed.createComponent(IgxActionStripComponent);
@@ -48,22 +52,10 @@ describe('igxActionStrip', () => {
4852
expect(actionStrip.hidden).toBeTruthy();
4953
fixture.debugElement.nativeElement.removeChild(el);
5054
});
55+
5156
});
5257

5358
describe('Initialization and rendering tests: ', () => {
54-
configureTestSuite(() => {
55-
return TestBed.configureTestingModule({
56-
declarations: [
57-
IgxActionStripTestingComponent
58-
],
59-
imports: [
60-
IgxActionStripModule,
61-
IgxIconModule,
62-
NoopAnimationsModule,
63-
IgxToggleModule
64-
]
65-
})
66-
});
6759

6860
beforeEach(() => {
6961
fixture = TestBed.createComponent(IgxActionStripTestingComponent);
@@ -110,20 +102,6 @@ describe('igxActionStrip', () => {
110102
});
111103

112104
describe('render content as menu', () => {
113-
configureTestSuite(() => {
114-
return TestBed.configureTestingModule({
115-
declarations: [
116-
IgxActionStripMenuTestingComponent,
117-
IgxActionStripCombinedMenuTestingComponent
118-
],
119-
imports: [
120-
IgxActionStripModule,
121-
IgxIconModule,
122-
NoopAnimationsModule,
123-
IgxToggleModule
124-
]
125-
});
126-
});
127105

128106
it('should render tree-dot button which toggles the content as menu', () => {
129107
fixture = TestBed.createComponent(IgxActionStripMenuTestingComponent);

‎projects/igniteui-angular/src/lib/avatar/avatar.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ export const IgxAvatarType = mkenum({
2626
ICON: 'icon',
2727
CUSTOM: 'custom'
2828
});
29-
3029
export type IgxAvatarType = (typeof IgxAvatarType)[keyof typeof IgxAvatarType];
3130

3231
/**

‎projects/igniteui-angular/src/lib/carousel/carousel.component.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ class HelperTestFunctions {
873873
return prev.querySelector(HelperTestFunctions.BUTTON_ARROW_CLASS);
874874
}
875875

876-
public static getIndicatorsContainer(fixture, position = CarouselIndicatorsOrientation.bottom): HTMLElement {
876+
public static getIndicatorsContainer(fixture, position: CarouselIndicatorsOrientation = CarouselIndicatorsOrientation.bottom): HTMLElement {
877877
const carouselNative = fixture.nativeElement;
878878
if (position === CarouselIndicatorsOrientation.bottom) {
879879
return carouselNative.querySelector(HelperTestFunctions.INDICATORS_BOTTOM_CLASS);
@@ -882,17 +882,17 @@ class HelperTestFunctions {
882882
}
883883
}
884884

885-
public static getIndicatorsLabel(fixture, position = CarouselIndicatorsOrientation.bottom) {
885+
public static getIndicatorsLabel(fixture, position: CarouselIndicatorsOrientation = CarouselIndicatorsOrientation.bottom) {
886886
const indContainer = HelperTestFunctions.getIndicatorsContainer(fixture, position);
887887
return indContainer.querySelector(HelperTestFunctions.INDICATORS_LABEL_CLASS);
888888
}
889889

890-
public static getIndicators(fixture, position = CarouselIndicatorsOrientation.bottom) {
890+
public static getIndicators(fixture, position: CarouselIndicatorsOrientation = CarouselIndicatorsOrientation.bottom) {
891891
const indContainer = HelperTestFunctions.getIndicatorsContainer(fixture, position);
892892
return indContainer.querySelectorAll(HelperTestFunctions.INDICATOR_CLASS);
893893
}
894894

895-
public static getIndicatorsDots(fixture, position = CarouselIndicatorsOrientation.bottom) {
895+
public static getIndicatorsDots(fixture, position: CarouselIndicatorsOrientation = CarouselIndicatorsOrientation.bottom) {
896896
const indContainer = HelperTestFunctions.getIndicatorsContainer(fixture, position);
897897
return indContainer.querySelectorAll(HelperTestFunctions.INDICATOR_DOT_CLASS);
898898
}

0 commit comments

Comments
 (0)