@automattic/newspack-blocks 1.37.0 → 1.48.0

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.blog/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         1.37.0
+ * Version:         1.48.0
  *
  * @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', '1.37.0' );
+define( 'NEWSPACK_BLOCKS__VERSION', '1.48.0' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';
@@ -27,9 +27,15 @@ require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'src/blocks/homepage-articles/class-w
 // REST Controller for Author Profile Block.
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'src/blocks/author-profile/class-wp-rest-newspack-authors-controller.php';
 
+// REST Controller for Author List Block.
+require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'src/blocks/author-list/class-wp-rest-newspack-author-list-controller.php';
+
 // REST Controller for Donate Block.
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'src/blocks/donate/class-wp-rest-newspack-donate-controller.php';
 
+// REST Controller for Iframe Block.
+require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'src/blocks/iframe/class-wp-rest-newspack-iframe-controller.php';
+
 /**
  * Registers Articles block routes.
  */
@@ -48,6 +54,15 @@ function newspack_authors_block_register_rest_routes() { // phpcs:ignore WordPre
 }
 add_action( 'rest_api_init', 'newspack_authors_block_register_rest_routes' );
 
+/**
+ * Registers Author List block routes.
+ */
+function newspack_author_list_block_register_rest_routes() { // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedFunctionFound
+	$author_list_controller = new WP_REST_Newspack_Author_List_Controller();
+	$author_list_controller->register_routes();
+}
+add_action( 'rest_api_init', 'newspack_author_list_block_register_rest_routes' );
+
 /**
  * Registers Donate block routes.
  */
@@ -57,6 +72,15 @@ function newspack_donate_block_register_rest_routes() { // phpcs:ignore WordPres
 }
 add_action( 'rest_api_init', 'newspack_donate_block_register_rest_routes' );
 
+/**
+ * Registers Iframe block routes.
+ */
+function newspack_iframe_block_register_rest_routes() { // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedFunctionFound
+	$iframe_controller = new WP_REST_Newspack_Iframe_Controller();
+	$iframe_controller->register_routes();
+}
+add_action( 'rest_api_init', 'newspack_iframe_block_register_rest_routes' );
+
 Newspack_Blocks::manage_view_scripts();
 add_action( 'enqueue_block_editor_assets', array( 'Newspack_Blocks', 'enqueue_block_editor_assets' ) );
 add_action( 'wp_enqueue_scripts', array( 'Newspack_Blocks', 'enqueue_block_styles_assets' ) );

package/package.json

@@ -1,150 +1,55 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "1.37.0",
+	"version": "1.48.0",
 	"author": "Automattic",
 	"devDependencies": {
-		"@automattic/calypso-build": "^9.0.0",
-		"@babel/core": "^7.12.10",
-		"@commitlint/cli": "^8.3.5",
-		"@commitlint/config-conventional": "^8.3.4",
-		"@semantic-release/changelog": "^5.0.0",
-		"@semantic-release/git": "^9.0.0",
-		"@wordpress/api-fetch": "^5.2.1",
-		"@wordpress/base-styles": "^3.6.0",
-		"@wordpress/block-editor": "^7.0.1",
-		"@wordpress/blocks": "^11.0.1",
-		"@wordpress/components": "^16.0.0",
-		"@wordpress/element": "^4.0.0",
-		"@wordpress/eslint-plugin": "^9.1.1",
-		"@wordpress/stylelint-config": "^19.1.0",
-		"@wordpress/url": "^3.2.1",
-		"classnames": "^2.2.6",
-		"commitizen": "^4.0.3",
-		"cz-conventional-changelog": "^3.0.2",
+		"@rushstack/eslint-patch": "^1.1.2",
+		"@testing-library/dom": "^8.13.0",
+		"@testing-library/user-event": "^14.1.0",
 		"eslint": "^7.32.0",
-		"eslint-config-prettier": "^8.3.0",
-		"eslint-plugin-import": "^2.19.1",
-		"eslint-plugin-jsdoc": "^36.0.8",
-		"eslint-plugin-prettier": "^4.0.0",
-		"eslint-plugin-react": "^7.17.0",
-		"lint-staged": "^9.5.0",
-		"npm-run-all": "^4.1.5",
-		"prettier": "npm:wp-prettier@2.2.1-beta-1",
-		"semantic-release": "^16.0.2",
-		"semantic-release-version-bump": "^1.3.0",
-		"stylelint": "^13.13.1",
-		"stylelint-config-prettier": "^8.0.0",
-		"stylelint-prettier": "^1.1.2",
-		"webpack": "^5.46.0",
-		"webpack-cli": "^4.7.2 "
+		"fetch-mock-jest": "^1.5.1",
+		"html-entities": "^2.3.3",
+		"identity-obj-proxy": "^3.0.0",
+		"lint-staged": "^12.3.7",
+		"newspack-scripts": "^3.3.0",
+		"prettier": "npm:wp-prettier@^2.2.1-beta-1",
+		"stylelint": "^13.3.1"
 	},
 	"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",
-	"directories": {
-		"test": "tests"
-	},
 	"dependencies": {
-		"@stripe/stripe-js": "^1.15.0",
-		"@wordpress/a11y": "^3.2.1",
-		"@wordpress/compose": "^5.0.1",
-		"@wordpress/data": "^6.0.1",
-		"@wordpress/date": "^4.2.1",
-		"@wordpress/dom-ready": "^3.2.1",
-		"@wordpress/edit-post": "^5.0.1",
-		"@wordpress/escape-html": "^2.2.1",
-		"@wordpress/hooks": "^3.2.0",
-		"@wordpress/html-entities": "^3.2.1",
-		"@wordpress/i18n": "^4.2.1",
-		"@wordpress/icons": "^5.0.1",
-		"@wordpress/keycodes": "^3.2.1",
-		"@wordpress/plugins": "^4.0.1",
-		"lodash": "^4.17.20",
-		"newspack-components": "^1.6.1",
+		"@stripe/stripe-js": "^1.27.0",
+		"classnames": "^2.3.1",
+		"lodash": "^4.17.21",
+		"newspack-components": "^2.0.3",
 		"react": "^17.0.2",
-		"redux": "^4.0.5",
+		"redux": "^4.1.2",
 		"redux-saga": "^1.1.3",
-		"regenerator-runtime": "^0.13.7",
-		"swiper": "4.5.1"
+		"regenerator-runtime": "^0.13.9",
+		"swiper": "7.4.1"
 	},
 	"scripts": {
-		"cm": "git-cz",
-		"semantic-release": "semantic-release",
-		"start": "npm run dev",
-		"dev": "calypso-build --watch --config='./webpack.config.js'",
-		"build": "calypso-build --config='./webpack.config.js'",
-		"lint": "npm-run-all --parallel lint:*",
-		"lint:js": "eslint --ext .js,.jsx src",
+		"cm": "newspack-scripts commit",
+		"semantic-release": "newspack-scripts release --files=newspack-blocks.php",
+		"build": "newspack-scripts build",
+		"start": "npm ci && newspack-scripts watch",
+		"watch": "newspack-scripts watch",
+		"test": "newspack-scripts test",
+		"lint": "npm run lint:scss && npm run lint:js",
+		"lint:js": "prettier 'src/**/*.{js,jsx}' --write",
 		"lint:js:staged": "eslint --ext .js,.jsx",
 		"format:js": "prettier 'src/**/*.{js,jsx}' --write",
-		"lint:scss": "stylelint \"**/*.scss\" --syntax scss",
+		"lint:scss": "stylelint '**/*.scss' --syntax scss --config=./node_modules/newspack-scripts/config/stylelint.config.js",
 		"format:scss": "prettier --write 'src/**/*.scss'",
-		"lint:scss:staged": "stylelint --syntax scss",
+		"lint:scss:staged": "stylelint --syntax scss --config=./node_modules/newspack-scripts/config/stylelint.config.js",
 		"i18n": "NODE_ENV=production npm run build; bash ./bin/update-translations.sh",
-		"clean": "rm -rf dist/",
-		"test": "echo \"Error: no test specified\" && exit 1",
-		"release": "NODE_ENV=production npm run build && npm run semantic-release",
-		"release:archive": "rm -rf release && mkdir -p release && rsync -r . ./release/newspack-blocks --exclude-from='./.distignore' && cd release && zip -r newspack-blocks.zip newspack-blocks"
+		"release": "npm run build && npm run semantic-release",
+		"release:archive": "rm -rf release && mkdir -p release && rsync -r . ./release/newspack-blocks --exclude-from='./.distignore' && cd release && zip -r newspack-blocks.zip newspack-blocks",
+		"postinstall": "rm -rf node_modules/newspack-scripts/node_modules/prettier"
 	},
 	"lint-staged": {
 		"*.scss": "npm run lint:scss:staged",
 		"*.js": "npm run lint:js:staged"
 	},
-	"release": {
-		"branches": [
-			"release",
-			{
-				"name": "alpha",
-				"prerelease": "alpha"
-			}
-		],
-		"prepare": [
-			"@semantic-release/changelog",
-			"@semantic-release/npm",
-			[
-				"semantic-release-version-bump",
-				{
-					"files": "newspack-blocks.php",
-					"callback": "npm run release:archive"
-				}
-			],
-			{
-				"path": "@semantic-release/git",
-				"assets": [
-					"newspack-blocks.php",
-					"package.json",
-					"package-lock.json",
-					"CHANGELOG.md"
-				],
-				"message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
-			}
-		],
-		"plugins": [
-			"@semantic-release/commit-analyzer",
-			"@semantic-release/release-notes-generator",
-			[
-				"@semantic-release/npm",
-				{
-					"npmPublish": false
-				}
-			],
-			"semantic-release-version-bump",
-			[
-				"@semantic-release/github",
-				{
-					"assets": [
-						{
-							"path": "./release/newspack-blocks.zip",
-							"label": "newspack-blocks.zip"
-						}
-					]
-				}
-			]
-		]
-	},
-	"config": {
-		"commitizen": {
-			"path": "./node_modules/cz-conventional-changelog"
-		}
-	},
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/Automattic/newspack-blocks.git"
@@ -152,8 +57,5 @@
 	"license": "GPL-3.0-or-later",
 	"bugs": {
 		"url": "https://github.com/Automattic/newspack-blocks/issues"
-	},
-	"optionalDependencies": {
-		"fsevents": "^1.2.11"
 	}
 }

