Skip to content

Commit d8e81a6

Browse files
Merge pull request #1 from strongbox/upgrade-angular-9
Upgrade to angular 9
2 parents a2091f0 + 5348e60 commit d8e81a6

File tree

9 files changed

+5746
-3502
lines changed

9 files changed

+5746
-3502
lines changed

angular.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
"sourceMap": false,
4747
"extractCss": true,
4848
"namedChunks": false,
49-
"aot": true,
5049
"extractLicenses": true,
5150
"vendorChunk": false,
5251
"buildOptimizer": true,

package-lock.json

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

package.json

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,55 +4,60 @@
44
"scripts": {
55
"ng": "ng",
66
"start": "ng serve",
7-
"build": "ng build --delete-output-path --prod --deployUrl /database/static/assets/",
7+
"build": "ng build --delete-output-path --prod --deployUrl /database/static/assets/ --build-optimizer",
8+
"build-source-map": "npm run build -- --source-map",
89
"package": "./node_modules/.bin/rimraf dist/packaging/* && ./node_modules/.bin/webpack --env.configuration=prod",
910
"serve-packaged": "./node_modules/.bin/http-server dist/packaging/strongbox-database-ui -a 127.0.0.1 -p 4207 -g -c-1 --no-dotfiles -o /",
1011
"ci-build": "npm run build && npm run package",
1112
"ci-test": "ng test --browsers HeadlessChrome,HeadlessFirefox",
1213
"ci-e2e": "ng e2e --port 4201 --protractor-config ./e2e/protractor-ci.conf.js",
1314
"test": "ng test --watch --browsers Chrome --source-map=false",
1415
"lint": "ng lint",
15-
"e2e": "ng e2e --port 4201"
16+
"e2e": "ng e2e --port 4201",
17+
"// postinstall note": "Check https://angular.io/guide/ivy#speeding-up-ngcc-compilation",
18+
"postinstall": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points",
19+
"// utils": "",
20+
"source-map-explorer": "node_modules/.bin/source-map-explorer dist/strongbox-database-ui/main-es2015.*.js"
1621
},
1722
"private": true,
1823
"dependencies": {
19-
"@angular/animations": "~8.2.14",
20-
"@angular/cdk": "~8.2.3",
21-
"@angular/common": "~8.2.14",
22-
"@angular/compiler": "~8.2.14",
23-
"@angular/core": "~8.2.14",
24-
"@angular/flex-layout": "^8.0.0-beta.27",
25-
"@angular/forms": "~8.2.14",
26-
"@angular/material": "^8.2.3",
27-
"@angular/platform-browser": "~8.2.14",
28-
"@angular/platform-browser-dynamic": "~8.2.14",
29-
"@angular/router": "~8.2.14",
24+
"@angular/animations": "~9.0.0",
25+
"@angular/cdk": "~9.0.0",
26+
"@angular/common": "~9.0.0",
27+
"@angular/compiler": "~9.0.0",
28+
"@angular/core": "~9.0.0",
29+
"@angular/flex-layout": "^9.0.0-beta.29",
30+
"@angular/forms": "~9.0.0",
31+
"@angular/material": "~9.0.0",
32+
"@angular/platform-browser": "~9.0.0",
33+
"@angular/platform-browser-dynamic": "~9.0.0",
34+
"@angular/router": "~9.0.0",
3035
"class-transformer": "^0.2.3",
3136
"core-js": "^3.5.0",
3237
"d3": "^5.14.2",
3338
"d3-force": "^2.0.1",
3439
"d3-force-reuse": "^1.0.1",
3540
"ionicons": "^4.6.3",
3641
"ngx-json-viewer": "^2.4.0",
37-
"ngx-toastr": "^11.2.1",
42+
"ngx-toastr": "^12.0.0",
3843
"open-sans-fontface": "^1.4.0",
39-
"rxjs": "~6.4.0",
44+
"rxjs": "~6.5.4",
4045
"tslib": "^1.10.0",
4146
"uuid": "^3.3.3",
42-
"zone.js": "~0.9.1"
47+
"zone.js": "~0.10.2"
4348
},
4449
"devDependencies": {
45-
"@angular-devkit/build-angular": "~0.803.20",
46-
"@angular/cli": "~8.3.20",
47-
"@angular/compiler-cli": "~8.2.14",
48-
"@angular/language-service": "~8.2.14",
50+
"@angular-devkit/build-angular": "~0.900.1",
51+
"@angular/cli": "~9.0.1",
52+
"@angular/compiler-cli": "~9.0.0",
53+
"@angular/language-service": "~9.0.0",
4954
"@types/d3": "^5.7.2",
5055
"@types/d3-force": "^1.2.1",
5156
"@types/d3-selection": "^1.4.1",
5257
"@types/jasmine": "~3.3.8",
5358
"@types/jasminewd2": "~2.0.3",
54-
"@types/node": "~8.9.4",
55-
"codelyzer": "^5.0.0",
59+
"@types/node": "^12.11.1",
60+
"codelyzer": "^5.1.2",
5661
"compression-webpack-plugin": "^3.0.1",
5762
"filemanager-webpack-plugin": "^2.0.5",
5863
"http-server": "^0.12.0",
@@ -68,9 +73,10 @@
6873
"karma-verbose-reporter": "0.0.6",
6974
"protractor": "~5.4.0",
7075
"rimraf": "^3.0.0",
76+
"source-map-explorer": "^2.2.2",
7177
"ts-node": "~7.0.0",
7278
"tslint": "~5.15.0",
73-
"typescript": "~3.5.3",
79+
"typescript": "~3.7.5",
7480
"webpack-cli": "^3.3.10",
7581
"webpack-manifest-plugin": "^2.2.0"
7682
}

