MAGE-1015 Remove InstantSearch from global deps

Author: cammonro

Block/Configuration.php

@@ -13,7 +13,7 @@ class Configuration extends Algolia implements CollectionDataSourceInterface
     //Placeholder for future implementation (requires custom renderer for hierarchicalMenu widget)
     private const IS_CATEGORY_NAVIGATION_ENABLED = false;
 
-    public function isSearchPage()
+    public function isSearchPage(): bool
     {
         if ($this->getConfigHelper()->isInstantEnabled()) {
             /** @var Http $request */
@@ -80,8 +80,6 @@ public function getConfiguration()
 
         $suggestionHelper = $this->getSuggestionHelper();
 
-        $productHelper = $this->getProductHelper();
-
         $algoliaHelper = $this->getAlgoliaHelper();
 
         $persoHelper = $this->getPersonalizationHelper();
@@ -254,7 +252,7 @@ public function getConfiguration()
             'attributeFilter' => $attributesToFilter,
             'facets' => $facets,
             'areCategoriesInFacets' => $areCategoriesInFacets,
-            'hitsPerPage' => (int) $config->getNumberOfProductResults(),
+            'hitsPerPage' => $config->getNumberOfProductResults(),
             'sortingIndices' => array_values($this->sortingTransformer->getSortingIndices(
                 $this->getStoreId(),
                 $customerGroupId
@@ -421,7 +419,7 @@ protected function getOrderedProductIds(ConfigHelper $configHelper, Http $reques
         return $ids;
     }
 
-    protected function isLandingPage()
+    protected function isLandingPage(): bool
     {
         return $this->getRequest()->getFullActionName() === 'algolia_landingpage_view';
     }
@@ -440,4 +438,15 @@ protected function getLandingPageConfiguration()
     {
         return $this->isLandingPage() ? $this->getCurrentLandingPage()->getConfiguration() : json_encode([]);
     }
+
+    public function canLoadInstantSearch(): bool
+    {
+        return $this->getConfigHelper()->isInstantEnabled()
+            && $this->isProductListingPage();
+    }
+
+    protected function isProductListingPage(): bool
+    {
+        return $this->isSearchPage() || $this->isLandingPage();
+    }
 }

view/frontend/requirejs-config.js

@@ -55,7 +55,6 @@ const config = {
 
     },
     deps : [
-        'algoliaInstantSearch', 
         'algoliaInsights'
     ],
     config: {

view/frontend/templates/internals/configuration.phtml

@@ -7,7 +7,7 @@ $configuration = $block->getConfiguration();
 if (class_exists('\Magento\Framework\View\Helper\SecureHtmlRenderer')) : ?>
     <?php
         /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
-        if ($configuration['instant']['enabled'] === true && $configuration['isSearchPage'] === true)  {
+        if ($block->canLoadInstantSearch())  {
             $css = /* @noEscape */ $secureRenderer->renderTag('style', [],  $configuration['instant']['selector'] . ' {display:none}', false);
             /* @noEscape */ echo $secureRenderer->renderTag('script', [], 'document.write(\'' . $css . '\');' , false);
         }
@@ -17,7 +17,7 @@ if (class_exists('\Magento\Framework\View\Helper\SecureHtmlRenderer')) : ?>
 <?php else: ?>
     <script>
         <?php
-        if ($configuration['instant']['enabled'] === true && $configuration['isSearchPage'] === true) :
+        if ($block->canLoadInstantSearch()):
         $css = '<style type="text/css">' . $configuration['instant']['selector'] . ' {display:none}</style>';
         ?>
         // Hide the instant-search selector ASAP to remove flickering. Will be re-displayed later with JS.
@@ -29,3 +29,14 @@ if (class_exists('\Magento\Framework\View\Helper\SecureHtmlRenderer')) : ?>
         window.algoliaConfig = <?php /* @noEscape */ echo json_encode($configuration); ?>;
     </script>
 <?php endif; ?>
+
+
+<?php if ($block->canLoadInstantSearch()) : ?>
+    <script type="text/x-magento-init">
+        {
+            "*": {
+                "algoliaInstantSearch": {}
+            }
+        }
+    </script>
+<?php endif;?>