Skip to content

Commit 19cc59a

Browse files
santoshyadavdevsantoshyadavdev
authored
Merge pull request #492 from shanmukhateja/feat-ng-10
upgrade to Angular v10
2 parents 7e8e415 + d6e4d0c commit 19cc59a

File tree

69 files changed

+567
-478
lines changed

Some content is hidden

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

69 files changed

+567
-478
lines changed

‎package.json

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,25 @@
2222
},
2323
"private": true,
2424
"dependencies": {
25-
"@angular/animations": "9.1.12",
26-
"@angular/common": "9.1.12",
27-
"@angular/compiler": "9.1.12",
28-
"@angular/core": "9.1.12",
29-
"@angular/forms": "9.1.12",
30-
"@angular/platform-browser": "9.1.12",
31-
"@angular/platform-browser-dynamic": "9.1.12",
32-
"@angular/router": "9.1.12",
25+
"@angular/animations": "10.2.4",
26+
"@angular/common": "10.2.4",
27+
"@angular/compiler": "10.2.4",
28+
"@angular/core": "10.2.4",
29+
"@angular/forms": "10.2.4",
30+
"@angular/platform-browser": "10.2.4",
31+
"@angular/platform-browser-dynamic": "10.2.4",
32+
"@angular/router": "10.2.4",
3333
"@fortawesome/fontawesome-svg-core": "1.2.30",
3434
"@fortawesome/free-solid-svg-icons": "5.14.0",
3535
"@fortawesome/react-fontawesome": "0.1.11",
36-
"@nrwl/angular": "9.5.1",
37-
"@nrwl/workspace": "9.5.1",
36+
"@nrwl/angular": "^10.4.10",
37+
"@nrwl/workspace": "^10.4.10",
3838
"bulma": "0.9.0",
3939
"core-js": "3.6.5",
4040
"font-awesome": "4.7.0",
4141
"marked": "1.1.1",
4242
"ng-samurai": "^2.0.5",
4343
"ngx-markdown": "9.1.1",
44-
"ngx-semantic-version": "2.1.0",
4544
"prism-themes": "1.4.0",
4645
"renamer": "2.0.1",
4746
"rxjs": "6.6.2",
@@ -50,11 +49,11 @@
5049
"zone.js": "0.10.3"
5150
},
5251
"devDependencies": {
53-
"@angular-devkit/build-angular": "0.1000.5",
54-
"@angular-devkit/build-ng-packagr": "0.1000.5",
55-
"@angular/cli": "9.1.12",
56-
"@angular/compiler-cli": "9.1.12",
57-
"@angular/language-service": "9.1.12",
52+
"@angular-devkit/build-angular": "0.1002.1",
53+
"@angular-devkit/build-ng-packagr": "0.1002.1",
54+
"@angular/cli": "10.2.1",
55+
"@angular/compiler-cli": "10.2.4",
56+
"@angular/language-service": "10.2.4",
5857
"@commitlint/cli": "9.1.1",
5958
"@commitlint/config-conventional": "9.1.1",
6059
"@fortawesome/fontawesome-free": "5.14.0",
@@ -80,16 +79,16 @@
8079
"karma-coverage-istanbul-reporter": "3.0.3",
8180
"karma-jasmine": "3.3.1",
8281
"karma-jasmine-html-reporter": "1.5.4",
83-
"ng-packagr": "9.1.5",
82+
"ng-packagr": "10.1.2",
8483
"prettier": "2.0.5",
8584
"pretty-quick": "2.0.1",
8685
"protractor": "7.0.0",
8786
"standard-version": "8.0.2",
88-
"ts-jest": "26.2.0",
87+
"ts-jest": "^26.4.4",
8988
"ts-node": "8.10.2",
90-
"tslint": "5.20.1",
89+
"tslint": "^6.1.3",
9190
"tslint-config-prettier": "1.18.0",
92-
"typescript": "3.8.3"
91+
"typescript": "4.0.5"
9392
},
9493
"husky": {
9594
"hooks": {

‎projects/bulma-app/src/app/app.component.spec.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@ import { RouterTestingModule } from '@angular/router/testing';
33
import { AppComponent } from './app.component';
44

55
describe('AppComponent', () => {
6-
beforeEach(async(() => {
7-
TestBed.configureTestingModule({
8-
imports: [
9-
RouterTestingModule
10-
],
11-
declarations: [
12-
AppComponent
13-
],
14-
}).compileComponents();
15-
}));
6+
beforeEach(
7+
waitForAsync(() => {
8+
TestBed.configureTestingModule({
9+
imports: [RouterTestingModule],
10+
declarations: [AppComponent],
11+
}).compileComponents();
12+
}),
13+
);
1614

1715
it('should create the app', () => {
1816
const fixture = TestBed.createComponent(AppComponent);
@@ -30,6 +28,8 @@ describe('AppComponent', () => {
3028
const fixture = TestBed.createComponent(AppComponent);
3129
fixture.detectChanges();
3230
const compiled = fixture.debugElement.nativeElement;
33-
expect(compiled.querySelector('.content span').textContent).toContain('bulma-app app is running!');
31+
expect(compiled.querySelector('.content span').textContent).toContain(
32+
'bulma-app app is running!',
33+
);
3434
});
3535
});

‎projects/bulma-app/src/app/box/box/box.component.spec.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
1+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
22

33
import { BoxComponent } from './box.component';
44

55
describe('BoxComponent', () => {
66
let component: BoxComponent;
77
let fixture: ComponentFixture<BoxComponent>;
88

9-
beforeEach(async(() => {
10-
TestBed.configureTestingModule({
11-
declarations: [BoxComponent],
12-
}).compileComponents();
13-
}));
9+
beforeEach(
10+
waitForAsync(() => {
11+
TestBed.configureTestingModule({
12+
declarations: [BoxComponent],
13+
}).compileComponents();
14+
}),
15+
);
1416

1517
beforeEach(() => {
1618
fixture = TestBed.createComponent(BoxComponent);

‎projects/bulma-app/src/app/button/button.component.spec.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
1+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
22

33
import { ButtonComponent } from './button.component';
44

55
describe('ButtonComponent', () => {
66
let component: ButtonComponent;
77
let fixture: ComponentFixture<ButtonComponent>;
88

9-
beforeEach(async(() => {
10-
TestBed.configureTestingModule({
11-
declarations: [ ButtonComponent ]
12-
})
13-
.compileComponents();
14-
}));
9+
beforeEach(
10+
waitForAsync(() => {
11+
TestBed.configureTestingModule({
12+
declarations: [ButtonComponent],
13+
}).compileComponents();
14+
}),
15+
);
1516

1617
beforeEach(() => {
1718
fixture = TestBed.createComponent(ButtonComponent);

‎projects/bulma-app/src/app/card/card.component.spec.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
1+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
22

33
import { CardComponent } from './card.component';
44

55
describe('CardComponent', () => {
66
let component: CardComponent;
77
let fixture: ComponentFixture<CardComponent>;
88

9-
beforeEach(async(() => {
10-
TestBed.configureTestingModule({
11-
declarations: [ CardComponent ]
12-
})
13-
.compileComponents();
14-
}));
9+
beforeEach(
10+
waitForAsync(() => {
11+
TestBed.configureTestingModule({
12+
declarations: [CardComponent],
13+
}).compileComponents();
14+
}),
15+
);
1516

1617
beforeEach(() => {
1718
fixture = TestBed.createComponent(CardComponent);

‎projects/bulma-app/src/app/container/container.component.spec.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
1+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
22

33
import { ContainerComponent } from './container.component';
44

55
describe('ContainerComponent', () => {
66
let component: ContainerComponent;
77
let fixture: ComponentFixture<ContainerComponent>;
88

9-
beforeEach(async(() => {
10-
TestBed.configureTestingModule({
11-
declarations: [ ContainerComponent ]
12-
})
13-
.compileComponents();
14-
}));
9+
beforeEach(
10+
waitForAsync(() => {
11+
TestBed.configureTestingModule({
12+
declarations: [ContainerComponent],
13+
}).compileComponents();
14+
}),
15+
);
1516

1617
beforeEach(() => {
1718
fixture = TestBed.createComponent(ContainerComponent);

‎projects/bulma-app/src/app/footer/doc-footer/doc-footer.component.spec.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
1+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
22

33
import { DocFooterComponent } from './doc-footer.component';
44

55
describe('DocFooterComponent', () => {
66
let component: DocFooterComponent;
77
let fixture: ComponentFixture<DocFooterComponent>;
88

9-
beforeEach(async(() => {
10-
TestBed.configureTestingModule({
11-
declarations: [ DocFooterComponent ]
12-
})
13-
.compileComponents();
14-
}));
9+
beforeEach(
10+
waitForAsync(() => {
11+
TestBed.configureTestingModule({
12+
declarations: [DocFooterComponent],
13+
}).compileComponents();
14+
}),
15+
);
1516

1617
beforeEach(() => {
1718
fixture = TestBed.createComponent(DocFooterComponent);

‎projects/bulma-app/src/app/footer/footer.component.spec.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
1+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
22

33
import { FooterComponent } from './footer.component';
44

55
describe('FooterComponent', () => {
66
let component: FooterComponent;
77
let fixture: ComponentFixture<FooterComponent>;
88

9-
beforeEach(async(() => {
10-
TestBed.configureTestingModule({
11-
declarations: [ FooterComponent ]
12-
})
13-
.compileComponents();
14-
}));
9+
beforeEach(
10+
waitForAsync(() => {
11+
TestBed.configureTestingModule({
12+
declarations: [FooterComponent],
13+
}).compileComponents();
14+
}),
15+
);
1516

1617
beforeEach(() => {
1718
fixture = TestBed.createComponent(FooterComponent);

‎projects/bulma-app/src/app/gettingstarted/gettingstarted.component.spec.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
1+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
22

33
import { GettingstartedComponent } from './gettingstarted.component';
44

55
describe('GettingstartedComponent', () => {
66
let component: GettingstartedComponent;
77
let fixture: ComponentFixture<GettingstartedComponent>;
88

9-
beforeEach(async(() => {
10-
TestBed.configureTestingModule({
11-
declarations: [ GettingstartedComponent ]
12-
})
13-
.compileComponents();
14-
}));
9+
beforeEach(
10+
waitForAsync(() => {
11+
TestBed.configureTestingModule({
12+
declarations: [GettingstartedComponent],
13+
}).compileComponents();
14+
}),
15+
);
1516

1617
beforeEach(() => {
1718
fixture = TestBed.createComponent(GettingstartedComponent);

‎projects/bulma-app/src/app/hero/hero.component.spec.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
1+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
22

33
import { HeroComponent } from './hero.component';
44

55
describe('HeroComponent', () => {
66
let component: HeroComponent;
77
let fixture: ComponentFixture<HeroComponent>;
88

9-
beforeEach(async(() => {
10-
TestBed.configureTestingModule({
11-
declarations: [ HeroComponent ]
12-
})
13-
.compileComponents();
14-
}));
9+
beforeEach(
10+
waitForAsync(() => {
11+
TestBed.configureTestingModule({
12+
declarations: [HeroComponent],
13+
}).compileComponents();
14+
}),
15+
);
1516

1617
beforeEach(() => {
1718
fixture = TestBed.createComponent(HeroComponent);

0 commit comments

Comments
 (0)