Skip to content

Commit c4e6fa7

Browse files
brendangaddbrendangadd
authored
Merge pull request #5 from StatCan/try-npm-fix
Fix npm vulnerabilities
2 parents 3c844b4 + d32875d commit c4e6fa7

File tree

9 files changed

+11507
-6603
lines changed

9 files changed

+11507
-6603
lines changed

‎frontend/angular.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
"styles": [
3030
"src/styles.scss"
3131
],
32-
"scripts": [],
33-
"es5BrowserSupport": true
32+
"scripts": []
3433
},
3534
"configurations": {
3635
"production": {
@@ -175,4 +174,4 @@
175174
}
176175
},
177176
"defaultProject": "frontend"
178-
}
177+
}

‎frontend/package-lock.json

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

‎frontend/package.json

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,48 +12,49 @@
1212
},
1313
"private": true,
1414
"dependencies": {
15-
"@angular/animations": "^7.2.12",
16-
"@angular/cdk": "^7.3.7",
17-
"@angular/common": "~7.2.0",
18-
"@angular/compiler": "~7.2.0",
19-
"@angular/core": "~7.2.0",
20-
"@angular/forms": "~7.2.0",
21-
"@angular/material": "^7.3.7",
22-
"@angular/platform-browser": "~7.2.0",
23-
"@angular/platform-browser-dynamic": "~7.2.0",
24-
"@angular/router": "~7.2.0",
25-
"@fortawesome/angular-fontawesome": "^0.3.0",
26-
"@fortawesome/fontawesome-svg-core": "^1.2.18",
27-
"@fortawesome/free-brands-svg-icons": "^5.8.2",
28-
"@fortawesome/free-solid-svg-icons": "^5.8.1",
29-
"core-js": "^2.5.4",
15+
"@angular/animations": "^10.0.4",
16+
"@angular/cdk": "^10.0.4",
17+
"@angular/common": "^10.0.4",
18+
"@angular/compiler": "^10.0.4",
19+
"@angular/core": "^10.0.4",
20+
"@angular/forms": "^10.0.4",
21+
"@angular/material": "^10.0.4",
22+
"@angular/platform-browser": "^10.0.4",
23+
"@angular/platform-browser-dynamic": "^10.0.4",
24+
"@angular/router": "^10.0.4",
25+
"@fortawesome/angular-fontawesome": "^0.7.0",
26+
"@fortawesome/fontawesome-svg-core": "^1.2.30",
27+
"@fortawesome/free-brands-svg-icons": "^5.14.0",
28+
"@fortawesome/free-solid-svg-icons": "^5.14.0",
29+
"core-js": "^3.6.5",
3030
"fontawesome": "^5.6.3",
3131
"hammerjs": "^2.0.8",
32-
"lodash": "^4.17.11",
32+
"lodash": "^4.17.19",
3333
"material-icons": "^0.3.1",
34-
"rxjs": "~6.3.3",
35-
"tslib": "^1.9.0",
36-
"zone.js": "~0.8.26"
34+
"node-sass": "^4.14.1",
35+
"rxjs": "^6.6.0",
36+
"tslib": "^2.0.0",
37+
"zone.js": "~0.10.3"
3738
},
3839
"devDependencies": {
39-
"@angular-devkit/build-angular": "~0.13.0",
40-
"@angular/cli": "~7.3.0",
41-
"@angular/compiler-cli": "~7.2.0",
42-
"@angular/language-service": "~7.2.0",
43-
"@types/node": "~8.9.4",
44-
"@types/jasmine": "~2.8.8",
45-
"@types/jasminewd2": "~2.0.3",
46-
"codelyzer": "~4.5.0",
47-
"jasmine-core": "~2.99.1",
48-
"jasmine-spec-reporter": "~4.2.1",
49-
"karma": "~3.1.1",
50-
"karma-chrome-launcher": "~2.2.0",
51-
"karma-coverage-istanbul-reporter": "~2.0.1",
52-
"karma-jasmine": "~1.1.2",
53-
"karma-jasmine-html-reporter": "^0.2.2",
54-
"protractor": "~5.4.0",
55-
"ts-node": "~7.0.0",
56-
"tslint": "~5.11.0",
57-
"typescript": "~3.2.2"
40+
"@angular-devkit/build-angular": "^0.1000.4",
41+
"@angular/cli": "^10.0.4",
42+
"@angular/compiler-cli": "^10.0.4",
43+
"@angular/language-service": "^10.0.4",
44+
"@types/jasmine": "^3.5.11",
45+
"@types/jasminewd2": "^2.0.8",
46+
"@types/node": "^14.0.26",
47+
"codelyzer": "~6.0.0",
48+
"jasmine-core": "~3.6.0",
49+
"jasmine-spec-reporter": "~5.0.2",
50+
"karma": "~5.1.0",
51+
"karma-chrome-launcher": "~3.1.0",
52+
"karma-coverage-istanbul-reporter": "^3.0.3",
53+
"karma-jasmine": "~3.3.1",
54+
"karma-jasmine-html-reporter": "^1.5.4",
55+
"protractor": "^7.0.0",
56+
"ts-node": "~8.10.2",
57+
"tslint": "~6.1.2",
58+
"typescript": "~3.9.7"
5859
}
5960
}

