big_pipe.module                                    | 15 ++----
 big_pipe.services.yml                              |  5 ++
 .../NoBigPipeRouteAlterSubscriber.php              | 53 ++++++++++++++++++++++
 src/Render/Placeholder/BigPipeStrategy.php         |  8 +---
 src/Tests/BigPipeTest.php                          | 19 ++++++++
 .../big_pipe_test/big_pipe_test.routing.yml        | 10 ++++
 .../Render/Placeholder/BigPipeStrategyTest.php     | 31 +++++++------
 7 files changed, 110 insertions(+), 31 deletions(-)

diff --git a/big_pipe.module b/big_pipe.module
index 485a0e1..af37695 100644
--- a/big_pipe.module
+++ b/big_pipe.module
@@ -33,16 +33,8 @@ function big_pipe_help($route_name, RouteMatchInterface $route_match) {
  * @see \Drupal\big_pipe\Controller\BigPipeController::setNoJsCookie()
  */
 function big_pipe_page_attachments(array &$page) {
-  // Exclude a few very special routes from no-JS detection.
-  $excluded_routes = [
-    // The batch system already uses a <meta> refresh to work with JS disabled.
-    'system.batch_page.html',
-    // The BigPipe placeholder strategy is not applied on the module
-    // installation page, so the no-JS detection is also not necessary.
-    // @see \Drupal\big_pipe\Render\Placeholder\BigPipeStrategy::processPlaceholders
-    'system.modules_list',
-  ];
-  if (in_array(\Drupal::routeMatch()->getRouteName(), $excluded_routes)) {
+  // Routes that don't use BigPipe also don't need no-JS detection.
+  if (\Drupal::routeMatch()->getRouteObject()->getOption('_no_big_pipe')) {
     return;
   }
 
@@ -64,8 +56,7 @@ function big_pipe_page_attachments(array &$page) {
         '#noscript' => TRUE,
         '#attributes' => [
           'http-equiv' => 'Refresh',
-          // @todo: Switch to Url::fromRoute() once https://www.drupal.org/node/2589967 is resolved.
-          'content' => '0; URL=' . Url::fromUri('internal:/big_pipe/no-js', ['query' => \Drupal::service('redirect.destination')->getAsArray()])->toString(),
+          'content' => '0; URL=' . Url::fromRoute('big_pipe.nojs', [], ['query' => \Drupal::service('redirect.destination')->getAsArray()])->toString(),
         ],
       ],
       'big_pipe_detect_nojs',
diff --git a/big_pipe.services.yml b/big_pipe.services.yml
index 9a78385..9209fc0 100644
--- a/big_pipe.services.yml
+++ b/big_pipe.services.yml
@@ -19,6 +19,11 @@ services:
     decoration_inner_name: html_response.attachments_processor.original
     arguments: ['@html_response.attachments_processor.original', '@asset.resolver', '@config.factory', '@asset.css.collection_renderer', '@asset.js.collection_renderer', '@request_stack', '@renderer', '@module_handler']
 
+  route_subscriber.no_big_pipe:
+    class: Drupal\big_pipe\EventSubscriber\NoBigPipeRouteAlterSubscriber
+    tags:
+      - { name: event_subscriber }
+
   # @todo Move this into Drupal 8 core.
   cache_context.session.exists:
     class: Drupal\big_pipe\Cache\Context\SessionExistsCacheContext
diff --git a/src/EventSubscriber/NoBigPipeRouteAlterSubscriber.php b/src/EventSubscriber/NoBigPipeRouteAlterSubscriber.php
new file mode 100644
index 0000000..973c2c5
--- /dev/null
+++ b/src/EventSubscriber/NoBigPipeRouteAlterSubscriber.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\big_pipe\EventSubscriber\NoBigPipeRouteAlterSubscriber.
+ */
+
+namespace Drupal\big_pipe\EventSubscriber;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Drupal\Core\Routing\RoutingEvents;
+use Drupal\Core\Routing\RouteBuildEvent;
+
+/**
+ * Sets the '_no_big_pipe' option on select routes.
+ */
+class NoBigPipeRouteAlterSubscriber implements EventSubscriberInterface {
+
+  /**
+   * Alters select routes to have the '_no_big_pipe' option.
+   *
+   * @param \Drupal\Core\Routing\RouteBuildEvent $event
+   *   The event to process.
+   */
+  public function onRoutingRouteAlterSetNoBigPipe(RouteBuildEvent $event) {
+    $no_big_pipe_routes = [
+      // The batch system uses a <meta> refresh to work without JavaScript.
+      'system.batch_page.html',
+      // When a user would install the BigPipe module using a browser and with
+      // JavaScript disabled, the first response contains the status messages
+      // for installing a module, but then the BigPipe no-JS redirect occurs,
+      // which then causes the user to not see those status messages.
+      // @see https://www.drupal.org/node/2469431#comment-10901944
+      'system.modules_list',
+    ];
+
+    $route_collection = $event->getRouteCollection();
+    foreach ($no_big_pipe_routes as $excluded_route) {
+      if ($route = $route_collection->get($excluded_route)) {
+        $route->setOption('_no_big_pipe', TRUE);
+      }
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  static function getSubscribedEvents() {
+    $events[RoutingEvents::ALTER][] = ['onRoutingRouteAlterSetNoBigPipe'];
+    return $events;
+  }
+
+}
diff --git a/src/Render/Placeholder/BigPipeStrategy.php b/src/Render/Placeholder/BigPipeStrategy.php
index 3a81b76..e24c9ad 100644
--- a/src/Render/Placeholder/BigPipeStrategy.php
+++ b/src/Render/Placeholder/BigPipeStrategy.php
@@ -110,12 +110,8 @@ class BigPipeStrategy implements PlaceholderStrategyInterface {
    * {@inheritdoc}
    */
   public function processPlaceholders(array $placeholders) {
-    // Don't apply the BigPipe placeholder strategy on the module installation
-    // page. When a user would install the BigPipe module using a browser that
-    // has JavaScript disabled, the status messages shown immediately after
-    // installing the module would get lost.
-    // @see https://www.drupal.org/node/2469431#comment-10901944
-    if ($this->routeMatch->getRouteName() === 'system.modules_list') {
+    // Routes can opt out from using the BigPipe HTML delivery technique.
+    if ($this->routeMatch->getRouteObject()->getOption('_no_big_pipe')) {
       return [];
     }
 
diff --git a/src/Tests/BigPipeTest.php b/src/Tests/BigPipeTest.php
index f44844b..d4cbf88 100644
--- a/src/Tests/BigPipeTest.php
+++ b/src/Tests/BigPipeTest.php
@@ -91,6 +91,8 @@ class BigPipeTest extends WebTestBase {
     $this->assertRaw('<noscript><meta http-equiv="Refresh" content="0; URL=' . base_path() . 'big_pipe/no-js?destination=' . base_path() . 'user/1" />' . "\n" . '</noscript>');
     $this->assertBigPipeNoJsMetaRefreshRedirect();
     $this->assertBigPipeNoJsCookieExists(TRUE);
+    $this->assertNoRaw('<noscript><meta http-equiv="Refresh" content="0; URL=');
+    $this->drupalLogout();
 
     // Close the prior connection and remove the collected state.
     $this->curlClose();
@@ -105,6 +107,23 @@ class BigPipeTest extends WebTestBase {
     $this->assertRaw('<noscript><meta http-equiv="Refresh" content="0; URL=' . base_path() . 'big_pipe/no-js?destination=' . base_path() . 'user/login" />' . "\n" . '</noscript>');
     $this->assertBigPipeNoJsMetaRefreshRedirect();
     $this->assertBigPipeNoJsCookieExists(TRUE);
+    $this->assertNoRaw('<noscript><meta http-equiv="Refresh" content="0; URL=');
+
+    // Close the prior connection and remove the collected state.
+    $this->curlClose();
+    $this->curlCookies = [];
+    $this->cookies = [];
+
+    // Edge case: route with '_no_big_pipe' option.
+    $this->drupalGet(Url::fromRoute('big_pipe_test.no_big_pipe'));
+    $this->assertSessionCookieExists(FALSE);
+    $this->assertBigPipeNoJsCookieExists(FALSE);
+    $this->assertNoRaw('<noscript><meta http-equiv="Refresh" content="0; URL=');
+    $this->drupalLogin($this->rootUser);
+    $this->drupalGet(Url::fromRoute('big_pipe_test.no_big_pipe'));
+    $this->assertSessionCookieExists(TRUE);
+    $this->assertBigPipeNoJsCookieExists(FALSE);
+    $this->assertNoRaw('<noscript><meta http-equiv="Refresh" content="0; URL=');
   }
 
   /**
diff --git a/tests/modules/big_pipe_test/big_pipe_test.routing.yml b/tests/modules/big_pipe_test/big_pipe_test.routing.yml
index d074285..e573913 100644
--- a/tests/modules/big_pipe_test/big_pipe_test.routing.yml
+++ b/tests/modules/big_pipe_test/big_pipe_test.routing.yml
@@ -5,3 +5,13 @@ big_pipe_test:
     _title: 'BigPipe test'
   requirements:
     _access: 'TRUE'
+
+big_pipe_test.no_big_pipe:
+  path: '/no_big_pipe'
+  defaults:
+    _controller: '\Drupal\big_pipe_test\BigPipeTestController::test'
+    _title: 'BigPipe test'
+  options:
+    _no_big_pipe: TRUE
+  requirements:
+    _access: 'TRUE'
diff --git a/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php b/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php
index 1858e1e..d726a83 100644
--- a/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php
+++ b/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php
@@ -14,6 +14,7 @@ use Drupal\Tests\UnitTestCase;
 use Prophecy\Argument;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Routing\Route;
 
 /**
  * @coversDefaultClass \Drupal\big_pipe\Render\Placeholder\BigPipeStrategy
@@ -26,30 +27,30 @@ class BigPipeStrategyTest extends UnitTestCase {
    *
    * @dataProvider placeholdersProvider
    */
-  public function testProcessPlaceholders(array $placeholders, $request_has_session, $request_has_big_pipe_nojs_cookie, array $expected_big_pipe_placeholders) {
+  public function testProcessPlaceholders(array $placeholders, $route_match_has_no_big_pipe_option, $request_has_session, $request_has_big_pipe_nojs_cookie, array $expected_big_pipe_placeholders) {
     $request = new Request();
     if ($request_has_big_pipe_nojs_cookie) {
       $request->cookies->set(BigPipeStrategy::NOJS_COOKIE, 1);
     }
     $request_stack = $this->prophesize(RequestStack::class);
     $request_stack->getCurrentRequest()
-      ->willReturn($request)
-      ->shouldBeCalled();
+      ->willReturn($request);
 
     $session_configuration = $this->prophesize(SessionConfigurationInterface::class);
     $session_configuration->hasSession(Argument::type(Request::class))
-      ->willReturn($request_has_session)
-      ->shouldBeCalled();
+      ->willReturn($request_has_session);
 
+    $route = $this->prophesize(Route::class);
+    $route->getOption('_no_big_pipe')
+      ->willReturn($route_match_has_no_big_pipe_option);
     $route_match = $this->prophesize(RouteMatchInterface::class);
-    $route_match->getRouteName()
-      ->willReturn('foobar')
-      ->shouldBeCalled();
+    $route_match->getRouteObject()
+      ->willReturn($route);
 
     $big_pipe_strategy = new BigPipeStrategy($session_configuration->reveal(), $request_stack->reveal(), $route_match->reveal());
     $processed_placeholders = $big_pipe_strategy->processPlaceholders($placeholders);
 
-    if ($request_has_session) {
+    if (!$route_match_has_no_big_pipe_option && $request_has_session) {
       $this->assertSameSize($expected_big_pipe_placeholders, $processed_placeholders, 'BigPipe is able to deliver all placeholders.');
       foreach (array_keys($placeholders) as $placeholder) {
         $this->assertSame($expected_big_pipe_placeholders[$placeholder], $processed_placeholders[$placeholder], "Verifying how BigPipeStrategy handles the placeholder '$placeholder'");
@@ -77,16 +78,20 @@ class BigPipeStrategyTest extends UnitTestCase {
     ];
 
     return [
-      'no session, no-JS cookie absent' => [$placeholders, FALSE, FALSE, []],
-      'no session, no-JS cookie present' => [$placeholders, FALSE, TRUE, []],
-      'session, no-JS cookie absent: (JS-powered) BigPipe placeholder used for HTML placeholders' => [$placeholders, TRUE, FALSE, [
+      '_no_big_pipe absent, no session, no-JS cookie absent' => [$placeholders, FALSE, FALSE, FALSE, []],
+      '_no_big_pipe absent, no session, no-JS cookie present' => [$placeholders, FALSE, FALSE, TRUE, []],
+      '_no_big_pipe present, no session, no-JS cookie absent' => [$placeholders, TRUE, FALSE, FALSE, []],
+      '_no_big_pipe present, no session, no-JS cookie present' => [$placeholders, TRUE, FALSE, TRUE, []],
+      '_no_big_pipe present, session, no-JS cookie absent' => [$placeholders, TRUE, TRUE, FALSE, []],
+      '_no_big_pipe present, session, no-JS cookie present' => [$placeholders, TRUE, TRUE, TRUE, []],
+      '_no_big_pipe absent, session, no-JS cookie absent: (JS-powered) BigPipe placeholder used for HTML placeholders' => [$placeholders, FALSE, TRUE, FALSE, [
         $cases['html']->placeholder                             => $cases['html']->bigPipePlaceholderRenderArray,
         $cases['html_attribute_value']->placeholder             => $cases['html_attribute_value']->bigPipeNoJsPlaceholderRenderArray,
         $cases['html_attribute_value_subset']->placeholder      => $cases['html_attribute_value_subset']->bigPipeNoJsPlaceholderRenderArray,
         $cases['edge_case__invalid_html']->placeholder          => $cases['edge_case__invalid_html']->bigPipeNoJsPlaceholderRenderArray,
         $cases['edge_case__html_non_lazy_builder']->placeholder => $cases['edge_case__html_non_lazy_builder']->bigPipePlaceholderRenderArray,
       ]],
-      'session, no-JS cookie present: no-JS BigPipe placeholder used for HTML placeholders' => [$placeholders, TRUE, TRUE, [
+      '_no_big_pipe absent, session, no-JS cookie present: no-JS BigPipe placeholder used for HTML placeholders' => [$placeholders, FALSE, TRUE, TRUE, [
         $cases['html']->placeholder                             => $cases['html']->bigPipeNoJsPlaceholderRenderArray,
         $cases['html_attribute_value']->placeholder             => $cases['html_attribute_value']->bigPipeNoJsPlaceholderRenderArray,
         $cases['html_attribute_value_subset']->placeholder      => $cases['html_attribute_value_subset']->bigPipeNoJsPlaceholderRenderArray,