From 48e21a98d4eeaa5239050e781172ba2838eb5daa Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 8 Jan 2025 08:00:04 +0000
Subject: [PATCH 1/2] chore(deps): update internal dependencies

---
 package.json     |  6 +++---
 requirements.txt |  4 ++--
 yarn.lock        | 33 +++++++++++++++++++++++++--------
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 8bc8b4bd2f..f323f23956 100644
--- a/package.json
+++ b/package.json
@@ -30,10 +30,10 @@
     "@babel/preset-env": "7.23.7",
     "@babel/preset-react": "7.23.3",
     "@babel/preset-typescript": "7.23.3",
-    "@canonical/cookie-policy": "3.6.4",
+    "@canonical/cookie-policy": "3.6.5",
     "@canonical/global-nav": "3.6.4",
     "@canonical/latest-news": "1.5.0",
-    "@canonical/react-components": "1.7.0",
+    "@canonical/react-components": "1.7.3",
     "@canonical/store-components": "0.52.0",
     "@dnd-kit/core": "6.1.0",
     "@dnd-kit/sortable": "8.0.0",
@@ -101,7 +101,7 @@
     "ts-loader": "9.5.1",
     "typescript": "5.3.3",
     "uuid": "10.0.0",
-    "vanilla-framework": "4.17.1",
+    "vanilla-framework": "4.18.5",
     "watch-cli": "0.2.3",
     "webpack": "5.94.0",
     "webpack-cli": "5.1.4",
diff --git a/requirements.txt b/requirements.txt
index d97dadd54a..bec23482b8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,10 @@
 # App dependencies
 canonicalwebteam.flask-base==2.0.0
 canonicalwebteam.candid==0.9.0
-canonicalwebteam.discourse==5.7.2
+canonicalwebteam.discourse==5.7.3
 canonicalwebteam.blog==6.4.2
 canonicalwebteam.search==2.1.1
-canonicalwebteam.image-template==1.3.1
+canonicalwebteam.image-template==1.4.2
 canonicalwebteam.store-api==5.0.0
 canonicalwebteam.launchpad==0.9.0
 django-openid-auth==0.17
diff --git a/yarn.lock b/yarn.lock
index a0e497af9d..5d94aa0edf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1048,10 +1048,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@canonical/cookie-policy@3.6.4":
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/@canonical/cookie-policy/-/cookie-policy-3.6.4.tgz#895c3770f621b73d88b0d5843c43a32d99e4a462"
-  integrity sha512-kfwamTpAaBhtH5TzlMb8wE814a8lIbONUuSYnS7VPiHDfcdmw4NoBPNpldmNY1j3CAT5vMKOx5kulRTWpEXpag==
+"@canonical/cookie-policy@3.6.5":
+  version "3.6.5"
+  resolved "https://registry.yarnpkg.com/@canonical/cookie-policy/-/cookie-policy-3.6.5.tgz#50d82df6da2970b6b5d78d066dd94fcc1317e591"
+  integrity sha512-CQJKSkuLXhSumkIIw4YPSjR7k9561hZ3EEdMPQTkAVTxXURhm3WzJm/uyrvcAuU/a//jzWa8ScltCaHFBdACew==
 
 "@canonical/global-nav@3.6.4":
   version "3.6.4"
@@ -1082,6 +1082,23 @@
     react-table "7.8.0"
     react-useportal "1.0.19"
 
+"@canonical/react-components@1.7.3":
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/@canonical/react-components/-/react-components-1.7.3.tgz#1a5529d0c71a5362edfeee6971324e6feefc1454"
+  integrity sha512-+MxpZdLhHacZzbyN4CJ3YrTtLBD/grcgkhedC6Xp7+xuwwXOJivnIbNxqRbml2k+nEhPRkKpNa1y8e17nlD+nA==
+  dependencies:
+    "@types/jest" "29.5.12"
+    "@types/node" "20.16.3"
+    "@types/react" "18.3.5"
+    "@types/react-dom" "18.3.0"
+    "@types/react-table" "7.7.20"
+    classnames "2.5.1"
+    jest-environment-jsdom "29.7.0"
+    lodash.isequal "4.5.0"
+    prop-types "15.8.1"
+    react-table "7.8.0"
+    react-useportal "1.0.19"
+
 "@canonical/store-components@0.52.0":
   version "0.52.0"
   resolved "https://registry.yarnpkg.com/@canonical/store-components/-/store-components-0.52.0.tgz#04415a5c826601feb9cb554a1e5086c874b83ef6"
@@ -8113,10 +8130,10 @@ v8-to-istanbul@^9.0.1:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^2.0.0"
 
-vanilla-framework@4.17.1:
-  version "4.17.1"
-  resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-4.17.1.tgz#8f0913e51bbe14ec3ed0686fe4f91ab7685eda41"
-  integrity sha512-vmjx08LnGnNC37GF4shnrknmWhjV1Xq2LciBvzIBZFy4zCVbDO7O2HJbPvXzLkWClgICk7zkpnKJMVBAUk4wjA==
+vanilla-framework@4.18.5:
+  version "4.18.5"
+  resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-4.18.5.tgz#038e3bbeaeca49ae6cf6a074e0ed83901818eae6"
+  integrity sha512-UuYI6se/IV/u9YfzYPIs2FNJapgi9ld7F3s9IbjeR0yCvfH1HCjfZdDPD23tkQDBHiT6wNT6wugXDqFnunVJfQ==
 
 vanilla-framework@4.9.0:
   version "4.9.0"

From 0a266ffe8c2d97fd9f01d5e523539685cd86470b Mon Sep 17 00:00:00 2001
From: Steve Rydz <steve.rydz@canonical.com>
Date: Wed, 8 Jan 2025 10:06:34 +0000
Subject: [PATCH 2/2] Revert image-template upgrade

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index bec23482b8..31d9f064f4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ canonicalwebteam.candid==0.9.0
 canonicalwebteam.discourse==5.7.3
 canonicalwebteam.blog==6.4.2
 canonicalwebteam.search==2.1.1
-canonicalwebteam.image-template==1.4.2
+canonicalwebteam.image-template==1.3.1
 canonicalwebteam.store-api==5.0.0
 canonicalwebteam.launchpad==0.9.0
 django-openid-auth==0.17