Remove save() function from subscription blocks

projects/plugins/jetpack/changelog/delete-subscribe-block-save

@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+Removes old save() implementation for the subscription block. Doesn't impact user experience as the block is already dynamic.

projects/plugins/jetpack/extensions/blocks/subscriptions/deprecated/index.js

@@ -4,11 +4,13 @@ import deprecatedV3 from './v3';
 import deprecatedV4 from './v4';
 import deprecatedV5 from './v5';
 import deprecatedV6 from './v6';
+import deprecatedV7 from './v7';
 
 // Deprecations should run in reverse chronological order. Most probable
 // deprecations to run are the most recent. This ordering makes the process
 // a little more performant.
 export default [
+	deprecatedV7,
 	deprecatedV6,
 	deprecatedV5,
 	deprecatedV4,

projects/plugins/jetpack/extensions/blocks/subscriptions/deprecated/v7/attributes.js

@@ -0,0 +1,84 @@
+import { __ } from '@wordpress/i18n';
+
+export default {
+	subscribePlaceholder: {
+		type: 'string',
+		default: __( 'Type your email…', 'jetpack' ),
+	},
+	showSubscribersTotal: {
+		type: 'boolean',
+		default: false,
+	},
+	buttonOnNewLine: {
+		type: 'boolean',
+		default: false,
+	},
+	buttonWidth: {
+		type: 'string',
+	},
+	submitButtonText: {
+		type: 'string',
+		default: __( 'Subscribe', 'jetpack' ),
+	},
+	emailFieldBackgroundColor: {
+		type: 'string',
+	},
+	customEmailFieldBackgroundColor: {
+		type: 'string',
+	},
+	emailFieldGradient: {
+		type: 'string',
+	},
+	customEmailFieldGradient: {
+		type: 'string',
+	},
+	buttonBackgroundColor: {
+		type: 'string',
+	},
+	customButtonBackgroundColor: {
+		type: 'string',
+	},
+	buttonGradient: {
+		type: 'string',
+	},
+	customButtonGradient: {
+		type: 'string',
+	},
+	textColor: {
+		type: 'string',
+	},
+	customTextColor: {
+		type: 'string',
+	},
+	fontSize: {
+		type: 'string',
+	},
+	customFontSize: {
+		type: 'string',
+	},
+	borderRadius: {
+		type: 'number',
+	},
+	borderWeight: {
+		type: 'number',
+	},
+	borderColor: {
+		type: 'string',
+	},
+	customBorderColor: {
+		type: 'string',
+	},
+	padding: {
+		type: 'number',
+	},
+	spacing: {
+		type: 'number',
+	},
+	successMessage: {
+		type: 'string',
+		default: __(
+			"Success! An email was just sent to confirm your subscription. Please find the email now and click 'Confirm Follow' to start subscribing.",
+			'jetpack'
+		),
+	},
+};

projects/plugins/jetpack/extensions/blocks/subscriptions/deprecated/v7/index.js

@@ -0,0 +1,12 @@
+import definedAttributes from './attributes';
+import save from './save';
+
+/**
+ * Deprecation reason
+ *
+ * Added new block attribute `successMessage`, which was already available to the shortcode.
+ */
+export default {
+	attributes: definedAttributes,
+	save,
+};

projects/plugins/jetpack/extensions/blocks/subscriptions/save.js → projects/plugins/jetpack/extensions/blocks/subscriptions/deprecated/v7/save.js

@@ -7,14 +7,31 @@ import { RawHTML } from '@wordpress/element';
 import classnames from 'classnames';
 import { reduce } from 'lodash';
 import defaultAttributes from './attributes';
-import {
-	DEFAULT_BORDER_RADIUS_VALUE,
-	DEFAULT_BORDER_WEIGHT_VALUE,
-	DEFAULT_PADDING_VALUE,
-	DEFAULT_SPACING_VALUE,
-	DEFAULT_FONTSIZE_VALUE,
-} from './constants';
-import { encodeValueForShortcodeAttribute } from './utils';
+
+export const DEFAULT_BORDER_RADIUS_VALUE = 0;
+export const DEFAULT_BORDER_WEIGHT_VALUE = 1;
+export const DEFAULT_PADDING_VALUE = 15;
+export const DEFAULT_SPACING_VALUE = 10;
+export const DEFAULT_FONTSIZE_VALUE = '16px';
+
+/**
+ * Apply HTML encoding for special characters inside shortcode attributes.
+ *
+ * @see https://codex.wordpress.org/Shortcode_API#Attributes
+ * @param {string} value - Value to encode.
+ * @returns {string} Encoded value.
+ */
+export const encodeValueForShortcodeAttribute = value => {
+	return value
+		.replace( /</g, '&lt;' )
+		.replace( />/g, '&gt;' )
+		.replace( /"/g, '&quot;' )
+		.replace( /'/g, '&#039;' )
+		.replace( /\[/g, '&#091;' )
+		.replace( /\]/g, '&#093;' )
+		.replace( /\u00a0/g, '&nbsp;' )
+		.replace( /\u200b/g, '&#x200b;' );
+};
 
 export default function Save( { className, attributes } ) {
 	const {

projects/plugins/jetpack/extensions/blocks/subscriptions/index.js

@@ -7,7 +7,6 @@ import attributes from './attributes';
 import deprecated from './deprecated';
 import edit from './edit';
 import SubscribePanels from './panel';
-import save from './save';
 
 export const name = 'subscriptions';
 export const icon = (
@@ -53,7 +52,6 @@ export const settings = {
 	],
 	attributes,
 	edit,
-	save,
 	styles: [
 		{
 			name: 'compact',

projects/plugins/jetpack/extensions/blocks/subscriptions/test/fixtures/jetpack__subscriptions.html

@@ -1,3 +1 @@
-<!-- wp:jetpack/subscriptions {"subscribePlaceholder":"Enter your email address","showSubscribersTotal":true,"buttonOnNewLine":true,"submitButtonText":"Sign Up","fontSize":"33px","customFontSize":"33px","borderRadius":8,"borderWeight":3,"padding":18,"successMessage":"Volla, you subscribed to our blog!"} -->
-<div class="wp-block-jetpack-subscriptions wp-block-jetpack-subscriptions__supports-newline wp-block-jetpack-subscriptions__use-newline wp-block-jetpack-subscriptions__show-subs">[jetpack_subscription_form subscribe_placeholder="Enter your email address" show_subscribers_total="true" button_on_newline="true" submit_button_text="Sign Up" custom_font_size="33px" custom_border_radius="8" custom_border_weight="3" custom_padding="18" custom_spacing="10" submit_button_classes="has-33-px-font-size" email_field_classes="has-33-px-font-size" show_only_email_and_button="true" success_message="Volla, you subscribed to our blog!"]</div>
-<!-- /wp:jetpack/subscriptions -->
+<!-- wp:jetpack/subscriptions {"subscribePlaceholder":"Enter your email address","showSubscribersTotal":true,"buttonOnNewLine":true,"submitButtonText":"Sign Up","fontSize":"33px","customFontSize":"33px","borderRadius":8,"borderWeight":3,"padding":18,"successMessage":"Volla, you subscribed to our blog!"} /-->

projects/plugins/jetpack/extensions/blocks/subscriptions/test/fixtures/jetpack__subscriptions.json

@@ -1,21 +1,21 @@
 [
-    {
-        "clientId": "_clientId_0",
-        "name": "jetpack/subscriptions",
-        "isValid": true,
-        "attributes": {
-            "subscribePlaceholder": "Enter your email address",
-            "showSubscribersTotal": true,
-            "buttonOnNewLine": true,
-            "submitButtonText": "Sign Up",
-            "fontSize": "33px",
-            "customFontSize": "33px",
-            "borderRadius": 8,
-            "borderWeight": 3,
-            "padding": 18,
-            "successMessage": "Volla, you subscribed to our blog!"
-        },
-        "innerBlocks": [],
-        "originalContent": "<div class=\"wp-block-jetpack-subscriptions wp-block-jetpack-subscriptions__supports-newline wp-block-jetpack-subscriptions__use-newline wp-block-jetpack-subscriptions__show-subs\">[jetpack_subscription_form subscribe_placeholder=\"Enter your email address\" show_subscribers_total=\"true\" button_on_newline=\"true\" submit_button_text=\"Sign Up\" custom_font_size=\"33px\" custom_border_radius=\"8\" custom_border_weight=\"3\" custom_padding=\"18\" custom_spacing=\"10\" submit_button_classes=\"has-33-px-font-size\" email_field_classes=\"has-33-px-font-size\" show_only_email_and_button=\"true\" success_message=\"Volla, you subscribed to our blog!\"]</div>"
-    }
+	{
+		"clientId": "_clientId_0",
+		"name": "jetpack/subscriptions",
+		"isValid": true,
+		"attributes": {
+			"subscribePlaceholder": "Enter your email address",
+			"showSubscribersTotal": true,
+			"buttonOnNewLine": true,
+			"submitButtonText": "Sign Up",
+			"fontSize": "33px",
+			"customFontSize": "33px",
+			"borderRadius": 8,
+			"borderWeight": 3,
+			"padding": 18,
+			"successMessage": "Volla, you subscribed to our blog!"
+		},
+		"innerBlocks": [],
+		"originalContent": ""
+	}
 ]

projects/plugins/jetpack/extensions/blocks/subscriptions/test/fixtures/jetpack__subscriptions.parsed.json

@@ -1,22 +1,20 @@
 [
-    {
-        "blockName": "jetpack/subscriptions",
-        "attrs": {
-            "subscribePlaceholder": "Enter your email address",
-            "showSubscribersTotal": true,
-            "buttonOnNewLine": true,
-            "submitButtonText": "Sign Up",
-            "fontSize": "33px",
-            "customFontSize": "33px",
-            "borderRadius": 8,
-            "borderWeight": 3,
-            "padding": 18,
-            "successMessage": "Volla, you subscribed to our blog!"
-        },
-        "innerBlocks": [],
-        "innerHTML": "\n<div class=\"wp-block-jetpack-subscriptions wp-block-jetpack-subscriptions__supports-newline wp-block-jetpack-subscriptions__use-newline wp-block-jetpack-subscriptions__show-subs\">[jetpack_subscription_form subscribe_placeholder=\"Enter your email address\" show_subscribers_total=\"true\" button_on_newline=\"true\" submit_button_text=\"Sign Up\" custom_font_size=\"33px\" custom_border_radius=\"8\" custom_border_weight=\"3\" custom_padding=\"18\" custom_spacing=\"10\" submit_button_classes=\"has-33-px-font-size\" email_field_classes=\"has-33-px-font-size\" show_only_email_and_button=\"true\" success_message=\"Volla, you subscribed to our blog!\"]</div>\n",
-        "innerContent": [
-            "\n<div class=\"wp-block-jetpack-subscriptions wp-block-jetpack-subscriptions__supports-newline wp-block-jetpack-subscriptions__use-newline wp-block-jetpack-subscriptions__show-subs\">[jetpack_subscription_form subscribe_placeholder=\"Enter your email address\" show_subscribers_total=\"true\" button_on_newline=\"true\" submit_button_text=\"Sign Up\" custom_font_size=\"33px\" custom_border_radius=\"8\" custom_border_weight=\"3\" custom_padding=\"18\" custom_spacing=\"10\" submit_button_classes=\"has-33-px-font-size\" email_field_classes=\"has-33-px-font-size\" show_only_email_and_button=\"true\" success_message=\"Volla, you subscribed to our blog!\"]</div>\n"
-        ]
-    }
+	{
+		"blockName": "jetpack/subscriptions",
+		"attrs": {
+			"subscribePlaceholder": "Enter your email address",
+			"showSubscribersTotal": true,
+			"buttonOnNewLine": true,
+			"submitButtonText": "Sign Up",
+			"fontSize": "33px",
+			"customFontSize": "33px",
+			"borderRadius": 8,
+			"borderWeight": 3,
+			"padding": 18,
+			"successMessage": "Volla, you subscribed to our blog!"
+		},
+		"innerBlocks": [],
+		"innerHTML": "",
+		"innerContent": []
+	}
 ]

projects/plugins/jetpack/extensions/blocks/subscriptions/test/fixtures/jetpack__subscriptions.serialized.html

@@ -1,3 +1 @@
-<!-- wp:jetpack/subscriptions {"subscribePlaceholder":"Enter your email address","showSubscribersTotal":true,"buttonOnNewLine":true,"submitButtonText":"Sign Up","fontSize":"33px","customFontSize":"33px","borderRadius":8,"borderWeight":3,"padding":18,"successMessage":"Volla, you subscribed to our blog!"} -->
-<div class="wp-block-jetpack-subscriptions wp-block-jetpack-subscriptions__supports-newline wp-block-jetpack-subscriptions__use-newline wp-block-jetpack-subscriptions__show-subs">[jetpack_subscription_form subscribe_placeholder="Enter your email address" show_subscribers_total="true" button_on_newline="true" submit_button_text="Sign Up" custom_font_size="33px" custom_border_radius="8" custom_border_weight="3" custom_padding="18" custom_spacing="10" submit_button_classes="has-33-px-font-size" email_field_classes="has-33-px-font-size" show_only_email_and_button="true" success_message="Volla, you subscribed to our blog!"]</div>
-<!-- /wp:jetpack/subscriptions -->
+<!-- wp:jetpack/subscriptions {"subscribePlaceholder":"Enter your email address","showSubscribersTotal":true,"buttonOnNewLine":true,"submitButtonText":"Sign Up","fontSize":"33px","customFontSize":"33px","borderRadius":8,"borderWeight":3,"padding":18,"successMessage":"Volla, you subscribed to our blog!"} /-->

projects/plugins/jetpack/extensions/blocks/subscriptions/test/fixtures/jetpack__subscriptions__deprecated-1.serialized.html

@@ -1,3 +1 @@
-<!-- wp:jetpack/subscriptions -->
-<div class="wp-block-jetpack-subscriptions wp-block-jetpack-subscriptions__supports-newline">[jetpack_subscription_form show_subscribers_total="false" custom_font_size="16px" custom_border_radius="0" custom_border_weight="1" custom_padding="15" custom_spacing="10" submit_button_classes="" email_field_classes="" show_only_email_and_button="true"]</div>
-<!-- /wp:jetpack/subscriptions -->
+<!-- wp:jetpack/subscriptions /-->

projects/plugins/jetpack/extensions/blocks/subscriptions/test/fixtures/jetpack__subscriptions__deprecated-2.serialized.html

@@ -1,3 +1 @@
-<!-- wp:jetpack/subscriptions {"subscribePlaceholder":"Email Address","buttonOnNewLine":true,"buttonBackgroundColor":"primary","customButtonBackgroundColor":"#ffffff","textColor":"background","customTextColor":"#000000"} -->
-<div class="wp-block-jetpack-subscriptions wp-block-jetpack-subscriptions__supports-newline wp-block-jetpack-subscriptions__use-newline">[jetpack_subscription_form subscribe_placeholder="Email Address" show_subscribers_total="false" button_on_newline="true" custom_background_button_color="#ffffff" custom_text_button_color="#000000" custom_font_size="16px" custom_border_radius="0" custom_border_weight="1" custom_padding="15" custom_spacing="10" submit_button_classes="has-text-color has-background-color has-background has-primary-background-color" email_field_classes="" show_only_email_and_button="true"]</div>
-<!-- /wp:jetpack/subscriptions -->
+<!-- wp:jetpack/subscriptions {"subscribePlaceholder":"Email Address","buttonOnNewLine":true,"buttonBackgroundColor":"primary","customButtonBackgroundColor":"#ffffff","textColor":"background","customTextColor":"#000000"} /-->

projects/plugins/jetpack/extensions/blocks/subscriptions/test/fixtures/jetpack__subscriptions__deprecated-3.serialized.html

@@ -1,3 +1 @@
-<!-- wp:jetpack/subscriptions {"subscribePlaceholder":"Email Address"} -->
-<div class="wp-block-jetpack-subscriptions wp-block-jetpack-subscriptions__supports-newline">[jetpack_subscription_form subscribe_placeholder="Email Address" show_subscribers_total="false" button_on_newline="false" custom_font_size="16px" custom_border_radius="0" custom_border_weight="1" custom_padding="15" custom_spacing="10" submit_button_classes="" email_field_classes="" show_only_email_and_button="true"]</div>
-<!-- /wp:jetpack/subscriptions -->
+<!-- wp:jetpack/subscriptions {"subscribePlaceholder":"Email Address"} /-->

projects/plugins/jetpack/extensions/blocks/subscriptions/test/fixtures/jetpack__subscriptions__deprecated-4.serialized.html

@@ -1,3 +1 @@
-<!-- wp:jetpack/subscriptions {"subscribePlaceholder":"Enter your email address","submitButtonText":"Sign Up"} -->
-<div class="wp-block-jetpack-subscriptions wp-block-jetpack-subscriptions__supports-newline">[jetpack_subscription_form subscribe_placeholder="Enter your email address" show_subscribers_total="false" button_on_newline="false" submit_button_text="Sign Up" custom_font_size="16px" custom_border_radius="0" custom_border_weight="1" custom_padding="15" custom_spacing="10" submit_button_classes="" email_field_classes="" show_only_email_and_button="true"]</div>
-<!-- /wp:jetpack/subscriptions -->
+<!-- wp:jetpack/subscriptions {"subscribePlaceholder":"Enter your email address","submitButtonText":"Sign Up"} /-->

projects/plugins/jetpack/extensions/blocks/subscriptions/test/fixtures/jetpack__subscriptions__deprecated-5.serialized.html

@@ -1,3 +1 @@
-<!-- wp:jetpack/subscriptions {"subscribePlaceholder":"Email Address","customFontSize":"33px"} -->
-<div class="wp-block-jetpack-subscriptions wp-block-jetpack-subscriptions__supports-newline">[jetpack_subscription_form subscribe_placeholder="Email Address" show_subscribers_total="false" button_on_newline="false" custom_font_size="33px" custom_border_radius="0" custom_border_weight="1" custom_padding="15" custom_spacing="10" submit_button_classes="" email_field_classes="" show_only_email_and_button="true"]</div>
-<!-- /wp:jetpack/subscriptions -->
+<!-- wp:jetpack/subscriptions {"subscribePlaceholder":"Email Address","customFontSize":"33px"} /-->

projects/plugins/jetpack/extensions/blocks/subscriptions/test/fixtures/jetpack__subscriptions__deprecated-6.serialized.html

@@ -1,3 +1 @@
-<!-- wp:jetpack/subscriptions -->
-<div class="wp-block-jetpack-subscriptions wp-block-jetpack-subscriptions__supports-newline">[jetpack_subscription_form show_subscribers_total="false" button_on_newline="false" custom_font_size="16px" custom_border_radius="0" custom_border_weight="1" custom_padding="15" custom_spacing="10" submit_button_classes="" email_field_classes="" show_only_email_and_button="true" success_message="Success! An email was just sent to confirm your subscription. Please find the email now and click &#039;Confirm Follow&#039; to start subscribing."]</div>
-<!-- /wp:jetpack/subscriptions -->
+<!-- wp:jetpack/subscriptions /-->

projects/plugins/jetpack/extensions/blocks/subscriptions/test/fixtures/jetpack__subscriptions__deprecated-7.html

@@ -0,0 +1,3 @@
+<!-- wp:jetpack/subscriptions {"subscribePlaceholder":"Enter your email address","showSubscribersTotal":true,"buttonOnNewLine":true,"submitButtonText":"Sign Up","fontSize":"33px","customFontSize":"33px","borderRadius":8,"borderWeight":3,"padding":18,"successMessage":"Volla, you subscribed to our blog!"} -->
+<div class="wp-block-jetpack-subscriptions wp-block-jetpack-subscriptions__supports-newline wp-block-jetpack-subscriptions__use-newline wp-block-jetpack-subscriptions__show-subs">[jetpack_subscription_form subscribe_placeholder="Enter your email address" show_subscribers_total="true" button_on_newline="true" submit_button_text="Sign Up" custom_font_size="33px" custom_border_radius="8" custom_border_weight="3" custom_padding="18" custom_spacing="10" submit_button_classes="has-33-px-font-size" email_field_classes="has-33-px-font-size" show_only_email_and_button="true" success_message="Volla, you subscribed to our blog!"]</div>
+<!-- /wp:jetpack/subscriptions -->

projects/plugins/jetpack/extensions/blocks/subscriptions/test/fixtures/jetpack__subscriptions__deprecated-7.json

@@ -0,0 +1,21 @@
+[
+	{
+		"clientId": "_clientId_0",
+		"name": "jetpack/subscriptions",
+		"isValid": true,
+		"attributes": {
+			"subscribePlaceholder": "Enter your email address",
+			"showSubscribersTotal": true,
+			"buttonOnNewLine": true,
+			"submitButtonText": "Sign Up",
+			"fontSize": "33px",
+			"customFontSize": "33px",
+			"borderRadius": 8,
+			"borderWeight": 3,
+			"padding": 18,
+			"successMessage": "Volla, you subscribed to our blog!"
+		},
+		"innerBlocks": [],
+		"originalContent": "<div class=\"wp-block-jetpack-subscriptions wp-block-jetpack-subscriptions__supports-newline wp-block-jetpack-subscriptions__use-newline wp-block-jetpack-subscriptions__show-subs\">[jetpack_subscription_form subscribe_placeholder=\"Enter your email address\" show_subscribers_total=\"true\" button_on_newline=\"true\" submit_button_text=\"Sign Up\" custom_font_size=\"33px\" custom_border_radius=\"8\" custom_border_weight=\"3\" custom_padding=\"18\" custom_spacing=\"10\" submit_button_classes=\"has-33-px-font-size\" email_field_classes=\"has-33-px-font-size\" show_only_email_and_button=\"true\" success_message=\"Volla, you subscribed to our blog!\"]</div>"
+	}
+]

projects/plugins/jetpack/extensions/blocks/subscriptions/test/fixtures/jetpack__subscriptions__deprecated-7.parsed.json

@@ -0,0 +1,22 @@
+[
+	{
+		"blockName": "jetpack/subscriptions",
+		"attrs": {
+			"subscribePlaceholder": "Enter your email address",
+			"showSubscribersTotal": true,
+			"buttonOnNewLine": true,
+			"submitButtonText": "Sign Up",
+			"fontSize": "33px",
+			"customFontSize": "33px",
+			"borderRadius": 8,
+			"borderWeight": 3,
+			"padding": 18,
+			"successMessage": "Volla, you subscribed to our blog!"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-jetpack-subscriptions wp-block-jetpack-subscriptions__supports-newline wp-block-jetpack-subscriptions__use-newline wp-block-jetpack-subscriptions__show-subs\">[jetpack_subscription_form subscribe_placeholder=\"Enter your email address\" show_subscribers_total=\"true\" button_on_newline=\"true\" submit_button_text=\"Sign Up\" custom_font_size=\"33px\" custom_border_radius=\"8\" custom_border_weight=\"3\" custom_padding=\"18\" custom_spacing=\"10\" submit_button_classes=\"has-33-px-font-size\" email_field_classes=\"has-33-px-font-size\" show_only_email_and_button=\"true\" success_message=\"Volla, you subscribed to our blog!\"]</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-jetpack-subscriptions wp-block-jetpack-subscriptions__supports-newline wp-block-jetpack-subscriptions__use-newline wp-block-jetpack-subscriptions__show-subs\">[jetpack_subscription_form subscribe_placeholder=\"Enter your email address\" show_subscribers_total=\"true\" button_on_newline=\"true\" submit_button_text=\"Sign Up\" custom_font_size=\"33px\" custom_border_radius=\"8\" custom_border_weight=\"3\" custom_padding=\"18\" custom_spacing=\"10\" submit_button_classes=\"has-33-px-font-size\" email_field_classes=\"has-33-px-font-size\" show_only_email_and_button=\"true\" success_message=\"Volla, you subscribed to our blog!\"]</div>\n"
+		]
+	}
+]

projects/plugins/jetpack/extensions/blocks/subscriptions/test/fixtures/jetpack__subscriptions__deprecated-7.serialized.html

@@ -0,0 +1 @@
+<!-- wp:jetpack/subscriptions {"subscribePlaceholder":"Enter your email address","showSubscribersTotal":true,"buttonOnNewLine":true,"submitButtonText":"Sign Up","fontSize":"33px","customFontSize":"33px","borderRadius":8,"borderWeight":3,"padding":18,"successMessage":"Volla, you subscribed to our blog!"} /-->