@automattic/newspack-blocks 4.31.0 → 4.31.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## @automattic/newspack-blocks [4.31.2](https://github.com/Automattic/newspack-workspace/compare/newspack-blocks@4.31.1...newspack-blocks@4.31.2) (2026-09-10)
+
+
+### Bug Fixes
+
+* **iframe:** keep Back working on iframe block pages (NPPM-3180) ([#1042](https://github.com/Automattic/newspack-workspace/issues/1042)) ([6a87cb2](https://github.com/Automattic/newspack-workspace/commit/6a87cb2c6dcab735a81b54e87fb11b93769baac1))
+
+## @automattic/newspack-blocks [4.31.1](https://github.com/Automattic/newspack-workspace/compare/newspack-blocks@4.31.0...newspack-blocks@4.31.1) (2026-09-09)
+
+
+### Bug Fixes
+
+* **homepage-articles:** reset dedup state per render pass (NPLAUNC-242) ([#1019](https://github.com/Automattic/newspack-workspace/issues/1019)) ([0ecdc9b](https://github.com/Automattic/newspack-workspace/commit/0ecdc9b7e9511799df668738a732ef6f0d808cb4))
+
 # @automattic/newspack-blocks [4.31.0](https://github.com/Automattic/newspack-workspace/compare/newspack-blocks@4.30.5...newspack-blocks@4.31.0) (2026-08-31)
 
 

package/dist/iframe/view.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-dom-ready'), 'version' => 'b237b52924e68e8bf7a5');
+<?php return array('dependencies' => array('wp-dom-ready'), 'version' => '0adcb9c939693718d723');

package/dist/iframe/view.js

@@ -1 +1 @@
-(()=>{"use strict";var e={n:t=>{var n=t&&t.__esModule?()=>t.default:()=>t;return e.d(n,{a:n}),n},d:(t,n)=>{for(var r in n)e.o(n,r)&&!e.o(t,r)&&Object.defineProperty(t,r,{enumerable:!0,get:n[r]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t)};const t=window.wp.domReady;e.n(t)()(()=>{Array.from(document.querySelectorAll(".wp-block-newspack-blocks-iframe iframe")).forEach(e=>{const t=setInterval(function(){e.src=e.src},2e3);e.onload=function(){clearInterval(t)},window.addEventListener("message",function(t){if(t.origin!==new URL(e.src).origin||e.contentWindow!==t.source)return;let n=0;t.data&&t.data.height&&("number"==typeof t.data.height?n=t.data.height:"string"==typeof t.data.height&&(n=Number(t.data.height))),!isNaN(n)&&n>0&&(e.parentElement&&"auto"!==e.parentElement.style.height&&(e.parentElement.style.height="auto"),e.style.height=n+"px")})})})})();
+(()=>{"use strict";var e={n:t=>{var n=t&&t.__esModule?()=>t.default:()=>t;return e.d(n,{a:n}),n},d:(t,n)=>{for(var a in n)e.o(n,a)&&!e.o(t,a)&&Object.defineProperty(t,a,{enumerable:!0,get:n[a]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t)};const t=window.wp.domReady;e.n(t)()(()=>{Array.from(document.querySelectorAll(".wp-block-newspack-blocks-iframe iframe")).forEach(e=>{let t=0;const n=setInterval(()=>{!(e=>{const t=e.contentDocument;return null!==t&&"about:blank"===t.URL})(e)||t>=10?clearInterval(n):(t++,e.contentWindow.location.replace(e.src))},2e3);window.addEventListener("message",function(t){if(t.origin!==new URL(e.src).origin||e.contentWindow!==t.source)return;let n=0;t.data&&t.data.height&&("number"==typeof t.data.height?n=t.data.height:"string"==typeof t.data.height&&(n=Number(t.data.height))),!isNaN(n)&&n>0&&(e.parentElement&&"auto"!==e.parentElement.style.height&&(e.parentElement.style.height="auto"),e.style.height=n+"px")})})})})();

package/includes/class-newspack-blocks.php

@@ -20,6 +20,14 @@ class Newspack_Blocks {
 		'tiers-based'          => 'newspack-blocks-donate-tiers-based',
 	];
 
+	/**
+	 * Nesting depth of `the_content` filter applications. A depth of zero marks
+	 * the start of a top-level render pass, where deduplication state is reset.
+	 *
+	 * @var int
+	 */
+	private static $content_render_depth = 0;
+
 	/**
 	 * Add hooks and filters.
 	 */
@@ -30,6 +38,8 @@ class Newspack_Blocks {
 		add_post_type_support( 'page', 'newspack_blocks' );
 		add_action( 'jetpack_register_gutenberg_extensions', [ __CLASS__, 'disable_jetpack_donate' ], 99 );
 		add_filter( 'the_content', [ __CLASS__, 'hide_post_content_when_iframe_block_is_fullscreen' ] );
+		add_filter( 'the_content', [ __CLASS__, 'start_content_render_pass' ], PHP_INT_MIN );
+		add_filter( 'the_content', [ __CLASS__, 'end_content_render_pass' ], PHP_INT_MAX );
 		add_filter( 'body_class', [ __CLASS__, 'add_body_classes' ] );
 		add_filter( 'admin_body_class', [ __CLASS__, 'add_body_classes' ] );
 
@@ -616,6 +626,73 @@ class Newspack_Blocks {
 		return false;
 	}
 
+	/**
+	 * Mark the start of a `the_content` render pass.
+	 *
+	 * Deduplication state accumulates in globals for the life of the request,
+	 * which is right for a front-end page but wrong wherever one request renders
+	 * the same content more than once (a REST save renders it up to three times)
+	 * or renders several posts (a REST collection). There, every top-level pass
+	 * starts from a clean slate so each returns the same posts. Nested passes
+	 * (a Query Loop rendering Post Content, a synced pattern) keep the state of
+	 * the pass they belong to.
+	 *
+	 * @param string $content Post content.
+	 * @return string Unmodified post content.
+	 */
+	public static function start_content_render_pass( $content ) {
+		if ( 0 === self::$content_render_depth && self::should_reset_deduplication_per_render_pass() ) {
+			self::reset_deduplication();
+		}
+		self::$content_render_depth++;
+		return $content;
+	}
+
+	/**
+	 * Mark the end of a `the_content` render pass.
+	 *
+	 * @param string $content Post content.
+	 * @return string Unmodified post content.
+	 */
+	public static function end_content_render_pass( $content ) {
+		self::$content_render_depth = max( 0, self::$content_render_depth - 1 );
+		return $content;
+	}
+
+	/**
+	 * Whether deduplication state should be reset at the start of each top-level
+	 * `the_content` pass.
+	 *
+	 * On the front end the state is kept for the whole request, because a block
+	 * theme can render Content Loop blocks in the template before the post
+	 * content, and those have to be excluded from the blocks inside it.
+	 *
+	 * @return bool
+	 */
+	public static function should_reset_deduplication_per_render_pass() {
+		$is_front_end = ! is_admin()
+			&& ! wp_doing_ajax()
+			&& ! wp_doing_cron()
+			&& ! ( defined( 'REST_REQUEST' ) && REST_REQUEST )
+			&& ! ( defined( 'WP_CLI' ) && WP_CLI );
+
+		return ! $is_front_end;
+	}
+
+	/**
+	 * Forget which posts have been rendered so far, so the next Content Loop or
+	 * Carousel block starts deduplicating from scratch.
+	 *
+	 * The list of posts picked by specific-posts blocks is left alone: it is
+	 * derived from the current post, which `wp_reset_postdata()` cannot restore
+	 * inside a REST request once a block's loop has moved it, so recomputing it
+	 * per pass would give each pass a different exclusion list.
+	 */
+	public static function reset_deduplication() {
+		global $newspack_blocks_post_id;
+		$newspack_blocks_post_id = [];
+	}
+
 	/**
 	 * Whether the block should be included in the deduplication logic.
 	 *
@@ -712,6 +789,8 @@ class Newspack_Blocks {
 			'has_password'        => false,
 			'is_newspack_query'   => true,
 			'tax_query'           => [], // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_tax_query
+			// The total is only needed to decide whether a More button has a next page.
+			'no_found_rows'       => empty( $attributes['moreButton'] ),
 		);
 		if ( $specific_mode && $specific_posts ) {
 			$args['posts_per_page'] = count( $specific_posts );

package/languages/newspack-blocks-de_DE.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Newspack Blocks\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/newspack-blocks\n"
-"POT-Creation-Date: 2026-08-31T17:53:31+00:00\n"
+"POT-Creation-Date: 2026-09-09T13:54:18+00:00\n"
 "PO-Revision-Date: 2024-08-30 08:45-0700\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -282,45 +282,45 @@ msgstr ""
 msgid "Newspack Subscribe"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:983
+#: includes/class-newspack-blocks.php:1062
 msgid "Common"
 msgstr ""
 
 #. translators: separates last two sponsor names; needs a space on either side.
-#: includes/class-newspack-blocks.php:1084
+#: includes/class-newspack-blocks.php:1163
 msgid " and "
 msgstr " und "
 
 #. translators: separates all but the last two sponsor names; needs a space at the end.
-#: includes/class-newspack-blocks.php:1087
+#: includes/class-newspack-blocks.php:1166
 msgid ", "
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1422
+#: includes/class-newspack-blocks.php:1501
 msgid "Jetpack donations is disabled in favour of Newspack donations."
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1455 dist/editor.js:26
+#: includes/class-newspack-blocks.php:1534 dist/editor.js:26
 #: src/shared/js/utils.js:54
 msgid "Draft"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1456 dist/editor.js:26
+#: includes/class-newspack-blocks.php:1535 dist/editor.js:26
 #: src/shared/js/utils.js:54
 msgid "Scheduled"
 msgstr ""
 
 #. Translators: %s is the %s is the frequency.
-#: includes/class-newspack-blocks.php:1654 dist/editor.js:48
+#: includes/class-newspack-blocks.php:1733 dist/editor.js:48
 #, php-format
 msgid "per %s"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1685
+#: includes/class-newspack-blocks.php:1764
 msgid " once"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1688
+#: includes/class-newspack-blocks.php:1767
 msgid " per "
 msgstr ""
 

package/languages/newspack-blocks-es_ES.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Newspack Blocks 1.0.0-alpha.20\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/newspack-blocks\n"
-"POT-Creation-Date: 2026-08-31T17:53:31+00:00\n"
+"POT-Creation-Date: 2026-09-09T13:54:18+00:00\n"
 "PO-Revision-Date: 2025-08-12T14:56:45+00:00\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -274,45 +274,45 @@ msgstr ""
 msgid "Newspack Subscribe"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:983
+#: includes/class-newspack-blocks.php:1062
 msgid "Common"
 msgstr ""
 
 #. translators: separates last two sponsor names; needs a space on either side.
-#: includes/class-newspack-blocks.php:1084
+#: includes/class-newspack-blocks.php:1163
 msgid " and "
 msgstr " y "
 
 #. translators: separates all but the last two sponsor names; needs a space at the end.
-#: includes/class-newspack-blocks.php:1087
+#: includes/class-newspack-blocks.php:1166
 msgid ", "
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1422
+#: includes/class-newspack-blocks.php:1501
 msgid "Jetpack donations is disabled in favour of Newspack donations."
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1455 dist/editor.js:26
+#: includes/class-newspack-blocks.php:1534 dist/editor.js:26
 #: src/shared/js/utils.js:54
 msgid "Draft"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1456 dist/editor.js:26
+#: includes/class-newspack-blocks.php:1535 dist/editor.js:26
 #: src/shared/js/utils.js:54
 msgid "Scheduled"
 msgstr ""
 
 #. Translators: %s is the %s is the frequency.
-#: includes/class-newspack-blocks.php:1654 dist/editor.js:48
+#: includes/class-newspack-blocks.php:1733 dist/editor.js:48
 #, php-format
 msgid "per %s"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1685
+#: includes/class-newspack-blocks.php:1764
 msgid " once"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1688
+#: includes/class-newspack-blocks.php:1767
 msgid " per "
 msgstr ""
 

package/languages/newspack-blocks-fr_BE.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Newspack Blocks 1.0.0-alpha.25\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/newspack-blocks\n"
-"POT-Creation-Date: 2026-08-31T17:53:31+00:00\n"
+"POT-Creation-Date: 2026-09-09T13:54:18+00:00\n"
 "PO-Revision-Date: 2024-08-30 08:46-0700\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -272,45 +272,45 @@ msgstr ""
 msgid "Newspack Subscribe"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:983
+#: includes/class-newspack-blocks.php:1062
 msgid "Common"
 msgstr ""
 
 #. translators: separates last two sponsor names; needs a space on either side.
-#: includes/class-newspack-blocks.php:1084
+#: includes/class-newspack-blocks.php:1163
 msgid " and "
 msgstr " et "
 
 #. translators: separates all but the last two sponsor names; needs a space at the end.
-#: includes/class-newspack-blocks.php:1087
+#: includes/class-newspack-blocks.php:1166
 msgid ", "
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1422
+#: includes/class-newspack-blocks.php:1501
 msgid "Jetpack donations is disabled in favour of Newspack donations."
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1455 dist/editor.js:26
+#: includes/class-newspack-blocks.php:1534 dist/editor.js:26
 #: src/shared/js/utils.js:54
 msgid "Draft"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1456 dist/editor.js:26
+#: includes/class-newspack-blocks.php:1535 dist/editor.js:26
 #: src/shared/js/utils.js:54
 msgid "Scheduled"
 msgstr ""
 
 #. Translators: %s is the %s is the frequency.
-#: includes/class-newspack-blocks.php:1654 dist/editor.js:48
+#: includes/class-newspack-blocks.php:1733 dist/editor.js:48
 #, php-format
 msgid "per %s"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1685
+#: includes/class-newspack-blocks.php:1764
 msgid " once"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1688
+#: includes/class-newspack-blocks.php:1767
 msgid " per "
 msgstr ""
 

package/languages/newspack-blocks-nb_NO.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Newspack Blocks 1.0.0-alpha.20\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/newspack-blocks\n"
-"POT-Creation-Date: 2026-08-31T17:53:31+00:00\n"
+"POT-Creation-Date: 2026-09-09T13:54:18+00:00\n"
 "PO-Revision-Date: 2024-08-30 08:46-0700\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -272,45 +272,45 @@ msgstr ""
 msgid "Newspack Subscribe"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:983
+#: includes/class-newspack-blocks.php:1062
 msgid "Common"
 msgstr ""
 
 #. translators: separates last two sponsor names; needs a space on either side.
-#: includes/class-newspack-blocks.php:1084
+#: includes/class-newspack-blocks.php:1163
 msgid " and "
 msgstr " og "
 
 #. translators: separates all but the last two sponsor names; needs a space at the end.
-#: includes/class-newspack-blocks.php:1087
+#: includes/class-newspack-blocks.php:1166
 msgid ", "
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1422
+#: includes/class-newspack-blocks.php:1501
 msgid "Jetpack donations is disabled in favour of Newspack donations."
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1455 dist/editor.js:26
+#: includes/class-newspack-blocks.php:1534 dist/editor.js:26
 #: src/shared/js/utils.js:54
 msgid "Draft"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1456 dist/editor.js:26
+#: includes/class-newspack-blocks.php:1535 dist/editor.js:26
 #: src/shared/js/utils.js:54
 msgid "Scheduled"
 msgstr ""
 
 #. Translators: %s is the %s is the frequency.
-#: includes/class-newspack-blocks.php:1654 dist/editor.js:48
+#: includes/class-newspack-blocks.php:1733 dist/editor.js:48
 #, php-format
 msgid "per %s"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1685
+#: includes/class-newspack-blocks.php:1764
 msgid " once"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1688
+#: includes/class-newspack-blocks.php:1767
 msgid " per "
 msgstr ""
 

package/languages/newspack-blocks-pt_PT.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Newspack Blocks 1.0.0-alpha.25\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/newspack-blocks\n"
-"POT-Creation-Date: 2026-08-31T17:53:31+00:00\n"
+"POT-Creation-Date: 2026-09-09T13:54:18+00:00\n"
 "PO-Revision-Date: 2024-08-30 08:46-0700\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -272,45 +272,45 @@ msgstr ""
 msgid "Newspack Subscribe"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:983
+#: includes/class-newspack-blocks.php:1062
 msgid "Common"
 msgstr ""
 
 #. translators: separates last two sponsor names; needs a space on either side.
-#: includes/class-newspack-blocks.php:1084
+#: includes/class-newspack-blocks.php:1163
 msgid " and "
 msgstr " e "
 
 #. translators: separates all but the last two sponsor names; needs a space at the end.
-#: includes/class-newspack-blocks.php:1087
+#: includes/class-newspack-blocks.php:1166
 msgid ", "
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1422
+#: includes/class-newspack-blocks.php:1501
 msgid "Jetpack donations is disabled in favour of Newspack donations."
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1455 dist/editor.js:26
+#: includes/class-newspack-blocks.php:1534 dist/editor.js:26
 #: src/shared/js/utils.js:54
 msgid "Draft"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1456 dist/editor.js:26
+#: includes/class-newspack-blocks.php:1535 dist/editor.js:26
 #: src/shared/js/utils.js:54
 msgid "Scheduled"
 msgstr ""
 
 #. Translators: %s is the %s is the frequency.
-#: includes/class-newspack-blocks.php:1654 dist/editor.js:48
+#: includes/class-newspack-blocks.php:1733 dist/editor.js:48
 #, php-format
 msgid "per %s"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1685
+#: includes/class-newspack-blocks.php:1764
 msgid " once"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1688
+#: includes/class-newspack-blocks.php:1767
 msgid " per "
 msgstr ""
 

package/languages/newspack-blocks.pot

@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Newspack Blocks plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Newspack Blocks 4.30.5\n"
+"Project-Id-Version: Newspack Blocks 4.31.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/newspack-blocks\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2026-08-31T17:53:31+00:00\n"
+"POT-Creation-Date: 2026-09-09T13:54:18+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
 "X-Domain: newspack-blocks\n"
@@ -263,48 +263,48 @@ msgstr ""
 msgid "Newspack Subscribe"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:983
+#: includes/class-newspack-blocks.php:1062
 msgid "Common"
 msgstr ""
 
 #. translators: separates last two sponsor names; needs a space on either side.
-#: includes/class-newspack-blocks.php:1084
+#: includes/class-newspack-blocks.php:1163
 msgid " and "
 msgstr ""
 
 #. translators: separates all but the last two sponsor names; needs a space at the end.
-#: includes/class-newspack-blocks.php:1087
+#: includes/class-newspack-blocks.php:1166
 msgid ", "
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1422
+#: includes/class-newspack-blocks.php:1501
 msgid "Jetpack donations is disabled in favour of Newspack donations."
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1455
+#: includes/class-newspack-blocks.php:1534
 #: dist/editor.js:26
 #: src/shared/js/utils.js:54
 msgid "Draft"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1456
+#: includes/class-newspack-blocks.php:1535
 #: dist/editor.js:26
 #: src/shared/js/utils.js:54
 msgid "Scheduled"
 msgstr ""
 
 #. Translators: %s is the %s is the frequency.
-#: includes/class-newspack-blocks.php:1654
+#: includes/class-newspack-blocks.php:1733
 #: dist/editor.js:48
 #, php-format,js-format
 msgid "per %s"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1685
+#: includes/class-newspack-blocks.php:1764
 msgid " once"
 msgstr ""
 
-#: includes/class-newspack-blocks.php:1688
+#: includes/class-newspack-blocks.php:1767
 msgid " per "
 msgstr ""
 

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         4.31.0
+ * Version:         4.31.2
  *
  * @package         Newspack_Blocks
  */
@@ -15,7 +15,7 @@
 define( 'NEWSPACK_BLOCKS__PLUGIN_FILE', __FILE__ );
 define( 'NEWSPACK_BLOCKS__BLOCKS_DIRECTORY', 'dist/' );
 define( 'NEWSPACK_BLOCKS__PLUGIN_DIR', plugin_dir_path( NEWSPACK_BLOCKS__PLUGIN_FILE ) );
-define( 'NEWSPACK_BLOCKS__VERSION', '4.31.0' );
+define( 'NEWSPACK_BLOCKS__VERSION', '4.31.2' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "4.31.0",
+	"version": "4.31.2",
 	"author": "Automattic",
 	"description": "=== Newspack Blocks === Contributors: (this should be a list of wordpress.org userid's) Donate link: https://example.com/ Tags: comments, spam Requires at least: 4.5 Tested up to: 5.1.1 Stable tag: 0.1.0 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html",
 	"repository": {

package/src/blocks/iframe/view.js

@@ -9,17 +9,47 @@ import domReady from '@wordpress/dom-ready';
 
 import './view.scss';
 
+/**
+ * Whether the frame still shows its initial about:blank, so it has loaded nothing.
+ * Google Docs Viewer intermittently answers HTTP 204, which leaves the frame blank
+ * with no load event. That is the case the retry exists for.
+ *
+ * contentDocument is null for a loaded cross-origin document, a detached frame, and
+ * a sandboxed frame without allow-same-origin (from the first tick, so such a frame
+ * would never retry; this block renders no sandbox attribute).
+ *
+ * @param {HTMLIFrameElement} iframe The iframe.
+ * @return {boolean} Whether the frame is still on its initial about:blank.
+ */
+const isStillBlank = iframe => {
+	const doc = iframe.contentDocument;
+	return doc !== null && doc.URL === 'about:blank';
+};
+
+/**
+ * Re-navigations before giving up on a frame that never loads. A 204 resolves in a
+ * retry or two; without a bound, a permanently blank embed keeps requesting for as
+ * long as the page is open.
+ */
+const MAX_RETRIES = 10;
+
 domReady( () => {
 	const iframes = Array.from( document.querySelectorAll( '.wp-block-newspack-blocks-iframe iframe' ) );
 	iframes.forEach( iframe => {
-		const timerId = setInterval( function () {
-			iframe.src = iframe.src;
+		// Don't wait for the load event: it may have fired before this script ran
+		// (delayed JS). Navigate with location.replace(), since resetting src on a
+		// loaded frame adds a history entry and makes readers press Back twice
+		// (NPPM-3180).
+		let attempts = 0;
+		const retry = setInterval( () => {
+			if ( ! isStillBlank( iframe ) || attempts >= MAX_RETRIES ) {
+				clearInterval( retry );
+				return;
+			}
+			attempts++;
+			iframe.contentWindow.location.replace( iframe.src );
 		}, 2000 );
 
-		iframe.onload = function () {
-			clearInterval( timerId );
-		};
-
 		// Add a listener for dynamic resizing if the iframe supports it.
 		window.addEventListener( 'message', function ( event ) {
 			// Reject messages from untrusted origins.

package/src/blocks/iframe/view.test.js

@@ -0,0 +1,97 @@
+/**
+ * The iframe block's retry (NPPM-3180) must leave a frame that already holds a
+ * document alone, and must never reset `src`, which adds a history entry.
+ */
+
+const SRC = 'https://embed.example.test/widget';
+
+/**
+ * Render one iframe block and stub the frame state jsdom cannot provide.
+ *
+ * @param {Object|null} contentDocument What the attached frame reports: the initial
+ *                                      about:blank document while a navigation is in
+ *                                      flight or was abandoned (cross-origin included),
+ *                                      null once a cross-origin document has loaded.
+ *                                      A detached frame reports null, as does its
+ *                                      contentWindow.
+ * @return {Object} The iframe, its state holder, and the `replace` and `setSrc` spies.
+ */
+function renderIframe( contentDocument ) {
+	document.body.innerHTML = `<figure class="wp-block-newspack-blocks-iframe"><div class="wp-block-embed__wrapper"><iframe src="${ SRC }"></iframe></div></figure>`;
+	const iframe = document.querySelector( 'iframe' );
+	const state = { contentDocument };
+	const replace = jest.fn();
+	const setSrc = jest.fn();
+	const contentWindow = { location: { replace } };
+	Object.defineProperty( iframe, 'contentDocument', { configurable: true, get: () => ( iframe.isConnected ? state.contentDocument : null ) } );
+	Object.defineProperty( iframe, 'contentWindow', { configurable: true, get: () => ( iframe.isConnected ? contentWindow : null ) } );
+	Object.defineProperty( iframe, 'src', { configurable: true, get: () => SRC, set: setSrc } );
+	jest.isolateModules( () => require( './view' ) );
+	return { iframe, state, replace, setSrc };
+}
+
+describe( 'iframe block view script', () => {
+	beforeEach( () => {
+		jest.useFakeTimers();
+	} );
+
+	afterEach( () => {
+		jest.clearAllTimers();
+		jest.useRealTimers();
+		document.body.innerHTML = '';
+	} );
+
+	it.each( [
+		// The delayed-script case: the frame loaded before this script ran.
+		[ 'cross-origin', null ],
+		[ 'same-origin', { URL: 'https://example.test/embed' } ],
+	] )( 'leaves a frame that already holds a %s document alone', ( _, contentDocument ) => {
+		const { replace, setSrc } = renderIframe( contentDocument );
+		jest.advanceTimersByTime( 10000 );
+		expect( replace ).not.toHaveBeenCalled();
+		expect( setSrc ).not.toHaveBeenCalled();
+		expect( jest.getTimerCount() ).toBe( 0 );
+	} );
+
+	it( 'retries with location.replace while the frame is still blank, then stops', () => {
+		const { state, replace, setSrc } = renderIframe( { URL: 'about:blank' } );
+
+		jest.advanceTimersByTime( 2000 );
+		expect( replace ).toHaveBeenCalledTimes( 1 );
+		expect( replace ).toHaveBeenCalledWith( SRC );
+
+		jest.advanceTimersByTime( 2000 );
+		expect( replace ).toHaveBeenCalledTimes( 2 );
+
+		// The retry succeeded and a cross-origin document loaded.
+		state.contentDocument = null;
+		jest.advanceTimersByTime( 10000 );
+		expect( replace ).toHaveBeenCalledTimes( 2 );
+		expect( jest.getTimerCount() ).toBe( 0 );
+
+		// Resetting src is what adds the history entry.
+		expect( setSrc ).not.toHaveBeenCalled();
+	} );
+
+	it( 'gives up after 10 attempts on a frame that never loads', () => {
+		const { replace } = renderIframe( { URL: 'about:blank' } );
+		jest.advanceTimersByTime( 20000 );
+		expect( replace ).toHaveBeenCalledTimes( 10 );
+
+		jest.advanceTimersByTime( 20000 );
+		expect( replace ).toHaveBeenCalledTimes( 10 );
+		expect( jest.getTimerCount() ).toBe( 0 );
+	} );
+
+	it( 'checks the frame before touching contentWindow, so a removed frame does not throw', () => {
+		const { iframe, replace } = renderIframe( { URL: 'about:blank' } );
+		jest.advanceTimersByTime( 2000 );
+		expect( replace ).toHaveBeenCalledTimes( 1 );
+
+		// A detached frame has no contentWindow; dereferencing it would throw inside the tick.
+		iframe.remove();
+		expect( () => jest.advanceTimersByTime( 10000 ) ).not.toThrow();
+		expect( replace ).toHaveBeenCalledTimes( 1 );
+		expect( jest.getTimerCount() ).toBe( 0 );
+	} );
+} );

package/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'automattic/newspack-blocks',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => 'ab8a41932e2833aaadaea7e35f6cbd805c8a2d1e',
+        'reference' => '6a87cb2c6dcab735a81b54e87fb11b93769baac1',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'automattic/newspack-blocks' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => 'ab8a41932e2833aaadaea7e35f6cbd805c8a2d1e',
+            'reference' => '6a87cb2c6dcab735a81b54e87fb11b93769baac1',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),