Skip to content

Commit 00cf3a8

Browse files
santoshyadavdevsantoshyadavdev
authored
Merge pull request #144 from SV9045/SV9045/ng-update
Angular Version and Dependenices Updated!
2 parents 4a28c40 + ada8f13 commit 00cf3a8

12 files changed

+107
-57
lines changed

‎angular.json

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
"optimization": true,
4343
"outputHashing": "all",
4444
"sourceMap": false,
45-
"extractCss": true,
4645
"namedChunks": false,
4746
"extractLicenses": true,
4847
"vendorChunk": false,

‎browserslist

-12
This file was deleted.

‎e2e/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
55
"module": "commonjs",
6-
"target": "es5",
6+
"target": "es2018",
77
"types": [
88
"jasmine",
99
"jasminewd2",

‎package.json

+29-29
Original file line numberDiff line numberDiff line change
@@ -13,41 +13,41 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"@angular/animations": "9.1.12",
17-
"@angular/cdk": "9.2.4",
18-
"@angular/common": "9.1.12",
19-
"@angular/compiler": "9.1.12",
20-
"@angular/core": "9.1.12",
21-
"@angular/forms": "9.1.12",
22-
"@angular/material": "9.2.4",
23-
"@angular/platform-browser": "9.1.12",
24-
"@angular/platform-browser-dynamic": "9.1.12",
25-
"@angular/router": "9.1.12",
26-
"@angular/service-worker": "9.1.12",
27-
"rxjs": "6.6.2",
28-
"tslib": "1.13.0",
16+
"@angular/animations": "11.0.9",
17+
"@angular/cdk": "11.0.4",
18+
"@angular/common": "11.0.9",
19+
"@angular/compiler": "11.0.9",
20+
"@angular/core": "11.0.9",
21+
"@angular/forms": "11.0.9",
22+
"@angular/material": "11.0.4",
23+
"@angular/platform-browser": "11.0.9",
24+
"@angular/platform-browser-dynamic": "11.0.9",
25+
"@angular/router": "11.0.9",
26+
"@angular/service-worker": "11.0.9",
27+
"rxjs": "6.6.3",
28+
"tslib": "^2.0.0",
2929
"zone.js": "0.10.3"
3030
},
3131
"devDependencies": {
32-
"@angular-devkit/build-angular": "0.1000.5",
33-
"@angular/cli": "9.1.12",
34-
"@angular/compiler-cli": "9.1.12",
35-
"@angular/language-service": "9.1.12",
36-
"@types/jasmine": "3.5.12",
32+
"@angular-devkit/build-angular": "0.1100.7",
33+
"@angular/cli": "11.0.7",
34+
"@angular/compiler-cli": "11.0.9",
35+
"@angular/language-service": "11.0.9",
36+
"@types/jasmine": "~3.6.0",
3737
"@types/jasminewd2": "2.0.8",
3838
"@types/node": "12.12.54",
3939
"all-contributors-cli": "6.17.0",
40-
"codelyzer": "6.0.0",
41-
"jasmine-core": "3.6.0",
42-
"jasmine-spec-reporter": "5.0.2",
43-
"karma": "5.1.1",
44-
"karma-chrome-launcher": "3.1.0",
45-
"karma-coverage-istanbul-reporter": "3.0.3",
46-
"karma-jasmine": "4.0.1",
47-
"karma-jasmine-html-reporter": "1.5.4",
48-
"protractor": "7.0.0",
40+
"codelyzer": "^6.0.0",
41+
"jasmine-core": "~3.6.0",
42+
"jasmine-spec-reporter": "~5.0.0",
43+
"karma": "~5.0.0",
44+
"karma-chrome-launcher": "~3.1.0",
45+
"karma-coverage-istanbul-reporter": "~3.0.2",
46+
"karma-jasmine": "~4.0.0",
47+
"karma-jasmine-html-reporter": "^1.5.0",
48+
"protractor": "~7.0.0",
4949
"ts-node": "8.10.2",
50-
"tslint": "6.1.3",
51-
"typescript": "3.8.3"
50+
"tslint": "~6.1.0",
51+
"typescript": "4.0.5"
5252
}
5353
}

‎src/app/Utils/components/search-bar/search-bar.component.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
1+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
22

33
import { SearchBarComponent } from './search-bar.component';
44

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

