From 925c58d69fabf5822ef6b8149661cc1ff65d48fa Mon Sep 17 00:00:00 2001 From: Sergey Mitroshin Date: Fri, 28 Jun 2024 19:39:56 -0400 Subject: [PATCH] Google Analytics: display deprecation notices (#38078) Display Google Analytics deprecation notice on non-Jetpack admin pages. --- .../hooks/use-notification-watcher/index.ts | 2 + .../use-deprecate-feature-notice.ts | 47 +++++ .../changelog/add-ga-deprecation-notice | 4 + projects/packages/my-jetpack/composer.json | 2 +- projects/packages/my-jetpack/package.json | 2 +- .../my-jetpack/src/class-initializer.php | 2 +- .../changelog/add-ga-deprecation-notice | 5 + projects/plugins/backup/composer.json | 2 +- projects/plugins/backup/composer.lock | 4 +- projects/plugins/backup/jetpack-backup.php | 2 +- .../boost/changelog/add-ga-deprecation-notice | 5 + projects/plugins/boost/composer.lock | 4 +- .../components/jetpack-notices/index.jsx | 29 ++- .../components/settings-card/style.scss | 18 +- .../_inc/client/traffic/google-analytics.jsx | 18 ++ .../jetpack/_inc/client/traffic/index.jsx | 27 ++- projects/plugins/jetpack/_inc/deprecate.js | 17 ++ .../changelog/add-ga-deprecation-notice | 4 + projects/plugins/jetpack/class.jetpack.php | 3 + projects/plugins/jetpack/composer.lock | 4 +- .../plugins/jetpack/src/class-deprecate.php | 166 ++++++++++++++++++ .../changelog/add-ga-deprecation-notice | 5 + projects/plugins/migration/composer.lock | 4 +- .../changelog/add-ga-deprecation-notice | 5 + projects/plugins/protect/composer.lock | 4 +- .../changelog/add-ga-deprecation-notice | 5 + projects/plugins/search/composer.lock | 4 +- .../changelog/add-ga-deprecation-notice | 5 + projects/plugins/social/composer.lock | 4 +- .../changelog/add-ga-deprecation-notice | 5 + projects/plugins/starter-plugin/composer.lock | 4 +- .../changelog/add-ga-deprecation-notice | 5 + projects/plugins/videopress/composer.lock | 4 +- 33 files changed, 392 insertions(+), 29 deletions(-) create mode 100644 projects/packages/my-jetpack/_inc/hooks/use-notification-watcher/use-deprecate-feature-notice.ts create mode 100644 projects/packages/my-jetpack/changelog/add-ga-deprecation-notice create mode 100644 projects/plugins/backup/changelog/add-ga-deprecation-notice create mode 100644 projects/plugins/boost/changelog/add-ga-deprecation-notice create mode 100644 projects/plugins/jetpack/_inc/deprecate.js create mode 100644 projects/plugins/jetpack/changelog/add-ga-deprecation-notice create mode 100644 projects/plugins/jetpack/src/class-deprecate.php create mode 100644 projects/plugins/migration/changelog/add-ga-deprecation-notice create mode 100644 projects/plugins/protect/changelog/add-ga-deprecation-notice create mode 100644 projects/plugins/search/changelog/add-ga-deprecation-notice create mode 100644 projects/plugins/social/changelog/add-ga-deprecation-notice create mode 100644 projects/plugins/starter-plugin/changelog/add-ga-deprecation-notice create mode 100644 projects/plugins/videopress/changelog/add-ga-deprecation-notice diff --git a/projects/packages/my-jetpack/_inc/hooks/use-notification-watcher/index.ts b/projects/packages/my-jetpack/_inc/hooks/use-notification-watcher/index.ts index 3a60928d487b2..c2cccc2fa70eb 100644 --- a/projects/packages/my-jetpack/_inc/hooks/use-notification-watcher/index.ts +++ b/projects/packages/my-jetpack/_inc/hooks/use-notification-watcher/index.ts @@ -1,6 +1,7 @@ import { getMyJetpackWindowInitialState } from '../../data/utils/get-my-jetpack-window-state'; import useBadInstallNotice from './use-bad-install-notice'; import useConnectionErrorsNotice from './use-connection-errors-notice'; +import useDeprecateFeatureNotice from './use-deprecate-feature-notice'; import useSiteConnectionNotice from './use-site-connection-notice'; const useNotificationWatcher = () => { @@ -9,6 +10,7 @@ const useNotificationWatcher = () => { useBadInstallNotice( redBubbleAlerts ); useSiteConnectionNotice( redBubbleAlerts ); useConnectionErrorsNotice(); + useDeprecateFeatureNotice( redBubbleAlerts ); }; export default useNotificationWatcher; diff --git a/projects/packages/my-jetpack/_inc/hooks/use-notification-watcher/use-deprecate-feature-notice.ts b/projects/packages/my-jetpack/_inc/hooks/use-notification-watcher/use-deprecate-feature-notice.ts new file mode 100644 index 0000000000000..4d4ed2f5e49fb --- /dev/null +++ b/projects/packages/my-jetpack/_inc/hooks/use-notification-watcher/use-deprecate-feature-notice.ts @@ -0,0 +1,47 @@ +import { useContext, useEffect } from 'react'; +import { NOTICE_PRIORITY_MEDIUM } from '../../context/constants'; +import { NoticeContext } from '../../context/notices/noticeContext'; +import type { NoticeOptions } from '../../context/notices/types'; + +type RedBubbleAlerts = Window[ 'myJetpackInitialState' ][ 'redBubbleAlerts' ]; + +const useDeprecateFeatureNotice = ( redBubbleAlerts: RedBubbleAlerts ) => { + const { setNotice } = useContext( NoticeContext ); + + useEffect( () => { + const deprecateAlerts = Object.keys( redBubbleAlerts ).filter( key => + key.endsWith( '-deprecate-feature' ) + ) as Array< `${ string }-deprecate-feature` >; + + if ( deprecateAlerts.length === 0 ) { + return; + } + + const alert = redBubbleAlerts[ deprecateAlerts[ 0 ] ]; + const { text, link } = alert.data; + + const onCtaClick = () => { + window.open( link.url ); + }; + + const noticeOptions: NoticeOptions = { + id: 'deprecate-feature-notice', + level: 'error', + actions: [ + { + label: link.label, + onClick: onCtaClick, + noDefaultClasses: true, + }, + ], + priority: NOTICE_PRIORITY_MEDIUM, + }; + + setNotice( { + message: text, + options: noticeOptions, + } ); + }, [ redBubbleAlerts, setNotice ] ); +}; + +export default useDeprecateFeatureNotice; diff --git a/projects/packages/my-jetpack/changelog/add-ga-deprecation-notice b/projects/packages/my-jetpack/changelog/add-ga-deprecation-notice new file mode 100644 index 0000000000000..9db29b23e4841 --- /dev/null +++ b/projects/packages/my-jetpack/changelog/add-ga-deprecation-notice @@ -0,0 +1,4 @@ +Significance: minor +Type: added + +Add the Google Analytics deprecation notice. diff --git a/projects/packages/my-jetpack/composer.json b/projects/packages/my-jetpack/composer.json index c9c9c21a46c4b..5e0d856f45523 100644 --- a/projects/packages/my-jetpack/composer.json +++ b/projects/packages/my-jetpack/composer.json @@ -79,7 +79,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "4.26.x-dev" + "dev-trunk": "4.27.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json index 6c806df43e363..f7e78755b3aeb 100644 --- a/projects/packages/my-jetpack/package.json +++ b/projects/packages/my-jetpack/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-my-jetpack", - "version": "4.26.1-alpha", + "version": "4.27.0-alpha", "description": "WP Admin page with information and configuration shared among all Jetpack stand-alone plugins", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/my-jetpack/#readme", "bugs": { diff --git a/projects/packages/my-jetpack/src/class-initializer.php b/projects/packages/my-jetpack/src/class-initializer.php index c9cd146a76ff9..ca3cc5a53a681 100644 --- a/projects/packages/my-jetpack/src/class-initializer.php +++ b/projects/packages/my-jetpack/src/class-initializer.php @@ -37,7 +37,7 @@ class Initializer { * * @var string */ - const PACKAGE_VERSION = '4.26.1-alpha'; + const PACKAGE_VERSION = '4.27.0-alpha'; /** * HTML container ID for the IDC screen on My Jetpack page. diff --git a/projects/plugins/backup/changelog/add-ga-deprecation-notice b/projects/plugins/backup/changelog/add-ga-deprecation-notice new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/backup/changelog/add-ga-deprecation-notice @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/backup/composer.json b/projects/plugins/backup/composer.json index 4641d975108f3..88afbdabc0a42 100644 --- a/projects/plugins/backup/composer.json +++ b/projects/plugins/backup/composer.json @@ -34,7 +34,7 @@ "minimum-stability": "dev", "prefer-stable": true, "config": { - "autoloader-suffix": "9559eef123208b7d1b9c15b978567267_backupⓥ2_7", + "autoloader-suffix": "9559eef123208b7d1b9c15b978567267_backupⓥ2_8_alpha", "allow-plugins": { "automattic/jetpack-autoloader": true, "automattic/jetpack-composer-plugin": true diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock index 8750021b09731..03daa2ed6c2e7 100644 --- a/projects/plugins/backup/composer.lock +++ b/projects/plugins/backup/composer.lock @@ -1088,7 +1088,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "8af97f65a2b748d65ebc013886022933fc6dc614" + "reference": "e423495d1048ef659f3277bbd74ca1d5c57a2a8c" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1123,7 +1123,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "4.26.x-dev" + "dev-trunk": "4.27.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/plugins/backup/jetpack-backup.php b/projects/plugins/backup/jetpack-backup.php index 1b35b0b85515c..a5be4e6f37a2f 100644 --- a/projects/plugins/backup/jetpack-backup.php +++ b/projects/plugins/backup/jetpack-backup.php @@ -4,7 +4,7 @@ * Plugin Name: Jetpack VaultPress Backup * Plugin URI: https://jetpack.com/jetpack-backup * Description: Easily restore or download a backup of your site from a specific moment in time. - * Version: 2.7 + * Version: 2.8-alpha * Author: Automattic - Jetpack Backup team * Author URI: https://jetpack.com/ * License: GPLv2 or later diff --git a/projects/plugins/boost/changelog/add-ga-deprecation-notice b/projects/plugins/boost/changelog/add-ga-deprecation-notice new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/boost/changelog/add-ga-deprecation-notice @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock index ff538903c2a4b..a3b704166282b 100644 --- a/projects/plugins/boost/composer.lock +++ b/projects/plugins/boost/composer.lock @@ -1007,7 +1007,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "8af97f65a2b748d65ebc013886022933fc6dc614" + "reference": "e423495d1048ef659f3277bbd74ca1d5c57a2a8c" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1042,7 +1042,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "4.26.x-dev" + "dev-trunk": "4.27.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/plugins/jetpack/_inc/client/components/jetpack-notices/index.jsx b/projects/plugins/jetpack/_inc/client/components/jetpack-notices/index.jsx index 81487d978e058..3f4312f40cca8 100644 --- a/projects/plugins/jetpack/_inc/client/components/jetpack-notices/index.jsx +++ b/projects/plugins/jetpack/_inc/client/components/jetpack-notices/index.jsx @@ -1,5 +1,6 @@ import { JETPACK_CONTACT_BETA_SUPPORT } from 'constants/urls'; import { getRedirectUrl } from '@automattic/jetpack-components'; +import { ExternalLink } from '@wordpress/components'; import { createInterpolateElement } from '@wordpress/element'; import { __, sprintf } from '@wordpress/i18n'; import ConnectionBanner from 'components/connection-banner'; @@ -29,10 +30,12 @@ import { userIsSubscriber, getConnectionErrors, getSiteAdminUrl, + isWoASite, } from 'state/initial-state'; import { getLicensingError, clearLicensingError } from 'state/licensing'; -import { getModule } from 'state/modules'; +import { getModule, isModuleActivated } from 'state/modules'; import { getSiteDataErrors } from 'state/site'; +import { isFetchingPluginsData, isPluginActive } from 'state/site/plugins'; import { StartFreshDeprecationWarning } from '../../writing/custom-css'; import DismissableNotices from './dismissable'; import JetpackConnectionErrors from './jetpack-connection-errors'; @@ -242,6 +245,22 @@ class JetpackNotices extends React.Component { ) } + { this.props.showGoogleAnalyticsNotice && ( + +
+ { __( + "Jetpack's Google Analytics feature will be removed on August 6, 2024.", + 'jetpack' + ) } +
+ + { __( + 'Read this document for details and how to keep tracking visits with Google Analytics', + 'jetpack' + ) } + + + ) } ); } @@ -268,6 +287,14 @@ export default connect( hasConnectedOwner: hasConnectedOwner( state ), siteAdminUrl: getSiteAdminUrl( state ), startFreshEnabled: !! getModule( state, 'custom-css' )?.options?.replace, + showGoogleAnalyticsNotice: + isModuleActivated( state, 'google-analytics' ) && + ! isWoASite( state ) && + ! isFetchingPluginsData( state ) && + ! isPluginActive( + state, + 'jetpack-legacy-google-analytics/jetpack-legacy-google-analytics.php' + ), }; }, dispatch => { diff --git a/projects/plugins/jetpack/_inc/client/components/settings-card/style.scss b/projects/plugins/jetpack/_inc/client/components/settings-card/style.scss index 56b69f6179b7f..15cf500944692 100644 --- a/projects/plugins/jetpack/_inc/client/components/settings-card/style.scss +++ b/projects/plugins/jetpack/_inc/client/components/settings-card/style.scss @@ -21,7 +21,7 @@ .jp-settings-card__configure-link { display: flex; margin-bottom: 0; - + &:last-child { border-top: 1px solid var( --jp-gray ); } @@ -44,6 +44,20 @@ border-top: 1px solid var( --jp-gray ); } + .dops-notice { + margin-bottom: 0; + + &, .dops-notice__icon-wrapper { + border-radius: 0; + } + + .dops-notice__text { + &, a { + color: var(--jp-white); + } + } + } + .dops-card.is-card-link + .jp-form-settings-group { border-top: 1px solid var( --jp-gray ); } @@ -54,7 +68,7 @@ &:hover { box-shadow: none; - + .dops-banner__title { text-decoration: underline; } diff --git a/projects/plugins/jetpack/_inc/client/traffic/google-analytics.jsx b/projects/plugins/jetpack/_inc/client/traffic/google-analytics.jsx index 638ae4cc19ecf..434c23646a3cc 100644 --- a/projects/plugins/jetpack/_inc/client/traffic/google-analytics.jsx +++ b/projects/plugins/jetpack/_inc/client/traffic/google-analytics.jsx @@ -1,8 +1,10 @@ import { getRedirectUrl } from '@automattic/jetpack-components'; +import { ExternalLink } from '@wordpress/components'; import { createInterpolateElement } from '@wordpress/element'; import { __, _x } from '@wordpress/i18n'; import Card from 'components/card'; import { withModuleSettingsFormHelpers } from 'components/module-settings/with-module-settings-form-helpers'; +import SimpleNotice from 'components/notice'; import SettingsCard from 'components/settings-card'; import SettingsGroup from 'components/settings-group'; import analytics from 'lib/analytics'; @@ -23,6 +25,22 @@ export const GoogleAnalytics = withModuleSettingsFormHelpers( feature={ FEATURE_GOOGLE_ANALYTICS_JETPACK } hideButton > + { this.props.showDeprecationNotice && ( + +
+ { __( + "Jetpack's Google Analytics feature will be removed on August 6, 2024.", + 'jetpack' + ) } +
+ + { __( + 'Read this document for details and how to keep tracking visits with Google Analytics', + 'jetpack' + ) } + + + ) } } { foundAnalytics && ( - + ) } { foundBlaze && } { foundShortlinks && } @@ -111,7 +128,11 @@ export default connect( state => { isOfflineMode: isOfflineMode( state ), isUnavailableInOfflineMode: module_name => isUnavailableInOfflineMode( state, module_name ), isModuleFound: module_name => isModuleFound( state, module_name ), + isModuleActivated: module_name => isModuleActivated( state, module_name ), isSiteConnected: isSiteConnected( state ), + isFetchingPluginsData: isFetchingPluginsData( state ), + isPluginActive: plugin_name => isPluginActive( state, plugin_name ), + isWoASite: isWoASite( state ), lastPostUrl: getLastPostUrl( state ), getModuleOverride: module_name => getModuleOverride( state, module_name ), hasConnectedOwner: hasConnectedOwner( state ), diff --git a/projects/plugins/jetpack/_inc/deprecate.js b/projects/plugins/jetpack/_inc/deprecate.js new file mode 100644 index 0000000000000..4917eeb7d7d42 --- /dev/null +++ b/projects/plugins/jetpack/_inc/deprecate.js @@ -0,0 +1,17 @@ +addEventListener( 'DOMContentLoaded', () => { + const notices = document.getElementsByClassName( 'jetpack-deprecate-dismissible' ); + for ( let i = 0; i < notices.length; ++i ) { + if ( ! notices[ i ].hasAttribute( 'id' ) ) { + continue; + } + + notices[ i ].addEventListener( 'click', event => { + if ( event.target.classList.contains( 'notice-dismiss' ) ) { + document.cookie = + 'jetpack_deprecate_dismissed[' + + notices[ i ].getAttribute( 'id' ) + + ']=1; expires=Fri, 31 Dec 9999 23:59:59 GMT; SameSite=None;'; + } + } ); + } +} ); diff --git a/projects/plugins/jetpack/changelog/add-ga-deprecation-notice b/projects/plugins/jetpack/changelog/add-ga-deprecation-notice new file mode 100644 index 0000000000000..06fefda529791 --- /dev/null +++ b/projects/plugins/jetpack/changelog/add-ga-deprecation-notice @@ -0,0 +1,4 @@ +Significance: minor +Type: other + +Google Analytics: add deprecation notice for non-Jetpack admin pages." diff --git a/projects/plugins/jetpack/class.jetpack.php b/projects/plugins/jetpack/class.jetpack.php index 339f5cdd6a49b..0f93064aaa196 100644 --- a/projects/plugins/jetpack/class.jetpack.php +++ b/projects/plugins/jetpack/class.jetpack.php @@ -28,6 +28,7 @@ use Automattic\Jetpack\Modules; use Automattic\Jetpack\My_Jetpack\Initializer as My_Jetpack_Initializer; use Automattic\Jetpack\Paths; +use Automattic\Jetpack\Plugin\Deprecate; use Automattic\Jetpack\Plugin\Tracking as Plugin_Tracking; use Automattic\Jetpack\Redirect; use Automattic\Jetpack\Status; @@ -861,6 +862,8 @@ function () { // Add 5-star add_filter( 'plugin_row_meta', array( $this, 'add_5_star_review_link' ), 10, 2 ); + + Deprecate::instance(); } /** diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock index b34efbd35dc0c..af3a34c4fb972 100644 --- a/projects/plugins/jetpack/composer.lock +++ b/projects/plugins/jetpack/composer.lock @@ -1914,7 +1914,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "8af97f65a2b748d65ebc013886022933fc6dc614" + "reference": "e423495d1048ef659f3277bbd74ca1d5c57a2a8c" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1949,7 +1949,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "4.26.x-dev" + "dev-trunk": "4.27.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/plugins/jetpack/src/class-deprecate.php b/projects/plugins/jetpack/src/class-deprecate.php new file mode 100644 index 0000000000000..cae7fabc288bc --- /dev/null +++ b/projects/plugins/jetpack/src/class-deprecate.php @@ -0,0 +1,166 @@ +has_notices() ) { + return; + } + + if ( ! wp_script_is( 'jetpack-deprecate', 'registered' ) ) { + wp_register_script( + 'jetpack-deprecate', + Assets::get_file_url_for_environment( '_inc/build/deprecate.min.js', '_inc/deprecate.js' ), + array(), + JETPACK__VERSION, + true + ); + } + + wp_enqueue_script( 'jetpack-deprecate' ); + } + + /** + * Render Google Analytics deprecation notice. + * + * @return void + */ + public function render_admin_notices() { + if ( $this->show_ga_notice() ) { + $support_url = Redirect::get_url( 'jetpack-support-google-analytics' ); + + $this->render_notice( + 'jetpack-ga-admin-notice', + esc_html__( "Jetpack's Google Analytics feature will be removed on August 6, 2024.", 'jetpack' ) + . ' ' . esc_html__( 'Read this document for details and how to keep tracking visits with Google Analytics', 'jetpack' ) . '.' + ); + } + } + + /** + * Add the deprecation notices to My Jetpack. + * + * @param array $slugs Already added bubbles. + * + * @return mixed + */ + public function add_my_jetpack_red_bubbles( $slugs ) { + if ( $this->show_ga_notice() ) { + $slugs['jetpack-google-analytics-deprecate-feature'] = array( + 'data' => array( + 'text' => __( "Jetpack's Google Analytics feature will be removed on August 6, 2024. Read the documentation for details and how to keep tracking visits with Google Analytics.", 'jetpack' ), + 'link' => array( + 'label' => esc_html__( 'See documentation', 'jetpack' ), + 'url' => Redirect::get_url( 'jetpack-support-google-analytics' ), + ), + ), + ); + } + + return $slugs; + } + + /** + * Render the notice. + * + * @param string $id The notice ID. + * @param string $text The notice text. + * @param array $params Additional notice params. + * + * @return void + */ + private function render_notice( $id, $text, $params = array() ) { + if ( ! empty( $_COOKIE['jetpack_deprecate_dismissed'][ $id ] ) ) { + return; + } + + $params['id'] = $id; + + if ( empty( $params['type'] ) ) { + $params['type'] = 'warning'; + } + + if ( empty( $params['dismissible'] ) ) { + $params['dismissible'] = true; + } + + if ( $params['dismissible'] ) { + if ( empty( $params['additional_classes'] ) ) { + $params['additional_classes'] = array(); + } + + $params['additional_classes'][] = 'jetpack-deprecate-dismissible'; + } + + wp_admin_notice( $text, $params ); + } + + /** + * Check if there are any notices to be displayed, so we wouldn't load unnecessary JS. + * + * @return bool + */ + private function has_notices() { + return $this->show_ga_notice(); + } + + /** + * Check if Google Analytics notice should show up. + * + * @return bool + */ + private function show_ga_notice() { + return ( new Modules() )->is_active( 'google-analytics', false ) + && ! is_plugin_active( 'jetpack-legacy-google-analytics/jetpack-legacy-google-analytics.php' ) + && ! ( new Host() )->is_woa_site(); + } +} diff --git a/projects/plugins/migration/changelog/add-ga-deprecation-notice b/projects/plugins/migration/changelog/add-ga-deprecation-notice new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/migration/changelog/add-ga-deprecation-notice @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/migration/composer.lock b/projects/plugins/migration/composer.lock index 9d4af52a422e7..903c8b0950e9f 100644 --- a/projects/plugins/migration/composer.lock +++ b/projects/plugins/migration/composer.lock @@ -1088,7 +1088,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "8af97f65a2b748d65ebc013886022933fc6dc614" + "reference": "e423495d1048ef659f3277bbd74ca1d5c57a2a8c" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1123,7 +1123,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "4.26.x-dev" + "dev-trunk": "4.27.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/plugins/protect/changelog/add-ga-deprecation-notice b/projects/plugins/protect/changelog/add-ga-deprecation-notice new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/protect/changelog/add-ga-deprecation-notice @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock index c7e67bfb753cb..df269136d2920 100644 --- a/projects/plugins/protect/composer.lock +++ b/projects/plugins/protect/composer.lock @@ -1001,7 +1001,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "8af97f65a2b748d65ebc013886022933fc6dc614" + "reference": "e423495d1048ef659f3277bbd74ca1d5c57a2a8c" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -1036,7 +1036,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "4.26.x-dev" + "dev-trunk": "4.27.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/plugins/search/changelog/add-ga-deprecation-notice b/projects/plugins/search/changelog/add-ga-deprecation-notice new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/search/changelog/add-ga-deprecation-notice @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock index 4c031cfccba49..51610853f58f8 100644 --- a/projects/plugins/search/composer.lock +++ b/projects/plugins/search/composer.lock @@ -944,7 +944,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "8af97f65a2b748d65ebc013886022933fc6dc614" + "reference": "e423495d1048ef659f3277bbd74ca1d5c57a2a8c" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -979,7 +979,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "4.26.x-dev" + "dev-trunk": "4.27.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/plugins/social/changelog/add-ga-deprecation-notice b/projects/plugins/social/changelog/add-ga-deprecation-notice new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/social/changelog/add-ga-deprecation-notice @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock index 6d82122e73ad2..2a832e8c19c31 100644 --- a/projects/plugins/social/composer.lock +++ b/projects/plugins/social/composer.lock @@ -944,7 +944,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "8af97f65a2b748d65ebc013886022933fc6dc614" + "reference": "e423495d1048ef659f3277bbd74ca1d5c57a2a8c" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -979,7 +979,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "4.26.x-dev" + "dev-trunk": "4.27.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/plugins/starter-plugin/changelog/add-ga-deprecation-notice b/projects/plugins/starter-plugin/changelog/add-ga-deprecation-notice new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/starter-plugin/changelog/add-ga-deprecation-notice @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock index d73f6e2471b28..9b9007e430f8a 100644 --- a/projects/plugins/starter-plugin/composer.lock +++ b/projects/plugins/starter-plugin/composer.lock @@ -944,7 +944,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "8af97f65a2b748d65ebc013886022933fc6dc614" + "reference": "e423495d1048ef659f3277bbd74ca1d5c57a2a8c" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -979,7 +979,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "4.26.x-dev" + "dev-trunk": "4.27.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php" diff --git a/projects/plugins/videopress/changelog/add-ga-deprecation-notice b/projects/plugins/videopress/changelog/add-ga-deprecation-notice new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/videopress/changelog/add-ga-deprecation-notice @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/videopress/composer.lock b/projects/plugins/videopress/composer.lock index 6a7f847667038..3d3dbfd46f446 100644 --- a/projects/plugins/videopress/composer.lock +++ b/projects/plugins/videopress/composer.lock @@ -944,7 +944,7 @@ "dist": { "type": "path", "url": "../../packages/my-jetpack", - "reference": "8af97f65a2b748d65ebc013886022933fc6dc614" + "reference": "e423495d1048ef659f3277bbd74ca1d5c57a2a8c" }, "require": { "automattic/jetpack-admin-ui": "@dev", @@ -979,7 +979,7 @@ "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}" }, "branch-alias": { - "dev-trunk": "4.26.x-dev" + "dev-trunk": "4.27.x-dev" }, "version-constants": { "::PACKAGE_VERSION": "src/class-initializer.php"