Add service worker streaming

wp-includes/default-filters.php

@@ -16,6 +16,7 @@
 add_action( 'wp_ajax_wp_service_worker', 'wp_ajax_wp_service_worker' );
 add_action( 'wp_ajax_nopriv_wp_service_worker', 'wp_ajax_wp_service_worker' );
 add_action( 'parse_query', 'wp_hide_admin_bar_offline' );
+add_filter( 'old_slug_redirect_url', 'wp_service_worker_fragment_redirect_old_slug_to_new_url' );
 
 add_action( 'wp_head', 'wp_add_error_template_no_robots' );
 add_filter( 'pre_get_document_title', 'WP_Service_Worker_Navigation_Routing_Component::filter_title_for_streaming_header' );

wp-includes/js/service-worker-navigation-routing.js

@@ -8,7 +8,16 @@ wp.serviceWorker.routing.registerRoute( new wp.serviceWorker.routing.NavigationR
 
 		const handleResponse = ( response ) => {
 			if ( response.status < 500 ) {
-				return response;
+				if ( response.redirected ) {
+					const redirectedUrl = new URL( response.url );
+					redirectedUrl.searchParams.delete( STREAM_HEADER_FRAGMENT_QUERY_VAR );
+					const script = `<script>history.replaceState( {}, '', ${ JSON.stringify( redirectedUrl.toString() ) } );</script>`;
+					return response.text().then( ( body ) => {
+						return new Response( script + body );
+					} );
+				} else {
+					return response;
+				}
 			}
 			const channel = new BroadcastChannel( 'wordpress-server-errors' );
 

wp-includes/service-workers.php

@@ -419,3 +419,19 @@ function wp_prepare_stream_fragment_response( $dom, $fragment_name ) {
 
 	return $response;
 }
+
+/**
+ * Preserve stream fragment query param on canonical redirects.
+ *
+ * @since 0.2
+ *
+ * @param string $link New URL of the post.
+ * @return string URL to be redirected.
+ */
+function wp_service_worker_fragment_redirect_old_slug_to_new_url( $link ) {
+	$fragment = get_query_var( WP_Service_Worker_Navigation_Routing_Component::STREAM_FRAGMENT_QUERY_VAR );
+	if ( $fragment ) {
+		$link = add_query_arg( WP_Service_Worker_Navigation_Routing_Component::STREAM_FRAGMENT_QUERY_VAR, sanitize_key( $fragment ), $link );
+	}
+	return $link;
+}