Skip to content

Commit af08e5a

Browse files
author
Alain BOUDARD
committed
fix: upgrade ng9
BREAK: up de version
1 parent 4fb090d commit af08e5a

21 files changed

+8934
-7658
lines changed

src/angular/angular.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"build": {
1212
"builder": "@angular-devkit/build-angular:browser",
1313
"options": {
14+
"aot": true,
1415
"outputPath": "../main/resources/static",
1516
"index": "src/index.html",
1617
"main": "src/main.ts",
@@ -28,6 +29,12 @@
2829
},
2930
"configurations": {
3031
"production": {
32+
"budgets": [
33+
{
34+
"type": "anyComponentStyle",
35+
"maximumWarning": "6kb"
36+
}
37+
],
3138
"optimization": true,
3239
"outputHashing": "all",
3340
"sourceMap": false,
@@ -125,7 +132,7 @@
125132
"schematics": {
126133
"@schematics/angular:component": {
127134
"prefix": "app",
128-
"styleext": "scss"
135+
"style": "scss"
129136
},
130137
"@schematics/angular:directive": {
131138
"prefix": "app"

src/angular/package-lock.json

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

src/angular/package.json

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,49 +8,51 @@
88
"build": "ng build --prod",
99
"buildwatch": "ng build --watch",
1010
"test": "ng test",
11-
"lint": "ng lint",
11+
"lint": "ng lint --fix",
1212
"e2e": "ng e2e",
1313
"dbmock": "json-server --watch server.json --port 3004 --routes routes.json",
1414
"compodoc": "./node_modules/.bin/compodoc -p src/tsconfig.app.json --disableSourceCode --disableDomTree --disableTemplateTab --disableGraph",
1515
"compodoc-all": "./node_modules/.bin/compodoc -p src/tsconfig.app.json"
1616
},
1717
"private": true,
1818
"dependencies": {
19-
"@angular/animations": "^8.2.14",
20-
"@angular/common": "^8.2.14",
21-
"@angular/compiler": "^8.2.14",
22-
"@angular/core": "^8.2.14",
23-
"@angular/forms": "^8.2.14",
24-
"@angular/platform-browser": "^8.2.14",
25-
"@angular/platform-browser-dynamic": "^8.2.14",
26-
"@angular/router": "^8.2.14",
27-
"@fortawesome/angular-fontawesome": "^0.5.0",
19+
"@angular/animations": "^9.1.13",
20+
"@angular/common": "^9.1.13",
21+
"@angular/compiler": "^9.1.13",
22+
"@angular/core": "^9.1.13",
23+
"@angular/forms": "^9.1.13",
24+
"@angular/localize": "^9.1.13",
25+
"@angular/platform-browser": "^9.1.13",
26+
"@angular/platform-browser-dynamic": "^9.1.13",
27+
"@angular/router": "^9.1.13",
28+
"@fortawesome/angular-fontawesome": "^0.6.1",
2829
"@fortawesome/fontawesome-svg-core": "^1.2.27",
2930
"@fortawesome/free-solid-svg-icons": "^5.12.1",
30-
"@ng-bootstrap/ng-bootstrap": "^5.3.0",
31-
"@ngrx/data": "^8.6.0",
32-
"@ngrx/effects": "^8.6.0",
33-
"@ngrx/entity": "^8.6.0",
34-
"@ngrx/store": "^8.6.0",
35-
"@ngrx/store-devtools": "^8.6.0",
36-
"bootstrap": "^4.4.1",
31+
"@ng-bootstrap/ng-bootstrap": "^6.2.0",
32+
"@ngrx/data": "^9.2.1",
33+
"@ngrx/effects": "^9.2.1",
34+
"@ngrx/entity": "^9.2.1",
35+
"@ngrx/store": "^9.2.1",
36+
"@ngrx/store-devtools": "^9.2.1",
37+
"bootstrap": "^4.5.0",
3738
"core-js": "^2.6.11",
38-
"ngx-spinner": "^8.1.0",
39-
"ngx-toastr": "^11.3.3",
39+
"ngx-spinner": "^9.0.2",
40+
"ngx-toastr": "^12.1.0",
4041
"rxjs": "^6.5.4",
4142
"rxjs-compat": "^6.5.4",
42-
"zone.js": "~0.9.1"
43+
"tslib": "^1.10.0",
44+
"zone.js": "~0.10.2"
4345
},
4446
"devDependencies": {
45-
"@angular-devkit/build-angular": "~0.803.25",
46-
"@angular/cli": "~8.3.25",
47-
"@angular/compiler-cli": "^8.2.14",
48-
"@angular/language-service": "^8.2.14",
49-
"@ngrx/schematics": "^8.6.0",
47+
"@angular-devkit/build-angular": "~0.901.15",
48+
"@angular/cli": "~9.1.15",
49+
"@angular/compiler-cli": "^9.1.13",
50+
"@angular/language-service": "^9.1.13",
51+
"@ngrx/schematics": "^9.2.1",
5052
"@types/jasmine": "^2.8.7",
5153
"@types/jasminewd2": "~2.0.3",
52-
"@types/node": "^6.0.109",
53-
"codelyzer": "^5.0.1",
54+
"@types/node": "^12.11.1",
55+
"codelyzer": "^5.1.2",
5456
"jasmine-core": "~2.8.0",
5557
"jasmine-spec-reporter": "~4.2.1",
5658
"json-server": "^0.15.1",
@@ -62,7 +64,7 @@
6264
"protractor": "^5.3.2",
6365
"ts-node": "~4.1.0",
6466
"tslint": "~5.9.1",
65-
"typescript": "^3.5.3",
66-
"worker-loader": "^1.1.1"
67+
"worker-loader": "^1.1.1",
68+
"typescript": "^3.8.3"
6769
}
6870
}

src/angular/src/app/app.module.ts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
import { CustomAdapter } from './shared/custom-adapter';
2-
import { BrowserModule } from '@angular/platform-browser';
3-
import { NgModule } from '@angular/core';
41
import { HttpClientModule } from '@angular/common/http';
5-
6-
import { AppComponent } from './app.component';
7-
import { AppStoreModule } from './store/app-store.module';
8-
import { ServicesModule } from './services/services.module';
9-
import { NgbModule, NgbDateAdapter, NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap';
2+
import { NgModule } from '@angular/core';
103
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
4+
import { BrowserModule } from '@angular/platform-browser';
115
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
12-
import { CompModule } from './comp/comp.module';
6+
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
7+
import { NgbDateAdapter, NgbDateParserFormatter, NgbModule } from '@ng-bootstrap/ng-bootstrap';
138
import { ToastrModule } from 'ngx-toastr';
14-
import { TodoModule } from './todo/todo.module';
159
import { AppRoutingModule } from './app-routing/app-routing.module';
16-
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
10+
import { AppComponent } from './app.component';
11+
import { CompModule } from './comp/comp.module';
12+
import { CustomAdapter } from './shared/custom-adapter';
1713
import { CustomDateParser } from './shared/custom-date-parser';
14+
import { AppStoreModule } from './store/app-store.module';
15+
import { TodoModule } from './todo/todo.module';
16+
1817

1918
@NgModule({
2019
declarations: [AppComponent],
@@ -26,7 +25,6 @@ import { CustomDateParser } from './shared/custom-date-parser';
2625
HttpClientModule,
2726
BrowserModule,
2827
AppStoreModule,
29-
ServicesModule,
3028
NgbModule,
3129
FontAwesomeModule,
3230
BrowserAnimationsModule, // required animations module

src/angular/src/app/comp/fa-input/fa-input.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class FaInputComponent {
1818
@Output() value = new EventEmitter<string>();
1919
inputFocus = false;
2020

21-
@ContentChild(InputRefDirective, {static: false}) input: InputRefDirective;
21+
@ContentChild(InputRefDirective) input: InputRefDirective;
2222

2323
@HostBinding('class.focus')
2424
get focus() {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { NgModule } from '@angular/core';
2-
import { Routes, RouterModule } from '@angular/router';
3-
2+
import { RouterModule, Routes } from '@angular/router';
43
import { FilesComponent } from './files.component';
54

5+
66
const routes: Routes = [{ path: '', component: FilesComponent }];
77

88
@NgModule({

src/angular/src/app/files/upload/upload.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Component, OnInit, ChangeDetectorRef } from '@angular/core';
1+
import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
22
import { FormControl, FormGroup, Validators } from '@angular/forms';
3+
import { ToastrService } from 'ngx-toastr';
34
import { FilesService } from '../../services/files.service';
4-
import {ToastrService} from "ngx-toastr";
55

66
@Component({
77
selector: 'app-upload',

src/angular/src/app/services/files.service.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { TestBed, inject } from '@angular/core/testing';
2-
1+
import { inject, TestBed } from '@angular/core/testing';
32
import { FilesService } from './files.service';
43

4+
55
describe('FilesService', () => {
66
beforeEach(() => {
77
TestBed.configureTestingModule({

src/angular/src/app/services/services.module.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/angular/src/app/services/toast.service.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { TestBed, inject } from '@angular/core/testing';
2-
1+
import { inject, TestBed } from '@angular/core/testing';
32
import { ToastService } from './toast.service';
43

4+
55
describe('ToastServiceService', () => {
66
beforeEach(() => {
77
TestBed.configureTestingModule({

0 commit comments

Comments
 (0)