From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 5 May 2022 13:24:11 +0000 (+0200)
Subject: Merge branch '5.4'
X-Git-Tag: 5.5.0_Beta_1~22
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3f1e03869fa6ed0cefdeb43fdef18f806cec2d40;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.4'
---

3f1e03869fa6ed0cefdeb43fdef18f806cec2d40
diff --cc package-lock.json
index f88051c6f1,377fc2ecb1..8e10996ce5
--- a/package-lock.json
+++ b/package-lock.json
@@@ -15,19 -15,17 +15,19 @@@
          "@types/pica": "^5.1.3",
          "@types/prismjs": "^1.16.6",
          "@types/twitter-for-web": "0.0.2",
 +        "focus-trap": "^6.7.1",
          "qr-creator": "^1.0.0",
 +        "tabbable": "^5.2.1",
-         "tslib": "^2.3.1"
+         "tslib": "^2.4.0"
        },
        "devDependencies": {
-         "@typescript-eslint/eslint-plugin": "^5.14.0",
-         "@typescript-eslint/parser": "^5.14.0",
+         "@typescript-eslint/eslint-plugin": "^5.22.0",
+         "@typescript-eslint/parser": "^5.22.0",
          "@woltlab/zxcvbn": "git+https://github.com/WoltLab/zxcvbn.git#5b582b24e437f1883ccad3c37dae7c3c5f1e7da3",
-         "eslint": "^8.10.0",
+         "eslint": "^8.14.0",
          "eslint-config-prettier": "^8.5.0",
-         "prettier": "^2.5.1",
-         "typescript": "^4.6.2"
+         "prettier": "^2.6.2",
+         "typescript": "^4.6.4"
        }
      },
      "node_modules/@eslint/eslintrc": {
diff --cc package.json
index 3c30e6fdab,7a43643599..f0253d3512
--- a/package.json
+++ b/package.json
@@@ -22,9 -22,7 +22,9 @@@
      "@types/pica": "^5.1.3",
      "@types/prismjs": "^1.16.6",
      "@types/twitter-for-web": "0.0.2",
 +    "focus-trap": "^6.7.1",
      "qr-creator": "^1.0.0",
 +    "tabbable": "^5.2.1",
-     "tslib": "^2.3.1"
+     "tslib": "^2.4.0"
    }
  }