From a2f833e6c61e64f7812cebb49760ef83583936e3 Mon Sep 17 00:00:00 2001 From: arthur Date: Mon, 12 Aug 2024 11:05:35 +0800 Subject: [PATCH 1/3] MU WPCOM: Replace @wordpress/react-i18n with @wordpress/i18n --- .../packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php | 3 ++- .../variants/wpcom/components/wpcom-tour-kit-minimized.tsx | 4 +--- .../variants/wpcom/components/wpcom-tour-kit-rating.tsx | 3 +-- .../wpcom/components/wpcom-tour-kit-step-card-navigation.tsx | 3 +-- .../components/wpcom-tour-kit-step-card-overlay-controls.tsx | 4 +--- .../variants/wpcom/components/wpcom-tour-kit-step-card.tsx | 3 +-- .../wpcom-block-editor-nux/src/sharing-modal/index.tsx | 3 +-- .../src/sharing-modal/suggested-tags.tsx | 3 +-- 8 files changed, 9 insertions(+), 17 deletions(-) diff --git a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php index 5e5c971fe3901..511ca02ce987a 100644 --- a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php +++ b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php @@ -174,7 +174,7 @@ public static function load_etk_features_flags() { define( 'MU_WPCOM_STARTER_PAGE_TEMPLATES', true ); define( 'MU_WPCOM_TAGS_EDUCATION', true ); define( 'MU_WPCOM_BLOCK_DESCRIPTION_LINKS', true ); - define( 'MU_WPCOM_BLOCK_EDITOR_NUX', false ); + define( 'MU_WPCOM_BLOCK_EDITOR_NUX', true ); define( 'MU_WPCOM_POSTS_LIST_BLOCK', true ); define( 'MU_WPCOM_JETPACK_COUNTDOWN_BLOCK', true ); define( 'MU_WPCOM_JETPACK_TIMELINE_BLOCK', true ); @@ -218,6 +218,7 @@ public static function load_etk_features() { require_once __DIR__ . '/features/paragraph-block-placeholder/paragraph-block-placeholder.php'; require_once __DIR__ . '/features/tags-education/tags-education.php'; require_once __DIR__ . '/features/wpcom-block-description-links/wpcom-block-description-links.php'; + require_once __DIR__ . '/features/wpcom-block-editor-nux/class-wpcom-block-editor-nux.php'; require_once __DIR__ . '/features/wpcom-blocks/a8c-posts-list/a8c-posts-list.php'; require_once __DIR__ . '/features/wpcom-blocks/event-countdown/event-countdown.php'; require_once __DIR__ . '/features/wpcom-blocks/timeline/timeline.php'; diff --git a/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-minimized.tsx b/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-minimized.tsx index 1afd5ce37fca4..1e73d6ba41a9d 100644 --- a/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-minimized.tsx +++ b/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-minimized.tsx @@ -1,8 +1,7 @@ import { Button, Flex } from '@wordpress/components'; import { createInterpolateElement } from '@wordpress/element'; -import { sprintf } from '@wordpress/i18n'; +import { __, sprintf } from '@wordpress/i18n'; import { Icon, close } from '@wordpress/icons'; -import { useI18n } from '@wordpress/react-i18n'; import maximize from '../icons/maximize'; import type { MinimizedTourRendererProps } from '../../../types'; @@ -12,7 +11,6 @@ const WpcomTourKitMinimized: React.FunctionComponent< MinimizedTourRendererProps onDismiss, currentStepIndex, } ) => { - const { __ } = useI18n(); const lastStepIndex = steps.length - 1; const page = currentStepIndex + 1; const numberOfPages = lastStepIndex + 1; diff --git a/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-rating.tsx b/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-rating.tsx index 82c20f1410019..eb787d5d5562a 100644 --- a/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-rating.tsx +++ b/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-rating.tsx @@ -1,6 +1,6 @@ import { Button } from '@wordpress/components'; import { useState } from '@wordpress/element'; -import { useI18n } from '@wordpress/react-i18n'; +import { __ } from '@wordpress/i18n'; import clsx from 'clsx'; import { useTourKitContext } from '../../../index'; import thumbsDown from '../icons/thumbs_down'; @@ -12,7 +12,6 @@ const WpcomTourKitRating: React.FunctionComponent = () => { const context = useTourKitContext(); const config = context.config as unknown as WpcomConfig; const tourRating = config.options?.tourRating?.useTourRating?.() ?? tempRating; - const { __ } = useI18n(); let isDisabled = false; diff --git a/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-step-card-navigation.tsx b/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-step-card-navigation.tsx index e324f0b2a4380..3afad4f9ab0d6 100644 --- a/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-step-card-navigation.tsx +++ b/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-step-card-navigation.tsx @@ -1,5 +1,5 @@ import { Button } from '@wordpress/components'; -import { useI18n } from '@wordpress/react-i18n'; +import { __ } from '@wordpress/i18n'; import WpcomTourKitPaginationControl from './wpcom-tour-kit-pagination-control'; import type { WpcomTourStepRendererProps } from '../../../types'; @@ -14,7 +14,6 @@ const WpcomTourKitStepCardNavigation: React.FunctionComponent< Props > = ( { setInitialFocusedElement, steps, } ) => { - const { __ } = useI18n(); const isFirstStep = currentStepIndex === 0; const lastStepIndex = steps.length - 1; diff --git a/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-step-card-overlay-controls.tsx b/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-step-card-overlay-controls.tsx index bfad1e0204dc7..f6523b5786ebd 100644 --- a/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-step-card-overlay-controls.tsx +++ b/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-step-card-overlay-controls.tsx @@ -1,6 +1,6 @@ import { Button, Flex } from '@wordpress/components'; +import { __ } from '@wordpress/i18n'; import { close } from '@wordpress/icons'; -import { useI18n } from '@wordpress/react-i18n'; import minimize from '../icons/minimize'; import type { TourStepRendererProps } from '../../../types'; @@ -13,8 +13,6 @@ const WpcomTourKitStepCardOverlayControls: React.FunctionComponent< Props > = ( onMinimize, onDismiss, } ) => { - const { __ } = useI18n(); - return (
diff --git a/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-step-card.tsx b/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-step-card.tsx index 743d4f1cce9ac..b86e4202c01a1 100644 --- a/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-step-card.tsx +++ b/projects/packages/jetpack-mu-wpcom/src/common/tour-kit/variants/wpcom/components/wpcom-tour-kit-step-card.tsx @@ -1,7 +1,7 @@ import { Button, Card, CardBody, CardFooter, CardMedia } from '@wordpress/components'; import { useViewportMatch } from '@wordpress/compose'; +import { __ } from '@wordpress/i18n'; import { Icon } from '@wordpress/icons'; -import { useI18n } from '@wordpress/react-i18n'; import clsx from 'clsx'; import WpcomTourKitRating from './wpcom-tour-kit-rating'; import WpcomTourKitStepCardNavigation from './wpcom-tour-kit-step-card-navigation'; @@ -18,7 +18,6 @@ const WpcomTourKitStepCard: React.FunctionComponent< WpcomTourStepRendererProps onPreviousStep, setInitialFocusedElement, } ) => { - const { __ } = useI18n(); const lastStepIndex = steps.length - 1; const { descriptions, heading, imgSrc, imgLink } = steps[ currentStepIndex ].meta; const isLastStep = currentStepIndex === lastStepIndex; diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-block-editor-nux/src/sharing-modal/index.tsx b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-block-editor-nux/src/sharing-modal/index.tsx index e94883d699491..1a3e41a658ad4 100644 --- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-block-editor-nux/src/sharing-modal/index.tsx +++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-block-editor-nux/src/sharing-modal/index.tsx @@ -1,9 +1,9 @@ import { Modal, Button } from '@wordpress/components'; import { useDispatch, useSelect } from '@wordpress/data'; import { useEffect, useRef, useState } from '@wordpress/element'; +import { __ } from '@wordpress/i18n'; import { Icon, globe, link as linkIcon } from '@wordpress/icons'; import { store as noticesStore } from '@wordpress/notices'; -import { useI18n } from '@wordpress/react-i18n'; import clsx from 'clsx'; import React from 'react'; import postPublishedImage from '../../../../assets/images/illo-share.svg'; @@ -42,7 +42,6 @@ const SharingModalInner: React.FC = () => { const isDismissedDefault = window?.sharingModalOptions?.isDismissed || false; const { launchpadScreenOption } = window?.launchpadOptions || {}; const { isDismissed, updateIsDismissed } = useSharingModalDismissed( isDismissedDefault ); - const { __ } = useI18n(); const isPrivateBlog = window?.wpcomGutenberg?.blogPublic === '-1'; const { diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-block-editor-nux/src/sharing-modal/suggested-tags.tsx b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-block-editor-nux/src/sharing-modal/suggested-tags.tsx index 8f47b85adb592..52e7fd8cbaa1f 100644 --- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-block-editor-nux/src/sharing-modal/suggested-tags.tsx +++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-block-editor-nux/src/sharing-modal/suggested-tags.tsx @@ -3,8 +3,8 @@ import { Button, FormTokenField } from '@wordpress/components'; import { TokenItem } from '@wordpress/components/build-types/form-token-field/types'; import { useDispatch, useSelect } from '@wordpress/data'; import { useEffect } from '@wordpress/element'; +import { __, _n } from '@wordpress/i18n'; import { store as noticesStore } from '@wordpress/notices'; -import { useI18n } from '@wordpress/react-i18n'; import * as React from 'react'; import { wpcomTrackEvent } from '../../../../common/tracks'; import useAddTagsToPost from './use-add-tags-to-post'; @@ -37,7 +37,6 @@ type SuggestedTagsProps = { * @param props - The props of the component. */ function SuggestedTags( props: SuggestedTagsProps ) { - const { __, _n } = useI18n(); const localeSlug = useLocale(); const { id: postId, meta: postMeta } = useSelect( select => ( select( 'core/editor' ) as CoreEditorPlaceholder ).getCurrentPost(), From 3886c8e8012003a9d3c2acec448c0951b34cac29 Mon Sep 17 00:00:00 2001 From: arthur Date: Mon, 12 Aug 2024 11:42:21 +0800 Subject: [PATCH 2/3] changelog --- .../changelog/fix-wpcom-block-editor-nux-error | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 projects/packages/jetpack-mu-wpcom/changelog/fix-wpcom-block-editor-nux-error diff --git a/projects/packages/jetpack-mu-wpcom/changelog/fix-wpcom-block-editor-nux-error b/projects/packages/jetpack-mu-wpcom/changelog/fix-wpcom-block-editor-nux-error new file mode 100644 index 0000000000000..c7cc55b63aaf9 --- /dev/null +++ b/projects/packages/jetpack-mu-wpcom/changelog/fix-wpcom-block-editor-nux-error @@ -0,0 +1,4 @@ +Significance: patch +Type: fixed + +MU WPCOM: Fix the “page-patterns” plugin has encountered an error and cannot be rendered" From e7614e791fc19b25d60ed739d6916982f05797ca Mon Sep 17 00:00:00 2001 From: arthur Date: Mon, 12 Aug 2024 11:52:19 +0800 Subject: [PATCH 3/3] Fix versions --- projects/packages/jetpack-mu-wpcom/package.json | 2 +- .../packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json index e37c8718446ab..ad97cd97a0a01 100644 --- a/projects/packages/jetpack-mu-wpcom/package.json +++ b/projects/packages/jetpack-mu-wpcom/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-mu-wpcom", - "version": "5.54.2", + "version": "5.54.3-alpha", "description": "Enhances your site with features powered by WordPress.com", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/jetpack-mu-wpcom/#readme", "bugs": { diff --git a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php index 511ca02ce987a..c102d53423b21 100644 --- a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php +++ b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php @@ -13,7 +13,7 @@ * Jetpack_Mu_Wpcom main class. */ class Jetpack_Mu_Wpcom { - const PACKAGE_VERSION = '5.54.2'; + const PACKAGE_VERSION = '5.54.3-alpha'; const PKG_DIR = __DIR__ . '/../'; const BASE_DIR = __DIR__ . '/'; const BASE_FILE = __FILE__;