From 2075f299bd997e1c8b31e4bf058f48498b81e3db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Dec 2020 10:57:26 +0000
Subject: [PATCH 1/2] Bump eslint-plugin-unicorn from 23.0.0 to 24.0.0

Bumps [eslint-plugin-unicorn](https://github.com/sindresorhus/eslint-plugin-unicorn) from 23.0.0 to 24.0.0.
- [Release notes](https://github.com/sindresorhus/eslint-plugin-unicorn/releases)
- [Commits](https://github.com/sindresorhus/eslint-plugin-unicorn/compare/v23.0.0...v24.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8d835ff5b433..d2e910ad56ac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4031,9 +4031,9 @@
       }
     },
     "eslint-plugin-unicorn": {
-      "version": "23.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-23.0.0.tgz",
-      "integrity": "sha512-Vabo3cjl6cjyhcf+76CdQEY6suOFzK0Xh3xo0uL9VDYrDJP5+B6PjV0tHTYm82WZmFWniugFJM3ywHSNYTi/ZQ==",
+      "version": "24.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-24.0.0.tgz",
+      "integrity": "sha512-NfLjIZas/ZUwc3S+pUtbTRqgCkODxPEkJBJ5ZR8wIu90BmX4jmXp10hoOZMScR2CR1NYTtrx0OX4BQvBnbzZzA==",
       "dev": true,
       "requires": {
         "ci-info": "^2.0.0",
@@ -4048,7 +4048,7 @@
         "regexp-tree": "^0.1.21",
         "reserved-words": "^0.1.2",
         "safe-regex": "^2.1.1",
-        "semver": "^7.3.2"
+        "semver": "^7.3.4"
       },
       "dependencies": {
         "safe-regex": {
diff --git a/package.json b/package.json
index 4e82b78cafa6..17c14a40c10a 100644
--- a/package.json
+++ b/package.json
@@ -113,7 +113,7 @@
     "eslint": "^7.15.0",
     "eslint-config-xo": "^0.33.1",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-unicorn": "^23.0.0",
+    "eslint-plugin-unicorn": "^24.0.0",
     "find-unused-sass-variables": "^3.0.0",
     "glob": "^7.1.6",
     "hammer-simulator": "0.0.1",

From 687e4c7d7bea6f91c28f09eaeb99dea074ff9117 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Thu, 17 Dec 2020 15:02:22 +0200
Subject: [PATCH 2/2] Update karma.conf.js

---
 js/tests/karma.conf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js
index d0dd8bdd9033..38c7003bb0f9 100644
--- a/js/tests/karma.conf.js
+++ b/js/tests/karma.conf.js
@@ -59,7 +59,7 @@ const conf = {
   colors: true,
   autoWatch: false,
   singleRun: true,
-  concurrency: Infinity,
+  concurrency: Number.POSITIVE_INFINITY,
   client: {
     clearContext: false
   },