From 70e256bd86d5ea1162f59413671ba5a10218b8c4 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 1 Apr 2021 16:49:57 +0200 Subject: [PATCH] [MIRROR] Upgrade tgui dependencies, make yarn task skippable (#4578) * Upgrade tgui dependencies, make yarn task skippable (#58081) * Upgrade tgui dependencies, make yarn task skippable * Use a phony target to avoid double rebuilds * Upgrade tgui dependencies, make yarn task skippable Co-authored-by: Aleksej Komarov --- tgui/bin/tgui | 5 +- tgui/bin/tgui_.ps1 | 5 +- tgui/package.json | 28 +- tgui/packages/tgfont/package.json | 2 +- tgui/packages/tgui-dev-server/package.json | 2 +- tgui/packages/tgui-panel/package.json | 2 +- tgui/packages/tgui-polyfill/package.json | 2 +- tgui/packages/tgui/package.json | 2 +- tgui/yarn.lock | 691 +++++++++++---------- tools/build/build.js | 27 +- tools/build/cbt/task.js | 3 + 11 files changed, 406 insertions(+), 363 deletions(-) diff --git a/tgui/bin/tgui b/tgui/bin/tgui index 73053553e35..5569655fa44 100755 --- a/tgui/bin/tgui +++ b/tgui/bin/tgui @@ -89,8 +89,9 @@ task-clean() { rm -rf .yarn/cache rm -rf .yarn/unplugged rm -rf .yarn/webpack - rm -rf .yarn/build-state.yml - rm -rf .yarn/install-state.gz + rm -f .yarn/build-state.yml + rm -f .yarn/install-state.gz + rm -f .yarn/install-target rm -f .pnp.js ## NPM artifacts rm -rf **/node_modules diff --git a/tgui/bin/tgui_.ps1 b/tgui/bin/tgui_.ps1 index daeb794eccc..c8f74b2d214 100644 --- a/tgui/bin/tgui_.ps1 +++ b/tgui/bin/tgui_.ps1 @@ -72,8 +72,9 @@ function task-clean { Remove-Quiet -Recurse -Force ".yarn\cache" Remove-Quiet -Recurse -Force ".yarn\unplugged" Remove-Quiet -Recurse -Force ".yarn\webpack" - Remove-Quiet -Recurse -Force ".yarn\build-state.yml" - Remove-Quiet -Recurse -Force ".yarn\install-state.gz" + Remove-Quiet -Force ".yarn\build-state.yml" + Remove-Quiet -Force ".yarn\install-state.gz" + Remove-Quiet -Force ".yarn\install-target" Remove-Quiet -Force ".pnp.js" ## NPM artifacts Get-ChildItem -Path "." -Include "node_modules" -Recurse -File:$false | Remove-Item -Recurse -Force diff --git a/tgui/package.json b/tgui/package.json index 9ed8c1efea0..29b80b433dd 100644 --- a/tgui/package.json +++ b/tgui/package.json @@ -6,39 +6,39 @@ "packages/*" ], "dependencies": { - "@babel/core": "^7.13.8", - "@babel/eslint-parser": "^7.13.8", + "@babel/core": "^7.13.14", + "@babel/eslint-parser": "^7.13.14", "@babel/plugin-proposal-class-properties": "^7.13.0", "@babel/plugin-transform-jscript": "^7.12.13", - "@babel/preset-env": "^7.13.9", + "@babel/preset-env": "^7.13.12", "@babel/preset-typescript": "^7.13.0", - "@types/jest": "^26.0.20", - "@types/jsdom": "^16.2.6", - "@types/node": "^14.14.31", - "@typescript-eslint/parser": "^4.16.1", + "@types/jest": "^26.0.22", + "@types/jsdom": "^16.2.9", + "@types/node": "^14.14.37", + "@typescript-eslint/parser": "^4.20.0", "babel-jest": "^26.6.3", "babel-loader": "^8.2.2", "babel-plugin-inferno": "^6.1.1", "babel-plugin-transform-remove-console": "^6.9.4", "common": "workspace:*", - "css-loader": "^5.1.1", - "eslint": "^7.21.0", + "css-loader": "^5.2.0", + "eslint": "^7.23.0", "eslint-plugin-radar": "^0.2.1", - "eslint-plugin-react": "^7.22.0", + "eslint-plugin-react": "^7.23.1", "file-loader": "^6.2.0", "inferno": "^7.4.8", "jest": "^26.6.3", "jest-circus": "^26.6.3", - "jsdom": "^16.4.0", - "mini-css-extract-plugin": "^1.3.9", + "jsdom": "^16.5.2", + "mini-css-extract-plugin": "^1.4.0", "sass": "^1.32.8", "sass-loader": "^11.0.1", "style-loader": "^2.0.0", "terser-webpack-plugin": "^5.1.1", "typescript": "^4.2.3", "url-loader": "^4.1.1", - "webpack": "^5.24.3", + "webpack": "^5.28.0", "webpack-bundle-analyzer": "^4.4.0", - "webpack-cli": "^4.5.0" + "webpack-cli": "^4.6.0" } } diff --git a/tgui/packages/tgfont/package.json b/tgui/packages/tgfont/package.json index bf10a5d18a5..72308f125bd 100644 --- a/tgui/packages/tgfont/package.json +++ b/tgui/packages/tgfont/package.json @@ -3,7 +3,7 @@ "name": "tgfont", "version": "1.0.0", "dependencies": { - "fantasticon": "^1.1.1" + "fantasticon": "^1.1.3" }, "scripts": { "build": "node mkdist.cjs && fantasticon --config config.cjs" diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json index 5a04f61d75e..ecc42dd7440 100644 --- a/tgui/packages/tgui-dev-server/package.json +++ b/tgui/packages/tgui-dev-server/package.json @@ -9,6 +9,6 @@ "glob": "^7.1.6", "source-map": "^0.7.3", "stacktrace-parser": "^0.1.10", - "ws": "^7.4.3" + "ws": "^7.4.4" } } diff --git a/tgui/packages/tgui-panel/package.json b/tgui/packages/tgui-panel/package.json index 33180fa61bd..a5b542859c1 100644 --- a/tgui/packages/tgui-panel/package.json +++ b/tgui/packages/tgui-panel/package.json @@ -4,7 +4,7 @@ "version": "4.3.0", "dependencies": { "common": "workspace:*", - "dompurify": "^2.2.6", + "dompurify": "^2.2.7", "inferno": "^7.4.8", "tgui": "workspace:*", "tgui-dev-server": "workspace:*", diff --git a/tgui/packages/tgui-polyfill/package.json b/tgui/packages/tgui-polyfill/package.json index 8aa288089d1..234b33f192e 100644 --- a/tgui/packages/tgui-polyfill/package.json +++ b/tgui/packages/tgui-polyfill/package.json @@ -4,7 +4,7 @@ "version": "4.3.0", "dependencies": { "core-js": "^3.9.1", - "regenerator-runtime": "^0.13.7", + "regenerator-runtime": "^0.13.8", "whatwg-fetch": "^3.6.2" } } diff --git a/tgui/packages/tgui/package.json b/tgui/packages/tgui/package.json index cc584dd668e..f39d03ff77a 100644 --- a/tgui/packages/tgui/package.json +++ b/tgui/packages/tgui/package.json @@ -4,7 +4,7 @@ "version": "4.3.0", "dependencies": { "common": "workspace:*", - "dompurify": "^2.2.6", + "dompurify": "^2.2.7", "inferno": "^7.4.8", "inferno-vnode-flags": "^7.4.8", "marked": "^2.0.1", diff --git a/tgui/yarn.lock b/tgui/yarn.lock index 62e82639559..e4f063cbb16 100644 --- a/tgui/yarn.lock +++ b/tgui/yarn.lock @@ -23,59 +23,58 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.13.0, @babel/compat-data@npm:^7.13.8": - version: 7.13.8 - resolution: "@babel/compat-data@npm:7.13.8" - checksum: e07e24737973206dd17439224945a354352ce0896d5a0bdd22fc637464eb650bdf6651a42352dc35fa8d55842ce1b66e545a1e3c096ee8f45947dcc32a44be44 +"@babel/compat-data@npm:^7.13.0, @babel/compat-data@npm:^7.13.12, @babel/compat-data@npm:^7.13.8": + version: 7.13.12 + resolution: "@babel/compat-data@npm:7.13.12" + checksum: a7165243d68ee4d3f22cddd431175678df9c01dc12c11621ba8a76af9907d922d68afaa9f32a05ce2b85e55895dd8ca5c9407a8ec72ffcda12400ca24714d15a languageName: node linkType: hard -"@babel/core@npm:7.13.8, @babel/core@npm:^7.1.0, @babel/core@npm:^7.13.8, @babel/core@npm:^7.7.5": - version: 7.13.8 - resolution: "@babel/core@npm:7.13.8" +"@babel/core@npm:7.13.14, @babel/core@npm:^7.1.0, @babel/core@npm:^7.13.14, @babel/core@npm:^7.7.5": + version: 7.13.14 + resolution: "@babel/core@npm:7.13.14" dependencies: "@babel/code-frame": ^7.12.13 - "@babel/generator": ^7.13.0 - "@babel/helper-compilation-targets": ^7.13.8 - "@babel/helper-module-transforms": ^7.13.0 - "@babel/helpers": ^7.13.0 - "@babel/parser": ^7.13.4 + "@babel/generator": ^7.13.9 + "@babel/helper-compilation-targets": ^7.13.13 + "@babel/helper-module-transforms": ^7.13.14 + "@babel/helpers": ^7.13.10 + "@babel/parser": ^7.13.13 "@babel/template": ^7.12.13 - "@babel/traverse": ^7.13.0 - "@babel/types": ^7.13.0 + "@babel/traverse": ^7.13.13 + "@babel/types": ^7.13.14 convert-source-map: ^1.7.0 debug: ^4.1.0 gensync: ^1.0.0-beta.2 json5: ^2.1.2 - lodash: ^4.17.19 semver: ^6.3.0 source-map: ^0.5.0 - checksum: f3c61e635aa41e127775d1191a65aedd4cf90008625eb93ddbd86214ebae6b0793cefd10503b2a4df8aa510d0e1108dfd15e29bde9bbffc899a50015f56f49c4 + checksum: 36b0d604078b735d8f248990b2c578cd73f5b691512175c45d95f0a3d841e11695f0816c8a4386a7ae884f5b5b865fcffe39d2105f6aa6065f261dda8c7f0313 languageName: node linkType: hard -"@babel/eslint-parser@npm:^7.13.8": - version: 7.13.8 - resolution: "@babel/eslint-parser@npm:7.13.8" +"@babel/eslint-parser@npm:^7.13.14": + version: 7.13.14 + resolution: "@babel/eslint-parser@npm:7.13.14" dependencies: - eslint-scope: 5.1.0 + eslint-scope: ^5.1.0 eslint-visitor-keys: ^1.3.0 semver: ^6.3.0 peerDependencies: "@babel/core": ">=7.11.0" eslint: ">=7.5.0" - checksum: d89951ded0ae1d820a2975d5ce0d6bf5f20ccbfeac7c0bb6a7ba77a885713d17e627d034db9e0441b4f63475735ee6d9b1e4bc7b5f059ecc7c44e177749b2796 + checksum: f115202b60f677ef66d8a6c91bb1e9a4916994bf33289873e2cc18cd4420fc5bd37fbc12891b3d410bce83824938fed719d5d76d707f4de09e051d24becb6324 languageName: node linkType: hard -"@babel/generator@npm:^7.13.0": - version: 7.13.0 - resolution: "@babel/generator@npm:7.13.0" +"@babel/generator@npm:^7.13.9": + version: 7.13.9 + resolution: "@babel/generator@npm:7.13.9" dependencies: "@babel/types": ^7.13.0 jsesc: ^2.5.1 source-map: ^0.5.0 - checksum: d406238edc9e967e5a5013b9c7cf02d9eb4ea0160cd209cb63edb39a095d392b007e6762acb65ae79958a8bc0cf94945155b34dbcb2dfc93df1159881c217148 + checksum: d9cf7db910dd703a55c3ba147a8024564d51de06f5e3e61aef6ca197bcd80a6cb0a633fe4688c8c9f6226c70ee6f32a747050a8e420972b45cc98a6b3fc5ae66 languageName: node linkType: hard @@ -98,17 +97,17 @@ __metadata: languageName: node linkType: hard -"@babel/helper-compilation-targets@npm:^7.13.0, @babel/helper-compilation-targets@npm:^7.13.8": - version: 7.13.8 - resolution: "@babel/helper-compilation-targets@npm:7.13.8" +"@babel/helper-compilation-targets@npm:^7.13.0, @babel/helper-compilation-targets@npm:^7.13.10, @babel/helper-compilation-targets@npm:^7.13.13, @babel/helper-compilation-targets@npm:^7.13.8": + version: 7.13.13 + resolution: "@babel/helper-compilation-targets@npm:7.13.13" dependencies: - "@babel/compat-data": ^7.13.8 + "@babel/compat-data": ^7.13.12 "@babel/helper-validator-option": ^7.12.17 browserslist: ^4.14.5 semver: ^6.3.0 peerDependencies: "@babel/core": ^7.0.0 - checksum: dbee371e5ff226bb03a036d1af858f038ab6e71fac1ff5014bf69411b71af187bcdb0e49d5352ec5ef5e83186c9b88ee83b74295ba900691095b31017ec59f89 + checksum: 2d77381d5fa0e488e86b2abbf5c299a6c1b0e490c95d3ca9a63fac8d45713a182a32fedabceb207588681ae09fc1c19c5418c26e686ae752d46102c9537f9ec7 languageName: node linkType: hard @@ -196,38 +195,37 @@ __metadata: languageName: node linkType: hard -"@babel/helper-member-expression-to-functions@npm:^7.13.0": - version: 7.13.0 - resolution: "@babel/helper-member-expression-to-functions@npm:7.13.0" +"@babel/helper-member-expression-to-functions@npm:^7.13.0, @babel/helper-member-expression-to-functions@npm:^7.13.12": + version: 7.13.12 + resolution: "@babel/helper-member-expression-to-functions@npm:7.13.12" dependencies: - "@babel/types": ^7.13.0 - checksum: 9baaab9910a96c0f201b71c6cc39037dce5d32a321f61347ac489ddbef2bcbd232adcadeaa8e44d8c9a7216226c009b57f9d65697d90d7a8ed2c27682932d959 + "@babel/types": ^7.13.12 + checksum: 2c075f72e5bda1432c74484548272577485d45c4d6c7cc9e84c5d053eaa6e0890e93c9b018bab97f65cbb81ac04dd9cdca73d5ae0e94b03cfc00d10972b99185 languageName: node linkType: hard -"@babel/helper-module-imports@npm:^7.12.13": - version: 7.12.13 - resolution: "@babel/helper-module-imports@npm:7.12.13" +"@babel/helper-module-imports@npm:^7.12.13, @babel/helper-module-imports@npm:^7.13.12": + version: 7.13.12 + resolution: "@babel/helper-module-imports@npm:7.13.12" dependencies: - "@babel/types": ^7.12.13 - checksum: 9832436fb44361b2d7a0b7d99f18b7c0529afb94202ab92b578147aba062447e9a1cff33bc95db33189686fa922c62f23da296870958eee2f862b3aa89809159 + "@babel/types": ^7.13.12 + checksum: 4d1d3364bec0820e50c782b5a5c81e7987c260c14772bc594ca8dbfdb3b6e43bd9b4e5071fd2a5f777c822dc7440781fa904f643e2069755db9ba5033cb2beac languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.13.0": - version: 7.13.0 - resolution: "@babel/helper-module-transforms@npm:7.13.0" +"@babel/helper-module-transforms@npm:^7.13.0, @babel/helper-module-transforms@npm:^7.13.14": + version: 7.13.14 + resolution: "@babel/helper-module-transforms@npm:7.13.14" dependencies: - "@babel/helper-module-imports": ^7.12.13 - "@babel/helper-replace-supers": ^7.13.0 - "@babel/helper-simple-access": ^7.12.13 + "@babel/helper-module-imports": ^7.13.12 + "@babel/helper-replace-supers": ^7.13.12 + "@babel/helper-simple-access": ^7.13.12 "@babel/helper-split-export-declaration": ^7.12.13 "@babel/helper-validator-identifier": ^7.12.11 "@babel/template": ^7.12.13 - "@babel/traverse": ^7.13.0 - "@babel/types": ^7.13.0 - lodash: ^4.17.19 - checksum: b7e45c67eeaca488fa7a7bb0afebaec25b91f94cb04d32229ef799bd3a31ef5b566737fefd139b20c6525817528816e43bf492372c77e352e2a0e4d03b1fe21b + "@babel/traverse": ^7.13.13 + "@babel/types": ^7.13.14 + checksum: 576e86d0d41674e01703754a16e94495e424c7972f932e1eedb30206092b410b3659c0d0a7a06c61e024cee9b6020215db4732903ae49ebbd19d813feb0a90da languageName: node linkType: hard @@ -258,24 +256,24 @@ __metadata: languageName: node linkType: hard -"@babel/helper-replace-supers@npm:^7.12.13, @babel/helper-replace-supers@npm:^7.13.0": - version: 7.13.0 - resolution: "@babel/helper-replace-supers@npm:7.13.0" +"@babel/helper-replace-supers@npm:^7.12.13, @babel/helper-replace-supers@npm:^7.13.0, @babel/helper-replace-supers@npm:^7.13.12": + version: 7.13.12 + resolution: "@babel/helper-replace-supers@npm:7.13.12" dependencies: - "@babel/helper-member-expression-to-functions": ^7.13.0 + "@babel/helper-member-expression-to-functions": ^7.13.12 "@babel/helper-optimise-call-expression": ^7.12.13 "@babel/traverse": ^7.13.0 - "@babel/types": ^7.13.0 - checksum: b32ab3f4d6a4e7f80c361eb9c0a001c2ae498f885248cb567c8de2475fb3dcbdf7ddd32a9e9a926abf55cf4f46faad7ceebfd3d035dea5508c3d9ba55d4083cc + "@babel/types": ^7.13.12 + checksum: 38b79cb56a9a5324e32567660fcafbac4efae6f2c2c2ef048deb2d022476fc1c7acfda5ab841f7135d07b4f39e62142f9d253cfe824232030432c86f94d226f1 languageName: node linkType: hard -"@babel/helper-simple-access@npm:^7.12.13": - version: 7.12.13 - resolution: "@babel/helper-simple-access@npm:7.12.13" +"@babel/helper-simple-access@npm:^7.12.13, @babel/helper-simple-access@npm:^7.13.12": + version: 7.13.12 + resolution: "@babel/helper-simple-access@npm:7.13.12" dependencies: - "@babel/types": ^7.12.13 - checksum: 34f19da4b8129006d660ff6d704d493a447852268a1360727a7de32087c7cead4c2548a3bb73c8fee7afa2dcad85087d53f9b0cabe071f3bf5cc27f35de9e7c8 + "@babel/types": ^7.13.12 + checksum: eff532a1572a4ac562c5918a409871ddf9baee9ece197b98a54622184d3b9e01bdd465597f27ca3d452e71638c913a14819cf261dc095a466032dfd92a88bc73 languageName: node linkType: hard @@ -323,14 +321,14 @@ __metadata: languageName: node linkType: hard -"@babel/helpers@npm:^7.13.0": - version: 7.13.0 - resolution: "@babel/helpers@npm:7.13.0" +"@babel/helpers@npm:^7.13.10": + version: 7.13.10 + resolution: "@babel/helpers@npm:7.13.10" dependencies: "@babel/template": ^7.12.13 "@babel/traverse": ^7.13.0 "@babel/types": ^7.13.0 - checksum: 6c435aefe108e85b999570eed9fc2ec10944cb1ed4c3ff6656936c90a6f986174bd5c80ec48ecbbb7042e5eca5761364f484d7e0238a3aa77c2f5099dcac8df0 + checksum: 1bc93126957b51108080ab1aa24997a9a10d5f395de54621ce9df7825cdbce878ad9d26886c927c3d9bcfd75d24972037ed5fb904fcd83fb92e5c8f8628f6b40 languageName: node linkType: hard @@ -345,12 +343,25 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.13, @babel/parser@npm:^7.13.0, @babel/parser@npm:^7.13.4": - version: 7.13.4 - resolution: "@babel/parser@npm:7.13.4" +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.13, @babel/parser@npm:^7.13.13": + version: 7.13.13 + resolution: "@babel/parser@npm:7.13.13" bin: parser: ./bin/babel-parser.js - checksum: 3aac62adbd1fd91798751a09b385ed3810acffb7bd637066bea65acf16670fdc8c7c39bab2148c57b4d6606355344de01922c9aba86405c771eaabc58701077a + checksum: ae20be2d964cec7c6e8f1c8154b0b6457852a6269f957964b5cc7f39baa5b71dc733b9e88cc3f5b91de171f4c023d272040bf31065bef1573aa0e88dd0f3ee75 + languageName: node + linkType: hard + +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.13.12": + version: 7.13.12 + resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.13.12" + dependencies: + "@babel/helper-plugin-utils": ^7.13.0 + "@babel/helper-skip-transparent-expression-wrappers": ^7.12.1 + "@babel/plugin-proposal-optional-chaining": ^7.13.12 + peerDependencies: + "@babel/core": ^7.13.0 + checksum: ad0b508a5c3f3436ff0ff598b7aad63686bfe7f846b19c862c09397bc987ab9244b866204440496cf6d1b7ec07ea01a6fe95fd3067dbdf58ec48d9d4d4d9a440 languageName: node linkType: hard @@ -478,16 +489,16 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-optional-chaining@npm:^7.13.8": - version: 7.13.8 - resolution: "@babel/plugin-proposal-optional-chaining@npm:7.13.8" +"@babel/plugin-proposal-optional-chaining@npm:^7.13.12": + version: 7.13.12 + resolution: "@babel/plugin-proposal-optional-chaining@npm:7.13.12" dependencies: "@babel/helper-plugin-utils": ^7.13.0 "@babel/helper-skip-transparent-expression-wrappers": ^7.12.1 "@babel/plugin-syntax-optional-chaining": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 8295f1ceda1bc40eb281b611eeebc087db843de318bbffeecd245b0a0ffe7df723ec99c39579d2e1089af2694abde938f30defb16c5f909423fa6d57a7155598 + checksum: 8663cfbf5cdfe41f8765976b94de9525c223085d53bb48bd481a03539a7680f2aa3b3fd525d80144e1c1c646cbad817fea7ef8da573bbf0600ddde32fab7420b languageName: node linkType: hard @@ -1091,14 +1102,15 @@ __metadata: languageName: node linkType: hard -"@babel/preset-env@npm:^7.13.9": - version: 7.13.9 - resolution: "@babel/preset-env@npm:7.13.9" +"@babel/preset-env@npm:^7.13.12": + version: 7.13.12 + resolution: "@babel/preset-env@npm:7.13.12" dependencies: - "@babel/compat-data": ^7.13.8 - "@babel/helper-compilation-targets": ^7.13.8 + "@babel/compat-data": ^7.13.12 + "@babel/helper-compilation-targets": ^7.13.10 "@babel/helper-plugin-utils": ^7.13.0 "@babel/helper-validator-option": ^7.12.17 + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.13.12 "@babel/plugin-proposal-async-generator-functions": ^7.13.8 "@babel/plugin-proposal-class-properties": ^7.13.0 "@babel/plugin-proposal-dynamic-import": ^7.13.8 @@ -1109,7 +1121,7 @@ __metadata: "@babel/plugin-proposal-numeric-separator": ^7.12.13 "@babel/plugin-proposal-object-rest-spread": ^7.13.8 "@babel/plugin-proposal-optional-catch-binding": ^7.13.8 - "@babel/plugin-proposal-optional-chaining": ^7.13.8 + "@babel/plugin-proposal-optional-chaining": ^7.13.12 "@babel/plugin-proposal-private-methods": ^7.13.0 "@babel/plugin-proposal-unicode-property-regex": ^7.12.13 "@babel/plugin-syntax-async-generators": ^7.8.4 @@ -1157,7 +1169,7 @@ __metadata: "@babel/plugin-transform-unicode-escapes": ^7.12.13 "@babel/plugin-transform-unicode-regex": ^7.12.13 "@babel/preset-modules": ^0.1.4 - "@babel/types": ^7.13.0 + "@babel/types": ^7.13.12 babel-plugin-polyfill-corejs2: ^0.1.4 babel-plugin-polyfill-corejs3: ^0.1.3 babel-plugin-polyfill-regenerator: ^0.1.2 @@ -1165,7 +1177,7 @@ __metadata: semver: ^6.3.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 55ef45c648da2cf98d703a3f5128eeb883285580f02717059c1ac708ac8cb291e40705838dfdd4f4c59da3c96b816c13e2d2d0d9a7490e3bace4cf41ec8ba151 + checksum: e86ef0d986e388b5c4efd0b426975cc1e41d0aecea9b94ba54904ad06f2ba92d5ee82c3a073edb21cd7ca15b2a22970478cbdd63a69fb2f01d65161904aa998c languageName: node linkType: hard @@ -1217,31 +1229,30 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.13.0": - version: 7.13.0 - resolution: "@babel/traverse@npm:7.13.0" +"@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.13.13": + version: 7.13.13 + resolution: "@babel/traverse@npm:7.13.13" dependencies: "@babel/code-frame": ^7.12.13 - "@babel/generator": ^7.13.0 + "@babel/generator": ^7.13.9 "@babel/helper-function-name": ^7.12.13 "@babel/helper-split-export-declaration": ^7.12.13 - "@babel/parser": ^7.13.0 - "@babel/types": ^7.13.0 + "@babel/parser": ^7.13.13 + "@babel/types": ^7.13.13 debug: ^4.1.0 globals: ^11.1.0 - lodash: ^4.17.19 - checksum: e5d1b690157da325b5bea98e472f4df0fff16048242a70880e2da7939b005ccd5b63d2b4527e203cfc71a422da0fa513c0ad84114bff002d583ebd7dbd2c8576 + checksum: 2669b654730a308747c38c0f89a873fa2452c7e2e23532988e529a4dec6c09a6b862f50a6ea139afc496bd0f85a86c4ff922b262d6c41ab43c1df3886b3bbb1e languageName: node linkType: hard -"@babel/types@npm:^7, @babel/types@npm:^7.0.0, @babel/types@npm:^7.12.1, @babel/types@npm:^7.12.13, @babel/types@npm:^7.13.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": - version: 7.13.0 - resolution: "@babel/types@npm:7.13.0" +"@babel/types@npm:^7, @babel/types@npm:^7.0.0, @babel/types@npm:^7.12.1, @babel/types@npm:^7.12.13, @babel/types@npm:^7.13.0, @babel/types@npm:^7.13.12, @babel/types@npm:^7.13.13, @babel/types@npm:^7.13.14, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": + version: 7.13.14 + resolution: "@babel/types@npm:7.13.14" dependencies: "@babel/helper-validator-identifier": ^7.12.11 lodash: ^4.17.19 to-fast-properties: ^2.0.0 - checksum: a47357647a92c08ee2f5059210d37fd7fe190e8d4ef71dd97ba61c6ca7b7e979660bc8ba00fdc51249c037199b634dd984fde8d7a622fdd5e3e2161fe65e94c3 + checksum: 0dda1e774076c763ad38d77a2292524556be0629f5b7a2078bddb40ae4a2fd059d10197029a988926dc314f7519e17daa8a714656e0faa207f2bb5339b57410c languageName: node linkType: hard @@ -1657,24 +1668,24 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:^26.0.20": - version: 26.0.20 - resolution: "@types/jest@npm:26.0.20" +"@types/jest@npm:^26.0.22": + version: 26.0.22 + resolution: "@types/jest@npm:26.0.22" dependencies: jest-diff: ^26.0.0 pretty-format: ^26.0.0 - checksum: 221e39c7c9ce8d71ae4b2ba6abeef1a5b04f1cd96419b9fbbb65534bef4c4215b650561183073dcf47584ff1888d1f4fa7d2af2a38492b7feb9a3bfdcd24c44f + checksum: 4c98ed058522f6cc74bcb47b8b7b104b77b2d4e42e087171f3d2d3ae5338c21f43ec26f2a186bc229c1bd72c3f776ad07faba837f0ec27f22cf94e154516c0b3 languageName: node linkType: hard -"@types/jsdom@npm:^16.2.6": - version: 16.2.6 - resolution: "@types/jsdom@npm:16.2.6" +"@types/jsdom@npm:^16.2.9": + version: 16.2.9 + resolution: "@types/jsdom@npm:16.2.9" dependencies: "@types/node": "*" "@types/parse5": "*" "@types/tough-cookie": "*" - checksum: 64252ba056a916c434ce121d250ca0327ae2362808b1eb1a652b49801e7a0c36e5f0f8b06b25fee5203e6bf8f4af1d7e0a0c2b3ec6cd5e084f01b22d6f7b22b8 + checksum: 0f9799664a0abd6e772bffb20e3568f0667c1ec2f77566a94843fae2ec5f13bf9fc8d174d77ad12afcbe24f0a1bc9623966eebe7c2605a3968639bb15e9c0bfc languageName: node linkType: hard @@ -1685,10 +1696,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:^14.14.31": - version: 14.14.31 - resolution: "@types/node@npm:14.14.31" - checksum: 635dc8a0898a923621e02ca179e17baa39fdfa44f0096fcc1b7046c9b32317e74a99956a7b45ca0e8069874f51f4e7873a418239a318a4b6e7936f6510ac5992 +"@types/node@npm:*, @types/node@npm:^14.14.37": + version: 14.14.37 + resolution: "@types/node@npm:14.14.37" + checksum: 5e2d9baf7594ebacaf016716515f30de0765169412787f981481c2fb8b468923149bb9e2e3219ee672399811672ceddc339a7372a61cf15bc656836a5494d991 languageName: node linkType: hard @@ -1743,46 +1754,46 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^4.16.1": - version: 4.16.1 - resolution: "@typescript-eslint/parser@npm:4.16.1" +"@typescript-eslint/parser@npm:^4.20.0": + version: 4.20.0 + resolution: "@typescript-eslint/parser@npm:4.20.0" dependencies: - "@typescript-eslint/scope-manager": 4.16.1 - "@typescript-eslint/types": 4.16.1 - "@typescript-eslint/typescript-estree": 4.16.1 + "@typescript-eslint/scope-manager": 4.20.0 + "@typescript-eslint/types": 4.20.0 + "@typescript-eslint/typescript-estree": 4.20.0 debug: ^4.1.1 peerDependencies: eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 9ce7c8b2ec9679c6428b44fe06f6a56f145b54b72549691d97e3d6a4ffd0fc116ca61bdef695e77c3217fc30f2988434078e09009ab2dc5ec028e6f3cecb9a16 + checksum: 0d6d23e8603a893929b6f62dd5088585950d4f20cf83e890bb867cbea7e77291a3a5d850da7851e7949c9e7e8d1d5bbf0bc35b8ba6abd7eed3443be441d930c0 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:4.16.1": - version: 4.16.1 - resolution: "@typescript-eslint/scope-manager@npm:4.16.1" +"@typescript-eslint/scope-manager@npm:4.20.0": + version: 4.20.0 + resolution: "@typescript-eslint/scope-manager@npm:4.20.0" dependencies: - "@typescript-eslint/types": 4.16.1 - "@typescript-eslint/visitor-keys": 4.16.1 - checksum: 2872ae6b3c1afe6d0de2168cf4c14864ac6183de8db081f8efc236a4a6f6448d59f80abc529ab3b50b48b8a9a5b21c4bacbad8936a384ca3c2f1bb4b950fd4de + "@typescript-eslint/types": 4.20.0 + "@typescript-eslint/visitor-keys": 4.20.0 + checksum: 4e5b33cc7e31e37fd87c4af9d28fa1e9ab88681c7f80add98dbbee3ea725f05b448306f738aeb89788404cca3ef3cac75ad3ad7a03a90a9008cd4157ec069ae1 languageName: node linkType: hard -"@typescript-eslint/types@npm:4.16.1": - version: 4.16.1 - resolution: "@typescript-eslint/types@npm:4.16.1" - checksum: 5df220b8dff372540921d8ef478f4107e6eb51824e7346c942dafc2d181cd937983fa80f44c2e94abf28b57a303e72205915d2bca13ac37c028a98710fd37baa +"@typescript-eslint/types@npm:4.20.0": + version: 4.20.0 + resolution: "@typescript-eslint/types@npm:4.20.0" + checksum: fa059ca3abcd375a56057491dac8565311a2822828a4177024de0a70bdd5959d57f0d8a8d2b8082427ade85cc61c512238d804197a2f789aac95263b4bdfccfa languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:4.16.1": - version: 4.16.1 - resolution: "@typescript-eslint/typescript-estree@npm:4.16.1" +"@typescript-eslint/typescript-estree@npm:4.20.0": + version: 4.20.0 + resolution: "@typescript-eslint/typescript-estree@npm:4.20.0" dependencies: - "@typescript-eslint/types": 4.16.1 - "@typescript-eslint/visitor-keys": 4.16.1 + "@typescript-eslint/types": 4.20.0 + "@typescript-eslint/visitor-keys": 4.20.0 debug: ^4.1.1 globby: ^11.0.1 is-glob: ^4.0.1 @@ -1791,17 +1802,17 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: d09de17eb15f08a44574d62a3eadcacd6d331372bd7525cfb7d08d9caeb8d09c2f5a195927ea48a71996337baab47bf9c7d50549c160b901be6a6bc1df9c3f39 + checksum: bed950e86750fab653fe2e8bbe161d52fbae56d13405bbf02983dfc5c6c26708b05b6cc8d8a4332e8d070b34c66d59d05c96f04174ff5a844754068f9c185a4e languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:4.16.1": - version: 4.16.1 - resolution: "@typescript-eslint/visitor-keys@npm:4.16.1" +"@typescript-eslint/visitor-keys@npm:4.20.0": + version: 4.20.0 + resolution: "@typescript-eslint/visitor-keys@npm:4.20.0" dependencies: - "@typescript-eslint/types": 4.16.1 + "@typescript-eslint/types": 4.20.0 eslint-visitor-keys: ^2.0.0 - checksum: 7b3f87165fc3533e80c8e5848306dca7ffbe7a6c04c40895cb5cdbfdf55bca606933efae20c16d91576e0ab926f8f539257b1fb13231aac3b0c8ad9d741042c9 + checksum: 6d6e4932408454479764a5f9de6fc865556f366c10bee3adc1fcf1316c9e6f7b387adc1bc8bd91317f5439c8f7c5d3290c36b3ec98bfd54eb759c9ae1414c674 languageName: node linkType: hard @@ -1956,36 +1967,36 @@ __metadata: languageName: node linkType: hard -"@webpack-cli/configtest@npm:^1.0.1": - version: 1.0.1 - resolution: "@webpack-cli/configtest@npm:1.0.1" +"@webpack-cli/configtest@npm:^1.0.2": + version: 1.0.2 + resolution: "@webpack-cli/configtest@npm:1.0.2" peerDependencies: webpack: 4.x.x || 5.x.x webpack-cli: 4.x.x - checksum: 6db91531c43658c7830767cd698e72dd2d569d85b306a9eedafc1d8a8935b0a9ecf3881b7fff21eca18695c3440e911f2020fa7b9ea29af41944f23efa54bd16 + checksum: 98edc004536d7fd212386a759b738f78f71dc24a7c10fa5245d3c4d2b33e47e9076c132d25aa94c291848ccf47e8986b71244785c95fbacf770a5d9f54dc8586 languageName: node linkType: hard -"@webpack-cli/info@npm:^1.2.2": - version: 1.2.2 - resolution: "@webpack-cli/info@npm:1.2.2" +"@webpack-cli/info@npm:^1.2.3": + version: 1.2.3 + resolution: "@webpack-cli/info@npm:1.2.3" dependencies: envinfo: ^7.7.3 peerDependencies: webpack-cli: 4.x.x - checksum: ee23161d9ea56be871e67596f9d65b8342de858b59cb6658870bda474deaa328ea0d34320344eac704b88673a373456584e08748f0a7d60226bf76c2e667e706 + checksum: 0499e93583176fe0d3f1f8a2022f460c8177cf24e07d7b6110de4ac89dab42115d898095c856ede4cf2b4c1c36a4a6e0230658480fae341119d20e25d28f3e35 languageName: node linkType: hard -"@webpack-cli/serve@npm:^1.3.0": - version: 1.3.0 - resolution: "@webpack-cli/serve@npm:1.3.0" +"@webpack-cli/serve@npm:^1.3.1": + version: 1.3.1 + resolution: "@webpack-cli/serve@npm:1.3.1" peerDependencies: webpack-cli: 4.x.x peerDependenciesMeta: webpack-dev-server: optional: true - checksum: ce97bd9db98663375d62edbcd5711e057291e890c9e89254e4333fb9e6192252afca743b8a0fa087be00c6222db1c2e1d4da67707c6a679e1d9e1d7a3d001381 + checksum: 8a734da3451268d5d2ae24b57c7f824b452fb2eba8ea41f7b8830eb3f322a9649cc3d40a6dbb6f19017748bbdbf24cf459ad0ac27289b723d9b132b946c168c7 languageName: node linkType: hard @@ -2003,7 +2014,7 @@ __metadata: languageName: node linkType: hard -"abab@npm:^2.0.3": +"abab@npm:^2.0.3, abab@npm:^2.0.5": version: 2.0.5 resolution: "abab@npm:2.0.5" checksum: a42b91bd9dd2451a3fc6996bc8953139904ff7b1a793719205041148da892337afc97ed0589ef2c44765c4da3d688eed145781db1623b611621d805294c367a3 @@ -2059,12 +2070,12 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.0.4": - version: 8.0.5 - resolution: "acorn@npm:8.0.5" +"acorn@npm:^8.0.4, acorn@npm:^8.1.0": + version: 8.1.0 + resolution: "acorn@npm:8.1.0" bin: acorn: bin/acorn - checksum: b138585ca3948355fb0125105576b90326d4bdfd610f6c8bab382d281c9ea99d2360280c0aa4548f2e4b924eea2256a273140c49fc1be46d8a3b4b3bfefd8a62 + checksum: 99ccf30832b00ff7e19dff353479fd303c5a82c4ae0a5c5904a6c03316658b89bbdca40f5d8473e6aedd988a404190abd7b431dbd3160df4c09a10398b84bf1c languageName: node linkType: hard @@ -2223,7 +2234,7 @@ __metadata: languageName: node linkType: hard -"array-includes@npm:^3.1.1, array-includes@npm:^3.1.2": +"array-includes@npm:^3.1.2, array-includes@npm:^3.1.3": version: 3.1.3 resolution: "array-includes@npm:3.1.3" dependencies: @@ -2250,7 +2261,7 @@ __metadata: languageName: node linkType: hard -"array.prototype.flatmap@npm:^1.2.3": +"array.prototype.flatmap@npm:^1.2.4": version: 1.2.4 resolution: "array.prototype.flatmap@npm:1.2.4" dependencies: @@ -2926,10 +2937,10 @@ __metadata: languageName: node linkType: hard -"colorette@npm:^1.2.1": - version: 1.2.1 - resolution: "colorette@npm:1.2.1" - checksum: 1cc21ad4b84777a424794f78b6bb6a44b614ae17dcea91762199339f8047598e6d981249eeef7ea588c99eaf062be8fcdcd4866c112998922ed854db6dde96f9 +"colorette@npm:^1.2.1, colorette@npm:^1.2.2": + version: 1.2.2 + resolution: "colorette@npm:1.2.2" + checksum: e240f0c94b8d9f34b52bd17b50fc13a3b74f9e662edeaa2b0c65e06ec6b1fc6367fb42b834ec5a1d819d68b74a3d850f3bd3e284f9e614d6c4ffa122f83c6ec5 languageName: node linkType: hard @@ -2956,10 +2967,10 @@ __metadata: languageName: node linkType: hard -"commander@npm:^7.0.0": - version: 7.1.0 - resolution: "commander@npm:7.1.0" - checksum: 2b6dacb11f17cd9b702ae18b586b060327590dd57e2702edefbff701ec7c63b55338e70544210893bad280fc9579ffb839dd8ae0a6bc652fceffe3f9ad1c2c44 +"commander@npm:^7.0.0, commander@npm:^7.1.0": + version: 7.2.0 + resolution: "commander@npm:7.2.0" + checksum: bdc0eca5e25cd24af8440163d3c9a996785bbac4b49a590365699cdc1ed08cefbac8f268153208ab2bc5dc3cb1d3fb573fd1590c681e36e371342186bd331a4c languageName: node linkType: hard @@ -3072,15 +3083,15 @@ __metadata: languageName: node linkType: hard -"css-loader@npm:^5.1.1": - version: 5.1.1 - resolution: "css-loader@npm:5.1.1" +"css-loader@npm:^5.2.0": + version: 5.2.0 + resolution: "css-loader@npm:5.2.0" dependencies: camelcase: ^6.2.0 cssesc: ^3.0.0 icss-utils: ^5.1.0 loader-utils: ^2.0.0 - postcss: ^8.2.6 + postcss: ^8.2.8 postcss-modules-extract-imports: ^3.0.0 postcss-modules-local-by-default: ^4.0.0 postcss-modules-scope: ^3.0.0 @@ -3090,7 +3101,7 @@ __metadata: semver: ^7.3.4 peerDependencies: webpack: ^4.27.0 || ^5.0.0 - checksum: 620fae3cace4a251fec723da2a4549a3874dd3459774451f834b19c4f38051aa76323d500d5d3408244b11fb40dbfc2fb30722be7b5e87ba7c6bed65396a898b + checksum: c3b2bb78531a56f6f6d5fa5dd6e2f992a89f136db3f4c150c3536daaa315b453d252c80f493099ead4edf0143b23357ff2d772148b61725c3dbca45b13446e67 languageName: node linkType: hard @@ -3117,7 +3128,7 @@ __metadata: languageName: node linkType: hard -"cssstyle@npm:^2.2.0": +"cssstyle@npm:^2.3.0": version: 2.3.0 resolution: "cssstyle@npm:2.3.0" dependencies: @@ -3191,7 +3202,7 @@ __metadata: languageName: node linkType: hard -"decimal.js@npm:^10.2.0": +"decimal.js@npm:^10.2.1": version: 10.2.1 resolution: "decimal.js@npm:10.2.1" checksum: ba28b27bb8aca6bbb73fbdb51d759961d9ff82218c4aa737b4f4826dee4244618a61c410201bb152950c4915e3d82a86211d1c2a4e23f805ee577574ba115e59 @@ -3327,10 +3338,10 @@ __metadata: languageName: node linkType: hard -"dompurify@npm:^2.2.6": - version: 2.2.6 - resolution: "dompurify@npm:2.2.6" - checksum: dfc77c2c603d84d4385a419acbda3f14777bf97f7a33a1de43d8a4f264171d12c916eda923715bc0199bcece20d3d6d3de730f3470d178c8ffdf25ba7ca18aee +"dompurify@npm:^2.2.7": + version: 2.2.7 + resolution: "dompurify@npm:2.2.7" + checksum: ddf23c494b0417c764384817716a19daebd7c3c528ce26360390952d6661679d9058ccc643ea8930223201a41a89affb07c3f01d1c6cbe057d01c6607e01b6c4 languageName: node linkType: hard @@ -3547,12 +3558,12 @@ __metadata: languageName: node linkType: hard -"escodegen@npm:^1.14.1": - version: 1.14.3 - resolution: "escodegen@npm:1.14.3" +"escodegen@npm:^2.0.0": + version: 2.0.0 + resolution: "escodegen@npm:2.0.0" dependencies: esprima: ^4.0.1 - estraverse: ^4.2.0 + estraverse: ^5.2.0 esutils: ^2.0.2 optionator: ^0.8.1 source-map: ~0.6.1 @@ -3562,7 +3573,7 @@ __metadata: bin: escodegen: bin/escodegen.js esgenerate: bin/esgenerate.js - checksum: 548c5a83a81a51122f1006309a392e1412bb00657f15aca60f01f9d4553851bdaf0519d898fd3ee2bb46f116e03ee48757f4d9a28a7b58bc8c096fd4b33f6cbc + checksum: c49da32cd173570f2076f0d52b80761b2a876dfea2046bfc8c5dc84f76b70105e35b2fed10fe0a8487df14674d46bc30245f3a27e8838601c3c85e68f693f363 languageName: node linkType: hard @@ -3575,38 +3586,29 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-react@npm:^7.22.0": - version: 7.22.0 - resolution: "eslint-plugin-react@npm:7.22.0" +"eslint-plugin-react@npm:^7.23.1": + version: 7.23.1 + resolution: "eslint-plugin-react@npm:7.23.1" dependencies: - array-includes: ^3.1.1 - array.prototype.flatmap: ^1.2.3 + array-includes: ^3.1.3 + array.prototype.flatmap: ^1.2.4 doctrine: ^2.1.0 has: ^1.0.3 jsx-ast-utils: ^2.4.1 || ^3.0.0 - object.entries: ^1.1.2 - object.fromentries: ^2.0.2 - object.values: ^1.1.1 + minimatch: ^3.0.4 + object.entries: ^1.1.3 + object.fromentries: ^2.0.4 + object.values: ^1.1.3 prop-types: ^15.7.2 - resolve: ^1.18.1 - string.prototype.matchall: ^4.0.2 + resolve: ^2.0.0-next.3 + string.prototype.matchall: ^4.0.4 peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 - checksum: 34927cb4880984e3a3e413ef57ebedbc4c4bf8e26f3cf561986e240c621d0873765fc5eef2be22171625deab2f77d0ec7013b422987ae5296fbdee0c682c6cc5 + checksum: 1c9cfbe6f378d09c620d127c6f6e7708e0f482787a38dbd935b137c70ea65af8d648fda6b2755cd028ebed461628e230038146ab3b10eb9a76f02388ae554565 languageName: node linkType: hard -"eslint-scope@npm:5.1.0": - version: 5.1.0 - resolution: "eslint-scope@npm:5.1.0" - dependencies: - esrecurse: ^4.1.0 - estraverse: ^4.1.1 - checksum: 4a0e97979a855d09c4bb3a3f4f945cefaf8f6638a6a8f49472cefb0cf64982ab7ed1683a1e63d20ce1bcb01f94c133dc7a5bdf03b28eb945999f50f08878a2b4 - languageName: node - linkType: hard - -"eslint-scope@npm:^5.1.1": +"eslint-scope@npm:^5.1.0, eslint-scope@npm:^5.1.1": version: 5.1.1 resolution: "eslint-scope@npm:5.1.1" dependencies: @@ -3639,9 +3641,9 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^7.21.0": - version: 7.21.0 - resolution: "eslint@npm:7.21.0" +"eslint@npm:^7.23.0": + version: 7.23.0 + resolution: "eslint@npm:7.23.0" dependencies: "@babel/code-frame": 7.12.11 "@eslint/eslintrc": ^0.4.0 @@ -3660,7 +3662,7 @@ __metadata: file-entry-cache: ^6.0.1 functional-red-black-tree: ^1.0.1 glob-parent: ^5.0.0 - globals: ^12.1.0 + globals: ^13.6.0 ignore: ^4.0.6 import-fresh: ^3.0.0 imurmurhash: ^0.1.4 @@ -3668,7 +3670,7 @@ __metadata: js-yaml: ^3.13.1 json-stable-stringify-without-jsonify: ^1.0.1 levn: ^0.4.1 - lodash: ^4.17.20 + lodash: ^4.17.21 minimatch: ^3.0.4 natural-compare: ^1.4.0 optionator: ^0.9.1 @@ -3682,7 +3684,7 @@ __metadata: v8-compile-cache: ^2.0.3 bin: eslint: bin/eslint.js - checksum: aa8fd50cddc4ab259e2d0ff8f43f0601060543c12e335d76ee074bf25ad02a885bea9d48a367de736d3bdb871de7eb62e6d67930c0173cc46280ddd0f236e740 + checksum: f444869506eb0b53fdc6f6f6508b9f5daed51034af0289e6b201f996e7f2d06134f765ef598568269d2a0575dc9da5d3308bd2716f795b789d92e7febb654aab languageName: node linkType: hard @@ -3723,7 +3725,7 @@ __metadata: languageName: node linkType: hard -"esrecurse@npm:^4.1.0, esrecurse@npm:^4.3.0": +"esrecurse@npm:^4.3.0": version: 4.3.0 resolution: "esrecurse@npm:4.3.0" dependencies: @@ -3732,7 +3734,7 @@ __metadata: languageName: node linkType: hard -"estraverse@npm:^4.1.1, estraverse@npm:^4.2.0": +"estraverse@npm:^4.1.1": version: 4.3.0 resolution: "estraverse@npm:4.3.0" checksum: 1e4c627da9e9af07bf7b2817320f606841808fb2ec0cbd81097b30d5f90d8613288b3e523153babe04615d59b54ef876d98f0ca27488b6c0934dacd725a8d338 @@ -3927,24 +3929,24 @@ __metadata: languageName: node linkType: hard -"fantasticon@npm:^1.1.1": - version: 1.1.1 - resolution: "fantasticon@npm:1.1.1" +"fantasticon@npm:^1.1.3": + version: 1.1.3 + resolution: "fantasticon@npm:1.1.3" dependencies: change-case: ^4.1.2 cli-color: ^2.0.0 - commander: ^7.0.0 + commander: ^7.1.0 glob: ^7.1.6 - handlebars: ^4.7.6 - slugify: ^1.4.6 - svg2ttf: ^5.0.0 + handlebars: ^4.7.7 + slugify: ^1.4.7 + svg2ttf: ^5.1.0 svgicons2svgfont: ^9.1.1 ttf2eot: ^2.0.0 ttf2woff: ^2.0.2 ttf2woff2: ^4.0.1 bin: fantasticon: bin/fantasticon - checksum: c554ebaf79b85c3debfde3e5e6c5e2a49f99839b81b0b38f2a2b93dd62d41829d6b89fad6b3551ce9ec17a3f38f2cc27fba8c6860b493413dd07a38a889e1dda + checksum: bfa5ad26b7b6de66e7af23f1246ec3c6a48604c6313ade5469d8f4d1ea337d390f0cc418fc58ef4698a749bc283326429659e82eb10fb24524ea45ab4e5bacc9 languageName: node linkType: hard @@ -4329,6 +4331,15 @@ __metadata: languageName: node linkType: hard +"globals@npm:^13.6.0": + version: 13.7.0 + resolution: "globals@npm:13.7.0" + dependencies: + type-fest: ^0.20.2 + checksum: 98e36151746f1457c28553db5d2ceb0fc11838f81bf4868d43df30fb1f03d0abf11b0fe16eeb8d390def5c91142a3e1a42a0f505ca67ec659aa1a30a82302268 + languageName: node + linkType: hard + "globby@npm:^11.0.1": version: 11.0.2 resolution: "globby@npm:11.0.2" @@ -4366,7 +4377,7 @@ __metadata: languageName: node linkType: hard -"handlebars@npm:^4.7.6": +"handlebars@npm:^4.7.7": version: 4.7.7 resolution: "handlebars@npm:4.7.7" dependencies: @@ -4663,13 +4674,6 @@ __metadata: languageName: node linkType: hard -"ip-regex@npm:^2.1.0": - version: 2.1.0 - resolution: "ip-regex@npm:2.1.0" - checksum: 2fd2190ada81b55a8a6f913bcb5a6fd6ff9da127905b4c01521f09a1d391e86d415dfe8c131ed2989d536949bb2f9654a71b9fa6f7ae2ac3ae6111b2026cc902 - languageName: node - linkType: hard - "is-accessor-descriptor@npm:^0.1.6": version: 0.1.6 resolution: "is-accessor-descriptor@npm:0.1.6" @@ -5562,42 +5566,42 @@ __metadata: languageName: node linkType: hard -"jsdom@npm:^16.4.0": - version: 16.4.0 - resolution: "jsdom@npm:16.4.0" +"jsdom@npm:^16.4.0, jsdom@npm:^16.5.2": + version: 16.5.2 + resolution: "jsdom@npm:16.5.2" dependencies: - abab: ^2.0.3 - acorn: ^7.1.1 + abab: ^2.0.5 + acorn: ^8.1.0 acorn-globals: ^6.0.0 cssom: ^0.4.4 - cssstyle: ^2.2.0 + cssstyle: ^2.3.0 data-urls: ^2.0.0 - decimal.js: ^10.2.0 + decimal.js: ^10.2.1 domexception: ^2.0.1 - escodegen: ^1.14.1 + escodegen: ^2.0.0 html-encoding-sniffer: ^2.0.1 is-potential-custom-element-name: ^1.0.0 nwsapi: ^2.2.0 - parse5: 5.1.1 + parse5: 6.0.1 request: ^2.88.2 - request-promise-native: ^1.0.8 - saxes: ^5.0.0 + request-promise-native: ^1.0.9 + saxes: ^5.0.1 symbol-tree: ^3.2.4 - tough-cookie: ^3.0.1 + 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.0.0 - ws: ^7.2.3 + whatwg-url: ^8.5.0 + ws: ^7.4.4 xml-name-validator: ^3.0.0 peerDependencies: canvas: ^2.5.0 peerDependenciesMeta: canvas: optional: true - checksum: adca681df01b62452970357bb941c5a0a67f784afbf32c57bb07d7b3799a853f161e4c7a1ccce75fd9089b5c5e5601acf9eab5fe440899d96c08b5bdc3d2cad5 + checksum: a0be91b456596db988e1c5c6a146fcceb4fb6d401b947498c5b4cd7ff3202ce8ca3816be77a60d112bc45916fc7959fb7aeb98e81729c36bf4fef566c91c02db languageName: node linkType: hard @@ -5837,14 +5841,7 @@ __metadata: languageName: node linkType: hard -"lodash.sortby@npm:^4.7.0": - version: 4.7.0 - resolution: "lodash.sortby@npm:4.7.0" - checksum: 43cde11276c66da7b3eda5e9f00dc6edc276d2bcf0a5969ffc62b612cd1c4baf2eff5e84cee11383005722c460a9ca0f521fad4fa1cd2dc1ef013ee4da2dfe63 - languageName: node - linkType: hard - -"lodash@npm:^4.17.10, lodash@npm:^4.17.19, lodash@npm:^4.17.20": +"lodash@npm:^4.17.10, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.7.0": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: 4983720b9abca930a4a46f18db163d7dad8dd00dbed6db0cc7b499b33b717cce69f80928b27bbb1ff2cbd3b19d251ee90669a8b5ea466072ca81c2ebe91e7468 @@ -6032,16 +6029,16 @@ __metadata: languageName: node linkType: hard -"mini-css-extract-plugin@npm:^1.3.9": - version: 1.3.9 - resolution: "mini-css-extract-plugin@npm:1.3.9" +"mini-css-extract-plugin@npm:^1.4.0": + version: 1.4.0 + resolution: "mini-css-extract-plugin@npm:1.4.0" dependencies: loader-utils: ^2.0.0 schema-utils: ^3.0.0 webpack-sources: ^1.1.0 peerDependencies: webpack: ^4.4.0 || ^5.0.0 - checksum: 3899410d7655bf7b10578c8810dd915ed816c8940ec3476de3b9fcc25a0ffcc14c2ece6a7ed2f4fb881a7ed102593512438274189088ad47227b9d13599ea70a + checksum: 081612504f579a3d49b31b2358a27185efbfc3c28f9b8240dfd27def92a840d3f7eb254b3997565fb9690f29b21b598a0027a99ac87cd6f19a81e9211cec2ec0 languageName: node linkType: hard @@ -6122,12 +6119,12 @@ __metadata: languageName: node linkType: hard -"nanoid@npm:^3.1.20": - version: 3.1.20 - resolution: "nanoid@npm:3.1.20" +"nanoid@npm:^3.1.22": + version: 3.1.22 + resolution: "nanoid@npm:3.1.22" bin: nanoid: bin/nanoid.cjs - checksum: 4788d36edcfec7bb32ddf33ed8f1f46df2867f70e9b1993bb131f7677e04ead2b621e5d614d2736308be18db1d54208d8ab207b4586bd5b052f71fb9d4c0ebea + checksum: 6a38c799816de388cd67233a9fad6216e0ad2abda3ce5b34eb126afbef6905924507223dc65797e2bcbc513f9cd7e078ea7e69448d59f434a6206b491278ae24 languageName: node linkType: hard @@ -6402,7 +6399,7 @@ __metadata: languageName: node linkType: hard -"object.entries@npm:^1.1.2": +"object.entries@npm:^1.1.3": version: 1.1.3 resolution: "object.entries@npm:1.1.3" dependencies: @@ -6414,7 +6411,7 @@ __metadata: languageName: node linkType: hard -"object.fromentries@npm:^2.0.2": +"object.fromentries@npm:^2.0.4": version: 2.0.4 resolution: "object.fromentries@npm:2.0.4" dependencies: @@ -6435,15 +6432,15 @@ __metadata: languageName: node linkType: hard -"object.values@npm:^1.1.1": - version: 1.1.2 - resolution: "object.values@npm:1.1.2" +"object.values@npm:^1.1.3": + version: 1.1.3 + resolution: "object.values@npm:1.1.3" dependencies: - call-bind: ^1.0.0 + call-bind: ^1.0.2 define-properties: ^1.1.3 - es-abstract: ^1.18.0-next.1 + es-abstract: ^1.18.0-next.2 has: ^1.0.3 - checksum: d9e492095a46caa1531d5917ba707967ae882193b6e0b318d56f5f867b756ad62a3e600fae434e9d0b6a33f1a35d7a604631d6db3f876266c7802c5b63923f16 + checksum: 31111fe8b8dfe7c3326ae8729eae542dc32d5705339b9b63d89d4a2f766641bfe8989744bd4771c65a7ca0dff281800e99640262c2e82daa97079143a86b3e0b languageName: node linkType: hard @@ -6597,10 +6594,10 @@ __metadata: languageName: node linkType: hard -"parse5@npm:5.1.1": - version: 5.1.1 - resolution: "parse5@npm:5.1.1" - checksum: fad72ff5010ee8a6f0a38b83fc886b71a54d746d5c4ff5aad74d6ba1fe87b9606585bf32aa200b015ce329e0906f50f2851f29876abeacd5c13567c7a0455362 +"parse5@npm:6.0.1": + version: 6.0.1 + resolution: "parse5@npm:6.0.1" + checksum: e312014edd76a6dc2eac35248ad53477b2594a7b92b7a00f66169483bb87c3d1d36660daddeb720457418dfe0893eb3ad1043085047fc3699167afa6834cb4c4 languageName: node linkType: hard @@ -6775,14 +6772,14 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.2.6": - version: 8.2.6 - resolution: "postcss@npm:8.2.6" +"postcss@npm:^8.2.8": + version: 8.2.9 + resolution: "postcss@npm:8.2.9" dependencies: - colorette: ^1.2.1 - nanoid: ^3.1.20 + colorette: ^1.2.2 + nanoid: ^3.1.22 source-map: ^0.6.1 - checksum: 31dcc6632589e5b0d06ae3854122073a38952f3a25280511fa4bd8c2bc254c05d1d1db0913848ed3171c84d41b233ec3fe5d7349de4700f624a16fa93553ccac + checksum: b661a6e858c82e8919c9b1e6bc299b5b2ba61dc66ccc52ef631ddc8b69aabce170a6f0a9ea04f087e7be780ad34cfc15dbbf952c152a9698375de8c88b8c4e96 languageName: node linkType: hard @@ -6847,7 +6844,7 @@ __metadata: languageName: node linkType: hard -"psl@npm:^1.1.28": +"psl@npm:^1.1.28, psl@npm:^1.1.33": version: 1.8.0 resolution: "psl@npm:1.8.0" checksum: 92d47c6257456878bfa8190d76b84de69bcefdc129eeee3f9fe204c15fd08d35fe5b8627033f39b455e40a9375a1474b25ff4ab2c5448dd8c8f75da692d0f5b4 @@ -7003,10 +7000,10 @@ __metadata: languageName: node linkType: hard -"regenerator-runtime@npm:^0.13.4, regenerator-runtime@npm:^0.13.7": - version: 0.13.7 - resolution: "regenerator-runtime@npm:0.13.7" - checksum: 6ef567c662088b1b292214920cbd72443059298d477f72e1a37e0a113bafbfac9057cbfe35ae617284effc4b423493326a78561bbff7b04162c7949bdb9624e8 +"regenerator-runtime@npm:^0.13.4, regenerator-runtime@npm:^0.13.8": + version: 0.13.8 + resolution: "regenerator-runtime@npm:0.13.8" + checksum: 20178f5753f181d59691e5c3b4c59a2769987f75c7ccf325777673b5478acca61a553b10e895585086c222f72f5ee428090acf50320264de4b79f630f7388653 languageName: node linkType: hard @@ -7110,7 +7107,7 @@ __metadata: languageName: node linkType: hard -"request-promise-native@npm:^1.0.8": +"request-promise-native@npm:^1.0.9": version: 1.0.9 resolution: "request-promise-native@npm:1.0.9" dependencies: @@ -7212,6 +7209,16 @@ __metadata: languageName: node linkType: hard +resolve@^2.0.0-next.3: + version: 2.0.0-next.3 + resolution: "resolve@npm:2.0.0-next.3" + dependencies: + is-core-module: ^2.2.0 + path-parse: ^1.0.6 + checksum: dc9529322d9ac6175e91cd909ca845f31cc2c065e0f79ca2c423499238af9c214373d6682df24ca7be4ff20561332d4fad4516f91ea6c3919853f72f869e542c + languageName: node + linkType: hard + "resolve@patch:resolve@^1.10.0#builtin, resolve@patch:resolve@^1.14.2#builtin, resolve@patch:resolve@^1.18.1#builtin, resolve@patch:resolve@^1.9.0#builtin": version: 1.20.0 resolution: "resolve@patch:resolve@npm%3A1.20.0#builtin::version=1.20.0&hash=3388aa" @@ -7222,6 +7229,16 @@ __metadata: languageName: node linkType: hard +"resolve@patch:resolve@^2.0.0-next.3#builtin": + version: 2.0.0-next.3 + resolution: "resolve@patch:resolve@npm%3A2.0.0-next.3#builtin::version=2.0.0-next.3&hash=3388aa" + dependencies: + is-core-module: ^2.2.0 + path-parse: ^1.0.6 + checksum: a36d174b5e1b72eb9d05f2457fde2e91a4954f4480ee693681eca3a423978304d6232443726384ebf54fc4039f1ec8da7e8731383aab4c11704d157d5bcf5031 + languageName: node + linkType: hard + "ret@npm:~0.1.10": version: 0.1.15 resolution: "ret@npm:0.1.15" @@ -7352,7 +7369,7 @@ __metadata: languageName: node linkType: hard -"saxes@npm:^5.0.0": +"saxes@npm:^5.0.1": version: 5.0.1 resolution: "saxes@npm:5.0.1" dependencies: @@ -7562,10 +7579,10 @@ __metadata: languageName: node linkType: hard -"slugify@npm:^1.4.6": - version: 1.4.7 - resolution: "slugify@npm:1.4.7" - checksum: df4963d10c69d8f5331a9c741a6d123e519010ef7b41d00a5c14f476c39c7e9be993889f4dd762ea4f8fb99c21fcf8ce13e73ec7e2fe1e9ca4322e65e6cae548 +"slugify@npm:^1.4.7": + version: 1.5.0 + resolution: "slugify@npm:1.5.0" + checksum: 049cb08bda13e3adfa0eb05e6a6d26cfa76526d9ce41b455f48833e1d3c99940683047618af9b864a93cd544ca1f4b795b524414d3725c71caac7f9f8f7374f1 languageName: node linkType: hard @@ -7835,7 +7852,7 @@ __metadata: languageName: node linkType: hard -"string.prototype.matchall@npm:^4.0.2": +"string.prototype.matchall@npm:^4.0.4": version: 4.0.4 resolution: "string.prototype.matchall@npm:4.0.4" dependencies: @@ -7997,7 +8014,7 @@ __metadata: languageName: node linkType: hard -"svg2ttf@npm:^5.0.0": +"svg2ttf@npm:^5.1.0": version: 5.1.0 resolution: "svg2ttf@npm:5.1.0" dependencies: @@ -8141,7 +8158,7 @@ __metadata: version: 0.0.0-use.local resolution: "tgfont@workspace:packages/tgfont" dependencies: - fantasticon: ^1.1.1 + fantasticon: ^1.1.3 languageName: unknown linkType: soft @@ -8155,7 +8172,7 @@ __metadata: glob: ^7.1.6 source-map: ^0.7.3 stacktrace-parser: ^0.1.10 - ws: ^7.4.3 + ws: ^7.4.4 languageName: unknown linkType: soft @@ -8164,7 +8181,7 @@ __metadata: resolution: "tgui-panel@workspace:packages/tgui-panel" dependencies: common: "workspace:*" - dompurify: ^2.2.6 + dompurify: ^2.2.7 inferno: ^7.4.8 tgui: "workspace:*" tgui-dev-server: "workspace:*" @@ -8177,7 +8194,7 @@ __metadata: resolution: "tgui-polyfill@workspace:packages/tgui-polyfill" dependencies: core-js: ^3.9.1 - regenerator-runtime: ^0.13.7 + regenerator-runtime: ^0.13.8 whatwg-fetch: ^3.6.2 languageName: unknown linkType: soft @@ -8186,40 +8203,40 @@ __metadata: version: 0.0.0-use.local resolution: "tgui-workspace@workspace:." dependencies: - "@babel/core": ^7.13.8 - "@babel/eslint-parser": ^7.13.8 + "@babel/core": ^7.13.14 + "@babel/eslint-parser": ^7.13.14 "@babel/plugin-proposal-class-properties": ^7.13.0 "@babel/plugin-transform-jscript": ^7.12.13 - "@babel/preset-env": ^7.13.9 + "@babel/preset-env": ^7.13.12 "@babel/preset-typescript": ^7.13.0 - "@types/jest": ^26.0.20 - "@types/jsdom": ^16.2.6 - "@types/node": ^14.14.31 - "@typescript-eslint/parser": ^4.16.1 + "@types/jest": ^26.0.22 + "@types/jsdom": ^16.2.9 + "@types/node": ^14.14.37 + "@typescript-eslint/parser": ^4.20.0 babel-jest: ^26.6.3 babel-loader: ^8.2.2 babel-plugin-inferno: ^6.1.1 babel-plugin-transform-remove-console: ^6.9.4 common: "workspace:*" - css-loader: ^5.1.1 - eslint: ^7.21.0 + css-loader: ^5.2.0 + eslint: ^7.23.0 eslint-plugin-radar: ^0.2.1 - eslint-plugin-react: ^7.22.0 + eslint-plugin-react: ^7.23.1 file-loader: ^6.2.0 inferno: ^7.4.8 jest: ^26.6.3 jest-circus: ^26.6.3 - jsdom: ^16.4.0 - mini-css-extract-plugin: ^1.3.9 + jsdom: ^16.5.2 + mini-css-extract-plugin: ^1.4.0 sass: ^1.32.8 sass-loader: ^11.0.1 style-loader: ^2.0.0 terser-webpack-plugin: ^5.1.1 typescript: ^4.2.3 url-loader: ^4.1.1 - webpack: ^5.24.3 + webpack: ^5.28.0 webpack-bundle-analyzer: ^4.4.0 - webpack-cli: ^4.5.0 + webpack-cli: ^4.6.0 languageName: unknown linkType: soft @@ -8228,7 +8245,7 @@ __metadata: resolution: "tgui@workspace:packages/tgui" dependencies: common: "workspace:*" - dompurify: ^2.2.6 + dompurify: ^2.2.7 inferno: ^7.4.8 inferno-vnode-flags: ^7.4.8 marked: ^2.0.1 @@ -8325,14 +8342,14 @@ __metadata: languageName: node linkType: hard -"tough-cookie@npm:^3.0.1": - version: 3.0.1 - resolution: "tough-cookie@npm:3.0.1" +"tough-cookie@npm:^4.0.0": + version: 4.0.0 + resolution: "tough-cookie@npm:4.0.0" dependencies: - ip-regex: ^2.1.0 - psl: ^1.1.28 + psl: ^1.1.33 punycode: ^2.1.1 - checksum: dc1eee69c61a6d5598144ff41c9b5e758207130d92d2b89facad075140a99c10d674a6278764b9edfe8e074cb7840c15e7b786b93d0672875026c2ce5172d774 + universalify: ^0.1.2 + checksum: 161dc4728e2801c1bd3b32d4d14abd2762120d9ed0b96d892720440aa04ed0ad6c425c38195265c74366fe01d8aaf1cc0a31636cb18b82c9b6ce630743210235 languageName: node linkType: hard @@ -8464,6 +8481,13 @@ __metadata: languageName: node linkType: hard +"type-fest@npm:^0.20.2": + version: 0.20.2 + resolution: "type-fest@npm:0.20.2" + checksum: 1f887bc6150e632fb772fd28e33c22a4ab036c6f484fa9ac2e2115f6cae9d62bba7ca0368e3332b539d85bd2c8391c7bff22ad410abcbc9ab3774d61e250b210 + languageName: node + linkType: hard + "type-fest@npm:^0.6.0": version: 0.6.0 resolution: "type-fest@npm:0.6.0" @@ -8587,6 +8611,13 @@ typescript@^4.2.3: languageName: node linkType: hard +"universalify@npm:^0.1.2": + version: 0.1.2 + resolution: "universalify@npm:0.1.2" + checksum: 420fc6547357782c700d53e9a92506a8e95345b13e97684c8f9ab75237912ec2ebb6af8ac10d4f7406b7b6bd21c58f6c5c0811414fb0b4091b78b4743fa6806e + languageName: node + linkType: hard + "unset-value@npm:^1.0.0": version: 1.0.0 resolution: "unset-value@npm:1.0.0" @@ -8801,14 +8832,14 @@ typescript@^4.2.3: languageName: node linkType: hard -"webpack-cli@npm:^4.5.0": - version: 4.5.0 - resolution: "webpack-cli@npm:4.5.0" +"webpack-cli@npm:^4.6.0": + version: 4.6.0 + resolution: "webpack-cli@npm:4.6.0" dependencies: "@discoveryjs/json-ext": ^0.5.0 - "@webpack-cli/configtest": ^1.0.1 - "@webpack-cli/info": ^1.2.2 - "@webpack-cli/serve": ^1.3.0 + "@webpack-cli/configtest": ^1.0.2 + "@webpack-cli/info": ^1.2.3 + "@webpack-cli/serve": ^1.3.1 colorette: ^1.2.1 commander: ^7.0.0 enquirer: ^2.3.6 @@ -8824,8 +8855,6 @@ typescript@^4.2.3: peerDependenciesMeta: "@webpack-cli/generators": optional: true - "@webpack-cli/init": - optional: true "@webpack-cli/migrate": optional: true webpack-bundle-analyzer: @@ -8834,7 +8863,7 @@ typescript@^4.2.3: optional: true bin: webpack-cli: bin/cli.js - checksum: dde382455aa3af9f38b48bfa85d4e3df39766b9478e7457e69b415bd96c30747fe8a16d2405be8a59654e9bbdd3b03296a75d8bdab1b7f2a3fda2028f4683568 + checksum: 5818245d609bfe677a84c14ebb7177590a511a871ce877803c14ba948dc603c15637fdfc1346726480d26b97ba4a55785a211e584d0dd098ec767927f244f9b9 languageName: node linkType: hard @@ -8868,9 +8897,9 @@ typescript@^4.2.3: languageName: node linkType: hard -"webpack@npm:^5.24.3": - version: 5.24.3 - resolution: "webpack@npm:5.24.3" +"webpack@npm:^5.28.0": + version: 5.28.0 + resolution: "webpack@npm:5.28.0" dependencies: "@types/eslint-scope": ^3.7.0 "@types/estree": ^0.0.46 @@ -8900,7 +8929,7 @@ typescript@^4.2.3: optional: true bin: webpack: bin/webpack.js - checksum: 025181b6a4ba57caabd81047ab5751835a1b00e04cd15d3dca36e33f2034a194f73135b468da402001e5f9042bdad41d38587aec2a747b9fd7846044092655bb + checksum: bb1948e6a2039499284f231b1b71e69414e673cd086e55db118f112a18c4a7979c93b607bea4429fc63034babf2b2d21d2f4ba1ee620f1dda614e485848972e3 languageName: node linkType: hard @@ -8927,14 +8956,14 @@ typescript@^4.2.3: languageName: node linkType: hard -"whatwg-url@npm:^8.0.0": - version: 8.4.0 - resolution: "whatwg-url@npm:8.4.0" +"whatwg-url@npm:^8.0.0, whatwg-url@npm:^8.5.0": + version: 8.5.0 + resolution: "whatwg-url@npm:8.5.0" dependencies: - lodash.sortby: ^4.7.0 + lodash: ^4.7.0 tr46: ^2.0.2 webidl-conversions: ^6.1.0 - checksum: c85dfbedd2554e76d05eba467509db3a0ed5740e3bf1069a10ca302da531d64399693e4952c61be67d119a6b7f634f3ff65fbe59555b30474f849a7e0ce2a4c6 + checksum: a070c4be45bd09e9f1593d678e798fb66cd2cbccd2a604a7453063c68ab4bb80b4a9e2a0a80562264e5963eb589311c6467599fdac9fb6a4112cd786397920e4 languageName: node linkType: hard @@ -9027,9 +9056,9 @@ typescript@^4.2.3: languageName: node linkType: hard -"ws@npm:^7.2.3, ws@npm:^7.3.1, ws@npm:^7.4.3": - version: 7.4.3 - resolution: "ws@npm:7.4.3" +"ws@npm:^7.3.1, ws@npm:^7.4.4": + version: 7.4.4 + resolution: "ws@npm:7.4.4" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ^5.0.2 @@ -9038,7 +9067,7 @@ typescript@^4.2.3: optional: true utf-8-validate: optional: true - checksum: 493655b7c4589d09ff3c2b6e8870b9ad7f7aea0aff34034e2dbb9a2e13f6868a47b06b423bc2365aec6143500b04ad24fdaecfbd9a6752f8eab2d339182c9884 + checksum: ad08761ed753cdd3f7172e9a9efc7d74e7e196623cace2380e5f74ff0abd16196e03223bd4148a34278dcbc653ee3841994635419281cbf303b3f22c589e2ec4 languageName: node linkType: hard diff --git a/tools/build/build.js b/tools/build/build.js index 4bfe3859086..09714b9a4c0 100755 --- a/tools/build/build.js +++ b/tools/build/build.js @@ -64,13 +64,21 @@ const yarn = args => { }); }; -/// Installs all tgui dependencies +/** Installs all tgui dependencies */ const taskYarn = new Task('yarn') + // The following dependencies skip what could be considered an important + // step in Yarn: it verifies the integrity of cache. With this setup, if + // cache ever becomes corrupted, your only option is to clean build. + .depends('tgui/.yarn/+(cache|releases|plugins|sdks)/**/*') + .depends('tgui/**/package.json') + .depends('tgui/yarn.lock') + // Phony target (automatically created at the end of the task) + .provides('tgui/.yarn/install-target') .build(() => yarn(['install'])); -/// Builds svg fonts +/** Builds svg fonts */ const taskTgfont = new Task('tgfont') - .depends('tgui/.yarn/install-state.gz') + .depends('tgui/.yarn/install-target') .depends('tgui/packages/tgfont/**/*.+(js|cjs|svg)') .depends('tgui/packages/tgfont/package.json') .provides('tgui/packages/tgfont/dist/tgfont.css') @@ -78,9 +86,9 @@ const taskTgfont = new Task('tgfont') .provides('tgui/packages/tgfont/dist/tgfont.woff2') .build(() => yarn(['workspace', 'tgfont', 'build'])); -/// Builds tgui +/** Builds tgui */ const taskTgui = new Task('tgui') - .depends('tgui/.yarn/install-state.gz') + .depends('tgui/.yarn/install-target') .depends('tgui/webpack.config.js') .depends('tgui/**/package.json') .depends('tgui/packages/**/*.+(js|cjs|ts|tsx|scss)') @@ -93,9 +101,11 @@ const taskTgui = new Task('tgui') await yarn(['run', 'webpack-cli', '--mode=production']); }); -/// Prepends the defines to the .dme. -/// Does not clean them up, as this is intended for TGS which -/// clones new copies anyway. +/** + * Prepends the defines to the .dme. + * Does not clean them up, as this is intended for TGS which + * clones new copies anyway. + */ const taskPrependDefines = (...defines) => new Task('prepend-defines') .build(async () => { const dmeContents = fs.readFileSync(`${DME_NAME}.dme`); @@ -169,7 +179,6 @@ const taskDm = (...injectedDefines) => new Task('dm') // Add the actual dme content const dme_content = fs.readFileSync(`${DME_NAME}.dme`) fs.appendFileSync(`${DME_NAME}.mdme`, dme_content) - await exec(dmPath, [`${DME_NAME}.mdme`]); // Rename dmb fs.renameSync(`${DME_NAME}.mdme.dmb`, `${DME_NAME}.dmb`) diff --git a/tools/build/cbt/task.js b/tools/build/cbt/task.js index f074ec0b8b7..f0782bfe1ec 100644 --- a/tools/build/cbt/task.js +++ b/tools/build/cbt/task.js @@ -69,6 +69,9 @@ class Task { if (!this.script) { return; } + if (process.env.DEBUG && needsRebuild) { + console.debug(` Reason: ${needsRebuild}`); + } console.warn(` => Starting '${this.name}'`); const startedAt = Date.now(); // Run the script