merge conflict

Enterprise-CMCS · Jan 7, 2025 · c3fd18e · c3fd18e
2 parents 5ba0e77 + 65ae9c7
commit c3fd18e
Show file tree

Hide file tree

Showing 6 changed files with 566 additions and 625 deletions.
diff --git a/services/app-api/package.json b/services/app-api/package.json
@@ -40,7 +40,7 @@
     "aws-jwt-verify": "^3.1.0",
     "date-fns": "^2.26.0",
     "date-fns-tz": "^1.2.2",
-    "dompurify": "^2.5.7",
+    "dompurify": "^2.5.8",
     "jsdom": "^24.1.3",
     "jwt-decode": "^3.1.2",
     "jwt-encode": "^1.0.1",

diff --git a/services/app-api/yarn.lock b/services/app-api/yarn.lock
@@ -2631,10 +2631,10 @@ domexception@^2.0.1:
   dependencies:
     webidl-conversions "^5.0.0"
 
-dompurify@^2.5.7:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.5.7.tgz#6e0d36b9177db5a99f18ade1f28579db5ab839d7"
-  integrity sha512-2q4bEI+coQM8f5ez7kt2xclg1XsecaV9ASJk/54vwlfRRNQfDqJz2pzQ8t0Ix/ToBpXlVjrRIx7pFC/o8itG2Q==
+dompurify@^2.5.8:
+  version "2.5.8"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.5.8.tgz#2809d89d7e528dc7a071dea440d7376df676f824"
+  integrity sha512-o1vSNgrmYMQObbSSvF/1brBYEQPHhV1+gsmrusO7/GXtp1T9rCS8cXFqVxK/9crT1jA6Ccv+5MTSjBNqr7Sovw==
 
 electron-to-chromium@^1.4.796:
   version "1.4.798"

diff --git a/services/ui-auth/package.json b/services/ui-auth/package.json
@@ -9,7 +9,7 @@
   "author": "",
   "license": "CC0-1.0",
   "dependencies": {
-    "@aws-sdk/client-cognito-identity-provider": "^3.691.0"
+    "@aws-sdk/client-cognito-identity-provider": "^3.712.0"
   },
   "devDependencies": {
     "serverless-plugin-common-excludes": "^4.0.0",