From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 2 Jan 2025 15:34:28 +0000 (+0100)
Subject: Merge branch '6.0' into 6.1
X-Git-Tag: 6.1.3_dev_3~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=16b016de32bef3b7c31d37a73b17b1a60599ae99;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '6.0' into 6.1
---

16b016de32bef3b7c31d37a73b17b1a60599ae99
diff --cc package-lock.json
index 59a0811220,6989913e1e..2341d5e865
--- a/package-lock.json
+++ b/package-lock.json
@@@ -11,13 -11,12 +11,13 @@@
          "@types/facebook-js-sdk": "^3.3.12",
          "@types/google.maps": "^3.58.1",
          "@types/jquery": "^3.5.32",
 -        "@types/pica": "^5.1.3",
 +        "@types/pica": "5.1.3",
          "@types/prismjs": "^1.26.5",
 -        "@types/twitter-for-web": "0.0.3",
 -        "@woltlab/editor": "git+https://github.com/WoltLab/editor.git#0587b116500467bdb66750410f0d9ba34b285be7",
 +        "@types/twitter-for-web": "0.0.6",
 +        "@woltlab/editor": "git+https://github.com/WoltLab/editor.git#ad63ae03e8611e280d30739847a226a1ef4b332d",
 +        "@woltlab/visual-dom-diff": "git+https://github.com/WoltLab/visual-dom-diff.git#e5b51fce3157d1eda310566fc1f86101341d1fea",
          "@woltlab/zxcvbn": "git+https://github.com/WoltLab/zxcvbn.git#5b582b24e437f1883ccad3c37dae7c3c5f1e7da3",
-         "focus-trap": "^7.6.1",
+         "focus-trap": "^7.6.2",
          "html-parsed-element": "^0.4.1",
          "perfect-scrollbar": "^1.5.6",
          "qr-creator": "^1.0.0",
@@@ -1698,9 -1722,22 +1730,22 @@@
          "url": "https://opencollective.com/typescript-eslint"
        }
      },
+     "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+       "version": "4.2.0",
+       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+       "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+       "dev": true,
+       "license": "Apache-2.0",
+       "engines": {
+         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+       },
+       "funding": {
+         "url": "https://opencollective.com/eslint"
+       }
+     },
      "node_modules/@woltlab/editor": {
 -      "resolved": "git+ssh://git@github.com/WoltLab/editor.git#0587b116500467bdb66750410f0d9ba34b285be7",
 -      "integrity": "sha512-Fy+KV0EuJF86WRgYLSIyOLEzz2BkvXWVwN57Q73lJ2Dg+thcLkUwGlEoX/aeQJoedyltP28v4AXZBiepV1VbgQ==",
 +      "resolved": "git+ssh://git@github.com/WoltLab/editor.git#ad63ae03e8611e280d30739847a226a1ef4b332d",
 +      "integrity": "sha512-x6xLW+/YjGuimnHuI34u0q+Ho97gpawG6o/osugSY7tPjJKOMNeaA3kvNya/1ZHDKbVs6Pnz5Oszb3fMYil+xw==",
        "dependencies": {
          "@ckeditor/ckeditor5-alignment": "^43.3.1",
          "@ckeditor/ckeditor5-autosave": "^43.3.1",
@@@ -2010,15 -2037,10 +2055,15 @@@
        "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
        "dev": true
      },
 +    "node_modules/diff-match-patch": {
 +      "version": "1.0.5",
 +      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz",
 +      "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="
 +    },
      "node_modules/esbuild": {
-       "version": "0.24.0",
-       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz",
-       "integrity": "sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==",
+       "version": "0.24.2",
+       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz",
+       "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==",
        "dev": true,
        "hasInstallScript": true,
        "license": "MIT",
diff --cc package.json
index 4ae8331f3a,851e44e3d5..976561349c
--- a/package.json
+++ b/package.json
@@@ -18,13 -18,12 +18,13 @@@
      "@types/facebook-js-sdk": "^3.3.12",
      "@types/google.maps": "^3.58.1",
      "@types/jquery": "^3.5.32",
 -    "@types/pica": "^5.1.3",
 +    "@types/pica": "5.1.3",
      "@types/prismjs": "^1.26.5",
 -    "@types/twitter-for-web": "0.0.3",
 -    "@woltlab/editor": "git+https://github.com/WoltLab/editor.git#0587b116500467bdb66750410f0d9ba34b285be7",
 +    "@types/twitter-for-web": "0.0.6",
 +    "@woltlab/editor": "git+https://github.com/WoltLab/editor.git#ad63ae03e8611e280d30739847a226a1ef4b332d",
 +    "@woltlab/visual-dom-diff": "git+https://github.com/WoltLab/visual-dom-diff.git#e5b51fce3157d1eda310566fc1f86101341d1fea",
      "@woltlab/zxcvbn": "git+https://github.com/WoltLab/zxcvbn.git#5b582b24e437f1883ccad3c37dae7c3c5f1e7da3",
-     "focus-trap": "^7.6.1",
+     "focus-trap": "^7.6.2",
      "html-parsed-element": "^0.4.1",
      "perfect-scrollbar": "^1.5.6",
      "qr-creator": "^1.0.0",