From 2704e3875800148e435784760a50c067ec63509b Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 5 Jul 2022 11:30:08 -0500 Subject: [PATCH 01/13] Upgrade Jest to v28 --- jest/assetTransformer.js | 4 +- package.json | 13 +- yarn.lock | 1337 +++++++++++++++++++------------------- 3 files changed, 662 insertions(+), 692 deletions(-) diff --git a/jest/assetTransformer.js b/jest/assetTransformer.js index db42b2a2f..9043107a3 100644 --- a/jest/assetTransformer.js +++ b/jest/assetTransformer.js @@ -5,6 +5,8 @@ const path = require('path'); // Tries to do basically what Webpack does module.exports = { process(src, filename, config, options) { - return `module.exports = "https://soapbox.test/assets/${path.basename(filename)}";`; + return { + code: `module.exports = "https://soapbox.test/assets/${path.basename(filename)}";`, + }; }, }; diff --git a/package.json b/package.json index f42719a69..420f6bd62 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@fontsource/inter": "^4.5.1", "@fontsource/roboto": "^4.5.0", "@gamestdio/websocket": "^0.3.2", - "@jest/globals": "^27.5.1", + "@jest/globals": "^28.1.2", "@lcdp/offline-plugin": "^5.1.0", "@metamask/providers": "^9.0.0", "@popperjs/core": "^2.11.5", @@ -73,7 +73,7 @@ "@testing-library/react": "^12.1.4", "@types/escape-html": "^1.0.1", "@types/http-link-header": "^1.0.3", - "@types/jest": "^27.4.1", + "@types/jest": "^28.1.4", "@types/lodash": "^4.14.180", "@types/object-assign": "^4.0.30", "@types/object-fit-images": "^3.2.3", @@ -208,7 +208,7 @@ "@typescript-eslint/eslint-plugin": "^5.15.0", "@typescript-eslint/parser": "^5.15.0", "babel-eslint": "^10.1.0", - "babel-jest": "^28.1.0", + "babel-jest": "^28.1.2", "cross-env": "^7.0.3", "danger": "^11.0.7", "eslint": "^7.0.0", @@ -220,8 +220,9 @@ "eslint-plugin-react-hooks": "^4.2.0", "fake-indexeddb": "^3.1.7", "husky": "^7.0.2", - "jest": "^27.5.1", - "jest-junit": "^13.2.0", + "jest": "^28.1.2", + "jest-environment-jsdom": "^28.1.2", + "jest-junit": "^14.0.0", "lint-staged": ">=10", "raf": "^3.4.1", "react-intl-translations-manager": "^5.0.3", @@ -230,7 +231,7 @@ "stylelint-config-standard": "^22.0.0", "stylelint-scss": "^3.18.0", "tailwindcss": "^3.0.15", - "ts-jest": "^27.1.4", + "ts-jest": "^28.0.5", "webpack-dev-server": "^4.9.1", "yargs": "^16.0.3" } diff --git a/yarn.lock b/yarn.lock index d620b35e3..b1500c99d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -45,7 +45,7 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.10.tgz#711dc726a492dfc8be8220028b1b92482362baab" integrity sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw== -"@babel/core@>=7.9.0", "@babel/core@^7.7.2", "@babel/core@^7.9.0": +"@babel/core@>=7.9.0", "@babel/core@^7.9.0": version "7.15.5" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.5.tgz#f8ed9ace730722544609f90c9bb49162dc3bf5b9" integrity sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg== @@ -66,27 +66,6 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.8.0": - version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.8.tgz#3dac27c190ebc3a4381110d46c80e77efe172e1a" - integrity sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ== - dependencies: - "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.7" - "@babel/helper-compilation-targets" "^7.17.7" - "@babel/helper-module-transforms" "^7.17.7" - "@babel/helpers" "^7.17.8" - "@babel/parser" "^7.17.8" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.3" - "@babel/types" "^7.17.0" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.1.2" - semver "^6.3.0" - "@babel/core@^7.11.6", "@babel/core@^7.18.2": version "7.18.2" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.2.tgz#87b2fcd7cce9becaa7f5acebdc4f09f3dd19d876" @@ -108,6 +87,27 @@ json5 "^2.2.1" semver "^6.3.0" +"@babel/core@^7.12.3": + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.8.tgz#3dac27c190ebc3a4381110d46c80e77efe172e1a" + integrity sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ== + dependencies: + "@ampproject/remapping" "^2.1.0" + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.17.7" + "@babel/helper-compilation-targets" "^7.17.7" + "@babel/helper-module-transforms" "^7.17.7" + "@babel/helpers" "^7.17.8" + "@babel/parser" "^7.17.8" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.17.3" + "@babel/types" "^7.17.0" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.1.2" + semver "^6.3.0" + "@babel/generator@^7.15.4", "@babel/generator@^7.17.3", "@babel/generator@^7.17.7": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad" @@ -1603,113 +1603,129 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@jest/console@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.5.1.tgz#260fe7239602fe5130a94f1aa386eff54b014bba" - integrity sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg== +"@jest/console@^28.1.1": + version "28.1.1" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-28.1.1.tgz#305f8ca50b6e70413839f54c0e002b60a0f2fd7d" + integrity sha512-0RiUocPVFEm3WRMOStIHbRWllG6iW6E3/gUPnf4lkrVFyXIIDeCe+vlKeYyFOMhB2EPE6FLFCNADSOOQMaqvyA== dependencies: - "@jest/types" "^27.5.1" + "@jest/types" "^28.1.1" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^27.5.1" - jest-util "^27.5.1" + jest-message-util "^28.1.1" + jest-util "^28.1.1" slash "^3.0.0" -"@jest/core@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.5.1.tgz#267ac5f704e09dc52de2922cbf3af9edcd64b626" - integrity sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ== +"@jest/core@^28.1.2": + version "28.1.2" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-28.1.2.tgz#eac519b9acbd154313854b8823a47b5c645f785a" + integrity sha512-Xo4E+Sb/nZODMGOPt2G3cMmCBqL4/W2Ijwr7/mrXlq4jdJwcFQ/9KrrJZT2adQRk2otVBXXOz1GRQ4Z5iOgvRQ== dependencies: - "@jest/console" "^27.5.1" - "@jest/reporters" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/console" "^28.1.1" + "@jest/reporters" "^28.1.2" + "@jest/test-result" "^28.1.1" + "@jest/transform" "^28.1.2" + "@jest/types" "^28.1.1" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - emittery "^0.8.1" + ci-info "^3.2.0" exit "^0.1.2" graceful-fs "^4.2.9" - jest-changed-files "^27.5.1" - jest-config "^27.5.1" - jest-haste-map "^27.5.1" - jest-message-util "^27.5.1" - jest-regex-util "^27.5.1" - jest-resolve "^27.5.1" - jest-resolve-dependencies "^27.5.1" - jest-runner "^27.5.1" - jest-runtime "^27.5.1" - jest-snapshot "^27.5.1" - jest-util "^27.5.1" - jest-validate "^27.5.1" - jest-watcher "^27.5.1" + jest-changed-files "^28.0.2" + jest-config "^28.1.2" + jest-haste-map "^28.1.1" + jest-message-util "^28.1.1" + jest-regex-util "^28.0.2" + jest-resolve "^28.1.1" + jest-resolve-dependencies "^28.1.2" + jest-runner "^28.1.2" + jest-runtime "^28.1.2" + jest-snapshot "^28.1.2" + jest-util "^28.1.1" + jest-validate "^28.1.1" + jest-watcher "^28.1.1" micromatch "^4.0.4" + pretty-format "^28.1.1" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.5.1.tgz#d7425820511fe7158abbecc010140c3fd3be9c74" - integrity sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA== +"@jest/environment@^28.1.2": + version "28.1.2" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-28.1.2.tgz#94a052c0c5f9f8c8e6d13ea6da78dbc5d7d9b85b" + integrity sha512-I0CR1RUMmOzd0tRpz10oUfaChBWs+/Hrvn5xYhMEF/ZqrDaaeHwS8yDBqEWCrEnkH2g+WE/6g90oBv3nKpcm8Q== dependencies: - "@jest/fake-timers" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/fake-timers" "^28.1.2" + "@jest/types" "^28.1.1" "@types/node" "*" - jest-mock "^27.5.1" + jest-mock "^28.1.1" -"@jest/fake-timers@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.5.1.tgz#76979745ce0579c8a94a4678af7a748eda8ada74" - integrity sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ== +"@jest/expect-utils@^28.1.1": + version "28.1.1" + resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-28.1.1.tgz#d84c346025b9f6f3886d02c48a6177e2b0360587" + integrity sha512-n/ghlvdhCdMI/hTcnn4qV57kQuV9OTsZzH1TTCVARANKhl6hXJqLKUkwX69ftMGpsbpt96SsDD8n8LD2d9+FRw== dependencies: - "@jest/types" "^27.5.1" - "@sinonjs/fake-timers" "^8.0.1" + jest-get-type "^28.0.2" + +"@jest/expect@^28.1.2": + version "28.1.2" + resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-28.1.2.tgz#0b25acedff46e1e1e5606285306c8a399c12534f" + integrity sha512-HBzyZBeFBiOelNbBKN0pilWbbrGvwDUwAqMC46NVJmWm8AVkuE58NbG1s7DR4cxFt4U5cVLxofAoHxgvC5MyOw== + dependencies: + expect "^28.1.1" + jest-snapshot "^28.1.2" + +"@jest/fake-timers@^28.1.2": + version "28.1.2" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-28.1.2.tgz#d49e8ee4e02ba85a6e844a52a5e7c59c23e3b76f" + integrity sha512-xSYEI7Y0D5FbZN2LsCUj/EKRR1zfQYmGuAUVh6xTqhx7V5JhjgMcK5Pa0iR6WIk0GXiHDe0Ke4A+yERKE9saqg== + dependencies: + "@jest/types" "^28.1.1" + "@sinonjs/fake-timers" "^9.1.2" "@types/node" "*" - jest-message-util "^27.5.1" - jest-mock "^27.5.1" - jest-util "^27.5.1" + jest-message-util "^28.1.1" + jest-mock "^28.1.1" + jest-util "^28.1.1" -"@jest/globals@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.5.1.tgz#7ac06ce57ab966566c7963431cef458434601b2b" - integrity sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q== +"@jest/globals@^28.1.2": + version "28.1.2" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-28.1.2.tgz#92fab296e337c7309c25e4202fb724f62249d83f" + integrity sha512-cz0lkJVDOtDaYhvT3Fv2U1B6FtBnV+OpEyJCzTHM1fdoTsU4QNLAt/H4RkiwEUU+dL4g/MFsoTuHeT2pvbo4Hg== dependencies: - "@jest/environment" "^27.5.1" - "@jest/types" "^27.5.1" - expect "^27.5.1" + "@jest/environment" "^28.1.2" + "@jest/expect" "^28.1.2" + "@jest/types" "^28.1.1" -"@jest/reporters@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.5.1.tgz#ceda7be96170b03c923c37987b64015812ffec04" - integrity sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw== +"@jest/reporters@^28.1.2": + version "28.1.2" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-28.1.2.tgz#0327be4ce4d0d9ae49e7908656f89669d0c2a260" + integrity sha512-/whGLhiwAqeCTmQEouSigUZJPVl7sW8V26EiboImL+UyXznnr1a03/YZ2BX8OlFw0n+Zlwu+EZAITZtaeRTxyA== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/console" "^28.1.1" + "@jest/test-result" "^28.1.1" + "@jest/transform" "^28.1.2" + "@jest/types" "^28.1.1" + "@jridgewell/trace-mapping" "^0.3.13" "@types/node" "*" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" - glob "^7.1.2" + glob "^7.1.3" graceful-fs "^4.2.9" istanbul-lib-coverage "^3.0.0" istanbul-lib-instrument "^5.1.0" istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.1.3" - jest-haste-map "^27.5.1" - jest-resolve "^27.5.1" - jest-util "^27.5.1" - jest-worker "^27.5.1" + jest-message-util "^28.1.1" + jest-util "^28.1.1" + jest-worker "^28.1.1" slash "^3.0.0" - source-map "^0.6.0" string-length "^4.0.1" + strip-ansi "^6.0.0" terminal-link "^2.0.0" - v8-to-istanbul "^8.1.0" + v8-to-istanbul "^9.0.1" "@jest/schemas@^28.0.2": version "28.0.2" @@ -1718,103 +1734,60 @@ dependencies: "@sinclair/typebox" "^0.23.3" -"@jest/source-map@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.1.tgz#6608391e465add4205eae073b55e7f279e04e8cf" - integrity sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg== +"@jest/source-map@^28.1.2": + version "28.1.2" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-28.1.2.tgz#7fe832b172b497d6663cdff6c13b0a920e139e24" + integrity sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww== dependencies: + "@jridgewell/trace-mapping" "^0.3.13" callsites "^3.0.0" graceful-fs "^4.2.9" - source-map "^0.6.0" -"@jest/test-result@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.5.1.tgz#56a6585fa80f7cdab72b8c5fc2e871d03832f5bb" - integrity sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag== +"@jest/test-result@^28.1.1": + version "28.1.1" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-28.1.1.tgz#c6f18d1bbb01aa88925dd687872a75f8414b317a" + integrity sha512-hPmkugBktqL6rRzwWAtp1JtYT4VHwv8OQ+9lE5Gymj6dHzubI/oJHMUpPOt8NrdVWSrz9S7bHjJUmv2ggFoUNQ== dependencies: - "@jest/console" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/console" "^28.1.1" + "@jest/types" "^28.1.1" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz#4057e0e9cea4439e544c6353c6affe58d095745b" - integrity sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ== +"@jest/test-sequencer@^28.1.1": + version "28.1.1" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-28.1.1.tgz#f594ee2331df75000afe0d1ae3237630ecec732e" + integrity sha512-nuL+dNSVMcWB7OOtgb0EGH5AjO4UBCt68SLP08rwmC+iRhyuJWS9MtZ/MpipxFwKAlHFftbMsydXqWre8B0+XA== dependencies: - "@jest/test-result" "^27.5.1" + "@jest/test-result" "^28.1.1" graceful-fs "^4.2.9" - jest-haste-map "^27.5.1" - jest-runtime "^27.5.1" - -"@jest/transform@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.5.1.tgz#6c3501dcc00c4c08915f292a600ece5ecfe1f409" - integrity sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw== - dependencies: - "@babel/core" "^7.1.0" - "@jest/types" "^27.5.1" - babel-plugin-istanbul "^6.1.1" - chalk "^4.0.0" - convert-source-map "^1.4.0" - fast-json-stable-stringify "^2.0.0" - graceful-fs "^4.2.9" - jest-haste-map "^27.5.1" - jest-regex-util "^27.5.1" - jest-util "^27.5.1" - micromatch "^4.0.4" - pirates "^4.0.4" + jest-haste-map "^28.1.1" slash "^3.0.0" - source-map "^0.6.1" - write-file-atomic "^3.0.0" -"@jest/transform@^28.1.0": - version "28.1.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-28.1.0.tgz#224a3c9ba4cc98e2ff996c0a89a2d59db15c74ce" - integrity sha512-omy2xe5WxlAfqmsTjTPxw+iXRTRnf+NtX0ToG+4S0tABeb4KsKmPUHq5UBuwunHg3tJRwgEQhEp0M/8oiatLEA== +"@jest/transform@^28.1.2": + version "28.1.2" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-28.1.2.tgz#b367962c53fd53821269bde050ce373e111327c1" + integrity sha512-3o+lKF6iweLeJFHBlMJysdaPbpoMmtbHEFsjzSv37HIq/wWt5ijTeO2Yf7MO5yyczCopD507cNwNLeX8Y/CuIg== dependencies: "@babel/core" "^7.11.6" - "@jest/types" "^28.1.0" - "@jridgewell/trace-mapping" "^0.3.7" + "@jest/types" "^28.1.1" + "@jridgewell/trace-mapping" "^0.3.13" babel-plugin-istanbul "^6.1.1" chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.9" - jest-haste-map "^28.1.0" + jest-haste-map "^28.1.1" jest-regex-util "^28.0.2" - jest-util "^28.1.0" + jest-util "^28.1.1" micromatch "^4.0.4" pirates "^4.0.4" slash "^3.0.0" write-file-atomic "^4.0.1" -"@jest/types@^27.1.1": - version "27.1.1" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.1.1.tgz#77a3fc014f906c65752d12123a0134359707c0ad" - integrity sha512-yqJPDDseb0mXgKqmNqypCsb85C22K1aY5+LUxh7syIM9n/b0AsaltxNy+o6tt29VcfGDpYEve175bm3uOhcehA== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^3.0.0" - "@types/node" "*" - "@types/yargs" "^16.0.0" - chalk "^4.0.0" - -"@jest/types@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80" - integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^3.0.0" - "@types/node" "*" - "@types/yargs" "^16.0.0" - chalk "^4.0.0" - -"@jest/types@^28.1.0": - version "28.1.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.1.0.tgz#508327a89976cbf9bd3e1cc74641a29fd7dfd519" - integrity sha512-xmEggMPr317MIOjjDoZ4ejCSr9Lpbt/u34+dvc99t7DS8YirW5rwZEhzKPC2BMUFkUhI48qs6qLUSGw5FuL0GA== +"@jest/types@^28.1.1": + version "28.1.1" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.1.1.tgz#d059bbc80e6da6eda9f081f293299348bd78ee0b" + integrity sha512-vRXVqSg1VhDnB8bWcmvLzmg0Bt9CRKVgHPXqYwvWMX3TvAjeO+nRuK6+VdTKCtWOvYlmkF/HqNAL/z+N3B53Kw== dependencies: "@jest/schemas" "^28.0.2" "@types/istanbul-lib-coverage" "^2.0.0" @@ -1863,7 +1836,15 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@jridgewell/trace-mapping@^0.3.7", "@jridgewell/trace-mapping@^0.3.9": +"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13": + version "0.3.14" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed" + integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@jridgewell/trace-mapping@^0.3.9": version "0.3.13" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea" integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w== @@ -2257,10 +2238,10 @@ dependencies: type-detect "4.0.8" -"@sinonjs/fake-timers@^8.0.1": - version "8.1.0" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz#3fdc2b6cb58935b21bfb8d1625eb1300484316e7" - integrity sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg== +"@sinonjs/fake-timers@^9.1.2": + version "9.1.2" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c" + integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw== dependencies: "@sinonjs/commons" "^1.7.0" @@ -2351,10 +2332,10 @@ resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.0.3.tgz#463667596122c13d997f70b73426947ab71de962" integrity sha512-zIgBG5CxfXbMsm4wBS6iQC3TBNMZk16O25i4shS9MM+eSG7PZHrsBF6LFIesUkepkZ3QKKgstB2/Nola6nvy4A== -"@tootallnate/once@1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" - integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== +"@tootallnate/once@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" + integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== "@trysound/sax@0.2.0": version "0.2.0" @@ -2366,7 +2347,7 @@ resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.2.tgz#ed4e0ad92306a704f9fb132a0cfcf77486dbe2bc" integrity sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig== -"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.12", "@types/babel__core@^7.1.14": +"@types/babel__core@^7.1.12", "@types/babel__core@^7.1.14": version "7.1.19" resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460" integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw== @@ -2403,7 +2384,7 @@ "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" -"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": +"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": version "7.14.2" resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43" integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA== @@ -2517,7 +2498,7 @@ dependencies: "@types/node" "*" -"@types/graceful-fs@^4.1.2", "@types/graceful-fs@^4.1.3": +"@types/graceful-fs@^4.1.3": version "4.1.5" resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== @@ -2585,7 +2566,7 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jest@*", "@types/jest@^27.4.1": +"@types/jest@*": version "27.4.1" resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.4.1.tgz#185cbe2926eaaf9662d340cc02e548ce9e11ab6d" integrity sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw== @@ -2593,6 +2574,23 @@ jest-matcher-utils "^27.0.0" pretty-format "^27.0.0" +"@types/jest@^28.1.4": + version "28.1.4" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-28.1.4.tgz#a11ee6c8fd0b52c19c9c18138b78bbcc201dad5a" + integrity sha512-telv6G5N7zRJiLcI3Rs3o+ipZ28EnE+7EvF0pSrt2pZOMnAVI/f+6/LucDxOvcBcTeTL3JMF744BbVQAVBUQRA== + dependencies: + jest-matcher-utils "^28.0.0" + pretty-format "^28.0.0" + +"@types/jsdom@^16.2.4": + version "16.2.14" + resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-16.2.14.tgz#26fe9da6a8870715b154bb84cd3b2e53433d8720" + integrity sha512-6BAy1xXEmMuHeAJ4Fv4yXKwBDTGTOseExKE3OaHiNycdHdZw59KfYzrt0DkDluvwmik1HRt6QS7bImxUmpSy+w== + dependencies: + "@types/node" "*" + "@types/parse5" "*" + "@types/tough-cookie" "*" + "@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8": version "7.0.9" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" @@ -2655,6 +2653,11 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== +"@types/parse5@*": + version "6.0.3" + resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.3.tgz#705bb349e789efa06f43f128cef51240753424cb" + integrity sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g== + "@types/prettier@^2.1.5": version "2.3.2" resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.2.tgz#fc8c2825e4ed2142473b4a81064e6e081463d1b3" @@ -2848,6 +2851,11 @@ dependencies: "@types/jest" "*" +"@types/tough-cookie@*": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" + integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw== + "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2": version "2.0.6" resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" @@ -2870,13 +2878,6 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== -"@types/yargs@^16.0.0": - version "16.0.4" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977" - integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw== - dependencies: - "@types/yargs-parser" "*" - "@types/yargs@^17.0.8": version "17.0.10" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.10.tgz#591522fce85d8739bca7b8bb90d048e4478d186a" @@ -3124,10 +3125,10 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -abab@^2.0.3, abab@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" - integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== +abab@^2.0.5, abab@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" + integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== abort-controller@^3.0.0: version "3.0.0" @@ -3194,7 +3195,7 @@ acorn@^7.0.0, acorn@^7.1.1, acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.4, acorn@^8.2.4, acorn@^8.4.1: +acorn@^8.0.4, acorn@^8.4.1: version "8.5.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2" integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q== @@ -3531,29 +3532,15 @@ babel-eslint@^10.1.0: eslint-visitor-keys "^1.0.0" resolve "^1.12.0" -babel-jest@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.1.tgz#a1bf8d61928edfefd21da27eb86a695bfd691444" - integrity sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg== +babel-jest@^28.1.2: + version "28.1.2" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.2.tgz#2b37fb81439f14d34d8b2cc4a4bd7efabf9acbfe" + integrity sha512-pfmoo6sh4L/+5/G2OOfQrGJgvH7fTa1oChnuYH2G/6gA+JwDvO8PELwvwnofKBMNrQsam0Wy/Rw+QSrBNewq2Q== dependencies: - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/transform" "^28.1.2" "@types/babel__core" "^7.1.14" babel-plugin-istanbul "^6.1.1" - babel-preset-jest "^27.5.1" - chalk "^4.0.0" - graceful-fs "^4.2.9" - slash "^3.0.0" - -babel-jest@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.0.tgz#95a67f8e2e7c0042e7b3ad3951b8af41a533b5ea" - integrity sha512-zNKk0yhDZ6QUwfxh9k07GII6siNGMJWVUU49gmFj5gfdqDKLqa2RArXOF2CODp4Dr7dLxN2cvAV+667dGJ4b4w== - dependencies: - "@jest/transform" "^28.1.0" - "@types/babel__core" "^7.1.14" - babel-plugin-istanbul "^6.1.1" - babel-preset-jest "^28.0.2" + babel-preset-jest "^28.1.1" chalk "^4.0.0" graceful-fs "^4.2.9" slash "^3.0.0" @@ -3586,20 +3573,10 @@ babel-plugin-istanbul@^6.1.1: istanbul-lib-instrument "^5.0.4" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz#9be98ecf28c331eb9f5df9c72d6f89deb8181c2e" - integrity sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ== - dependencies: - "@babel/template" "^7.3.3" - "@babel/types" "^7.3.3" - "@types/babel__core" "^7.0.0" - "@types/babel__traverse" "^7.0.6" - -babel-plugin-jest-hoist@^28.0.2: - version "28.0.2" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.0.2.tgz#9307d03a633be6fc4b1a6bc5c3a87e22bd01dd3b" - integrity sha512-Kizhn/ZL+68ZQHxSnHyuvJv8IchXD62KQxV77TBDV/xoBFBOfgRAk97GNs6hXdTTCiVES9nB2I6+7MXXrk5llQ== +babel-plugin-jest-hoist@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.1.tgz#5e055cdcc47894f28341f87f5e35aad2df680b11" + integrity sha512-NovGCy5Hn25uMJSAU8FaHqzs13cFoOI4lhIujiepssjCKRsAo3TA734RDWSGxuFTsUJXerYOqQQodlxgmtqbzw== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" @@ -3706,20 +3683,12 @@ babel-preset-current-node-syntax@^1.0.0: "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-top-level-await" "^7.8.3" -babel-preset-jest@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz#91f10f58034cb7989cb4f962b69fa6eef6a6bc81" - integrity sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag== +babel-preset-jest@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-28.1.1.tgz#5b6e5e69f963eb2d70f739c607b8f723c0ee75e4" + integrity sha512-FCq9Oud0ReTeWtcneYf/48981aTfXYuB9gbU4rBNNJVBSQ6ssv7E6v/qvbBxtOWwZFXjLZwpg+W3q7J6vhH25g== dependencies: - babel-plugin-jest-hoist "^27.5.1" - babel-preset-current-node-syntax "^1.0.0" - -babel-preset-jest@^28.0.2: - version "28.0.2" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-28.0.2.tgz#d8210fe4e46c1017e9fa13d7794b166e93aa9f89" - integrity sha512-sYzXIdgIXXroJTFeB3S6sNDWtlJ2dllCdTEsnZ65ACrMojj3hVNFRmnJ1HZtomGi+Be7aqpY/HJ92fr8OhKVkQ== - dependencies: - babel-plugin-jest-hoist "^28.0.2" + babel-plugin-jest-hoist "^28.1.1" babel-preset-current-node-syntax "^1.0.0" bail@^1.0.0: @@ -4115,11 +4084,6 @@ chrome-trace-event@^1.0.2: resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== -ci-info@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz#2876cb948a498797b5236f0095bc057d0dca38b6" - integrity sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A== - ci-info@^3.2.0: version "3.3.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" @@ -4565,10 +4529,10 @@ csso@^4.2.0: dependencies: css-tree "^1.1.2" -cssom@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" - integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== +cssom@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36" + integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw== cssom@~0.3.6: version "0.3.8" @@ -4643,14 +4607,14 @@ danger@^11.0.7: require-from-string "^2.0.2" supports-hyperlinks "^1.0.1" -data-urls@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" - integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== +data-urls@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143" + integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ== dependencies: - abab "^2.0.3" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.0.0" + abab "^2.0.6" + whatwg-mimetype "^3.0.0" + whatwg-url "^11.0.0" date-fns@^2.0.1, date-fns@^2.24.0: version "2.28.0" @@ -4671,10 +4635,10 @@ debug@3.1.0: dependencies: ms "2.0.0" -debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.1, debug@^4.3.1: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== +debug@4, debug@^4.1.0, debug@^4.3.2, debug@^4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" @@ -4685,10 +4649,10 @@ debug@^3.1.0, debug@^3.2.7: dependencies: ms "^2.1.1" -debug@^4.1.0, debug@^4.3.2, debug@^4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== +debug@^4.0.0, debug@^4.0.1, debug@^4.1.1, debug@^4.3.1: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== dependencies: ms "2.1.2" @@ -4705,7 +4669,7 @@ decamelize@^1.1.0, decamelize@^1.2.0: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= -decimal.js@^10.2.1: +decimal.js@^10.3.1: version "10.3.1" resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== @@ -4838,6 +4802,11 @@ diff-sequences@^27.5.1: resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327" integrity sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ== +diff-sequences@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-28.1.1.tgz#9989dc731266dc2903457a70e996f3a041913ac6" + integrity sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw== + dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -4929,12 +4898,12 @@ domexception@^1.0.1: dependencies: webidl-conversions "^4.0.2" -domexception@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" - integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== +domexception@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673" + integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw== dependencies: - webidl-conversions "^5.0.0" + webidl-conversions "^7.0.0" domhandler@^2.3.0: version "2.4.2" @@ -5022,10 +4991,10 @@ electron-to-chromium@^1.4.84: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.103.tgz#abfe376a4d70fa1e1b4b353b95df5d6dfd05da3a" integrity sha512-c/uKWR1Z/W30Wy/sx3dkZoj4BijbXX85QKWu9jJfjho3LBAXNEGAEW3oWiGb+dotA6C6BzCTxL2/aLes7jlUeg== -emittery@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860" - integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg== +emittery@^0.10.2: + version "0.10.2" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933" + integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw== emoji-datasource@5.0.0: version "5.0.0" @@ -5587,15 +5556,16 @@ expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -expect@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/expect/-/expect-27.5.1.tgz#83ce59f1e5bdf5f9d2b94b61d2050db48f3fef74" - integrity sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw== +expect@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/expect/-/expect-28.1.1.tgz#ca6fff65f6517cf7220c2e805a49c19aea30b420" + integrity sha512-/AANEwGL0tWBwzLNOvO0yUdy2D52jVdNXppOqswC49sxMN2cPWsGCQdzuIf9tj6hHoBQzNvx75JUYuQAckPo3w== dependencies: - "@jest/types" "^27.5.1" - jest-get-type "^27.5.1" - jest-matcher-utils "^27.5.1" - jest-message-util "^27.5.1" + "@jest/expect-utils" "^28.1.1" + jest-get-type "^28.0.2" + jest-matcher-utils "^28.1.1" + jest-message-util "^28.1.1" + jest-util "^28.1.1" express@^4.17.3: version "4.18.1" @@ -5863,15 +5833,6 @@ form-data@^2.5.0: combined-stream "^1.0.6" mime-types "^2.1.12" -form-data@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" - integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - form-data@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" @@ -6310,12 +6271,12 @@ hpack.js@^2.1.6: readable-stream "^2.0.1" wbuf "^1.1.0" -html-encoding-sniffer@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" - integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== +html-encoding-sniffer@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9" + integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA== dependencies: - whatwg-encoding "^1.0.5" + whatwg-encoding "^2.0.0" html-entities@^2.3.2: version "2.3.2" @@ -6427,12 +6388,12 @@ http-proxy-agent@^2.1.0: agent-base "4" debug "3.1.0" -http-proxy-agent@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== +http-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" + integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== dependencies: - "@tootallnate/once" "1" + "@tootallnate/once" "2" agent-base "6" debug "4" @@ -6465,9 +6426,9 @@ https-proxy-agent@^2.2.1: debug "^3.1.0" https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== dependencies: agent-base "6" debug "4" @@ -6499,6 +6460,13 @@ iconv-lite@0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" +iconv-lite@0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + icss-utils@^5.0.0, icss-utils@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" @@ -6742,13 +6710,6 @@ is-callable@^1.1.4, is-callable@^1.2.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== -is-ci@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz#c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994" - integrity sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ== - dependencies: - ci-info "^3.1.1" - is-core-module@^2.2.0, is-core-module@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19" @@ -7051,85 +7012,82 @@ istanbul-reports@^3.1.3: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -jest-changed-files@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz#a348aed00ec9bf671cc58a66fcbe7c3dfd6a68f5" - integrity sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw== +jest-changed-files@^28.0.2: + version "28.0.2" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-28.0.2.tgz#7d7810660a5bd043af9e9cfbe4d58adb05e91531" + integrity sha512-QX9u+5I2s54ZnGoMEjiM2WeBvJR2J7w/8ZUmH2um/WLAuGAYFQcsVXY9+1YL6k0H/AGUdH8pXUAv6erDqEsvIA== dependencies: - "@jest/types" "^27.5.1" execa "^5.0.0" throat "^6.0.1" -jest-circus@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.5.1.tgz#37a5a4459b7bf4406e53d637b49d22c65d125ecc" - integrity sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw== +jest-circus@^28.1.2: + version "28.1.2" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-28.1.2.tgz#0d5a5623eccb244efe87d1edc365696e4fcf80ce" + integrity sha512-E2vdPIJG5/69EMpslFhaA46WkcrN74LI5V/cSJ59L7uS8UNoXbzTxmwhpi9XrIL3zqvMt5T0pl5k2l2u2GwBNQ== dependencies: - "@jest/environment" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/environment" "^28.1.2" + "@jest/expect" "^28.1.2" + "@jest/test-result" "^28.1.1" + "@jest/types" "^28.1.1" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" - expect "^27.5.1" is-generator-fn "^2.0.0" - jest-each "^27.5.1" - jest-matcher-utils "^27.5.1" - jest-message-util "^27.5.1" - jest-runtime "^27.5.1" - jest-snapshot "^27.5.1" - jest-util "^27.5.1" - pretty-format "^27.5.1" + jest-each "^28.1.1" + jest-matcher-utils "^28.1.1" + jest-message-util "^28.1.1" + jest-runtime "^28.1.2" + jest-snapshot "^28.1.2" + jest-util "^28.1.1" + pretty-format "^28.1.1" slash "^3.0.0" stack-utils "^2.0.3" throat "^6.0.1" -jest-cli@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.5.1.tgz#278794a6e6458ea8029547e6c6cbf673bd30b145" - integrity sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw== +jest-cli@^28.1.2: + version "28.1.2" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-28.1.2.tgz#b89012e5bad14135e71b1628b85475d3773a1bbc" + integrity sha512-l6eoi5Do/IJUXAFL9qRmDiFpBeEJAnjJb1dcd9i/VWfVWbp3mJhuH50dNtX67Ali4Ecvt4eBkWb4hXhPHkAZTw== dependencies: - "@jest/core" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/core" "^28.1.2" + "@jest/test-result" "^28.1.1" + "@jest/types" "^28.1.1" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.9" import-local "^3.0.2" - jest-config "^27.5.1" - jest-util "^27.5.1" - jest-validate "^27.5.1" + jest-config "^28.1.2" + jest-util "^28.1.1" + jest-validate "^28.1.1" prompts "^2.0.1" - yargs "^16.2.0" + yargs "^17.3.1" -jest-config@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.5.1.tgz#5c387de33dca3f99ad6357ddeccd91bf3a0e4a41" - integrity sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA== +jest-config@^28.1.2: + version "28.1.2" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-28.1.2.tgz#ba00ad30caf62286c86e7c1099e915218a0ac8c6" + integrity sha512-g6EfeRqddVbjPVBVY4JWpUY4IvQoFRIZcv4V36QkqzE0IGhEC/VkugFeBMAeUE7PRgC8KJF0yvJNDeQRbamEVA== dependencies: - "@babel/core" "^7.8.0" - "@jest/test-sequencer" "^27.5.1" - "@jest/types" "^27.5.1" - babel-jest "^27.5.1" + "@babel/core" "^7.11.6" + "@jest/test-sequencer" "^28.1.1" + "@jest/types" "^28.1.1" + babel-jest "^28.1.2" chalk "^4.0.0" ci-info "^3.2.0" deepmerge "^4.2.2" - glob "^7.1.1" + glob "^7.1.3" graceful-fs "^4.2.9" - jest-circus "^27.5.1" - jest-environment-jsdom "^27.5.1" - jest-environment-node "^27.5.1" - jest-get-type "^27.5.1" - jest-jasmine2 "^27.5.1" - jest-regex-util "^27.5.1" - jest-resolve "^27.5.1" - jest-runner "^27.5.1" - jest-util "^27.5.1" - jest-validate "^27.5.1" + jest-circus "^28.1.2" + jest-environment-node "^28.1.2" + jest-get-type "^28.0.2" + jest-regex-util "^28.0.2" + jest-resolve "^28.1.1" + jest-runner "^28.1.2" + jest-util "^28.1.1" + jest-validate "^28.1.1" micromatch "^4.0.4" parse-json "^5.2.0" - pretty-format "^27.5.1" + pretty-format "^28.1.1" slash "^3.0.0" strip-json-comments "^3.1.1" @@ -7143,135 +7101,108 @@ jest-diff@^27.5.1: jest-get-type "^27.5.1" pretty-format "^27.5.1" -jest-docblock@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.1.tgz#14092f364a42c6108d42c33c8cf30e058e25f6c0" - integrity sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ== +jest-diff@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-28.1.1.tgz#1a3eedfd81ae79810931c63a1d0f201b9120106c" + integrity sha512-/MUUxeR2fHbqHoMMiffe/Afm+U8U4olFRJ0hiVG2lZatPJcnGxx292ustVu7bULhjV65IYMxRdploAKLbcrsyg== + dependencies: + chalk "^4.0.0" + diff-sequences "^28.1.1" + jest-get-type "^28.0.2" + pretty-format "^28.1.1" + +jest-docblock@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-28.1.1.tgz#6f515c3bf841516d82ecd57a62eed9204c2f42a8" + integrity sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA== dependencies: detect-newline "^3.0.0" -jest-each@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.5.1.tgz#5bc87016f45ed9507fed6e4702a5b468a5b2c44e" - integrity sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ== +jest-each@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-28.1.1.tgz#ba5238dacf4f31d9fe23ddc2c44c01e7c23885c4" + integrity sha512-A042rqh17ZvEhRceDMi784ppoXR7MWGDEKTXEZXb4svt0eShMZvijGxzKsx+yIjeE8QYmHPrnHiTSQVhN4nqaw== dependencies: - "@jest/types" "^27.5.1" + "@jest/types" "^28.1.1" chalk "^4.0.0" - jest-get-type "^27.5.1" - jest-util "^27.5.1" - pretty-format "^27.5.1" + jest-get-type "^28.0.2" + jest-util "^28.1.1" + pretty-format "^28.1.1" -jest-environment-jsdom@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz#ea9ccd1fc610209655a77898f86b2b559516a546" - integrity sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw== +jest-environment-jsdom@^28.1.2: + version "28.1.2" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-28.1.2.tgz#d3fe82ef8f900c34ab582df7d3002c5079e3d8ab" + integrity sha512-Ujhx/xFZGVPuxAVpseQ7KqdBErenuWH3Io2HujkGOKMS2VWmpnTGYHzv+73p21QJ9yYQlJkeg06rTe1svV+u0g== dependencies: - "@jest/environment" "^27.5.1" - "@jest/fake-timers" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/environment" "^28.1.2" + "@jest/fake-timers" "^28.1.2" + "@jest/types" "^28.1.1" + "@types/jsdom" "^16.2.4" "@types/node" "*" - jest-mock "^27.5.1" - jest-util "^27.5.1" - jsdom "^16.6.0" + jest-mock "^28.1.1" + jest-util "^28.1.1" + jsdom "^19.0.0" -jest-environment-node@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.5.1.tgz#dedc2cfe52fab6b8f5714b4808aefa85357a365e" - integrity sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw== +jest-environment-node@^28.1.2: + version "28.1.2" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-28.1.2.tgz#3e2eb47f6d173b0648d5f7c717cb1c26651d5c8a" + integrity sha512-oYsZz9Qw27XKmOgTtnl0jW7VplJkN2oeof+SwAwKFQacq3CLlG9u4kTGuuLWfvu3J7bVutWlrbEQMOCL/jughw== dependencies: - "@jest/environment" "^27.5.1" - "@jest/fake-timers" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/environment" "^28.1.2" + "@jest/fake-timers" "^28.1.2" + "@jest/types" "^28.1.1" "@types/node" "*" - jest-mock "^27.5.1" - jest-util "^27.5.1" + jest-mock "^28.1.1" + jest-util "^28.1.1" jest-get-type@^27.5.1: version "27.5.1" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1" integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw== -jest-haste-map@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.5.1.tgz#9fd8bd7e7b4fa502d9c6164c5640512b4e811e7f" - integrity sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng== - dependencies: - "@jest/types" "^27.5.1" - "@types/graceful-fs" "^4.1.2" - "@types/node" "*" - anymatch "^3.0.3" - fb-watchman "^2.0.0" - graceful-fs "^4.2.9" - jest-regex-util "^27.5.1" - jest-serializer "^27.5.1" - jest-util "^27.5.1" - jest-worker "^27.5.1" - micromatch "^4.0.4" - walker "^1.0.7" - optionalDependencies: - fsevents "^2.3.2" +jest-get-type@^28.0.2: + version "28.0.2" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-28.0.2.tgz#34622e628e4fdcd793d46db8a242227901fcf203" + integrity sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA== -jest-haste-map@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-28.1.0.tgz#6c1ee2daf1c20a3e03dbd8e5b35c4d73d2349cf0" - integrity sha512-xyZ9sXV8PtKi6NCrJlmq53PyNVHzxmcfXNVvIRHpHmh1j/HChC4pwKgyjj7Z9us19JMw8PpQTJsFWOsIfT93Dw== +jest-haste-map@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-28.1.1.tgz#471685f1acd365a9394745bb97c8fc16289adca3" + integrity sha512-ZrRSE2o3Ezh7sb1KmeLEZRZ4mgufbrMwolcFHNRSjKZhpLa8TdooXOOFlSwoUzlbVs1t0l7upVRW2K7RWGHzbQ== dependencies: - "@jest/types" "^28.1.0" + "@jest/types" "^28.1.1" "@types/graceful-fs" "^4.1.3" "@types/node" "*" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.9" jest-regex-util "^28.0.2" - jest-util "^28.1.0" - jest-worker "^28.1.0" + jest-util "^28.1.1" + jest-worker "^28.1.1" micromatch "^4.0.4" - walker "^1.0.7" + walker "^1.0.8" optionalDependencies: fsevents "^2.3.2" -jest-jasmine2@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz#a037b0034ef49a9f3d71c4375a796f3b230d1ac4" - integrity sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ== - dependencies: - "@jest/environment" "^27.5.1" - "@jest/source-map" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/types" "^27.5.1" - "@types/node" "*" - chalk "^4.0.0" - co "^4.6.0" - expect "^27.5.1" - is-generator-fn "^2.0.0" - jest-each "^27.5.1" - jest-matcher-utils "^27.5.1" - jest-message-util "^27.5.1" - jest-runtime "^27.5.1" - jest-snapshot "^27.5.1" - jest-util "^27.5.1" - pretty-format "^27.5.1" - throat "^6.0.1" - -jest-junit@^13.2.0: - version "13.2.0" - resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-13.2.0.tgz#66eeb86429aafac8c1745a70f44ace185aacb943" - integrity sha512-B0XNlotl1rdsvFZkFfoa19mc634+rrd8E4Sskb92Bb8MmSXeWV9XJGUyctunZS1W410uAxcyYuPUGVnbcOH8cg== +jest-junit@^14.0.0: + version "14.0.0" + resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-14.0.0.tgz#f69fc31bab32224848f443480c2c808fccb2a802" + integrity sha512-kALvBDegstTROfDGXH71UGD7k5g7593Y1wuX1wpWT+QTYcBbmtuGOA8UlAt56zo/B2eMIOcaOVEON3j0VXVa4g== dependencies: mkdirp "^1.0.4" strip-ansi "^6.0.1" uuid "^8.3.2" xml "^1.0.1" -jest-leak-detector@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz#6ec9d54c3579dd6e3e66d70e3498adf80fde3fb8" - integrity sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ== +jest-leak-detector@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-28.1.1.tgz#537f37afd610a4b3f4cab15e06baf60484548efb" + integrity sha512-4jvs8V8kLbAaotE+wFR7vfUGf603cwYtFf1/PYEsyX2BAjSzj8hQSVTP6OWzseTl0xL6dyHuKs2JAks7Pfubmw== dependencies: - jest-get-type "^27.5.1" - pretty-format "^27.5.1" + jest-get-type "^28.0.2" + pretty-format "^28.1.1" -jest-matcher-utils@^27.0.0, jest-matcher-utils@^27.5.1: +jest-matcher-utils@^27.0.0: version "27.5.1" resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz#9c0cdbda8245bc22d2331729d1091308b40cf8ab" integrity sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw== @@ -7281,27 +7212,37 @@ jest-matcher-utils@^27.0.0, jest-matcher-utils@^27.5.1: jest-get-type "^27.5.1" pretty-format "^27.5.1" -jest-message-util@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.1.tgz#bdda72806da10d9ed6425e12afff38cd1458b6cf" - integrity sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g== +jest-matcher-utils@^28.0.0, jest-matcher-utils@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-28.1.1.tgz#a7c4653c2b782ec96796eb3088060720f1e29304" + integrity sha512-NPJPRWrbmR2nAJ+1nmnfcKKzSwgfaciCCrYZzVnNoxVoyusYWIjkBMNvu0RHJe7dNj4hH3uZOPZsQA+xAYWqsw== + dependencies: + chalk "^4.0.0" + jest-diff "^28.1.1" + jest-get-type "^28.0.2" + pretty-format "^28.1.1" + +jest-message-util@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-28.1.1.tgz#60aa0b475cfc08c8a9363ed2fb9108514dd9ab89" + integrity sha512-xoDOOT66fLfmTRiqkoLIU7v42mal/SqwDKvfmfiWAdJMSJiU+ozgluO7KbvoAgiwIrrGZsV7viETjc8GNrA/IQ== dependencies: "@babel/code-frame" "^7.12.13" - "@jest/types" "^27.5.1" + "@jest/types" "^28.1.1" "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.9" micromatch "^4.0.4" - pretty-format "^27.5.1" + pretty-format "^28.1.1" slash "^3.0.0" stack-utils "^2.0.3" -jest-mock@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.1.tgz#19948336d49ef4d9c52021d34ac7b5f36ff967d6" - integrity sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og== +jest-mock@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.1.1.tgz#37903d269427fa1ef5b2447be874e1c62a39a371" + integrity sha512-bDCb0FjfsmKweAvE09dZT59IMkzgN0fYBH6t5S45NoJfd2DHkS3ySG2K+hucortryhO3fVuXdlxWcbtIuV/Skw== dependencies: - "@jest/types" "^27.5.1" + "@jest/types" "^28.1.1" "@types/node" "*" jest-pnp-resolver@^1.2.2: @@ -7309,191 +7250,154 @@ jest-pnp-resolver@^1.2.2: resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== -jest-regex-util@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz#4da143f7e9fd1e542d4aa69617b38e4a78365b95" - integrity sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg== - jest-regex-util@^28.0.2: version "28.0.2" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-28.0.2.tgz#afdc377a3b25fb6e80825adcf76c854e5bf47ead" integrity sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw== -jest-resolve-dependencies@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz#d811ecc8305e731cc86dd79741ee98fed06f1da8" - integrity sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg== +jest-resolve-dependencies@^28.1.2: + version "28.1.2" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.2.tgz#ca528858e0c6642d5a1dda8fc7cda10230c275bc" + integrity sha512-OXw4vbOZuyRTBi3tapWBqdyodU+T33ww5cPZORuTWkg+Y8lmsxQlVu3MWtJh6NMlKRTHQetF96yGPv01Ye7Mbg== dependencies: - "@jest/types" "^27.5.1" - jest-regex-util "^27.5.1" - jest-snapshot "^27.5.1" + jest-regex-util "^28.0.2" + jest-snapshot "^28.1.2" -jest-resolve@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.5.1.tgz#a2f1c5a0796ec18fe9eb1536ac3814c23617b384" - integrity sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw== +jest-resolve@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-28.1.1.tgz#bc2eaf384abdcc1aaf3ba7c50d1adf01e59095e5" + integrity sha512-/d1UbyUkf9nvsgdBildLe6LAD4DalgkgZcKd0nZ8XUGPyA/7fsnaQIlKVnDiuUXv/IeZhPEDrRJubVSulxrShA== dependencies: - "@jest/types" "^27.5.1" chalk "^4.0.0" graceful-fs "^4.2.9" - jest-haste-map "^27.5.1" + jest-haste-map "^28.1.1" jest-pnp-resolver "^1.2.2" - jest-util "^27.5.1" - jest-validate "^27.5.1" + jest-util "^28.1.1" + jest-validate "^28.1.1" resolve "^1.20.0" resolve.exports "^1.1.0" slash "^3.0.0" -jest-runner@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.5.1.tgz#071b27c1fa30d90540805c5645a0ec167c7b62e5" - integrity sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ== +jest-runner@^28.1.2: + version "28.1.2" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-28.1.2.tgz#f293409592a62234285a71237e38499a3554e350" + integrity sha512-6/k3DlAsAEr5VcptCMdhtRhOoYClZQmxnVMZvZ/quvPGRpN7OBQYPIC32tWSgOnbgqLXNs5RAniC+nkdFZpD4A== dependencies: - "@jest/console" "^27.5.1" - "@jest/environment" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/console" "^28.1.1" + "@jest/environment" "^28.1.2" + "@jest/test-result" "^28.1.1" + "@jest/transform" "^28.1.2" + "@jest/types" "^28.1.1" "@types/node" "*" chalk "^4.0.0" - emittery "^0.8.1" + emittery "^0.10.2" graceful-fs "^4.2.9" - jest-docblock "^27.5.1" - jest-environment-jsdom "^27.5.1" - jest-environment-node "^27.5.1" - jest-haste-map "^27.5.1" - jest-leak-detector "^27.5.1" - jest-message-util "^27.5.1" - jest-resolve "^27.5.1" - jest-runtime "^27.5.1" - jest-util "^27.5.1" - jest-worker "^27.5.1" - source-map-support "^0.5.6" + jest-docblock "^28.1.1" + jest-environment-node "^28.1.2" + jest-haste-map "^28.1.1" + jest-leak-detector "^28.1.1" + jest-message-util "^28.1.1" + jest-resolve "^28.1.1" + jest-runtime "^28.1.2" + jest-util "^28.1.1" + jest-watcher "^28.1.1" + jest-worker "^28.1.1" + source-map-support "0.5.13" throat "^6.0.1" -jest-runtime@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.5.1.tgz#4896003d7a334f7e8e4a53ba93fb9bcd3db0a1af" - integrity sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A== +jest-runtime@^28.1.2: + version "28.1.2" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-28.1.2.tgz#d68f34f814a848555a345ceda23289f14d59a688" + integrity sha512-i4w93OsWzLOeMXSi9epmakb2+3z0AchZtUQVF1hesBmcQQy4vtaql5YdVe9KexdJaVRyPDw8DoBR0j3lYsZVYw== dependencies: - "@jest/environment" "^27.5.1" - "@jest/fake-timers" "^27.5.1" - "@jest/globals" "^27.5.1" - "@jest/source-map" "^27.5.1" - "@jest/test-result" "^27.5.1" - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/environment" "^28.1.2" + "@jest/fake-timers" "^28.1.2" + "@jest/globals" "^28.1.2" + "@jest/source-map" "^28.1.2" + "@jest/test-result" "^28.1.1" + "@jest/transform" "^28.1.2" + "@jest/types" "^28.1.1" chalk "^4.0.0" cjs-module-lexer "^1.0.0" collect-v8-coverage "^1.0.0" execa "^5.0.0" glob "^7.1.3" graceful-fs "^4.2.9" - jest-haste-map "^27.5.1" - jest-message-util "^27.5.1" - jest-mock "^27.5.1" - jest-regex-util "^27.5.1" - jest-resolve "^27.5.1" - jest-snapshot "^27.5.1" - jest-util "^27.5.1" + jest-haste-map "^28.1.1" + jest-message-util "^28.1.1" + jest-mock "^28.1.1" + jest-regex-util "^28.0.2" + jest-resolve "^28.1.1" + jest-snapshot "^28.1.2" + jest-util "^28.1.1" slash "^3.0.0" strip-bom "^4.0.0" -jest-serializer@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.5.1.tgz#81438410a30ea66fd57ff730835123dea1fb1f64" - integrity sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w== +jest-snapshot@^28.1.2: + version "28.1.2" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-28.1.2.tgz#93d31b87b11b384f5946fe0767541496135f8d52" + integrity sha512-wzrieFttZYfLvrCVRJxX+jwML2YTArOUqFpCoSVy1QUapx+LlV9uLbV/mMEhYj4t7aMeE9aSQFHSvV/oNoDAMA== dependencies: - "@types/node" "*" - graceful-fs "^4.2.9" - -jest-snapshot@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.5.1.tgz#b668d50d23d38054a51b42c4039cab59ae6eb6a1" - integrity sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA== - dependencies: - "@babel/core" "^7.7.2" + "@babel/core" "^7.11.6" "@babel/generator" "^7.7.2" "@babel/plugin-syntax-typescript" "^7.7.2" "@babel/traverse" "^7.7.2" - "@babel/types" "^7.0.0" - "@jest/transform" "^27.5.1" - "@jest/types" "^27.5.1" - "@types/babel__traverse" "^7.0.4" + "@babel/types" "^7.3.3" + "@jest/expect-utils" "^28.1.1" + "@jest/transform" "^28.1.2" + "@jest/types" "^28.1.1" + "@types/babel__traverse" "^7.0.6" "@types/prettier" "^2.1.5" babel-preset-current-node-syntax "^1.0.0" chalk "^4.0.0" - expect "^27.5.1" + expect "^28.1.1" graceful-fs "^4.2.9" - jest-diff "^27.5.1" - jest-get-type "^27.5.1" - jest-haste-map "^27.5.1" - jest-matcher-utils "^27.5.1" - jest-message-util "^27.5.1" - jest-util "^27.5.1" + jest-diff "^28.1.1" + jest-get-type "^28.0.2" + jest-haste-map "^28.1.1" + jest-matcher-utils "^28.1.1" + jest-message-util "^28.1.1" + jest-util "^28.1.1" natural-compare "^1.4.0" - pretty-format "^27.5.1" - semver "^7.3.2" + pretty-format "^28.1.1" + semver "^7.3.5" -jest-util@^27.0.0: - version "27.2.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.2.0.tgz#bfccb85cfafae752257319e825a5b8d4ada470dc" - integrity sha512-T5ZJCNeFpqcLBpx+Hl9r9KoxBCUqeWlJ1Htli+vryigZVJ1vuLB9j35grEBASp4R13KFkV7jM52bBGnArpJN6A== +jest-util@^28.0.0, jest-util@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.1.1.tgz#ff39e436a1aca397c0ab998db5a51ae2b7080d05" + integrity sha512-FktOu7ca1DZSyhPAxgxB6hfh2+9zMoJ7aEQA759Z6p45NuO8mWcqujH+UdHlCm/V6JTWwDztM2ITCzU1ijJAfw== dependencies: - "@jest/types" "^27.1.1" - "@types/node" "*" - chalk "^4.0.0" - graceful-fs "^4.2.4" - is-ci "^3.0.0" - picomatch "^2.2.3" - -jest-util@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.1.tgz#3ba9771e8e31a0b85da48fe0b0891fb86c01c2f9" - integrity sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw== - dependencies: - "@jest/types" "^27.5.1" + "@jest/types" "^28.1.1" "@types/node" "*" chalk "^4.0.0" ci-info "^3.2.0" graceful-fs "^4.2.9" picomatch "^2.2.3" -jest-util@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.1.0.tgz#d54eb83ad77e1dd441408738c5a5043642823be5" - integrity sha512-qYdCKD77k4Hwkose2YBEqQk7PzUf/NSE+rutzceduFveQREeH6b+89Dc9+wjX9dAwHcgdx4yedGA3FQlU/qCTA== +jest-validate@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-28.1.1.tgz#59b7b339b3c85b5144bd0c06ad3600f503a4acc8" + integrity sha512-Kpf6gcClqFCIZ4ti5++XemYJWUPCFUW+N2gknn+KgnDf549iLul3cBuKVe1YcWRlaF8tZV8eJCap0eECOEE3Ug== dependencies: - "@jest/types" "^28.1.0" - "@types/node" "*" - chalk "^4.0.0" - ci-info "^3.2.0" - graceful-fs "^4.2.9" - picomatch "^2.2.3" - -jest-validate@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.5.1.tgz#9197d54dc0bdb52260b8db40b46ae668e04df067" - integrity sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ== - dependencies: - "@jest/types" "^27.5.1" + "@jest/types" "^28.1.1" camelcase "^6.2.0" chalk "^4.0.0" - jest-get-type "^27.5.1" + jest-get-type "^28.0.2" leven "^3.1.0" - pretty-format "^27.5.1" + pretty-format "^28.1.1" -jest-watcher@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.5.1.tgz#71bd85fb9bde3a2c2ec4dc353437971c43c642a2" - integrity sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw== +jest-watcher@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-28.1.1.tgz#533597fb3bfefd52b5cd115cd916cffd237fb60c" + integrity sha512-RQIpeZ8EIJMxbQrXpJQYIIlubBnB9imEHsxxE41f54ZwcqWLysL/A0ZcdMirf+XsMn3xfphVQVV4EW0/p7i7Ug== dependencies: - "@jest/test-result" "^27.5.1" - "@jest/types" "^27.5.1" + "@jest/test-result" "^28.1.1" + "@jest/types" "^28.1.1" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - jest-util "^27.5.1" + emittery "^0.10.2" + jest-util "^28.1.1" string-length "^4.0.1" jest-worker@^27.0.6: @@ -7505,32 +7409,24 @@ jest-worker@^27.0.6: merge-stream "^2.0.0" supports-color "^8.0.0" -jest-worker@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" - integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== +jest-worker@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.1.tgz#3480c73247171dfd01eda77200f0063ab6a3bf28" + integrity sha512-Au7slXB08C6h+xbJPp7VIb6U0XX5Kc9uel/WFc6/rcTzGiaVCBRngBExSYuXSLFPULPSYU3cJ3ybS988lNFQhQ== dependencies: "@types/node" "*" merge-stream "^2.0.0" supports-color "^8.0.0" -jest-worker@^28.1.0: - version "28.1.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.0.tgz#ced54757a035e87591e1208253a6e3aac1a855e5" - integrity sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A== +jest@^28.1.2: + version "28.1.2" + resolved "https://registry.yarnpkg.com/jest/-/jest-28.1.2.tgz#451ff24081ce31ca00b07b60c61add13aa96f8eb" + integrity sha512-Tuf05DwLeCh2cfWCQbcz9UxldoDyiR1E9Igaei5khjonKncYdc6LDfynKCEWozK0oLE3GD+xKAo2u8x/0s6GOg== dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^8.0.0" - -jest@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz#dadf33ba70a779be7a6fc33015843b51494f63fc" - integrity sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ== - dependencies: - "@jest/core" "^27.5.1" + "@jest/core" "^28.1.2" + "@jest/types" "^28.1.1" import-local "^3.0.2" - jest-cli "^27.5.1" + jest-cli "^28.1.2" js-base64@^2.1.9: version "2.6.4" @@ -7582,23 +7478,23 @@ jsdoc@~3.6.7: taffydb "2.6.2" underscore "~1.13.1" -jsdom@^16.6.0: - version "16.7.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" - integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== +jsdom@^19.0.0: + version "19.0.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-19.0.0.tgz#93e67c149fe26816d38a849ea30ac93677e16b6a" + integrity sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A== dependencies: abab "^2.0.5" - acorn "^8.2.4" + acorn "^8.5.0" acorn-globals "^6.0.0" - cssom "^0.4.4" + cssom "^0.5.0" cssstyle "^2.3.0" - data-urls "^2.0.0" - decimal.js "^10.2.1" - domexception "^2.0.1" + data-urls "^3.0.1" + decimal.js "^10.3.1" + domexception "^4.0.0" escodegen "^2.0.0" - form-data "^3.0.0" - html-encoding-sniffer "^2.0.1" - http-proxy-agent "^4.0.1" + form-data "^4.0.0" + html-encoding-sniffer "^3.0.0" + http-proxy-agent "^5.0.0" https-proxy-agent "^5.0.0" is-potential-custom-element-name "^1.0.1" nwsapi "^2.2.0" @@ -7607,13 +7503,13 @@ jsdom@^16.6.0: symbol-tree "^3.2.4" tough-cookie "^4.0.0" w3c-hr-time "^1.0.2" - w3c-xmlserializer "^2.0.0" - webidl-conversions "^6.1.0" - whatwg-encoding "^1.0.5" - whatwg-mimetype "^2.3.0" - whatwg-url "^8.5.0" - ws "^7.4.6" - xml-name-validator "^3.0.0" + w3c-xmlserializer "^3.0.0" + webidl-conversions "^7.0.0" + whatwg-encoding "^2.0.0" + whatwg-mimetype "^3.0.0" + whatwg-url "^10.0.0" + ws "^8.2.3" + xml-name-validator "^4.0.0" jsesc@^2.5.1: version "2.5.2" @@ -7668,13 +7564,6 @@ json-stable-stringify@^1.0.1: dependencies: jsonify "~0.0.0" -json5@2.x: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== - dependencies: - minimist "^1.2.5" - json5@^0.5.0: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" @@ -7846,7 +7735,7 @@ levn@^0.4.1: levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA== dependencies: prelude-ls "~1.1.2" type-check "~0.3.2" @@ -8621,9 +8510,9 @@ num2fraction@^1.2.2: integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= nwsapi@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" - integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== + version "2.2.1" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.1.tgz#10a9f268fbf4c461249ebcfe38e359aa36e2577c" + integrity sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg== object-assign@^4.0.1, object-assign@^4.1.1: version "4.1.1" @@ -9426,7 +9315,7 @@ prelude-ls@^1.2.1: prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" - integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= + integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== pretty-error@^4.0.0: version "4.0.0" @@ -9445,6 +9334,16 @@ pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.5.1: ansi-styles "^5.0.0" react-is "^17.0.1" +pretty-format@^28.0.0, pretty-format@^28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-28.1.1.tgz#f731530394e0f7fcd95aba6b43c50e02d86b95cb" + integrity sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw== + dependencies: + "@jest/schemas" "^28.0.2" + ansi-regex "^5.0.1" + ansi-styles "^5.0.0" + react-is "^18.0.0" + prettyjson@^1.2.1: version "1.2.5" resolved "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.5.tgz#ef3cfffcc70505c032abc59785884b4027031835" @@ -9502,9 +9401,9 @@ proxy-addr@~2.0.7: ipaddr.js "1.9.1" psl@^1.1.33: - version "1.8.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" - integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + version "1.9.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" + integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== pump@^3.0.0: version "3.0.0" @@ -9727,6 +9626,11 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== +react-is@^18.0.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" + integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== + react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" @@ -10372,7 +10276,7 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -"safer-buffer@>= 2.1.2 < 3": +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -10655,7 +10559,15 @@ source-map-resolve@^0.6.0: atob "^2.1.2" decode-uri-component "^0.2.0" -source-map-support@^0.5.20, source-map-support@^0.5.6, source-map-support@~0.5.20: +source-map-support@0.5.13: + version "0.5.13" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" + integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-support@^0.5.20, source-map-support@~0.5.20: version "0.5.20" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== @@ -10673,7 +10585,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.7.3, source-map@~0.7.2: +source-map@~0.7.2: version "0.7.3" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== @@ -10792,6 +10704,15 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string.prototype.matchall@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz#59370644e1db7e4c0c045277690cf7b01203c4da" @@ -11305,6 +11226,13 @@ tr46@^2.1.0: dependencies: punycode "^2.1.1" +tr46@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9" + integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA== + dependencies: + punycode "^2.1.1" + tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" @@ -11320,19 +11248,19 @@ trough@^1.0.0: resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== -ts-jest@^27.1.4: - version "27.1.4" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.1.4.tgz#84d42cf0f4e7157a52e7c64b1492c46330943e00" - integrity sha512-qjkZlVPWVctAezwsOD1OPzbZ+k7zA5z3oxII4dGdZo5ggX/PL7kvwTM0pXTr10fAtbiVpJaL3bWd502zAhpgSQ== +ts-jest@^28.0.5: + version "28.0.5" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-28.0.5.tgz#31776f768fba6dfc8c061d488840ed0c8eeac8b9" + integrity sha512-Sx9FyP9pCY7pUzQpy4FgRZf2bhHY3za576HMKJFs+OnQ9jS96Du5vNsDKkyedQkik+sEabbKAnCliv9BEsHZgQ== dependencies: bs-logger "0.x" fast-json-stable-stringify "2.x" - jest-util "^27.0.0" - json5 "2.x" + jest-util "^28.0.0" + json5 "^2.2.1" lodash.memoize "4.x" make-error "1.x" semver "7.x" - yargs-parser "20.x" + yargs-parser "^21.0.1" ts-loader@^9.3.0: version "9.3.0" @@ -11395,7 +11323,7 @@ type-check@^0.4.0, type-check@~0.4.0: type-check@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== dependencies: prelude-ls "~1.1.2" @@ -11656,14 +11584,14 @@ v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== -v8-to-istanbul@^8.1.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz#77b752fd3975e31bbcef938f85e9bd1c7a8d60ed" - integrity sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w== +v8-to-istanbul@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4" + integrity sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w== dependencies: + "@jridgewell/trace-mapping" "^0.3.12" "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" - source-map "^0.7.3" validate-npm-package-license@^3.0.1: version "3.0.4" @@ -11708,14 +11636,14 @@ w3c-hr-time@^1.0.2: dependencies: browser-process-hrtime "^1.0.0" -w3c-xmlserializer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" - integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== +w3c-xmlserializer@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz#06cdc3eefb7e4d0b20a560a5a3aeb0d2d9a65923" + integrity sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg== dependencies: - xml-name-validator "^3.0.0" + xml-name-validator "^4.0.0" -walker@^1.0.7: +walker@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ== @@ -11780,16 +11708,16 @@ webidl-conversions@^4.0.2: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== -webidl-conversions@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" - integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== - webidl-conversions@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== +webidl-conversions@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" + integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== + webpack-assets-manifest@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/webpack-assets-manifest/-/webpack-assets-manifest-5.1.0.tgz#5af328f6c8fa760cb9a62af631a83da2b478b791" @@ -11946,17 +11874,33 @@ websocket-extensions@>=0.1.1: resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== -whatwg-encoding@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" - integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== +whatwg-encoding@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53" + integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg== dependencies: - iconv-lite "0.4.24" + iconv-lite "0.6.3" -whatwg-mimetype@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" - integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== +whatwg-mimetype@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" + integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== + +whatwg-url@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-10.0.0.tgz#37264f720b575b4a311bd4094ed8c760caaa05da" + integrity sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w== + dependencies: + tr46 "^3.0.0" + webidl-conversions "^7.0.0" + +whatwg-url@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018" + integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ== + dependencies: + tr46 "^3.0.0" + webidl-conversions "^7.0.0" whatwg-url@^5.0.0: version "5.0.0" @@ -11975,7 +11919,7 @@ whatwg-url@^7.0.0: tr46 "^1.0.1" webidl-conversions "^4.0.2" -whatwg-url@^8.0.0, whatwg-url@^8.4.0, whatwg-url@^8.5.0: +whatwg-url@^8.4.0: version "8.7.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== @@ -12059,7 +12003,7 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -write-file-atomic@^3.0.0, write-file-atomic@^3.0.3: +write-file-atomic@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== @@ -12077,20 +12021,25 @@ write-file-atomic@^4.0.1: imurmurhash "^0.1.4" signal-exit "^3.0.7" -ws@^7.3.1, ws@^7.4.6: +ws@^7.3.1: version "7.5.5" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881" integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w== +ws@^8.2.3: + version "8.8.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.0.tgz#8e71c75e2f6348dbf8d78005107297056cb77769" + integrity sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ== + ws@^8.4.2: version "8.7.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.7.0.tgz#eaf9d874b433aa00c0e0d8752532444875db3957" integrity sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg== -xml-name-validator@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" - integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== +xml-name-validator@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" + integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== xml@^1.0.1: version "1.0.1" @@ -12127,12 +12076,17 @@ yaml@^1.10.0, yaml@^1.10.2: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -yargs-parser@20.x, yargs-parser@^20.2.2, yargs-parser@^20.2.3: +yargs-parser@^20.2.2, yargs-parser@^20.2.3: version "20.2.9" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs@^16.0.3, yargs@^16.2.0: +yargs-parser@^21.0.0, yargs-parser@^21.0.1: + version "21.0.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35" + integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg== + +yargs@^16.0.3: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== @@ -12145,6 +12099,19 @@ yargs@^16.0.3, yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" +yargs@^17.3.1: + version "17.5.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e" + integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.0.0" + yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" From 94cbffc19412250d6e5b77ca6441bf08bd0504e9 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 8 Jul 2022 17:05:19 -0500 Subject: [PATCH 02/13] Add missing web push locales --- app/soapbox/service_worker/web_push_locales.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/soapbox/service_worker/web_push_locales.js b/app/soapbox/service_worker/web_push_locales.js index 1265f3cfa..941522a2d 100644 --- a/app/soapbox/service_worker/web_push_locales.js +++ b/app/soapbox/service_worker/web_push_locales.js @@ -20,6 +20,9 @@ filenames.forEach(filename => { 'notification.mention': full['notification.mention'] || '', 'notification.reblog': full['notification.reblog'] || '', 'notification.poll': full['notification.poll'] || '', + 'notification.status': full['notification.status'] || '', + 'notification.move': full['notification.move'] || '', + 'notification.user_approved': full['notification.user_approved'] || '', 'status.show_more': full['status.show_more'] || '', 'status.reblog': full['status.reblog'] || '', From 143aa119d2c48b5d8be00b265120867beb6417a7 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 8 Jul 2022 17:07:38 -0500 Subject: [PATCH 03/13] notification.chat_mention --> notification.pleroma:chat_mention --- app/soapbox/features/notifications/components/notification.tsx | 2 +- app/soapbox/locales/ar.json | 2 +- app/soapbox/locales/ast.json | 2 +- app/soapbox/locales/bg.json | 2 +- app/soapbox/locales/bn.json | 2 +- app/soapbox/locales/br.json | 2 +- app/soapbox/locales/ca.json | 2 +- app/soapbox/locales/co.json | 2 +- app/soapbox/locales/cs.json | 2 +- app/soapbox/locales/cy.json | 2 +- app/soapbox/locales/da.json | 2 +- app/soapbox/locales/de.json | 2 +- app/soapbox/locales/defaultMessages.json | 2 +- app/soapbox/locales/el.json | 2 +- app/soapbox/locales/en-Shaw.json | 2 +- app/soapbox/locales/en.json | 2 +- app/soapbox/locales/eo.json | 2 +- app/soapbox/locales/es-AR.json | 2 +- app/soapbox/locales/es.json | 2 +- app/soapbox/locales/et.json | 2 +- app/soapbox/locales/eu.json | 2 +- app/soapbox/locales/fa.json | 2 +- app/soapbox/locales/fi.json | 2 +- app/soapbox/locales/fr.json | 2 +- app/soapbox/locales/ga.json | 2 +- app/soapbox/locales/gl.json | 2 +- app/soapbox/locales/he.json | 2 +- app/soapbox/locales/hi.json | 2 +- app/soapbox/locales/hr.json | 2 +- app/soapbox/locales/hu.json | 2 +- app/soapbox/locales/hy.json | 2 +- app/soapbox/locales/id.json | 2 +- app/soapbox/locales/io.json | 2 +- app/soapbox/locales/it.json | 2 +- app/soapbox/locales/ja.json | 2 +- app/soapbox/locales/ka.json | 2 +- app/soapbox/locales/kk.json | 2 +- app/soapbox/locales/ko.json | 2 +- app/soapbox/locales/lt.json | 2 +- app/soapbox/locales/lv.json | 2 +- app/soapbox/locales/mk.json | 2 +- app/soapbox/locales/ms.json | 2 +- app/soapbox/locales/nl.json | 2 +- app/soapbox/locales/nn.json | 2 +- app/soapbox/locales/no.json | 2 +- app/soapbox/locales/oc.json | 2 +- app/soapbox/locales/pl.json | 2 +- app/soapbox/locales/pt-BR.json | 2 +- app/soapbox/locales/pt.json | 2 +- app/soapbox/locales/ro.json | 2 +- app/soapbox/locales/ru.json | 2 +- app/soapbox/locales/sk.json | 2 +- app/soapbox/locales/sl.json | 2 +- app/soapbox/locales/sq.json | 2 +- app/soapbox/locales/sr-Latn.json | 2 +- app/soapbox/locales/sr.json | 2 +- app/soapbox/locales/sv.json | 2 +- app/soapbox/locales/ta.json | 2 +- app/soapbox/locales/te.json | 2 +- app/soapbox/locales/th.json | 2 +- app/soapbox/locales/tr.json | 2 +- app/soapbox/locales/uk.json | 2 +- app/soapbox/locales/zh-CN.json | 2 +- app/soapbox/locales/zh-HK.json | 2 +- app/soapbox/locales/zh-TW.json | 2 +- 65 files changed, 65 insertions(+), 65 deletions(-) diff --git a/app/soapbox/features/notifications/components/notification.tsx b/app/soapbox/features/notifications/components/notification.tsx index 4b67e5645..1215a138c 100644 --- a/app/soapbox/features/notifications/components/notification.tsx +++ b/app/soapbox/features/notifications/components/notification.tsx @@ -82,7 +82,7 @@ const messages: Record = defineMess defaultMessage: '{name} moved to {targetName}', }, 'pleroma:chat_mention': { - id: 'notification.chat_mention', + id: 'notification.pleroma:chat_mention', defaultMessage: '{name} sent you a message', }, 'pleroma:emoji_reaction': { diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json index d1e705697..a508846d9 100644 --- a/app/soapbox/locales/ar.json +++ b/app/soapbox/locales/ar.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "أُعجِب {name} بمنشورك", "notification.follow": "{name} يتابعك", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/ast.json b/app/soapbox/locales/ast.json index ef5c65bd9..8ddb7bcaa 100644 --- a/app/soapbox/locales/ast.json +++ b/app/soapbox/locales/ast.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} siguióte", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/bg.json b/app/soapbox/locales/bg.json index 4e937e97c..296e6b6b3 100644 --- a/app/soapbox/locales/bg.json +++ b/app/soapbox/locales/bg.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} хареса твоята публикация", "notification.follow": "{name} те последва", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/bn.json b/app/soapbox/locales/bn.json index c030722fa..adc441285 100644 --- a/app/soapbox/locales/bn.json +++ b/app/soapbox/locales/bn.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} আপনার কার্যক্রম পছন্দ করেছেন", "notification.follow": "{name} আপনাকে অনুসরণ করেছেন", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/br.json b/app/soapbox/locales/br.json index 9bec55d5b..4ee233e15 100644 --- a/app/soapbox/locales/br.json +++ b/app/soapbox/locales/br.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/ca.json b/app/soapbox/locales/ca.json index e36ad89bc..3007d4446 100644 --- a/app/soapbox/locales/ca.json +++ b/app/soapbox/locales/ca.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} t'ha enviat un missatge", + "notification.pleroma:chat_mention": "{name} t'ha enviat un missatge", "notification.favourite": "{name} ha afavorit el teu estat", "notification.follow": "{name} t'ha seguit", "notification.follow_request": "{name} ha sol·licitat seguir-te", diff --git a/app/soapbox/locales/co.json b/app/soapbox/locales/co.json index 79214836a..d57318943 100644 --- a/app/soapbox/locales/co.json +++ b/app/soapbox/locales/co.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} hà aghjuntu u vostru statutu à i so favuriti", "notification.follow": "{name} v'hà seguitatu", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/cs.json b/app/soapbox/locales/cs.json index 155e1fa95..3e5e5c77a 100644 --- a/app/soapbox/locales/cs.json +++ b/app/soapbox/locales/cs.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} Vám poslal/a zprávu", + "notification.pleroma:chat_mention": "{name} Vám poslal/a zprávu", "notification.favourite": "{name} si oblíbil/a váš příspěvek", "notification.follow": "{name} vás začal/a sledovat", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/cy.json b/app/soapbox/locales/cy.json index bfc9c701b..b27bbc575 100644 --- a/app/soapbox/locales/cy.json +++ b/app/soapbox/locales/cy.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "hoffodd {name} eich tŵt", "notification.follow": "dilynodd {name} chi", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/da.json b/app/soapbox/locales/da.json index a935d51cf..16ac072a2 100644 --- a/app/soapbox/locales/da.json +++ b/app/soapbox/locales/da.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favoriserede din status", "notification.follow": "{name} fulgte dig", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json index 366373390..2fcb8e5f0 100644 --- a/app/soapbox/locales/de.json +++ b/app/soapbox/locales/de.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} hat dir eine Nachricht gesendet", + "notification.pleroma:chat_mention": "{name} hat dir eine Nachricht gesendet", "notification.favourite": "{name} hat deinen Beitrag favorisiert", "notification.follow": "{name} folgt dir", "notification.follow_request": "{name} möchte dir folgen", diff --git a/app/soapbox/locales/defaultMessages.json b/app/soapbox/locales/defaultMessages.json index e9c48411f..c5730c2e8 100644 --- a/app/soapbox/locales/defaultMessages.json +++ b/app/soapbox/locales/defaultMessages.json @@ -4318,7 +4318,7 @@ }, { "defaultMessage": "{name} sent you a message", - "id": "notification.chat_mention" + "id": "notification.pleroma:chat_mention" }, { "defaultMessage": "{name} reacted to your post", diff --git a/app/soapbox/locales/el.json b/app/soapbox/locales/el.json index b601e68e8..9ee73f0df 100644 --- a/app/soapbox/locales/el.json +++ b/app/soapbox/locales/el.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "Ο/Η {name} σημείωσε ως αγαπημένη την κατάστασή σου", "notification.follow": "Ο/Η {name} σε ακολούθησε", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/en-Shaw.json b/app/soapbox/locales/en-Shaw.json index 027855309..bf0663c44 100644 --- a/app/soapbox/locales/en-Shaw.json +++ b/app/soapbox/locales/en-Shaw.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑥𐑧𐑕𐑦𐑡", + "notification.pleroma:chat_mention": "{name} 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑥𐑧𐑕𐑦𐑡", "notification.favourite": "{name} 𐑤𐑲𐑒𐑑 𐑘𐑹 𐑐𐑴𐑕𐑑", "notification.follow": "{name} 𐑓𐑪𐑤𐑴𐑛 𐑿", "notification.follow_request": "{name} 𐑣𐑨𐑟 𐑮𐑦𐑒𐑢𐑧𐑕𐑑𐑩𐑛 𐑑 𐑓𐑪𐑤𐑴 𐑿", diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json index 9a1af5b43..2d226e81d 100644 --- a/app/soapbox/locales/en.json +++ b/app/soapbox/locales/en.json @@ -712,7 +712,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} liked your post", "notification.follow": "{name} followed you", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/eo.json b/app/soapbox/locales/eo.json index 4c3bd6166..7b4b89c5f 100644 --- a/app/soapbox/locales/eo.json +++ b/app/soapbox/locales/eo.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} stelumis vian mesaĝon", "notification.follow": "{name} eksekvis vin", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/es-AR.json b/app/soapbox/locales/es-AR.json index eb56879a0..8590459b6 100644 --- a/app/soapbox/locales/es-AR.json +++ b/app/soapbox/locales/es-AR.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} marcó tu estado como favorito", "notification.follow": "{name} te empezó a seguir", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json index c4a3e99cb..9c8e6432a 100644 --- a/app/soapbox/locales/es.json +++ b/app/soapbox/locales/es.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} marcó tu estado como favorito", "notification.follow": "{name} te empezó a seguir", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/et.json b/app/soapbox/locales/et.json index 636be30e0..954dbb96c 100644 --- a/app/soapbox/locales/et.json +++ b/app/soapbox/locales/et.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} märkis su staatuse lemmikuks", "notification.follow": "{name} jälgib sind", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/eu.json b/app/soapbox/locales/eu.json index a16e4332b..3041d4be7 100644 --- a/app/soapbox/locales/eu.json +++ b/app/soapbox/locales/eu.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name}(e)k zure mezua gogoko du", "notification.follow": "{name}(e)k jarraitzen zaitu", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/fa.json b/app/soapbox/locales/fa.json index b9e9da44d..2b65e24c7 100644 --- a/app/soapbox/locales/fa.json +++ b/app/soapbox/locales/fa.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "‫{name}‬ نوشتهٔ شما را پسندید", "notification.follow": "‫{name}‬ پیگیر شما شد", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/fi.json b/app/soapbox/locales/fi.json index d806c2fc6..b8896b3f9 100644 --- a/app/soapbox/locales/fi.json +++ b/app/soapbox/locales/fi.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} tykkäsi tilastasi", "notification.follow": "{name} seurasi sinua", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/fr.json b/app/soapbox/locales/fr.json index 373c89021..3c7d73308 100644 --- a/app/soapbox/locales/fr.json +++ b/app/soapbox/locales/fr.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} a ajouté à ses favoris :", "notification.follow": "{name} vous suit", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json index eb21a107f..0cf874018 100644 --- a/app/soapbox/locales/ga.json +++ b/app/soapbox/locales/ga.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/gl.json b/app/soapbox/locales/gl.json index 3ea35cb9f..95ee2cbbc 100644 --- a/app/soapbox/locales/gl.json +++ b/app/soapbox/locales/gl.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} marcou como favorito o seu estado", "notification.follow": "{name} está a seguila", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/he.json b/app/soapbox/locales/he.json index 66d636c1d..7b20f137a 100644 --- a/app/soapbox/locales/he.json +++ b/app/soapbox/locales/he.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} שלח לך הודעה", + "notification.pleroma:chat_mention": "{name} שלח לך הודעה", "notification.favourite": "הפוסט שלך חובב על ידי {name}", "notification.follow": "{name} במעקב אחרייך", "notification.follow_request": "{name} ביקש לעקוב אחריך", diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json index cbc84692c..26deafba5 100644 --- a/app/soapbox/locales/hi.json +++ b/app/soapbox/locales/hi.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json index ca5451121..68e3fe114 100644 --- a/app/soapbox/locales/hr.json +++ b/app/soapbox/locales/hr.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} je lajkao tvoj status", "notification.follow": "{name} te sada slijedi", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/hu.json b/app/soapbox/locales/hu.json index 0d5b56411..032c16b8d 100644 --- a/app/soapbox/locales/hu.json +++ b/app/soapbox/locales/hu.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} kedvencnek jelölte egy tülködet", "notification.follow": "{name} követ téged", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/hy.json b/app/soapbox/locales/hy.json index c2638e2d4..cabc205ad 100644 --- a/app/soapbox/locales/hy.json +++ b/app/soapbox/locales/hy.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} հավանեց թութդ", "notification.follow": "{name} սկսեց հետեւել քեզ", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/id.json b/app/soapbox/locales/id.json index 904f73cc5..6d86cbb8c 100644 --- a/app/soapbox/locales/id.json +++ b/app/soapbox/locales/id.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} menyukai status anda", "notification.follow": "{name} mengikuti anda", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json index f85f36a5a..5c351dc99 100644 --- a/app/soapbox/locales/io.json +++ b/app/soapbox/locales/io.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorizis tua mesajo", "notification.follow": "{name} sequeskis tu", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json index 6972de6c1..8f03e6a7d 100644 --- a/app/soapbox/locales/it.json +++ b/app/soapbox/locales/it.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} oggi festeggia il compleanno", "notification.birthday.more": "{count} e {count, plural, un {friend} più {friends}}", "notification.birthday_plural": "{name} e {more} oggi festeggiano il compleanno", - "notification.chat_mention": "{name} ti ha spedito un messaggio", + "notification.pleroma:chat_mention": "{name} ti ha spedito un messaggio", "notification.favourite": "{name} ha apprezzato il contenuto", "notification.follow": "{name} adesso ti segue", "notification.follow_request": "{name} ha chiesto di seguirti", diff --git a/app/soapbox/locales/ja.json b/app/soapbox/locales/ja.json index 931c89326..c40c65de3 100644 --- a/app/soapbox/locales/ja.json +++ b/app/soapbox/locales/ja.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name}さんがあなたにメッセージを送りました", + "notification.pleroma:chat_mention": "{name}さんがあなたにメッセージを送りました", "notification.favourite": "{name}さんがあなたの投稿をお気に入りに登録しました", "notification.follow": "{name}さんにフォローされました", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/ka.json b/app/soapbox/locales/ka.json index 950b4e69c..d0146522d 100644 --- a/app/soapbox/locales/ka.json +++ b/app/soapbox/locales/ka.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name}-მა თქვენი სტატუსი აქცია ფავორიტად", "notification.follow": "{name} გამოგყვათ", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/kk.json b/app/soapbox/locales/kk.json index 40f4f25ac..8620007e2 100644 --- a/app/soapbox/locales/kk.json +++ b/app/soapbox/locales/kk.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} жазбаңызды таңдаулыға қосты", "notification.follow": "{name} сізге жазылды", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/ko.json b/app/soapbox/locales/ko.json index 55bc1e1bb..25b771202 100644 --- a/app/soapbox/locales/ko.json +++ b/app/soapbox/locales/ko.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name}님이 즐겨찾기 했습니다", "notification.follow": "{name}님이 나를 팔로우 했습니다", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json index ff62cbf65..27c086ab8 100644 --- a/app/soapbox/locales/lt.json +++ b/app/soapbox/locales/lt.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/lv.json b/app/soapbox/locales/lv.json index c97bca375..51352659c 100644 --- a/app/soapbox/locales/lv.json +++ b/app/soapbox/locales/lv.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/mk.json b/app/soapbox/locales/mk.json index 8d017fb27..c8919a214 100644 --- a/app/soapbox/locales/mk.json +++ b/app/soapbox/locales/mk.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json index dc75e0a32..b6e701fcd 100644 --- a/app/soapbox/locales/ms.json +++ b/app/soapbox/locales/ms.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/nl.json b/app/soapbox/locales/nl.json index 47795ef3d..0e3ea550c 100644 --- a/app/soapbox/locales/nl.json +++ b/app/soapbox/locales/nl.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} voegde jouw toot als favoriet toe", "notification.follow": "{name} volgt jou nu", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/nn.json b/app/soapbox/locales/nn.json index 26e4c3134..62adfaba4 100644 --- a/app/soapbox/locales/nn.json +++ b/app/soapbox/locales/nn.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} likte din status", "notification.follow": "{name} fulgte deg", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json index fe86be051..827d16b33 100644 --- a/app/soapbox/locales/no.json +++ b/app/soapbox/locales/no.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} likte din status", "notification.follow": "{name} fulgte deg", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/oc.json b/app/soapbox/locales/oc.json index 64b471abc..6ba11c35d 100644 --- a/app/soapbox/locales/oc.json +++ b/app/soapbox/locales/oc.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} a ajustat a sos favorits", "notification.follow": "{name} vos sèc", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json index 1184a91f6..6e31746f7 100644 --- a/app/soapbox/locales/pl.json +++ b/app/soapbox/locales/pl.json @@ -749,7 +749,7 @@ "notification.birthday": "{name} ma dziś urodziny", "notification.birthday.more": "{count} {count, plural, one {znajomy} other {więcej znajomych}}", "notification.birthday_plural": "{name} i {more} mają dziś urodziny", - "notification.chat_mention": "{name} wysłał(a) Ci wiadomośść", + "notification.pleroma:chat_mention": "{name} wysłał(a) Ci wiadomośść", "notification.favourite": "{name} dodał(a) Twój wpis do ulubionych", "notification.follow": "{name} zaczął(-ęła) Cię śledzić", "notification.follow_request": "{name} poprosił(a) Cię o możliwość śledzenia", diff --git a/app/soapbox/locales/pt-BR.json b/app/soapbox/locales/pt-BR.json index f0b0a19df..76b2e4b84 100644 --- a/app/soapbox/locales/pt-BR.json +++ b/app/soapbox/locales/pt-BR.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} adicionou a sua postagem aos favoritos", "notification.follow": "{name} te seguiu", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/pt.json b/app/soapbox/locales/pt.json index 4cc86daad..5c8c51bb9 100644 --- a/app/soapbox/locales/pt.json +++ b/app/soapbox/locales/pt.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} enviou-te uma mensagem", + "notification.pleroma:chat_mention": "{name} enviou-te uma mensagem", "notification.favourite": "{name} gostou desta publicação", "notification.follow": "{name} começou a seguir-te", "notification.follow_request": "{name} pediu para te seguir", diff --git a/app/soapbox/locales/ro.json b/app/soapbox/locales/ro.json index 2f49f24ce..488ce486a 100644 --- a/app/soapbox/locales/ro.json +++ b/app/soapbox/locales/ro.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} a adăugat statusul tău la favorite", "notification.follow": "{name} te urmărește", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json index b4d0b3e2d..90b3827b0 100644 --- a/app/soapbox/locales/ru.json +++ b/app/soapbox/locales/ru.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} понравился Ваш статус", "notification.follow": "{name} подписался (-лась) на вас", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/sk.json b/app/soapbox/locales/sk.json index 7a81a02c4..023f86526 100644 --- a/app/soapbox/locales/sk.json +++ b/app/soapbox/locales/sk.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} si obľúbil/a tvoj príspevok", "notification.follow": "{name} ťa začal/a následovať", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/sl.json b/app/soapbox/locales/sl.json index d1710325d..30a90754b 100644 --- a/app/soapbox/locales/sl.json +++ b/app/soapbox/locales/sl.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} je vzljubil/a vaš status", "notification.follow": "{name} vam sledi", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/sq.json b/app/soapbox/locales/sq.json index 1c0a23d21..494b9ce8d 100644 --- a/app/soapbox/locales/sq.json +++ b/app/soapbox/locales/sq.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} parapëlqeu gjendjen tuaj", "notification.follow": "{name} zuri t’ju ndjekë", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json index ccf0c8ef1..952e0d360 100644 --- a/app/soapbox/locales/sr-Latn.json +++ b/app/soapbox/locales/sr-Latn.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} je stavio Vaš status kao omiljeni", "notification.follow": "{name} Vas je zapratio", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/sr.json b/app/soapbox/locales/sr.json index 140a2738c..b9e8d84ac 100644 --- a/app/soapbox/locales/sr.json +++ b/app/soapbox/locales/sr.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} је ставио/ла Ваш статус као омиљени", "notification.follow": "{name} Вас је запратио/ла", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/sv.json b/app/soapbox/locales/sv.json index a57d57e8f..dedaa4651 100644 --- a/app/soapbox/locales/sv.json +++ b/app/soapbox/locales/sv.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} favoriserade din status", "notification.follow": "{name} följer dig", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/ta.json b/app/soapbox/locales/ta.json index 69c44f84f..536bff964 100644 --- a/app/soapbox/locales/ta.json +++ b/app/soapbox/locales/ta.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} ஆர்வம் கொண்டவர், உங்கள் நிலை", "notification.follow": "{name} நீங்கள் தொடர்ந்து வந்தீர்கள்", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/te.json b/app/soapbox/locales/te.json index 6b34989f9..1e1311a4b 100644 --- a/app/soapbox/locales/te.json +++ b/app/soapbox/locales/te.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} మీ స్టేటస్ ను ఇష్టపడ్డారు", "notification.follow": "{name} మిమ్మల్ని అనుసరిస్తున్నారు", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/th.json b/app/soapbox/locales/th.json index c509dd4a3..cfc6d8396 100644 --- a/app/soapbox/locales/th.json +++ b/app/soapbox/locales/th.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} ได้ชื่นชอบสถานะของคุณ", "notification.follow": "{name} ได้ติดตามคุณ", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json index 45c7c02b0..2cb0e84dc 100644 --- a/app/soapbox/locales/tr.json +++ b/app/soapbox/locales/tr.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} senin durumunu favorilere ekledi", "notification.follow": "{name} seni takip ediyor", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json index bf601a95b..fb950161d 100644 --- a/app/soapbox/locales/uk.json +++ b/app/soapbox/locales/uk.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} вподобав(-ла) ваш допис", "notification.follow": "{name} підписався(-лась) на Вас", "notification.follow_request": "{name} відправив(-ла) запит на підписку", diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json index 0ec6a2e0f..7a5aeb1f1 100644 --- a/app/soapbox/locales/zh-CN.json +++ b/app/soapbox/locales/zh-CN.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} 回复了你", + "notification.pleroma:chat_mention": "{name} 回复了你", "notification.favourite": "{name} 赞了你的帖文", "notification.follow": "{name} 开始关注你", "notification.follow_request": "{name} 请求关注你", diff --git a/app/soapbox/locales/zh-HK.json b/app/soapbox/locales/zh-HK.json index b163f6675..65462c72f 100644 --- a/app/soapbox/locales/zh-HK.json +++ b/app/soapbox/locales/zh-HK.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} 收藏了你的文章", "notification.follow": "{name} 開始關注你", "notification.follow_request": "{name} has requested to follow you", diff --git a/app/soapbox/locales/zh-TW.json b/app/soapbox/locales/zh-TW.json index 5eade39d5..09ba5c840 100644 --- a/app/soapbox/locales/zh-TW.json +++ b/app/soapbox/locales/zh-TW.json @@ -706,7 +706,7 @@ "notification.birthday": "{name} has a birthday today", "notification.birthday.more": "{count} more {count, plural, one {friend} other {friends}}", "notification.birthday_plural": "{name} and {more} have birthday today", - "notification.chat_mention": "{name} sent you a message", + "notification.pleroma:chat_mention": "{name} sent you a message", "notification.favourite": "{name} 把你的嘟文加入了最愛", "notification.follow": "{name} 關注了你", "notification.follow_request": "{name} has requested to follow you", From 48bd46cf926bf30253435b89b6c98f1dc9e5e6ee Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 8 Jul 2022 17:08:41 -0500 Subject: [PATCH 04/13] Web push locales: add pleroma locales --- app/soapbox/service_worker/web_push_locales.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/soapbox/service_worker/web_push_locales.js b/app/soapbox/service_worker/web_push_locales.js index 941522a2d..172bbe4b5 100644 --- a/app/soapbox/service_worker/web_push_locales.js +++ b/app/soapbox/service_worker/web_push_locales.js @@ -24,6 +24,9 @@ filenames.forEach(filename => { 'notification.move': full['notification.move'] || '', 'notification.user_approved': full['notification.user_approved'] || '', + 'notification.pleroma:chat_mention': full['notification.pleroma:chat_mention'] || '', + 'notification.pleroma:emoji_reaction': full['notification.pleroma:emoji_reaction'] || '', + 'status.show_more': full['status.show_more'] || '', 'status.reblog': full['status.reblog'] || '', 'status.favourite': full['status.favourite'] || '', From b10dc7ea6e71b422c8cf6484193b612f302c6c46 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 8 Jul 2022 17:20:41 -0500 Subject: [PATCH 05/13] Notification: fix ariaLabel crash --- .../notifications/components/notification.tsx | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/app/soapbox/features/notifications/components/notification.tsx b/app/soapbox/features/notifications/components/notification.tsx index 1215a138c..268539dd2 100644 --- a/app/soapbox/features/notifications/components/notification.tsx +++ b/app/soapbox/features/notifications/components/notification.tsx @@ -14,7 +14,7 @@ import type { ScrollPosition } from 'soapbox/components/status'; import type { NotificationType } from 'soapbox/normalizers/notification'; import type { Account, Status, Notification as NotificationEntity } from 'soapbox/types/entities'; -const notificationForScreenReader = (intl: ReturnType, message: string, timestamp: Date) => { +const notificationForScreenReader = (intl: IntlShape, message: string, timestamp: Date) => { const output = [message]; output.push(intl.formatDate(timestamp, { hour: '2-digit', minute: '2-digit', month: 'short', day: 'numeric' })); @@ -281,25 +281,24 @@ const Notification: React.FC = (props) => { const message: React.ReactNode = type && account && typeof account === 'object' ? buildMessage(intl, type, account, notification.total_count, targetName, instance.title) : null; + const ariaLabel = messages[type] ? ( + notificationForScreenReader( + intl, + intl.formatMessage(messages[type], + { + name: account && typeof account === 'object' ? account.acct : '', + targetName, + }), + notification.created_at, + ) + ) : ''; + return (
From 463c9fc9f5b0259766358dc55abbd1029626a604 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 8 Jul 2022 17:49:30 -0500 Subject: [PATCH 06/13] Please the linter gods --- app/soapbox/features/notifications/components/notification.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/soapbox/features/notifications/components/notification.tsx b/app/soapbox/features/notifications/components/notification.tsx index 268539dd2..b413517e6 100644 --- a/app/soapbox/features/notifications/components/notification.tsx +++ b/app/soapbox/features/notifications/components/notification.tsx @@ -284,8 +284,7 @@ const Notification: React.FC = (props) => { const ariaLabel = messages[type] ? ( notificationForScreenReader( intl, - intl.formatMessage(messages[type], - { + intl.formatMessage(messages[type], { name: account && typeof account === 'object' ? account.acct : '', targetName, }), From 627e6c574ff9ff72418e2058eb5c05da5ad5ee9d Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 8 Jul 2022 17:52:39 -0500 Subject: [PATCH 07/13] Drop invalid notifications --- app/soapbox/actions/notifications.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/app/soapbox/actions/notifications.ts b/app/soapbox/actions/notifications.ts index 0e396b89a..adeb46bf9 100644 --- a/app/soapbox/actions/notifications.ts +++ b/app/soapbox/actions/notifications.ts @@ -89,6 +89,7 @@ const updateNotifications = (notification: APIEntity) => const updateNotificationsQueue = (notification: APIEntity, intlMessages: Record, intlLocale: string, curPath: string) => (dispatch: AppDispatch, getState: () => RootState) => { + if (!notification.type) return; // drop invalid notifications if (notification.type === 'pleroma:chat_mention') return; // Drop chat notifications, handle them per-chat const showAlert = getSettings(getState()).getIn(['notifications', 'alerts', notification.type]); From f66d65924a9852f29b115003a5a2e5d6cafe9f81 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 8 Jul 2022 18:09:57 -0500 Subject: [PATCH 08/13] Better enforcement of notification types --- .../notifications/components/notification.tsx | 10 ++++---- app/soapbox/normalizers/notification.ts | 15 +---------- app/soapbox/utils/notification.ts | 25 +++++++++++++++++++ 3 files changed, 31 insertions(+), 19 deletions(-) create mode 100644 app/soapbox/utils/notification.ts diff --git a/app/soapbox/features/notifications/components/notification.tsx b/app/soapbox/features/notifications/components/notification.tsx index b413517e6..a6e7e9514 100644 --- a/app/soapbox/features/notifications/components/notification.tsx +++ b/app/soapbox/features/notifications/components/notification.tsx @@ -9,9 +9,9 @@ import { HStack, Text, Emoji } from 'soapbox/components/ui'; import AccountContainer from 'soapbox/containers/account_container'; import StatusContainer from 'soapbox/containers/status_container'; import { useAppSelector } from 'soapbox/hooks'; +import { NotificationType, validType } from 'soapbox/utils/notification'; import type { ScrollPosition } from 'soapbox/components/status'; -import type { NotificationType } from 'soapbox/normalizers/notification'; import type { Account, Status, Notification as NotificationEntity } from 'soapbox/types/entities'; const notificationForScreenReader = (intl: IntlShape, message: string, timestamp: Date) => { @@ -48,7 +48,7 @@ const icons: Record = { user_approved: require('@tabler/icons/icons/user-plus.svg'), }; -const messages: Record = defineMessages({ +const messages: Record = defineMessages({ follow: { id: 'notification.follow', defaultMessage: '{name} followed you', @@ -221,7 +221,7 @@ const Notification: React.FC = (props) => { className='w-4 h-4 flex-none' /> ); - } else if (type) { + } else if (validType(type)) { return ( = (props) => { const targetName = notification.target && typeof notification.target === 'object' ? notification.target.acct : ''; - const message: React.ReactNode = type && account && typeof account === 'object' ? buildMessage(intl, type, account, notification.total_count, targetName, instance.title) : null; + const message: React.ReactNode = validType(type) && account && typeof account === 'object' ? buildMessage(intl, type, account, notification.total_count, targetName, instance.title) : null; - const ariaLabel = messages[type] ? ( + const ariaLabel = validType(type) ? ( notificationForScreenReader( intl, intl.formatMessage(messages[type], { diff --git a/app/soapbox/normalizers/notification.ts b/app/soapbox/normalizers/notification.ts index 2bac3f2b3..9b34278b6 100644 --- a/app/soapbox/normalizers/notification.ts +++ b/app/soapbox/normalizers/notification.ts @@ -11,19 +11,6 @@ import { import type { Account, Status, EmbeddedEntity } from 'soapbox/types/entities'; -export type NotificationType = - 'follow' - | 'follow_request' - | 'mention' - | 'reblog' - | 'favourite' - | 'poll' - | 'status' - | 'move' - | 'pleroma:chat_mention' - | 'pleroma:emoji_reaction' - | 'user_approved'; - // https://docs.joinmastodon.org/entities/notification/ export const NotificationRecord = ImmutableRecord({ account: null as EmbeddedEntity, @@ -33,7 +20,7 @@ export const NotificationRecord = ImmutableRecord({ id: '', status: null as EmbeddedEntity, target: null as EmbeddedEntity, // move - type: '' as NotificationType | '', + type: '', total_count: null as number | null, // grouped notifications }); diff --git a/app/soapbox/utils/notification.ts b/app/soapbox/utils/notification.ts new file mode 100644 index 000000000..635d16f29 --- /dev/null +++ b/app/soapbox/utils/notification.ts @@ -0,0 +1,25 @@ +/** Notification types known to Soapbox. */ +const NOTIFICATION_TYPES = [ + 'follow', + 'follow_request', + 'mention', + 'reblog', + 'favourite', + 'poll', + 'status', + 'move', + 'pleroma:chat_mention', + 'pleroma:emoji_reaction', + 'user_approved', +] as const; + +type NotificationType = typeof NOTIFICATION_TYPES[number]; + +/** Ensure the Notification is a valid, known type. */ +const validType = (type: string): type is NotificationType => NOTIFICATION_TYPES.includes(type as any); + +export { + NOTIFICATION_TYPES, + NotificationType, + validType, +}; From 018117049ee31fa3ce2aaa503793bd9eda41e570 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 8 Jul 2022 18:33:10 -0500 Subject: [PATCH 09/13] Update icons in notifications filter bar --- app/soapbox/features/notifications/components/filter_bar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/soapbox/features/notifications/components/filter_bar.js b/app/soapbox/features/notifications/components/filter_bar.js index 6384b7788..70b919de3 100644 --- a/app/soapbox/features/notifications/components/filter_bar.js +++ b/app/soapbox/features/notifications/components/filter_bar.js @@ -57,7 +57,7 @@ class NotificationFilterBar extends React.PureComponent { name: 'mention', }); items.push({ - text: , + text: , title: intl.formatMessage(messages.favourites), action: this.onClick('favourite'), name: 'favourite', @@ -81,7 +81,7 @@ class NotificationFilterBar extends React.PureComponent { name: 'poll', }); items.push({ - text: , + text: , title: intl.formatMessage(messages.statuses), action: this.onClick('status'), name: 'status', From 6ddb44f626c60d30efe02e401232cdc1fd19c3c0 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 9 Jul 2022 11:20:02 -0500 Subject: [PATCH 10/13] Upgrade Tabler to v1.73.0, use new import paths, remove Webpack hack --- app/soapbox/actions/moderation.tsx | 10 +-- app/soapbox/components/account.tsx | 2 +- app/soapbox/components/account_search.tsx | 4 +- app/soapbox/components/birthday_input.tsx | 8 +- app/soapbox/components/display-name.tsx | 2 +- app/soapbox/components/domain.tsx | 4 +- app/soapbox/components/dropdown_menu.tsx | 2 +- app/soapbox/components/error_boundary.tsx | 2 +- app/soapbox/components/list.tsx | 2 +- app/soapbox/components/media_gallery.js | 6 +- app/soapbox/components/modal_root.js | 2 +- app/soapbox/components/polls/poll-option.tsx | 4 +- app/soapbox/components/quoted-status.tsx | 2 +- app/soapbox/components/scroll-top-button.tsx | 2 +- app/soapbox/components/sidebar-navigation.tsx | 28 +++---- app/soapbox/components/sidebar_menu.tsx | 32 ++++---- app/soapbox/components/status.tsx | 6 +- app/soapbox/components/status_action_bar.tsx | 68 +++++++-------- app/soapbox/components/thumb_navigation.tsx | 12 +-- app/soapbox/components/ui/card/card.tsx | 2 +- .../ui/icon/__tests__/svg-icon.test.tsx | 2 +- app/soapbox/components/ui/input/input.tsx | 2 +- app/soapbox/components/ui/modal/modal.tsx | 2 +- .../components/ui/streamfield/streamfield.tsx | 4 +- app/soapbox/components/ui/widget/widget.tsx | 2 +- app/soapbox/components/upload-progress.tsx | 2 +- .../components/validation-checkmark.tsx | 2 +- app/soapbox/containers/account_container.js | 2 +- app/soapbox/containers/status_container.js | 4 +- .../features/account/components/header.js | 82 +++++++++---------- .../components/column_settings.js | 2 +- .../containers/header_container.js | 4 +- .../features/admin/components/report.tsx | 6 +- .../admin/components/report_status.tsx | 6 +- .../admin/components/unapproved_account.tsx | 4 +- .../features/aliases/components/account.tsx | 2 +- .../features/aliases/components/search.tsx | 2 +- app/soapbox/features/audio/index.js | 6 +- app/soapbox/features/auth_layout/index.tsx | 2 +- .../components/registration_form.tsx | 2 +- app/soapbox/features/backups/index.tsx | 2 +- app/soapbox/features/birthdays/account.tsx | 2 +- .../features/chats/components/chat-box.tsx | 4 +- .../chats/components/chat-message-list.tsx | 6 +- .../features/chats/components/chat-window.tsx | 2 +- .../features/chats/components/chat.tsx | 2 +- .../components/column_settings.js | 2 +- .../compose/components/compose_form.js | 4 +- .../components/emoji_picker_dropdown.js | 2 +- .../compose/components/markdown_button.tsx | 2 +- .../compose/components/poll_button.tsx | 2 +- .../compose/components/privacy_dropdown.tsx | 8 +- .../compose/components/reply_indicator.tsx | 2 +- .../compose/components/schedule_button.tsx | 2 +- .../compose/components/schedule_form.tsx | 2 +- .../features/compose/components/search.tsx | 6 +- .../compose/components/spoiler_button.tsx | 2 +- .../features/compose/components/upload.tsx | 18 ++-- .../compose/components/upload_button.tsx | 4 +- .../components/crypto_address.tsx | 4 +- .../components/detailed_crypto_address.tsx | 2 +- .../features/developers/developers_menu.tsx | 12 +-- .../components/instance_restrictions.js | 8 +- .../components/restricted_instance.tsx | 2 +- .../features/feed-filtering/feed-carousel.tsx | 6 +- .../components/account_authorize.tsx | 4 +- .../features/groups/removed_accounts/index.js | 2 +- .../groups/timeline/components/header.js | 6 +- .../components/column_settings.js | 2 +- .../features/list_adder/components/list.tsx | 6 +- .../list_editor/components/account.tsx | 4 +- .../list_editor/components/search.tsx | 2 +- app/soapbox/features/list_timeline/index.tsx | 2 +- app/soapbox/features/lists/index.tsx | 6 +- .../components/clear_column_button.js | 2 +- .../components/column_settings.js | 2 +- .../notifications/components/filter_bar.js | 12 +-- .../components/follow_request.js | 4 +- .../notifications/components/notification.tsx | 22 ++--- .../containers/column_settings_container.js | 2 +- .../steps/avatar-selection-step.tsx | 2 +- .../onboarding/steps/completed-step.tsx | 2 +- .../steps/cover-photo-selection-step.tsx | 2 +- .../public_layout/components/header.tsx | 4 +- .../components/column_settings.js | 2 +- .../features/remote_timeline/index.tsx | 2 +- .../features/reply_mentions/account.tsx | 4 +- .../scheduled_status_action_bar.tsx | 4 +- .../features/status/components/action-bar.tsx | 62 +++++++------- .../features/status/components/card.tsx | 10 +-- .../status/components/detailed-status.tsx | 4 +- .../components/status-interaction-bar.tsx | 4 +- .../containers/detailed_status_container.js | 4 +- app/soapbox/features/status/index.tsx | 4 +- .../features/ui/components/accordion.tsx | 2 +- .../features/ui/components/action-button.tsx | 4 +- .../ui/components/bundle_column_error.tsx | 2 +- .../features/ui/components/compose-button.tsx | 2 +- .../features/ui/components/compose_modal.tsx | 2 +- .../ui/components/instance_info_panel.tsx | 2 +- .../components/instance_moderation_panel.tsx | 4 +- .../features/ui/components/media_modal.js | 6 +- .../components/modals/landing-page-modal.tsx | 2 +- .../report-modal/steps/other-actions-step.tsx | 4 +- app/soapbox/features/ui/components/navbar.tsx | 2 +- .../ui/components/profile-dropdown.tsx | 4 +- .../ui/components/profile_fields_panel.tsx | 2 +- .../ui/components/profile_info_panel.tsx | 10 +-- .../ui/components/reply_mentions_modal.tsx | 2 +- .../ui/components/subscription-button.tsx | 2 +- .../features/ui/components/theme-selector.tsx | 8 +- .../features/ui/components/upload_area.tsx | 2 +- .../ui/components/who-to-follow-panel.tsx | 2 +- app/soapbox/features/ui/index.tsx | 2 +- .../features/verification/email_passthru.tsx | 8 +- .../features/verification/registration.tsx | 2 +- .../verification/steps/email-verification.tsx | 2 +- app/soapbox/features/video/index.js | 12 +-- package.json | 2 +- webpack/shared.js | 3 - yarn.lock | 8 +- 121 files changed, 368 insertions(+), 371 deletions(-) diff --git a/app/soapbox/actions/moderation.tsx b/app/soapbox/actions/moderation.tsx index 69342277b..ea5861eca 100644 --- a/app/soapbox/actions/moderation.tsx +++ b/app/soapbox/actions/moderation.tsx @@ -44,7 +44,7 @@ const deactivateUserModal = (intl: IntlShape, accountId: string, afterConfirm = const name = state.accounts.get(accountId)!.username; dispatch(openModal('CONFIRM', { - icon: require('@tabler/icons/icons/user-off.svg'), + icon: require('@tabler/icons/user-off.svg'), heading: intl.formatMessage(messages.deactivateUserHeading, { acct }), message: intl.formatMessage(messages.deactivateUserPrompt, { acct }), confirm: intl.formatMessage(messages.deactivateUserConfirm, { name }), @@ -83,7 +83,7 @@ const deleteUserModal = (intl: IntlShape, accountId: string, afterConfirm = () = const checkbox = local ? intl.formatMessage(messages.deleteLocalUserCheckbox) : false; dispatch(openModal('CONFIRM', { - icon: require('@tabler/icons/icons/user-minus.svg'), + icon: require('@tabler/icons/user-minus.svg'), heading: intl.formatMessage(messages.deleteUserHeading, { acct }), message, confirm, @@ -106,7 +106,7 @@ const rejectUserModal = (intl: IntlShape, accountId: string, afterConfirm = () = const name = state.accounts.get(accountId)!.username; dispatch(openModal('CONFIRM', { - icon: require('@tabler/icons/icons/user-off.svg'), + icon: require('@tabler/icons/user-off.svg'), heading: intl.formatMessage(messages.rejectUserHeading, { acct }), message: intl.formatMessage(messages.rejectUserPrompt, { acct }), confirm: intl.formatMessage(messages.rejectUserConfirm, { name }), @@ -127,7 +127,7 @@ const toggleStatusSensitivityModal = (intl: IntlShape, statusId: string, sensiti const acct = state.accounts.get(accountId)!.acct; dispatch(openModal('CONFIRM', { - icon: require('@tabler/icons/icons/alert-triangle.svg'), + icon: require('@tabler/icons/alert-triangle.svg'), heading: intl.formatMessage(sensitive === false ? messages.markStatusSensitiveHeading : messages.markStatusNotSensitiveHeading), message: intl.formatMessage(sensitive === false ? messages.markStatusSensitivePrompt : messages.markStatusNotSensitivePrompt, { acct }), confirm: intl.formatMessage(sensitive === false ? messages.markStatusSensitiveConfirm : messages.markStatusNotSensitiveConfirm), @@ -148,7 +148,7 @@ const deleteStatusModal = (intl: IntlShape, statusId: string, afterConfirm = () const acct = state.accounts.get(accountId)!.acct; dispatch(openModal('CONFIRM', { - icon: require('@tabler/icons/icons/trash.svg'), + icon: require('@tabler/icons/trash.svg'), heading: intl.formatMessage(messages.deleteStatusHeading), message: intl.formatMessage(messages.deleteStatusPrompt, { acct }), confirm: intl.formatMessage(messages.deleteStatusConfirm), diff --git a/app/soapbox/components/account.tsx b/app/soapbox/components/account.tsx index 2d53e6da8..efa8b423c 100644 --- a/app/soapbox/components/account.tsx +++ b/app/soapbox/components/account.tsx @@ -227,7 +227,7 @@ const Account = ({ <> · - + ) : null} diff --git a/app/soapbox/components/account_search.tsx b/app/soapbox/components/account_search.tsx index 3acda1152..adbb5501d 100644 --- a/app/soapbox/components/account_search.tsx +++ b/app/soapbox/components/account_search.tsx @@ -70,8 +70,8 @@ const AccountSearch: React.FC = ({ onSelected, ...rest }) => { />
- - + +
); diff --git a/app/soapbox/components/birthday_input.tsx b/app/soapbox/components/birthday_input.tsx index a1dc36c88..e263fb02e 100644 --- a/app/soapbox/components/birthday_input.tsx +++ b/app/soapbox/components/birthday_input.tsx @@ -70,7 +70,7 @@ const BirthdayInput: React.FC = ({ value, onChange, required })
= ({ value, onChange, required }) {intl.formatDate(date, { month: 'long' })} = ({ value, onChange, required })
= ({ value, onChange, required }) {intl.formatDate(date, { year: 'numeric' })} = ({ account, children, withDate = fal const joinedAt = createdAt ? (
- +
) : null; diff --git a/app/soapbox/components/domain.tsx b/app/soapbox/components/domain.tsx index 005848c89..22c8272de 100644 --- a/app/soapbox/components/domain.tsx +++ b/app/soapbox/components/domain.tsx @@ -21,7 +21,7 @@ const Domain: React.FC = ({ domain }) => { // const onBlockDomain = () => { // dispatch(openModal('CONFIRM', { - // icon: require('@tabler/icons/icons/ban.svg'), + // icon: require('@tabler/icons/ban.svg'), // heading: , // message: {domain} }} />, // confirm: intl.formatMessage(messages.blockDomainConfirm), @@ -41,7 +41,7 @@ const Domain: React.FC = ({ domain }) => {
- +
diff --git a/app/soapbox/components/dropdown_menu.tsx b/app/soapbox/components/dropdown_menu.tsx index 957583b60..ed8d87c16 100644 --- a/app/soapbox/components/dropdown_menu.tsx +++ b/app/soapbox/components/dropdown_menu.tsx @@ -366,7 +366,7 @@ class Dropdown extends React.PureComponent { } render() { - const { src = require('@tabler/icons/icons/dots.svg'), items, title, disabled, dropdownPlacement, openDropdownId, openedViaKeyboard = false, pressed, text, children } = this.props; + const { src = require('@tabler/icons/dots.svg'), items, title, disabled, dropdownPlacement, openDropdownId, openedViaKeyboard = false, pressed, text, children } = this.props; const open = this.state.id === openDropdownId; return ( diff --git a/app/soapbox/components/error_boundary.tsx b/app/soapbox/components/error_boundary.tsx index c1025d465..f28fecd0c 100644 --- a/app/soapbox/components/error_boundary.tsx +++ b/app/soapbox/components/error_boundary.tsx @@ -120,7 +120,7 @@ class ErrorBoundary extends React.PureComponent { {logo ? ( {siteTitle} ) : ( - + )}
diff --git a/app/soapbox/components/list.tsx b/app/soapbox/components/list.tsx index e7d858334..23ff05086 100644 --- a/app/soapbox/components/list.tsx +++ b/app/soapbox/components/list.tsx @@ -54,7 +54,7 @@ const ListItem: React.FC = ({ label, hint, children, onClick }) => {
{children} - +
) : renderChildren()} diff --git a/app/soapbox/components/media_gallery.js b/app/soapbox/components/media_gallery.js index 5e528d4be..4f16f5a73 100644 --- a/app/soapbox/components/media_gallery.js +++ b/app/soapbox/components/media_gallery.js @@ -149,7 +149,7 @@ class Item extends React.PureComponent { const attachmentIcon = ( ); @@ -602,7 +602,7 @@ class MediaGallery extends React.PureComponent { (visible || compact) ? (
- diff --git a/app/soapbox/components/modal_root.js b/app/soapbox/components/modal_root.js index 842b66ba6..7eb25b9aa 100644 --- a/app/soapbox/components/modal_root.js +++ b/app/soapbox/components/modal_root.js @@ -78,7 +78,7 @@ class ModalRoot extends React.PureComponent { if (hasComposeContent && type === 'COMPOSE') { onOpenModal('CONFIRM', { - icon: require('@tabler/icons/icons/trash.svg'), + icon: require('@tabler/icons/trash.svg'), heading: isEditing ? : , message: isEditing ? : , confirm: intl.formatMessage(messages.confirm), diff --git a/app/soapbox/components/polls/poll-option.tsx b/app/soapbox/components/polls/poll-option.tsx index 9b3da5cfa..b242f649b 100644 --- a/app/soapbox/components/polls/poll-option.tsx +++ b/app/soapbox/components/polls/poll-option.tsx @@ -85,7 +85,7 @@ const PollOptionText: React.FC = ({ poll, option, index, active aria-label={option.title} > {active && ( - + )} @@ -138,7 +138,7 @@ const PollOption: React.FC = (props): JSX.Element | null => { {voted ? ( diff --git a/app/soapbox/components/quoted-status.tsx b/app/soapbox/components/quoted-status.tsx index 5d6eb526e..4c48e85a1 100644 --- a/app/soapbox/components/quoted-status.tsx +++ b/app/soapbox/components/quoted-status.tsx @@ -116,7 +116,7 @@ const QuotedStatus: React.FC = ({ status, onCancel, compose }) => if (onCancel) { actions = { onActionClick: handleClose, - actionIcon: require('@tabler/icons/icons/x.svg'), + actionIcon: require('@tabler/icons/x.svg'), actionAlignment: 'top', actionTitle: intl.formatMessage(messages.cancel), }; diff --git a/app/soapbox/components/scroll-top-button.tsx b/app/soapbox/components/scroll-top-button.tsx index 3652296ef..37be35ee6 100644 --- a/app/soapbox/components/scroll-top-button.tsx +++ b/app/soapbox/components/scroll-top-button.tsx @@ -84,7 +84,7 @@ const ScrollTopButton: React.FC = ({ return (
- + {(count > 0) && ( diff --git a/app/soapbox/components/sidebar-navigation.tsx b/app/soapbox/components/sidebar-navigation.tsx index f4cf64e49..b2bbc941f 100644 --- a/app/soapbox/components/sidebar-navigation.tsx +++ b/app/soapbox/components/sidebar-navigation.tsx @@ -31,7 +31,7 @@ const SidebarNavigation = () => { menu.push({ to: '/follow_requests', text: , - icon: require('@tabler/icons/icons/user-plus.svg'), + icon: require('@tabler/icons/user-plus.svg'), count: followRequestsCount, }); } @@ -40,7 +40,7 @@ const SidebarNavigation = () => { menu.push({ to: '/bookmarks', text: , - icon: require('@tabler/icons/icons/bookmark.svg'), + icon: require('@tabler/icons/bookmark.svg'), }); } @@ -48,14 +48,14 @@ const SidebarNavigation = () => { menu.push({ to: '/lists', text: , - icon: require('@tabler/icons/icons/list.svg'), + icon: require('@tabler/icons/list.svg'), }); } if (settings.get('isDeveloper')) { menu.push({ to: '/developers', - icon: require('@tabler/icons/icons/code.svg'), + icon: require('@tabler/icons/code.svg'), text: , }); } @@ -63,7 +63,7 @@ const SidebarNavigation = () => { if (account.staff) { menu.push({ to: '/soapbox/admin', - icon: require('@tabler/icons/icons/dashboard.svg'), + icon: require('@tabler/icons/dashboard.svg'), text: , count: dashboardCount, }); @@ -77,7 +77,7 @@ const SidebarNavigation = () => { if (features.publicTimeline) { menu.push({ to: '/timeline/local', - icon: features.federating ? require('@tabler/icons/icons/users.svg') : require('@tabler/icons/icons/world.svg'), + icon: features.federating ? require('@tabler/icons/users.svg') : require('@tabler/icons/world.svg'), text: features.federating ? instance.title : , }); } @@ -101,7 +101,7 @@ const SidebarNavigation = () => { return ( } /> @@ -112,7 +112,7 @@ const SidebarNavigation = () => { return ( } /> ); @@ -126,13 +126,13 @@ const SidebarNavigation = () => {
} /> } /> @@ -140,7 +140,7 @@ const SidebarNavigation = () => { <> } /> @@ -149,13 +149,13 @@ const SidebarNavigation = () => { } /> } /> @@ -164,7 +164,7 @@ const SidebarNavigation = () => { {menu.length > 0 && ( } /> diff --git a/app/soapbox/components/sidebar_menu.tsx b/app/soapbox/components/sidebar_menu.tsx index 2940c5bfa..787c8ed76 100644 --- a/app/soapbox/components/sidebar_menu.tsx +++ b/app/soapbox/components/sidebar_menu.tsx @@ -158,7 +158,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => { @@ -177,7 +177,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => { { {otherAccounts.map(account => renderAccount(account))} - + {intl.formatMessage(messages.addAccount)}
@@ -208,7 +208,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => { @@ -216,7 +216,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => { {features.bookmarks && ( @@ -225,7 +225,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => { {features.lists && ( @@ -234,7 +234,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => { {settings.get('isDeveloper') && ( @@ -245,7 +245,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => { } onClick={onClose} /> @@ -264,21 +264,21 @@ const SidebarMenu: React.FC = (): JSX.Element | null => { @@ -286,7 +286,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => { {features.federating && ( @@ -295,7 +295,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => { {features.filters && ( @@ -304,7 +304,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => { {account.admin && ( @@ -313,7 +313,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => { {features.import && ( @@ -323,7 +323,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => { diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx index 90d7e13df..a7a775427 100644 --- a/app/soapbox/components/status.tsx +++ b/app/soapbox/components/status.tsx @@ -344,7 +344,7 @@ class Status extends ImmutablePureComponent { prepend = (
- + @@ -363,7 +363,7 @@ class Status extends ImmutablePureComponent { onClick={(event) => event.stopPropagation()} className='hidden sm:flex items-center text-gray-500 text-xs font-medium space-x-1 hover:underline' > - + { onClick={(event) => event.stopPropagation()} className='flex items-center text-gray-500 text-xs font-medium space-x-1 hover:underline' > - + event.stopPropagation(), }); menu.push({ text: intl.formatMessage(messages.admin_status), href: `/pleroma/admin/#/statuses/${status.id}/`, - icon: require('@tabler/icons/icons/pencil.svg'), + icon: require('@tabler/icons/pencil.svg'), action: (event) => event.stopPropagation(), }); } @@ -516,25 +516,25 @@ class StatusActionBar extends ImmutablePureComponent @@ -665,7 +665,7 @@ class StatusActionBar extends ImmutablePureComponent )} @@ -696,7 +696,7 @@ class StatusActionBar extends ImmutablePureComponent
diff --git a/app/soapbox/components/thumb_navigation.tsx b/app/soapbox/components/thumb_navigation.tsx index adb89869f..e46f7c7c3 100644 --- a/app/soapbox/components/thumb_navigation.tsx +++ b/app/soapbox/components/thumb_navigation.tsx @@ -17,7 +17,7 @@ const ThumbNavigation: React.FC = (): JSX.Element => { if (features.chats) { return ( } to='/chats' exact @@ -29,7 +29,7 @@ const ThumbNavigation: React.FC = (): JSX.Element => { if (features.directTimeline || features.conversations) { return ( } to='/messages' paths={['/messages', '/conversations']} @@ -43,14 +43,14 @@ const ThumbNavigation: React.FC = (): JSX.Element => { return (
} to='/' exact /> } to='/search' exact @@ -58,7 +58,7 @@ const ThumbNavigation: React.FC = (): JSX.Element => { {account && ( } to='/notifications' exact @@ -70,7 +70,7 @@ const ThumbNavigation: React.FC = (): JSX.Element => { {(account && account.staff) && ( } to='/soapbox/admin' count={dashboardCount} diff --git a/app/soapbox/components/ui/card/card.tsx b/app/soapbox/components/ui/card/card.tsx index 3eedaaf40..c876219f4 100644 --- a/app/soapbox/components/ui/card/card.tsx +++ b/app/soapbox/components/ui/card/card.tsx @@ -64,7 +64,7 @@ const CardHeader: React.FC = ({ children, backHref, onBackClick }): return ( - + {intl.formatMessage(messages.back)} ); diff --git a/app/soapbox/components/ui/icon/__tests__/svg-icon.test.tsx b/app/soapbox/components/ui/icon/__tests__/svg-icon.test.tsx index a1e269dd8..c56a6d190 100644 --- a/app/soapbox/components/ui/icon/__tests__/svg-icon.test.tsx +++ b/app/soapbox/components/ui/icon/__tests__/svg-icon.test.tsx @@ -5,7 +5,7 @@ import SvgIcon from '../svg-icon'; describe('', () => { it('renders loading element with default size', () => { - render(); + render(); const svg = screen.getByTestId('svg-icon-loader'); expect(svg.getAttribute('width')).toBe('24'); diff --git a/app/soapbox/components/ui/input/input.tsx b/app/soapbox/components/ui/input/input.tsx index 8ba0d6ff9..488f2733e 100644 --- a/app/soapbox/components/ui/input/input.tsx +++ b/app/soapbox/components/ui/input/input.tsx @@ -88,7 +88,7 @@ const Input = React.forwardRef( className='text-gray-400 dark:text-gray-500 hover:text-gray-500 dark:hover:text-gray-400 h-full px-2 focus:ring-primary-500 focus:ring-2' > diff --git a/app/soapbox/components/ui/modal/modal.tsx b/app/soapbox/components/ui/modal/modal.tsx index 10f0976ec..259783539 100644 --- a/app/soapbox/components/ui/modal/modal.tsx +++ b/app/soapbox/components/ui/modal/modal.tsx @@ -59,7 +59,7 @@ const Modal: React.FC = ({ cancelAction, cancelText, children, - closeIcon = require('@tabler/icons/icons/x.svg'), + closeIcon = require('@tabler/icons/x.svg'), closePosition = 'right', confirmationAction, confirmationDisabled, diff --git a/app/soapbox/components/ui/streamfield/streamfield.tsx b/app/soapbox/components/ui/streamfield/streamfield.tsx index 902ae2873..140a194b6 100644 --- a/app/soapbox/components/ui/streamfield/streamfield.tsx +++ b/app/soapbox/components/ui/streamfield/streamfield.tsx @@ -74,7 +74,7 @@ const Streamfield: React.FC = ({ onRemoveItem(i)} title={intl.formatMessage(messages.remove)} /> @@ -86,7 +86,7 @@ const Streamfield: React.FC = ({ {onAddItem && (
diff --git a/app/soapbox/features/account_timeline/containers/header_container.js b/app/soapbox/features/account_timeline/containers/header_container.js index a0585c0c3..f7a8d7ba8 100644 --- a/app/soapbox/features/account_timeline/containers/header_container.js +++ b/app/soapbox/features/account_timeline/containers/header_container.js @@ -96,7 +96,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ dispatch(unblockAccount(account.get('id'))); } else { dispatch(openModal('CONFIRM', { - icon: require('@tabler/icons/icons/ban.svg'), + icon: require('@tabler/icons/ban.svg'), heading: , message: @{account.get('acct')} }} />, confirm: intl.formatMessage(messages.blockConfirm), @@ -164,7 +164,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ onBlockDomain(domain) { dispatch(openModal('CONFIRM', { - icon: require('@tabler/icons/icons/ban.svg'), + icon: require('@tabler/icons/ban.svg'), heading: , message: {domain} }} />, confirm: intl.formatMessage(messages.blockDomainConfirm), diff --git a/app/soapbox/features/admin/components/report.tsx b/app/soapbox/features/admin/components/report.tsx index 82ec5804e..fb1c5bf5d 100644 --- a/app/soapbox/features/admin/components/report.tsx +++ b/app/soapbox/features/admin/components/report.tsx @@ -40,11 +40,11 @@ const Report: React.FC = ({ report }) => { return [{ text: intl.formatMessage(messages.deactivateUser, { name: targetAccount.username as string }), action: handleDeactivateUser, - icon: require('@tabler/icons/icons/user-off.svg'), + icon: require('@tabler/icons/user-off.svg'), }, { text: intl.formatMessage(messages.deleteUser, { name: targetAccount.username as string }), action: handleDeleteUser, - icon: require('@tabler/icons/icons/user-minus.svg'), + icon: require('@tabler/icons/user-minus.svg'), }]; }; @@ -124,7 +124,7 @@ const Report: React.FC = ({ report }) => { - +
); diff --git a/app/soapbox/features/admin/components/report_status.tsx b/app/soapbox/features/admin/components/report_status.tsx index 7503675e4..8ec01792e 100644 --- a/app/soapbox/features/admin/components/report_status.tsx +++ b/app/soapbox/features/admin/components/report_status.tsx @@ -40,11 +40,11 @@ const ReportStatus: React.FC = ({ status }) => { return [{ text: intl.formatMessage(messages.viewStatus, { acct: `@${acct}` }), to: `/@${acct}/posts/${status.id}`, - icon: require('@tabler/icons/icons/pencil.svg'), + icon: require('@tabler/icons/pencil.svg'), }, { text: intl.formatMessage(messages.deleteStatus, { acct: `@${acct}` }), action: handleDeleteStatus, - icon: require('@tabler/icons/icons/trash.svg'), + icon: require('@tabler/icons/trash.svg'), destructive: true, }]; }; @@ -123,7 +123,7 @@ const ReportStatus: React.FC = ({ status }) => {
diff --git a/app/soapbox/features/admin/components/unapproved_account.tsx b/app/soapbox/features/admin/components/unapproved_account.tsx index ffd76fc30..b5a08c956 100644 --- a/app/soapbox/features/admin/components/unapproved_account.tsx +++ b/app/soapbox/features/admin/components/unapproved_account.tsx @@ -52,8 +52,8 @@ const UnapprovedAccount: React.FC = ({ accountId }) => {
{adminAccount?.invite_request || ''}
- - + +
); diff --git a/app/soapbox/features/aliases/components/account.tsx b/app/soapbox/features/aliases/components/account.tsx index adcd1b072..3d24c0543 100644 --- a/app/soapbox/features/aliases/components/account.tsx +++ b/app/soapbox/features/aliases/components/account.tsx @@ -48,7 +48,7 @@ const Account: React.FC = ({ accountId, aliases }) => { if (!added && accountId !== me) { button = (
- +
); } diff --git a/app/soapbox/features/aliases/components/search.tsx b/app/soapbox/features/aliases/components/search.tsx index 3720a6930..4d2a55a6a 100644 --- a/app/soapbox/features/aliases/components/search.tsx +++ b/app/soapbox/features/aliases/components/search.tsx @@ -54,7 +54,7 @@ const Search: React.FC = () => { />
- +
diff --git a/app/soapbox/features/audio/index.js b/app/soapbox/features/audio/index.js index 067856abf..2a6732ec9 100644 --- a/app/soapbox/features/audio/index.js +++ b/app/soapbox/features/audio/index.js @@ -491,8 +491,8 @@ class Audio extends React.PureComponent {
- - + + diff --git a/app/soapbox/features/auth_layout/index.tsx b/app/soapbox/features/auth_layout/index.tsx index 87026e4b4..d4f6517bd 100644 --- a/app/soapbox/features/auth_layout/index.tsx +++ b/app/soapbox/features/auth_layout/index.tsx @@ -54,7 +54,7 @@ const AuthLayout = () => {
diff --git a/app/soapbox/features/chats/components/chat-box.tsx b/app/soapbox/features/chats/components/chat-box.tsx index 0baabb43b..869764961 100644 --- a/app/soapbox/features/chats/components/chat-box.tsx +++ b/app/soapbox/features/chats/components/chat-box.tsx @@ -144,7 +144,7 @@ const ChatBox: React.FC = ({ chatId, onSetInputRef, autosize }) => {
@@ -155,7 +155,7 @@ const ChatBox: React.FC = ({ chatId, onSetInputRef, autosize }) => { const renderActionButton = () => { return canSubmit() ? ( diff --git a/app/soapbox/features/chats/components/chat-message-list.tsx b/app/soapbox/features/chats/components/chat-message-list.tsx index 935a3707d..70f843ebd 100644 --- a/app/soapbox/features/chats/components/chat-message-list.tsx +++ b/app/soapbox/features/chats/components/chat-message-list.tsx @@ -219,7 +219,7 @@ const ChatMessageList: React.FC = ({ chatId, chatMessageIds, a { text: intl.formatMessage(messages.delete), action: handleDeleteMessage(chatMessage.chat_id, chatMessage.id), - icon: require('@tabler/icons/icons/trash.svg'), + icon: require('@tabler/icons/trash.svg'), destructive: true, }, ]; @@ -228,7 +228,7 @@ const ChatMessageList: React.FC = ({ chatId, chatMessageIds, a menu.push({ text: intl.formatMessage(messages.report), action: handleReportUser(chatMessage.account_id), - icon: require('@tabler/icons/icons/flag.svg'), + icon: require('@tabler/icons/flag.svg'), }); } @@ -251,7 +251,7 @@ const ChatMessageList: React.FC = ({ chatId, chatMessageIds, a
diff --git a/app/soapbox/features/chats/components/chat-window.tsx b/app/soapbox/features/chats/components/chat-window.tsx index 5a71f6598..8b30d3ba8 100644 --- a/app/soapbox/features/chats/components/chat-window.tsx +++ b/app/soapbox/features/chats/components/chat-window.tsx @@ -98,7 +98,7 @@ const ChatWindow: React.FC = ({ idx, chatId, windowState }) => { @{getAcct(account, displayFqn)}
- +
diff --git a/app/soapbox/features/chats/components/chat.tsx b/app/soapbox/features/chats/components/chat.tsx index e2e4e90c1..13d2b7fee 100644 --- a/app/soapbox/features/chats/components/chat.tsx +++ b/app/soapbox/features/chats/components/chat.tsx @@ -44,7 +44,7 @@ const Chat: React.FC = ({ chatId, onClick }) => { {attachment && ( )} {content ? ( diff --git a/app/soapbox/features/community_timeline/components/column_settings.js b/app/soapbox/features/community_timeline/components/column_settings.js index a5bf9a91f..52781f1f4 100644 --- a/app/soapbox/features/community_timeline/components/column_settings.js +++ b/app/soapbox/features/community_timeline/components/column_settings.js @@ -31,7 +31,7 @@ class ColumnSettings extends React.PureComponent {
- +
diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js index 69dffd7de..66010cfd3 100644 --- a/app/soapbox/features/compose/components/compose_form.js +++ b/app/soapbox/features/compose/components/compose_form.js @@ -270,14 +270,14 @@ class ComposeForm extends ImmutablePureComponent { } else if (this.props.privacy === 'direct') { publishText = ( <> - + {intl.formatMessage(messages.message)} ); } else if (this.props.privacy === 'private') { publishText = ( <> - + {intl.formatMessage(messages.publish)} ); diff --git a/app/soapbox/features/compose/components/emoji_picker_dropdown.js b/app/soapbox/features/compose/components/emoji_picker_dropdown.js index ca1fff018..675d87de5 100644 --- a/app/soapbox/features/compose/components/emoji_picker_dropdown.js +++ b/app/soapbox/features/compose/components/emoji_picker_dropdown.js @@ -365,7 +365,7 @@ class EmojiPickerDropdown extends React.PureComponent { 'pulse-loading': active && loading, })} alt='😀' - src={require('@tabler/icons/icons/mood-happy.svg')} + src={require('@tabler/icons/mood-happy.svg')} title={title} aria-label={title} aria-expanded={active} diff --git a/app/soapbox/features/compose/components/markdown_button.tsx b/app/soapbox/features/compose/components/markdown_button.tsx index 01b0620a0..7d0d56eb6 100644 --- a/app/soapbox/features/compose/components/markdown_button.tsx +++ b/app/soapbox/features/compose/components/markdown_button.tsx @@ -18,7 +18,7 @@ const MarkdownButton: React.FC = ({ active, onClick }) => { return ( = ({ active, unavailable, disabled, onCl return ( = ({ const [placement, setPlacement] = useState('bottom'); const options = [ - { icon: require('@tabler/icons/icons/world.svg'), value: 'public', text: intl.formatMessage(messages.public_short), meta: intl.formatMessage(messages.public_long) }, - { icon: require('@tabler/icons/icons/lock-open.svg'), value: 'unlisted', text: intl.formatMessage(messages.unlisted_short), meta: intl.formatMessage(messages.unlisted_long) }, - { icon: require('@tabler/icons/icons/lock.svg'), value: 'private', text: intl.formatMessage(messages.private_short), meta: intl.formatMessage(messages.private_long) }, - { icon: require('@tabler/icons/icons/mail.svg'), value: 'direct', text: intl.formatMessage(messages.direct_short), meta: intl.formatMessage(messages.direct_long) }, + { icon: require('@tabler/icons/world.svg'), value: 'public', text: intl.formatMessage(messages.public_short), meta: intl.formatMessage(messages.public_long) }, + { icon: require('@tabler/icons/lock-open.svg'), value: 'unlisted', text: intl.formatMessage(messages.unlisted_short), meta: intl.formatMessage(messages.unlisted_long) }, + { icon: require('@tabler/icons/lock.svg'), value: 'private', text: intl.formatMessage(messages.private_short), meta: intl.formatMessage(messages.private_long) }, + { icon: require('@tabler/icons/mail.svg'), value: 'direct', text: intl.formatMessage(messages.direct_short), meta: intl.formatMessage(messages.direct_long) }, ]; const handleToggle: React.MouseEventHandler = (e) => { diff --git a/app/soapbox/features/compose/components/reply_indicator.tsx b/app/soapbox/features/compose/components/reply_indicator.tsx index f47b0494b..1e76e616e 100644 --- a/app/soapbox/features/compose/components/reply_indicator.tsx +++ b/app/soapbox/features/compose/components/reply_indicator.tsx @@ -26,7 +26,7 @@ const ReplyIndicator: React.FC = ({ status, hideActions, onCanc if (!hideActions && onCancel) { actions = { onActionClick: handleClick, - actionIcon: require('@tabler/icons/icons/x.svg'), + actionIcon: require('@tabler/icons/x.svg'), actionAlignment: 'top', actionTitle: 'Dismiss', }; diff --git a/app/soapbox/features/compose/components/schedule_button.tsx b/app/soapbox/features/compose/components/schedule_button.tsx index 8d1509884..44669e06f 100644 --- a/app/soapbox/features/compose/components/schedule_button.tsx +++ b/app/soapbox/features/compose/components/schedule_button.tsx @@ -28,7 +28,7 @@ const ScheduleButton: React.FC = ({ active, unavailable, disabl return ( { diff --git a/app/soapbox/features/compose/components/search.tsx b/app/soapbox/features/compose/components/search.tsx index e70786cb7..b51164f80 100644 --- a/app/soapbox/features/compose/components/search.tsx +++ b/app/soapbox/features/compose/components/search.tsx @@ -105,7 +105,7 @@ const Search = (props: ISearch) => { const makeMenu = () => [ { text: intl.formatMessage(messages.action, { query: value }), - icon: require('@tabler/icons/icons/search.svg'), + icon: require('@tabler/icons/search.svg'), action: handleSubmit, }, ]; @@ -140,12 +140,12 @@ const Search = (props: ISearch) => { onClick={handleClear} > diff --git a/app/soapbox/features/compose/components/spoiler_button.tsx b/app/soapbox/features/compose/components/spoiler_button.tsx index 6d9c1aa76..0bc009406 100644 --- a/app/soapbox/features/compose/components/spoiler_button.tsx +++ b/app/soapbox/features/compose/components/spoiler_button.tsx @@ -18,7 +18,7 @@ const SpoilerButton: React.FC = ({ active, onClick }) => { return ( = { 'application/x-freearc': fileZipIcon, @@ -157,7 +157,7 @@ const Upload: React.FC = (props) => {
} /> @@ -165,7 +165,7 @@ const Upload: React.FC = (props) => { {(mediaType !== 'unknown' && Boolean(props.media.get('url'))) && ( } /> )} diff --git a/app/soapbox/features/compose/components/upload_button.tsx b/app/soapbox/features/compose/components/upload_button.tsx index cc29b61aa..eac158af5 100644 --- a/app/soapbox/features/compose/components/upload_button.tsx +++ b/app/soapbox/features/compose/components/upload_button.tsx @@ -48,8 +48,8 @@ const UploadButton: React.FC = ({ } const src = onlyImages(attachmentTypes) - ? require('@tabler/icons/icons/photo.svg') - : require('@tabler/icons/icons/paperclip.svg'); + ? require('@tabler/icons/photo.svg') + : require('@tabler/icons/paperclip.svg'); return (
diff --git a/app/soapbox/features/crypto_donate/components/crypto_address.tsx b/app/soapbox/features/crypto_donate/components/crypto_address.tsx index afffd085a..1ecccf083 100644 --- a/app/soapbox/features/crypto_donate/components/crypto_address.tsx +++ b/app/soapbox/features/crypto_donate/components/crypto_address.tsx @@ -42,12 +42,12 @@ const CryptoAddress: React.FC = (props): JSX.Element => { - + {explorerUrl && ( - + )} diff --git a/app/soapbox/features/crypto_donate/components/detailed_crypto_address.tsx b/app/soapbox/features/crypto_donate/components/detailed_crypto_address.tsx index 3df4b40de..76b83c196 100644 --- a/app/soapbox/features/crypto_donate/components/detailed_crypto_address.tsx +++ b/app/soapbox/features/crypto_donate/components/detailed_crypto_address.tsx @@ -30,7 +30,7 @@ const DetailedCryptoAddress: React.FC = ({ address, tick
{title || ticker.toUpperCase()}
{explorerUrl && - + }
diff --git a/app/soapbox/features/developers/developers_menu.tsx b/app/soapbox/features/developers/developers_menu.tsx index 876ce6d10..b4dfdd9c4 100644 --- a/app/soapbox/features/developers/developers_menu.tsx +++ b/app/soapbox/features/developers/developers_menu.tsx @@ -32,7 +32,7 @@ const Developers = () => {
- + @@ -40,7 +40,7 @@ const Developers = () => { - + @@ -48,7 +48,7 @@ const Developers = () => { - + @@ -56,7 +56,7 @@ const Developers = () => { - + @@ -64,7 +64,7 @@ const Developers = () => { - + @@ -72,7 +72,7 @@ const Developers = () => {
@@ -140,7 +140,7 @@ const FeedCarousel = () => { onClick={handleNextPage} className='bg-white/85 backdrop-blur rounded-full h-8 w-8 flex items-center justify-center' > - +
diff --git a/app/soapbox/features/follow_requests/components/account_authorize.tsx b/app/soapbox/features/follow_requests/components/account_authorize.tsx index ff66df26b..4355b8f46 100644 --- a/app/soapbox/features/follow_requests/components/account_authorize.tsx +++ b/app/soapbox/features/follow_requests/components/account_authorize.tsx @@ -51,8 +51,8 @@ const AccountAuthorize: React.FC = ({ id }) => {
-
-
+
+
); diff --git a/app/soapbox/features/groups/removed_accounts/index.js b/app/soapbox/features/groups/removed_accounts/index.js index e5d0dae41..10aa20333 100644 --- a/app/soapbox/features/groups/removed_accounts/index.js +++ b/app/soapbox/features/groups/removed_accounts/index.js @@ -82,7 +82,7 @@ class GroupRemovedAccounts extends ImmutablePureComponent { {accountIds.map(id => ())} diff --git a/app/soapbox/features/groups/timeline/components/header.js b/app/soapbox/features/groups/timeline/components/header.js index 9cb26eae3..c08210afd 100644 --- a/app/soapbox/features/groups/timeline/components/header.js +++ b/app/soapbox/features/groups/timeline/components/header.js @@ -51,17 +51,17 @@ class Header extends ImmutablePureComponent { { text: intl.formatMessage(messages.edit), to: `/groups/${group.get('id')}/edit`, - icon: require('@tabler/icons/icons/edit.svg'), + icon: require('@tabler/icons/edit.svg'), }, { text: intl.formatMessage(messages.removed_accounts), to: `/groups/${group.get('id')}/removed_accounts`, - icon: require('@tabler/icons/icons/trash.svg'), + icon: require('@tabler/icons/trash.svg'), destructive: true, }, ]; - return ; + return ; } render() { diff --git a/app/soapbox/features/home_timeline/components/column_settings.js b/app/soapbox/features/home_timeline/components/column_settings.js index 78ca71919..a643c7e17 100644 --- a/app/soapbox/features/home_timeline/components/column_settings.js +++ b/app/soapbox/features/home_timeline/components/column_settings.js @@ -31,7 +31,7 @@ class ColumnSettings extends React.PureComponent {
- +
diff --git a/app/soapbox/features/list_adder/components/list.tsx b/app/soapbox/features/list_adder/components/list.tsx index 822833476..c9358c98e 100644 --- a/app/soapbox/features/list_adder/components/list.tsx +++ b/app/soapbox/features/list_adder/components/list.tsx @@ -30,14 +30,14 @@ const List: React.FC = ({ listId }) => { let button; if (added) { - button = ; + button = ; } else { - button = ; + button = ; } return (
- + {list.title} diff --git a/app/soapbox/features/list_editor/components/account.tsx b/app/soapbox/features/list_editor/components/account.tsx index f3c52d9f3..79916ead2 100644 --- a/app/soapbox/features/list_editor/components/account.tsx +++ b/app/soapbox/features/list_editor/components/account.tsx @@ -34,9 +34,9 @@ const Account: React.FC = ({ accountId }) => { let button; if (isAdded) { - button = ; + button = ; } else { - button = ; + button = ; } return ( diff --git a/app/soapbox/features/list_editor/components/search.tsx b/app/soapbox/features/list_editor/components/search.tsx index edd78250f..4326ffa93 100644 --- a/app/soapbox/features/list_editor/components/search.tsx +++ b/app/soapbox/features/list_editor/components/search.tsx @@ -45,7 +45,7 @@ const Search = () => { placeholder={intl.formatMessage(messages.search)} />
- +
diff --git a/app/soapbox/features/list_timeline/index.tsx b/app/soapbox/features/list_timeline/index.tsx index f9d1e6f24..90f2be274 100644 --- a/app/soapbox/features/list_timeline/index.tsx +++ b/app/soapbox/features/list_timeline/index.tsx @@ -49,7 +49,7 @@ const ListTimeline: React.FC = () => { // const handleDeleteClick = () => { // dispatch(openModal('CONFIRM', { - // icon: require('@tabler/icons/icons/trash.svg'), + // icon: require('@tabler/icons/trash.svg'), // heading: intl.formatMessage(messages.deleteHeading), // message: intl.formatMessage(messages.deleteMessage), // confirm: intl.formatMessage(messages.deleteConfirm), diff --git a/app/soapbox/features/lists/index.tsx b/app/soapbox/features/lists/index.tsx index 187c05218..e2843f77a 100644 --- a/app/soapbox/features/lists/index.tsx +++ b/app/soapbox/features/lists/index.tsx @@ -93,12 +93,12 @@ const Lists: React.FC = () => { > {lists.map((list: any) => ( - + {list.title} - - + + ))} diff --git a/app/soapbox/features/notifications/components/clear_column_button.js b/app/soapbox/features/notifications/components/clear_column_button.js index ebb27cfbe..709deab78 100644 --- a/app/soapbox/features/notifications/components/clear_column_button.js +++ b/app/soapbox/features/notifications/components/clear_column_button.js @@ -12,7 +12,7 @@ export default class ClearColumnButton extends React.PureComponent { render() { return ( - + ); } diff --git a/app/soapbox/features/notifications/components/column_settings.js b/app/soapbox/features/notifications/components/column_settings.js index 63093ec78..b71e8fa30 100644 --- a/app/soapbox/features/notifications/components/column_settings.js +++ b/app/soapbox/features/notifications/components/column_settings.js @@ -60,7 +60,7 @@ class ColumnSettings extends React.PureComponent {
- +
diff --git a/app/soapbox/features/notifications/components/filter_bar.js b/app/soapbox/features/notifications/components/filter_bar.js index 6384b7788..81e370a3a 100644 --- a/app/soapbox/features/notifications/components/filter_bar.js +++ b/app/soapbox/features/notifications/components/filter_bar.js @@ -51,19 +51,19 @@ class NotificationFilterBar extends React.PureComponent { }); } else { items.push({ - text: , + text: , title: intl.formatMessage(messages.mentions), action: this.onClick('mention'), name: 'mention', }); items.push({ - text: , + text: , title: intl.formatMessage(messages.favourites), action: this.onClick('favourite'), name: 'favourite', }); if (supportsEmojiReacts) items.push({ - text: , + text: , title: intl.formatMessage(messages.emoji_reacts), action: this.onClick('pleroma:emoji_reaction'), name: 'pleroma:emoji_reaction', @@ -75,19 +75,19 @@ class NotificationFilterBar extends React.PureComponent { name: 'reblog', }); items.push({ - text: , + text: , title: intl.formatMessage(messages.polls), action: this.onClick('poll'), name: 'poll', }); items.push({ - text: , + text: , title: intl.formatMessage(messages.statuses), action: this.onClick('status'), name: 'status', }); items.push({ - text: , + text: , title: intl.formatMessage(messages.follows), action: this.onClick('follow'), name: 'follow', diff --git a/app/soapbox/features/notifications/components/follow_request.js b/app/soapbox/features/notifications/components/follow_request.js index 4c386227e..be781a948 100644 --- a/app/soapbox/features/notifications/components/follow_request.js +++ b/app/soapbox/features/notifications/components/follow_request.js @@ -49,8 +49,8 @@ class FollowRequest extends ImmutablePureComponent {
- - + +
diff --git a/app/soapbox/features/notifications/components/notification.tsx b/app/soapbox/features/notifications/components/notification.tsx index 4b67e5645..1073ff3aa 100644 --- a/app/soapbox/features/notifications/components/notification.tsx +++ b/app/soapbox/features/notifications/components/notification.tsx @@ -35,17 +35,17 @@ const buildLink = (account: Account): JSX.Element => ( ); const icons: Record = { - follow: require('@tabler/icons/icons/user-plus.svg'), - follow_request: require('@tabler/icons/icons/user-plus.svg'), - mention: require('@tabler/icons/icons/at.svg'), - favourite: require('@tabler/icons/icons/heart.svg'), - reblog: require('@tabler/icons/icons/repeat.svg'), - status: require('@tabler/icons/icons/bell-ringing.svg'), - poll: require('@tabler/icons/icons/chart-bar.svg'), - move: require('@tabler/icons/icons/briefcase.svg'), - 'pleroma:chat_mention': require('@tabler/icons/icons/messages.svg'), - 'pleroma:emoji_reaction': require('@tabler/icons/icons/mood-happy.svg'), - user_approved: require('@tabler/icons/icons/user-plus.svg'), + follow: require('@tabler/icons/user-plus.svg'), + follow_request: require('@tabler/icons/user-plus.svg'), + mention: require('@tabler/icons/at.svg'), + favourite: require('@tabler/icons/heart.svg'), + reblog: require('@tabler/icons/repeat.svg'), + status: require('@tabler/icons/bell-ringing.svg'), + poll: require('@tabler/icons/chart-bar.svg'), + move: require('@tabler/icons/briefcase.svg'), + 'pleroma:chat_mention': require('@tabler/icons/messages.svg'), + 'pleroma:emoji_reaction': require('@tabler/icons/mood-happy.svg'), + user_approved: require('@tabler/icons/user-plus.svg'), }; const messages: Record = defineMessages({ diff --git a/app/soapbox/features/notifications/containers/column_settings_container.js b/app/soapbox/features/notifications/containers/column_settings_container.js index 7e01f2fca..6375e59f5 100644 --- a/app/soapbox/features/notifications/containers/column_settings_container.js +++ b/app/soapbox/features/notifications/containers/column_settings_container.js @@ -42,7 +42,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ onClear() { dispatch(openModal('CONFIRM', { - icon: require('@tabler/icons/icons/eraser.svg'), + icon: require('@tabler/icons/eraser.svg'), heading: intl.formatMessage(messages.clearHeading), message: intl.formatMessage(messages.clearMessage), confirm: intl.formatMessage(messages.clearConfirm), diff --git a/app/soapbox/features/onboarding/steps/avatar-selection-step.tsx b/app/soapbox/features/onboarding/steps/avatar-selection-step.tsx index 5278ed529..4593406bb 100644 --- a/app/soapbox/features/onboarding/steps/avatar-selection-step.tsx +++ b/app/soapbox/features/onboarding/steps/avatar-selection-step.tsx @@ -108,7 +108,7 @@ const AvatarSelectionStep = ({ onNext }: { onNext: () => void }) => { })} disabled={isSubmitting} > - + diff --git a/app/soapbox/features/onboarding/steps/completed-step.tsx b/app/soapbox/features/onboarding/steps/completed-step.tsx index 60f6fba13..b6637589c 100644 --- a/app/soapbox/features/onboarding/steps/completed-step.tsx +++ b/app/soapbox/features/onboarding/steps/completed-step.tsx @@ -7,7 +7,7 @@ const CompletedStep = ({ onComplete }: { onComplete: () => void }) => ( - + diff --git a/app/soapbox/features/onboarding/steps/cover-photo-selection-step.tsx b/app/soapbox/features/onboarding/steps/cover-photo-selection-step.tsx index 9efd311e8..5bc7d898f 100644 --- a/app/soapbox/features/onboarding/steps/cover-photo-selection-step.tsx +++ b/app/soapbox/features/onboarding/steps/cover-photo-selection-step.tsx @@ -120,7 +120,7 @@ const CoverPhotoSelectionStep = ({ onNext }: { onNext: () => void }) => { })} disabled={isSubmitting} > - + diff --git a/app/soapbox/features/public_layout/components/header.tsx b/app/soapbox/features/public_layout/components/header.tsx index 6598bc397..1813c7d8a 100644 --- a/app/soapbox/features/public_layout/components/header.tsx +++ b/app/soapbox/features/public_layout/components/header.tsx @@ -82,7 +82,7 @@ const Header = () => { @@ -146,7 +146,7 @@ const Header = () => { diff --git a/app/soapbox/features/public_timeline/components/column_settings.js b/app/soapbox/features/public_timeline/components/column_settings.js index a2b2ca6f8..1d7022fa4 100644 --- a/app/soapbox/features/public_timeline/components/column_settings.js +++ b/app/soapbox/features/public_timeline/components/column_settings.js @@ -31,7 +31,7 @@ class ColumnSettings extends React.PureComponent {
- +
diff --git a/app/soapbox/features/remote_timeline/index.tsx b/app/soapbox/features/remote_timeline/index.tsx index d6443fc86..e19284891 100644 --- a/app/soapbox/features/remote_timeline/index.tsx +++ b/app/soapbox/features/remote_timeline/index.tsx @@ -68,7 +68,7 @@ const RemoteTimeline: React.FC = ({ params }) => { {instance && } {!pinned && - + = ({ accountId, author }) => { let button; if (added) { - button = ; + button = ; } else { - button = ; + button = ; } return ( diff --git a/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.tsx b/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.tsx index 7b44805d4..dd73b8945 100644 --- a/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.tsx +++ b/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.tsx @@ -34,7 +34,7 @@ const ScheduledStatusActionBar: React.FC = ({ status dispatch(cancelScheduledStatus(status.id)); } else { dispatch(openModal('CONFIRM', { - icon: require('@tabler/icons/icons/calendar-stats.svg'), + icon: require('@tabler/icons/calendar-stats.svg'), heading: intl.formatMessage(messages.deleteHeading), message: intl.formatMessage(messages.deleteMessage), confirm: intl.formatMessage(messages.deleteConfirm), @@ -49,7 +49,7 @@ const ScheduledStatusActionBar: React.FC = ({ status diff --git a/app/soapbox/features/status/components/action-bar.tsx b/app/soapbox/features/status/components/action-bar.tsx index 5ee95b39c..366c15a27 100644 --- a/app/soapbox/features/status/components/action-bar.tsx +++ b/app/soapbox/features/status/components/action-bar.tsx @@ -372,14 +372,14 @@ class ActionBar extends React.PureComponent { menu.push({ text: intl.formatMessage(messages.copy), action: this.handleCopy, - icon: require('@tabler/icons/icons/link.svg'), + icon: require('@tabler/icons/link.svg'), }); if (features.embeds) { menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed, - icon: require('@tabler/icons/icons/share.svg'), + icon: require('@tabler/icons/share.svg'), }); } } @@ -389,7 +389,7 @@ class ActionBar extends React.PureComponent { menu.push({ text: intl.formatMessage(status.bookmarked ? messages.unbookmark : messages.bookmark), action: this.handleBookmarkClick, - icon: require(status.bookmarked ? '@tabler/icons/icons/bookmark-off.svg' : '@tabler/icons/icons/bookmark.svg'), + icon: require(status.bookmarked ? '@tabler/icons/bookmark-off.svg' : '@tabler/icons/bookmark.svg'), }); } @@ -400,7 +400,7 @@ class ActionBar extends React.PureComponent { menu.push({ text: intl.formatMessage(status.pinned ? messages.unpin : messages.pin), action: this.handlePinClick, - icon: require(mutingConversation ? '@tabler/icons/icons/pinned-off.svg' : '@tabler/icons/icons/pin.svg'), + icon: require(mutingConversation ? '@tabler/icons/pinned-off.svg' : '@tabler/icons/pin.svg'), }); menu.push(null); @@ -408,7 +408,7 @@ class ActionBar extends React.PureComponent { menu.push({ text: intl.formatMessage(status.reblogged ? messages.cancel_reblog_private : messages.reblog_private), action: this.handleReblogClick, - icon: require('@tabler/icons/icons/repeat.svg'), + icon: require('@tabler/icons/repeat.svg'), }); menu.push(null); @@ -417,26 +417,26 @@ class ActionBar extends React.PureComponent { menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick, - icon: require(mutingConversation ? '@tabler/icons/icons/bell.svg' : '@tabler/icons/icons/bell-off.svg'), + icon: require(mutingConversation ? '@tabler/icons/bell.svg' : '@tabler/icons/bell-off.svg'), }); menu.push(null); menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick, - icon: require('@tabler/icons/icons/trash.svg'), + icon: require('@tabler/icons/trash.svg'), destructive: true, }); if (features.editStatuses) { menu.push({ text: intl.formatMessage(messages.edit), action: this.handleEditClick, - icon: require('@tabler/icons/icons/edit.svg'), + icon: require('@tabler/icons/edit.svg'), }); } else { menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick, - icon: require('@tabler/icons/icons/edit.svg'), + icon: require('@tabler/icons/edit.svg'), destructive: true, }); } @@ -444,20 +444,20 @@ class ActionBar extends React.PureComponent { menu.push({ text: intl.formatMessage(messages.mention, { name: username }), action: this.handleMentionClick, - icon: require('@tabler/icons/icons/at.svg'), + icon: require('@tabler/icons/at.svg'), }); // if (status.getIn(['account', 'pleroma', 'accepts_chat_messages'], false) === true) { // menu.push({ // text: intl.formatMessage(messages.chat, { name: username }), // action: this.handleChatClick, - // icon: require('@tabler/icons/icons/messages.svg'), + // icon: require('@tabler/icons/messages.svg'), // }); // } else { // menu.push({ // text: intl.formatMessage(messages.direct, { name: username }), // action: this.handleDirectClick, - // icon: require('@tabler/icons/icons/mail.svg'), + // icon: require('@tabler/icons/mail.svg'), // }); // } @@ -465,17 +465,17 @@ class ActionBar extends React.PureComponent { menu.push({ text: intl.formatMessage(messages.mute, { name: username }), action: this.handleMuteClick, - icon: require('@tabler/icons/icons/circle-x.svg'), + icon: require('@tabler/icons/circle-x.svg'), }); menu.push({ text: intl.formatMessage(messages.block, { name: username }), action: this.handleBlockClick, - icon: require('@tabler/icons/icons/ban.svg'), + icon: require('@tabler/icons/ban.svg'), }); menu.push({ text: intl.formatMessage(messages.report, { name: username }), action: this.handleReport, - icon: require('@tabler/icons/icons/flag.svg'), + icon: require('@tabler/icons/flag.svg'), }); } @@ -486,37 +486,37 @@ class ActionBar extends React.PureComponent { menu.push({ text: intl.formatMessage(messages.admin_account, { name: username }), href: `/pleroma/admin/#/users/${status.getIn(['account', 'id'])}/`, - icon: require('@tabler/icons/icons/gavel.svg'), + icon: require('@tabler/icons/gavel.svg'), }); menu.push({ text: intl.formatMessage(messages.admin_status), href: `/pleroma/admin/#/statuses/${status.id}/`, - icon: require('@tabler/icons/icons/pencil.svg'), + icon: require('@tabler/icons/pencil.svg'), }); } menu.push({ text: intl.formatMessage(status.sensitive === false ? messages.markStatusSensitive : messages.markStatusNotSensitive), action: this.handleToggleStatusSensitivity, - icon: require('@tabler/icons/icons/alert-triangle.svg'), + icon: require('@tabler/icons/alert-triangle.svg'), }); if (!ownAccount) { menu.push({ text: intl.formatMessage(messages.deactivateUser, { name: username }), action: this.handleDeactivateUser, - icon: require('@tabler/icons/icons/user-off.svg'), + icon: require('@tabler/icons/user-off.svg'), }); menu.push({ text: intl.formatMessage(messages.deleteUser, { name: username }), action: this.handleDeleteUser, - icon: require('@tabler/icons/icons/user-minus.svg'), + icon: require('@tabler/icons/user-minus.svg'), destructive: true, }); menu.push({ text: intl.formatMessage(messages.deleteStatus), action: this.handleDeleteStatus, - icon: require('@tabler/icons/icons/trash.svg'), + icon: require('@tabler/icons/trash.svg'), destructive: true, }); } @@ -525,12 +525,12 @@ class ActionBar extends React.PureComponent { const canShare = ('share' in navigator) && status.visibility === 'public'; - let reblogIcon = require('@tabler/icons/icons/repeat.svg'); + let reblogIcon = require('@tabler/icons/repeat.svg'); if (status.visibility === 'direct') { - reblogIcon = require('@tabler/icons/icons/mail.svg'); + reblogIcon = require('@tabler/icons/mail.svg'); } else if (status.visibility === 'private') { - reblogIcon = require('@tabler/icons/icons/lock.svg'); + reblogIcon = require('@tabler/icons/lock.svg'); } const reblog_disabled = (status.visibility === 'direct' || status.visibility === 'private'); @@ -538,11 +538,11 @@ class ActionBar extends React.PureComponent { const reblogMenu: Menu = [{ text: intl.formatMessage(status.reblogged ? messages.cancel_reblog_private : messages.reblog), action: this.handleReblogClick, - icon: require('@tabler/icons/icons/repeat.svg'), + icon: require('@tabler/icons/repeat.svg'), }, { text: intl.formatMessage(messages.quotePost), action: this.handleQuoteClick, - icon: require('@tabler/icons/icons/quote.svg'), + icon: require('@tabler/icons/quote.svg'), }]; const reblogButton = ( @@ -563,7 +563,7 @@ class ActionBar extends React.PureComponent { { 'text-accent-300 hover:text-accent-300': Boolean(meEmojiReact), })} title={meEmojiTitle} - src={require('@tabler/icons/icons/heart.svg')} + src={require('@tabler/icons/heart.svg')} iconClassName={classNames({ 'fill-accent-300': Boolean(meEmojiReact), })} @@ -620,7 +620,7 @@ class ActionBar extends React.PureComponent { 'text-accent-300 hover:text-accent-300': Boolean(meEmojiReact), })} title={meEmojiTitle} - src={require('@tabler/icons/icons/heart.svg')} + src={require('@tabler/icons/heart.svg')} iconClassName={classNames({ 'fill-accent-300': Boolean(meEmojiReact), })} @@ -632,7 +632,7 @@ class ActionBar extends React.PureComponent { {canShare && ( { )} diff --git a/app/soapbox/features/status/components/card.tsx b/app/soapbox/features/status/components/card.tsx index 9aeeda38a..90ddc27e3 100644 --- a/app/soapbox/features/status/components/card.tsx +++ b/app/soapbox/features/status/components/card.tsx @@ -156,7 +156,7 @@ const Card: React.FC = ({
{title}

{trimmedDescription}

- {card.provider_name} + {card.provider_name}
); @@ -184,10 +184,10 @@ const Card: React.FC = ({ if (embedded) { embed = renderVideo(); } else { - let iconVariant = require('@tabler/icons/icons/player-play.svg'); + let iconVariant = require('@tabler/icons/player-play.svg'); if (card.type === 'photo') { - iconVariant = require('@tabler/icons/icons/zoom-in.svg'); + iconVariant = require('@tabler/icons/zoom-in.svg'); } embed = ( @@ -214,7 +214,7 @@ const Card: React.FC = ({ className='text-gray-400 hover:text-gray-600' > @@ -242,7 +242,7 @@ const Card: React.FC = ({ } else { embed = (
- +
); } diff --git a/app/soapbox/features/status/components/detailed-status.tsx b/app/soapbox/features/status/components/detailed-status.tsx index 8745e6188..393fc58fe 100644 --- a/app/soapbox/features/status/components/detailed-status.tsx +++ b/app/soapbox/features/status/components/detailed-status.tsx @@ -120,9 +120,9 @@ class DetailedStatus extends ImmutablePureComponent; + statusTypeIcon = ; } else if (status.visibility === 'private') { - statusTypeIcon = ; + statusTypeIcon = ; } return ( diff --git a/app/soapbox/features/status/components/status-interaction-bar.tsx b/app/soapbox/features/status/components/status-interaction-bar.tsx index 6f121780b..72cb061db 100644 --- a/app/soapbox/features/status/components/status-interaction-bar.tsx +++ b/app/soapbox/features/status/components/status-interaction-bar.tsx @@ -73,7 +73,7 @@ const StatusInteractionBar: React.FC = ({ status }): JSX. @@ -104,7 +104,7 @@ const StatusInteractionBar: React.FC = ({ status }): JSX. 'text-accent-300': true, 'cursor-default': !features.exposableReactions, })} - src={require('@tabler/icons/icons/heart.svg')} + src={require('@tabler/icons/heart.svg')} iconClassName='fill-accent-300' role='presentation' onClick={features.exposableReactions ? handleOpenFavouritesModal : undefined} diff --git a/app/soapbox/features/status/containers/detailed_status_container.js b/app/soapbox/features/status/containers/detailed_status_container.js index a88d9e7cd..be3b22d43 100644 --- a/app/soapbox/features/status/containers/detailed_status_container.js +++ b/app/soapbox/features/status/containers/detailed_status_container.js @@ -135,7 +135,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ dispatch(deleteStatus(status.get('id'), withRedraft)); } else { dispatch(openModal('CONFIRM', { - icon: withRedraft ? require('@tabler/icons/icons/edit.svg') : require('@tabler/icons/icons/trash.svg'), + icon: withRedraft ? require('@tabler/icons/edit.svg') : require('@tabler/icons/trash.svg'), heading: intl.formatMessage(withRedraft ? messages.redraftHeading : messages.deleteHeading), message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage), confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm), @@ -172,7 +172,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ onBlock(status) { const account = status.get('account'); dispatch(openModal('CONFIRM', { - icon: require('@tabler/icons/icons/ban.svg'), + icon: require('@tabler/icons/ban.svg'), heading: , message: @{account.get('acct')} }} />, confirm: intl.formatMessage(messages.blockConfirm), diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx index b27be7e5b..cc0ce6fcc 100644 --- a/app/soapbox/features/status/index.tsx +++ b/app/soapbox/features/status/index.tsx @@ -321,7 +321,7 @@ class Status extends ImmutablePureComponent { dispatch(deleteStatus(status.id, withRedraft)); } else { dispatch(openModal('CONFIRM', { - icon: withRedraft ? require('@tabler/icons/icons/edit.svg') : require('@tabler/icons/icons/trash.svg'), + icon: withRedraft ? require('@tabler/icons/edit.svg') : require('@tabler/icons/trash.svg'), heading: intl.formatMessage(withRedraft ? messages.redraftHeading : messages.deleteHeading), message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage), confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm), @@ -409,7 +409,7 @@ class Status extends ImmutablePureComponent { if (!account || typeof account !== 'object') return; dispatch(openModal('CONFIRM', { - icon: require('@tabler/icons/icons/ban.svg'), + icon: require('@tabler/icons/ban.svg'), heading: , message: @{account.acct} }} />, confirm: intl.formatMessage(messages.blockConfirm), diff --git a/app/soapbox/features/ui/components/accordion.tsx b/app/soapbox/features/ui/components/accordion.tsx index 40afbf7b1..32eb9da0c 100644 --- a/app/soapbox/features/ui/components/accordion.tsx +++ b/app/soapbox/features/ui/components/accordion.tsx @@ -32,7 +32,7 @@ const Accordion: React.FC = ({ headline, children, menu, expanded =
{menu && (
- +
)}
diff --git a/app/soapbox/features/ui/components/compose_modal.tsx b/app/soapbox/features/ui/components/compose_modal.tsx index 470c04b69..8b8abc342 100644 --- a/app/soapbox/features/ui/components/compose_modal.tsx +++ b/app/soapbox/features/ui/components/compose_modal.tsx @@ -30,7 +30,7 @@ const ComposeModal: React.FC = ({ onClose }) => { const onClickClose = () => { if (composeText) { dispatch(openModal('CONFIRM', { - icon: require('@tabler/icons/icons/trash.svg'), + icon: require('@tabler/icons/trash.svg'), heading: , message: , confirm: intl.formatMessage(messages.confirm), diff --git a/app/soapbox/features/ui/components/instance_info_panel.tsx b/app/soapbox/features/ui/components/instance_info_panel.tsx index 4c2462e10..eeed8beda 100644 --- a/app/soapbox/features/ui/components/instance_info_panel.tsx +++ b/app/soapbox/features/ui/components/instance_info_panel.tsx @@ -43,7 +43,7 @@ const InstanceInfoPanel: React.FC = ({ host }) => { ); diff --git a/app/soapbox/features/ui/components/instance_moderation_panel.tsx b/app/soapbox/features/ui/components/instance_moderation_panel.tsx index ed97495f1..3ea9cf715 100644 --- a/app/soapbox/features/ui/components/instance_moderation_panel.tsx +++ b/app/soapbox/features/ui/components/instance_moderation_panel.tsx @@ -37,7 +37,7 @@ const InstanceModerationPanel: React.FC = ({ host }) = return [{ text: intl.formatMessage(messages.editFederation), action: handleEditFederation, - icon: require('@tabler/icons/icons/edit.svg'), + icon: require('@tabler/icons/edit.svg'), }]; }; @@ -47,7 +47,7 @@ const InstanceModerationPanel: React.FC = ({ host }) = } action={account?.admin ? ( - + ) : undefined} > diff --git a/app/soapbox/features/ui/components/media_modal.js b/app/soapbox/features/ui/components/media_modal.js index 111bbede1..dcc670d15 100644 --- a/app/soapbox/features/ui/components/media_modal.js +++ b/app/soapbox/features/ui/components/media_modal.js @@ -121,13 +121,13 @@ class MediaModal extends ImmutablePureComponent { const leftNav = media.size > 1 && ( ); const rightNav = media.size > 1 && ( ); @@ -252,7 +252,7 @@ class MediaModal extends ImmutablePureComponent {
- + {leftNav} {rightNav} diff --git a/app/soapbox/features/ui/components/modals/landing-page-modal.tsx b/app/soapbox/features/ui/components/modals/landing-page-modal.tsx index d3e9b8be5..22a733f60 100644 --- a/app/soapbox/features/ui/components/modals/landing-page-modal.tsx +++ b/app/soapbox/features/ui/components/modals/landing-page-modal.tsx @@ -44,7 +44,7 @@ const LandingPageModal: React.FC = ({ onClose }) => { target='_blank' className='p-3 space-x-3 flex items-center rounded-md dark:hover:bg-slate-900/50 hover:bg-gray-50' > - + {intl.formatMessage(messages.helpCenter)} diff --git a/app/soapbox/features/ui/components/modals/report-modal/steps/other-actions-step.tsx b/app/soapbox/features/ui/components/modals/report-modal/steps/other-actions-step.tsx index f22cde28b..7ce82995d 100644 --- a/app/soapbox/features/ui/components/modals/report-modal/steps/other-actions-step.tsx +++ b/app/soapbox/features/ui/components/modals/report-modal/steps/other-actions-step.tsx @@ -67,7 +67,7 @@ const OtherActionsStep = ({ account }: IOtherActionsStep) => {
); diff --git a/app/soapbox/features/verification/email_passthru.tsx b/app/soapbox/features/verification/email_passthru.tsx index ebe36e5f0..2211e6d96 100644 --- a/app/soapbox/features/verification/email_passthru.tsx +++ b/app/soapbox/features/verification/email_passthru.tsx @@ -33,7 +33,7 @@ const Success = () => { return ( - + {intl.formatMessage(messages.emailConfirmedHeading)} @@ -49,7 +49,7 @@ const GenericFail = () => { return ( - + {intl.formatMessage(messages.genericFailHeading)} @@ -65,7 +65,7 @@ const TokenNotFound = () => { return ( - + {intl.formatMessage(messages.tokenNotFoundHeading)} @@ -82,7 +82,7 @@ const TokenExpired = () => { return ( - + {intl.formatMessage(messages.tokenExpiredHeading)} diff --git a/app/soapbox/features/verification/registration.tsx b/app/soapbox/features/verification/registration.tsx index 02aea214c..a06d49963 100644 --- a/app/soapbox/features/verification/registration.tsx +++ b/app/soapbox/features/verification/registration.tsx @@ -109,7 +109,7 @@ const Registration = () => { value={username} onChange={handleInputChange} required - icon={require('@tabler/icons/icons/at.svg')} + icon={require('@tabler/icons/at.svg')} /> diff --git a/app/soapbox/features/verification/steps/email-verification.tsx b/app/soapbox/features/verification/steps/email-verification.tsx index b8c1810b1..9ee87cbee 100644 --- a/app/soapbox/features/verification/steps/email-verification.tsx +++ b/app/soapbox/features/verification/steps/email-verification.tsx @@ -37,7 +37,7 @@ const EmailSent: React.FC = ({ handleSubmit }) => { return (
- +
We sent you an email diff --git a/app/soapbox/features/video/index.js b/app/soapbox/features/video/index.js index 0bcb094d7..d4250029b 100644 --- a/app/soapbox/features/video/index.js +++ b/app/soapbox/features/video/index.js @@ -589,8 +589,8 @@ class Video extends React.PureComponent {
- - + +
@@ -613,10 +613,10 @@ class Video extends React.PureComponent {
- {(sensitive && !onCloseVideo) && } - {(!fullscreen && onOpenVideo) && } - {/* onCloseVideo && */} - + {(sensitive && !onCloseVideo) && } + {(!fullscreen && onOpenVideo) && } + {/* onCloseVideo && */} +
diff --git a/package.json b/package.json index cb9ab4481..09b041554 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "@sentry/browser": "^7.2.0", "@sentry/react": "^7.2.0", "@sentry/tracing": "^7.2.0", - "@tabler/icons": "^1.71.0", + "@tabler/icons": "^1.73.0", "@tailwindcss/forms": "^0.4.0", "@tailwindcss/typography": "^0.5.1", "@testing-library/react": "^12.1.4", diff --git a/webpack/shared.js b/webpack/shared.js index 9dee79de1..fb8308ee4 100644 --- a/webpack/shared.js +++ b/webpack/shared.js @@ -145,9 +145,6 @@ module.exports = { 'node_modules', ], alias: { - // Override tabler's package.json to allow importing .svg files directly - // https://stackoverflow.com/a/35990101/8811886 - '@tabler': resolve('node_modules', '@tabler'), 'icons': resolve('app', 'icons'), 'custom': resolve('custom'), }, diff --git a/yarn.lock b/yarn.lock index 8d2248152..1a0aa5c4e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2284,10 +2284,10 @@ remark "^13.0.0" unist-util-find-all-after "^3.0.2" -"@tabler/icons@^1.71.0": - version "1.71.0" - resolved "https://registry.yarnpkg.com/@tabler/icons/-/icons-1.71.0.tgz#74d771aa18487ea92af07c67048e411ada0f0427" - integrity sha512-hOeXAWSXGgT2S8O9QrRTomEq6YE1AtuXrcOy5DgGVI93xub1JnGSA3Z9gZzuND4pSJ+Ee+geI5u8hTYbfIsuGw== +"@tabler/icons@^1.73.0": + version "1.73.0" + resolved "https://registry.yarnpkg.com/@tabler/icons/-/icons-1.73.0.tgz#26d81858baf41be939504e1f9b4b32835eda6fdb" + integrity sha512-MhAHFzVj79ZWlAIRD++7Mk55PZsdlEdkfkjO3DD257mqj8iJZQRAQtkx2UFJXVs2mMrcOUu1qtj4rlVC8BfnKA== "@tailwindcss/forms@^0.4.0": version "0.4.0" From 16c08b23a8cbb42d5c604fcb6325d2346c56fe6d Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 9 Jul 2022 11:22:38 -0500 Subject: [PATCH 11/13] Fix improper import of Tabler icons --- app/soapbox/components/status_action_bar.tsx | 6 +++--- app/soapbox/features/status/components/action-bar.tsx | 6 +++--- app/soapbox/features/ui/components/instance_info_panel.tsx | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/soapbox/components/status_action_bar.tsx b/app/soapbox/components/status_action_bar.tsx index fe79fb2db..c3a3087a3 100644 --- a/app/soapbox/components/status_action_bar.tsx +++ b/app/soapbox/components/status_action_bar.tsx @@ -404,7 +404,7 @@ class StatusActionBar extends ImmutablePureComponent { menu.push({ text: intl.formatMessage(status.bookmarked ? messages.unbookmark : messages.bookmark), action: this.handleBookmarkClick, - icon: require(status.bookmarked ? '@tabler/icons/bookmark-off.svg' : '@tabler/icons/bookmark.svg'), + icon: status.bookmarked ? require('@tabler/icons/bookmark-off.svg') : require('@tabler/icons/bookmark.svg'), }); } @@ -400,7 +400,7 @@ class ActionBar extends React.PureComponent { menu.push({ text: intl.formatMessage(status.pinned ? messages.unpin : messages.pin), action: this.handlePinClick, - icon: require(mutingConversation ? '@tabler/icons/pinned-off.svg' : '@tabler/icons/pin.svg'), + icon: mutingConversation ? require('@tabler/icons/pinned-off.svg') : require('@tabler/icons/pin.svg'), }); menu.push(null); @@ -417,7 +417,7 @@ class ActionBar extends React.PureComponent { menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick, - icon: require(mutingConversation ? '@tabler/icons/bell.svg' : '@tabler/icons/bell-off.svg'), + icon: mutingConversation ? require('@tabler/icons/bell.svg') : require('@tabler/icons/bell-off.svg'), }); menu.push(null); menu.push({ diff --git a/app/soapbox/features/ui/components/instance_info_panel.tsx b/app/soapbox/features/ui/components/instance_info_panel.tsx index eeed8beda..3467455b3 100644 --- a/app/soapbox/features/ui/components/instance_info_panel.tsx +++ b/app/soapbox/features/ui/components/instance_info_panel.tsx @@ -43,7 +43,7 @@ const InstanceInfoPanel: React.FC = ({ host }) => { ); From 0dc9478600cb5a7b5eeac7fb3f85b4192a1a449e Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 9 Jul 2022 14:04:01 -0500 Subject: [PATCH 12/13] Jest: simplify regexes --- jest.config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jest.config.js b/jest.config.js index e86307f93..3fa667c36 100644 --- a/jest.config.js +++ b/jest.config.js @@ -38,12 +38,12 @@ module.exports = { 'transformIgnorePatterns': [ // FIXME: react-sticky-box doesn't provide a CJS build, so transform it for now // https://github.com/codecks-io/react-sticky-box/issues/79 - `/node_modules/(?!(react-sticky-box|.+\\.(${ASSET_EXTS})))`, + `/node_modules/(?!(react-sticky-box|.+\\.(${ASSET_EXTS})$))`, // Ignore node_modules, except static assets - // `/node_modules/(?!.+\\.(${ASSET_EXTS}))`, + // `/node_modules/(?!.+\\.(${ASSET_EXTS})$)`, ], 'transform': { '\\.[jt]sx?$': 'babel-jest', - [`.+\\.(${ASSET_EXTS})$`]: '/jest/assetTransformer.js', + [`\\.(${ASSET_EXTS})$`]: '/jest/assetTransformer.js', }, }; From 8bcf5fe82d7ba3d70fe73ea5fb71a9f6d97d5b54 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 9 Jul 2022 14:25:19 -0500 Subject: [PATCH 13/13] Update tests for Jest v28, apply uuid hack https://github.com/uuidjs/uuid/pull/616#issuecomment-1111012599 --- app/soapbox/reducers/__tests__/contexts.test.ts | 3 ++- jest.config.js | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/soapbox/reducers/__tests__/contexts.test.ts b/app/soapbox/reducers/__tests__/contexts.test.ts index 901763091..29e9e3c07 100644 --- a/app/soapbox/reducers/__tests__/contexts.test.ts +++ b/app/soapbox/reducers/__tests__/contexts.test.ts @@ -2,6 +2,7 @@ import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet, fromJS, + is, } from 'immutable'; import { STATUS_IMPORT } from 'soapbox/actions/importer'; @@ -111,7 +112,7 @@ describe('contexts reducer', () => { }) as ImmutableMap>, }); - expect(reducer(state, action)).toEqual(expected); + expect(is(reducer(state, action), expected)).toBe(true); }); }); }); diff --git a/jest.config.js b/jest.config.js index 3fa667c36..468401c51 100644 --- a/jest.config.js +++ b/jest.config.js @@ -33,6 +33,10 @@ module.exports = { '/node_modules', '/app', ], + 'moduleNameMapper': { + // https://github.com/uuidjs/uuid/pull/616#issuecomment-1111012599 + '^uuid$': require.resolve('uuid'), + }, 'testMatch': ['**/*/__tests__/**/?(*.|*-)+(test).(ts|js)?(x)'], 'testEnvironment': 'jsdom', 'transformIgnorePatterns': [