Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update synced Newspack Blocks to 4.5.7 #41481

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from

Conversation

tbradsha
Copy link
Contributor

@tbradsha tbradsha commented Jan 31, 2025

Updating a dependency for the sake of making sure it works. Here's a link to the rough diff of changes, noting that we only sync a small subset of that repo:
Automattic/newspack-blocks@v4.5.2...v4.5.7

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

Make sure things look as expected?

@tbradsha tbradsha added [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. [Type] Janitorial labels Jan 31, 2025
@tbradsha tbradsha requested review from kraftbj and a team January 31, 2025 20:31
@tbradsha tbradsha self-assigned this Jan 31, 2025
Copy link
Contributor

github-actions bot commented Jan 31, 2025

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the update/newspack-blocks/sync_to_4.5.7 branch.

    • For jetpack-mu-wpcom changes, also add define( 'JETPACK_MU_WPCOM_LOAD_VIA_BETA_PLUGIN', true ); to your wp-config.php file.
  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack-mu-wpcom-plugin update/newspack-blocks/sync_to_4.5.7
    

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

Copy link
Contributor

github-actions bot commented Jan 31, 2025

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • ✅ Add a "[Type]" label (Bug, Enhancement, Janitorial, Task).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖


The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.


Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Choose a review path based on your changes:
    • A. Team Review: add the "[Status] Needs Team Review" label
      • For most changes, including minor cross-team impacts.
      • Example: Updating a team-specific component or a small change to a shared library.
    • B. Crew Review: add the "[Status] Needs Review" label
      • For significant changes to core functionality.
      • Example: Major updates to a shared library or complex features.
    • C. Both: Start with Team, then request Crew
      • For complex changes or when you need extra confidence.
      • Example: Refactor affecting multiple systems.
  3. Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!


Mu Wpcom plugin:

  • Next scheduled release: WordPress.com Simple releases happen semi-continuously (PCYsg-Jjm-p2).

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.


Wpcomsh plugin:

  • Next scheduled release: Atomic deploys happen twice daily on weekdays (p9o2xV-2EN-p2).

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

@@ -1252,7 +1253,7 @@ public static function disable_jetpack_donate() {

// Tell Jetpack to mark the donations feature as unavailable.
Jetpack_Gutenberg::set_extension_unavailable(
'donations',
'jetpack/donations',
Copy link
Contributor Author

@tbradsha tbradsha Jan 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kraftbj I tagged you for review, as you removed the prefix in #39734; in general this is a file that is synced as-is (see here).

On the one hand, if we really don't want that prefix, we can update the script to target that specific string, though it would need to be pretty specific to avoid false positives.

On the other hand, I have no idea if this is something that should actually be disabled in this package's version...should we really be disabling the extension in favor of Newspack's variant, given we don't even sync that block? 🤔

On the third hand, it seems to have worked up to this point...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this. The set_extension_unavailable still checks for the jetpack/ prefix and strips it, so it works either way. It is, in theory, just slightly more performant since it can skip out of the prefix check early.

Without knowing how Newspack Blocks check for Jetpack version, we can leave upstream as it is (and thus accept this merge bringing back the prefix).

Copy link
Contributor

Code Coverage Summary

Coverage changed in 1 file.

File Coverage Δ% Δ Uncovered
projects/packages/jetpack-mu-wpcom/src/features/newspack-blocks/synced-newspack-blocks/class-newspack-blocks.php 0/754 (0.00%) 0.00% 3 💔

Full summary · PHP report · JS report

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[mu wpcom Feature] Newspack Blocks [Package] Jetpack mu wpcom WordPress.com Features [Plugin] mu wpcom jetpack-mu-wpcom plugin [Plugin] Wpcomsh [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. [Type] Janitorial
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants