USAGOV-1937-clear-menu-link:

composer.json

@@ -138,7 +138,8 @@
             "drupal/tome": {
                 "CSS on Amazon S3 via Flysystem not processing properly": "https://www.drupal.org/files/issues/2020-08-06/3161384-4.patch",
                 "De-duplicate invoke paths in StaticCommand's exportPaths": "./patches/drupal/deduplicateTomeInvokePaths.patch",
-                "Make tome work with drush 12": "https://www.drupal.org/files/issues/2023-08-02/tome_drush12-support.patch"
+                "Make tome work with drush 12": "https://www.drupal.org/files/issues/2023-08-02/tome_drush12-support.patch",
+                "Make tome work with path count > 1 without re-exporting pages multiple times" : "./patches/drupal/tomePathCountFixes.patch"
             },
             "drupal/core": {
                 "Enable MenuActiveTrail to find the original menu item created by node_menus": "./patches/drupal/correctActiveTrail_d10.patch",
@@ -151,6 +152,9 @@
             },
             "drupal/views_menu_children_filter": {
                 "Use the technique from correctActiveTrail.patch to return the original menu item": "./patches/drupal/correctMenuChildren_d10.patch"
+            },
+            "drupal/menu_breadcrumb": {
+                "Add url.path to cache context for menu breadcrumb": "https://www.drupal.org/files/issues/2024-09-11/menu_breadcrumb-3230481-fix-cache-context-mr22.patch"
             }
         },
         "drupal-lenient": {

patches/drupal/tomePathCountFixes.patch

@@ -0,0 +1,92 @@
+diff --git a/modules/tome_static/src/Commands/StaticCommand.php b/modules/tome_static/src/Commands/StaticCommand.php
+index 56d963b5607c3ffdeebdf6c7854f0d0b1ece1b06..d6fbaca2cb30308f156e9927529673dfbf81f778 100644
+--- a/modules/tome_static/src/Commands/StaticCommand.php
++++ b/modules/tome_static/src/Commands/StaticCommand.php
+@@ -53,6 +53,8 @@ class StaticCommand extends CommandBase {
+    */
+   protected $state;
+
++  protected $init_paths = [];
++
+   /**
+    * Constructs a StaticCommand instance.
+    *
+@@ -123,6 +125,9 @@ class StaticCommand extends CommandBase {
+     }
+
+     $this->io->writeln('Generating static HTML...');
++
++    $this->setInitialPaths($paths);
++
+     $this->exportPaths($paths, [], $options['process-count'], $options['path-count'], TRUE, $options['retry-count'], $options['uri']);
+     $this->io->success('Exported static HTML and related assets.');
+
+@@ -135,6 +140,14 @@ class StaticCommand extends CommandBase {
+     return 0;
+   }
+
++  protected function setInitialPaths(array $paths): void {
++    $this->init_paths = $paths;
++  }
++
++  protected function getInitialPaths(): array {
++    return $this->init_paths;
++  }
++
+   /**
+    * Exports the given paths to the static directory.
+    *
+@@ -175,15 +188,18 @@ class StaticCommand extends CommandBase {
+     $show_progress && $this->io->progressStart(count($paths));
+
+     $invoke_paths = [];
+-    $collected_errors = $this->runCommands($commands, $process_count, $retry_count, function (Process $process) use ($show_progress, &$invoke_paths, $path_count) {
++    $collected_errors = $this->runCommands($commands, $process_count, $retry_count, function (Process $process) use ($show_progress, &$invoke_paths, $path_count, $old_paths) {
+       $show_progress && $this->io->progressAdvance($path_count);
+       $output = $process->getOutput();
+       if (!empty($output) && $json = json_decode($output, TRUE)) {
+         $invoke_paths = array_unique(array_merge($invoke_paths, $json));
++
++        // don't include paths that are going to be exported by another process
++        $invoke_paths = array_diff($invoke_paths, $old_paths, $this->getInitialPaths());
+       }
+     });
+
+-    $invoke_paths = array_diff($invoke_paths, $old_paths);
++    $invoke_paths = array_diff($invoke_paths, $old_paths,  $this->getInitialPaths());
+     $old_paths = array_merge($old_paths, $invoke_paths);
+
+     $show_progress && $this->io->progressFinish();
+@@ -191,6 +207,7 @@ class StaticCommand extends CommandBase {
+       $this->displayErrors($collected_errors);
+     }
+     if (count($invoke_paths)) {
++      $this->init_paths = array_merge($this->init_paths, $invoke_paths);
+       $this->io->writeln('Processing related assets and paths...');
+       $this->exportPaths($invoke_paths, $old_paths, $process_count, $path_count, $show_progress, $retry_count, $uri);
+     }
+diff --git a/modules/tome_static/src/Commands/StaticExportPathCommand.php b/modules/tome_static/src/Commands/StaticExportPathCommand.php
+index 933321846edd33204522259f1411ff5eab404376..4ff8dd3e79a9cd9e5db72b8b7d0d0f2e73007d4a 100644
+--- a/modules/tome_static/src/Commands/StaticExportPathCommand.php
++++ b/modules/tome_static/src/Commands/StaticExportPathCommand.php
+@@ -68,6 +68,7 @@ class StaticExportPathCommand extends StaticCommand {
+       $this->requestPreparer->prepareForRequest();
+       try {
+         $invoke_paths = array_merge($this->static->requestPath($path), $invoke_paths);
++        $invoke_paths = array_unique($invoke_paths);
+       }
+       catch (\Exception $e) {
+         $this->io->getErrorStyle()->error($this->formatPathException($path, $e));
+diff --git a/modules/tome_static/src/RequestPreparer.php b/modules/tome_static/src/RequestPreparer.php
+index be08b0460e494b74492f3940634b8ab71aa1f900..7d514d82f689ddf203b6280dc1f702cfa4327159 100644
+--- a/modules/tome_static/src/RequestPreparer.php
++++ b/modules/tome_static/src/RequestPreparer.php
+@@ -110,7 +110,7 @@ class RequestPreparer {
+     }
+     // Reset active trail cache.
+     if ($this->menuActiveTrail instanceof CacheCollectorInterface) {
+-      $this->menuActiveTrail->reset();
++      $this->menuActiveTrail->clear();
+     }
+     // Reset the language manager.
+     $this->languageManager->reset();

scripts/tome-static.sh

@@ -30,7 +30,7 @@ echo "Starting Static Site Generation : "$(date)
 mkdir -p /var/www/html
 # time drush -vvv tome:static --uri=$URI --process-count=1 --path-count=1
 # time drush tome:static -y --uri=$URI --process-count=5 --path-count=1
-time drush tome:static -y --uri=$URI --process-count=$TOME_PROCESS_COUNT --path-count=1
+time drush tome:static -y --uri=$URI --process-count=$TOME_PROCESS_COUNT --path-count=10
 TOME_SUCCESS=$?
 echo "Finished Static Site Generation : "$(date)
 exit $TOME_SUCCESS

web/modules/custom/usagov_ssg_postprocessing/src/EventSubscriber/RequestPrepareSubscriber.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace Drupal\usagov_ssg_postprocessing\EventSubscriber;
+
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Routing\CurrentRouteMatch;
+use Drupal\path_alias\AliasManager;
+use Drupal\tome_static\Event\TomeStaticEvents;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Clears non-core caches between Tome requests.
+ *
+ * This event is useful when running tome with more than one path per process to
+ * clear any caches used by contrib modules.
+ */
+class RequestPrepareSubscriber implements EventSubscriberInterface {
+
+  public function __construct(
+    private AliasManager $alias_manager,
+    private EntityTypeManagerInterface $entity_type_manager,
+    private CurrentRouteMatch $currentRouteMatch,
+  ) {}
+
+  /**
+   * Clear additional caches.
+   *
+   * Fixes issues found when tome export path count is greater than 1.
+   */
+  public function requestPrepare(): void {
+    // Fixes redirects exporting with the target node's content instead
+    // of an HTML redirect.
+    $this->alias_manager->cacheClear();
+
+    $menuLinkStorage = $this->entity_type_manager->getStorage('menu_link_content');
+    $menuLinkStorage->resetCache();
+
+    $menuStorage = $this->entity_type_manager->getStorage('menu');
+    $menuStorage->resetCache();
+
+    $this->currentRouteMatch->resetRouteMatch();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents() {
+    $events[TomeStaticEvents::REQUEST_PREPARE][] = ['requestPrepare'];
+    return $events;
+  }
+
+}

web/modules/custom/usagov_ssg_postprocessing/src/EventSubscriber/TomeEventSubscriber.php

@@ -8,6 +8,7 @@
 use Drupal\Core\Site\Settings;
 use Drupal\tome_static\Event\CollectPathsEvent;
 use Drupal\tome_static\Event\ModifyHtmlEvent;
+use Drupal\tome_static\Event\PathPlaceholderEvent;
 use Drupal\tome_static\Event\TomeStaticEvents;
 use Masterminds\HTML5;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -168,19 +169,38 @@ public function modifyHtml(ModifyHtmlEvent $event) {
       }
     }
 
+    // Never crawl the rewritten Spanish path. It might be treated like a redirect by
+    // Tome and overwrite the original homepage HTML
+    $event->addExcludePath('/es/');
+
     if ($changes) {
       // Render it as HTML5:
       $modifiedHtml = $html5->saveHTML($document);
       $event->setHtml($modifiedHtml);
     }
   }
 
+  /**
+   * Prevent exporting paths Tome might discover after the collect paths event.
+   *
+   * @param PathPlaceholderEvent $event
+   * @return void
+   */
+  public function excludeInvalidPaths(PathPlaceholderEvent $event) {
+    $path = $event->getPath();
+
+    if (preg_match('/(es\/)?node\/\d+$/', $path)) {
+      $event->setInvalid();
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
   public static function getSubscribedEvents() {
     $events[TomeStaticEvents::MODIFY_HTML][] = ['modifyHtml'];
     $events[TomeStaticEvents::COLLECT_PATHS][] = ['excludeDirectories'];
+    $events[TomeStaticEvents::PATH_PLACEHOLDER][] = ['excludeInvalidPaths'];
     return $events;
   }
 

web/modules/custom/usagov_ssg_postprocessing/usagov_ssg_postprocessing.services.yml

@@ -12,3 +12,8 @@ services:
     class: '\Drupal\usagov_ssg_postprocessing\EventSubscriber\PublishedPagesSubscriber'
     tags:
       - { name: 'event_subscriber' }
+  usagov_ssg_postprocessing_request_prepare_events_subscriber:
+    class: '\Drupal\usagov_ssg_postprocessing\EventSubscriber\RequestPrepareSubscriber'
+    arguments: ['@path_alias.manager', '@entity_type.manager', '@current_route_match']
+    tags:
+      - { name: 'event_subscriber' }