';
- $elements['#markup'] = Markup::create($css_placeholder . $js_placeholder . (string) $elements['#markup']);
- $elements['#attached']['html_response_attachment_placeholders']['styles'] = $css_placeholder;
- $elements['#attached']['html_response_attachment_placeholders']['scripts'] = $js_placeholder;
-
- $html_response = new HtmlResponse();
- $html_response->setContent($elements);
- $html_response->getCacheableMetadata()->setCacheMaxAge(0);
-
- // Push a fake request with the asset libraries loaded so far and dispatch
- // KernelEvents::RESPONSE event. This results in the attachments for the
- // HTML response being processed by HtmlResponseAttachmentsProcessor and
- // hence:
- // - the HTML to load the CSS can be rendered.
- // - the HTML to load the JS (at the top) can be rendered.
- $fake_request = $this->requestStack->getMasterRequest()->duplicate();
- $fake_request->request->set('ajax_page_state', ['libraries' => implode(',', $cumulative_assets->getAlreadyLoadedLibraries())] + $cumulative_assets->getSettings()['ajaxPageState']);
- $this->requestStack->push($fake_request);
- $event = new FilterResponseEvent($this->httpKernel, $fake_request, HttpKernelInterface::SUB_REQUEST, $html_response);
- $this->eventDispatcher->dispatch(KernelEvents::RESPONSE, $event);
- $html_response = $event->getResponse();
- $this->requestStack->pop();
-
- // Send this embedded HTML response.
- print $html_response->getContent();
- print $t[1];
- flush();
-
- // Another placeholder was rendered and sent, track the set of asset
- // libraries sent so far. Any new settings also need to be tracked, so
- // they can be sent in ::sendPreBody().
- // @todo What if drupalSettings already was printed in the HTML ? That case is not yet handled. In that case, no-JS BigPipe would cause broken (incomplete) drupalSettings… This would not matter if it were only used if JS is not enabled, but that's not the only use case. However, this
- $final_settings = $html_response->getAttachments()['drupalSettings'];
- $cumulative_assets->setAlreadyLoadedLibraries(explode(',', $final_settings['ajaxPageState']['libraries']));
- $cumulative_assets->setSettings($final_settings);
- }
- }
-
}
diff --git a/core/modules/big_pipe/src/Render/BigPipeInterface.php b/core/modules/big_pipe/src/Render/BigPipeInterface.php
index 0950d9c..f4066a3 100644
--- a/core/modules/big_pipe/src/Render/BigPipeInterface.php
+++ b/core/modules/big_pipe/src/Render/BigPipeInterface.php
@@ -119,15 +119,12 @@
interface BigPipeInterface {
/**
- * Sends the content to the browser, splitting before the closing tag
- * and afterwards processes placeholders to send when they have been rendered.
- *
- * The output buffers are flushed in between.
+ * Sends an HTML response in chunks using the BigPipe technique.
*
* @param string $content
* The HTML response content to send.
* @param array $attachments
- * The HTML response's attachments
+ * The HTML response's attachments.
*/
public function sendContent($content, array $attachments);
diff --git a/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php b/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
index 80bd378..58eb50b 100644
--- a/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
+++ b/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
@@ -72,14 +72,13 @@ public function __construct(AccountInterface $current_user) {
* {@inheritdoc}
*/
public function processPlaceholders(array $placeholders) {
- $return = [];
-
// @todo Move to a ResponsePolicy instead.
// @todo Add user.roles:authenticated cache context.
if (!$this->currentUser->isAuthenticated()) {
- return $return;
+ return [];
}
+ $overridden_placeholders = [];
foreach ($placeholders as $placeholder => $placeholder_elements) {
// BigPipe uses JavaScript and the DOM to find the placeholder to replace.
// This means finding the placeholder to replace must be efficient. Most
@@ -95,21 +94,21 @@ public function processPlaceholders(array $placeholders) {
// @see \Drupal\Core\Form\FormBuilder::renderFormTokenPlaceholder()
// @see \Drupal\Core\Form\FormBuilder::renderPlaceholderFormAction()
if ($placeholder[0] !== '<' || $placeholder !== Html::normalize($placeholder)) {
- $return[$placeholder] = static::createBigPipeNoJsPlaceholder($placeholder, $placeholder_elements);
+ $overridden_placeholders[$placeholder] = static::createBigPipeNoJsPlaceholder($placeholder, $placeholder_elements);
}
else {
// If the current session doesn't have JavaScript, fall back to no-JS
// BigPipe.
if (empty($_SESSION['big_pipe_has_js'])) {
- $return[$placeholder] = static::createBigPipeNoJsPlaceholder($placeholder, $placeholder_elements);
+ $overridden_placeholders[$placeholder] = static::createBigPipeNoJsPlaceholder($placeholder, $placeholder_elements);
}
else {
- $return[$placeholder] = static::createBigPipeJsPlaceholder($placeholder, $placeholder_elements);
+ $overridden_placeholders[$placeholder] = static::createBigPipeJsPlaceholder($placeholder, $placeholder_elements);
}
}
}
- return $return;
+ return $overridden_placeholders;
}
/**
@@ -171,6 +170,9 @@ protected static function createBigPipeJsPlaceholder($original_placeholder, arra
*
* @return array
* The resulting BigPipe no-JS placeholder render array.
+ *
+ * @todo Figure out how to simplify this. Perhaps no new placeholder is in fact necessary?
+ * @todo Related, perhaps distinguish between "HTML" and "non-HTML (attr value)" use cases? Because right now, this *breaks* HTML and therefore breaks response filters: this indiscriminately uses a as a placeholder, which is invalid inside a HTML attribute, and thus breaks DOM parsing.
*/
protected static function createBigPipeNoJsPlaceholder($original_placeholder, array $placeholder_render_array) {
$html_placeholder = Html::getId($original_placeholder);