Merge pull request #647 from newfold-labs/update/js-utility-ui-analytics

Update js-utility-ui-analytics source and imports

Author: circlecube

package-lock.json

@@ -29,9 +29,11 @@
         "test:unit": "npx wp-env run phpunit 'phpunit -c /var/www/html/wp-content/plugins//phpunit.xml --verbose'"
     },
     "dependencies": {
-        "@newfold-labs/js-utility-ui-analytics": "1.2.0",
-        "@newfold-labs/wp-module-facebook": "^1.0.9",
+        "@newfold/js-utility-ui-analytics": "1.3.1",
+        "@newfold/wp-module-facebook": "^1.1.2",
         "@sentry/react": "^8.9.2",
+        "@wordpress/api-fetch": "^7.17.0",
+        "@wordpress/data": "^10.17.0",
         "@wordpress/interface": "^5.25.0",
         "@wordpress/style-engine": "^0.11.0",
         "bytes": "^3.1.2",

package.json

@@ -5,7 +5,7 @@ import { useSelect, useDispatch } from '@wordpress/data';
 import { Button, ButtonGroup, Modal } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
 import classNames from 'classnames';
-import { HiiveAnalytics } from '@newfold-labs/js-utility-ui-analytics';
+import { HiiveAnalytics } from '@newfold/js-utility-ui-analytics';
 
 import { setFlow } from '../../utils/api/flow';
 import { store as nfdOnboardingStore } from '../../store';

src/OnboardingSPA/components/ExitToWordPress/index.js

@@ -22,7 +22,7 @@ import { stepSiteGenMigration } from '../../../steps/SiteGen/Migration/step';
 import { useWPSettings as getWPSettings } from '../../../steps/Ecommerce/useWPSettings';
 
 // classes
-import { HiiveAnalytics } from '@newfold-labs/js-utility-ui-analytics';
+import { HiiveAnalytics } from '@newfold/js-utility-ui-analytics';
 import themeToggleHOC from '../themeToggleHOC';
 import { init as initializePlugins } from '../../../utils/api/plugins';
 import { init as initializeThemes } from '../../../utils/api/themes';
@@ -389,12 +389,16 @@ const SiteBuild = () => {
 	const trackInstaWpMigrationEvent = () => {
 		if ( currentStep?.path === stepSiteGenMigration?.path ) {
 			if ( instaWpMigrationUrl ) {
-				getWPSettings().then( ( res ) => sendOnboardingEvent(
-					new OnboardingEvent(
-						res.nfd_migrate_site ? ACTION_MFE_MIGRATION_INITIATED : ACTION_MIGRATION_INITIATED,
-						instaWpMigrationUrl
+				getWPSettings().then( ( res ) =>
+					sendOnboardingEvent(
+						new OnboardingEvent(
+							res.nfd_migrate_site
+								? ACTION_MFE_MIGRATION_INITIATED
+								: ACTION_MIGRATION_INITIATED,
+							instaWpMigrationUrl
+						)
 					)
-				) );
+				);
 			}
 		}
 	};

src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteBuild/index.js

@@ -3,7 +3,7 @@ import { memo } from '@wordpress/element';
 import { Button } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { useLocation, useNavigate } from 'react-router-dom';
-import { HiiveAnalytics } from '@newfold-labs/js-utility-ui-analytics';
+import { HiiveAnalytics } from '@newfold/js-utility-ui-analytics';
 
 import { setFlow } from '../../utils/api/flow';
 import { store as nfdOnboardingStore } from '../../store';

src/OnboardingSPA/components/SkipButton/index.js

@@ -5,7 +5,7 @@ import { getFragment } from '@wordpress/url';
 
 // Third-party
 import { useLocation } from 'react-router-dom';
-import { HiiveAnalytics } from '@newfold-labs/js-utility-ui-analytics';
+import { HiiveAnalytics } from '@newfold/js-utility-ui-analytics';
 
 // Classes and functions
 import { switchFlow } from '../../../utils/api/flow';

src/OnboardingSPA/components/StateHandlers/Flow/index.js

@@ -5,7 +5,7 @@ import { useViewportMatch } from '@wordpress/compose';
 
 // Third-party
 import { useNavigate } from 'react-router-dom';
-import { FacebookConnectButton } from '@newfold-labs/wp-module-facebook';
+import { FacebookConnectButton } from '@newfold/wp-module-facebook';
 
 // Classes and functions
 import getContents from './contents';

src/OnboardingSPA/steps/SiteGen/SocialMedia/index.js

@@ -1,4 +1,4 @@
-import { HiiveEvent } from '@newfold-labs/js-utility-ui-analytics';
+import { HiiveEvent } from '@newfold/js-utility-ui-analytics';
 import { getLabelKeyFromAction } from '.';
 import { CATEGORY } from './constants';
 

src/OnboardingSPA/utils/analytics/hiive/OnboardingEvent.js

@@ -1,4 +1,6 @@
-import { HiiveAnalytics } from '@newfold-labs/js-utility-ui-analytics';
+import { HiiveAnalytics } from '@newfold/js-utility-ui-analytics';
+import { default as wpData } from '@wordpress/data';
+import { default as wpApiFetch } from '@wordpress/api-fetch';
 import { ACTION_TO_LABEL_KEY_MAP } from './constants';
 
 export const trackOnboardingEvent = ( onboardingEvent ) => {
@@ -16,4 +18,10 @@ export const getLabelKeyFromAction = ( action ) => {
 	return undefined;
 };
 
+// passing dependencies to HiiveAnalytics solely for build purposes
+HiiveAnalytics.dependencies = {
+	wpData,
+	wpApiFetch,
+};
+
 export * from './OnboardingEvent';

src/OnboardingSPA/utils/analytics/hiive/index.js

@@ -6,7 +6,7 @@ import { registerCoreBlocks } from '@wordpress/block-library';
 
 // Classes and functions
 import initializeNFDOnboarding from './OnboardingSPA';
-import { HiiveAnalytics } from '@newfold-labs/js-utility-ui-analytics';
+import { HiiveAnalytics } from '@newfold/js-utility-ui-analytics';
 import { onboardingRestURL } from './OnboardingSPA/utils/api/common';
 import { isEnvironmentCypress } from './OnboardingSPA/utils';
 import * as Sentry from '@sentry/react';