Merge pull request #512 from yext/master-into-1.17

Merge master into release/v1.17 and resolve conflicts.

Also, update the package version numbers and incorporate #503

J=none
Test=none

cards/financial-professional-location/template.hbs

@@ -24,7 +24,9 @@
 {{#*inline 'image'}}
 {{#if card.image}}
 <div class="HitchhikerFinancialProfessionalLocation-imgWrapper">
-  <img class="HitchhikerFinancialProfessionalLocation-img" src="{{card.image}}" alt="{{#if card.altText}}{{card.altText}}{{/if}}" />
+  <img class="HitchhikerFinancialProfessionalLocation-img"
+  src="{{#unless (isAbsoluteUrl card.image)}}{{relativePath}}/{{/unless}}{{card.image}}"
+  alt="{{#if card.altText}}{{card.altText}}{{/if}}" />
 </div>
 {{/if}}
 {{/inline}}
@@ -41,7 +43,8 @@
 {{#if card.title}}
 <div class="HitchhikerFinancialProfessionalLocation-title">
   {{#if card.url}}
-  <a class="HitchhikerFinancialProfessionalLocation-titleLink js-HitchhikerFinancialProfessionalLocation-titleLink" href="{{card.url}}"
+  <a class="HitchhikerFinancialProfessionalLocation-titleLink js-HitchhikerFinancialProfessionalLocation-titleLink"
+    href="{{#unless (isAbsoluteUrl card.url}}{{relativePath}}/{{/unless}}{{card.url}}"
     data-eventtype="TITLE_CLICK" data-eventoptions='{{json card.titleEventOptions}}'
     target={{#if card.target}}"{{card.target}}"{{else}}"_top" rel="noopener noreferrer nofollow" {{/if}}>
     {{card.title}}
@@ -159,7 +162,7 @@
 {{#if (all url label)}}
 <div class="HitchhikerFinancialProfessionalLocation-{{ctaName}}">
   <a class="HitchhikerCTA js-HitchhikerCTA{{#if modifiers}} {{modifiers}}{{/if}}"
-    href="{{url}}"
+    href="{{#unless (isAbsoluteUrl url)}}{{relativePath}}/{{/unless}}{{url}}"
     data-eventtype="{{eventType}}"
     data-eventoptions='{{json eventOptions}}'
     target="{{#if target}}{{target}}{{else}}_top{{/if}}"

cards/location-standard/template.hbs

@@ -149,7 +149,9 @@
 {{#if card.title}}
 <div class="HitchhikerLocationStandard-title">
   {{#if card.titleUrl}}
-  <a class="HitchhikerLocationStandard-titleLink js-Hitchhiker-title" href="{{card.titleUrl}}" data-eventtype="TITLE_CLICK"
+  <a class="HitchhikerLocationStandard-titleLink js-Hitchhiker-title"
+    href="{{#unless (isAbsoluteUrl card.titleUrl)}}{{relativePath}}/{{/unless}}{{card.titleUrl}}"
+    data-eventtype="TITLE_CLICK"
     data-eventoptions='{{json card.titleEventOptions}}'
     target={{#if card.target}}"{{card.target}}"{{else}}"_top"{{/if}}>
     {{{card.title}}}
@@ -191,4 +193,4 @@
   {{/if}}
 </div>
 {{/if}}
-{{/inline}}
+{{/inline}}

cards/multilang-financial-professional-location/template.hbs

@@ -24,7 +24,9 @@
 {{#*inline 'image'}}
 {{#if card.image}}
 <div class="HitchhikerFinancialProfessionalLocation-imgWrapper">
-  <img class="HitchhikerFinancialProfessionalLocation-img" src="{{card.image}}" alt="{{#if card.altText}}{{card.altText}}{{/if}}" />
+  <img class="HitchhikerFinancialProfessionalLocation-img"
+    src="{{#unless (isAbsoluteUrl card.image)}}{{relativePath}}/{{/unless}}{{card.image}}"
+    alt="{{#if card.altText}}{{card.altText}}{{/if}}" />
 </div>
 {{/if}}
 {{/inline}}
@@ -41,7 +43,8 @@
 {{#if card.title}}
 <div class="HitchhikerFinancialProfessionalLocation-title">
   {{#if card.url}}
-  <a class="HitchhikerFinancialProfessionalLocation-titleLink js-HitchhikerFinancialProfessionalLocation-titleLink" href="{{card.url}}"
+  <a class="HitchhikerFinancialProfessionalLocation-titleLink js-HitchhikerFinancialProfessionalLocation-titleLink"
+    href="{{#unless (isAbsoluteUrl card.url)}}{{relativePath}}/{{/unless}}{{card.url}}"
     data-eventtype="TITLE_CLICK" data-eventoptions='{{json card.titleEventOptions}}'
     target={{#if card.target}}"{{card.target}}"{{else}}"_top" rel="noopener noreferrer nofollow" {{/if}}>
     {{card.title}}
@@ -159,7 +162,7 @@
 {{#if (all url label)}}
 <div class="HitchhikerFinancialProfessionalLocation-{{ctaName}}">
   <a class="HitchhikerCTA js-HitchhikerCTA{{#if modifiers}} {{modifiers}}{{/if}}"
-    href="{{url}}"
+    href="{{#unless (isAbsoluteUrl url)}}{{relativePath}}/{{/unless}}{{url}}"
     data-eventtype="{{eventType}}"
     data-eventoptions='{{json eventOptions}}'
     target="{{#if target}}{{target}}{{else}}_top{{/if}}"

cards/multilang-location-standard/template.hbs

@@ -149,7 +149,9 @@
 {{#if card.title}}
 <div class="HitchhikerLocationStandard-title">
   {{#if card.titleUrl}}
-  <a class="HitchhikerLocationStandard-titleLink js-Hitchhiker-title" href="{{card.titleUrl}}" data-eventtype="TITLE_CLICK"
+  <a class="HitchhikerLocationStandard-titleLink js-Hitchhiker-title"
+    href="{{#unless (isAbsoluteUrl card.titleUrl)}}{{relativePath}}/{{/unless}}{{card.titleUrl}}"
+    data-eventtype="TITLE_CLICK"
     data-eventoptions='{{json card.titleEventOptions}}'
     target={{#if card.target}}"{{card.target}}"{{else}}"_top"{{/if}}>
     {{{card.title}}}
@@ -191,4 +193,4 @@
   {{/if}}
 </div>
 {{/if}}
-{{/inline}}
+{{/inline}}

global_config.json

@@ -1,10 +1,8 @@
 {
   "sdkVersion": "1.6", // The version of the Answers SDK to use
   // "apiKey": "<REPLACE ME>", // The answers api key found on the experiences page. This will be provided automatically by the Yext CI system
-  "experienceKey": "<REPLACE ME>",
   // "experienceVersion": "<REPLACE ME>", // the Answers Experience version to use for API requests. This will be provided automatically by the Yext CI system
   // "businessId": "<REPLACE ME>", // The business ID of the account. This will be provided automatically by the Yext CI system
-  "locale": "en", // The default locale for searches. Examples: UK: en-GB, Spanish: es, Spain Spanish: es-ES.
   "logo": "", // The link to the logo for open graph meta tag - og:image.
   "favicon": "",
   "googleTagManagerName": "dataLayer", // The name of your Google Tag Manager data layer

package.json

@@ -1,6 +1,6 @@
 {
   "name": "answers-hitchhiker-theme",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "A starter answers theme for hitchhikers",
   "scripts": {
     "test": "cross-env NODE_ICU_DATA=node_modules/full-icu jest --verbose"

static/package.json

@@ -1,6 +1,6 @@
 {
   "name": "answers-hitchhiker-theme",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "Toolchain for use with the HH Theme",
   "main": "Gruntfile.js",
   "scripts": {