Upgrade client dependencies (#12329)

* upgrade amplitude-js to v6

* upgrade svg-url-loader

* upgrade uuid

* upgrade validator

website/client/package-lock.json

@@ -2849,6 +2849,11 @@
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
         }
       }
     },
@@ -5852,9 +5857,9 @@
       "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
     },
     "amplitude-js": {
-      "version": "5.11.0",
+      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-5.11.0.tgz",
+      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-6.2.0.tgz",
-      "integrity": "sha512-rH5CqWvnKK9E6uVI7h1t/ikkQK4vhiS7iy2fncE4K56MY0ty/XVF9cNFBq2NAujMo1VXvu8oG80MdIETPG1zsA==",
+      "integrity": "sha512-l+00XubD0ZJHcWUBMzV6JrtXs1JhsqO/qGoDbYLtljtgup/cCclOAuirwQJMtYLRP6vEmstGjZtq1Ew9nWnzug==",
       "requires": {
         "@amplitude/ua-parser-js": "0.7.20",
         "blueimp-md5": "^2.10.0",
@@ -7062,9 +7067,9 @@
       "integrity": "sha512-aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg=="
     },
     "blueimp-md5": {
-      "version": "2.13.0",
+      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.16.0.tgz",
-      "integrity": "sha512-lmp0m647R5e77ORduxLW5mISIDcvgJZa52vMBv5uVI3UmSWTQjkJsZVBfaFqQPw/QFogJwvY6e3Gl9nP+Loe+Q=="
+      "integrity": "sha512-j4nzWIqEFpLSbdhUApHRGDwfXbV8ALhqOn+FY5L6XBdKPAXU9BpGgFSbDsgqogfqPPR9R2WooseWCsfhfEC6uQ=="
     },
     "bn.js": {
       "version": "4.11.8",
@@ -16991,6 +16996,11 @@
             "psl": "^1.1.28",
             "punycode": "^2.1.1"
           }
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
         }
       }
     },
@@ -17755,6 +17765,11 @@
         "websocket-driver": "0.6.5"
       },
       "dependencies": {
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+        },
         "websocket-driver": {
           "version": "0.6.5",
           "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
@@ -18637,29 +18652,61 @@
       "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q="
     },
     "svg-url-loader": {
-      "version": "3.0.3",
+      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/svg-url-loader/-/svg-url-loader-3.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/svg-url-loader/-/svg-url-loader-6.0.0.tgz",
-      "integrity": "sha512-MKGiRNDs8fnHcZcPkhGcw9+130IXyFM9H8m6T7u3ScUuZYEeVzX0vNMru30D4MCF6vMYas5iw/Ru9lwFKBjaGw==",
+      "integrity": "sha512-Qr5SCKxyxKcRnvnVrO3iQj9EX/v40UiGEMshgegzV7vpo3yc+HexELOdtWcA3MKjL8IyZZ1zOdcILmDEa/8JJQ==",
       "requires": {
-        "file-loader": "~4.3.0",
+        "file-loader": "~6.0.0",
-        "loader-utils": "~1.2.3"
+        "loader-utils": "~2.0.0"
       },
       "dependencies": {
-        "file-loader": {
+        "ajv": {
-          "version": "4.3.0",
+          "version": "6.12.2",
-          "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-          "integrity": "sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA==",
+          "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
           "requires": {
-            "loader-utils": "^1.2.3",
+            "fast-deep-equal": "^3.1.1",
-            "schema-utils": "^2.5.0"
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+        },
+        "file-loader": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz",
+          "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==",
+          "requires": {
+            "loader-utils": "^2.0.0",
+            "schema-utils": "^2.6.5"
+          }
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
           }
         },
         "schema-utils": {
-          "version": "2.5.0",
+          "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.5.0.tgz",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-          "integrity": "sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==",
+          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
           "requires": {
-            "ajv": "^6.10.2",
+            "@types/json-schema": "^7.0.4",
+            "ajv": "^6.12.2",
             "ajv-keywords": "^3.4.1"
           }
         }
@@ -19589,9 +19636,9 @@
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uuid": {
-      "version": "3.4.0",
+      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+      "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg=="
     },
     "v8-compile-cache": {
       "version": "2.1.0",
@@ -19608,9 +19655,9 @@
       }
     },
     "validator": {
-      "version": "11.1.0",
+      "version": "13.1.1",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-11.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.1.1.tgz",
-      "integrity": "sha512-qiQ5ktdO7CD6C/5/mYV4jku/7qnqzjrxb3C/Q5wR3vGGinHTgJZN/TdFT3ZX4vXhX2R1PXx42fB1cn5W+uJ4lg=="
+      "integrity": "sha512-8GfPiwzzRoWTg7OV1zva1KvrSemuMkv07MA9TTl91hfhe+wKrsrgVN4H2QSFd/U/FhiU3iWPYVgvbsOGwhyFWw=="
     },
     "vary": {
       "version": "1.1.2",
@@ -20064,6 +20111,13 @@
       "requires": {
         "ansi-colors": "^3.0.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+        }
       }
     },
     "webpack-merge": {

website/client/package.json

@@ -24,7 +24,7 @@
     "@vue/cli-plugin-unit-mocha": "^4.4.4",
     "@vue/cli-service": "^4.4.4",
     "@vue/test-utils": "1.0.0-beta.29",
-    "amplitude-js": "^5.11.0",
+    "amplitude-js": "^6.2.0",
     "axios": "^0.19.2",
     "axios-progress-bar": "^1.2.0",
     "babel-eslint": "^10.1.0",
@@ -48,11 +48,11 @@
     "sass-loader": "^8.0.2",
     "smartbanner.js": "^1.16.0",
     "svg-inline-loader": "^0.8.2",
-    "svg-url-loader": "^3.0.3",
+    "svg-url-loader": "^6.0.0",
     "svgo": "^1.3.2",
     "svgo-loader": "^2.2.1",
-    "uuid": "^3.4.0",
+    "uuid": "^8.1.0",
-    "validator": "^11.1.0",
+    "validator": "^13.1.1",
     "vue": "^2.6.11",
     "vue-cli-plugin-storybook": "^0.6.1",
     "vue-mugen-scroll": "^0.2.6",

website/client/src/components/challenges/challengeDetail.vue

@@ -317,7 +317,7 @@ import Vue from 'vue';
 import findIndex from 'lodash/findIndex';
 import cloneDeep from 'lodash/cloneDeep';
 import omit from 'lodash/omit';
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 
 import { mapState } from '@/libs/store';
 import memberSearchDropdown from '@/components/members/memberSearchDropdown';

website/client/src/components/inventory/item.vue

@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 
 export default {
   props: {
@@ -79,7 +79,7 @@ export default {
   },
   data () {
     return Object.freeze({
-      itemId: uuid.v4(),
+      itemId: uuid(),
     });
   },
   methods: {

website/client/src/components/inventory/stable/foodItem.vue

@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 import DragDropDirective from '@/directives/dragdrop.directive';
 
 import CountBadge from '@/components/ui/countBadge';
@@ -71,7 +71,7 @@ export default {
   },
   data () {
     return Object.freeze({
-      itemId: uuid.v4(),
+      itemId: uuid(),
     });
   },
   methods: {

website/client/src/components/inventory/stable/mountItem.vue

@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 import { mapState } from '@/libs/store';
 import { isOwned } from '../../../libs/createAnimal';
 
@@ -54,7 +54,7 @@ export default {
   },
   data () {
     return Object.freeze({
-      itemId: uuid.v4(),
+      itemId: uuid(),
     });
   },
   computed: {

website/client/src/components/inventory/stable/petItem.vue

@@ -106,7 +106,7 @@
 </style>
 
 <script>
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 import { mapState } from '@/libs/store';
 import {
   isAllowedToFeed, isHatchable, isOwned, isSpecial,
@@ -135,7 +135,7 @@ export default {
   },
   data () {
     return Object.freeze({
-      itemId: uuid.v4(),
+      itemId: uuid(),
     });
   },
   computed: {

website/client/src/components/payments/amazonButton.vue

@@ -7,7 +7,7 @@
 
 <script>
 import axios from 'axios';
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 import { mapState } from '@/libs/store';
 import paymentsMixin from '@/mixins/payments';
 
@@ -59,7 +59,7 @@ export default {
     },
   },
   beforeMount () {
-    this.buttonId = `AmazonPayButton-${uuid.v4()}`;
+    this.buttonId = `AmazonPayButton-${uuid()}`;
   },
   mounted () {
     this.amazonPaymentsInit(this.amazonData);

website/client/src/components/shops/shopItem.vue

@@ -235,7 +235,7 @@
 </style>
 
 <script>
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 
 import moment from 'moment';
 import svgGem from '@/assets/svg/gem.svg';
@@ -290,7 +290,7 @@ export default {
   },
   data () {
     return Object.freeze({
-      itemId: uuid.v4(),
+      itemId: uuid(),
       icons: {
         gems: svgGem,
         gold: svgGold,

website/client/src/components/sidebarSection.vue

@@ -79,7 +79,7 @@
 </style>
 
 <script>
-import uuid from 'uuid/v4';
+import { v4 as uuid } from 'uuid';
 import upIcon from '@/assets/svg/up.svg';
 import downIcon from '@/assets/svg/down.svg';
 import informationIcon from '@/assets/svg/information.svg';

website/client/src/components/tasks/modal-controls/checklist.vue

@@ -73,7 +73,7 @@
 <script>
 // import clone from 'lodash/clone';
 import draggable from 'vuedraggable';
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 
 import positiveIcon from '@/assets/svg/positive.svg';
 import deleteIcon from '@/assets/svg/delete.svg';
@@ -128,7 +128,7 @@ export default {
       }
 
       const checkListItem = {
-        id: uuid.v4(),
+        id: uuid(),
         text: newChecklistItemText,
         completed: false,
       };

website/client/src/components/tasks/task.vue

@@ -798,7 +798,7 @@
 import moment from 'moment';
 import axios from 'axios';
 import Vue from 'vue';
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 import isEmpty from 'lodash/isEmpty';
 import { mapState, mapGetters, mapActions } from '@/libs/store';
 import scoreTask from '@/../../common/script/ops/scoreTask';
@@ -839,7 +839,7 @@ export default {
   props: ['task', 'isUser', 'group', 'challenge', 'dueDate'], // @TODO: maybe we should store the group on state?
   data () {
     return {
-      random: uuid.v4(), // used to avoid conflicts between checkboxes ids
+      random: uuid(), // used to avoid conflicts between checkboxes ids
       icons: Object.freeze({
         positive: positiveIcon,
         negative: negativeIcon,

website/client/src/components/tasks/user.vue

@@ -398,7 +398,7 @@
 </style>
 
 <script>
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 import Vue from 'vue';
 import throttle from 'lodash/throttle';
 import cloneDeep from 'lodash/cloneDeep';
@@ -511,7 +511,7 @@ export default {
       this.editingTags = true;
     },
     addTag (eventObj, key) {
-      this.tagsSnap[key].push({ id: uuid.v4(), name: this.newTag });
+      this.tagsSnap[key].push({ id: uuid(), name: this.newTag });
       this.newTag = null;
     },
     removeTag (index, key) {

website/client/src/store/actions/snackbars.js

@@ -1,4 +1,4 @@
-import uuid from 'uuid';
+import { v4 as uuid } from 'uuid';
 
 export function add (store, payload) {
   const notification = { ...payload };