Bump angular to 12. (#571)

bitwarden · Dec 9, 2021 · 6a179ab · 6a179ab
1 parent a6b95b1
commit 6a179ab
Show file tree

Hide file tree

Showing 11 changed files with 1,555 additions and 1,772 deletions.
diff --git a/angular/package-lock.json b/angular/package-lock.json
diff --git a/angular/package.json b/angular/package.json
@@ -22,21 +22,21 @@
   "devDependencies": {
     "@types/duo_web_sdk": "^2.7.1",
     "rimraf": "^3.0.2",
-    "typescript": "4.1.5"
+    "typescript": "4.3.5"
   },
   "dependencies": {
-    "@angular/animations": "^11.2.11",
-    "@angular/cdk": "^11.2.10",
-    "@angular/common": "^11.2.11",
-    "@angular/compiler": "^11.2.11",
-    "@angular/core": "^11.2.11",
-    "@angular/forms": "^11.2.11",
-    "@angular/platform-browser": "^11.2.11",
-    "@angular/platform-browser-dynamic": "^11.2.11",
-    "@angular/router": "^11.2.11",
+    "@angular/animations": "^12.2.13",
+    "@angular/cdk": "^12.2.13",
+    "@angular/common": "^12.2.13",
+    "@angular/compiler": "^12.2.13",
+    "@angular/core": "^12.2.13",
+    "@angular/forms": "^12.2.13",
+    "@angular/platform-browser": "^12.2.13",
+    "@angular/platform-browser-dynamic": "^12.2.13",
+    "@angular/router": "^12.2.13",
     "@bitwarden/jslib-common": "file:../common",
     "duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git",
-    "rxjs": "6.6.7",
+    "rxjs": "^7.4.0",
     "tldjs": "^2.3.1",
     "zone.js": "0.11.4"
   }

diff --git a/angular/src/components/modal/modal.ref.ts b/angular/src/components/modal/modal.ref.ts
@@ -6,14 +6,14 @@ export class ModalRef {
     onCreated: Observable<HTMLElement>; // Modal added to the DOM.
     onClose: Observable<any>;           // Initiated close.
     onClosed: Observable<any>;          // Modal was closed (Remove element from DOM)
-    onShow: Observable<any>;            // Start showing modal
-    onShown: Observable<any>;           // Modal is fully visible
+    onShow: Observable<void>;           // Start showing modal
+    onShown: Observable<void>;          // Modal is fully visible
 
     private readonly _onCreated = new Subject<HTMLElement>();
     private readonly _onClose = new Subject<any>();
     private readonly _onClosed = new Subject<any>();
-    private readonly _onShow = new Subject<any>();
-    private readonly _onShown = new Subject<any>();
+    private readonly _onShow = new Subject<void>();
+    private readonly _onShown = new Subject<void>();
     private lastResult: any;
 
     constructor() {

diff --git a/common/package-lock.json b/common/package-lock.json
diff --git a/common/package.json b/common/package.json
@@ -27,7 +27,7 @@
     "@types/tldjs": "^2.3.0",
     "@types/zxcvbn": "^4.4.1",
     "rimraf": "^3.0.2",
-    "typescript": "4.1.5"
+    "typescript": "4.3.5"
   },
   "dependencies": {
     "@microsoft/signalr": "5.0.10",
@@ -37,7 +37,7 @@
     "lunr": "^2.3.9",
     "node-forge": "^0.10.0",
     "papaparse": "^5.3.0",
-    "rxjs": "6.6.7",
+    "rxjs": "^7.4.0",
     "tldjs": "^2.3.1",
     "zxcvbn": "^4.4.2"
   }

diff --git a/common/src/importers/baseImporter.ts b/common/src/importers/baseImporter.ts
@@ -88,7 +88,7 @@ export abstract class BaseImporter {
     }
 
     protected parseCsv(data: string, header: boolean, options: any = {}): any[] {
-        const parseOptions = Object.assign({ header: header }, this.parseCsvOptions, options);
+        const parseOptions: papa.ParseConfig<string> = Object.assign({ header: header }, this.parseCsvOptions, options);
         data = this.splitNewLine(data).join('\n').trim();
         const result = papa.parse(data, parseOptions);
         if (result.errors != null && result.errors.length > 0) {