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

MU WPCOM: Port the newspack blocks from the ETK #38454

Merged
merged 28 commits into from
Jul 31, 2024

Conversation

arthur791004
Copy link
Contributor

@arthur791004 arthur791004 commented Jul 22, 2024

Related to https://github.com/Automattic/dotcom-forge/issues/8208, https://github.com/Automattic/dotcom-forge/issues/8036

Proposed changes:

  • Port the script to sync the newspack blocks into jetpack-mu-wpcom after the installation, and then fix the text domain automatically after the sync
  • Added redux, redux-saga, and swiper to dependencies as they're required by the @automattic/newspack-blocks
    • The Jetpack repo defined strict-peer-dependencies = true. So, there are some errors if we install the @automattic/newspack-blocks package directly due to the mismatched peer dependencies versions.
  • Use jscodeshift to fix Optimization seems to have broken the following translation strings issue due to the bad minification as follows
    // Before minification
    showAdvancedFilters
      ? __( 'Hide Advanced Filters', 'jetpack-mu-wpcom' )
      : __('Show Advanced Filters', 'jetpack-mu-wpcom' )
    
    // After minification but it made Jetpack couldn't get the string to translation directly
    __(S?"Hide Advanced Filters":"Show Advanced Filters","jetpack-mu-wpcom")
    
    // With jscodeshift, we add the dummy arguments to avoid the above minification
    showAdvancedFilters
      ? __( 'Hide Advanced Filters', 'jetpack-mu-wpcom' )
      : __('Show Advanced Filters', 'jetpack-mu-wpcom', 0)
  • Ported the Blog Posts block from the ETK
    image
  • Ported the Post Carousel block from the ETK
    image

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:

  • Apply changes to wpcom or atomic sites

  • Go to the Editor

  • Insert the Blog Posts and Post Carousel

  • Make sure they display correctly in the Editor

  • Save & Refresh the page

  • Make sure they still display correctly

  • Go to your frontend page

  • Make sure they work well your the frontend page

Copy link
Contributor

github-actions bot commented Jul 22, 2024

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 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.


Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.


Mu Wpcom plugin:

  • Next scheduled release: WordPress.com Simple releases happen daily.

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


Wpcomsh plugin:

  • Next scheduled release: on demand (usually Mondays if not sooner).

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

Copy link
Contributor

github-actions bot commented Jul 22, 2024

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 mu-wpcom/newspack-blocks 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/newspack-blocks
    
    bin/jetpack-downloader test jetpack-mu-wpcom-plugin mu-wpcom/newspack-blocks
    

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

@arthur791004 arthur791004 marked this pull request as ready for review July 23, 2024 08:08
@arthur791004 arthur791004 force-pushed the mu-wpcom/newspack-blocks branch from 097a7f4 to 474be25 Compare July 24, 2024 06:23
@github-actions github-actions bot added [Plugin] mu wpcom jetpack-mu-wpcom plugin [Plugin] Wpcomsh labels Jul 24, 2024
@fushar
Copy link
Contributor

fushar commented Jul 24, 2024

@arthur791004: can we fix the conflict first? I'll then test it 👍

fushar
fushar previously approved these changes Jul 25, 2024
Copy link
Contributor

@fushar fushar left a comment

Choose a reason for hiding this comment

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

Tested all scenarios. Nice job!

I also tested with and without ETK plugin active.

Blog Posts block

Editor Frontend
image image

Post Carousel block

Editor Frontend
image image

Since this is a big change... I advise to only merge this after we have deployed #38526 to Atomic... What do you think?

@arthur791004
Copy link
Contributor Author

Since this is a big change... I advise to only merge this after we have deployed #38526 to Atomic... What do you think?

Sounds good!

@fushar
Copy link
Contributor

fushar commented Jul 26, 2024

@arthur791004 let's rebase this PR again 😂

fushar
fushar previously approved these changes Jul 26, 2024
Copy link
Contributor

@fushar fushar left a comment

Choose a reason for hiding this comment

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

Smoke-tested again on Simple and Atomic sites, and it still works fine.

But I'm still not confident merging this before deploying wpcomsh 5.0.2. 😭

@arthur791004
Copy link
Contributor Author

Let's merge this on next week 😉

@github-actions github-actions bot added the [Plugin] CRM Issues about the Jetpack CRM plugin label Jul 29, 2024
@arthur791004 arthur791004 merged commit 71819c1 into trunk Jul 31, 2024
74 checks passed
@arthur791004 arthur791004 deleted the mu-wpcom/newspack-blocks branch July 31, 2024 06:50
arthur791004 added a commit that referenced this pull request Aug 5, 2024
@arthur791004 arthur791004 restored the mu-wpcom/newspack-blocks branch August 5, 2024 16:30
zinigor added a commit that referenced this pull request Aug 5, 2024
* Revert "MU WPCOM: Port the newspack blocks from the ETK (#38454)"

This reverts commit 71819c1.

* Changelog.

---------

Co-authored-by: Igor Zinovyev <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants