5 files changed, 96 insertions, 25 deletions

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 9d6d1bd18..7368c7774 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -4,8 +4,7 @@ import babel from 'gulp-babel';
 import dartSass from 'sass';
 import gulpSass from 'gulp-sass';
 import csso from 'gulp-csso';
-import terser from 'terser';
-import composer from 'gulp-uglify/composer';
+import terser from 'gulp-terser';
 import htmlMin from 'gulp-htmlmin';
 import connect from 'gulp-connect';
 import { exec } from 'child_process';
@@ -24,7 +23,6 @@ import * as rawStyleConfig from './scripts/theme/default/legacy';
 dotenv.config();
 
 const sass = gulpSass(dartSass);
-const uglify = composer(terser, console);
 
 const isDevBuild = process.env.NODE_ENV === 'development';
 
@@ -200,7 +198,7 @@ export function processJavascripts() {
         comments: false,
       }),
     )
-    .pipe(gulpIf(!isDevBuild, uglify())) // Only uglify in production to speed up dev builds
+    .pipe(gulpIf(!isDevBuild, terser())) // Only uglify in production to speed up dev builds
     .pipe(gulp.dest(paths.javascripts.dest))
     .pipe(connect.reload());
 }
@@ -214,7 +212,7 @@ export function processTypescripts() {
         comments: false,
       }),
     )
-    .pipe(gulpIf(!isDevBuild, uglify())) // Only uglify in production to speed up dev builds
+    .pipe(gulpIf(!isDevBuild, terser())) // Only uglify in production to speed up dev builds
     .pipe(gulp.dest(paths.typescripts.dest))
     .pipe(connect.reload());
 }
diff --git a/package-lock.json b/package-lock.json
index 2c73e20fe..64a8de037 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -104,7 +104,7 @@
         "@types/react": "^17.0.31",
         "@types/react-dom": "^17.0.10",
         "@types/route-parser": "^0.1.3",
-        "@types/tar": "^4.0.5",
+        "@types/tar": "^6.1.0",
         "@types/uuid": "^8.3.1",
         "@types/validator": "^13.6.4",
         "@typescript-eslint/eslint-plugin": "^5.1.0",
@@ -140,6 +140,7 @@
         "gulp-if": "^3.0.0",
         "gulp-sass": "^5.0.0",
         "gulp-sass-variables": "^1.2.0",
+        "gulp-terser": "^2.1.0",
         "gulp-typescript": "^6.0.0-alpha.1",
         "gulp-uglify": "^3.0.2",
         "hex-rgb": "^4.3.0",
@@ -149,13 +150,12 @@
         "jest": "^27.3.1",
         "kebab-case": "^1.0.1",
         "mocha": "^9.1.3",
-        "node-gyp": "8.3.0",
+        "node-gyp": "8.4.0",
         "prettier": "^2.4.1",
         "preval-build-info": "^1.0.3",
         "rimraf": "^3.0.2",
         "sass": "^1.43.3",
         "simple-git": "^2.47.0",
-        "terser": "^4.8.0",
         "ts-loader": "^5.4.5",
         "ts-mocha": "^8.0.0",
         "ts-node": "^10.2.1",
@@ -4955,9 +4955,9 @@
       "dev": true
     },
     "node_modules/@types/tar": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@types/tar/-/tar-4.0.5.tgz",
-      "integrity": "sha512-cgwPhNEabHaZcYIy5xeMtux2EmYBitfqEceBUi2t5+ETy4dW6kswt6WX4+HqLeiiKOo42EXbGiDmVJ2x+vi37Q==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@types/tar/-/tar-6.1.0.tgz",
+      "integrity": "sha512-uTZKMW7ZkdTJXX4+Bsp0ko9N7B5/NJ5wJRW14XTb6KNN+9i2NPel6iPKp8rTQahMW46BM9tM52dTeMSldB55og==",
       "dev": true,
       "dependencies": {
         "@types/minipass": "*",
@@ -15201,6 +15201,47 @@
         "node": ">=8"
       }
     },
+    "node_modules/gulp-terser": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-terser/-/gulp-terser-2.1.0.tgz",
+      "integrity": "sha512-lQ3+JUdHDVISAlUIUSZ/G9Dz/rBQHxOiYDQ70IVWFQeh4b33TC1MCIU+K18w07PS3rq/CVc34aQO4SUbdaNMPQ==",
+      "dev": true,
+      "dependencies": {
+        "plugin-error": "^1.0.1",
+        "terser": "^5.9.0",
+        "through2": "^4.0.2",
+        "vinyl-sourcemaps-apply": "^0.2.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/gulp-terser/node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/gulp-terser/node_modules/terser": {
+      "version": "5.9.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
+      "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^2.20.0",
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/gulp-typescript": {
       "version": "6.0.0-alpha.1",
       "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-6.0.0-alpha.1.tgz",
@@ -22007,9 +22048,9 @@
       "integrity": "sha1-5FSb63kcOxyEJ1WlJztzvosICjQ="
     },
     "node_modules/node-gyp": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.3.0.tgz",
-      "integrity": "sha512-e+vmKyTiybKgrmvs4M2REFKCnOd+NcrAAnn99Yko6NQA+zZdMlRvbIUHojfsHrSQ1CddLgZnHicnEVgDHziJzA==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.0.tgz",
+      "integrity": "sha512-Bi/oCm5bH6F+FmzfUxJpPaxMEyIhszULGR3TprmTeku8/dMFcdTcypk120NeZqEt54r1BrgEKtm2jJiuIKE28Q==",
       "dev": true,
       "dependencies": {
         "env-paths": "^2.2.0",
@@ -35637,9 +35678,9 @@
       "dev": true
     },
     "@types/tar": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@types/tar/-/tar-4.0.5.tgz",
-      "integrity": "sha512-cgwPhNEabHaZcYIy5xeMtux2EmYBitfqEceBUi2t5+ETy4dW6kswt6WX4+HqLeiiKOo42EXbGiDmVJ2x+vi37Q==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@types/tar/-/tar-6.1.0.tgz",
+      "integrity": "sha512-uTZKMW7ZkdTJXX4+Bsp0ko9N7B5/NJ5wJRW14XTb6KNN+9i2NPel6iPKp8rTQahMW46BM9tM52dTeMSldB55og==",
       "dev": true,
       "requires": {
         "@types/minipass": "*",
@@ -43871,6 +43912,37 @@
         }
       }
     },
