Merge pull request #8967 from google/infra/8826-followup-fix-resolve-…

…selects

Replace __experimentalResolveSelect with resolveSelect.

assets/js/modules/analytics-4/components/audience-segmentation/dashboard/AudienceSelectionPanel/ErrorNotice.js

@@ -25,7 +25,7 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import Data from 'googlesitekit-data';
+import { useSelect, useDispatch } from 'googlesitekit-data';
 import { CORE_SITE } from '../../../../../../googlesitekit/datastore/site/constants';
 import { MODULES_ANALYTICS_4 } from '../../../../datastore/constants';
 import { isInsufficientPermissionsError } from '../../../../../../util/errors';
@@ -34,8 +34,6 @@ import ReportErrorActions from '../../../../../../components/ReportErrorActions'
 import RequestAccessButton from './RequestAccessButton';
 import RetryButton from './RetryButton';
 
-const { useSelect, useDispatch } = Data;
-
 export default function ErrorNotice() {
 	const syncAvailableAudiencesError = useSelect( ( select ) =>
 		select( MODULES_ANALYTICS_4 ).getErrorForAction(

assets/js/modules/analytics-4/datastore/audiences.js

@@ -304,9 +304,7 @@ const baseActions = {
 			} );
 
 			yield commonActions.await(
-				__experimentalResolveSelect(
-					MODULES_ANALYTICS_4
-				).getAudienceSettings()
+				resolveSelect( MODULES_ANALYTICS_4 ).getAudienceSettings()
 			);
 
 			if ( failedAudiencesToRetry.length > 0 ) {

assets/js/modules/reader-revenue-manager/index.js

@@ -57,9 +57,7 @@ export const registerModule = isRrmModuleEnabled( ( modules ) => {
 		],
 		checkRequirements: async ( registry ) => {
 			// Ensure the site info is resolved to get the home URL.
-			await registry
-				.__experimentalResolveSelect( CORE_SITE )
-				.getSiteInfo();
+			await registry.resolveSelect( CORE_SITE ).getSiteInfo();
 			const homeURL = registry.select( CORE_SITE ).getHomeURL();
 
 			if ( isURLUsingHTTPS( homeURL ) ) {