Skip to content

Font Library Refactor #57688

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

Merged
creativecoder merged 28 commits into from
Jan 23, 2024
Merged

Font Library Refactor #57688

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5dbb7fc
Font Library: add wp_font_face post type and scaffold font face REST …
creativecoder Jan 9, 2024
e89854a
Font Library: create font faces through the REST API (#57702)
creativecoder Jan 11, 2024
998f084
Refactor Font Family Controller (#57785)
creativecoder Jan 12, 2024
90b5717
Font Family and Font Face REST API endpoints: better data handling an…
creativecoder Jan 15, 2024
efffcc8
Font Families REST API endpoint: ensure unique font family slugs (#57…
creativecoder Jan 16, 2024
c263a04
Font Library: delete child font faces and font assets when deleting p…
creativecoder Jan 16, 2024
e8ca12c
Font Library: refactor client side install functions to work with rev…
jffng Jan 17, 2024
13b5640
Cleanup/font library view error handling (#57926)
pbking Jan 17, 2024
3e37968
Font Faces endpoint: prevent creating font faces with duplicate setti…
creativecoder Jan 17, 2024
d1f8dcf
Font Library: Update uninstall/delete on client side (#57932)
mikachan Jan 18, 2024
3e5e987
Update packages/edit-site/src/components/global-styles/font-library-m…
mikachan Jan 18, 2024
dd885b5
Font Library: address JS feedback in #57688 (#57961)
mikachan Jan 18, 2024
2ed7a3b
Font Library REST API endpoints: address initial feedback from featur…
creativecoder Jan 19, 2024
c0e9949
Font Library: font collection refactor to use the new schema (#57884)
matiasbenedetto Jan 19, 2024
51345f0
Fix font asset download when font faces are installed (#58021)
creativecoder Jan 19, 2024
d45d540
Font Families and Faces: disable autosaves using empty class (#58018)
creativecoder Jan 19, 2024
1320d20
Adds migration for legacy font family content (#58032)
creativecoder Jan 22, 2024
4dce262
Font Library: Fix font collection filtering (#58091)
matiasbenedetto Jan 23, 2024
3da3f45
Merge branch 'trunk' into try/font-library-refactor
mikachan Jan 23, 2024
2743793
Fix load.php
mikachan Jan 23, 2024
b98c028
Font Library: fix to activate and display the right activation state …
matiasbenedetto Jan 23, 2024
921ec13
Fix font face files not being deleted with family (#58128)
creativecoder Jan 23, 2024
14b9e53
Font Library Preview: fix quoting of fontFamily property (#58127)
creativecoder Jan 23, 2024
f460811
Fix Font Library Tests_Font_Library_Hooks test missed in #58128
creativecoder Jan 23, 2024
51e4bed
Font library: Fix React key prop warnings (#57939)
mikachan Jan 23, 2024
23ce4e9
removing repeated comment
matiasbenedetto Jan 23, 2024
eb30f83
Update default Google fonts collection URL
mikachan Jan 23, 2024
dde2059
Font Library: Prevent error when installing a system font twice (#58141)
creativecoder Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'trunk' into try/font-library-refactor
  • Loading branch information
@mikachan
mikachan authored Jan 23, 2024
commit 3da3f4592f0312722bc79dbcb545524e04ad51e2
29 changes: 9 additions & 20 deletions lib/load.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,26 +139,15 @@ function gutenberg_is_experiment_enabled( $name ) {
// Fonts API / Font Face.
remove_action( 'plugins_loaded', '_wp_theme_json_webfonts_handler' ); // Turns off WordPress 6.0's stopgap handler.

/*
* If the Font Library is available, load the Font Face files, else load the Fonts API.
* This strategy is temporary until the Font Library is merged. It's used here to allow
* the Font Face (redesigned Fonts API) to be merged before the Font Library while
* keeping Fonts API available for sites that are using it.
*/
if (
! defined( 'FONT_LIBRARY_DISABLED' ) || ! FONT_LIBRARY_DISABLED
) {
// Loads the Font Library.
if ( ! class_exists( 'WP_Font_Library' ) ) {
require __DIR__ . '/experimental/fonts/font-library/class-wp-font-collection.php';
require __DIR__ . '/experimental/fonts/font-library/class-wp-font-library.php';
require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family-utils.php';
require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family.php';
require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-families-controller.php';
require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-faces-controller.php';
require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php';
require __DIR__ . '/experimental/fonts/font-library/font-library.php';
}
// Loads the Font Library.
require __DIR__ . '/experimental/fonts/font-library/class-wp-font-collection.php';
require __DIR__ . '/experimental/fonts/font-library/class-wp-font-library.php';
require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family-utils.php';
require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family.php';
require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-families-controller.php';
require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php';
require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-autosave-font-families-controller.php';
require __DIR__ . '/experimental/fonts/font-library/font-library.php';

// Load the Font Face and Font Face Resolver, if not already loaded by WordPress Core.
if ( ! class_exists( 'WP_Font_Face' ) ) {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.