Fix/hdx 9070 google search optimize

ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/webassets.yml

@@ -4,33 +4,29 @@ common-js: &common-js
 common-css: &common-css
   filters: cssrewrite, rcssmin
 
-vendor-vendor-css:
-  <<: *common-css
-  output: ckanext-hdx_theme/%(version)s_vendor-vendor.css
-  contents:
-    - fontawesome-free/css/all.css    
+# vendor-vendor-css:
+#   contents:
+    #same version as CKANs but from CDN and min
+    # Fontawesome is included directly in page.html
 
 vendor-vendor:
   #original is base/vendor/webassets.yml -> vendor
-  extra:
-    preload:
-      - vendor-vendor-css    
   contents:
-    - jed.js
-    - moment-with-locales.js
+    - vendor/jed.js
+    - vendor/moment-with-locales.js
     # HDX Edit
     # commented out this line to allow a new version of select2 to be integrated into our new onboarding pages
     # vendor/select2-js (created above) is now included in hdx_theme/page-scripts
     # - select2/select2.js
     # END HDX Edit
-    - popperjs.js
-    - purify.js
-    - jquery.js
+    - vendor/popperjs.js
+    - vendor/purify.js
+    - vendor/jquery.js
 
 vendor-bootstrap:
   #original is base/vendor/webassets.yml -> vendor
   contents:
-    - bootstrap/js/bootstrap.js
+    - vendor/bootstrap/js/bootstrap.js
 
 base-main:
   <<: *common-js
@@ -112,6 +108,7 @@ page-styles:
   output: ckanext-hdx_theme/%(version)s_page-styles.css
   <<: *common-css
   contents:
+    # - vendor-vendor-css - Fontawesome is included directly in page.html
     - select2/select2.css
     - page-common-styles
     - base/base.css

ckanext-hdx_theme/ckanext/hdx_theme/templates/page.html

@@ -224,6 +224,7 @@
 {#      {% resource 'hdx_theme/package/tracking.js' %}#}
 {#  {% endif %}#}
   <link rel=preconnect href="https://fonts.gstatic.com" />
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2LwA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
   {#<script src="https://www.google.com/recaptcha/api.js" async defer></script>#}
   {{ super() }}
   {% asset 'hdx_theme/search-scripts' %}