@automattic/jetpack-connection 0.34.1 → 0.35.0

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ### This is a list detailing changes for the Jetpack RNA Connection Component releases.
 
+## [0.35.0] - 2024-08-13
+### Added
+- Updated the connection initial state to fallback on the new consolidated Jetpack script data [#38825]
+
+## [0.34.2] - 2024-08-09
+### Added
+- React 19 compatibility: Making sure useRef includes an argument. [#38765]
+
+### Removed
+- Tests: Removed react-test-renderer. [#38755]
+
 ## [0.34.1] - 2024-07-22
 ### Added
 - Display the proper error message for suspended sites on site registration. [#38359]
@@ -805,6 +816,8 @@
 - `Main` and `ConnectUser` components added.
 - `JetpackRestApiClient` API client added.
 
+[0.35.0]: https://github.com/Automattic/jetpack-connection-js/compare/v0.34.2...v0.35.0
+[0.34.2]: https://github.com/Automattic/jetpack-connection-js/compare/v0.34.1...v0.34.2
 [0.34.1]: https://github.com/Automattic/jetpack-connection-js/compare/v0.34.0...v0.34.1
 [0.34.0]: https://github.com/Automattic/jetpack-connection-js/compare/v0.33.19...v0.34.0
 [0.33.19]: https://github.com/Automattic/jetpack-connection-js/compare/v0.33.18...v0.33.19

package/components/in-place-connection/index.jsx

@@ -34,8 +34,8 @@ const InPlaceConnection = props => {
 	} = props;
 	let { height = '300' } = props;
 
-	const iframeWrapRef = useRef();
-	const iframeRef = useRef();
+	const iframeWrapRef = useRef( undefined );
+	const iframeRef = useRef( undefined );
 
 	/**
 	 * Handles messages received from inside the iframe.

package/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,

package/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':

package/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;
 

package/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.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-connection",
-	"version": "0.34.1",
+	"version": "0.35.0",
 	"description": "Jetpack Connection Component",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/connection/#readme",
 	"bugs": {
@@ -16,8 +16,9 @@
 	"dependencies": {
 		"@automattic/jetpack-analytics": "^0.1.29",
 		"@automattic/jetpack-api": "^0.17.9",
-		"@automattic/jetpack-components": "^0.55.0",
+		"@automattic/jetpack-components": "^0.55.6",
 		"@automattic/jetpack-config": "^0.1.24",
+		"@automattic/jetpack-script-data": "^0.1.1",
 		"@wordpress/base-styles": "5.2.0",
 		"@wordpress/browserslist-config": "6.2.0",
 		"@wordpress/components": "28.2.0",
@@ -41,8 +42,7 @@
 		"jest": "29.7.0",
 		"jest-environment-jsdom": "29.7.0",
 		"react": "18.3.1",
-		"react-dom": "18.3.1",
-		"react-test-renderer": "18.3.1"
+		"react-dom": "18.3.1"
 	},
 	"peerDependencies": {
 		"react": "^18.0.0",

package/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(