@automattic/newspack-blocks 1.75.6 → 2.0.0-alpha.2

package/src/blocks/homepage-articles/utils.ts

@@ -38,6 +38,7 @@ const POST_QUERY_ATTRIBUTES = [
 	'categoryExclusions',
 	'postType',
 	'includedPostStatuses',
+	'deduplicate',
 ];
 
 type HomepageArticlesAttributes = {

package/src/blocks/homepage-articles/view.php

@@ -163,7 +163,6 @@ function newspack_blocks_render_block_homepage_articles( $attributes ) {
 			),
 			[
 				'page' => 2,
-				'amp'  => Newspack_Blocks::is_amp(),
 			]
 		),
 		rest_url( '/newspack-blocks/v1/articles' )
@@ -191,9 +190,6 @@ function newspack_blocks_render_block_homepage_articles( $attributes ) {
 	ob_start();
 
 	if ( $article_query->have_posts() ) : ?>
-		<?php if ( $has_more_button && Newspack_Blocks::is_amp() ) : ?>
-			<amp-script layout="container" src="<?php echo esc_url( plugins_url( '/newspack-blocks/amp/homepage-articles/view.js' ) ); ?>">
-		<?php endif; ?>
 		<div
 			class="<?php echo esc_attr( $classes ); ?>"
 			style="<?php echo esc_attr( $styles ); ?>"
@@ -238,9 +234,6 @@ function newspack_blocks_render_block_homepage_articles( $attributes ) {
 			<?php endif; ?>
 
 		</div>
-		<?php if ( $has_more_button && Newspack_Blocks::is_amp() ) : ?>
-			</amp-script>
-		<?php endif; ?>
 		<?php
 	endif;
 
@@ -377,30 +370,3 @@ function newspack_blocks_format_categories( $post_id ) {
 		return apply_filters( 'newspack_blocks_categories', $category_formatted );
 	}
 }
-
-/**
- * Inject amp-state containing all post IDs visible on page load.
- */
-function newspack_blocks_inject_amp_state() {
-	if ( ! Newspack_Blocks::is_amp() ) {
-		return;
-	}
-	global $newspack_blocks_post_id;
-	if ( ! $newspack_blocks_post_id || ! count( $newspack_blocks_post_id ) ) {
-		return;
-	}
-	$post_ids = implode( ', ', array_merge( array_keys( $newspack_blocks_post_id ), [ get_the_ID() ] ) );
-	ob_start();
-	?>
-	<amp-state id='newspackHomepagePosts'>
-		<script type="application/json">
-			{
-				"exclude_ids": [ <?php echo esc_attr( $post_ids ); ?> ]
-			}
-		</script>
-	</amp-state>
-	<?php
-	echo ob_get_clean(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-}
-
-add_action( 'wp_footer', 'newspack_blocks_inject_amp_state' );

package/src/blocks/homepage-articles/view.scss

@@ -455,11 +455,7 @@
 			margin: 0;
 		}
 	}
-}
 
