Merge remote-tracking branch 'origin/6.2' into fancybox
authorCyperghost <olaf_schmitz_1@t-online.de>
Tue, 12 Nov 2024 08:53:16 +0000 (09:53 +0100)
committerCyperghost <olaf_schmitz_1@t-online.de>
Tue, 12 Nov 2024 08:53:16 +0000 (09:53 +0100)
# Conflicts:
# package-lock.json
# package.json

1  2 
package-lock.json
package.json
wcfsetup/install/files/js/require.config.js
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

index 878f8889e149a3ce390bf4702fb4c7064be35a97,d2252eb3993434d261438913d99feacd94ff3a6f..92b7d3e665d5c37fb0306b9ed5f401d6d69fba84
@@@ -7,8 -7,7 +7,8 @@@
        "name": "@woltlab/wcf",
        "dependencies": {
          "@ckeditor/ckeditor5-inspector": "^4.1.0",
-         "@googlemaps/markerclusterer": "2.0.15",
 +        "@fancyapps/ui": "^5.0.36",
+         "@googlemaps/markerclusterer": "2.3.2",
          "@types/facebook-js-sdk": "^3.3.12",
          "@types/google.maps": "^3.58.1",
          "@types/jquery": "^3.5.30",
          "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
        }
      },
 +    "node_modules/@fancyapps/ui": {
 +      "version": "5.0.36",
 +      "resolved": "https://registry.npmjs.org/@fancyapps/ui/-/ui-5.0.36.tgz",
 +      "integrity": "sha512-GMygQzp1MBTFNTT6AzpbL6pXTD6bTxwjmmpI1fe8Ozmmiseu8/g82Sudl1YhcbZmS4bJgaBOF5THDFGpXQ1fDw=="
 +    },
      "node_modules/@googlemaps/markerclusterer": {
-       "version": "2.0.15",
-       "resolved": "https://registry.npmjs.org/@googlemaps/markerclusterer/-/markerclusterer-2.0.15.tgz",
-       "integrity": "sha512-/I6Esi5FtyeVHsezN9Kut8zRJoqe7KkTIJXGVqpKFf6BjC7qQ1xRajLMkOz0s8XKgLevbr+KdYjuvmj+LohOGg==",
+       "version": "2.3.2",
+       "resolved": "https://registry.npmjs.org/@googlemaps/markerclusterer/-/markerclusterer-2.3.2.tgz",
+       "integrity": "sha512-zb9OQP8XscZp2Npt1uQUYnGKu1miuq4DPP28JyDuFd6HV17HCEcjV9MtBi4muG/iVRXXvuHW9bRCnHbao9ITfw==",
        "license": "Apache-2.0",
        "dependencies": {
          "fast-deep-equal": "^3.1.3",
diff --cc package.json
index 8b49881fe4c8b9912e075924c1d1332226165e60,43e9e1ce9dcc415511d2a9f69cd26aa1543f810c..d90a631e892a301e9bd438c176d0acfb2b9ba4de
@@@ -14,8 -15,7 +15,8 @@@
    },
    "dependencies": {
      "@ckeditor/ckeditor5-inspector": "^4.1.0",
-     "@googlemaps/markerclusterer": "2.0.15",
 +    "@fancyapps/ui": "^5.0.36",
+     "@googlemaps/markerclusterer": "2.3.2",
      "@types/facebook-js-sdk": "^3.3.12",
      "@types/google.maps": "^3.58.1",
      "@types/jquery": "^3.5.30",
Simple merge
Simple merge