diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
index 6d31efb97..91556b171 100644
--- a/.github/workflows/alpha.yml
+++ b/.github/workflows/alpha.yml
@@ -66,7 +66,7 @@ jobs:
exit-code: '1'
ignore-unfixed: true
vuln-type: 'os,library'
- severity: 'CRITICAL,HIGH'
+ severity: 'CRITICAL'
- name: Trivy - Backend
uses: aquasecurity/trivy-action@master
diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
index d83659076..b754c3d4a 100644
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -86,7 +86,7 @@ jobs:
exit-code: '1'
ignore-unfixed: true
vuln-type: 'os,library'
- severity: 'CRITICAL,HIGH'
+ severity: 'CRITICAL'
- name: Trivy - Backend
uses: aquasecurity/trivy-action@master
diff --git a/backend/package.json b/backend/package.json
index 0f0805408..b46d928e7 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -20,7 +20,7 @@
},
"dependencies": {
"@sendgrid/mail": "7.6.2",
- "@sentry/node": "6.19.3",
+ "@sentry/node": "6.19.6",
"@types/bcryptjs": "2.4.2",
"@types/connect-redis": "0.0.18",
"@types/crypto-js": "4.1.1",
@@ -43,8 +43,8 @@
"@types/shortid": "0.0.29",
"@types/socket.io-redis": "3.0.0",
"@types/uuid": "8.3.4",
- "@typescript-eslint/eslint-plugin": "5.17.0",
- "@typescript-eslint/parser": "5.17.0",
+ "@typescript-eslint/eslint-plugin": "5.18.0",
+ "@typescript-eslint/parser": "5.18.0",
"bcryptjs": "2.4.3",
"chalk": "4.1.2",
"connect-redis": "6.1.3",
@@ -53,7 +53,7 @@
"csurf": "1.11.0",
"date-fns": "2.28.0",
"dotenv": "16.0.0",
- "eslint": "8.12.0",
+ "eslint": "8.13.0",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-prettier": "4.0.0",
"express": "4.17.3",
@@ -65,7 +65,7 @@
"jest": "27.5.1",
"lexorank": "1.0.4",
"lodash": "4.17.21",
- "moment": "2.29.1",
+ "moment": "2.29.2",
"node-fetch": "2.6.7",
"nodemailer": "6.7.3",
"nodemon": "2.0.15",
@@ -85,7 +85,7 @@
"shortid": "2.2.16",
"socket.io": "4.4.1",
"socket.io-redis": "6.1.1",
- "stripe": "8.215.0",
+ "stripe": "8.216.0",
"ts-jest": "27.1.4",
"ts-node": "10.7.0",
"typeorm": "0.2.45",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index a81c80ff7..718e5d5b2 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -581,60 +581,60 @@
"@sendgrid/client" "^7.6.2"
"@sendgrid/helpers" "^7.6.2"
-"@sentry/core@6.19.3":
- version "6.19.3"
- resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.19.3.tgz#88268afc8c42716c455ad77bb4bed2bbf96abd83"
- integrity sha512-RcGmYdkrE3VYBMl9Hgv4GKsC8FEVUdWYsfGIcT/btwP2YpBeUaTZl+1vV9r3Ncdl125LqzP5CKSj5otVxiEg6g==
- dependencies:
- "@sentry/hub" "6.19.3"
- "@sentry/minimal" "6.19.3"
- "@sentry/types" "6.19.3"
- "@sentry/utils" "6.19.3"
+"@sentry/core@6.19.6":
+ version "6.19.6"
+ resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.19.6.tgz#7d4649d0148b5d0be1358ab02e2f869bf7363e9a"
+ integrity sha512-biEotGRr44/vBCOegkTfC9rwqaqRKIpFljKGyYU6/NtzMRooktqOhjmjmItNCMRknArdeaQwA8lk2jcZDXX3Og==
+ dependencies:
+ "@sentry/hub" "6.19.6"
+ "@sentry/minimal" "6.19.6"
+ "@sentry/types" "6.19.6"
+ "@sentry/utils" "6.19.6"
tslib "^1.9.3"
-"@sentry/hub@6.19.3":
- version "6.19.3"
- resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.19.3.tgz#d555c83404f19ac9b68f336b051b8e7a9d75feb0"
- integrity sha512-iYbkrxEZt6CrHP3U3r54MARVZSs3YHjAMUMOTlC16s/Amz1McwV95XtI3NJaqMhwzl7R5vbGrs3xOtLg1V1Uyw==
+"@sentry/hub@6.19.6":
+ version "6.19.6"
+ resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.19.6.tgz#ada83ceca0827c49534edfaba018221bc1eb75e1"
+ integrity sha512-PuEOBZxvx3bjxcXmWWZfWXG+orojQiWzv9LQXjIgroVMKM/GG4QtZbnWl1hOckUj7WtKNl4hEGO2g/6PyCV/vA==
dependencies:
- "@sentry/types" "6.19.3"
- "@sentry/utils" "6.19.3"
+ "@sentry/types" "6.19.6"
+ "@sentry/utils" "6.19.6"
tslib "^1.9.3"
-"@sentry/minimal@6.19.3":
- version "6.19.3"
- resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.19.3.tgz#b9b7f0d7f0cd2341b243318668ac01458f9d7889"
- integrity sha512-xy/6ThHK8B2NJT98nWrx6V9eVgUbzq2N/8lv5/QqrKsICjxx22TRC8Q6zPg/o7BYcrY5vpugSEbIeErTnyxHDA==
+"@sentry/minimal@6.19.6":
+ version "6.19.6"
+ resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.19.6.tgz#b6cced3708e25d322039e68ebdf8fadfa445bf7d"
+ integrity sha512-T1NKcv+HTlmd8EbzUgnGPl4ySQGHWMCyZ8a8kXVMZOPDzphN3fVIzkYzWmSftCWp0rpabXPt9aRF2mfBKU+mAQ==
dependencies:
- "@sentry/hub" "6.19.3"
- "@sentry/types" "6.19.3"
+ "@sentry/hub" "6.19.6"
+ "@sentry/types" "6.19.6"
tslib "^1.9.3"
-"@sentry/node@6.19.3":
- version "6.19.3"
- resolved "https://registry.yarnpkg.com/@sentry/node/-/node-6.19.3.tgz#afcf106bf72acc0e4bbacbc54744de8a938cbd1c"
- integrity sha512-eHreMMbaK4mMAQ45Ki2xJ6in02l66hL6xhltppy/h4m297JIvjaQAFpbQf5XLtO7W4KjdbSV5qnB45D1aOAzFA==
+"@sentry/node@6.19.6":
+ version "6.19.6"
+ resolved "https://registry.yarnpkg.com/@sentry/node/-/node-6.19.6.tgz#d63c4ffcf0150b4175a2e4e5021b53af46e5946f"
+ integrity sha512-kHQMfsy40ZxxdS9zMPmXCOOLWOJbQj6/aVSHt/L1QthYcgkAi7NJQNXnQIPWQDe8eP3DfNIWM7dc446coqjXrQ==
dependencies:
- "@sentry/core" "6.19.3"
- "@sentry/hub" "6.19.3"
- "@sentry/types" "6.19.3"
- "@sentry/utils" "6.19.3"
+ "@sentry/core" "6.19.6"
+ "@sentry/hub" "6.19.6"
+ "@sentry/types" "6.19.6"
+ "@sentry/utils" "6.19.6"
cookie "^0.4.1"
https-proxy-agent "^5.0.0"
lru_map "^0.3.3"
tslib "^1.9.3"
-"@sentry/types@6.19.3":
- version "6.19.3"
- resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.19.3.tgz#94b19da68d4d23561efb1014f72968bcea85cd0c"
- integrity sha512-jHhqxp8MIWSfOc3krorirTGKTEaSFO6XrAvi+2AZhr6gvOChwOgzgrN2ZqesJcZmgCsqWV21u3usSwYeRrjOJA==
+"@sentry/types@6.19.6":
+ version "6.19.6"
+ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.19.6.tgz#70513f9dca05d23d7ab9c2a6cb08d4db6763ca67"
+ integrity sha512-QH34LMJidEUPZK78l+Frt3AaVFJhEmIi05Zf8WHd9/iTt+OqvCHBgq49DDr1FWFqyYWm/QgW/3bIoikFpfsXyQ==
-"@sentry/utils@6.19.3":
- version "6.19.3"
- resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.19.3.tgz#0c3a3f0b86c12e3b079e56e37a44e62a1226043d"
- integrity sha512-GdC9B/FK7qd0zItY43135bYbhuVSawE18bIrQDNuno8gTpDJ5OgShpTN9zR53AmMh16/lwKNnV3ZZjlpKcxuNw==
+"@sentry/utils@6.19.6":
+ version "6.19.6"
+ resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.19.6.tgz#2ddc9ef036c3847084c43d0e5a55e4646bdf9021"
+ integrity sha512-fAMWcsguL0632eWrROp/vhPgI7sBj/JROWVPzpabwVkm9z3m1rQm6iLFn4qfkZL8Ozy6NVZPXOQ7EXmeU24byg==
dependencies:
- "@sentry/types" "6.19.3"
+ "@sentry/types" "6.19.6"
tslib "^1.9.3"
"@sindresorhus/is@^0.14.0":
@@ -1059,14 +1059,14 @@
resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.3.tgz#781d360c282436494b32fe7d9f7f8e64b3118aa3"
integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==
-"@typescript-eslint/eslint-plugin@5.17.0":
- version "5.17.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.17.0.tgz#704eb4e75039000531255672bf1c85ee85cf1d67"
- integrity sha512-qVstvQilEd89HJk3qcbKt/zZrfBZ+9h2ynpAGlWjWiizA7m/MtLT9RoX6gjtpE500vfIg8jogAkDzdCxbsFASQ==
+"@typescript-eslint/eslint-plugin@5.18.0":
+ version "5.18.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.18.0.tgz#950df411cec65f90d75d6320a03b2c98f6c3af7d"
+ integrity sha512-tzrmdGMJI/uii9/V6lurMo4/o+dMTKDH82LkNjhJ3adCW22YQydoRs5MwTiqxGF9CSYxPxQ7EYb4jLNlIs+E+A==
dependencies:
- "@typescript-eslint/scope-manager" "5.17.0"
- "@typescript-eslint/type-utils" "5.17.0"
- "@typescript-eslint/utils" "5.17.0"
+ "@typescript-eslint/scope-manager" "5.18.0"
+ "@typescript-eslint/type-utils" "5.18.0"
+ "@typescript-eslint/utils" "5.18.0"
debug "^4.3.2"
functional-red-black-tree "^1.0.1"
ignore "^5.1.8"
@@ -1074,69 +1074,69 @@
semver "^7.3.5"
tsutils "^3.21.0"
-"@typescript-eslint/parser@5.17.0":
- version "5.17.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.17.0.tgz#7def77d5bcd8458d12d52909118cf3f0a45f89d5"
- integrity sha512-aRzW9Jg5Rlj2t2/crzhA2f23SIYFlF9mchGudyP0uiD6SenIxzKoLjwzHbafgHn39dNV/TV7xwQkLfFTZlJ4ig==
+"@typescript-eslint/parser@5.18.0":
+ version "5.18.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.18.0.tgz#2bcd4ff21df33621df33e942ccb21cb897f004c6"
+ integrity sha512-+08nYfurBzSSPndngnHvFw/fniWYJ5ymOrn/63oMIbgomVQOvIDhBoJmYZ9lwQOCnQV9xHGvf88ze3jFGUYooQ==
dependencies:
- "@typescript-eslint/scope-manager" "5.17.0"
- "@typescript-eslint/types" "5.17.0"
- "@typescript-eslint/typescript-estree" "5.17.0"
+ "@typescript-eslint/scope-manager" "5.18.0"
+ "@typescript-eslint/types" "5.18.0"
+ "@typescript-eslint/typescript-estree" "5.18.0"
debug "^4.3.2"
-"@typescript-eslint/scope-manager@5.17.0":
- version "5.17.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.17.0.tgz#4cea7d0e0bc0e79eb60cad431c89120987c3f952"
- integrity sha512-062iCYQF/doQ9T2WWfJohQKKN1zmmXVfAcS3xaiialiw8ZUGy05Em6QVNYJGO34/sU1a7a+90U3dUNfqUDHr3w==
+"@typescript-eslint/scope-manager@5.18.0":
+ version "5.18.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.18.0.tgz#a7d7b49b973ba8cebf2a3710eefd457ef2fb5505"
+ integrity sha512-C0CZML6NyRDj+ZbMqh9FnPscg2PrzSaVQg3IpTmpe0NURMVBXlghGZgMYqBw07YW73i0MCqSDqv2SbywnCS8jQ==
dependencies:
- "@typescript-eslint/types" "5.17.0"
- "@typescript-eslint/visitor-keys" "5.17.0"
+ "@typescript-eslint/types" "5.18.0"
+ "@typescript-eslint/visitor-keys" "5.18.0"
-"@typescript-eslint/type-utils@5.17.0":
- version "5.17.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.17.0.tgz#1c4549d68c89877662224aabb29fbbebf5fc9672"
- integrity sha512-3hU0RynUIlEuqMJA7dragb0/75gZmwNwFf/QJokWzPehTZousP/MNifVSgjxNcDCkM5HI2K22TjQWUmmHUINSg==
+"@typescript-eslint/type-utils@5.18.0":
+ version "5.18.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.18.0.tgz#62dbfc8478abf36ba94a90ddf10be3cc8e471c74"
+ integrity sha512-vcn9/6J5D6jtHxpEJrgK8FhaM8r6J1/ZiNu70ZUJN554Y3D9t3iovi6u7JF8l/e7FcBIxeuTEidZDR70UuCIfA==
dependencies:
- "@typescript-eslint/utils" "5.17.0"
+ "@typescript-eslint/utils" "5.18.0"
debug "^4.3.2"
tsutils "^3.21.0"
-"@typescript-eslint/types@5.17.0":
- version "5.17.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.17.0.tgz#861ec9e669ffa2aa9b873dd4d28d9b1ce26d216f"
- integrity sha512-AgQ4rWzmCxOZLioFEjlzOI3Ch8giDWx8aUDxyNw9iOeCvD3GEYAB7dxWGQy4T/rPVe8iPmu73jPHuaSqcjKvxw==
+"@typescript-eslint/types@5.18.0":
+ version "5.18.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.18.0.tgz#4f0425d85fdb863071680983853c59a62ce9566e"
+ integrity sha512-bhV1+XjM+9bHMTmXi46p1Led5NP6iqQcsOxgx7fvk6gGiV48c6IynY0apQb7693twJDsXiVzNXTflhplmaiJaw==
-"@typescript-eslint/typescript-estree@5.17.0":
- version "5.17.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.17.0.tgz#a7cba7dfc8f9cc2ac78c18584e684507df4f2488"
- integrity sha512-X1gtjEcmM7Je+qJRhq7ZAAaNXYhTgqMkR10euC4Si6PIjb+kwEQHSxGazXUQXFyqfEXdkGf6JijUu5R0uceQzg==
+"@typescript-eslint/typescript-estree@5.18.0":
+ version "5.18.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.18.0.tgz#6498e5ee69a32e82b6e18689e2f72e4060986474"
+ integrity sha512-wa+2VAhOPpZs1bVij9e5gyVu60ReMi/KuOx4LKjGx2Y3XTNUDJgQ+5f77D49pHtqef/klglf+mibuHs9TrPxdQ==
dependencies:
- "@typescript-eslint/types" "5.17.0"
- "@typescript-eslint/visitor-keys" "5.17.0"
+ "@typescript-eslint/types" "5.18.0"
+ "@typescript-eslint/visitor-keys" "5.18.0"
debug "^4.3.2"
globby "^11.0.4"
is-glob "^4.0.3"
semver "^7.3.5"
tsutils "^3.21.0"
-"@typescript-eslint/utils@5.17.0":
- version "5.17.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.17.0.tgz#549a9e1d491c6ccd3624bc3c1b098f5cfb45f306"
- integrity sha512-DVvndq1QoxQH+hFv+MUQHrrWZ7gQ5KcJzyjhzcqB1Y2Xes1UQQkTRPUfRpqhS8mhTWsSb2+iyvDW1Lef5DD7vA==
+"@typescript-eslint/utils@5.18.0":
+ version "5.18.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.18.0.tgz#27fc84cf95c1a96def0aae31684cb43a37e76855"
+ integrity sha512-+hFGWUMMri7OFY26TsOlGa+zgjEy1ssEipxpLjtl4wSll8zy85x0GrUSju/FHdKfVorZPYJLkF3I4XPtnCTewA==
dependencies:
"@types/json-schema" "^7.0.9"
- "@typescript-eslint/scope-manager" "5.17.0"
- "@typescript-eslint/types" "5.17.0"
- "@typescript-eslint/typescript-estree" "5.17.0"
+ "@typescript-eslint/scope-manager" "5.18.0"
+ "@typescript-eslint/types" "5.18.0"
+ "@typescript-eslint/typescript-estree" "5.18.0"
eslint-scope "^5.1.1"
eslint-utils "^3.0.0"
-"@typescript-eslint/visitor-keys@5.17.0":
- version "5.17.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.17.0.tgz#52daae45c61b0211b4c81b53a71841911e479128"
- integrity sha512-6K/zlc4OfCagUu7Am/BD5k8PSWQOgh34Nrv9Rxe2tBzlJ7uOeJ/h7ugCGDCeEZHT6k2CJBhbk9IsbkPI0uvUkA==
+"@typescript-eslint/visitor-keys@5.18.0":
+ version "5.18.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.18.0.tgz#c7c07709823804171d569017f3b031ced7253e60"
+ integrity sha512-Hf+t+dJsjAKpKSkg3EHvbtEpFFb/1CiOHnvI8bjHgOD4/wAw3gKrA0i94LrbekypiZVanJu3McWJg7rWDMzRTg==
dependencies:
- "@typescript-eslint/types" "5.17.0"
+ "@typescript-eslint/types" "5.18.0"
eslint-visitor-keys "^3.0.0"
abab@^2.0.3, abab@^2.0.5:
@@ -2121,10 +2121,10 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
-eslint@8.12.0:
- version "8.12.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.12.0.tgz#c7a5bd1cfa09079aae64c9076c07eada66a46e8e"
- integrity sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==
+eslint@8.13.0:
+ version "8.13.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.13.0.tgz#6fcea43b6811e655410f5626cfcf328016badcd7"
+ integrity sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ==
dependencies:
"@eslint/eslintrc" "^1.2.1"
"@humanwhocodes/config-array" "^0.9.2"
@@ -3580,10 +3580,10 @@ mkdirp@^1.0.4:
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-moment@2.29.1:
- version "2.29.1"
- resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
- integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+moment@2.29.2:
+ version "2.29.2"
+ resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
+ integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
ms@2.0.0:
version "2.0.0"
@@ -4680,10 +4680,10 @@ strip-json-comments@~2.0.1:
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-stripe@8.215.0:
- version "8.215.0"
- resolved "https://registry.yarnpkg.com/stripe/-/stripe-8.215.0.tgz#bb464e256fb83da9ea2f514711fd0f6f7ae7dc9a"
- integrity sha512-M+7iTZ9bzTkU1Ms+Zsuh0mTQfEzOjMoqyEaVBpuUmdbWTvshavzpAihsOkfabEu+sNY0vdbQxxHZ4kI3W8pKHQ==
+stripe@8.216.0:
+ version "8.216.0"
+ resolved "https://registry.yarnpkg.com/stripe/-/stripe-8.216.0.tgz#23c047498526d13a238c3aca7b4dc8cbbd522e46"
+ integrity sha512-LY8cNGizEnklIa4T82l6mZW0HS4cfzo1hNuhT+ZR9PBkmYcSUbg3ilUBVF0FCd4RP+NA44VEVfoSTTZ1Gg5+rQ==
dependencies:
"@types/node" ">=8.1.0"
qs "^6.10.3"
diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx
index c91a14b3c..b0f05ac78 100644
--- a/frontend/src/index.tsx
+++ b/frontend/src/index.tsx
@@ -1,8 +1,7 @@
import 'core-js/stable';
import 'whatwg-fetch';
+import ReactDOM from 'react-dom';
import App from './App';
-import { StrictMode } from 'react';
-import { createRoot } from 'react-dom/client';
import { initialiseAnalytics, initialiseSentry } from './track';
import * as serviceWorker from './serviceWorker';
import 'emoji-mart/css/emoji-mart.css';
@@ -13,14 +12,7 @@ window.Buffer = window.Buffer || require('buffer').Buffer;
initialiseSentry();
initialiseAnalytics();
-
-const container = document.getElementById('content')!;
-const root = createRoot(container);
-root.render(
-
-
-
-);
+ReactDOM.render(, document.getElementById('content'));
// If you want your app to work offline and load faster, you can change
// unregister() to register() below. Note this comes with some pitfalls.
diff --git a/frontend/src/views/game/summary/useMarkdown.ts b/frontend/src/views/game/summary/useMarkdown.ts
index 0e7760a96..24e507157 100644
--- a/frontend/src/views/game/summary/useMarkdown.ts
+++ b/frontend/src/views/game/summary/useMarkdown.ts
@@ -74,20 +74,25 @@ ${[...col.items].map((i) => toItem(i, 0)).join('\n')}
function toItem(item: ColumnStatsItem, depth: number) {
const highlight = item.type === 'group' ? '**' : '';
- let content = `${'\t'.repeat(depth)}- (+${item.likes}/-${
+ let content = `${' '.repeat(depth * 2)}* (+${item.likes}/-${
item.dislikes
- }) ${highlight}${item.content}${highlight}`;
+ }) ${highlight}${toMultiline(item.content)}${highlight}`;
+ if (item.post && item.post.action) {
+ content += `\n${' '.repeat((depth + 1) * 2)}* **Action**: *${toMultiline(
+ item.post.action
+ )}*`;
+ }
item.children.forEach((child) => {
content += '\n' + toItem(child, depth + 1);
});
- return toMultiline(content);
+ return content;
}
function toAction(action: ActionItem): string {
- return `- ${action.action}`;
+ return `- ${toMultiline(action.action)}`;
}
function toMultiline(content: string) {
- return content.replace(/(?:\r\n|\r|\n)/g, ' \n ');
+ return content.replace(/(?:\r\n|\r|\n)/g, ' \n');
}