From 6804b52d31b70b8aae68fdd590c2ec8dc0a9802f Mon Sep 17 00:00:00 2001 From: Anton Gunnarsson Date: Fri, 28 Feb 2025 13:54:29 +0000 Subject: [PATCH] Merged in fix/unpin-framer-motion-version (pull request #1444) Unpin framer-motion version Approved-by: Linus Flood --- apps/scandic-web/package.json | 2 +- yarn.lock | 32 +++++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/apps/scandic-web/package.json b/apps/scandic-web/package.json index 9f63a1aba..cabcc18fb 100644 --- a/apps/scandic-web/package.json +++ b/apps/scandic-web/package.json @@ -68,7 +68,7 @@ "embla-carousel-react": "^8.5.2", "fast-deep-equal": "^3.1.3", "fetch-retry": "^6.0.0", - "framer-motion": "11.3.28", + "framer-motion": "^11.3.28", "graphql": "^16.8.1", "graphql-request": "^6.1.0", "graphql-tag": "^2.12.6", diff --git a/yarn.lock b/yarn.lock index 5b5bc0079..090d768a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6341,7 +6341,7 @@ __metadata: eslint-plugin-simple-import-sort: "npm:^12.1.0" fast-deep-equal: "npm:^3.1.3" fetch-retry: "npm:^6.0.0" - framer-motion: "npm:11.3.28" + framer-motion: "npm:^11.3.28" graphql: "npm:^16.8.1" graphql-request: "npm:^6.1.0" graphql-tag: "npm:^2.12.6" @@ -12966,15 +12966,17 @@ __metadata: languageName: node linkType: hard -"framer-motion@npm:11.3.28": - version: 11.3.28 - resolution: "framer-motion@npm:11.3.28" +"framer-motion@npm:^11.3.28": + version: 11.18.2 + resolution: "framer-motion@npm:11.18.2" dependencies: + motion-dom: "npm:^11.18.1" + motion-utils: "npm:^11.18.1" tslib: "npm:^2.4.0" peerDependencies: "@emotion/is-prop-valid": "*" - react: ^18.0.0 - react-dom: ^18.0.0 + react: ^18.0.0 || ^19.0.0 + react-dom: ^18.0.0 || ^19.0.0 peerDependenciesMeta: "@emotion/is-prop-valid": optional: true @@ -12982,7 +12984,7 @@ __metadata: optional: true react-dom: optional: true - checksum: 10c0/f5aaf914f764ca4a05f7b77e50469b0dbd3311f7be98be871385075513370840de2f154422c7cdc00664147a3cc04f31053997c5eb3131edb25a1abfec570f93 + checksum: 10c0/41b1ef1b4e54ea13adaf01d61812a8783d2352f74641c91b50519775704bc6274db6b6863ff494a1f705fa6c6ed8f4df3497292327c906d53ea0129cef3ec361 languageName: node linkType: hard @@ -16705,6 +16707,22 @@ __metadata: languageName: node linkType: hard +"motion-dom@npm:^11.18.1": + version: 11.18.1 + resolution: "motion-dom@npm:11.18.1" + dependencies: + motion-utils: "npm:^11.18.1" + checksum: 10c0/98378bdf9d77870829cdf3624c5eff02e48cfa820dfc74450364d7421884700048d60e277bfbf477df33270fbae4c1980e5914586f5b6dff28d4921fdca8ac47 + languageName: node + linkType: hard + +"motion-utils@npm:^11.18.1": + version: 11.18.1 + resolution: "motion-utils@npm:11.18.1" + checksum: 10c0/dac083bdeb6e433a277ac4362211b0fdce59ff09d6f7897f0f49d1e3561209c6481f676876daf99a33485054bc7e4b1d1b8d1de16f7b1e5c6f117fe76358ca00 + languageName: node + linkType: hard + "mrmime@npm:^1.0.1": version: 1.0.1 resolution: "mrmime@npm:1.0.1"