package/postcss.config.js

@@ -0,0 +1,11 @@
+var postcssFocusWithin = require( 'postcss-focus-within' );
+
+module.exports = {
+	plugins: {
+		autoprefixer: {},
+	},
+};
+
+module.exports = {
+	plugins: [ postcssFocusWithin(/* pluginOptions */) ],
+};

package/src/block-patterns/subscribe-2.php

@@ -7,7 +7,7 @@
 
 return array(
 	'title'         => __( 'Subscribe Pattern 2', 'newspack-blocks' ),
-	'content'       => "<!-- wp:group {\"className\":\"newspack-pattern subscribe__style-2\"} -->\n<div class=\"wp-block-group newspack-pattern subscribe__style-2\"><div class=\"wp-block-group__inner-container\"><!-- wp:cover {\"url\":\"https://newspack.newspackstaging.com/wp-content/uploads/2020/03/automated_upload-62.jpg\",\"id\":131} -->\n<div class=\"wp-block-cover has-background-dim\"><img class=\"wp-block-cover__image-background wp-image-131\" alt=\"\" src=\"https://newspack.newspackstaging.com/wp-content/uploads/2020/03/automated_upload-62.jpg\" data-object-fit=\"cover\"/><div class=\"wp-block-cover__inner-container\"><!-- wp:heading {\"textAlign\":\"center\"} -->\n<h2 class=\"has-text-align-center\">" . esc_html__( 'Subscribe to our newsletter', 'newspack-blocks' ) . "</h2>\n<!-- /wp:heading --></div></div>\n<!-- /wp:cover -->\n\n<!-- wp:jetpack/mailchimp {\"consentText\":\"" . esc_html__( 'By subscribing, you agree to share your email address with us and Mailchimp to receive marketing, updates, and other emails from us. Use the unsubscribe link in those emails to opt out at any time.', 'newspack-blocks' ) . "\",\"interests\":[]} -->\n<!-- wp:jetpack/button {\"element\":\"button\",\"uniqueId\":\"mailchimp-widget-id\",\"text\":\"" . esc_html__( 'Subscribe', 'newspack-blocks' ) . "\"} /-->\n<!-- /wp:jetpack/mailchimp --></div></div>\n<!-- /wp:group -->",
+	'content'       => "<!-- wp:group {\"className\":\"newspack-pattern subscribe__style-2\"} -->\n<div class=\"wp-block-group newspack-pattern subscribe__style-2\"><div class=\"wp-block-group__inner-container\"><!-- wp:cover {\"url\":\"https://newspack.newspackstaging.com/wp-content/uploads/2020/03/automated_upload-62.jpg\",\"id\":131} -->\n<div class=\"wp-block-cover has-background-dim\"><img class=\"wp-block-cover__image-background wp-image-131\" alt=\"\" src=\"https://newspack.newspackstaging.com/wp-content/uploads/2020/03/automated_upload-62.jpg\" data-object-fit=\"cover\"/><div class=\"wp-block-cover__inner-container\"><!-- wp:heading {\"textAlign\":\"center\",\"textColor\":\"white\"} -->\n<h2 class=\"has-text-align-center has-white-color has-text-color\">" . esc_html__( 'Subscribe to our newsletter', 'newspack-blocks' ) . "</h2>\n<!-- /wp:heading --></div></div>\n<!-- /wp:cover -->\n\n<!-- wp:jetpack/mailchimp {\"consentText\":\"" . esc_html__( 'By subscribing, you agree to share your email address with us and Mailchimp to receive marketing, updates, and other emails from us. Use the unsubscribe link in those emails to opt out at any time.', 'newspack-blocks' ) . "\",\"interests\":[]} -->\n<!-- wp:jetpack/button {\"element\":\"button\",\"uniqueId\":\"mailchimp-widget-id\",\"text\":\"" . esc_html__( 'Subscribe', 'newspack-blocks' ) . "\"} /-->\n<!-- /wp:jetpack/mailchimp --></div></div>\n<!-- /wp:group -->",
 	'viewportWidth' => 1000,
 	'categories'    => array( 'newspack-subscribe' ),
 );