‎frontend/src/app/app.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { faDocker } from "@fortawesome/free-brands-svg-icons";
1919

2020
import { AppRoutingModule } from "./app-routing.module";
2121
import { AppComponent } from "./app.component";
22-
import { MaterialImportsModule } from "./utils/imports";
22+
import { MaterialModule } from "./utils/imports";
2323

2424
import { NamespaceService } from "./services/namespace.service";
2525
import { KubernetesService } from "./services/kubernetes.service";
@@ -83,7 +83,7 @@ import { FormGpusComponent } from "./resource-form/form-gpus/form-gpus.component
8383
BrowserModule,
8484
AppRoutingModule,
8585
HttpClientModule,
86-
MaterialImportsModule,
86+
MaterialModule,
8787
FontAwesomeModule,
8888
BrowserAnimationsModule,
8989
FormsModule,

‎frontend/src/app/main-table/resource-table/confirm-dialog/confirm-dialog.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, Inject } from "@angular/core";
2-
import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material";
2+
import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog";
33

44
interface DialogConfig {
55
title: string;

‎frontend/src/app/main-table/resource-table/resource-table.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import { Component, OnInit, ViewChild } from "@angular/core";
2-
import { MatSort, MatTableDataSource, MatDialog } from "@angular/material";
2+
import { MatSort } from "@angular/material/sort";
3+
import { MatTableDataSource } from "@angular/material/table";
4+
import { MatDialog } from "@angular/material/dialog";
35
import { Subscription } from "rxjs";
46
import { first } from "rxjs/operators";
57
import { isEqual } from "lodash";

‎frontend/src/app/services/snack-bar.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Injectable } from "@angular/core";
2-
import { MatSnackBar } from "@angular/material";
2+
import { MatSnackBar } from "@angular/material/snack-bar";
33
import { SnackBarComponent } from "./snack-bar/snack-bar.component";
44
import { SnackType } from "../utils/types";
55

‎frontend/src/app/services/snack-bar/snack-bar.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, Inject } from "@angular/core";
2-
import { MAT_SNACK_BAR_DATA, MatSnackBarRef } from "@angular/material";
2+
import { MAT_SNACK_BAR_DATA, MatSnackBarRef } from "@angular/material/snack-bar";
33
import { SnackType } from "src/app/utils/types";
44

