From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Wed, 9 Mar 2022 13:47:41 +0000 (+0100)
Subject: Merge branch '5.4'
X-Git-Tag: 5.5.0_Alpha_1~11
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0d763d6b578ef4f9ccc5ed418fce42166a7631a1;p=GitHub%2FWoltLab%2Fcom.woltlab.wcf.conversation.git

Merge branch '5.4'
---

0d763d6b578ef4f9ccc5ed418fce42166a7631a1
diff --cc package-lock.json
index a5fecbf,3d88e56..34e5e31
--- a/package-lock.json
+++ b/package-lock.json
@@@ -5,16 -5,16 +5,16 @@@
    "packages": {
      "": {
        "dependencies": {
 -        "@woltlab/wcf": "https://github.com/WoltLab/WCF.git#4e58d9911d6189e9914d7d0fb9b59ada7dec556a"
 +        "@woltlab/wcf": "https://github.com/WoltLab/WCF.git#6107d2d75703380c136b3efbb771082826c306ef"
        },
        "devDependencies": {
-         "@typescript-eslint/eslint-plugin": "^5.9.0",
-         "@typescript-eslint/parser": "^5.9.0",
-         "eslint": "^8.6.0",
-         "eslint-config-prettier": "^8.3.0",
+         "@typescript-eslint/eslint-plugin": "^5.14.0",
+         "@typescript-eslint/parser": "^5.14.0",
+         "eslint": "^8.10.0",
+         "eslint-config-prettier": "^8.5.0",
          "prettier": "^2.5.1",
          "tslib": "^2.3.1",
-         "typescript": "^4.5.4"
+         "typescript": "^4.6.2"
        }
      },
      "node_modules/@eslint/eslintrc": {
@@@ -106,15 -106,10 +106,15 @@@
        "resolved": "https://registry.npmjs.org/@types/facebook-js-sdk/-/facebook-js-sdk-3.3.5.tgz",
        "integrity": "sha512-80UAq9UoDzDDpsRXxV2ci1R+g/durNJTEzqh3ES4YkswW5T2lWAUuAghUWruw/H849ZhugyQqeaLHKF0iapReg=="
      },
 +    "node_modules/@types/google.maps": {
-       "version": "3.47.3",
-       "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.47.3.tgz",
-       "integrity": "sha512-BF/BzpO0LWiwR/bBoGVriy7e2n+syuGNQMQ0r/+GtisUcgKn9P7Z4rmLNmZko9niE8JJ5dpMkxHeen7gADlNaw=="
++      "version": "3.48.2",
++      "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.48.2.tgz",
++      "integrity": "sha512-ulxQ3eLy3s/l5KChx040FzsecC/2+JFWaF+FxGp628bJjqDL50vkzkRNEy1QlWOxHk5wKFfJvBonQrla/z82oA=="
 +    },
      "node_modules/@types/jquery": {
-       "version": "3.5.13",
-       "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.13.tgz",
-       "integrity": "sha512-ZxJrup8nz/ZxcU0vantG+TPdboMhB24jad2uSap50zE7Q9rUeYlCF25kFMSmHR33qoeOgqcdHEp3roaookC0Sg==",
+       "version": "3.5.14",
+       "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz",
+       "integrity": "sha512-X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg==",
        "dependencies": {
          "@types/sizzle": "*"
        }
@@@ -916,19 -866,11 +883,19 @@@
        }
      },
      "node_modules/flatted": {
-       "version": "3.1.1",
-       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
-       "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
+       "version": "3.2.5",
+       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
+       "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
        "dev": true
      },
 +    "node_modules/focus-trap": {
-       "version": "6.7.2",
-       "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.7.2.tgz",
-       "integrity": "sha512-mRVv9QPCXITaDreu+pNXiPk1Rpn0WQtGvGrDo3Z/s2kdwtzFw/WOPfbLkdxWWvcahoInm9eRztuQOr1RNyQGrw==",
++      "version": "6.7.3",
++      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.7.3.tgz",
++      "integrity": "sha512-8xCEKndV4KrseGhFKKKmczVA14yx1/hnmFICPOjcFjToxCJYj/NHH43tPc3YE/PLnLRNZoFug0EcWkGQde/miQ==",
 +      "dependencies": {
 +        "tabbable": "^5.2.1"
 +      }
 +    },
      "node_modules/fs.realpath": {
        "version": "1.0.0",
        "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@@ -1707,15 -1635,10 +1665,15 @@@
        "resolved": "https://registry.npmjs.org/@types/facebook-js-sdk/-/facebook-js-sdk-3.3.5.tgz",
        "integrity": "sha512-80UAq9UoDzDDpsRXxV2ci1R+g/durNJTEzqh3ES4YkswW5T2lWAUuAghUWruw/H849ZhugyQqeaLHKF0iapReg=="
      },
 +    "@types/google.maps": {
-       "version": "3.47.3",
-       "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.47.3.tgz",
-       "integrity": "sha512-BF/BzpO0LWiwR/bBoGVriy7e2n+syuGNQMQ0r/+GtisUcgKn9P7Z4rmLNmZko9niE8JJ5dpMkxHeen7gADlNaw=="
++      "version": "3.48.2",
++      "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.48.2.tgz",
++      "integrity": "sha512-ulxQ3eLy3s/l5KChx040FzsecC/2+JFWaF+FxGp628bJjqDL50vkzkRNEy1QlWOxHk5wKFfJvBonQrla/z82oA=="
 +    },
      "@types/jquery": {
-       "version": "3.5.13",
-       "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.13.tgz",
-       "integrity": "sha512-ZxJrup8nz/ZxcU0vantG+TPdboMhB24jad2uSap50zE7Q9rUeYlCF25kFMSmHR33qoeOgqcdHEp3roaookC0Sg==",
+       "version": "3.5.14",
+       "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz",
+       "integrity": "sha512-X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg==",
        "requires": {
          "@types/sizzle": "*"
        }
@@@ -2293,19 -2180,11 +2227,19 @@@
        }
      },
      "flatted": {
-       "version": "3.1.1",
-       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
-       "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
+       "version": "3.2.5",
+       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
+       "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
        "dev": true
      },
 +    "focus-trap": {
-       "version": "6.7.2",
-       "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.7.2.tgz",
-       "integrity": "sha512-mRVv9QPCXITaDreu+pNXiPk1Rpn0WQtGvGrDo3Z/s2kdwtzFw/WOPfbLkdxWWvcahoInm9eRztuQOr1RNyQGrw==",
++      "version": "6.7.3",
++      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.7.3.tgz",
++      "integrity": "sha512-8xCEKndV4KrseGhFKKKmczVA14yx1/hnmFICPOjcFjToxCJYj/NHH43tPc3YE/PLnLRNZoFug0EcWkGQde/miQ==",
 +      "requires": {
 +        "tabbable": "^5.2.1"
 +      }
 +    },
      "fs.realpath": {
        "version": "1.0.0",
        "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
diff --cc package.json
index d5deaae,188ab28..71b0a46
--- a/package.json
+++ b/package.json
@@@ -1,14 -1,14 +1,14 @@@
  {
    "devDependencies": {
-     "@typescript-eslint/eslint-plugin": "^5.9.0",
-     "@typescript-eslint/parser": "^5.9.0",
-     "eslint": "^8.6.0",
-     "eslint-config-prettier": "^8.3.0",
+     "@typescript-eslint/eslint-plugin": "^5.14.0",
+     "@typescript-eslint/parser": "^5.14.0",
+     "eslint": "^8.10.0",
+     "eslint-config-prettier": "^8.5.0",
      "prettier": "^2.5.1",
      "tslib": "^2.3.1",
-     "typescript": "^4.5.4"
+     "typescript": "^4.6.2"
    },
    "dependencies": {
 -    "@woltlab/wcf": "https://github.com/WoltLab/WCF.git#4e58d9911d6189e9914d7d0fb9b59ada7dec556a"
 +    "@woltlab/wcf": "https://github.com/WoltLab/WCF.git#6107d2d75703380c136b3efbb771082826c306ef"
    }
  }