package/src/block-patterns/subscribe-3.php

@@ -7,7 +7,7 @@
 
 return array(
 	'title'         => __( 'Subscribe Pattern 3', 'newspack-blocks' ),
-	'content'       => "<!-- wp:group {\"className\":\"newspack-pattern subscribe__style-3\"} -->\n<div class=\"wp-block-group newspack-pattern subscribe__style-3\"><!-- wp:columns {\"verticalAlignment\":\"center\"} -->\n<div class=\"wp-block-columns are-vertically-aligned-center\"><!-- wp:column {\"verticalAlignment\":\"center\"} -->\n<div class=\"wp-block-column is-vertically-aligned-center\"><!-- wp:cover {\"url\":\"https://newspack.newspackstaging.com/wp-content/uploads/2020/03/automated_upload-62.jpg\",\"id\":131,\"contentPosition\":\"center center\"} -->\n<div class=\"wp-block-cover has-background-dim\"><img class=\"wp-block-cover__image-background wp-image-131\" alt=\"\" src=\"https://newspack.newspackstaging.com/wp-content/uploads/2020/03/automated_upload-62.jpg\" data-object-fit=\"cover\"/><div class=\"wp-block-cover__inner-container\"><!-- wp:heading -->\n<h2>" . esc_html__( 'Subscribe to our newsletter', 'newspack-blocks' ) . "</h2>\n<!-- /wp:heading --></div></div>\n<!-- /wp:cover --></div>\n<!-- /wp:column -->\n\n<!-- wp:column {\"verticalAlignment\":\"center\"} -->\n<div class=\"wp-block-column is-vertically-aligned-center\"><!-- wp:jetpack/mailchimp {\"consentText\":\"" . esc_html__( 'By subscribing, you agree to share your email address with us and Mailchimp to receive marketing, updates, and other emails from us. Use the unsubscribe link in those emails to opt out at any time.', 'newspack-blocks' ) . "\",\"interests\":[]} -->\n<!-- wp:jetpack/button {\"element\":\"button\",\"uniqueId\":\"mailchimp-widget-id\",\"text\":\"" . esc_html__( 'Subscribe', 'newspack-blocks' ) . "\"} /-->\n<!-- /wp:jetpack/mailchimp --></div>\n<!-- /wp:column --></div>\n<!-- /wp:columns --></div>\n<!-- /wp:group -->",
+	'content'       => "<!-- wp:group {\"className\":\"newspack-pattern subscribe__style-3\"} -->\n<div class=\"wp-block-group newspack-pattern subscribe__style-3\"><!-- wp:columns {\"verticalAlignment\":\"center\"} -->\n<div class=\"wp-block-columns are-vertically-aligned-center\"><!-- wp:column {\"verticalAlignment\":\"center\"} -->\n<div class=\"wp-block-column is-vertically-aligned-center\"><!-- wp:cover {\"url\":\"https://newspack.newspackstaging.com/wp-content/uploads/2020/03/automated_upload-62.jpg\",\"id\":131,\"contentPosition\":\"center center\"} -->\n<div class=\"wp-block-cover has-background-dim\"><img class=\"wp-block-cover__image-background wp-image-131\" alt=\"\" src=\"https://newspack.newspackstaging.com/wp-content/uploads/2020/03/automated_upload-62.jpg\" data-object-fit=\"cover\"/><div class=\"wp-block-cover__inner-container\"><!-- wp:heading {\"textColor\":\"white\"} -->\n<h2 class=\"has-white-color has-text-color\">" . esc_html__( 'Subscribe to our newsletter', 'newspack-blocks' ) . "</h2>\n<!-- /wp:heading --></div></div>\n<!-- /wp:cover --></div>\n<!-- /wp:column -->\n\n<!-- wp:column {\"verticalAlignment\":\"center\"} -->\n<div class=\"wp-block-column is-vertically-aligned-center\"><!-- wp:jetpack/mailchimp {\"consentText\":\"" . esc_html__( 'By subscribing, you agree to share your email address with us and Mailchimp to receive marketing, updates, and other emails from us. Use the unsubscribe link in those emails to opt out at any time.', 'newspack-blocks' ) . "\",\"interests\":[]} -->\n<!-- wp:jetpack/button {\"element\":\"button\",\"uniqueId\":\"mailchimp-widget-id\",\"text\":\"" . esc_html__( 'Subscribe', 'newspack-blocks' ) . "\"} /-->\n<!-- /wp:jetpack/mailchimp --></div>\n<!-- /wp:column --></div>\n<!-- /wp:columns --></div>\n<!-- /wp:group -->",
 	'viewportWidth' => 1000,
 	'categories'    => array( 'newspack-subscribe' ),
 );

