From acf79c0ec30a2dc6a77735680e2d32544edcdd5f Mon Sep 17 00:00:00 2001
From: Asif Amin <asif.amin@dsiti.qld.gov.au>
Date: Wed, 22 Dec 2021 13:32:32 +1000
Subject: [PATCH 1/2] bower and jinja files not in use anymore

---
 bower.json       | 13 --------
 ssi_to_jinja2.py | 80 ------------------------------------------------
 2 files changed, 93 deletions(-)
 delete mode 100644 bower.json
 delete mode 100644 ssi_to_jinja2.py

diff --git a/bower.json b/bower.json
deleted file mode 100644
index 35defcaf0..000000000
--- a/bower.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "glue-template-release",
-  "version": "3.1.0",
-  "description": "glue-swe-template",
-  "homepage": "",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ]
-}
diff --git a/ssi_to_jinja2.py b/ssi_to_jinja2.py
deleted file mode 100644
index fdad0216f..000000000
--- a/ssi_to_jinja2.py
+++ /dev/null
@@ -1,80 +0,0 @@
-import sys
-import os
-import re
-from tempfile import mkstemp
-from shutil import move
-
-re_ssi = re.compile('<!--#include .*-->')
-re_echo = re.compile('value=".*"')
-re_echo_all = re.compile('<!--#echo.*-->')
-
-#Expecting a path to directory eg /home/user/swe/build/
-rootdir = sys.argv[1]
-for root, subdirs, files in os.walk(rootdir):
-    files = ["{0}{1}{2}".format(root,os.path.sep,s) for s in files]
-    for file_path in files:
-        include_js_snippet = False
-        #Create temp file
-        fh, abs_path = mkstemp()
-        with open(abs_path,'w') as new_file:
-            with open(file_path) as old_file:
-                for line in old_file:
-                    if '<!--#include' in line:
-                        new_file.write(line.replace('<!--#include virtual=','{% include ').replace('-->',' %}'))
-                    elif '<!--#set' in line:
-                        new_file.write(line.replace('<!--#set var="','{% set ').replace('" value=',' = ').replace('-->',' %}'))
-                    elif '<!--#echo' in line:
-                        if 'REQUEST_URI' in line:
-                            if 'value=' in line:
-                                new_file.write(re_echo.sub('value="{{ full_current_url }}"',line))
-                            else:
-                                new_file.write(re_echo_all.sub('{{ full_current_url }}',line))
-                        elif 'VHOST' in line:
-                            if 'value=' in line:
-                                new_file.write(re_echo.sub('value=""',line))
-                            else:
-                                new_file.write(re_echo_all.sub('',line))
-                        elif 'SERVED_BY' in line:
-                            if 'value=' in line:
-                                new_file.write(re_echo.sub('value=""',line))
-                            else:
-                                new_file.write(re_echo_all.sub('',line))
-                        elif 'SERVER_NAME' in line:
-                            if 'value=' in line:
-                                new_file.write(re_echo.sub('value="{{ macro_helpers.portal_type(\'site\')|trim }}.qld.gov.au"',line))
-                            else:
-                                new_file.write(re_echo_all.sub('{{ macro_helpers.portal_type(\'site\')|trim }}.qld.gov.au',line))
-                        elif 'HTTP_REFERER' in line:
-                            if 'value=' in line:
-                                include_js_snippet = True
-                                new_file.write(re_echo.sub('value=""',line))
-                            else:
-                                new_file.write(re_echo_all.sub('',line))
-                        elif 'HTTP_USER_AGENT' in line:
-                            if 'value=' in line:
-                                include_js_snippet = True
-                                new_file.write(re_echo.sub('value=""',line))
-                            else:
-                                new_file.write(re_echo_all.sub('',line))
-                        elif 'var="franchise"' in line:
-                            if 'value=' in line:
-                                new_file.write(re_echo.sub('value="{{ macro_helpers.portal_type(\'site\')|trim }}.qld.gov.au"',line))
-                            else:
-                                new_file.write(re_echo_all.sub('{{ macro_helpers.portal_type(\'site\')|trim }}.qld.gov.au',line))
-                        elif 'var="title"' in line:
-                            if 'value=' in line:
-                                new_file.write(re_echo.sub('value="{{ page_title }}"',line))
-                            else:
-                                new_file.write(re_echo_all.sub('{{ page_title }}',line))
-                        else:
-                            if 'value=' in line:
-                                new_file.write(re_echo.sub('value=""',line))
-                            else:
-                                new_file.write(re_echo_all.sub('',line))
-                    else:
-                        new_file.write(line)
-                if include_js_snippet == True:
-                    new_file.write('{% snippet "snippets/swe_js_includes.html" %}')
-        os.close(fh)
-        os.remove(file_path)
-        move(abs_path, file_path)

From 964ec45a1615499271e530f0d1e213e8b8f78dba Mon Sep 17 00:00:00 2001
From: Asif Amin <asif.amin@dsiti.qld.gov.au>
Date: Wed, 22 Dec 2021 13:43:03 +1000
Subject: [PATCH 2/2] bower and jinja files not in use anymore

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4bb42e7cb..81b52bf24 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,6 +20,7 @@ jobs:
           name: Workaround for GoogleChrome/puppeteer#290
           command: 'sh .circleci/setup_puppeteer.sh'
 
+      - run: npm install --save --legacy-peer-deps
       - run: npm install
 
       - run: