From 6b9a04d447690ab345a92a1c47b3f6d3c4472b05 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 16 May 2023 12:23:02 -0700
Subject: [PATCH] (REF) BrowserLoader - Remove unused flags

These flags were drafted when there was single "loader" class -- the idea
was that a UF might toggle these flags. However:

* The branch now supports swapping the "loader" class entirely.
* It's easier to read the class if you don't have so many flags.
* We don't have a real UF contract to compare against, so the
  flags are a bit speculative.
---
 Civi/Esm/BrowserLoader.php | 38 +-------------------------------------
 Civi/Esm/ShimLoader.php    |  8 --------
 2 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/Civi/Esm/BrowserLoader.php b/Civi/Esm/BrowserLoader.php
index 5529071a4c..8dedf41b5c 100644
--- a/Civi/Esm/BrowserLoader.php
+++ b/Civi/Esm/BrowserLoader.php
@@ -38,20 +38,6 @@ class BrowserLoader extends \Civi\Core\Service\AutoService implements EventSubsc
     ];
   }
 
-  /**
-   * Should we generate tags like `<script type="importmap">`?
-   *
-   * @var bool
-   */
-  protected $enableMap = TRUE;
-
-  /**
-   * Should we generate tags like `<script type="module src="foo.js">`?
-   *
-   * @var bool
-   */
-  protected $enableModules = TRUE;
-
   /**
    * @var \Civi\Esm\ImportMap
    * @inject esm.import_map
@@ -72,20 +58,6 @@ class BrowserLoader extends \Civi\Core\Service\AutoService implements EventSubsc
    */
   protected $required = FALSE;
 
-  /**
-   * @param bool $enableMap
-   */
-  public function setEnableMap(bool $enableMap): void {
-    $this->enableMap = $enableMap;
-  }
-
-  /**
-   * @param bool $enableModules
-   */
-  public function setEnableModules(bool $enableModules): void {
-    $this->enableModules = $enableModules;
-  }
-
   /**
    * Receive a notification that an ESM is being used.
    *
@@ -113,7 +85,7 @@ class BrowserLoader extends \Civi\Core\Service\AutoService implements EventSubsc
     $importMap = $this->importMap->get();
     $region->add([
       'name' => 'import-map',
-      'markup' => $this->renderImportMap($importMap),
+      'markup' => empty($importMap) ? '' : $this->renderImportMap($importMap),
       'weight' => -1000,
     ]);
   }
@@ -127,10 +99,6 @@ class BrowserLoader extends \Civi\Core\Service\AutoService implements EventSubsc
    *   Ex: '<script type="importmap">{"imports": ...}</script>'
    */
   protected function renderImportMap(array $importMap): string {
-    if (!$this->enableMap || empty($importMap)) {
-      return '';
-    }
-
     $flags = JSON_UNESCAPED_SLASHES;
     if (Civi::settings()->get('debug_enabled')) {
       $flags |= JSON_PRETTY_PRINT;
@@ -147,10 +115,6 @@ class BrowserLoader extends \Civi\Core\Service\AutoService implements EventSubsc
    * @see \CRM_Core_Resources_CollectionInterface::add()
    */
   public function renderModule(array $snippet): string {
-    if (!$this->enableModules) {
-      return '';
-    }
-
     switch ($snippet['type']) {
       case 'script':
         return sprintf("<script type=\"module\">\n%s\n</script>\n", $snippet['script']);
diff --git a/Civi/Esm/ShimLoader.php b/Civi/Esm/ShimLoader.php
index 5ef6d04a82..af7eebdb1d 100644
--- a/Civi/Esm/ShimLoader.php
+++ b/Civi/Esm/ShimLoader.php
@@ -44,10 +44,6 @@ class ShimLoader extends BrowserLoader {
    *   Ex: '<script type="importmap">{"imports": ...}</script>'
    */
   protected function renderImportMap(array $importMap): string {
-    if (!$this->enableMap || empty($importMap)) {
-      return '';
-    }
-
     $shimUrl = Civi::paths()->getUrl('[civicrm.bower]/es-module-shims/dist/es-module-shims.js');
     $shimHtml = sprintf("<script async src='%s'></script>\n", htmlentities($shimUrl));
 
@@ -67,10 +63,6 @@ class ShimLoader extends BrowserLoader {
    * @see \CRM_Core_Resources_CollectionInterface::add()
    */
   public function renderModule(array $snippet): string {
-    if (!$this->enableModules) {
-      return '';
-    }
-
     switch ($snippet['type']) {
       case 'script':
         return sprintf("<script type=\"module-shim\">\n%s\n</script>\n", $snippet['script']);
-- 
2.25.1