Moves font directory into uploads to match WP 6.5 #60354

creativecoder · 2024-04-02T01:48:17Z

What?

Brings the changes from https://core.trac.wordpress.org/changeset/57878 to Gutenberg
Deletes font files that may be in the previous folder location (wp-content/fonts) when deleting a font face

Why?

Keep Gutenberg + WP 6.4 font library behavior consistent with WP 6.5
Ensure font assets uploaded before the directory change are deleted with their associated font face

How?

Updates the default font directory location returned from wp_font_dir/wp_get_font_dir
Adds a function on the before_delete_post hook that checks for font files in the old location and deletes them, if needed

Testing Instructions

Using trunk branch of Gutenberg with WP 6.4, install fonts from the font library in the site editor
See that those font files are installed to wp-content/fonts
Switch to this branch
Install another font and see that the fonts are uploaded to wp-content/uploads/fonts
Delete both sets of fonts you just installed
The font files from both wp-content/fonts and wp-content/uploads/fonts should be deleted

Fixes #59417

github-actions · 2024-04-02T01:48:33Z

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

Unlinked Accounts

The following contributors have not linked their GitHub and WordPress.org accounts: @joehoyle, @Zealth57.

Contributors, please read how to link your accounts to ensure your work is properly credited in WordPress releases.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Unlinked contributors: joehoyle, Zealth57.

Co-authored-by: creativecoder <grantmkin@git.wordpress.org>
Co-authored-by: peterwilsoncc <peterwilsoncc@git.wordpress.org>
Co-authored-by: azaozz <azaozz@git.wordpress.org>
Co-authored-by: priethor <priethor@git.wordpress.org>
Co-authored-by: hellofromtonya <hellofromtonya@git.wordpress.org>
Co-authored-by: costdev <costdev@git.wordpress.org>
Co-authored-by: swissspidy <swissspidy@git.wordpress.org>
Co-authored-by: andreilupu <euthelup@git.wordpress.org>
Co-authored-by: youknowriad <youknowriad@git.wordpress.org>
Co-authored-by: aaronjorbin <jorbin@git.wordpress.org>
Co-authored-by: cbirdsong <cbirdsong@git.wordpress.org>
Co-authored-by: mcsf <mcsf@git.wordpress.org>
Co-authored-by: jazzsequence <jazzs3quence@git.wordpress.org>
Co-authored-by: joemcgill <joemcgill@git.wordpress.org>
Co-authored-by: pwtyler <pwtyler@git.wordpress.org>
Co-authored-by: getdave <get_dave@git.wordpress.org>
Co-authored-by: mtias <matveb@git.wordpress.org>
Co-authored-by: justlevine <justlevine@git.wordpress.org>
Co-authored-by: samuelsidler <samuelsidler@git.wordpress.org>
Co-authored-by: johnbillion <johnbillion@git.wordpress.org>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

github-actions · 2024-04-02T02:11:00Z

Flaky tests detected in abbbb28.
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/9733811493
📝 Reported issues:

[Flaky Test] submenu click on the arrow interactions #61884 in /test/e2e/specs/editor/blocks/navigation-frontend-interactivity.spec.js

azaozz · 2024-04-02T21:08:36Z

Thinking it may be better to hold on to this for couple of weeks (this change seems only relevant to new Gutenberg installs in WP 6.4). Lets see if there are any bugs caused by the changed location that would need fixing in a 6.5.1?

Also planning to work on implementing Josepha's decision from https://make.wordpress.org/core/2024/03/07/unblocking-wp6-5-font-library-and-synced-pattern-overrides/ in WP 6.6. This will set the default location back to wp-content/fonts.

peterwilsoncc

This looks good to me and matches the changes in WordPress-Develop.

I've requested some docblocks but preapproving.

The PHP unit tests are failing due to an issue pulling docker images, have you managed to get them passing locally?

peterwilsoncc · 2024-04-02T22:36:04Z

lib/compat/wordpress-6.5/fonts/fonts.php

