From 475214dcf467ebbc39915c859593f9d5fc3bf319 Mon Sep 17 00:00:00 2001
From: Graham Pengelly <graham@three-tier.com>
Date: Fri, 26 Jan 2024 13:10:53 +0000
Subject: [PATCH] Upgrade dfe-autocomplete

* Update to fix failing css build due to include of IE8 that is no
  longer part of govuk-frontend
---
 .github/actions/prepare-app-env/action.yml |  4 ++--
 Gemfile                                    |  3 ++-
 Gemfile.lock                               | 17 ++++++++++++-----
 package.json                               |  5 +++--
 yarn.lock                                  |  8 ++++----
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/.github/actions/prepare-app-env/action.yml b/.github/actions/prepare-app-env/action.yml
index bd94ec97a..f09cd02d9 100644
--- a/.github/actions/prepare-app-env/action.yml
+++ b/.github/actions/prepare-app-env/action.yml
@@ -42,7 +42,7 @@ runs:
 
     - name: Set up yarn cache
       if: ${{ inputs.skip-node == 'false' }}
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3
       with:
         path: ${{ steps.yarn-cache.outputs.dir }}
         key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -51,5 +51,5 @@ runs:
 
     - name: Install node.js dependencies
       if: ${{ inputs.skip-node == 'false' }}
-      run: yarn install
+      run: yarn install --force
       shell: bash
diff --git a/Gemfile b/Gemfile
index 7e55dd78c..b3abc143b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,8 @@ gem "devise"
 gem "devise_invitable"
 gem "dfe-autocomplete",
     require: "dfe/autocomplete",
-    github: "DFE-Digital/dfe-autocomplete"
+    github: "DFE-Digital/dfe-autocomplete",
+    ref: "11738c0"
 gem "faraday", "~> 2.9"
 gem "gds_zendesk"
 gem "govuk-components", "~> 5.0.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 90a7e093d..bc0776eb4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,7 @@
 GIT
   remote: https://github.com/DFE-Digital/dfe-autocomplete.git
-  revision: 36d80e6b5bba67c92cd9ec6982a4e536d1889aed
+  revision: 11738c0e25778162e26eb7ab5e22a6ffce671b08
+  ref: 11738c0
   specs:
     dfe-autocomplete (0.1.0)
       actionview (>= 7.0.2.3)
@@ -209,9 +210,10 @@ GEM
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     inflection (1.0.0)
-    io-console (0.6.0)
-    irb (1.6.4)
-      reline (>= 0.3.0)
+    io-console (0.7.2)
+    irb (1.11.1)
+      rdoc
+      reline (>= 0.4.2)
     jaro_winkler (1.5.4)
     jsbundling-rails (1.1.2)
       railties (>= 6.0.0)
@@ -294,6 +296,8 @@ GEM
       racc
     pg (1.5.3)
     prettier_print (1.2.1)
+    psych (5.1.2)
+      stringio
     public_suffix (5.0.1)
     puma (6.4.2)
       nio4r (~> 2.0)
@@ -348,10 +352,12 @@ GEM
     rainbow (3.1.1)
     rake (13.1.0)
     rbs (2.8.4)
+    rdoc (6.6.2)
+      psych (>= 4.0.0)
     redcarpet (3.6.0)
     redis (4.8.1)
     regexp_parser (2.8.1)
-    reline (0.3.3)
+    reline (0.4.2)
       io-console (~> 0.5)
     responders (3.1.0)
       actionpack (>= 5.2)
@@ -467,6 +473,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
+    stringio (3.1.0)
     syntax_tree (6.1.1)
       prettier_print (>= 1.2.0)
     syntax_tree-haml (4.0.3)
diff --git a/package.json b/package.json
index dd781bc00..1363035f4 100644
--- a/package.json
+++ b/package.json
@@ -2,10 +2,11 @@
   "name": "app",
   "private": "true",
   "dependencies": {
-    "dfe-autocomplete": "github:DFE-Digital/dfe-autocomplete",
     "esbuild": "^0.19.12",
     "govuk-frontend": "^5.0.0",
-    "sass": "^1.70.0"
+    "sass": "^1.70.0",
+    "dfe-autocomplete": "github:DFE-Digital/dfe-autocomplete#main",
+    "accessible-autocomplete": "^2.0.4"
   },
   "scripts": {
     "build": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds --public-path=assets",
diff --git a/yarn.lock b/yarn.lock
index 69db61b81..15c9c5223 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -459,7 +459,7 @@ define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
-"dfe-autocomplete@github:DFE-Digital/dfe-autocomplete":
+"dfe-autocomplete@github:DFE-Digital/dfe-autocomplete#main":
   version "0.0.1"
   resolved "https://codeload.github.com/DFE-Digital/dfe-autocomplete/tar.gz/11738c0e25778162e26eb7ab5e22a6ffce671b08"
   dependencies:
@@ -949,9 +949,9 @@ ignore@^5.2.0:
   integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==
 
 immutable@^4.0.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.4.tgz#2e07b33837b4bb7662f288c244d1ced1ef65a78f"
-  integrity sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.5.tgz#f8b436e66d59f99760dc577f5c99a4fd2a5cc5a0"
+  integrity sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==
 
 import-fresh@^3.2.1:
   version "3.3.0"