From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Wed, 10 May 2023 11:56:04 +0000 (+0200)
Subject: Merge branch '5.5'
X-Git-Tag: 6.0.0_Alpha_1~119
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=49227aad1ef2046ab14069510bc10da230e8a710;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.5'
---

49227aad1ef2046ab14069510bc10da230e8a710
diff --cc package-lock.json
index 69747ad2f8,aab4da6bd1..a6080a0423
--- a/package-lock.json
+++ b/package-lock.json
@@@ -5,15 -6,10 +5,15 @@@
    "packages": {
      "": {
        "name": "@woltlab/wcf",
 -      "version": "5.4.0",
        "dependencies": {
 +        "@ckeditor/ckeditor5-autosave": "^37.1.0",
 +        "@ckeditor/ckeditor5-core": "^37.1.0",
 +        "@ckeditor/ckeditor5-editor-classic": "^37.1.0",
 +        "@ckeditor/ckeditor5-inspector": "^4.1.0",
 +        "@ckeditor/ckeditor5-mention": "^37.1.0",
 +        "@googlemaps/markerclusterer": "^2.0.15",
          "@types/facebook-js-sdk": "^3.3.6",
-         "@types/google.maps": "^3.51.1",
+         "@types/google.maps": "^3.53.1",
          "@types/jquery": "^3.5.14",
          "@types/perfect-scrollbar": "^0.7.0",
          "@types/pica": "^5.1.3",
diff --cc package.json
index 264632858f,95174aa4bb..ae2298ea9a
--- a/package.json
+++ b/package.json
@@@ -14,24 -15,16 +14,24 @@@
      "typescript": "^5.0.2"
    },
    "dependencies": {
 -    "@types/google.maps": "^3.53.1",
 -    "@types/perfect-scrollbar": "^0.7.0",
 +    "@ckeditor/ckeditor5-autosave": "^37.1.0",
 +    "@ckeditor/ckeditor5-core": "^37.1.0",
 +    "@ckeditor/ckeditor5-editor-classic": "^37.1.0",
 +    "@ckeditor/ckeditor5-inspector": "^4.1.0",
 +    "@ckeditor/ckeditor5-mention": "^37.1.0",
 +    "@googlemaps/markerclusterer": "^2.0.15",
      "@types/facebook-js-sdk": "^3.3.6",
-     "@types/google.maps": "^3.51.1",
++    "@types/google.maps": "^3.53.1",
      "@types/jquery": "^3.5.14",
 +    "@types/perfect-scrollbar": "^0.7.0",
      "@types/pica": "^5.1.3",
 -    "@types/prismjs": "^1.16.6",
 +    "@types/prismjs": "^1.26.0",
      "@types/twitter-for-web": "0.0.2",
 -    "focus-trap": "^6.9.4",
 +    "focus-trap": "^7.4.0",
 +    "html-parsed-element": "^0.4.1",
      "qr-creator": "^1.0.0",
 -    "tabbable": "^5.3.3",
 +    "reflect-metadata": "^0.1.13",
 +    "tabbable": "^6.1.2",
      "tslib": "^2.5.0"
    }
  }