package/src/block-patterns/subscribe-7.php

@@ -0,0 +1,12 @@
+<?php
+/**
+ * Subscribe Pattern 7.
+ *
+ * @package Newspack_Blocks
+ */
+
+return array(
+	'title'      => esc_html__( 'Subscribe Pattern 7', 'newspack-blocks' ),
+	'content'    => "<!-- wp:group {\"templateLock\":\"all\",\"className\":\"newspack-pattern subscribe__style-7\"} -->\n<div class=\"wp-block-group newspack-pattern subscribe__style-7\"><!-- wp:media-text {\"mediaId\":999,\"mediaLink\":\"https://newspackdev.mystagingwebsite.com/prompts-patterns/pexels-brotin-biswas-518543/\",\"mediaType\":\"image\",\"imageFill\":true} -->\n<div class=\"wp-block-media-text alignwide is-stacked-on-mobile is-image-fill\"><figure class=\"wp-block-media-text__media\" style=\"background-image:url(https://newspackdev.mystagingwebsite.com/wp-content/uploads/2022/03/pexels-brotin-biswas-518543-1024x683.jpeg);background-position:50% 50%\"><img src=\"https://newspackdev.mystagingwebsite.com/wp-content/uploads/2022/03/pexels-brotin-biswas-518543-1024x683.jpeg\" alt=\"\" class=\"wp-image-999 size-full\"/></figure><div class=\"wp-block-media-text__content\"><!-- wp:heading {\"lock\":{\"remove\":false},\"level\":4,\"className\":\"newspack-pattern__heading\"} -->\n<h4 class=\"newspack-pattern__heading\">" . esc_html__( 'Subscribe to our Newsletter', 'newspack-blocks' ) . "</h4>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph {\"lock\":{\"remove\":false}} -->\n<p>" . esc_html__( 'Be the first to know about breaking news, articles, and updates.', 'newspack-blocks' ) . "</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:jetpack/mailchimp {\"consentText\":\"" . esc_html__( 'By subscribing, you agree to share your email address with us. Use the unsubscribe link in those emails to opt out at any time.', 'newspack-blocks' ) . "\"} -->\n<!-- wp:jetpack/button {\"element\":\"button\",\"uniqueId\":\"mailchimp-widget-id\",\"text\":\"" . esc_html__( 'Subscribe', 'newspack-blocks' ) . "\",\"width\":\"100%\"} /-->\n<!-- /wp:jetpack/mailchimp --></div></div>\n<!-- /wp:media-text --></div>\n<!-- /wp:group -->",
+	'categories' => array( 'newspack-subscribe' ),
+);

