From bc7ac1262171fbf52227bc2d12f3bf178fb44ae7 Mon Sep 17 00:00:00 2001 From: tbradsha <32492176+tbradsha@users.noreply.github.com> Date: Thu, 19 Dec 2024 12:29:21 -0700 Subject: [PATCH] Remove `ENT_COMPAT` step --- .../jetpack-mu-wpcom/bin/sync-newspack-blocks.sh | 11 ----------- .../src/features/newspack-blocks/README.md | 5 ++--- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/projects/packages/jetpack-mu-wpcom/bin/sync-newspack-blocks.sh b/projects/packages/jetpack-mu-wpcom/bin/sync-newspack-blocks.sh index b3c883a2abf46..89a1cf6b9c348 100755 --- a/projects/packages/jetpack-mu-wpcom/bin/sync-newspack-blocks.sh +++ b/projects/packages/jetpack-mu-wpcom/bin/sync-newspack-blocks.sh @@ -209,15 +209,4 @@ for block_json_file in "$TARGET"/blocks/*/block.json; do jq --tab '. += {"textdomain": "jetpack-mu-wpcom"}' "$block_json_file" > "$TMPFILE" mv "$TMPFILE" "$block_json_file" done - -echo - -# Warn about the need to use ENT_COMPAT. -echo "Please ensure htmlentities and html_entity_decode use 'ENT_COMPAT'!" -ent_compat_needed=$(grep -rino 'html_entity_decode\|htmlentities' --include="$TARGET/*.php") -if [[ -n $ent_compat_needed ]]; then - echo 'Detected the below instances:' - echo "$ent_compat_needed" -fi -echo echo Sync done. diff --git a/projects/packages/jetpack-mu-wpcom/src/features/newspack-blocks/README.md b/projects/packages/jetpack-mu-wpcom/src/features/newspack-blocks/README.md index d3efc2f38d61b..b712c4428c0cd 100644 --- a/projects/packages/jetpack-mu-wpcom/src/features/newspack-blocks/README.md +++ b/projects/packages/jetpack-mu-wpcom/src/features/newspack-blocks/README.md @@ -46,12 +46,11 @@ This will pull the code from the release into this repository and perform the fo Once the script has completed: 1. Ensure the changes shown match the changes in the release. -2. Manually ensure we use ENT_COMPAT [in the proper places](https://github.com/Automattic/jetpack/pull/38873/commits/16f57e6f01b6eed98a19cd0299261ce5ac075b8e). -3. Commit. +2. Commit. ### Local development -Sometimes, probably, you will need to sync the NHA code straight in your local environment. It means you will get working on both projects at the same time. For this situation, you'd like to reference the code source through the `path` bin script argument. +Sometimes, probably, you will need to sync the code straight in your local environment. It means you will get working on both projects at the same time. For this situation, you'd like to reference the code source through the `path` bin script argument. ``` pnpm run sync:newspack-blocks --path=/Absolute/path/of/newspack-blocks/