Connection: Update the connection initial state to fallback on the ne…

…w consolidated Jetpack script data (#38825)

* Add initial state to the consolidated jetpack script data

* Add script-data as a dependency to connection package

* Fallback to the consolidated initial state in JS components

* Add changelog

* Simplify conditionals

* Fix up versions

projects/js-packages/connection/changelog/update-connection-initial-state

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Updated the connection initial state to fallback on the new consolidated Jetpack script data

projects/js-packages/connection/components/use-connection/index.jsx

@@ -1,9 +1,10 @@
 import restApi from '@automattic/jetpack-api';
+import { getScriptData } from '@automattic/jetpack-script-data';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { useEffect } from 'react';
 import { STORE_ID } from '../../state/store';
 
-const initialState = window?.JP_CONNECTION_INITIAL_STATE ? window.JP_CONNECTION_INITIAL_STATE : {};
+const initialState = window?.JP_CONNECTION_INITIAL_STATE || getScriptData()?.connection || {};
 
 export default ( {
 	registrationNonce = initialState.registrationNonce,

projects/js-packages/connection/helpers/get-calypso-origin.ts

@@ -1,11 +1,15 @@
+import { getScriptData } from '@automattic/jetpack-script-data';
+
 /**
  * Get the Calypso origin based on the development environment.
  *
  * @returns {string} The Calypso url origin.
  */
 export default function getCalypsoOrigin() {
-	const calypsoEnv =
-		typeof window !== 'undefined' && window?.JP_CONNECTION_INITIAL_STATE?.calypsoEnv;
+	const calypsoEnv = (
+		( typeof window !== 'undefined' && window?.JP_CONNECTION_INITIAL_STATE ) ||
+		getScriptData()?.connection
+	)?.calypsoEnv;
 
 	switch ( calypsoEnv ) {
 		case 'development':

projects/js-packages/connection/hooks/use-product-checkout-workflow/index.jsx

@@ -1,5 +1,6 @@
 import restApi from '@automattic/jetpack-api';
 import { getCalypsoOrigin } from '@automattic/jetpack-connection';
+import { getScriptData } from '@automattic/jetpack-script-data';
 import { useDispatch, useSelect } from '@wordpress/data';
 import debugFactory from 'debug';
 import { useEffect, useState, useMemo } from 'react';
@@ -13,7 +14,7 @@ const {
 	apiRoot,
 	apiNonce,
 	siteSuffix: defaultSiteSuffix,
-} = window?.JP_CONNECTION_INITIAL_STATE ? window.JP_CONNECTION_INITIAL_STATE : {};
+} = window?.JP_CONNECTION_INITIAL_STATE || getScriptData()?.connection || {};
 const defaultAdminUrl =
 	typeof window !== 'undefined' ? window?.myJetpackInitialState?.adminUrl : null;
 

projects/js-packages/connection/hooks/use-restore-connection/index.jsx

@@ -1,11 +1,11 @@
 import restApi from '@automattic/jetpack-api';
+import { getScriptData } from '@automattic/jetpack-script-data';
 import { useDispatch } from '@wordpress/data';
 import { useEffect, useState } from 'react';
 import { STORE_ID } from '../../state/store';
 
-const { apiRoot, apiNonce } = window?.JP_CONNECTION_INITIAL_STATE
-	? window.JP_CONNECTION_INITIAL_STATE
-	: {};
+const { apiRoot, apiNonce } =
+	window?.JP_CONNECTION_INITIAL_STATE || getScriptData()?.connection || {};
 
 /**
  * Restore connection hook.

projects/js-packages/connection/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-connection",
-	"version": "0.34.2",
+	"version": "0.35.0-alpha",
 	"description": "Jetpack Connection Component",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/connection/#readme",
 	"bugs": {
@@ -18,6 +18,7 @@
 		"@automattic/jetpack-api": "workspace:*",
 		"@automattic/jetpack-components": "workspace:*",
 		"@automattic/jetpack-config": "workspace:*",
+		"@automattic/jetpack-script-data": "workspace:*",
 		"@wordpress/base-styles": "5.2.0",
 		"@wordpress/browserslist-config": "6.2.0",
 		"@wordpress/components": "28.2.0",

projects/js-packages/connection/state/store.jsx

@@ -1,5 +1,6 @@
 /* eslint-disable no-console */
 
+import { getScriptData } from '@automattic/jetpack-script-data';
 import actions from './actions';
 import controls from './controls';
 import reducer from './reducers';
@@ -8,7 +9,7 @@ import selectors from './selectors';
 import storeHolder from './store-holder';
 import STORE_ID from './store-id';
 
-const initialState = window.JP_CONNECTION_INITIAL_STATE;
+const initialState = window.JP_CONNECTION_INITIAL_STATE || getScriptData()?.connection;
 
 if ( ! initialState ) {
 	console.error(

projects/packages/connection/changelog/update-connection-initial-state

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Updated the connection initial state to fallback on the new consolidated Jetpack script data

projects/packages/connection/composer.json

@@ -70,7 +70,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-trunk": "2.11.x-dev"
+			"dev-trunk": "2.12.x-dev"
 		},
 		"dependencies": {
 			"test-only": [

projects/packages/connection/src/class-initial-state.php

@@ -39,6 +39,18 @@ private static function get_data() {
 		);
 	}
 
+	/**
+	 * Set the connection script data.
+	 *
+	 * @param array $data The script data.
+	 */
+	public static function set_connection_script_data( $data ) {
+
+		$data['connection'] = self::get_data();
+
+		return $data;
+	}
+
 	/**
 	 * Render the initial state into a JavaScript variable.
 	 *

projects/packages/connection/src/class-manager.php

@@ -155,6 +155,8 @@ public static function configure() {
 
 		// Initial Partner management.
 		Partner::init();
+
+		add_filter( 'jetpack_admin_js_script_data', array( Initial_State::class, 'set_connection_script_data' ), 10, 1 );
 	}
 
 	/**

projects/packages/connection/src/class-package-version.php

@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '2.11.4';
+	const PACKAGE_VERSION = '2.12.0-alpha';
 
 	const PACKAGE_SLUG = 'connection';
 

projects/plugins/automattic-for-agencies-client/changelog/update-connection-initial-state

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+

projects/plugins/backup/changelog/update-connection-initial-state

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+

projects/plugins/boost/changelog/update-connection-initial-state

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+

projects/plugins/inspect/changelog/update-connection-initial-state

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+

projects/plugins/jetpack/changelog/update-connection-initial-state

@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Updated composer.lock.
+
+

projects/plugins/migration/changelog/update-connection-initial-state

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+

projects/plugins/mu-wpcom-plugin/changelog/update-connection-initial-state

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+

projects/plugins/protect/changelog/update-connection-initial-state

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+

projects/plugins/protect/composer.json

@@ -79,6 +79,6 @@
 			"automattic/jetpack-autoloader": true,
 			"automattic/jetpack-composer-plugin": true
 		},
-		"autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_protectⓥ3_0_0_beta"
+		"autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_protectⓥ3_0_1_alpha"
 	}
 }

projects/plugins/protect/jetpack-protect.php

@@ -3,7 +3,7 @@
  * Plugin Name: Jetpack Protect
  * Plugin URI: https://wordpress.org/plugins/jetpack-protect
  * Description: Security tools that keep your site safe and sound, from posts to plugins.
- * Version: 3.0.0-beta
+ * Version: 3.0.1-alpha
  * Author: Automattic - Jetpack Security team
  * Author URI: https://jetpack.com/protect/
  * License: GPLv2 or later
@@ -32,7 +32,7 @@
 	exit;
 }
 
-define( 'JETPACK_PROTECT_VERSION', '3.0.0-beta' );
+define( 'JETPACK_PROTECT_VERSION', '3.0.1-alpha' );
 define( 'JETPACK_PROTECT_DIR', plugin_dir_path( __FILE__ ) );
 define( 'JETPACK_PROTECT_ROOT_FILE', __FILE__ );
 define( 'JETPACK_PROTECT_ROOT_FILE_RELATIVE_PATH', plugin_basename( __FILE__ ) );

projects/plugins/search/changelog/update-connection-initial-state

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+