-/* stylelint-disable selector-type-no-unknown  */
-.wpnbha,
-amp-script .wpnbha {
 	/* Article meta */
 	.cat-links {
 		display: flex;
@@ -507,7 +503,6 @@ amp-script .wpnbha {
 		line-height: 1;
 	}
 }
-/* stylelint-enable */
 
 /*
 	Some really rough font sizing.
@@ -830,21 +825,3 @@ amp-script .wpnbha {
 		font-style: italic;
 	}
 }
-
-/* Prevent tree-shaking Loading and Error style rules */
-/* stylelint-disable selector-type-no-unknown  */
-amp-script .wpnbha.has-more-button.is-loading {
-	button {
-		display: none;
-	}
-	.loading {
-		display: block;
-	}
-}
-amp-script .wpnbha.has-more-button.is-error {
-	button,
-	.error {
-		display: block;
-	}
-}
-/* stylelint-enable */

package/src/blocks/iframe/view.php

@@ -111,19 +111,17 @@ function newspack_blocks_get_iframe_html( $mode, $src, $height, $width, $is_full
 		</div>
 	</figure>
 
-	<?php if ( ! Newspack_Blocks::is_amp() ) : ?>
-		<script>
-			const iframe = document.getElementById("<?php echo esc_attr( $iframe_id ); ?>");
-			const timerId = setInterval( function() {
-					iframe.src = iframe.src;
-				}, 2000 );
-
-			iframe.onload = function() {
-				clearInterval(timerId);
-			}
-
-		</script>
-	<?php endif; ?>
+	<script>
+		const iframe = document.getElementById("<?php echo esc_attr( $iframe_id ); ?>");
+		const timerId = setInterval( function() {
+				iframe.src = iframe.src;
+			}, 2000 );
+
+		iframe.onload = function() {
+			clearInterval(timerId);
+		}
+
+	</script>
 
 	<?php
 	return ob_get_clean();

package/src/modal-checkout/modal.js

@@ -105,6 +105,20 @@ domReady( () => {
 		forms.forEach( form => {
 			form.appendChild( modalCheckoutInput.cloneNode() );
 			form.target = iframeName;
+
+			// Fill in the referrer field.
+			const afterSuccessUrlInput = form.querySelector( 'input[name="after_success_url"]' );
+			const afterSuccessBehaviorInput = form.querySelector(
+				'input[name="after_success_behavior"]'
+			);
+			if (
+				afterSuccessBehaviorInput &&
+				afterSuccessUrlInput &&
+				'referrer' === afterSuccessBehaviorInput.getAttribute( 'value' )
+			) {
+				afterSuccessUrlInput.setAttribute( 'value', document.referrer || window.location.href );
+			}
+
 			form.addEventListener( 'submit', ev => {
 				const formData = new FormData( form );
 				// Clear any open variation modal.

package/src/modal-checkout/templates/checkout-form.php

@@ -24,6 +24,10 @@ $form_class          = 'checkout woocommerce-checkout';
 $form_method         = $edit_billing ? 'get' : 'post';
 $form_billing_fields = \Newspack_Blocks\Modal_Checkout::get_prefilled_fields();
 
+$after_success_behavior     = filter_input( INPUT_GET, 'after_success_behavior', FILTER_SANITIZE_STRING );
+$after_success_url          = filter_input( INPUT_GET, 'after_success_url', FILTER_SANITIZE_STRING );
+$after_success_button_label = filter_input( INPUT_GET, 'after_success_button_label', FILTER_SANITIZE_STRING );
+
 if ( $edit_billing ) {
 	$form_class .= ' edit-billing';
 }
@@ -70,6 +74,10 @@ if ( ! $checkout->is_registration_enabled() && $checkout->is_registration_requir
 <form name="checkout" method="<?php echo esc_attr( $form_method ); ?>" class="<?php echo esc_attr( $form_class ); ?>" action="<?php echo esc_url( $form_action ); ?>" enctype="multipart/form-data">
 
 	<input type="hidden" name="modal_checkout" value="1" />
+	<input type="hidden" name="after_success_behavior" value="<?php echo esc_attr( $after_success_behavior ); ?>" />
+	<input type="hidden" name="after_success_url" value="<?php echo esc_attr( $after_success_url ); ?>" />
+	<input type="hidden" name="after_success_button_label" value="<?php echo esc_attr( $after_success_button_label ); ?>" />
+
 	<?php
 	if ( $edit_billing ) {
 		wp_nonce_field( 'newspack_blocks_edit_billing', 'newspack_blocks_edit_billing_nonce' );

package/src/types/index.d.ts

@@ -6,7 +6,6 @@ declare global {
 		newspack_blocks_data: {
 			assets_path: string;
 			is_rendering_stripe_payment_form?: boolean;
-			can_render_tiers_based_layout?: boolean;
 			supports_recaptcha: boolean;
 			has_recaptcha: boolean;
 			recaptcha_url: string;
@@ -28,7 +27,7 @@ declare global {
 	type PostId = number;
 	type CategoryId = number;
 	type TagId = number;
-	type Taxonomy = { slug: string, terms: number[] }[];
+	type Taxonomy = { slug: string; terms: number[] }[];
 	type AuthorId = number;
 
 	type PostType = { name: string; slug: string; supports: { newspack_blocks: boolean } };

package/vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitffcc00ed7277b9ae75748a70e6ef8db0::getLoader();
+return ComposerAutoloaderInitf52ddb06dc7136613134cfd4647ad1e6::getLoader();

package/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitffcc00ed7277b9ae75748a70e6ef8db0
+class ComposerAutoloaderInitf52ddb06dc7136613134cfd4647ad1e6
 {
     private static $loader;
 
@@ -22,12 +22,12 @@ class ComposerAutoloaderInitffcc00ed7277b9ae75748a70e6ef8db0
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitffcc00ed7277b9ae75748a70e6ef8db0', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitf52ddb06dc7136613134cfd4647ad1e6', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitffcc00ed7277b9ae75748a70e6ef8db0', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitf52ddb06dc7136613134cfd4647ad1e6', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitffcc00ed7277b9ae75748a70e6ef8db0::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitf52ddb06dc7136613134cfd4647ad1e6::getInitializer($loader));
 
         $loader->register(true);
 

package/vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitffcc00ed7277b9ae75748a70e6ef8db0
+class ComposerStaticInitf52ddb06dc7136613134cfd4647ad1e6
 {
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
@@ -13,7 +13,7 @@ class ComposerStaticInitffcc00ed7277b9ae75748a70e6ef8db0
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInitffcc00ed7277b9ae75748a70e6ef8db0::$classMap;
+            $loader->classMap = ComposerStaticInitf52ddb06dc7136613134cfd4647ad1e6::$classMap;
 
         }, null, ClassLoader::class);
     }

package/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'automattic/newspack-blocks',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '77a8cac130bc9cd9345d6b004c463ed4fad9db0b',
+        'reference' => '82cfb05790f13ba1e4515c51ca109e3cf3bc3232',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'automattic/newspack-blocks' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '77a8cac130bc9cd9345d6b004c463ed4fad9db0b',
+            'reference' => '82cfb05790f13ba1e4515c51ca109e3cf3bc3232',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),