+    "gulp-terser": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-terser/-/gulp-terser-2.1.0.tgz",
+      "integrity": "sha512-lQ3+JUdHDVISAlUIUSZ/G9Dz/rBQHxOiYDQ70IVWFQeh4b33TC1MCIU+K18w07PS3rq/CVc34aQO4SUbdaNMPQ==",
+      "dev": true,
+      "requires": {
+        "plugin-error": "^1.0.1",
+        "terser": "^5.9.0",
+        "through2": "^4.0.2",
+        "vinyl-sourcemaps-apply": "^0.2.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true
+        },
+        "terser": {
+          "version": "5.9.0",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
+          "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
+          "dev": true,
+          "requires": {
+            "commander": "^2.20.0",
+            "source-map": "~0.7.2",
+            "source-map-support": "~0.5.20"
+          }
+        }
+      }
+    },
     "gulp-typescript": {
       "version": "6.0.0-alpha.1",
       "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-6.0.0-alpha.1.tgz",
@@ -49068,9 +49140,9 @@
       "integrity": "sha1-5FSb63kcOxyEJ1WlJztzvosICjQ="
     },
     "node-gyp": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.3.0.tgz",
-      "integrity": "sha512-e+vmKyTiybKgrmvs4M2REFKCnOd+NcrAAnn99Yko6NQA+zZdMlRvbIUHojfsHrSQ1CddLgZnHicnEVgDHziJzA==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.0.tgz",
+      "integrity": "sha512-Bi/oCm5bH6F+FmzfUxJpPaxMEyIhszULGR3TprmTeku8/dMFcdTcypk120NeZqEt54r1BrgEKtm2jJiuIKE28Q==",
       "dev": true,
       "requires": {
         "env-paths": "^2.2.0",
diff --git a/package.json b/package.json
index eaac08ce1..dc6435c4a 100644
--- a/package.json
+++ b/package.json
@@ -141,7 +141,7 @@
     "@types/react": "^17.0.31",
     "@types/react-dom": "^17.0.10",
     "@types/route-parser": "^0.1.3",
-    "@types/tar": "^4.0.5",
+    "@types/tar": "^6.1.0",
     "@types/uuid": "^8.3.1",
     "@types/validator": "^13.6.4",
     "@typescript-eslint/eslint-plugin": "^5.1.0",
@@ -177,6 +177,7 @@
     "gulp-if": "^3.0.0",
     "gulp-sass": "^5.0.0",
     "gulp-sass-variables": "^1.2.0",
+    "gulp-terser": "^2.1.0",
     "gulp-typescript": "^6.0.0-alpha.1",
     "gulp-uglify": "^3.0.2",
     "hex-rgb": "^4.3.0",
@@ -186,13 +187,12 @@
     "jest": "^27.3.1",
     "kebab-case": "^1.0.1",
     "mocha": "^9.1.3",
-    "node-gyp": "8.3.0",
+    "node-gyp": "8.4.0",
     "prettier": "^2.4.1",
     "preval-build-info": "^1.0.3",
     "rimraf": "^3.0.2",
     "sass": "^1.43.3",
     "simple-git": "^2.47.0",
-    "terser": "^4.8.0",
     "ts-loader": "^5.4.5",
     "ts-mocha": "^8.0.0",
     "ts-node": "^10.2.1",
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index dd71c2450..f23417870 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -125,8 +125,8 @@ class Invite extends Component {
       .some(emailValue => emailValue.trim() !== '');
 
     const sendButtonClassName = classnames({
-      auth__button: true,
-      'invite__embed--button': embed,
+      'auth__button': true,
+      'invite__embed--button': embed
     });
 
     const renderForm = (
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 3e0736fb5..50a28803f 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -190,6 +190,7 @@ AppLayoutContainer.wrappedComponent.propTypes = {
     app: PropTypes.instanceOf(AppStore).isRequired,
     requests: PropTypes.instanceOf(RequestStore).isRequired,
   }).isRequired,
+  // eslint-disable-next-line react/require-default-props
   children: oneOrManyChildElements,
 };