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.

Sign up for GitHub

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

Jump to bottom

Google Fonts Module: Fix conflict with blockbase custom fonts feature #24365

Closed
wants to merge 2 commits into from
Closed

Google Fonts Module: Fix conflict with blockbase custom fonts feature #24365

wants to merge 2 commits into from

Conversation

jeyip
Copy link
Contributor

@jeyip jeyip commented May 13, 2022

Fixes #

Changes proposed in this Pull Request:

Jetpack product discussion

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

Testing instructions:

  • Go to '..'

@matticbot
Copy link
Contributor

Caution: This PR has changes that must be merged to WordPress.com
Hello jeyip! These changes need to be synced to WordPress.com - If you 're an a11n, please commandeer and confirm D80767-code works as expected before merging this PR. Once this PR is merged, please commit the changes to WP.com. Thank you!
This revision will be updated with each commit to this PR

@github-actions github-actions bot added the [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ label May 13, 2022
@github-actions
Copy link
Contributor

github-actions bot commented May 13, 2022 •
edited
Loading

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.
  • ✅ All commits were linted before commit.
  • 🔴 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 (other than "Required review") 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 you’ve done so, switch to the "[Status] Needs Review" label; someone from Jetpack Crew will then review this PR and merge it to be included in the next Jetpack release.

Jetpack plugin:

  • Next scheduled release: June 7, 2022.
  • Scheduled code freeze: May 31, 2022.

@github-actions github-actions bot added the [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. label May 13, 2022
jeyip
jeyip commented May 13, 2022
View reviewed changes
projects/plugins/jetpack/modules/google-fonts.php
// fonts are no longer supported in the site editor, revert our transformed data so that the original
// blockbase fonts customizer feature can behave properly.
if ( ! blockbase_supports_jetpack_google_fonts() ) {
revert_migrated_blockbase_custom_fonts();
Copy link
Contributor Author

Choose a reason for hiding this comment

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

TODO:

Add other conditions when this is called. I imagine we'll want to hook into actions that run when the google fonts jetpack module is deactivated to execute this reversion logic.

@creativecoder
Copy link
Contributor

Closing in favor of Automattic/themes#6010

@github-actions github-actions bot removed the [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. label May 17, 2022
@jeyip jeyip deleted the fix/google_fonts_module_conflict_with_blockbase branch April 24, 2023 20:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@creativecoder creativecoder

@jeyip jeyip

Labels
[Feature] Google Fonts [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ Touches WP.com Files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jeyip @matticbot @creativecoder @jeherve