bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 07:43:35 +00:00
Code Issues Releases Wiki Activity

Upgrade Angular (#1365)

Browse Source 
* Upgrade Angular

* Upgrade angular2-toaster and angulartisc2

* Remove ng-upgrade dependency

* Update app.component.ts
This commit is contained in:
Oscar Hinton
2020-08-18 22:13:37 +02:00
committed by GitHub
parent f158661afa
commit f00bb5e1d7
6 changed files with 482 additions and 1214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

Submodule jslib updated: 101c5688c4...9957125d3a

1651
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

34
package.json
View File

@@ -24,8 +24,8 @@
"test:watch": "karma start" "test:watch": "karma start"
}, },
"devDependencies": { "devDependencies": {
"@angular/compiler-cli": "^7.2.11", "@angular/compiler-cli": "^9.1.12",
"@ngtools/webpack": "^7.2.2", "@ngtools/webpack": "^9.1.12",
"@types/chrome": "^0.0.73", "@types/chrome": "^0.0.73",
"@types/jasmine": "^3.3.12", "@types/jasmine": "^3.3.12",
"@types/lunr": "^2.3.3", "@types/lunr": "^2.3.3",
@@ -71,25 +71,24 @@
"ts-loader": "^8.0.2", "ts-loader": "^8.0.2",
"tslint": "^6.1.3", "tslint": "^6.1.3",
"tslint-loader": "^3.5.4", "tslint-loader": "^3.5.4",
"typescript": "3.6.5", "typescript": "3.8.3",
"webpack": "^4.29.0", "webpack": "^4.29.0",
"webpack-cli": "^3.2.1" "webpack-cli": "^3.2.1"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "7.2.1", "@angular/animations": "9.1.12",
"@angular/cdk": "7.2.1", "@angular/cdk": "9.2.4",
"@angular/common": "7.2.1", "@angular/common": "9.1.12",
"@angular/compiler": "7.2.1", "@angular/compiler": "9.1.12",
"@angular/core": "7.2.1", "@angular/core": "9.1.12",
"@angular/forms": "7.2.1", "@angular/forms": "9.1.12",
"@angular/platform-browser": "7.2.1", "@angular/platform-browser": "9.1.12",
"@angular/platform-browser-dynamic": "7.2.1", "@angular/platform-browser-dynamic": "9.1.12",
"@angular/router": "7.2.1", "@angular/router": "9.1.12",
"@angular/upgrade": "7.2.1",
"@microsoft/signalr": "3.1.0", "@microsoft/signalr": "3.1.0",
"@microsoft/signalr-protocol-msgpack": "3.1.0", "@microsoft/signalr-protocol-msgpack": "3.1.0",
"angular2-toaster": "6.1.0", "angular2-toaster": "8.0.0",
"angulartics2": "6.3.0", "angulartics2": "9.1.0",
"big-integer": "1.6.36", "big-integer": "1.6.36",
"core-js": "2.6.2", "core-js": "2.6.2",
"duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git", "duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git",
@@ -100,11 +99,12 @@
"node-forge": "0.7.6", "node-forge": "0.7.6",
"nord": "^0.2.1", "nord": "^0.2.1",
"papaparse": "4.6.0", "papaparse": "4.6.0",
"rxjs": "6.3.3", "rxjs": "6.6.2",
"sweetalert2": "9.8.2", "sweetalert2": "9.8.2",
"tldjs": "2.3.1", "tldjs": "2.3.1",
"tslib": "^2.0.1",
"web-animations-js": "2.3.1", "web-animations-js": "2.3.1",
"zone.js": "0.8.28", "zone.js": "0.10.3",
"zxcvbn": "4.4.2" "zxcvbn": "4.4.2"
} }
} }

3
src/popup/app-routing.module.ts
View File

@@ -1,4 +1,4 @@
import { NgModule } from '@angular/core'; import { NgModule, Injectable } from '@angular/core';
import { import {
ActivatedRouteSnapshot, ActivatedRouteSnapshot,
RouteReuseStrategy, RouteReuseStrategy,
@@ -249,6 +249,7 @@ const routes: Routes = [
}, },
]; ];
@Injectable()
export class NoRouteReuseStrategy implements RouteReuseStrategy { export class NoRouteReuseStrategy implements RouteReuseStrategy {
shouldDetach(route: ActivatedRouteSnapshot) { shouldDetach(route: ActivatedRouteSnapshot) {
return false; return false;

2
src/popup/app.module.ts
View File

@@ -149,7 +149,7 @@ registerLocaleData(localeZhTw, 'zh-TW');
FormsModule, FormsModule,
AppRoutingModule, AppRoutingModule,
ServicesModule, ServicesModule,
Angulartics2Module.forRoot([Angulartics2GoogleAnalytics], { Angulartics2Module.forRoot({
pageTracking: { pageTracking: {
clearQueryParams: true, clearQueryParams: true,
}, },

4
src/popup/settings/settings.component.ts
View File

@@ -44,8 +44,8 @@ const RateUrls = {
templateUrl: 'settings.component.html', templateUrl: 'settings.component.html',
}) })
export class SettingsComponent implements OnInit { export class SettingsComponent implements OnInit {
@ViewChild('vaultTimeoutSelect', { read: ElementRef }) vaultTimeoutSelectRef: ElementRef; @ViewChild('vaultTimeoutSelect', { read: ElementRef, static: true }) vaultTimeoutSelectRef: ElementRef;
@ViewChild('vaultTimeoutActionSelect', { read: ElementRef }) vaultTimeoutActionSelectRef: ElementRef; @ViewChild('vaultTimeoutActionSelect', { read: ElementRef, static: true }) vaultTimeoutActionSelectRef: ElementRef;
vaultTimeouts: any[]; vaultTimeouts: any[];
vaultTimeout: number = null; vaultTimeout: number = null;
vaultTimeoutActions: any[]; vaultTimeoutActions: any[];