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

Disable loading of Custom CSS for atomic sites in jetpack-mu-wpcom #38118

Merged
merged 2 commits into from
Jun 28, 2024

Conversation

monsieur-z
Copy link
Contributor

@monsieur-z monsieur-z commented Jun 28, 2024

Proposed changes:

#37794 caused the wpcomsh plugin to throw the exception: PHP Fatal error: Cannot redeclare jetpack_register_css_preprocessors().

This PR prevents the exception from being thrown by temporarily disabling the loading of the Custom CSS for atomic sites in the jetpack-mu-wpcom package (the Custom CSS will still be available in the Jetpack plugin for now). See conversation linked below for more details.

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

p1719591775246119-slack-C05PV073SG3

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

No.

Testing instructions:

  • Spin up a WoA developer site
  • Install and activate a classic theme, such as Twenty-Eleven
  • From /wp-admin/admin.php?page=jetpack_modules, activate the Custom CSS module
  • Install the Jetpack Beta Tester plugin
  • In WPadmin, go to Jetpack > Beta Tester
  • Select this branch for the WordPress.com Features
Screenshot 2024-06-11 at 4 44 34 PM
  • In the admin, visit Appearance > Additional CSS
  • Make sure you see the options above and that you can write additional CSS

@monsieur-z monsieur-z requested a review from a team June 28, 2024 17:22
@monsieur-z monsieur-z self-assigned this Jun 28, 2024
@monsieur-z monsieur-z added the [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. label Jun 28, 2024
@github-actions github-actions bot added the [Package] Jetpack mu wpcom WordPress.com Features label Jun 28, 2024
Copy link
Contributor

github-actions bot commented Jun 28, 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: July 2, 2024.
  • Scheduled code freeze: June 24, 2024.

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


Wpcomsh plugin:

  • Next scheduled release: July 2, 2024.
  • Scheduled code freeze: June 24, 2024.

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

anomiex
anomiex previously approved these changes Jun 28, 2024
Copy link
Contributor

@anomiex anomiex left a comment

Choose a reason for hiding this comment

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

See conversation linked below for more details.

TL;DR or for any non-Automatticians who wind up here: Jetpack gets updated weekly on WoA sites, while wpcomsh generally gets updated more often. With a version of wpcomsh containing #37794 and a version of Jetpack from earlier this week not containing #37794, wpcomsh loads first, defines the function, and there isn't yet the guard in Jetpack against redefining it. 💥

This PR removes the call in wpcomsh that loads all the code added in #37794, so wpcomsh doesn't define the functions. We'll revert this next week after Jetpack gets updated on WoA sites.

Copy link
Contributor

github-actions bot commented Jun 28, 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 fix/use-jetpack-plugin-custom-css-for-atomic 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 fix/use-jetpack-plugin-custom-css-for-atomic
    

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

@monsieur-z monsieur-z merged commit 02c6fc3 into trunk Jun 28, 2024
54 checks passed
@monsieur-z monsieur-z deleted the fix/use-jetpack-plugin-custom-css-for-atomic branch June 28, 2024 18:06
@github-actions github-actions bot removed the [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. label Jun 28, 2024
zinigor added a commit that referenced this pull request Jul 3, 2024
zinigor added a commit that referenced this pull request Jul 4, 2024
)

* Adding back the changes removed in #38118.

* changelog.

* Project versions.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Package] Jetpack mu wpcom WordPress.com Features [Plugin] mu wpcom jetpack-mu-wpcom plugin [Plugin] Wpcomsh
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants