Bump dependencies (#936)

* Bump dependencies
2024-09-29 04:17:41 +02:00 · 2021-04-22 21:29:29 +02:00 · 2021-04-22 21:29:29 +02:00 · 9547b72566
commit 9547b72566
parent 38097c40d8
10 changed files with 4934 additions and 7065 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 36641f07b9807d90270ccd743d16b903cb558078
+Subproject commit aca098645a21eef496e21d7c3a942cf6a83ff7bc
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -12,17 +12,17 @@
    "symlink:mac": "npm run symlink:lin",
    "symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib",
    "build": "gulp prebuild && webpack",
-    "build:watch": "gulp prebuild && webpack-dev-server",
+    "build:watch": "gulp prebuild && webpack serve",
    "build:dev": "gulp prebuild && cross-env ENV=development webpack",
-    "build:dev:watch": "gulp prebuild && cross-env ENV=development webpack-dev-server",
+    "build:dev:watch": "gulp prebuild && cross-env ENV=development webpack serve",
    "build:qa": "gulp prebuild && cross-env NODE_ENV=production ENV=qa webpack",
-    "build:qa:watch": "gulp prebuild && cross-env NODE_ENV=production ENV=qa webpack-dev-server",
+    "build:qa:watch": "gulp prebuild && cross-env NODE_ENV=production ENV=qa webpack serve",
    "build:prod": "gulp prebuild && cross-env NODE_ENV=production ENV=production webpack",
-    "build:prod:watch": "gulp prebuild && cross-env NODE_ENV=production ENV=production webpack-dev-server",
-    "build:selfhost": "gulp prebuild && cross-env SELF_HOST=true webpack-dev-server",
-    "build:selfhost:watch": "gulp prebuild && cross-env SELF_HOST=true webpack-dev-server",
+    "build:prod:watch": "gulp prebuild && cross-env NODE_ENV=production ENV=production webpack serve",
+    "build:selfhost": "gulp prebuild && cross-env SELF_HOST=true webpack serve",
+    "build:selfhost:watch": "gulp prebuild && cross-env SELF_HOST=true webpack serve",
    "build:selfhost:prod": "gulp prebuild && cross-env SELF_HOST=true NODE_ENV=production webpack",
-    "build:selfhost:prod:watch": "gulp prebuild && cross-env SELF_HOST=true NODE_ENV=production webpack-dev-server",
+    "build:selfhost:prod:watch": "gulp prebuild && cross-env SELF_HOST=true NODE_ENV=production webpack serve",
    "clean:l10n": "git push origin --delete l10n_master",
    "dist": "npm run build:prod && gulp postdist",
    "dist:selfhost": "npm run build:selfhost:prod && gulp postdist",
@ -32,76 +32,76 @@
    "lint:fix": "tslint 'src/**/*.ts' --fix"
  },
  "devDependencies": {
-    "@angular/compiler-cli": "^9.1.12",
-    "@ngtools/webpack": "^9.1.12",
+    "@angular/compiler-cli": "^11.2.11",
+    "@ngtools/webpack": "^11.2.10",
    "@types/jquery": "^3.5.5",
    "@types/lunr": "^2.3.3",
-    "@types/node": "^10.17.28",
+    "@types/node": "^10.17.57",
    "@types/node-forge": "^0.9.7",
-    "@types/papaparse": "^5.2.0",
+    "@types/papaparse": "^5.2.5",
    "@types/webcrypto": "^0.0.28",
-    "@types/webpack": "^4.4.11",
-    "@types/zxcvbn": "^4.4.0",
-    "angular2-template-loader": "^0.6.2",
-    "clean-webpack-plugin": "^0.1.19",
-    "copy-webpack-plugin": "^5.1.1",
-    "cross-env": "^5.2.0",
-    "css-loader": "^1.0.0",
-    "del": "^3.0.0",
-    "file-loader": "^2.0.0",
-    "gh-pages": "^1.2.0",
-    "gulp": "^4.0.0",
-    "gulp-google-webfonts": "^2.0.0",
-    "html-loader": "^0.5.5",
-    "html-webpack-plugin": "^3.2.0",
-    "mini-css-extract-plugin": "^0.9.0",
-    "node-sass": "^4.13.1",
-    "sass-loader": "^7.1.0",
-    "style-loader": "^0.23.0",
-    "terser-webpack-plugin": "^1.2.3",
-    "ts-loader": "^7.0.5",
+    "@types/webpack": "^4.4.27",
+    "@types/zxcvbn": "^4.4.1",
+    "clean-webpack-plugin": "^3.0.0",
+    "copy-webpack-plugin": "^6.4.0",
+    "cross-env": "^7.0.3",
+    "css-loader": "^5.2.3",
+    "del": "^6.0.0",
+    "file-loader": "^6.2.0",
+    "gh-pages": "^3.1.0",
+    "gulp": "^4.0.2",
+    "gulp-google-webfonts": "^4.0.0",
+    "html-loader": "^1.3.2",
+    "html-webpack-plugin": "^4.5.1",
+    "mini-css-extract-plugin": "^1.5.0",
+    "sass": "^1.32.10",
+    "sass-loader": "^10.1.1",
+    "style-loader": "^2.0.0",
+    "tapable": "^1.1.3",
+    "terser-webpack-plugin": "^4.2.3",
+    "ts-loader": "^8.1.0",
    "tslint": "^6.1.3",
    "tslint-loader": "^3.5.4",
-    "typescript": "3.8.3",
-    "webpack": "^4.29.0",
-    "webpack-cli": "^3.2.1",
-    "webpack-dev-server": "^3.1.14"
+    "typescript": "4.1.5",
+    "webpack": "^4.46.0",
+    "webpack-cli": "^4.6.0",
+    "webpack-dev-server": "^3.11.2"
  },
  "dependencies": {
-    "@angular/animations": "9.1.12",
-    "@angular/cdk": "9.2.4",
-    "@angular/common": "9.1.12",
-    "@angular/compiler": "9.1.12",
-    "@angular/core": "9.1.12",
-    "@angular/forms": "9.1.12",
-    "@angular/platform-browser": "9.1.12",
-    "@angular/platform-browser-dynamic": "9.1.12",
-    "@angular/router": "9.1.12",
+    "@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/localize": "^11.2.11",
+    "@angular/platform-browser": "^11.2.11",
+    "@angular/platform-browser-dynamic": "^11.2.11",
+    "@angular/router": "^11.2.11",
    "@microsoft/signalr": "3.1.13",
    "@microsoft/signalr-protocol-msgpack": "3.1.13",
-    "angular2-toaster": "8.0.0",
+    "angular2-toaster": "11.0.1",
    "big-integer": "1.6.48",
-    "bootstrap": "4.3.1",
-    "braintree-web-drop-in": "1.13.0",
+    "bootstrap": "4.6.0",
+    "braintree-web-drop-in": "1.27.0",
    "browser-hrtime": "^1.1.8",
-    "core-js": "2.6.2",
+    "core-js": "^3.11.0",
    "date-input-polyfill": "^2.14.0",
-    "duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git#410a9186cc34663c4913b17d6528067cd3331f1d",
+    "duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git#5f9a1a8598d2cda494c4f5ee0e38b31474abfee9",
    "font-awesome": "4.7.0",
    "jquery": "3.6.0",
-    "lunr": "2.3.3",
-    "ngx-infinite-scroll": "7.0.1",
+    "lunr": "2.3.9",
+    "ngx-infinite-scroll": "10.0.1",
    "node-forge": "0.10.0",
-    "papaparse": "5.2.0",
-    "popper.js": "1.14.4",
+    "papaparse": "5.3.0",
+    "popper.js": "1.16.1",
    "qrious": "4.0.2",
-    "rxjs": "6.6.2",
-    "sweetalert2": "10.15.4",
-    "tslib": "^2.0.1",
-    "web-animations-js": "2.3.1",
-    "webcrypto-shim": "0.1.4",
-    "whatwg-fetch": "3.0.0",
-    "zone.js": "0.10.3",
+    "rxjs": "^6.6.7",
+    "sweetalert2": "^10.16.6",
+    "tslib": "^2.2.0",
+    "webcrypto-shim": "0.1.7",
+    "whatwg-fetch": "3.6.2",
+    "zone.js": "0.11.4",
    "zxcvbn": "4.4.2"
  }
 }
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@ -1,5 +1,3 @@
-import 'core-js';
-
 import { ToasterModule } from 'angular2-toaster';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';

