Skip to content

Commit 35b47ed

Browse files
authored
Merge pull request #83 from dixyushi/update/version12
update from 10.2 to 12
2 parents b535963 + 90c014a commit 35b47ed

File tree

17 files changed

+3425
-4213
lines changed

17 files changed

+3425
-4213
lines changed

angular/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Jump the queue frontend
22

3-
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.10.
3+
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 12.1.2.
44

55
## Development server
66

angular/angular.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"build": {
1818
"builder": "@angular-devkit/build-angular:browser",
1919
"options": {
20-
"aot": true,
2120
"outputPath": "dist/angular",
2221
"index": "src/index.html",
2322
"main": "src/main.ts",
@@ -32,7 +31,13 @@
3231
"src/theme.scss",
3332
"node_modules/@covalent/core/common/platform.css"
3433
],
35-
"scripts": []
34+
"scripts": [],
35+
"vendorChunk": true,
36+
"extractLicenses": false,
37+
"buildOptimizer": false,
38+
"sourceMap": true,
39+
"optimization": false,
40+
"namedChunks": true
3641
},
3742
"configurations": {
3843
"production": {
@@ -45,9 +50,7 @@
4550
"optimization": true,
4651
"outputHashing": "all",
4752
"sourceMap": false,
48-
"extractCss": true,
4953
"namedChunks": false,
50-
"aot": true,
5154
"extractLicenses": true,
5255
"vendorChunk": false,
5356
"buildOptimizer": true,
@@ -63,7 +66,8 @@
6366
}
6467
]
6568
}
66-
}
69+
},
70+
"defaultConfiguration": ""
6771
},
6872
"serve": {
6973
"builder": "@angular-devkit/build-angular:dev-server",

angular/package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,42 @@
1111
},
1212
"private": true,
1313
"dependencies": {
14-
"@angular/animations": "10.2.3",
15-
"@angular/cdk": "10.2.7",
16-
"@angular/common": "~10.2.3",
17-
"@angular/compiler": "~10.2.3",
18-
"@angular/core": "~10.2.3",
19-
"@angular/forms": "~10.2.3",
20-
"@angular/material": "10.2.7",
21-
"@angular/platform-browser": "~10.2.3",
22-
"@angular/platform-browser-dynamic": "~10.2.3",
23-
"@angular/router": "~10.2.3",
14+
"@angular/animations": "12.1.2",
15+
"@angular/cdk": "12.1.2",
16+
"@angular/common": "~12.1.2",
17+
"@angular/compiler": "~12.1.2",
18+
"@angular/core": "~12.1.2",
19+
"@angular/forms": "~12.1.2",
20+
"@angular/material": "12.1.2",
21+
"@angular/platform-browser": "~12.1.2",
22+
"@angular/platform-browser-dynamic": "~12.1.2",
23+
"@angular/router": "~12.1.2",
2424
"@covalent/core": "^3.1.0",
2525
"core-js": "^2.5.4",
2626
"lodash-es": "^4.17.15",
2727
"rxjs": "~6.6.3",
2828
"tslib": "^2.0.0",
29-
"zone.js": "~0.10.2"
29+
"zone.js": "~0.11.4"
3030
},
3131
"devDependencies": {
32-
"@angular-devkit/build-angular": "~0.1002.0",
33-
"@angular/cli": "~10.2.0",
34-
"@angular/compiler-cli": "~10.2.3",
35-
"@angular/language-service": "~10.2.3",
36-
"@types/jasmine": "~2.8.8",
32+
"@angular-devkit/build-angular": "~12.1.2",
33+
"@angular/cli": "~12.1.2",
34+
"@angular/compiler-cli": "~12.1.2",
35+
"@angular/language-service": "~12.1.2",
36+
"@types/jasmine": "~3.6.0",
3737
"@types/jasminewd2": "~2.0.3",
3838
"@types/node": "^12.11.1",
39-
"codelyzer": "^5.1.2",
40-
"jasmine-core": "~3.5.0",
39+
"codelyzer": "^6.0.0",
40+
"jasmine-core": "~3.6.0",
4141
"jasmine-spec-reporter": "~5.0.0",
42-
"karma": "~5.0.0",
42+
"karma": "~6.3.4",
4343
"karma-chrome-launcher": "~3.1.0",
4444
"karma-coverage-istanbul-reporter": "~3.0.2",
4545
"karma-jasmine": "~4.0.0",
4646
"karma-jasmine-html-reporter": "^1.5.0",
4747
"protractor": "~7.0.0",
4848
"ts-node": "~7.0.0",
4949
"tslint": "~6.1.0",
50-
"typescript": "~4.0.5"
50+
"typescript": "~4.3.5"
5151
}
5252
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const appRoutes: Routes = [
1919
imports: [
2020
RouterModule.forRoot(
2121
appRoutes,
22-
{ enableTracing: true }, // <-- debugging purposes only
22+
{ enableTracing: true, relativeLinkResolution: 'legacy' }, // <-- debugging purposes only
2323
),
2424
],
2525
exports: [RouterModule],

angular/src/app/app.component.spec.ts

Lines changed: 2 additions & 2 deletions
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: [RouterTestingModule],
99
declarations: [AppComponent],

angular/src/app/form-login/components/login/login.component.spec.ts

Lines changed: 2 additions & 2 deletions
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 { LoginComponent } from './login.component';
44

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

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

angular/src/app/form-login/form-login.component.spec.ts

Lines changed: 2 additions & 2 deletions
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 { FormLoginComponent } from './form-login.component';
44

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

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

angular/src/app/layout/header/header.component.spec.ts

Lines changed: 2 additions & 2 deletions
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 { HeaderComponent } from './header.component';
44

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

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

angular/src/app/register/register.component.spec.ts

Lines changed: 2 additions & 2 deletions
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 { RegisterComponent } from './register.component';
44

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

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

angular/src/app/view-queue/view-queue.component.spec.ts

Lines changed: 2 additions & 2 deletions
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 { ViewQueueComponent } from './view-queue.component';
44

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

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

0 commit comments

Comments
 (0)