Reset my-jetpack from trunk

Automattic · Jul 22, 2024 · bb90514 · bb90514
1 parent 2c677a3
commit bb90514
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/projects/packages/my-jetpack/_inc/hooks/use-my-jetpack-connection/index.ts b/projects/packages/my-jetpack/_inc/hooks/use-my-jetpack-connection/index.ts
@@ -1,7 +1,7 @@
 import { useConnection } from '@automattic/jetpack-connection';
-import { getSiteData } from '@automattic/jetpack-initial-state';
 import {
 	getMyJetpackWindowInitialState,
+	getMyJetpackWindowRestState,
 	getMyJetpackWindowConnectionState,
 } from '../../data/utils/get-my-jetpack-window-state';
 /**
@@ -24,18 +24,17 @@ interface MyJetpackConnection {
 }
 
 const useMyJetpackConnection = (): MyJetpackConnection => {
-	const { rest_root, rest_nonce } = getSiteData();
-
+	const { apiRoot, apiNonce } = getMyJetpackWindowRestState();
 	const { topJetpackMenuItemUrl, blogID } = getMyJetpackWindowInitialState();
-	const connectionData = useConnection( { apiRoot: rest_root, apiNonce: rest_nonce } );
+	const connectionData = useConnection( { apiRoot, apiNonce } );
 	const { registrationNonce } = getMyJetpackWindowConnectionState();
 
 	// Alias: https://github.com/Automattic/jetpack/blob/trunk/projects/packages/connection/src/class-rest-connector.php/#L315
 	const isSiteConnected = connectionData.isRegistered;
 
 	return {
-		apiNonce: rest_nonce,
-		apiRoot: rest_root,
+		apiNonce,
+		apiRoot,
 		blogID,
 		registrationNonce,
 		...connectionData,

diff --git a/projects/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json
@@ -29,7 +29,6 @@
 		"@automattic/jetpack-boost-score-api": "workspace:*",
 		"@automattic/jetpack-components": "workspace:*",
 		"@automattic/jetpack-connection": "workspace:*",
-		"@automattic/jetpack-initial-state": "workspace:*",
 		"@automattic/jetpack-licensing": "workspace:*",
 		"@tanstack/react-query": "5.20.5",
 		"@wordpress/api-fetch": "7.2.0",