--- a/src/app/polyfills.ts
+++ b/src/app/polyfills.ts
@ -1,6 +1,5 @@
 /* tslint:disable */
-import 'core-js/es6';
-import 'core-js/es7/reflect';
+import 'core-js/stable';
 require('zone.js/dist/zone');

 // IE11 fix, ref: https://github.com/angular/angular/issues/24769
--- a/src/app/settings/payment.component.ts
+++ b/src/app/settings/payment.component.ts
@ -192,7 +192,7 @@ export class PaymentComponent implements OnInit {
    }

    handleStripeCardPayment(clientSecret: string, successCallback: () => Promise<any>): Promise<any> {
-        return new Promise((resolve, reject) => {
+        return new Promise<void>((resolve, reject) => {
            if (this.showMethods && this.stripeCardNumberElement == null) {
                reject();
                return;
--- a/src/app/settings/tax-info.component.ts
+++ b/src/app/settings/tax-info.component.ts
@ -118,7 +118,7 @@ export class TaxInfoComponent {

    submitTaxInfo(): Promise<any> {
        if (!this.hasChanged()) {
-            return new Promise(resolve => { resolve(); });
+            return new Promise<void>(resolve => { resolve(); });
        }
        const request = this.getTaxInfoRequest();
        return this.organizationId ? this.apiService.putOrganizationTaxInfo(this.organizationId,
--- a/src/connectors/u2f.html
+++ b/src/connectors/u2f.html
@ -4,7 +4,6 @@
 <head>
    <meta charset="utf-8" />
    <title>Bitwarden U2F Connector</title>
-    <script src="scripts/u2f.js"></script>
 </head>

 <body></body>
--- a/tsconfig.json
+++ b/tsconfig.json
@ -47,6 +47,6 @@
    "jslib/src/cli",
    "jslib/src/services/nodeApi.service.ts",
    "jslib/src/services/lowdbStorage.service.ts",
-    "jslib/src/misc/nodeUtils.ts",
+    "jslib/src/misc/nodeUtils.ts"
  ]
 }
--- a/webpack.config.js
+++ b/webpack.config.js
@ -1,7 +1,7 @@
 const path = require('path');
 const fs = require('fs');
 const webpack = require('webpack');
-const CleanWebpackPlugin = require('clean-webpack-plugin');
+const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
@ -68,12 +68,14 @@ const moduleRules = [
        test: /[\/\\]@angular[\/\\].+\.js$/,
        parser: { system: true },
    },
+    {
+        test: /(?:\.ngfactory\.js|\.ngstyle\.js|\.ts)$/,
+        loader: '@ngtools/webpack',
+    },
 ];

 const plugins = [
-    new CleanWebpackPlugin([
-        path.resolve(__dirname, 'build/*'),
-    ]),
+    new CleanWebpackPlugin(),
    // ref: https://github.com/angular/angular/issues/20357
    new webpack.ContextReplacementPlugin(/\@angular(\\|\/)core(\\|\/)fesm5/,
        path.resolve(__dirname, './src')),
@ -107,20 +109,22 @@ const plugins = [
        filename: 'sso-connector.html',
        chunks: ['connectors/sso'],
    }),
-    new CopyWebpackPlugin([
-        { from: './src/.nojekyll' },
-        { from: './src/manifest.json' },
-        { from: './src/favicon.ico' },
-        { from: './src/browserconfig.xml' },
-        { from: './src/app-id.json' },
-        { from: './src/404.html' },
-        { from: './src/404', to: '404' },
-        { from: './src/images', to: 'images' },
-        { from: './src/locales', to: 'locales' },
-        { from: './src/scripts', to: 'scripts' },
-        { from: './node_modules/qrious/dist/qrious.min.js', to: 'scripts' },
-        { from: './node_modules/braintree-web-drop-in/dist/browser/dropin.js', to: 'scripts' },
-    ]),
+    new CopyWebpackPlugin({
+        patterns:[
+            { from: './src/.nojekyll' },
+            { from: './src/manifest.json' },
+            { from: './src/favicon.ico' },
+            { from: './src/browserconfig.xml' },
+            { from: './src/app-id.json' },
+            { from: './src/404.html' },
+            { from: './src/404', to: '404' },
+            { from: './src/images', to: 'images' },
+            { from: './src/locales', to: 'locales' },
+            { from: './src/scripts', to: 'scripts' },
+            { from: './node_modules/qrious/dist/qrious.min.js', to: 'scripts' },
+            { from: './node_modules/braintree-web-drop-in/dist/browser/dropin.js', to: 'scripts' },
+        ],
+    }),
    new MiniCssExtractPlugin({
        filename: '[name].[hash].css',
        chunkFilename: '[id].[hash].css',
@ -133,25 +137,12 @@ const plugins = [
            'CACHE_TAG': JSON.stringify(Math.random().toString(36).substring(7)),
        }
    }),
-];
-
-if (NODE_ENV === 'production') {
-    moduleRules.push({
-        test: /(?:\.ngfactory\.js|\.ngstyle\.js|\.ts)$/,
-        loader: '@ngtools/webpack',
-    });
-    plugins.push(new AngularCompilerPlugin({
+    new AngularCompilerPlugin({
        tsConfigPath: 'tsconfig.json',
        entryModule: 'src/app/app.module#AppModule',
        sourceMap: true,
-    }));
-} else {
-    moduleRules.push({
-        test: /\.ts$/,
-        loaders: ['ts-loader', 'angular2-template-loader'],
-        exclude: path.resolve(__dirname, 'node_modules'),
-    });
-}
+    }),
+];

 // ref: https://webpack.js.org/configuration/dev-server/#devserver
 let certSuffix = fs.existsSync('dev-server.local.pem') ? '.local' : '.shared';