From 5259f2401b77ef4cc6b1bba8df4b3c1ca4769de0 Mon Sep 17 00:00:00 2001 From: Kendall Garner <17521368+kgarner7@users.noreply.github.com> Date: Sun, 28 Apr 2024 18:59:05 -0700 Subject: [PATCH] upgrade framer-motion to 11 --- package-lock.json | 56 ++++--------------- package.json | 2 +- release/app/package-lock.json | 3 +- .../components/general/draggable-item.tsx | 4 +- 4 files changed, 17 insertions(+), 48 deletions(-) diff --git a/package-lock.json b/package-lock.json index 18abc222..59f1bda9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "electron-updater": "^4.6.5", "fast-average-color": "^9.3.0", "format-duration": "^2.0.0", - "framer-motion": "^10.13.0", + "framer-motion": "^11.0.0", "fuse.js": "^6.6.2", "history": "^5.3.0", "i18next": "^21.10.0", @@ -11553,21 +11553,22 @@ } }, "node_modules/framer-motion": { - "version": "10.13.0", - "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-10.13.0.tgz", - "integrity": "sha512-xKhw9VCizmwEHbopOfluaoVunGHSZyMztGbTvsgOYqCjaKu6qtlwWY1J+6GhL41NY1P157JgEikjDm67XCFnvQ==", + "version": "11.1.7", + "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.1.7.tgz", + "integrity": "sha512-cW11Pu53eDAXUEhv5hEiWuIXWhfkbV32PlgVISn7jRdcAiVrJ1S03YQQ0/DzoswGYYwKi4qYmHHjCzAH52eSdQ==", + "license": "MIT", "dependencies": { - "@emotion/is-prop-valid": "^0.8.2", "tslib": "^2.4.0" }, - "optionalDependencies": { - "@emotion/is-prop-valid": "^0.8.2" - }, "peerDependencies": { + "@emotion/is-prop-valid": "*", "react": "^18.0.0", "react-dom": "^18.0.0" }, "peerDependenciesMeta": { + "@emotion/is-prop-valid": { + "optional": true + }, "react": { "optional": true }, @@ -11576,21 +11577,6 @@ } } }, - "node_modules/framer-motion/node_modules/@emotion/is-prop-valid": { - "version": "0.8.8", - "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz", - "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==", - "optional": true, - "dependencies": { - "@emotion/memoize": "0.7.4" - } - }, - "node_modules/framer-motion/node_modules/@emotion/memoize": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz", - "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==", - "optional": true - }, "node_modules/fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", @@ -30720,29 +30706,11 @@ "dev": true }, "framer-motion": { - "version": "10.13.0", - "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-10.13.0.tgz", - "integrity": "sha512-xKhw9VCizmwEHbopOfluaoVunGHSZyMztGbTvsgOYqCjaKu6qtlwWY1J+6GhL41NY1P157JgEikjDm67XCFnvQ==", + "version": "11.1.7", + "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.1.7.tgz", + "integrity": "sha512-cW11Pu53eDAXUEhv5hEiWuIXWhfkbV32PlgVISn7jRdcAiVrJ1S03YQQ0/DzoswGYYwKi4qYmHHjCzAH52eSdQ==", "requires": { - "@emotion/is-prop-valid": "^0.8.2", "tslib": "^2.4.0" - }, - "dependencies": { - "@emotion/is-prop-valid": { - "version": "0.8.8", - "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz", - "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==", - "optional": true, - "requires": { - "@emotion/memoize": "0.7.4" - } - }, - "@emotion/memoize": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz", - "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==", - "optional": true - } } }, "fresh": { diff --git a/package.json b/package.json index bc0ff149..82e38630 100644 --- a/package.json +++ b/package.json @@ -319,7 +319,7 @@ "electron-updater": "^4.6.5", "fast-average-color": "^9.3.0", "format-duration": "^2.0.0", - "framer-motion": "^10.13.0", + "framer-motion": "^11.0.0", "fuse.js": "^6.6.2", "history": "^5.3.0", "i18next": "^21.10.0", diff --git a/release/app/package-lock.json b/release/app/package-lock.json index f04bad4b..0acd09bb 100644 --- a/release/app/package-lock.json +++ b/release/app/package-lock.json @@ -2299,7 +2299,8 @@ "ws": { "version": "8.13.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", - "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==" + "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", + "requires": {} }, "xml2js": { "version": "0.4.23", diff --git a/src/renderer/features/settings/components/general/draggable-item.tsx b/src/renderer/features/settings/components/general/draggable-item.tsx index 7f7eb641..61baa5bc 100644 --- a/src/renderer/features/settings/components/general/draggable-item.tsx +++ b/src/renderer/features/settings/components/general/draggable-item.tsx @@ -1,9 +1,9 @@ import { Group } from '@mantine/core'; -import { useDragControls, Reorder } from 'framer-motion'; +import { useDragControls, Reorder, DragControls } from 'framer-motion'; import { MdDragIndicator } from 'react-icons/md'; import { Checkbox } from '/@/renderer/components'; -const DragHandle = ({ dragControls }: any) => { +const DragHandle = ({ dragControls }: { dragControls: DragControls }) => { return (