package/src/block-patterns/subscribe-8.php

@@ -0,0 +1,12 @@
+<?php
+/**
+ * Subscribe Pattern 8.
+ *
+ * @package Newspack_Blocks
+ */
+
+return array(
+	'title'      => esc_html__( 'Subscribe Pattern 8', 'newspack-blocks' ),
+	'content'    => "<!-- wp:group {\"templateLock\":\"all\",\"className\":\"newspack-pattern subscribe__style-8\"} -->\n<div class=\"wp-block-group newspack-pattern subscribe__style-8\"><!-- wp:image {\"lock\":{\"remove\":false},\"id\":999} -->\n<figure class=\"wp-block-image\"><img src=\"https://newspack.newspackstaging.com/wp-content/uploads/2022/03/pexels-brotin-biswas-518543-crop-scaled.jpg\" alt=\"\" class=\"wp-image-999\"/></figure>\n<!-- /wp:image -->\n\n<!-- wp:group {\"className\":\"newspack-pattern__inner\"} -->\n<div class=\"wp-block-group newspack-pattern__inner\"><!-- wp:heading {\"lock\":{\"remove\":false},\"level\":4,\"className\":\"newspack-pattern__heading\"} -->\n<h4 class=\"newspack-pattern__heading\">" . esc_html__( 'Subscribe to our Newsletter', 'newspack-blocks' ) . "</h4>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph {\"lock\":{\"remove\":false}} -->\n<p>" . esc_html__( 'Be the first to know about breaking news, articles, and updates.', 'newspack-blocks' ) . "</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:jetpack/mailchimp {\"consentText\":\"" . esc_html__( 'By subscribing, you agree to share your email address with us. Use the unsubscribe link in those emails to opt out at any time.', 'newspack-blocks' ) . "\"} -->\n<!-- wp:jetpack/button {\"element\":\"button\",\"uniqueId\":\"mailchimp-widget-id\",\"text\":\"" . esc_html__( 'Subscribe', 'newspack-blocks' ) . "\"} /-->\n<!-- /wp:jetpack/mailchimp --></div>\n<!-- /wp:group --></div>\n<!-- /wp:group -->",
+	'categories' => array( 'newspack-subscribe' ),
+);