55
@Component({

‎frontend/src/app/utils/imports.ts

Lines changed: 45 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,30 @@
1-
import { NgModule } from "@angular/core";
1+
import { ModuleWithProviders, NgModule} from "@angular/core";
2+
import { MatIconRegistry } from '@angular/material/icon';
3+
import { MatAutocompleteModule } from '@angular/material/autocomplete';
4+
import { MatButtonModule } from '@angular/material/button';
5+
import { MatCardModule } from '@angular/material/card';
6+
import { MatCheckboxModule } from '@angular/material/checkbox';
7+
import { MatDialogModule } from '@angular/material/dialog';
8+
import { MatDividerModule } from '@angular/material/divider';
9+
import { MatExpansionModule } from '@angular/material/expansion';
10+
import { MatFormFieldModule } from '@angular/material/form-field';
11+
import { MatGridListModule } from '@angular/material/grid-list';
12+
import { MatIconModule } from '@angular/material/icon';
13+
import { MatInputModule } from '@angular/material/input';
14+
import { MatListModule } from '@angular/material/list';
15+
import { MatMenuModule } from '@angular/material/menu';
16+
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
17+
import { MatSelectModule } from '@angular/material/select';
18+
import { MatSidenavModule } from '@angular/material/sidenav';
19+
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
20+
import { MatSnackBarModule } from '@angular/material/snack-bar';
21+
import { MatSortModule } from '@angular/material/sort';
22+
import { MatTableModule } from '@angular/material/table';
23+
import { MatToolbarModule } from '@angular/material/toolbar';
24+
import { MatTooltipModule } from '@angular/material/tooltip';
225

3-
import {
26+
const materialModules = [
427
MatButtonModule,
5-
MatMenuModule,
6-
MatToolbarModule,
7-
MatSidenavModule,
8-
MatIconModule,
9-
MatCardModule,
10-
MatTableModule,
11-
MatDividerModule,
12-
MatSortModule,
13-
MatAutocompleteModule,
14-
MatFormFieldModule,
15-
MatInputModule,
16-
MatDialogModule,
17-
MatGridListModule,
18-
MatExpansionModule,
19-
MatCheckboxModule,
20-
MatSelectModule,
21-
MatListModule,
22-
MatSnackBarModule,
23-
MatTooltipModule,
24-
MatProgressSpinnerModule,
25-
MatSlideToggleModule
26-
} from "@angular/material";
27-
28-
@NgModule({
29-
imports: [
30-
MatButtonModule,
3128
MatMenuModule,
3229
MatToolbarModule,
3330
MatIconModule,
@@ -49,30 +46,24 @@ import {
4946
MatTooltipModule,
5047
MatProgressSpinnerModule,
5148
MatSlideToggleModule
52-
],
53-
exports: [
54-
MatButtonModule,
55-
MatMenuModule,
56-
MatToolbarModule,
57-
MatIconModule,
58-
MatCardModule,
59-
MatSidenavModule,
60-
MatTableModule,
61-
MatDividerModule,
62-
MatSortModule,
63-
MatAutocompleteModule,
64-
MatFormFieldModule,
65-
MatInputModule,
66-
MatDialogModule,
67-
MatGridListModule,
68-
MatExpansionModule,
69-
MatCheckboxModule,
70-
MatSelectModule,
71-
MatListModule,
72-
MatSnackBarModule,
73-
MatTooltipModule,
74-
MatProgressSpinnerModule,
75-
MatSlideToggleModule
76-
]
49+
]
50+
51+
@NgModule({
52+
imports: [ ...materialModules ],
53+
exports: [...materialModules
54+
],
55+
providers: [
56+
]
7757
})
78-
export class MaterialImportsModule {}
58+
export class MaterialModule {
59+
constructor(public matIconRegistry: MatIconRegistry) {
60+
}
61+
62+
static forRoot(): ModuleWithProviders<MaterialModule> {
63+
return {
64+
ngModule: MaterialModule,
65+
providers: [MatIconRegistry]
66+
}
67+
}
68+
}
69+

0 commit comments

Comments
 (0)