Merge branch '5.4'

diff --cc package-lock.json
index f88051c6f1ab04a0f6827365f69729012971c90c,377fc2ecb153dd44f7142031b2b14000d2a5260e..8e10996ce5425f2044e0696ebfbd5878caefa545
--- 1/package-lock.json
--- 2/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",
-         "tslib": "^2.3.1"
 +        "tabbable": "^5.2.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 3c30e6fdab65b23995608f7897869acc57fa59c9,7a436435991b05a64fe37995d2b760604caa3aad..f0253d3512e9b862ebb80fe729a96b7e39c010f1
--- 1/package.json
--- 2/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",
-     "tslib": "^2.3.1"
 +    "tabbable": "^5.2.1",
+     "tslib": "^2.4.0"
    }
  }