package/src/block-patterns/subscribe-9.php

@@ -0,0 +1,12 @@
+<?php
+/**
+ * Subscribe Pattern 9.
+ *
+ * @package Newspack_Blocks
+ */
+
+return array(
+	'title'      => esc_html__( 'Subscribe Pattern 9', 'newspack-blocks' ),
+	'content'    => "<!-- wp:group {\"templateLock\":\"all\",\"className\":\"newspack-pattern subscribe__style-9\"} -->\n<div class=\"wp-block-group newspack-pattern subscribe__style-9\"><!-- wp:columns -->\n<div class=\"wp-block-columns\"><!-- wp:column {\"templateLock\":\"all\"} -->\n<div class=\"wp-block-column\"><!-- wp:heading {\"lock\":{\"remove\":false},\"level\":4,\"className\":\"newspack-pattern__heading\"} -->\n<h4 class=\"newspack-pattern__heading\">" . esc_html__( 'Subscribe to our Newsletter', 'newspack-blocks' ) . "</h4>\n<!-- /wp:heading -->\n\n<!-- wp:paragraph {\"lock\":{\"remove\":false}} -->\n<p>" . esc_html__( 'Be the first to know about breaking news, articles, and updates.', 'newspack-blocks' ) . "</p>\n<!-- /wp:paragraph --></div>\n<!-- /wp:column -->\n\n<!-- wp:column {\"templateLock\":\"all\"} -->\n<div class=\"wp-block-column\"><!-- wp:jetpack/mailchimp {\"consentText\":\"" . esc_html__( 'By subscribing, you agree to share your email address with us. Use the unsubscribe link in those emails to opt out at any time.', 'newspack-blocks' ) . "\"} -->\n<!-- wp:jetpack/button {\"element\":\"button\",\"uniqueId\":\"mailchimp-widget-id\",\"text\":\"" . esc_html__( 'Subscribe', 'newspack-blocks' ) . "\"} /-->\n<!-- /wp:jetpack/mailchimp --></div>\n<!-- /wp:column --></div>\n<!-- /wp:columns --></div>\n<!-- /wp:group -->",
+	'categories' => array( 'newspack-subscribe' ),
+);

