From fd497878218bf553fb5fa82749311483c65c374a Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 22 Apr 2024 09:30:53 +0100 Subject: [PATCH] Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 102 +++++++++++++++++++++++++-------------------------- yarn.lock | 22 ++++------- 2 files changed, 59 insertions(+), 65 deletions(-) diff --git a/package.json b/package.json index f1a8948e3b..c4b2e65718 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,14 @@ "contribute.json" ], "style": "bundle.css", + "matrix_i18n_extra_translation_funcs": [ + "UserFriendlyError" + ], "scripts": { "i18n": "matrix-gen-i18n && yarn i18n:sort && yarn i18n:lint", + "i18n:sort": "jq --sort-keys '.' src/i18n/strings/en_EN.json > src/i18n/strings/en_EN.json.tmp && mv src/i18n/strings/en_EN.json.tmp src/i18n/strings/en_EN.json", + "i18n:lint": "prettier --log-level=silent --write src/i18n/strings/ --ignore-path /dev/null", + "i18n:diff": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json", "clean": "rimraf lib webapp", "build": "yarn clean && yarn build:genfiles && yarn build:bundle", "build-stats": "yarn clean && yarn build:genfiles && yarn build:bundle-stats", @@ -53,19 +59,16 @@ "lint:types:src": "tsc --noEmit --jsx react", "lint:types:module_system": "tsc --noEmit --project ./tsconfig.module_system.json", "lint:style": "stylelint \"res/css/**/*.pcss\"", + "lint:workflows": "find .github/workflows -type f \\( -iname '*.yaml' -o -iname '*.yml' \\) | xargs -I {} sh -c 'echo \"Linting {}\"; action-validator \"{}\"'", "test": "jest", "coverage": "yarn test --coverage", "analyse:unused-exports": "ts-node ./scripts/analyse_unused_exports.ts", - "update:jitsi": "curl -s https://meet.element.io/libs/external_api.min.js > ./res/jitsi_external_api.min.js", - "lint:workflows": "find .github/workflows -type f \\( -iname '*.yaml' -o -iname '*.yml' \\) | xargs -I {} sh -c 'echo \"Linting {}\"; action-validator \"{}\"'", - "i18n:sort": "jq --sort-keys '.' src/i18n/strings/en_EN.json > src/i18n/strings/en_EN.json.tmp && mv src/i18n/strings/en_EN.json.tmp src/i18n/strings/en_EN.json", - "i18n:lint": "prettier --log-level=silent --write src/i18n/strings/ --ignore-path /dev/null", - "i18n:diff": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json", - "analyse:webpack-bundles": "webpack-bundle-analyzer webpack-stats.json webapp" + "analyse:webpack-bundles": "webpack-bundle-analyzer webpack-stats.json webapp", + "update:jitsi": "curl -s https://meet.element.io/libs/external_api.min.js > ./res/jitsi_external_api.min.js" }, "resolutions": { - "@types/react-dom": "18.0.11", - "@types/react": "18.0.28" + "@types/react-dom": "18.2.25", + "@types/react": "18.2.79" }, "dependencies": { "@matrix-org/olm": "3.2.15", @@ -73,20 +76,23 @@ "gfm.css": "^1.1.2", "jsrsasign": "^11.0.0", "katex": "^0.16.0", + "lodash": "^4.17.21", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^1.3.1", "react": "^18.2.0", "react-dom": "^18.2.0", - "ua-parser-js": "^1.0.0", - "lodash": "^4.17.21" + "ua-parser-js": "^1.0.0" }, "devDependencies": { + "@action-validator/cli": "^0.6.0", + "@action-validator/core": "^0.6.0", "@babel/core": "^7.12.10", "@babel/eslint-parser": "^7.12.10", "@babel/eslint-plugin": "^7.12.10", "@babel/plugin-proposal-class-properties": "^7.12.1", "@babel/plugin-proposal-export-default-from": "^7.12.1", + "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1", "@babel/plugin-proposal-numeric-separator": "^7.12.7", "@babel/plugin-proposal-object-rest-spread": "^7.12.1", @@ -103,21 +109,45 @@ "@sentry/webpack-plugin": "^2.7.1", "@svgr/webpack": "^8.0.0", "@testing-library/react": "^14", + "@types/commonmark": "^0.27.9", + "@types/content-type": "^1.1.8", + "@types/counterpart": "^0.18.4", + "@types/diff-match-patch": "^1.0.36", + "@types/escape-html": "^1.0.4", + "@types/file-saver": "^2.0.7", + "@types/glob-to-regexp": "^0.4.4", "@types/jest": "^29.0.0", + "@types/jitsi-meet": "^2.0.2", "@types/jsrsasign": "^10.5.4", + "@types/katex": "^0.16.7", + "@types/lodash": "^4.14.197", + "@types/minimist": "^1.2.5", "@types/modernizr": "^3.5.6", "@types/node": "^16", - "@types/react": "18.0.28", - "@types/react-dom": "18.0.11", + "@types/node-fetch": "^2.6.4", + "@types/pako": "^2.0.3", + "@types/qrcode": "^1.5.5", + "@types/react": "18.2.79", + "@types/react-beautiful-dnd": "^13.1.7", + "@types/react-dom": "18.2.25", + "@types/react-transition-group": "^4.4.9", "@types/sanitize-html": "^2.9.5", + "@types/sdp-transform": "^2.4.9", + "@types/tar-js": "^0.3.5", "@types/ua-parser-js": "^0.7.36", + "@types/uuid": "^9.0.7", "@typescript-eslint/eslint-plugin": "^7.0.0", "@typescript-eslint/parser": "^7.0.0", "babel-jest": "^29.0.0", "babel-loader": "^9.0.0", + "babel-plugin-jsx-remove-data-test-id": "^3.0.0", + "buffer": "^6.0.3", "chokidar": "^3.5.1", "concurrently": "^8.0.0", + "copy-webpack-plugin": "^12.0.0", + "cronstrue": "^2.41.0", "css-loader": "^7.0.0", + "css-minimizer-webpack-plugin": "^6.0.0", "dotenv": "^16.0.2", "eslint": "8.57.0", "eslint-config-google": "^0.14.0", @@ -129,6 +159,7 @@ "eslint-plugin-react-hooks": "^4.3.0", "eslint-plugin-unicorn": "^52.0.0", "fake-indexeddb": "^5.0.0", + "fetch-mock": "9.11.0", "fetch-mock-jest": "^1.5.1", "file-loader": "^6.0.0", "html-webpack-plugin": "^5.5.3", @@ -155,61 +186,30 @@ "postcss-scss": "^4.0.4", "postcss-simple-vars": "^7.0.1", "prettier": "3.2.5", + "process": "^0.11.10", "raw-loader": "^4.0.2", "rimraf": "^5.0.0", "semver": "^7.5.2", + "setimmediate": "^1.0.5", "string-replace-loader": "3", "style-loader": "4", "stylelint": "^16.1.0", "stylelint-config-standard": "^36.0.0", "stylelint-scss": "^6.0.0", "terser-webpack-plugin": "^5.3.9", + "ts-node": "^10.9.1", "ts-prune": "^0.10.3", "typescript": "5.4.3", + "util": "^0.12.5", "webpack": "^5.89.0", + "webpack-bundle-analyzer": "^4.8.0", "webpack-cli": "^5.0.0", "webpack-dev-server": "^5.0.0", - "yaml": "^2.3.3", - "webpack-bundle-analyzer": "^4.8.0", - "util": "^0.12.5", - "ts-node": "^10.9.1", - "setimmediate": "^1.0.5", - "process": "^0.11.10", - "fetch-mock": "9.11.0", - "css-minimizer-webpack-plugin": "^6.0.0", - "cronstrue": "^2.41.0", - "copy-webpack-plugin": "^12.0.0", - "buffer": "^6.0.3", - "babel-plugin-jsx-remove-data-test-id": "^3.0.0", - "@types/uuid": "^9.0.7", - "@types/tar-js": "^0.3.5", - "@types/sdp-transform": "^2.4.9", - "@types/react-transition-group": "^4.4.9", - "@types/react-beautiful-dnd": "^13.1.7", - "@types/qrcode": "^1.5.5", - "@types/pako": "^2.0.3", - "@types/node-fetch": "^2.6.4", - "@types/minimist": "^1.2.5", - "@types/lodash": "^4.14.197", - "@types/katex": "^0.16.7", - "@types/jitsi-meet": "^2.0.2", - "@types/glob-to-regexp": "^0.4.4", - "@types/file-saver": "^2.0.7", - "@types/escape-html": "^1.0.4", - "@types/diff-match-patch": "^1.0.36", - "@types/counterpart": "^0.18.4", - "@types/content-type": "^1.1.8", - "@types/commonmark": "^0.27.9", - "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7", - "@action-validator/core": "^0.6.0", - "@action-validator/cli": "^0.6.0" + "yaml": "^2.3.3" }, "@casualbot/jest-sonar-reporter": { "outputDirectory": "coverage", "outputName": "jest-sonar-report.xml", "relativePaths": true - }, - "matrix_i18n_extra_translation_funcs": [ - "UserFriendlyError" - ] -} \ No newline at end of file + } +} diff --git a/yarn.lock b/yarn.lock index 5939910599..966ae0c8a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3280,10 +3280,10 @@ dependencies: "@types/react" "*" -"@types/react-dom@18.0.11", "@types/react-dom@^18.0.0": - version "18.0.11" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.11.tgz#321351c1459bc9ca3d216aefc8a167beec334e33" - integrity sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw== +"@types/react-dom@18.2.25", "@types/react-dom@^18.0.0": + version "18.2.25" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.25.tgz#2946a30081f53e7c8d585eb138277245caedc521" + integrity sha512-o/V48vf4MQh7juIKZU2QGDfli6p1+OOi5oXx36Hffpc9adsHeXjVp8rHuPkjd8VT8sOJ2Zp05HR7CdpGTIUFUA== dependencies: "@types/react" "*" @@ -3304,13 +3304,12 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@18.0.28": - version "18.0.28" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.28.tgz#accaeb8b86f4908057ad629a26635fe641480065" - integrity sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew== +"@types/react@*", "@types/react@18.2.79": + version "18.2.79" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.79.tgz#c40efb4f255711f554d47b449f796d1c7756d865" + integrity sha512-RwGAGXPl9kSXwdNTafkOEuFrTBD5SA2B3iEB96xi8+xu5ddUa/cpvyVCSNn+asgLCTHkb5ZxN8gbuibYJi4s1w== dependencies: "@types/prop-types" "*" - "@types/scheduler" "*" csstype "^3.0.2" "@types/retry@0.12.0": @@ -3330,11 +3329,6 @@ dependencies: htmlparser2 "^8.0.0" -"@types/scheduler@*": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.4.tgz#fedc3e5b15c26dc18faae96bf1317487cb3658cf" - integrity sha512-2L9ifAGl7wmXwP4v3pN4p2FLhD0O1qsJpvKmNin5VA8+UvNVb447UDaAEV6UdrkA+m/Xs58U1RFps44x6TFsVQ== - "@types/sdp-transform@^2.4.9": version "2.4.9" resolved "https://registry.yarnpkg.com/@types/sdp-transform/-/sdp-transform-2.4.9.tgz#26ef39f487a6909b0512f580b80920a366b27f52"