Merge branch '5.5'
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 2 Aug 2023 08:55:00 +0000 (10:55 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 2 Aug 2023 08:55:00 +0000 (10:55 +0200)
1  2 
files/js/WoltLabSuite/Core/Conversation/Ui/Participant/Add.js
files/js/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.js
package-lock.json
package.json
ts/WoltLabSuite/Core/Conversation/Ui/Participant/Add.ts
ts/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.ts

index 378f72bb3e01aaab2c56983702f7e5fa3614e32e,a194eeaf97d61ad576bfe2428e07cdfb0189b18e..87d4fdd4231f85e78b26c99017de46663f9b8a8d
@@@ -5,14 -5,15 +5,14 @@@
    "packages": {
      "": {
        "dependencies": {
 -        "@woltlab/wcf": "https://github.com/WoltLab/WCF.git#5ed76b3a3267dfbffdf19405822d22510ad2bc7d"
 +        "@woltlab/d.ts": "https://github.com/WoltLab/d.ts.git#4040fc083245edeb2f8832d4613b9e76aa9c17a5"
        },
        "devDependencies": {
-         "@typescript-eslint/eslint-plugin": "^5.61.0",
-         "@typescript-eslint/parser": "^5.61.0",
-         "eslint": "^8.44.0",
-         "eslint-config-prettier": "^8.8.0",
+         "@typescript-eslint/eslint-plugin": "^6.2.1",
+         "@typescript-eslint/parser": "^6.2.1",
+         "eslint": "^8.46.0",
+         "eslint-config-prettier": "^8.9.0",
          "prettier": "^2.8.8",
 -        "tslib": "^2.6.0",
          "typescript": "^5.1.6"
        }
      },
        "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
        "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="
      },
 -    "node_modules/@types/twitter-for-web": {
 -      "version": "0.0.2",
 -      "resolved": "https://registry.npmjs.org/@types/twitter-for-web/-/twitter-for-web-0.0.2.tgz",
 -      "integrity": "sha512-fDg882G9KHOkVxyJFkZ1hIOHxgj1vHLZnMJshF9W+8C2f9lzkIc/DeD1Ed2q1SWaHD/hdooaFIWTDhgL8zzpYg=="
 -    },
      "node_modules/@typescript-eslint/eslint-plugin": {
-       "version": "5.61.0",
-       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.61.0.tgz",
-       "integrity": "sha512-A5l/eUAug103qtkwccSCxn8ZRwT+7RXWkFECdA4Cvl1dOlDUgTpAOfSEElZn2uSUxhdDpnCdetrf0jvU4qrL+g==",
+       "version": "6.2.1",
+       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.2.1.tgz",
+       "integrity": "sha512-iZVM/ALid9kO0+I81pnp1xmYiFyqibAHzrqX4q5YvvVEyJqY+e6rfTXSCsc2jUxGNqJqTfFSSij/NFkZBiBzLw==",
        "dev": true,
        "dependencies": {
-         "@eslint-community/regexpp": "^4.4.0",
-         "@typescript-eslint/scope-manager": "5.61.0",
-         "@typescript-eslint/type-utils": "5.61.0",
-         "@typescript-eslint/utils": "5.61.0",
+         "@eslint-community/regexpp": "^4.5.1",
+         "@typescript-eslint/scope-manager": "6.2.1",
+         "@typescript-eslint/type-utils": "6.2.1",
+         "@typescript-eslint/utils": "6.2.1",
+         "@typescript-eslint/visitor-keys": "6.2.1",
          "debug": "^4.3.4",
          "graphemer": "^1.4.0",
-         "ignore": "^5.2.0",
+         "ignore": "^5.2.4",
+         "natural-compare": "^1.4.0",
          "natural-compare-lite": "^1.4.0",
-         "semver": "^7.3.7",
-         "tsutils": "^3.21.0"
+         "semver": "^7.5.4",
+         "ts-api-utils": "^1.0.1"
        },
        "engines": {
-         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+         "node": "^16.0.0 || >=18.0.0"
        },
        "funding": {
          "type": "opencollective",
        "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
        "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="
      },
 -    "@types/twitter-for-web": {
 -      "version": "0.0.2",
 -      "resolved": "https://registry.npmjs.org/@types/twitter-for-web/-/twitter-for-web-0.0.2.tgz",
 -      "integrity": "sha512-fDg882G9KHOkVxyJFkZ1hIOHxgj1vHLZnMJshF9W+8C2f9lzkIc/DeD1Ed2q1SWaHD/hdooaFIWTDhgL8zzpYg=="
 -    },
      "@typescript-eslint/eslint-plugin": {
-       "version": "5.61.0",
-       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.61.0.tgz",
-       "integrity": "sha512-A5l/eUAug103qtkwccSCxn8ZRwT+7RXWkFECdA4Cvl1dOlDUgTpAOfSEElZn2uSUxhdDpnCdetrf0jvU4qrL+g==",
+       "version": "6.2.1",
+       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.2.1.tgz",
+       "integrity": "sha512-iZVM/ALid9kO0+I81pnp1xmYiFyqibAHzrqX4q5YvvVEyJqY+e6rfTXSCsc2jUxGNqJqTfFSSij/NFkZBiBzLw==",
        "dev": true,
        "requires": {
-         "@eslint-community/regexpp": "^4.4.0",
-         "@typescript-eslint/scope-manager": "5.61.0",
-         "@typescript-eslint/type-utils": "5.61.0",
-         "@typescript-eslint/utils": "5.61.0",
+         "@eslint-community/regexpp": "^4.5.1",
+         "@typescript-eslint/scope-manager": "6.2.1",
+         "@typescript-eslint/type-utils": "6.2.1",
+         "@typescript-eslint/utils": "6.2.1",
+         "@typescript-eslint/visitor-keys": "6.2.1",
          "debug": "^4.3.4",
          "graphemer": "^1.4.0",
-         "ignore": "^5.2.0",
+         "ignore": "^5.2.4",
+         "natural-compare": "^1.4.0",
          "natural-compare-lite": "^1.4.0",
-         "semver": "^7.3.7",
-         "tsutils": "^3.21.0"
+         "semver": "^7.5.4",
+         "ts-api-utils": "^1.0.1"
        }
      },
      "@typescript-eslint/parser": {
        }
      },
      "@typescript-eslint/visitor-keys": {
-       "version": "5.61.0",
-       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.61.0.tgz",
-       "integrity": "sha512-50XQ5VdbWrX06mQXhy93WywSFZZGsv3EOjq+lqp6WC2t+j3mb6A9xYVdrRxafvK88vg9k9u+CT4l6D8PEatjKg==",
+       "version": "6.2.1",
+       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz",
+       "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==",
        "dev": true,
        "requires": {
-         "@typescript-eslint/types": "5.61.0",
-         "eslint-visitor-keys": "^3.3.0"
+         "@typescript-eslint/types": "6.2.1",
+         "eslint-visitor-keys": "^3.4.1"
        }
      },
 -    "@woltlab/wcf": {
 -      "version": "git+ssh://git@github.com/WoltLab/WCF.git#5ed76b3a3267dfbffdf19405822d22510ad2bc7d",
 -      "integrity": "sha512-RFdoxbASRY4VpBSZkGhI6Vovf49YR4D9bjdxweJgobf+rPAcJAXmE5idzwk3osKrUS+yH2STewzsxZ6Bpak5cQ==",
 -      "from": "@woltlab/wcf@https://github.com/WoltLab/WCF.git#5ed76b3a3267dfbffdf19405822d22510ad2bc7d",
 +    "@woltlab/d.ts": {
 +      "version": "git+ssh://git@github.com/WoltLab/d.ts.git#4040fc083245edeb2f8832d4613b9e76aa9c17a5",
 +      "from": "@woltlab/d.ts@https://github.com/WoltLab/d.ts.git#4040fc083245edeb2f8832d4613b9e76aa9c17a5",
        "requires": {
 -        "@types/facebook-js-sdk": "^3.3.6",
 -        "@types/google.maps": "^3.51.1",
 -        "@types/jquery": "^3.5.14",
 -        "@types/perfect-scrollbar": "^0.7.0",
 -        "@types/pica": "^5.1.3",
 -        "@types/prismjs": "^1.16.6",
 -        "@types/twitter-for-web": "0.0.2",
 -        "focus-trap": "^6.9.4",
 -        "qr-creator": "^1.0.0",
 -        "tabbable": "^5.3.3",
 +        "@types/google.maps": "^3.52.0",
 +        "@types/jquery": "^3.5.16",
 +        "focus-trap": "^7.3.1",
          "tslib": "^2.5.0"
        }
      },
diff --cc package.json
index 057332a12690b84e74962d122296e9b7d932fd8f,6744c6847cd0ea564b99e9679962a2cae134d27d..138f751b9dc9fc23f2396c2e4c9e2362739b6bbf
@@@ -1,10 -1,11 +1,10 @@@
  {
    "devDependencies": {
-     "@typescript-eslint/eslint-plugin": "^5.61.0",
-     "@typescript-eslint/parser": "^5.61.0",
-     "eslint": "^8.44.0",
-     "eslint-config-prettier": "^8.8.0",
+     "@typescript-eslint/eslint-plugin": "^6.2.1",
+     "@typescript-eslint/parser": "^6.2.1",
+     "eslint": "^8.46.0",
+     "eslint-config-prettier": "^8.9.0",
      "prettier": "^2.8.8",
 -    "tslib": "^2.6.0",
      "typescript": "^5.1.6"
    },
    "dependencies": {