package/src/block-styles/core/columns/editor.scss

@@ -4,17 +4,14 @@
 .wp-block-columns {
 	@include media( mobile ) {
 		&[class*='is-style-first-col-to'] [data-type='core/column'] {
-			margin-left: 46px;
+			margin-left: 2em;
 		}
 
 		&[class*='is-style-first-col-to'] [data-type='core/column']:nth-child( 2 ) {
 			margin-left: 0;
 		}
 
-		&.is-style-first-col-to-second [data-type='core/column']:nth-child( 2 ) {
-			order: -1;
-		}
-
+		&.is-style-first-col-to-second [data-type='core/column']:nth-child( 2 ),
 		&.is-style-first-col-to-third [data-type='core/column']:nth-child( 2 ),
 		&.is-style-first-col-to-third [data-type='core/column']:nth-child( 3 ) {
 			order: -1;
@@ -37,11 +34,11 @@
 
 				&::after {
 					border-right: 1px solid $color__border;
-					bottom: 0;
+					bottom: 15px;
 					content: '';
 					position: absolute;
-					right: -30px;
-					top: 0;
+					right: -18px;
+					top: 15px;
 				}
 
 				&:nth-child( odd )::after {

package/src/block-styles/core/columns/view.scss

@@ -2,12 +2,10 @@
 @import '../../../shared/sass/mixins';
 
 .wp-block-columns {
-	.wp-block-column {
-		margin-bottom: 32px;
-
-		&:last-child {
-			margin-bottom: 0;
-		}
+	&.is-not-stack-on-mobile {
+		margin-left: -16px;
+		max-width: calc( 100% + 32px );
+		width: calc( 100% + 32px );
 	}
 
 	@include media( mobile ) {
@@ -16,12 +14,6 @@
 		max-width: calc( 100% + 32px );
 		width: calc( 100% + 32px );
 
-		.wp-block-column {
-			margin-bottom: 0;
-			margin-left: 16px;
-			margin-right: 16px;
-		}
-
 		&.is-style-first-col-to-second .wp-block-column:nth-child( 2 ) {
 			order: -1;
 		}
@@ -32,32 +24,6 @@
 		}
 	}
 
-	@include media( tablet ) {
-		&.is-style-borders {
-			margin-left: -24px;
-			max-width: calc( 100% + 48px );
-			width: calc( 100% + 48px );
-
-			> .wp-block-column {
-				margin-left: 24px;
-				margin-right: 24px;
-			}
-		}
-	}
-
-	@include media( desktop ) {
-		&.is-style-borders {
-			margin-left: -32px;
-			max-width: calc( 100% + 64px );
-			width: calc( 100% + 64px );
-
-			> .wp-block-column {
-				margin-left: 32px;
-				margin-right: 32px;
-			}
-		}
-	}
-
 	&.is-style-borders {
 		> .wp-block-column {
 			position: relative;
@@ -93,16 +59,91 @@
 					top: 0;
 				}
 			}
+		}
+	}
 
+	&.is-not-stacked-on-mobile {
+		> .wp-block-column,
+		> .wp-block-column:not( :first-child ),
+		> .wp-block-column:nth-child( 2n ) {
+			margin: 0 16px;
+		}
+
+		&.is-style-borders > .wp-block-column {
+			&::after {
+				border-right-width: 1px;
+				border-top-width: 0;
+				bottom: 0;
+				left: auto;
+				right: -16px;
+				top: 0;
+			}
+		}
+	}
+
+	&:not( .is-not-stacked-on-mobile ) {
+		> .wp-block-column {
+			margin-bottom: 32px;
+
+			&:last-child {
+				margin-bottom: 0;
+			}
+		}
+
+		&.is-style-borders {
+			> .wp-block-column {
+				margin-bottom: 64px;
+
+				&:last-child {
+					margin-bottom: 0;
+				}
+			}
+		}
+
+		@include media( mobile ) {
+			&.is-style-borders > .wp-block-column,
+			> .wp-block-column,
+			> .wp-block-column:not( :first-child ),
+			> .wp-block-column:nth-child( 2n ) {
+				margin: 0 16px;
+			}
+		}
+	}
+
+	&:not( .is-not-stacked-on-mobile ),
+	&.is-not-stacked-on-mobile {
+		&.is-style-borders {
 			@include media( tablet ) {
-				&::after {
-					right: -24px;
+				margin-left: -24px;
+				max-width: calc( 100% + 48px );
+				width: calc( 100% + 48px );
+
+				> .wp-block-column,
+				> .wp-block-column:not( :first-child ),
+				> .wp-block-column:nth-child( 2n ) {
+					margin-left: 24px;
+					margin-right: 24px;
+
+					&::after {
+						right: -24px;
+					}
 				}
 			}
 
 			@include media( desktop ) {
-				&::after {
-					right: -32px;
+				margin-left: -32px;
+				max-width: calc( 100% + 64px );
+				width: calc( 100% + 64px );
+
+				> .wp-block-column,
+				> .wp-block-column:not( :first-child ),
+				> .wp-block-column:nth-child( 2n ) {
+					margin-left: 32px;
+					margin-right: 32px;
+
+					&::after {
+						right: -32px;
+					}
 				}
 			}
 		}

package/src/blocks/author-list/block.json

@@ -0,0 +1,82 @@
+{
+	"name": "author-list",
+	"category": "newspack",
+	"attributes": {
+		"className": {
+			"type": "string",
+			"default": ""
+		},
+		"columns": {
+			"type": "number",
+			"default": 2
+		},
+		"exclude": {
+			"type": "array",
+			"default": []
+		},
+		"excludeEmpty": {
+			"type": "boolean",
+			"default": false
+		},
+		"layout": {
+			"type": "string",
+			"default": "list"
+		},
+		"textSize": {
+			"type": "string",
+			"default": "medium"
+		},
+		"authorRoles": {
+			"type": "array",
+			"default": [ "Administrator", "Editor", "Author", "Contributor" ]
+		},
+		"authorType": {
+			"type": "string",
+			"default": "all"
+		},
+		"showBio": {
+			"type": "boolean",
+			"default": true
+		},
+		"showSocial": {
+			"type": "boolean",
+			"default": true
+		},
+		"showEmail": {
+			"type": "boolean",
+			"default": true
+		},
+		"showArchiveLink": {
+			"type": "boolean",
+			"default": true
+		},
+		"showSeparators": {
+			"type": "boolean",
+			"default": false
+		},
+		"separatorSections": {
+			"type": "boolean",
+			"default": false
+		},
+		"showAvatar": {
+			"type": "boolean",
+			"default": true
+		},
+		"avatarAlignment": {
+			"type": "string",
+			"default": "left"
+		},
+		"avatarBorderRadius": {
+			"type": "string",
+			"default": "50%"
+		},
+		"avatarSize": {
+			"type": "number",
+			"default": 128
+		},
+		"avatarHideDefault": {
+			"type": "boolean",
+			"default": false
+		}
+	}
+}