Merge branch '5.4'
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 21 Sep 2021 08:35:23 +0000 (10:35 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 21 Sep 2021 08:35:23 +0000 (10:35 +0200)
1  2 
.github/workflows/codestyle.yml
package-lock.json
package.json

Simple merge
index 1a1ac4894ad57e7ceb872664f6e6235ec1240bb3,1c5d3a9568ab7f7286ba133096d5857330a55bae..1099bb3388a913c2d97a35370427c8352584dec9
@@@ -5,16 -5,16 +5,16 @@@
    "packages": {
      "": {
        "dependencies": {
-         "@woltlab/wcf": "https://github.com/WoltLab/WCF.git#master"
 -        "@woltlab/wcf": "https://github.com/WoltLab/WCF.git#4e58d9911d6189e9914d7d0fb9b59ada7dec556a"
++        "@woltlab/wcf": "https://github.com/WoltLab/WCF.git#20b6dea23916144f8f3ea0a68a5c6e5b5e12724c"
        },
        "devDependencies": {
-         "@typescript-eslint/eslint-plugin": "^4.6.1",
-         "@typescript-eslint/parser": "^4.6.1",
-         "eslint": "^7.12.1",
-         "eslint-config-prettier": "^6.15.0",
-         "prettier": "^2.1.2",
-         "tslib": "^2.0.3",
-         "typescript": "^4.0.2"
+         "@typescript-eslint/eslint-plugin": "^4.31.2",
+         "@typescript-eslint/parser": "^4.31.2",
+         "eslint": "^7.32.0",
+         "eslint-config-prettier": "^8.3.0",
+         "prettier": "^2.4.1",
+         "tslib": "^2.3.1",
+         "typescript": "^4.4.3"
        }
      },
      "node_modules/@babel/code-frame": {
      },
      "node_modules/@woltlab/wcf": {
        "version": "5.4.0",
-       "resolved": "git+ssh://git@github.com/WoltLab/WCF.git#e2ef9181f99cfa3a08195d35afcdf616bacd9dc4",
-       "dependencies": {
-         "@types/facebook-js-sdk": "^3.3.1",
-         "@types/jquery": "^3.5.4",
-         "@types/pica": "^5.1.2",
-         "@types/prismjs": "^1.16.2",
-         "@types/twitter-for-web": "0.0.1",
 -      "resolved": "git+ssh://git@github.com/WoltLab/WCF.git#4e58d9911d6189e9914d7d0fb9b59ada7dec556a",
 -      "integrity": "sha512-Da7xjFsTZb1zZOcbMNLmDB+XCkHB8ca9MzQcEYOj/KrwBkp6Tu3nTTbBMnLX7U8BtpbjJJUxmplhmyRuBsK3bQ==",
++      "resolved": "git+ssh://git@github.com/WoltLab/WCF.git#20b6dea23916144f8f3ea0a68a5c6e5b5e12724c",
++      "integrity": "sha512-bHetRlygzGnBO+4PSLtNfuMhZNWzF2HzRx0DO8eWKXr58vJoeq3qqA99AXMjhYKyqUaQBWZvnHLMSEXll2jrCw==",
+       "dependencies": {
+         "@types/facebook-js-sdk": "^3.3.5",
+         "@types/jquery": "^3.5.6",
+         "@types/pica": "^5.1.3",
+         "@types/prismjs": "^1.16.6",
+         "@types/twitter-for-web": "0.0.2",
          "qr-creator": "^1.0.0",
-         "tslib": "^2.0.3"
+         "tslib": "^2.3.1"
        }
      },
      "node_modules/acorn": {
        }
      },
      "@woltlab/wcf": {
-       "version": "git+ssh://git@github.com/WoltLab/WCF.git#e2ef9181f99cfa3a08195d35afcdf616bacd9dc4",
-       "from": "@woltlab/wcf@https://github.com/WoltLab/WCF.git#master",
-       "requires": {
-         "@types/facebook-js-sdk": "^3.3.1",
-         "@types/jquery": "^3.5.4",
-         "@types/pica": "^5.1.2",
-         "@types/prismjs": "^1.16.2",
-         "@types/twitter-for-web": "0.0.1",
 -      "version": "git+ssh://git@github.com/WoltLab/WCF.git#4e58d9911d6189e9914d7d0fb9b59ada7dec556a",
 -      "integrity": "sha512-Da7xjFsTZb1zZOcbMNLmDB+XCkHB8ca9MzQcEYOj/KrwBkp6Tu3nTTbBMnLX7U8BtpbjJJUxmplhmyRuBsK3bQ==",
 -      "from": "@woltlab/wcf@https://github.com/WoltLab/WCF.git#4e58d9911d6189e9914d7d0fb9b59ada7dec556a",
++      "version": "git+ssh://git@github.com/WoltLab/WCF.git#20b6dea23916144f8f3ea0a68a5c6e5b5e12724c",
++      "integrity": "sha512-bHetRlygzGnBO+4PSLtNfuMhZNWzF2HzRx0DO8eWKXr58vJoeq3qqA99AXMjhYKyqUaQBWZvnHLMSEXll2jrCw==",
++      "from": "@woltlab/wcf@https://github.com/WoltLab/WCF.git#20b6dea23916144f8f3ea0a68a5c6e5b5e12724c",
+       "requires": {
+         "@types/facebook-js-sdk": "^3.3.5",
+         "@types/jquery": "^3.5.6",
+         "@types/pica": "^5.1.3",
+         "@types/prismjs": "^1.16.6",
+         "@types/twitter-for-web": "0.0.2",
          "qr-creator": "^1.0.0",
-         "tslib": "^2.0.3"
+         "tslib": "^2.3.1"
        }
      },
      "acorn": {
diff --cc package.json
index 9b788ee16bf7182ad38bf0904733079d2f3d1ced,3c0fdc80548116f077a3e7f480ecb5cad8cf2578..44835d5ffba616fa2c973bdee09fdb387a7dca5c
@@@ -1,14 -1,14 +1,14 @@@
  {
    "devDependencies": {
-     "@typescript-eslint/eslint-plugin": "^4.6.1",
-     "@typescript-eslint/parser": "^4.6.1",
-     "eslint": "^7.12.1",
-     "eslint-config-prettier": "^6.15.0",
-     "prettier": "^2.1.2",
-     "tslib": "^2.0.3",
-     "typescript": "^4.0.2"
+     "@typescript-eslint/eslint-plugin": "^4.31.2",
+     "@typescript-eslint/parser": "^4.31.2",
+     "eslint": "^7.32.0",
+     "eslint-config-prettier": "^8.3.0",
+     "prettier": "^2.4.1",
+     "tslib": "^2.3.1",
+     "typescript": "^4.4.3"
    },
    "dependencies": {
-     "@woltlab/wcf": "https://github.com/WoltLab/WCF.git#master"
 -    "@woltlab/wcf": "https://github.com/WoltLab/WCF.git#4e58d9911d6189e9914d7d0fb9b59ada7dec556a"
++    "@woltlab/wcf": "https://github.com/WoltLab/WCF.git#20b6dea23916144f8f3ea0a68a5c6e5b5e12724c"
    }
  }