Skip to content

Commit 1c3ae74

Browse files
LipataLipata
authored
Merge pull request #8506 from IgniteUI/angular-11
Updating to Angular 11
2 parents dc83c5c + d2a69cc commit 1c3ae74

File tree

125 files changed

+4432
-6437
lines changed

Some content is hidden

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

125 files changed

+4432
-6437
lines changed

‎angular.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
"optimization": true,
5151
"outputHashing": "all",
5252
"sourceMap": false,
53-
"extractCss": true,
5453
"namedChunks": false,
5554
"extractLicenses": true,
5655
"vendorChunk": false,
@@ -162,7 +161,7 @@
162161
"prefix": "lib",
163162
"architect": {
164163
"build": {
165-
"builder": "@angular-devkit/build-ng-packagr:build",
164+
"builder": "@angular-devkit/build-angular:ng-packagr",
166165
"options": {
167166
"tsConfig": "projects/igniteui-angular/tsconfig.lib.json",
168167
"project": "projects/igniteui-angular/ng-package.json"

‎package-lock.json

+4,027-5,914
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+15-16
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@
4545
},
4646
"private": true,
4747
"dependencies": {
48-
"@angular/animations": "^10.1.0",
49-
"@angular/common": "^10.1.0",
50-
"@angular/compiler": "^10.1.0",
51-
"@angular/core": "^10.1.0",
52-
"@angular/forms": "^10.1.0",
53-
"@angular/platform-browser": "^10.1.0",
54-
"@angular/platform-browser-dynamic": "^10.1.0",
55-
"@angular/router": "^10.1.0",
48+
"@angular/animations": "^11.0.0-rc.1",
49+
"@angular/common": "^11.0.0-rc.1",
50+
"@angular/compiler": "^11.0.0-rc.1",
51+
"@angular/core": "^11.0.0-rc.1",
52+
"@angular/forms": "^11.0.0-rc.1",
53+
"@angular/platform-browser": "^11.0.0-rc.1",
54+
"@angular/platform-browser-dynamic": "^11.0.0-rc.1",
55+
"@angular/router": "^11.0.0-rc.1",
5656
"@igniteui/material-icons-extended": "^2.4.0",
5757
"@types/hammerjs": "^2.0.36",
5858
"@types/source-map": "0.5.2",
@@ -71,12 +71,11 @@
7171
"zone.js": "~0.10.3"
7272
},
7373
"devDependencies": {
74-
"@angular-devkit/build-angular": "~0.1001.0",
75-
"@angular-devkit/build-ng-packagr": "~0.1001.0",
76-
"@angular-devkit/schematics": "^10.1.0",
77-
"@angular/cli": "~10.1.0",
78-
"@angular/compiler-cli": "^10.1.0",
79-
"@angular/language-service": "^10.1.0",
74+
"@angular-devkit/build-angular": "~0.1100.0-rc.1",
75+
"@angular-devkit/schematics": "^11.0.0-rc.1",
76+
"@angular/cli": "~11.0.0-rc.1",
77+
"@angular/compiler-cli": "^11.0.0-rc.1",
78+
"@angular/language-service": "^11.0.0-rc.1",
8079
"@angularclass/hmr": "^2.1.3",
8180
"@types/jasmine": "^3.3.16",
8281
"@types/jasminewd2": "^2.0.8",
@@ -101,7 +100,7 @@
101100
"jasmine": "~3.5.0",
102101
"jasmine-core": "~3.5.0",
103102
"jasmine-spec-reporter": "~5.0.2",
104-
"karma": "~5.0.0",
103+
"karma": "~5.2.3",
105104
"karma-chrome-launcher": "~3.1.0",
106105
"karma-coverage-istanbul-reporter": "^3.0.3",
107106
"karma-jasmine": "~3.3.0",
@@ -110,7 +109,7 @@
110109
"karma-junit-reporter": "~2.0.1",
111110
"karma-spec-reporter": "~0.0.32",
112111
"lunr": "^2.3.8",
113-
"ng-packagr": "^10.1.0",
112+
"ng-packagr": "^11.0.0-next.3",
114113
"pngcrush": "^2.0.1",
115114
"protractor": "~7.0.0",
116115
"sassdoc": "^2.7.3",

‎projects/igniteui-angular/migrations/common/util.ts

+2-7
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,12 @@ const configPaths = ['/.angular.json', '/angular.json'];
88

99
export function getProjectPaths(config: WorkspaceSchema, appendPrefix = true): string[] {
1010
const sourceDirs = [];
11-
let globalPrefix;
1211

13-
if (config.schematics && config.schematics['@schematics/angular:component']) {
14-
// updated projects have global prefix rather than per-project:
15-
globalPrefix = config.schematics['@schematics/angular:component'].prefix;
16-
}
1712
const projects = getProjects(config);
1813
for (const proj of projects) {
1914
let sourcePath = path.join('/', proj.sourceRoot);
20-
if (appendPrefix && (proj.prefix || globalPrefix)) {
21-
sourcePath = path.join(sourcePath, proj.prefix || globalPrefix);
15+
if (appendPrefix && (proj.prefix)) {
16+
sourcePath = path.join(sourcePath, proj.prefix);
2217
}
2318
sourceDirs.push(normalize(sourcePath));
2419
}

‎projects/igniteui-angular/migrations/update-6_02/index.spec.ts

-26
Original file line numberDiff line numberDiff line change
@@ -60,30 +60,4 @@ describe('Update 6.0.2', () => {
6060
`@import "~igniteui-angular/lib/core/styles/themes/_index.scss";`
6161
);
6262
});
63-
64-
it('should update theme import in sass files', async () => {
65-
const config = JSON.parse(JSON.stringify(configJson));
66-
config.projects.testProj['schematics'] = {
67-
'@schematics/angular:component': {
68-
styleext: 'sass'
69-
}
70-
};
71-
appTree.overwrite('/angular.json', JSON.stringify(config));
72-
appTree.create(
73-
'/testSrc/appPrefix/component/test.component.sass',
74-
`@import "~igniteui-angular/core/styles/themes/index";`
75-
);
76-
appTree.create(
77-
'/testSrc/testSrc/styles.sass',
78-
`@import "~igniteui-angular/core/styles/themes/_index.scss";`
79-
);
80-
const tree = await schematicRunner.runSchematicAsync('migration-03', {}, appTree)
81-
.toPromise();
82-
expect(tree.readContent('/testSrc/appPrefix/component/test.component.sass')).toEqual(
83-
`@import "~igniteui-angular/lib/core/styles/themes/index";`
84-
);
85-
expect(tree.readContent('/testSrc/testSrc/styles.sass')).toEqual(
86-
`@import "~igniteui-angular/lib/core/styles/themes/_index.scss";`
87-
);
88-
});
8963
});

‎projects/igniteui-angular/migrations/update-6_02/index.ts

+1-11
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,17 @@ const version = '6.0.2';
1111

1212
export default function(): Rule {
1313
return (host: Tree, context: SchematicContext) => {
14-
let globalStyleExt: string;
1514
const themeImport = '~igniteui-angular/core/styles/themes';
1615
const newThemeImport = '~igniteui-angular/lib/core/styles/themes';
1716
const config = getWorkspace(host);
1817
const projects = getProjects(config);
1918

2019
context.logger.info(`Applying migration for Ignite UI for Angular to version ${version}`);
2120

22-
if (config.schematics && config.schematics['@schematics/angular:component']) {
23-
// updated projects have global prefix rather than per-project:
24-
globalStyleExt = config.schematics['@schematics/angular:component'].styleext;
25-
}
26-
2721
for (const proj of projects) {
2822
const dir = host.getDir(proj.sourceRoot);
29-
let ext = globalStyleExt || 'scss';
30-
if (proj.schematics && proj.schematics['@schematics/angular:component']) {
31-
ext = proj.schematics['@schematics/angular:component'].styleext || ext;
32-
}
3323
dir.visit((path, entry) => {
34-
if (path.endsWith('.' + ext)) {
24+
if (path.endsWith('.scss')) {
3525
let content = entry.content.toString();
3626
if (content.indexOf(themeImport) !== -1) {
3727
content = content.replace(themeImport, newThemeImport);

‎projects/igniteui-angular/migrations/update-8_2_6/index.ts

+1-11
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export default function(): Rule {
2828
'$_default-shape-pagination',
2929
'$_square-shape-pagination'];
3030

31-
let globalStyleExt: string;
3231
const gridPaginatorComponentImport = '~igniteui-angular/lib/core/styles/components/grid-paginator/grid-paginator-component';
3332
const gridPaginatorThemeImport = '~igniteui-angular/lib/core/styles/components/grid-paginator/grid-paginator-theme';
3433
const paginatorComponentImport = '~igniteui-angular/lib/core/styles/components/paginator/paginator-component';
@@ -40,19 +39,10 @@ export default function(): Rule {
4039

4140
const update = new UpdateChanges(__dirname, host, context);
4241

43-
if (config.schematics && config.schematics['@schematics/angular:component']) {
44-
// updated projects have global prefix rather than per-project:
45-
globalStyleExt = config.schematics['@schematics/angular:component'].styleext;
46-
}
47-
4842
for (const proj of projects) {
4943
const dir = host.getDir(proj.sourceRoot);
50-
let ext = globalStyleExt || 'scss';
51-
if (proj.schematics && proj.schematics['@schematics/angular:component']) {
52-
ext = proj.schematics['@schematics/angular:component'].styleext || ext;
53-
}
5444
dir.visit((path, entry) => {
55-
if (path.endsWith('.' + ext)) {
45+
if (path.endsWith('.scss')) {
5646
let content = entry.content.toString();
5747
if (content.match(/\bigx-grid-paginator\b/g)) {
5848
content = content.replace(/\bigx-grid-paginator\b/g, 'igx-paginator');

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { IgxActionStripComponent } from './action-strip.component';
22
import { Component, ViewChild, ElementRef, ViewContainerRef } from '@angular/core';
33
import { configureTestSuite } from '../test-utils/configure-suite';
44
import { IgxIconModule } from '../icon/public_api';
5-
import { TestBed, async, fakeAsync } from '@angular/core/testing';
5+
import { TestBed, fakeAsync, waitForAsync } from '@angular/core/testing';
66
import { By } from '@angular/platform-browser';
77
import { wait } from '../test-utils/ui-interactions.spec';
88
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -45,7 +45,7 @@ describe('igxActionStrip', () => {
4545

4646
describe('Initialization and rendering tests: ', () => {
4747
configureTestSuite();
48-
beforeAll(async(() => {
48+
beforeAll(waitForAsync(() => {
4949
TestBed.configureTestingModule({
5050
declarations: [
5151
IgxActionStripTestingComponent
@@ -103,7 +103,7 @@ describe('igxActionStrip', () => {
103103

104104
describe('render content as menu', () => {
105105
configureTestSuite();
106-
beforeAll(async(() => {
106+
beforeAll(waitForAsync(() => {
107107
TestBed.configureTestingModule({
108108
declarations: [
109109
IgxActionStripMenuTestingComponent,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, ViewChild, OnInit } from '@angular/core';
22
import { IgxActionStripComponent } from '../action-strip.component';
33
import { configureTestSuite } from '../../test-utils/configure-suite';
4-
import { TestBed, async, fakeAsync } from '@angular/core/testing';
4+
import { TestBed, fakeAsync, waitForAsync } from '@angular/core/testing';
55
import { IgxIconModule } from '../../icon/public_api';
66
import { IgxGridModule, IgxGridComponent } from '../../grids/grid/public_api';
77
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -16,7 +16,7 @@ describe('igxGridEditingActions #grid ', () => {
1616
let actionStrip: IgxActionStripComponent;
1717
let grid: IgxGridComponent;
1818
configureTestSuite();
19-
beforeAll(async(() => {
19+
beforeAll(waitForAsync(() => {
2020
TestBed.configureTestingModule({
2121
declarations: [
2222
IgxActionStripTestingComponent,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, ViewChild, OnInit } from '@angular/core';
22
import { IgxActionStripComponent } from '../action-strip.component';
33
import { configureTestSuite } from '../../test-utils/configure-suite';
4-
import { TestBed, async, fakeAsync } from '@angular/core/testing';
4+
import { TestBed, fakeAsync, waitForAsync } from '@angular/core/testing';
55
import { IgxIconModule } from '../../icon/public_api';
66
import { IgxGridModule, IgxGridComponent } from '../../grids/grid/public_api';
77
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -15,7 +15,7 @@ describe('igxGridPinningActions #grid ', () => {
1515
let actionStrip: IgxActionStripComponent;
1616
let grid: IgxGridComponent;
1717
configureTestSuite();
18-
beforeAll(async(() => {
18+
beforeAll(waitForAsync(() => {
1919
TestBed.configureTestingModule({
2020
declarations: [
2121
IgxActionStripTestingComponent,

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import { Component, ViewChild } from '@angular/core';
2-
import {
3-
async,
4-
TestBed
5-
} from '@angular/core/testing';
2+
import { TestBed, waitForAsync } from '@angular/core/testing';
63
import { By } from '@angular/platform-browser';
74
import { IgxIconModule } from '../icon/public_api';
85
import { IgxAvatarComponent, IgxAvatarType, IgxAvatarSize } from './avatar.component';
@@ -23,7 +20,7 @@ describe('Avatar', () => {
2320
icon: `${baseClass}--icon`
2421
};
2522

26-
beforeAll(async(() => {
23+
beforeAll(waitForAsync(() => {
2724
TestBed.configureTestingModule({
2825
declarations: [
2926
InitAvatarComponent,

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import { Component, ViewChild } from '@angular/core';
2-
import {
3-
async,
4-
TestBed
5-
} from '@angular/core/testing';
2+
import { TestBed, waitForAsync } from '@angular/core/testing';
63
import { By } from '@angular/platform-browser';
74
import { IgxIconModule } from '../icon/public_api';
85
import { IgxBadgeComponent, IgxBadgeType } from './badge.component';
@@ -11,7 +8,7 @@ import { configureTestSuite } from '../test-utils/configure-suite';
118

129
describe('Badge', () => {
1310
configureTestSuite();
14-
beforeAll(async(() => {
11+
beforeAll(waitForAsync(() => {
1512
TestBed.configureTestingModule({
1613
declarations: [
1714
InitBadgeComponent,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, OnInit, ViewChild, DebugElement } from '@angular/core';
2-
import { async, TestBed, ComponentFixture, tick, fakeAsync } from '@angular/core/testing';
2+
import { TestBed, ComponentFixture, tick, fakeAsync, waitForAsync } from '@angular/core/testing';
33
import { By } from '@angular/platform-browser';
44
import { IgxAvatarModule } from '../avatar/avatar.component';
55
import { IgxBannerComponent, IgxBannerModule } from './banner.component';
@@ -29,7 +29,7 @@ describe('igxBanner', () => {
2929
let bannerRowElement: DebugElement = null;
3030

3131
configureTestSuite();
32-
beforeAll(async(() => {
32+
beforeAll(waitForAsync(() => {
3333
TestBed.configureTestingModule({
3434
declarations: [
3535
IgxBannerEmptyComponent,

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import { Component, OnInit, ViewChild } from '@angular/core';
2-
import {
3-
async,
4-
TestBed
5-
} from '@angular/core/testing';
2+
import { TestBed, waitForAsync } from '@angular/core/testing';
63
import { ButtonGroupAlignment, IgxButtonGroupComponent, IgxButtonGroupModule } from './buttonGroup.component';
74
import { IgxButtonModule } from '../directives/button/button.directive';
85
import { configureTestSuite } from '../test-utils/configure-suite';
@@ -48,7 +45,7 @@ class Button {
4845

4946
describe('IgxButtonGroup', () => {
5047
configureTestSuite();
51-
beforeAll(async(() => {
48+
beforeAll(waitForAsync(() => {
5249
TestBed.configureTestingModule({
5350
declarations: [
5451
InitButtonGroupComponent,

‎projects/igniteui-angular/src/lib/calendar/calendar-multi-view.component.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, ViewChild } from '@angular/core';
2-
import { TestBed, async, fakeAsync, tick } from '@angular/core/testing';
2+
import { TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing';
33
import { FormsModule } from '@angular/forms';
44
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
55
import { configureTestSuite } from '../test-utils/configure-suite';
@@ -13,15 +13,15 @@ describe('Multi-View Calendar - ', () => {
1313
let fixture, calendar;
1414
configureTestSuite();
1515

16-
beforeAll(async(() => {
16+
beforeAll(waitForAsync(() => {
1717
TestBed.configureTestingModule({
1818
declarations: [MultiViewCalendarSampleComponent, MultiViewDatePickerSampleComponent, MultiViewNgModelSampleComponent],
1919
imports: [IgxCalendarModule, IgxDatePickerModule, FormsModule, NoopAnimationsModule]
2020
}).compileComponents();
2121
}));
2222

2323
describe('Base Tests - ', () => {
24-
beforeEach(async(() => {
24+
beforeEach(waitForAsync(() => {
2525
fixture = TestBed.createComponent(MultiViewCalendarSampleComponent);
2626
fixture.detectChanges();
2727
calendar = fixture.componentInstance.calendar;

0 commit comments

Comments
 (0)