From 93270da0297b0841022cc9081aa7d3f749b9862c Mon Sep 17 00:00:00 2001 From: Gjore Milevski Date: Thu, 19 Dec 2024 11:07:25 +0100 Subject: [PATCH] Resolve conflict, adjust react-uswds as a dependency --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 277568dbb..be020b525 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,7 @@ "node": ">=18.0.0" }, "peerDependencies": { - "@uswds/uswds": "^3.8.1", - "@trussworks/react-uswds": "^9.0.0" + "@uswds/uswds": "^3.8.1" }, "devDependencies": { "@babel/core": "^7.26.0", @@ -126,7 +125,6 @@ "stylelint-config-standard-scss": "^13.1.0", "@uswds/compile": "^1.1.0", "@uswds/uswds": "^3.8.1", - "@trussworks/react-uswds": "^9.0.0", "ts-jest": "^29.2.5", "typescript": "4.8.4" }, @@ -245,6 +243,7 @@ "shpjs": "^4.0.4", "styled-components": "^5.3.3", "tippy.js": "^6.3.7", + "@trussworks/react-uswds": "^9.0.0", "use-deep-compare": "^1.1.0", "xlsx": "^0.18.5" },