+ * @param int     $post_id Post ID.
+ * @param WP_Post $post    Post object.
+ */
+function gutenberg_before_delete_font_face( $post_id, $post ) {


Nice catch, I would have totally missed this.

peterwilsoncc · 2024-04-02T22:38:10Z

phpunit/tests/fonts/font-library/fontDeleteFilesFromWpContentFolder.php

+ *
+ * @covers ::gutenberg_before_delete_font_face
+ */
+class Tests_Font_Delete_Files_From_Wp_Content_Folder extends WP_UnitTestCase {


Are you able to add docblocks for the methods and properties throughout?

👍🏼 done in abbbb28

github-actions · 2024-06-13T00:41:09Z

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

❔ phpunit/tests/fonts/font-library/fontDeleteFilesFromWpContentFolder.php
❔ lib/compat/wordpress-6.5/fonts/fonts.php

creativecoder · 2024-06-30T17:39:52Z

I'm planning to go ahead with merging this. We can regroup as needed if/when the fonts folder is changed again.

peterwilsoncc · 2024-06-30T21:54:20Z

Thanks Grant, I'll create a follow up PR to backport WordPress/wordpress-develop@a033cf1 now it is unblocked.

* Updates default font directory location to wp-content/uploads/fonts when using Gutenberg with WP 6.5 and below * Deletes font files from wp-content/fonts when font face posts are deleted Unlinked contributors: joehoyle, Zealth57. Co-authored-by: creativecoder <grantmkin@git.wordpress.org> Co-authored-by: peterwilsoncc <peterwilsoncc@git.wordpress.org> Co-authored-by: azaozz <azaozz@git.wordpress.org> Co-authored-by: priethor <priethor@git.wordpress.org> Co-authored-by: hellofromtonya <hellofromtonya@git.wordpress.org> Co-authored-by: costdev <costdev@git.wordpress.org> Co-authored-by: swissspidy <swissspidy@git.wordpress.org> Co-authored-by: andreilupu <euthelup@git.wordpress.org> Co-authored-by: youknowriad <youknowriad@git.wordpress.org> Co-authored-by: aaronjorbin <jorbin@git.wordpress.org> Co-authored-by: cbirdsong <cbirdsong@git.wordpress.org> Co-authored-by: mcsf <mcsf@git.wordpress.org> Co-authored-by: jazzsequence <jazzs3quence@git.wordpress.org> Co-authored-by: joemcgill <joemcgill@git.wordpress.org> Co-authored-by: pwtyler <pwtyler@git.wordpress.org> Co-authored-by: getdave <get_dave@git.wordpress.org> Co-authored-by: mtias <matveb@git.wordpress.org> Co-authored-by: justlevine <justlevine@git.wordpress.org> Co-authored-by: samuelsidler <samuelsidler@git.wordpress.org> Co-authored-by: johnbillion <johnbillion@git.wordpress.org>

creativecoder added Backport from WordPress Core Pull request that needs to be backported to a Gutenberg release from WordPress Core [Feature] Font Library labels Apr 2, 2024

creativecoder self-assigned this Apr 2, 2024

creativecoder requested a review from spacedmonkey as a code owner April 2, 2024 01:48

creativecoder requested review from matiasbenedetto, peterwilsoncc and mikachan and removed request for spacedmonkey April 2, 2024 01:48

creativecoder mentioned this pull request Apr 2, 2024

Reconsider placing uploaded fonts within the uploads directory #59417

Closed

Base automatically changed from do/wp-dev-r57868-backport to trunk April 2, 2024 05:32

creativecoder force-pushed the update/move-font-directory-into-uploads branch from 89cad11 to 2303f63 Compare April 2, 2024 12:54

peterwilsoncc approved these changes Apr 2, 2024

View reviewed changes

justlevine mentioned this pull request Apr 7, 2024

Font Library: Handling for fonts that exist in the /fonts directory but have not been added in the Font Library #59102

Open

creativecoder added 5 commits June 30, 2024 11:53

Updates default font directory location

261c04f

Deletes font files from legacy folder location

8b48c22

Adds tests for deleting fonts in the previous folder location

e0423c2

Format PHP

70464cb

Adds and updates docblocks for tests

abbbb28

creativecoder force-pushed the update/move-font-directory-into-uploads branch from 9980d08 to abbbb28 Compare June 30, 2024 17:37

creativecoder merged commit b76965d into trunk Jun 30, 2024
62 checks passed

creativecoder deleted the update/move-font-directory-into-uploads branch June 30, 2024 21:52

github-actions bot added this to the Gutenberg 18.8 milestone Jun 30, 2024

Mamaduka mentioned this pull request Jul 30, 2024

Plugin: Remove compat layers for WP 6.4 and 6.5 #64096

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Moves font directory into uploads to match WP 6.5 #60354

Moves font directory into uploads to match WP 6.5 #60354

creativecoder commented Apr 2, 2024

github-actions bot commented Apr 2, 2024 •

edited

Loading

github-actions bot commented Apr 2, 2024 •

edited

Loading

azaozz commented Apr 2, 2024 •

edited

Loading

peterwilsoncc left a comment

peterwilsoncc Apr 2, 2024

peterwilsoncc Apr 2, 2024

creativecoder Jun 30, 2024

github-actions bot commented Jun 13, 2024

creativecoder commented Jun 30, 2024

peterwilsoncc commented Jun 30, 2024

Moves font directory into uploads to match WP 6.5 #60354

Moves font directory into uploads to match WP 6.5 #60354

Conversation

creativecoder commented Apr 2, 2024

What?

Why?

How?

Testing Instructions

github-actions bot commented Apr 2, 2024 • edited Loading

Unlinked Accounts

github-actions bot commented Apr 2, 2024 • edited Loading

azaozz commented Apr 2, 2024 • edited Loading

peterwilsoncc left a comment

Choose a reason for hiding this comment

peterwilsoncc Apr 2, 2024

Choose a reason for hiding this comment

peterwilsoncc Apr 2, 2024

Choose a reason for hiding this comment

creativecoder Jun 30, 2024

Choose a reason for hiding this comment

github-actions bot commented Jun 13, 2024

creativecoder commented Jun 30, 2024

peterwilsoncc commented Jun 30, 2024

github-actions bot commented Apr 2, 2024 •

edited

Loading

github-actions bot commented Apr 2, 2024 •

edited

Loading

azaozz commented Apr 2, 2024 •

edited

Loading