9-
beforeEach(async(() => {
9+
beforeEach(waitForAsync(() => {
1010
TestBed.configureTestingModule({
1111
declarations: [ SearchBarComponent ]
1212
})

‎src/app/app-routing.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const routes: Routes = [
1313
];
1414

1515
@NgModule({
16-
imports: [RouterModule.forRoot(routes)],
16+
imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })],
1717
exports: [RouterModule]
1818
})
1919
export class AppRoutingModule { }

‎src/app/app.component.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { TestBed, async } from '@angular/core/testing';
1+
import { TestBed, waitForAsync } from '@angular/core/testing';
22
import { RouterTestingModule } from '@angular/router/testing';
33
import { AppComponent } from './app.component';
44

55
describe('AppComponent', () => {
6-
beforeEach(async(() => {
6+
beforeEach(waitForAsync(() => {
77
TestBed.configureTestingModule({
88
imports: [
99
RouterTestingModule

‎src/app/dashboard/dashboard.component.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { LayoutModule } from '@angular/cdk/layout';
22
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
3-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
3+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
44
import { MatButtonModule } from '@angular/material/button';
55
import { MatCardModule } from '@angular/material/card';
66
import { MatGridListModule } from '@angular/material/grid-list';
@@ -13,7 +13,7 @@ describe('DashboardComponent', () => {
1313
let component: DashboardComponent;
1414
let fixture: ComponentFixture<DashboardComponent>;
1515

16-
beforeEach(async(() => {
16+
beforeEach(waitForAsync(() => {
1717
TestBed.configureTestingModule({
1818
declarations: [DashboardComponent],
1919
imports: [

‎src/app/main-nav/main-nav.component.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { LayoutModule } from '@angular/cdk/layout';
2-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
2+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
33
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
44
import { MatButtonModule } from '@angular/material/button';
55
import { MatIconModule } from '@angular/material/icon';
@@ -13,7 +13,7 @@ describe('MainNavComponent', () => {
1313
let component: MainNavComponent;
1414
let fixture: ComponentFixture<MainNavComponent>;
1515

16-
beforeEach(async(() => {
16+
beforeEach(waitForAsync(() => {
1717
TestBed.configureTestingModule({
1818
declarations: [MainNavComponent],
1919
imports: [

‎src/app/references/references.component.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
1+
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
22

33
import { ReferencesComponent } from './references.component';
44

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

9-
beforeEach(async(() => {
9+
beforeEach(waitForAsync(() => {
1010
TestBed.configureTestingModule({
1111
declarations: [ ReferencesComponent ]
1212
})

‎tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"downlevelIteration": true,
99
"emitDecoratorMetadata": true,
1010
"experimentalDecorators": true,
11-
"module": "esnext",
11+
"module": "es2020",
1212
"moduleResolution": "node",
1313
"importHelpers": true,
1414
"target": "es2015",

‎tslint.json

+65-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
{
22
"extends": "tslint:recommended",
33
"rules": {
4+
"align": {
5+
"options": [
6+
"parameters",
7+
"statements"
8+
]
9+
},
410
"array-type": false,
511
"arrow-parens": false,
12+
"arrow-return-shorthand": true,
613
"deprecation": {
714
"severity": "warn"
815
},
916
"component-class-suffix": true,
1017
"contextual-lifecycle": true,
18+
"curly": true,
1119
"directive-class-suffix": true,
1220
"directive-selector": [
1321
true,
@@ -21,10 +29,17 @@
2129
"app",
2230
"kebab-case"
2331
],
32+
"eofline": true,
2433
"import-blacklist": [
2534
true,
2635
"rxjs/Rx"
2736
],
37+
"import-spacing": true,
38+
"indent": {
39+
"options": [
40+
"spaces"
41+
]
42+
},
2843
"interface-name": false,
2944
"max-classes-per-file": false,
3045
"max-line-length": [
@@ -60,7 +75,6 @@
6075
"no-non-null-assertion": true,
6176
"no-redundant-jsdoc": true,
6277
"no-switch-case-fall-through": true,
63-
"no-use-before-declare": true,
6478
"no-var-requires": false,
6579
"object-literal-key-quotes": [
6680
true,
@@ -80,11 +94,60 @@
8094
"no-output-native": true,
8195
"no-output-on-prefix": true,
8296
"no-output-rename": true,
97+
"semicolon": {
98+
"options": [
99+
"always"
100+
]
101+
},
102+
"space-before-function-paren": {
103+
"options": {
104+
"anonymous": "never",
105+
"asyncArrow": "always",
106+
"constructor": "never",
107+
"method": "never",
108+
"named": "never"
109+
}
110+
},
83111
"no-outputs-metadata-property": true,
84112
"template-banana-in-box": true,
85113
"template-no-negated-async": true,
114+
"typedef-whitespace": {
115+
"options": [
116+
{
117+
"call-signature": "nospace",
118+
"index-signature": "nospace",
119+
"parameter": "nospace",
120+
"property-declaration": "nospace",
121+
"variable-declaration": "nospace"
122+
},
123+
{
124+
"call-signature": "onespace",
125+
"index-signature": "onespace",
126+
"parameter": "onespace",
127+
"property-declaration": "onespace",
128+
"variable-declaration": "onespace"
129+
}
130+
]
131+
},
86132
"use-lifecycle-interface": true,
87-
"use-pipe-transform-interface": true
133+
"use-pipe-transform-interface": true,
134+
"variable-name": {
135+
"options": [
136+
"ban-keywords",
137+
"check-format",
138+
"allow-pascal-case"
139+
]
140+
},
141+
"whitespace": {
142+
"options": [
143+
"check-branch",
144+
"check-decl",
145+
"check-operator",
146+
"check-separator",
147+
"check-type",
148+
"check-typecast"
149+
]
150+
}
88151
},
89152
"rulesDirectory": [
90153
"codelyzer"

0 commit comments

Comments
 (0)