diff --git a/package-lock.json b/package-lock.json
index 586318cdaa2f1a223f880e63c5e9ac68b1f40060..ea567292c54246bd11e8a5ca811a8299adc344d5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
"i18next": "^19.9.2",
"intersection-observer": "^0.10.0",
"isomorphic-unfetch": "^3.1.0",
- "jss": "^10.3.0",
+ "jss": "^10.9.2",
"jss-rtl": "^0.3.0",
"lodash": "^4.17.21",
"manifesto.js": "^4.2.16",
@@ -26,10 +26,10 @@
"re-reselect": "^4.0.1",
"react-beautiful-dnd": "^13.1.1",
"react-copy-to-clipboard": "^5.1.0",
- "react-dnd": "^10.0.2",
- "react-dnd-html5-backend": "^10.0.2",
+ "react-dnd": "^16.0.1",
+ "react-dnd-html5-backend": "^16.0.1",
"react-dnd-multi-backend": "^7.1.1",
- "react-dnd-touch-backend": "^10.0.2",
+ "react-dnd-touch-backend": "^16.0.1",
"react-full-screen": "^1.1.1",
"react-i18next": "^11.18.6",
"react-image": "^4.0.3",
@@ -89,7 +89,7 @@
"jsdom": "^19.0.0",
"puppeteer": "^13.7.0",
"react": "^17.0.0",
- "react-dom": "^17.0.0",
+ "react-dom": "^17.0.2",
"react-refresh": "^0.11.0",
"redux-mock-store": "^1.5.4",
"redux-saga-test-plan": "^4.0.6",
@@ -2798,19 +2798,19 @@
}
},
"node_modules/@react-dnd/asap": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.1.tgz",
- "integrity": "sha512-kLy0PJDDwvwwTXxqTFNAAllPHD73AycE9ypWeln/IguoGBEbvFcPDbCV03G52bEcC5E+YgupBE0VzHGdC8SIXg=="
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-5.0.2.tgz",
+ "integrity": "sha512-WLyfoHvxhs0V9U+GTsGilGgf2QsPl6ZZ44fnv0/b8T3nQyvzxidxsg/ZltbWssbsRDlYW8UKSQMTGotuTotZ6A=="
},
"node_modules/@react-dnd/invariant": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-2.0.0.tgz",
- "integrity": "sha512-xL4RCQBCBDJ+GRwKTFhGUW8GXa4yoDfJrPbLblc3U09ciS+9ZJXJ3Qrcs/x2IODOdIE5kQxvMmE2UKyqUictUw=="
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-4.0.2.tgz",
+ "integrity": "sha512-xKCTqAK/FFauOM9Ta2pswIyT3D8AQlfrYdOi/toTPEhqCuAs1v5tcJ3Y08Izh1cJ5Jchwy9SeAXmMg6zrKs2iw=="
},
"node_modules/@react-dnd/shallowequal": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz",
- "integrity": "sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg=="
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-4.0.2.tgz",
+ "integrity": "sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA=="
},
"node_modules/@redux-saga/core": {
"version": "1.2.1",
@@ -5492,13 +5492,13 @@
"dev": true
},
"node_modules/dnd-core": {
- "version": "10.0.2",
- "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-10.0.2.tgz",
- "integrity": "sha512-PrxEjxF0+6Y1n1n1Z9hSWZ1tvnDXv9syL+BccV1r1RC08uWNsyetf8AnWmUF3NgYPwy0HKQJwTqGkZK+1NlaFA==",
+ "version": "16.0.1",
+ "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-16.0.1.tgz",
+ "integrity": "sha512-HK294sl7tbw6F6IeuK16YSBUoorvHpY8RHO+9yFfaJyCDVb6n7PRcezrOEOa2SBCqiYpemh5Jx20ZcjKdFAVng==",
"dependencies": {
- "@react-dnd/asap": "^4.0.0",
- "@react-dnd/invariant": "^2.0.0",
- "redux": "^4.0.4"
+ "@react-dnd/asap": "^5.0.1",
+ "@react-dnd/invariant": "^4.0.1",
+ "redux": "^4.2.0"
}
},
"node_modules/dnd-multi-backend": {
@@ -11106,26 +11106,40 @@
}
},
"node_modules/react-dnd": {
- "version": "10.0.2",
- "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-10.0.2.tgz",
- "integrity": "sha512-SC2Ymvntynhoqtf5zaFhZscm9xenCoMofilxPdlwUlaelAzmbl9fw82C4ZJ//+lNm3kWAKXjGDZg2/aWjKEAtg==",
+ "version": "16.0.1",
+ "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-16.0.1.tgz",
+ "integrity": "sha512-QeoM/i73HHu2XF9aKksIUuamHPDvRglEwdHL4jsp784BgUuWcg6mzfxT0QDdQz8Wj0qyRKx2eMg8iZtWvU4E2Q==",
"dependencies": {
- "@react-dnd/shallowequal": "^2.0.0",
- "@types/hoist-non-react-statics": "^3.3.1",
- "dnd-core": "^10.0.2",
- "hoist-non-react-statics": "^3.3.0"
+ "@react-dnd/invariant": "^4.0.1",
+ "@react-dnd/shallowequal": "^4.0.1",
+ "dnd-core": "^16.0.1",
+ "fast-deep-equal": "^3.1.3",
+ "hoist-non-react-statics": "^3.3.2"
},
"peerDependencies": {
- "react": ">= 16.8",
- "react-dom": ">= 16.8"
+ "@types/hoist-non-react-statics": ">= 3.3.1",
+ "@types/node": ">= 12",
+ "@types/react": ">= 16",
+ "react": ">= 16.14"
+ },
+ "peerDependenciesMeta": {
+ "@types/hoist-non-react-statics": {
+ "optional": true
+ },
+ "@types/node": {
+ "optional": true
+ },
+ "@types/react": {
+ "optional": true
+ }
}
},
"node_modules/react-dnd-html5-backend": {
- "version": "10.0.2",
- "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-10.0.2.tgz",
- "integrity": "sha512-ny17gUdInZ6PIGXdzfwPhoztRdNVVvjoJMdG80hkDBamJBeUPuNF2Wv4D3uoQJLjXssX1+i9PhBqc7EpogClwQ==",
+ "version": "16.0.1",
+ "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-16.0.1.tgz",
+ "integrity": "sha512-Wu3dw5aDJmOGw8WjH1I1/yTH+vlXEL4vmjk5p+MHxP8HuHJS1lAGeIdG/hze1AvNeXWo/JgULV87LyQOr+r5jw==",
"dependencies": {
- "dnd-core": "^10.0.2"
+ "dnd-core": "^16.0.1"
}
},
"node_modules/react-dnd-multi-backend": {
@@ -11141,6 +11155,12 @@
"react-dom": "^16.14.0 || ^17.0.2 || ^18.0.0"
}
},
+ "node_modules/react-dnd-multi-backend/node_modules/@react-dnd/asap": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.1.tgz",
+ "integrity": "sha512-kLy0PJDDwvwwTXxqTFNAAllPHD73AycE9ypWeln/IguoGBEbvFcPDbCV03G52bEcC5E+YgupBE0VzHGdC8SIXg==",
+ "peer": true
+ },
"node_modules/react-dnd-multi-backend/node_modules/@react-dnd/invariant": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-3.0.1.tgz",
@@ -11204,12 +11224,12 @@
}
},
"node_modules/react-dnd-touch-backend": {
- "version": "10.0.2",
- "resolved": "https://registry.npmjs.org/react-dnd-touch-backend/-/react-dnd-touch-backend-10.0.2.tgz",
- "integrity": "sha512-+lW/Ern0dKyHToD0oP+Wc/ZD6l7qJazosLqbjzL7OnPlig6WxdlrHkJylOLkeAdZj41fIJJ551Lb57pIL0CcPw==",
+ "version": "16.0.1",
+ "resolved": "https://registry.npmjs.org/react-dnd-touch-backend/-/react-dnd-touch-backend-16.0.1.tgz",
+ "integrity": "sha512-NonoCABzzjyWGZuDxSG77dbgMZ2Wad7eQiCd/ECtsR2/NBLTjGksPUx9UPezZ1nQ/L7iD130Tz3RUshL/ClKLA==",
"dependencies": {
- "@react-dnd/invariant": "^2.0.0",
- "dnd-core": "^10.0.2"
+ "@react-dnd/invariant": "^4.0.1",
+ "dnd-core": "^16.0.1"
}
},
"node_modules/react-dom": {
@@ -11310,6 +11330,21 @@
"react": "16 - 18"
}
},
+ "node_modules/react-mosaic-component/node_modules/@react-dnd/asap": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.1.tgz",
+ "integrity": "sha512-kLy0PJDDwvwwTXxqTFNAAllPHD73AycE9ypWeln/IguoGBEbvFcPDbCV03G52bEcC5E+YgupBE0VzHGdC8SIXg=="
+ },
+ "node_modules/react-mosaic-component/node_modules/@react-dnd/invariant": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-2.0.0.tgz",
+ "integrity": "sha512-xL4RCQBCBDJ+GRwKTFhGUW8GXa4yoDfJrPbLblc3U09ciS+9ZJXJ3Qrcs/x2IODOdIE5kQxvMmE2UKyqUictUw=="
+ },
+ "node_modules/react-mosaic-component/node_modules/@react-dnd/shallowequal": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz",
+ "integrity": "sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg=="
+ },
"node_modules/react-mosaic-component/node_modules/dnd-core": {
"version": "14.0.1",
"resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-14.0.1.tgz",
@@ -16108,19 +16143,19 @@
}
},
"@react-dnd/asap": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.1.tgz",
- "integrity": "sha512-kLy0PJDDwvwwTXxqTFNAAllPHD73AycE9ypWeln/IguoGBEbvFcPDbCV03G52bEcC5E+YgupBE0VzHGdC8SIXg=="
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-5.0.2.tgz",
+ "integrity": "sha512-WLyfoHvxhs0V9U+GTsGilGgf2QsPl6ZZ44fnv0/b8T3nQyvzxidxsg/ZltbWssbsRDlYW8UKSQMTGotuTotZ6A=="
},
"@react-dnd/invariant": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-2.0.0.tgz",
- "integrity": "sha512-xL4RCQBCBDJ+GRwKTFhGUW8GXa4yoDfJrPbLblc3U09ciS+9ZJXJ3Qrcs/x2IODOdIE5kQxvMmE2UKyqUictUw=="
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-4.0.2.tgz",
+ "integrity": "sha512-xKCTqAK/FFauOM9Ta2pswIyT3D8AQlfrYdOi/toTPEhqCuAs1v5tcJ3Y08Izh1cJ5Jchwy9SeAXmMg6zrKs2iw=="
},
"@react-dnd/shallowequal": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz",
- "integrity": "sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg=="
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-4.0.2.tgz",
+ "integrity": "sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA=="
},
"@redux-saga/core": {
"version": "1.2.1",
@@ -18238,13 +18273,13 @@
"dev": true
},
"dnd-core": {
- "version": "10.0.2",
- "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-10.0.2.tgz",
- "integrity": "sha512-PrxEjxF0+6Y1n1n1Z9hSWZ1tvnDXv9syL+BccV1r1RC08uWNsyetf8AnWmUF3NgYPwy0HKQJwTqGkZK+1NlaFA==",
+ "version": "16.0.1",
+ "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-16.0.1.tgz",
+ "integrity": "sha512-HK294sl7tbw6F6IeuK16YSBUoorvHpY8RHO+9yFfaJyCDVb6n7PRcezrOEOa2SBCqiYpemh5Jx20ZcjKdFAVng==",
"requires": {
- "@react-dnd/asap": "^4.0.0",
- "@react-dnd/invariant": "^2.0.0",
- "redux": "^4.0.4"
+ "@react-dnd/asap": "^5.0.1",
+ "@react-dnd/invariant": "^4.0.1",
+ "redux": "^4.2.0"
}
},
"dnd-multi-backend": {
@@ -22522,22 +22557,23 @@
}
},
"react-dnd": {
- "version": "10.0.2",
- "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-10.0.2.tgz",
- "integrity": "sha512-SC2Ymvntynhoqtf5zaFhZscm9xenCoMofilxPdlwUlaelAzmbl9fw82C4ZJ//+lNm3kWAKXjGDZg2/aWjKEAtg==",
+ "version": "16.0.1",
+ "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-16.0.1.tgz",
+ "integrity": "sha512-QeoM/i73HHu2XF9aKksIUuamHPDvRglEwdHL4jsp784BgUuWcg6mzfxT0QDdQz8Wj0qyRKx2eMg8iZtWvU4E2Q==",
"requires": {
- "@react-dnd/shallowequal": "^2.0.0",
- "@types/hoist-non-react-statics": "^3.3.1",
- "dnd-core": "^10.0.2",
- "hoist-non-react-statics": "^3.3.0"
+ "@react-dnd/invariant": "^4.0.1",
+ "@react-dnd/shallowequal": "^4.0.1",
+ "dnd-core": "^16.0.1",
+ "fast-deep-equal": "^3.1.3",
+ "hoist-non-react-statics": "^3.3.2"
}
},
"react-dnd-html5-backend": {
- "version": "10.0.2",
- "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-10.0.2.tgz",
- "integrity": "sha512-ny17gUdInZ6PIGXdzfwPhoztRdNVVvjoJMdG80hkDBamJBeUPuNF2Wv4D3uoQJLjXssX1+i9PhBqc7EpogClwQ==",
+ "version": "16.0.1",
+ "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-16.0.1.tgz",
+ "integrity": "sha512-Wu3dw5aDJmOGw8WjH1I1/yTH+vlXEL4vmjk5p+MHxP8HuHJS1lAGeIdG/hze1AvNeXWo/JgULV87LyQOr+r5jw==",
"requires": {
- "dnd-core": "^10.0.2"
+ "dnd-core": "^16.0.1"
}
},
"react-dnd-multi-backend": {
@@ -22549,6 +22585,12 @@
"react-dnd-preview": "^7.1.1"
},
"dependencies": {
+ "@react-dnd/asap": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.1.tgz",
+ "integrity": "sha512-kLy0PJDDwvwwTXxqTFNAAllPHD73AycE9ypWeln/IguoGBEbvFcPDbCV03G52bEcC5E+YgupBE0VzHGdC8SIXg==",
+ "peer": true
+ },
"@react-dnd/invariant": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-3.0.1.tgz",
@@ -22594,12 +22636,12 @@
}
},
"react-dnd-touch-backend": {
- "version": "10.0.2",
- "resolved": "https://registry.npmjs.org/react-dnd-touch-backend/-/react-dnd-touch-backend-10.0.2.tgz",
- "integrity": "sha512-+lW/Ern0dKyHToD0oP+Wc/ZD6l7qJazosLqbjzL7OnPlig6WxdlrHkJylOLkeAdZj41fIJJ551Lb57pIL0CcPw==",
+ "version": "16.0.1",
+ "resolved": "https://registry.npmjs.org/react-dnd-touch-backend/-/react-dnd-touch-backend-16.0.1.tgz",
+ "integrity": "sha512-NonoCABzzjyWGZuDxSG77dbgMZ2Wad7eQiCd/ECtsR2/NBLTjGksPUx9UPezZ1nQ/L7iD130Tz3RUshL/ClKLA==",
"requires": {
- "@react-dnd/invariant": "^2.0.0",
- "dnd-core": "^10.0.2"
+ "@react-dnd/invariant": "^4.0.1",
+ "dnd-core": "^16.0.1"
}
},
"react-dom": {
@@ -22665,6 +22707,21 @@
"uuid": "^3.4.0"
},
"dependencies": {
+ "@react-dnd/asap": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.1.tgz",
+ "integrity": "sha512-kLy0PJDDwvwwTXxqTFNAAllPHD73AycE9ypWeln/IguoGBEbvFcPDbCV03G52bEcC5E+YgupBE0VzHGdC8SIXg=="
+ },
+ "@react-dnd/invariant": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-2.0.0.tgz",
+ "integrity": "sha512-xL4RCQBCBDJ+GRwKTFhGUW8GXa4yoDfJrPbLblc3U09ciS+9ZJXJ3Qrcs/x2IODOdIE5kQxvMmE2UKyqUictUw=="
+ },
+ "@react-dnd/shallowequal": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz",
+ "integrity": "sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg=="
+ },
"dnd-core": {
"version": "14.0.1",
"resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-14.0.1.tgz",
diff --git a/package.json b/package.json
index f7c654a605008979efab4ca75669154548332277..98bae96a566127584c22789033466a4cf667e9d1 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
"i18next": "^19.9.2",
"intersection-observer": "^0.10.0",
"isomorphic-unfetch": "^3.1.0",
- "jss": "^10.3.0",
+ "jss": "^10.9.2",
"jss-rtl": "^0.3.0",
"lodash": "^4.17.21",
"manifesto.js": "^4.2.16",
@@ -51,10 +51,10 @@
"re-reselect": "^4.0.1",
"react-beautiful-dnd": "^13.1.1",
"react-copy-to-clipboard": "^5.1.0",
- "react-dnd": "^10.0.2",
- "react-dnd-html5-backend": "^10.0.2",
+ "react-dnd": "^16.0.1",
+ "react-dnd-html5-backend": "^16.0.1",
"react-dnd-multi-backend": "^7.1.1",
- "react-dnd-touch-backend": "^10.0.2",
+ "react-dnd-touch-backend": "^16.0.1",
"react-full-screen": "^1.1.1",
"react-i18next": "^11.18.6",
"react-image": "^4.0.3",
@@ -85,6 +85,7 @@
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
"@typescript-eslint/eslint-plugin": "^5.45.0",
"@typescript-eslint/parser": "^5.45.0",
+ "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
"babel-jest": "^27.5.1",
"babel-loader": "^8.3.0",
"babel-plugin-lodash": "^3.3.4",
@@ -95,7 +96,6 @@
"codecov": "^3.8.3",
"core-js": "^3.26.1",
"enzyme": "^3.11.0",
- "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
"eslint": "^8.28.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-react-app": "^7.0.1",
@@ -114,7 +114,7 @@
"jsdom": "^19.0.0",
"puppeteer": "^13.7.0",
"react": "^17.0.0",
- "react-dom": "^17.0.0",
+ "react-dom": "^17.0.2",
"react-refresh": "^0.11.0",
"redux-mock-store": "^1.5.4",
"redux-saga-test-plan": "^4.0.6",
diff --git a/setupJest.js b/setupJest.js
index cc3e8aca8525e1a5818392b56daf766342cf3661..e3219d857c91bf0a2d33ada1b8f89e1443dd36e8 100644
--- a/setupJest.js
+++ b/setupJest.js
@@ -3,7 +3,7 @@
import { JSDOM } from 'jsdom'; // eslint-disable-line import/no-extraneous-dependencies
import fetch from 'jest-fetch-mock'; // eslint-disable-line import/no-extraneous-dependencies
import Enzyme from 'enzyme'; // eslint-disable-line import/no-extraneous-dependencies
-import Adapter from 'enzyme-adapter-react-16'; // eslint-disable-line import/no-extraneous-dependencies
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17'; // eslint-disable-line import/no-extraneous-dependencies
const jsdom = new JSDOM('<!doctype html><html><body><div id="main"></div></body></html>', { url: 'https://localhost' });
const { window } = jsdom;