Merge 92de398 into 604559b

yext · Dec 15, 2021 · b37566d · b37566d
2 parents 604559b + 92de398
commit b37566d
Show file tree

Hide file tree

Showing 52 changed files with 852 additions and 821 deletions.
diff --git a/.github/workflows/version-update.yml b/.github/workflows/version-update.yml
diff --git a/directanswercards/card_component.js b/directanswercards/card_component.js
@@ -23,9 +23,9 @@ BaseDirectAnswerCard["{{componentName}}"] = class extends ANSWERS.Component {
   setState(data) {
     let cardData = this.dataForRender(this.type, this.answer, this.relatedItem, this.snippet);
     this.validateDataForRender(cardData);
+
     return super.setState({
       ...cardData,
-      searcher: data.searcher,
       feedbackEnabled: ANSWERS.getAnalyticsOptIn(),
       feedbackSubmitted: data.feedbackSubmitted,
       isArray: Array.isArray(this.answer.value),
@@ -97,7 +97,7 @@ BaseDirectAnswerCard["{{componentName}}"] = class extends ANSWERS.Component {
       .addOptions({
         directAnswer: true,
         verticalKey: this.verticalConfigId,
-        searcher: this.getState('searcher'),
+        searcher: 'UNIVERSAL',
         entityId: this.associatedEntityId
       });
 
@@ -120,7 +120,7 @@ BaseDirectAnswerCard["{{componentName}}"] = class extends ANSWERS.Component {
    */
   addDefaultEventOptions(eventOptions = {}) {
     return Object.assign({}, {
-        searcher: this.getState('searcher'),
+        searcher: "UNIVERSAL",
         verticalConfigId: this.verticalConfigId,
         entityId: this.associatedEntityId,
         ...eventOptions
@@ -144,7 +144,7 @@ BaseDirectAnswerCard["{{componentName}}"] = class extends ANSWERS.Component {
       verticalKey: this.verticalConfigId,
       directAnswer: true,
       fieldName: this.answer.fieldApiName,
-      searcher: this.getState('searcher'),
+      searcher: 'UNIVERSAL',
       entityId: this.associatedEntityId,
       url: event.target.href
     };

diff --git a/global_config.json b/global_config.json
@@ -3,7 +3,6 @@
   // "token": "<REPLACE ME>", // The auth token to access Answers experience.
   // "apiKey": "<REPLACE ME>", // The answers api key found on the experiences page. This will be provided automatically by the Yext CI system
   // "experienceVersion": "<REPLACE ME>", // the Answers Experience version to use for API requests. This will be provided automatically by the Yext CI system
-  // "environment": "production", // The environment to run on for this Answers Experience. (i.e. 'production' or 'sandbox')
   // "businessId": "<REPLACE ME>", // The business ID of the account. This will be provided automatically by the Yext CI system
   // "initializeManually": true, // If true, the experience must be started by calling AnswersExperience.init() or AnswersExperienceFrame.init() for iframe integrations.
   // "useJWT": true, // Whether or not to enable JWT. If true, the apiKey will be hidden from the build output and the token must be specified through manual initialization.

diff --git a/hbshelpers/getDefaultUniversalLimit.js b/hbshelpers/getDefaultUniversalLimit.js
diff --git a/hbshelpers/wrapJsPartial.js b/hbshelpers/wrapJsPartial.js
diff --git a/layouts/html.hbs b/layouts/html.hbs
@@ -6,9 +6,7 @@
       if (window.name == 'overlay') {
         window.isOverlay = true;
       }
-      {{#wrapJsPartial}}
-        {{> script/translations}}
-      {{/wrapJsPartial}}
+      {{> script/translations}}
       {{/babel}}
     </script>
     {{> layouts/headincludes }}
@@ -74,15 +72,10 @@
     <script>
       {{#babel}}
         document.addEventListener('DOMContentLoaded', () => {
+          {{> script/on-document-load}}
           {{#if global_config.initializeManually}}
             new HitchhikerJS.ManualInitializer(initAnswers).setup();
-            {{#wrapJsPartial}}
-              {{> script/on-document-load}}
-            {{/wrapJsPartial}}
           {{else}}
-            {{#wrapJsPartial}}
-              {{> script/on-document-load}}
-            {{/wrapJsPartial}}
             initAnswers();
           {{/if}}
         });

diff --git a/layouts/preload-fonts.hbs b/layouts/preload-fonts.hbs
@@ -1,5 +1,5 @@
 <!-- Preload the SourceSans fonts used by default in the Theme -->
-<link rel="preload" as="font" href="{{relativePath}}/source-sans-pro-v14-latin-300.woff" type="font/woff" crossorigin="anonymous">
-<link rel="preload" as="font" href="{{relativePath}}/source-sans-pro-v14-latin-600.woff" type="font/woff" crossorigin="anonymous">
-<link rel="preload" as="font" href="{{relativePath}}/source-sans-pro-v14-latin-700.woff" type="font/woff" crossorigin="anonymous">
-<link rel="preload" as="font" href="{{relativePath}}/source-sans-pro-v14-latin-regular.woff" type="font/woff" crossorigin="anonymous">
+<link rel="preload" as="font" href="{{relativePath}}/static/assets/fonts/source-sans-pro-v14-latin-300.woff" type="font/woff" crossorigin="anonymous">
+<link rel="preload" as="font" href="{{relativePath}}/static/assets/fonts/source-sans-pro-v14-latin-600.woff" type="font/woff" crossorigin="anonymous">
+<link rel="preload" as="font" href="{{relativePath}}/static/assets/fonts/source-sans-pro-v14-latin-700.woff" type="font/woff" crossorigin="anonymous">
+<link rel="preload" as="font" href="{{relativePath}}/static/assets/fonts/source-sans-pro-v14-latin-regular.woff" type="font/woff" crossorigin="anonymous">