From 9099c1a4505b3f161da6e70cb26ad2d5f56a8b3f Mon Sep 17 00:00:00 2001 From: Joel Davies Date: Wed, 24 Jul 2024 07:54:37 +0000 Subject: [PATCH 1/5] Change tanstack/react-virtual pin to non-beta release --- package.json | 2 +- yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 4f7610fe..b9e19870 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@tanstack/react-query": "5.51.1", "@tanstack/react-query-devtools": "5.51.1", "@tanstack/react-table": "8.19.3", - "@tanstack/react-virtual": "beta", + "@tanstack/react-virtual": "3.8.3", "@types/jest": "29.5.2", "@types/node": "20.14.10", "@types/react": "18.2.48", diff --git a/yarn.lock b/yarn.lock index 74ba8746..0680ce70 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3421,15 +3421,15 @@ __metadata: languageName: node linkType: hard -"@tanstack/react-virtual@npm:beta": - version: 3.0.0-beta.68 - resolution: "@tanstack/react-virtual@npm:3.0.0-beta.68" +"@tanstack/react-virtual@npm:3.8.3": + version: 3.8.3 + resolution: "@tanstack/react-virtual@npm:3.8.3" dependencies: - "@tanstack/virtual-core": "npm:3.0.0-beta.68" + "@tanstack/virtual-core": "npm:3.8.3" peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 10c0/8c0afe5c476670093807cced5425bd6aad07ffef9b6823c75589eeefdbdd124b1c05766df9337bd6f92a7691c57a8c462c47c80a57d90bccedb9f19215797b76 + checksum: 10c0/36a80c4fd1516d29a36ce4f97e0b1d05c0c715e779d12b70b9c9b7ebb8296e928fd5ca1d2a336467fa00d07721bb679845cdaa6f28de08b47402534d8bfed0d9 languageName: node linkType: hard @@ -3440,10 +3440,10 @@ __metadata: languageName: node linkType: hard -"@tanstack/virtual-core@npm:3.0.0-beta.68": - version: 3.0.0-beta.68 - resolution: "@tanstack/virtual-core@npm:3.0.0-beta.68" - checksum: 10c0/24288d83bbdddc6fc67ac6b1d1879fa159115cac829c0b36bb6e89c46b85d7bb5c60c3bb2256f96790fee2d13aa8227d7b9fbf20bfd94c3249dd21b506ae23df +"@tanstack/virtual-core@npm:3.8.3": + version: 3.8.3 + resolution: "@tanstack/virtual-core@npm:3.8.3" + checksum: 10c0/3509a578e7c8ced00eef5574ca16aae466a4d066204d3c558f027d13656b2950364fdb99c07a834557933b3b81d531e029f952766c36016e386c24e8be978af5 languageName: node linkType: hard @@ -12118,7 +12118,7 @@ __metadata: "@tanstack/react-query": "npm:5.51.1" "@tanstack/react-query-devtools": "npm:5.51.1" "@tanstack/react-table": "npm:8.19.3" - "@tanstack/react-virtual": "npm:beta" + "@tanstack/react-virtual": "npm:3.8.3" "@testing-library/cypress": "npm:10.0.1" "@testing-library/dom": "npm:10.3.2" "@testing-library/jest-dom": "npm:6.4.6" From e9dff53961ac8bf9128be3a3fb82af669bf7922a Mon Sep 17 00:00:00 2001 From: Joel Davies Date: Wed, 24 Jul 2024 08:04:09 +0000 Subject: [PATCH 2/5] Update @mui/base to beta40 --- package.json | 2 +- yarn.lock | 63 +++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 46 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index b9e19870..d484dd81 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@emotion/react": "11.12.0", "@emotion/styled": "11.12.0", "@hello-pangea/dnd": "^16.6.0", - "@mui/base": "5.0.0-beta.12", + "@mui/base": "5.0.0-beta.40", "@mui/icons-material": "5.16.2", "@mui/material": "5.16.2", "@mui/system": "5.16.2", diff --git a/yarn.lock b/yarn.lock index 0680ce70..0013766d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1594,7 +1594,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.22.10, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.23.8, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.24.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.23.8, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.24.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": version: 7.24.8 resolution: "@babel/runtime@npm:7.24.8" dependencies: @@ -1967,7 +1967,7 @@ __metadata: languageName: node linkType: hard -"@emotion/is-prop-valid@npm:^1.2.1, @emotion/is-prop-valid@npm:^1.3.0": +"@emotion/is-prop-valid@npm:^1.3.0": version: 1.3.0 resolution: "@emotion/is-prop-valid@npm:1.3.0" dependencies: @@ -2125,6 +2125,16 @@ __metadata: languageName: node linkType: hard +"@floating-ui/dom@npm:^1.0.0": + version: 1.6.8 + resolution: "@floating-ui/dom@npm:1.6.8" + dependencies: + "@floating-ui/core": "npm:^1.6.0" + "@floating-ui/utils": "npm:^0.2.5" + checksum: 10c0/d52e257bbf1f04da7882d847dfe128783966a19e6d6a9e6d09d57d32bdc7255efce7ae15c3be781e349ae3b18c4575e910afde3e73ae57c31763e8a799f19f45 + languageName: node + linkType: hard + "@floating-ui/dom@npm:^1.6.1": version: 1.6.1 resolution: "@floating-ui/dom@npm:1.6.1" @@ -2135,7 +2145,7 @@ __metadata: languageName: node linkType: hard -"@floating-ui/react-dom@npm:^2.0.1, @floating-ui/react-dom@npm:^2.0.6": +"@floating-ui/react-dom@npm:^2.0.6": version: 2.0.8 resolution: "@floating-ui/react-dom@npm:2.0.8" dependencies: @@ -2147,6 +2157,18 @@ __metadata: languageName: node linkType: hard +"@floating-ui/react-dom@npm:^2.0.8": + version: 2.1.1 + resolution: "@floating-ui/react-dom@npm:2.1.1" + dependencies: + "@floating-ui/dom": "npm:^1.0.0" + peerDependencies: + react: ">=16.8.0" + react-dom: ">=16.8.0" + checksum: 10c0/732ab64600c511ceb0563b87bc557aa61789fec4f416a3f092bab89e508fa1d3ee5ade0f42051cc56eb5e4db867b87ab7fd48ce82db9fd4c01d94ffa08f60115 + languageName: node + linkType: hard + "@floating-ui/utils@npm:^0.2.1": version: 0.2.1 resolution: "@floating-ui/utils@npm:0.2.1" @@ -2154,6 +2176,13 @@ __metadata: languageName: node linkType: hard +"@floating-ui/utils@npm:^0.2.5": + version: 0.2.5 + resolution: "@floating-ui/utils@npm:0.2.5" + checksum: 10c0/9e1c7330433c3a8f226c5a44ed1dcdda13b313c4126ce3281f970d1e471b1c9fd9e1559cc76a0592af25d55a3f81afe1a5778aa7b80e51c9fa01930cd1d5557e + languageName: node + linkType: hard + "@hapi/hoek@npm:^9.0.0, @hapi/hoek@npm:^9.3.0": version: 9.3.0 resolution: "@hapi/hoek@npm:9.3.0" @@ -2631,19 +2660,17 @@ __metadata: languageName: node linkType: hard -"@mui/base@npm:5.0.0-beta.12": - version: 5.0.0-beta.12 - resolution: "@mui/base@npm:5.0.0-beta.12" +"@mui/base@npm:5.0.0-beta.40": + version: 5.0.0-beta.40 + resolution: "@mui/base@npm:5.0.0-beta.40" dependencies: - "@babel/runtime": "npm:^7.22.10" - "@emotion/is-prop-valid": "npm:^1.2.1" - "@floating-ui/react-dom": "npm:^2.0.1" - "@mui/types": "npm:^7.2.4" - "@mui/utils": "npm:^5.14.6" + "@babel/runtime": "npm:^7.23.9" + "@floating-ui/react-dom": "npm:^2.0.8" + "@mui/types": "npm:^7.2.14" + "@mui/utils": "npm:^5.15.14" "@popperjs/core": "npm:^2.11.8" - clsx: "npm:^2.0.0" + clsx: "npm:^2.1.0" prop-types: "npm:^15.8.1" - react-is: "npm:^18.2.0" peerDependencies: "@types/react": ^17.0.0 || ^18.0.0 react: ^17.0.0 || ^18.0.0 @@ -2651,7 +2678,7 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: 10c0/ccb5fe0dcdb38f449c58728bc11429d77530de80741cd073e1993a8f4bb56c1caf7f342e84881751f8223399721f63b618dc8f5518d966f3f7abbc0caf3197e5 + checksum: 10c0/631b4ee389e23d82c16c5845c2849af43000f52f1def639b9bb5bf39fd09f4eab93787d32950b715a7de7b689faab53bb7c9a78f6fd12b663876cf8128d45de1 languageName: node linkType: hard @@ -2826,7 +2853,7 @@ __metadata: languageName: node linkType: hard -"@mui/types@npm:^7.2.13, @mui/types@npm:^7.2.15, @mui/types@npm:^7.2.4": +"@mui/types@npm:^7.2.13, @mui/types@npm:^7.2.14, @mui/types@npm:^7.2.15": version: 7.2.15 resolution: "@mui/types@npm:7.2.15" peerDependencies: @@ -2838,7 +2865,7 @@ __metadata: languageName: node linkType: hard -"@mui/utils@npm:^5.14.16, @mui/utils@npm:^5.14.6, @mui/utils@npm:^5.15.6, @mui/utils@npm:^5.16.2, @mui/utils@npm:^5.16.4": +"@mui/utils@npm:^5.14.16, @mui/utils@npm:^5.15.14, @mui/utils@npm:^5.15.6, @mui/utils@npm:^5.16.2, @mui/utils@npm:^5.16.4": version: 5.16.4 resolution: "@mui/utils@npm:5.16.4" dependencies: @@ -12108,7 +12135,7 @@ __metadata: "@emotion/react": "npm:11.12.0" "@emotion/styled": "npm:11.12.0" "@hello-pangea/dnd": "npm:^16.6.0" - "@mui/base": "npm:5.0.0-beta.12" + "@mui/base": "npm:5.0.0-beta.40" "@mui/icons-material": "npm:5.16.2" "@mui/material": "npm:5.16.2" "@mui/system": "npm:5.16.2" @@ -13817,7 +13844,7 @@ __metadata: languageName: node linkType: hard -"react-is@npm:^18.0.0, react-is@npm:^18.2.0, react-is@npm:^18.3.1": +"react-is@npm:^18.0.0, react-is@npm:^18.3.1": version: 18.3.1 resolution: "react-is@npm:18.3.1" checksum: 10c0/f2f1e60010c683479e74c63f96b09fb41603527cd131a9959e2aee1e5a8b0caf270b365e5ca77d4a6b18aae659b60a86150bb3979073528877029b35aecd2072 From d25ba5550cef1e58b9e4637462cdf4b89a886f34 Mon Sep 17 00:00:00 2001 From: Joel Davies Date: Wed, 24 Jul 2024 08:11:34 +0000 Subject: [PATCH 3/5] Remove history, immutability-helper and react-draggable --- package.json | 3 --- yarn.lock | 41 +---------------------------------------- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/package.json b/package.json index d484dd81..77a3adc9 100644 --- a/package.json +++ b/package.json @@ -26,14 +26,11 @@ "cypress-delete-downloads-folder": "^0.0.5", "date-fns": "3.6.0", "hacktimer": "1.1.3", - "history": "5.3.0", - "immutability-helper": "3.1.1", "loglevel": "1.9.1", "prop-types": "15.8.1", "react": "18.2.0", "react-colorful": "5.6.1", "react-dom": "18.2.0", - "react-draggable": "4.4.5", "react-redux": "9.1.2", "react-scripts": "5.0.1", "single-spa-react": "5.1.4", diff --git a/yarn.lock b/yarn.lock index 0013766d..68e88fff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1594,7 +1594,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.23.8, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.24.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.23.8, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.24.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": version: 7.24.8 resolution: "@babel/runtime@npm:7.24.8" dependencies: @@ -5984,13 +5984,6 @@ __metadata: languageName: node linkType: hard -"clsx@npm:^1.1.1": - version: 1.2.1 - resolution: "clsx@npm:1.2.1" - checksum: 10c0/34dead8bee24f5e96f6e7937d711978380647e936a22e76380290e35486afd8634966ce300fc4b74a32f3762c7d4c0303f442c3e259f4ce02374eb0c82834f27 - languageName: node - linkType: hard - "clsx@npm:^2.0.0, clsx@npm:^2.1.0, clsx@npm:^2.1.1": version: 2.1.1 resolution: "clsx@npm:2.1.1" @@ -9022,15 +9015,6 @@ __metadata: languageName: node linkType: hard -"history@npm:5.3.0": - version: 5.3.0 - resolution: "history@npm:5.3.0" - dependencies: - "@babel/runtime": "npm:^7.7.6" - checksum: 10c0/812ec839386222d6437bd78d9f05db32e47d105ada0ad8834b32626919dd2fee7a10001bc489510f93a8069d02f118214bd8d42a82f7cf9daf8e84fbcbbb2016 - languageName: node - linkType: hard - "hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.1, hoist-non-react-statics@npm:^3.3.2": version: 3.3.2 resolution: "hoist-non-react-statics@npm:3.3.2" @@ -9360,13 +9344,6 @@ __metadata: languageName: node linkType: hard -"immutability-helper@npm:3.1.1": - version: 3.1.1 - resolution: "immutability-helper@npm:3.1.1" - checksum: 10c0/daf4f3a696b8735c5d2c9b1bac42908b66bfc18ea5484bccf6658f3e622e1486663b5ef781e1a407ee81183e16942e8b2596cc859ea94d522ba07731c2845f0e - languageName: node - linkType: hard - "import-fresh@npm:^3.1.0, import-fresh@npm:^3.2.1": version: 3.3.0 resolution: "import-fresh@npm:3.3.0" @@ -12174,9 +12151,7 @@ __metadata: eslint-plugin-prettier: "npm:5.2.1" express: "npm:4.19.2" hacktimer: "npm:1.1.3" - history: "npm:5.3.0" husky: "npm:9.1.1" - immutability-helper: "npm:3.1.1" jest-canvas-mock: "npm:2.5.0" jest-fail-on-console: "npm:3.3.0" lint-staged: "npm:15.2.0" @@ -12187,7 +12162,6 @@ __metadata: react: "npm:18.2.0" react-colorful: "npm:5.6.1" react-dom: "npm:18.2.0" - react-draggable: "npm:4.4.5" react-redux: "npm:9.1.2" react-scripts: "npm:5.0.1" serve: "npm:14.2.0" @@ -13810,19 +13784,6 @@ __metadata: languageName: node linkType: hard -"react-draggable@npm:4.4.5": - version: 4.4.5 - resolution: "react-draggable@npm:4.4.5" - dependencies: - clsx: "npm:^1.1.1" - prop-types: "npm:^15.8.1" - peerDependencies: - react: ">= 16.3.0" - react-dom: ">= 16.3.0" - checksum: 10c0/d950e25b41092ffd689e9882c287f7f49dbd8eb7e8a220af6e08c0dc06f1ae778871b0f414e30bd2891a96c6be1f673c3a698c0e642903542ff5ab5b0cbaf805 - languageName: node - linkType: hard - "react-error-overlay@npm:^6.0.11": version: 6.0.11 resolution: "react-error-overlay@npm:6.0.11" From e4257d9618935e885e2a80b76b726d168e9178e0 Mon Sep 17 00:00:00 2001 From: Joel Davies Date: Wed, 24 Jul 2024 08:16:22 +0000 Subject: [PATCH 4/5] Remove prop-types --- package.json | 1 - yarn.lock | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index 77a3adc9..4d7029ea 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "date-fns": "3.6.0", "hacktimer": "1.1.3", "loglevel": "1.9.1", - "prop-types": "15.8.1", "react": "18.2.0", "react-colorful": "5.6.1", "react-dom": "18.2.0", diff --git a/yarn.lock b/yarn.lock index 68e88fff..99878933 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12158,7 +12158,6 @@ __metadata: loglevel: "npm:1.9.1" msw: "npm:1.3.2" prettier: "npm:3.3.3" - prop-types: "npm:15.8.1" react: "npm:18.2.0" react-colorful: "npm:5.6.1" react-dom: "npm:18.2.0" @@ -13535,7 +13534,7 @@ __metadata: languageName: node linkType: hard -"prop-types@npm:15.8.1, prop-types@npm:^15.6.2, prop-types@npm:^15.8.1": +"prop-types@npm:^15.6.2, prop-types@npm:^15.8.1": version: 15.8.1 resolution: "prop-types@npm:15.8.1" dependencies: From 6ae169dd17576a90474d56e5182b577b2eec73ee Mon Sep 17 00:00:00 2001 From: Joel Davies Date: Wed, 24 Jul 2024 11:02:55 +0000 Subject: [PATCH 5/5] Remove @tanstack/react-virtual --- package.json | 1 - yarn.lock | 20 -------------------- 2 files changed, 21 deletions(-) diff --git a/package.json b/package.json index 4d7029ea..fe96317d 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,6 @@ "@tanstack/react-query": "5.51.1", "@tanstack/react-query-devtools": "5.51.1", "@tanstack/react-table": "8.19.3", - "@tanstack/react-virtual": "3.8.3", "@types/jest": "29.5.2", "@types/node": "20.14.10", "@types/react": "18.2.48", diff --git a/yarn.lock b/yarn.lock index 99878933..aeb9ef77 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3448,18 +3448,6 @@ __metadata: languageName: node linkType: hard -"@tanstack/react-virtual@npm:3.8.3": - version: 3.8.3 - resolution: "@tanstack/react-virtual@npm:3.8.3" - dependencies: - "@tanstack/virtual-core": "npm:3.8.3" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 10c0/36a80c4fd1516d29a36ce4f97e0b1d05c0c715e779d12b70b9c9b7ebb8296e928fd5ca1d2a336467fa00d07721bb679845cdaa6f28de08b47402534d8bfed0d9 - languageName: node - linkType: hard - "@tanstack/table-core@npm:8.19.3": version: 8.19.3 resolution: "@tanstack/table-core@npm:8.19.3" @@ -3467,13 +3455,6 @@ __metadata: languageName: node linkType: hard -"@tanstack/virtual-core@npm:3.8.3": - version: 3.8.3 - resolution: "@tanstack/virtual-core@npm:3.8.3" - checksum: 10c0/3509a578e7c8ced00eef5574ca16aae466a4d066204d3c558f027d13656b2950364fdb99c07a834557933b3b81d531e029f952766c36016e386c24e8be978af5 - languageName: node - linkType: hard - "@testing-library/cypress@npm:10.0.1": version: 10.0.1 resolution: "@testing-library/cypress@npm:10.0.1" @@ -12122,7 +12103,6 @@ __metadata: "@tanstack/react-query": "npm:5.51.1" "@tanstack/react-query-devtools": "npm:5.51.1" "@tanstack/react-table": "npm:8.19.3" - "@tanstack/react-virtual": "npm:3.8.3" "@testing-library/cypress": "npm:10.0.1" "@testing-library/dom": "npm:10.3.2" "@testing-library/jest-dom": "npm:6.4.6"