src/app/material.module.ts

Lines changed: 8 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,28 @@
11
import {NgModule} from '@angular/core';
22
import {FlexLayoutModule} from '@angular/flex-layout';
33
import {NgxJsonViewerModule} from 'ngx-json-viewer';
4-
5-
import {
6-
MatAutocompleteModule,
7-
MatBadgeModule,
8-
MatButtonModule,
9-
MatButtonToggleModule,
10-
MatCardModule,
11-
MatCheckboxModule,
12-
MatChipsModule,
13-
MatDialogModule,
14-
MatExpansionModule,
15-
MatIconModule,
16-
MatInputModule,
17-
MatListModule,
18-
MatMenuModule,
19-
MatPaginatorModule,
20-
MatProgressBarModule,
21-
MatProgressSpinnerModule,
22-
MatRadioModule,
23-
MatSelectModule,
24-
MatSidenavModule,
25-
MatSlideToggleModule,
26-
MatSortModule,
27-
MatTableModule,
28-
MatTabsModule,
29-
MatToolbarModule,
30-
MatTooltipModule
31-
} from '@angular/material';
4+
import {MatButtonModule} from '@angular/material/button';
5+
import {MatCardModule} from '@angular/material/card';
6+
import {MatInputModule} from '@angular/material/input';
7+
import {MatListModule} from '@angular/material/list';
8+
import {MatProgressBarModule} from '@angular/material/progress-bar';
9+
import {MatSelectModule} from '@angular/material/select';
10+
import {MatSortModule} from '@angular/material/sort';
11+
import {MatTableModule} from '@angular/material/table';
3212

3313
import {CdkTableModule} from '@angular/cdk/table';
3414

3515
const components = [
3616
CdkTableModule,
3717
FlexLayoutModule,
38-
MatAutocompleteModule,
39-
MatBadgeModule,
4018
MatButtonModule,
41-
MatButtonToggleModule,
4219
MatCardModule,
43-
MatCheckboxModule,
44-
MatChipsModule,
45-
MatDialogModule,
4620
MatInputModule,
47-
MatIconModule,
4821
MatListModule,
49-
MatExpansionModule,
50-
MatMenuModule,
51-
MatPaginatorModule,
5222
MatProgressBarModule,
53-
MatProgressSpinnerModule,
54-
MatRadioModule,
5523
MatSelectModule,
56-
MatSidenavModule,
57-
MatSlideToggleModule,
5824
MatTableModule,
5925
MatSortModule,
60-
MatTabsModule,
61-
MatToolbarModule,
62-
MatTooltipModule,
6326
NgxJsonViewerModule
6427
];
6528

src/app/pages/console/components/console-query-result/components/console-query-result-json-view/console-query-result-json-view.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export class ConsoleQueryResultJsonViewComponent implements OnInit, OnDestroy, A
1717
@Input()
1818
result: QueryResponse = null;
1919

20-
@ViewChild('jsonViewer', {static: false, read: NgxJsonViewerComponent})
20+
@ViewChild('jsonViewer', { read: NgxJsonViewerComponent })
2121
jsonView: NgxJsonViewerComponent = null;
2222

2323
prettyView: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);

src/app/pages/console/components/console-query-result/components/console-query-result-table-view/console-query-result-table-view.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component, Input, OnDestroy, OnInit, ViewChild} from '@angular/core';
22
import {FormControl} from '@angular/forms';
3-
import {MatTableDataSource} from '@angular/material';
3+
import { MatTableDataSource } from '@angular/material/table';
44
import {NgxJsonViewerComponent} from 'ngx-json-viewer';
55
import {Subject} from 'rxjs';
66

@@ -20,7 +20,7 @@ export class ConsoleQueryResultTableViewComponent implements OnInit, OnDestroy {
2020
displayedColumns: FormControl = new FormControl();
2121
dataSource: MatTableDataSource<any> = new MatTableDataSource<any>([]);
2222

23-
@ViewChild('jsonViewer', {static: false, read: NgxJsonViewerComponent})
23+
@ViewChild('jsonViewer', { read: NgxJsonViewerComponent })
2424
jsonView: NgxJsonViewerComponent;
2525

2626
tableViewData: TableViewData = null;

src/app/pages/console/components/console-query/console-query.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {AfterContentInit, Component, ElementRef, HostListener, OnDestroy, OnInit, ViewChild} from '@angular/core';
22
import {FormControl, Validators} from '@angular/forms';
3-
import {MatList} from '@angular/material';
3+
import { MatList } from '@angular/material/list';
44
import {BehaviorSubject, Subject} from 'rxjs';
55
import {takeUntil} from 'rxjs/operators';
66

@@ -38,7 +38,7 @@ export class ConsoleQueryComponent implements OnInit, OnDestroy, AfterContentIni
3838
@ViewChild('queryTextArea', {static: true, read: ElementRef})
3939
private queryTextArea: ElementRef;
4040

41-
@ViewChild('historyList', {static: false, read: MatList})
41+
@ViewChild('historyList', { read: MatList })
4242
private historyList: MatList;
4343

4444
private destroy$: Subject<any> = new Subject();

src/app/pages/schema/schema.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, OnDestroy, OnInit} from '@angular/core';
2-
import {MatTableDataSource} from '@angular/material';
2+
import { MatTableDataSource } from '@angular/material/table';
33

44
import {DatabaseService} from '../../services/database.service';
55
import {CypherQueryRequest} from '../../models/query.model';

tsconfig.app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"src/polyfills.ts"
1010
],
1111
"include": [
12-
"src/**/*.ts"
12+
"src/**/*.d.ts"
1313
],
1414
"exclude": [
1515
"src/test.ts",

0 commit comments

Comments
 (0)