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

Font Face: backport from Core changeset 56500 #54218

Merged
merged 5 commits into from Sep 13, 2023

Conversation

hellofromtonya
Copy link
Contributor

@hellofromtonya hellofromtonya commented Sep 6, 2023

What?

Font Face was merged into Core by changeset 56500. This PR backports the changes from Core.

Why?

To keep Core and Gutenberg files in synchronized.

How?

  • Merges the changes made in Core while retaining plugin specifics.
  • Adds @core-merge notes where appropriate.

Review notes:

When comparing the changes from Core's changeset 56500, please note that it included the static instance in wp_print_font_faces(). This static was removed in Gutenberg via commit 98b331e and in Core via changeset 56540.

Tip: Compare the changes from the code that's in Core's trunk, i.e. to avoid confusion of the static change.

@hellofromtonya hellofromtonya added Backport from WordPress Core Pull request that needs to be backported to the a Gutenberg release from WordPress Core [Feature] Typography Font and typography-related issues and PRs labels Sep 6, 2023
@github-actions
Copy link

github-actions bot commented Sep 6, 2023

This pull request has changed or added PHP files. Please confirm whether these changes need to be synced to WordPress Core, and therefore featured in the next release of WordPress.

If so, it is recommended to create a new Trac ticket and submit a pull request to the WordPress Core Github repository soon after this pull request is merged.

If you're unsure, you can always ask for help in the #core-editor channel in WordPress Slack.

Thank you! ❤️

View changed files
❔ lib/compat/wordpress-6.4/fonts/font-face/class-wp-font-face-resolver.php
❔ lib/compat/wordpress-6.4/fonts/font-face/class-wp-font-face.php
❔ lib/compat/wordpress-6.4/fonts/fonts.php
❔ phpunit/tests/fonts/font-face/base.php
❔ phpunit/tests/fonts/font-face/wpFontFace/generateAndPrint.php
❔ phpunit/tests/fonts/font-face/wpFontFaceResolver/getFontsFromThemeJson.php
❔ phpunit/tests/fonts/font-face/wpPrintFontFaces.php

@hellofromtonya hellofromtonya force-pushed the try/backport-core-changes-font-face branch from d773cef to 15c0058 Compare September 6, 2023 15:25
@hellofromtonya hellofromtonya requested review from ironprogrammer and anton-vlasenko and removed request for spacedmonkey September 6, 2023 15:26
@hellofromtonya hellofromtonya force-pushed the try/backport-core-changes-font-face branch 2 times, most recently from 69acdab to 2c3c729 Compare September 6, 2023 18:13
@hellofromtonya hellofromtonya marked this pull request as draft September 6, 2023 18:28
@hellofromtonya hellofromtonya force-pushed the try/backport-core-changes-font-face branch from 2c3c729 to eef352f Compare September 7, 2023 18:58
@hellofromtonya hellofromtonya marked this pull request as ready for review September 7, 2023 19:38
@github-actions
Copy link

github-actions bot commented Sep 7, 2023

Flaky tests detected in 877d725.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/6114287700
📝 Reported issues:

Copy link
Contributor

@anton-vlasenko anton-vlasenko left a comment

Choose a reason for hiding this comment

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

I've reviewed these changes, and they seem to be in line with what's already committed to Core.

I did a quick test and didn't notice any errors.

Therefore, I approve this PR.

@hellofromtonya hellofromtonya enabled auto-merge (squash) September 13, 2023 16:29
@hellofromtonya hellofromtonya merged commit 46ecc04 into trunk Sep 13, 2023
49 checks passed
@hellofromtonya hellofromtonya deleted the try/backport-core-changes-font-face branch September 13, 2023 17:00
@github-actions github-actions bot added this to the Gutenberg 16.7 milestone Sep 13, 2023
@mikachan mikachan added the [Type] Enhancement A suggestion for improvement. label Sep 20, 2023
@github-actions
Copy link

Warning: Type of PR label error

To merge this PR, it requires exactly 1 label indicating the type of PR. Other labels are optional and not being checked here.

  • Type-related labels to choose from: [Type] Accessibility (a11y), [Type] Automated Testing, [Type] Breaking Change, [Type] Bug, [Type] Build Tooling, [Type] Code Quality, [Type] Copy, [Type] Developer Documentation, [Type] Enhancement, [Type] Experimental, [Type] Feature, [Type] New API, [Type] Task, [Type] Performance, [Type] Project Management, [Type] Regression, [Type] Security, [Type] WP Core Ticket, Backport from WordPress Core.
  • Labels found: [Type] Enhancement, Backport from WordPress Core, [Feature] Typography.

Read more about Type labels in Gutenberg.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport from WordPress Core Pull request that needs to be backported to the a Gutenberg release from WordPress Core [Feature] Typography Font and typography-related issues and PRs [Type] Enhancement A suggestion for improvement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants