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

Move Fonts Library to compat dir for 6.5 #58608

Merged
merged 4 commits into from Feb 2, 2024
Merged

Move Fonts Library to compat dir for 6.5 #58608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ac9b36
Move font/ to compat dir for 6.5
getdave Feb 2, 2024
9fcbc24
Move back bc-layer to experimental folder
youknowriad Feb 2, 2024
7f40c37
Simplify folder structure
youknowriad Feb 2, 2024
d3a9f57
Fix typo
youknowriad Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
0 ...font-library/class-wp-font-collection.php → ...ss-6.5/fonts/class-wp-font-collection.php
View file
Open in desktop
File renamed without changes.
0 ...ts/font-library/class-wp-font-library.php → ...press-6.5/fonts/class-wp-font-library.php
View file
Open in desktop
File renamed without changes.
0 ...onts/font-library/class-wp-font-utils.php → ...rdpress-6.5/fonts/class-wp-font-utils.php
View file
Open in desktop
File renamed without changes.
0 ...s-wp-rest-font-collections-controller.php → ...s-wp-rest-font-collections-controller.php
View file
Open in desktop
File renamed without changes.
0 ...y/class-wp-rest-font-faces-controller.php → ...s/class-wp-rest-font-faces-controller.php
View file
Open in desktop
File renamed without changes.
0 ...lass-wp-rest-font-families-controller.php → ...lass-wp-rest-font-families-controller.php
View file
Open in desktop
File renamed without changes.
0 ...ental/fonts/font-library/font-library.php → lib/compat/wordpress-6.5/fonts/fonts.php
View file
Open in desktop
File renamed without changes.
0 ...er/class-gutenberg-fonts-api-bc-layer.php → ...er/class-gutenberg-fonts-api-bc-layer.php
View file
Open in desktop
File renamed without changes.
0 ...c-layer/class-wp-fonts-provider-local.php → ...c-layer/class-wp-fonts-provider-local.php
View file
Open in desktop
File renamed without changes.
0 ...face/bc-layer/class-wp-fonts-provider.php → ...face/bc-layer/class-wp-fonts-provider.php
View file
Open in desktop
File renamed without changes.
0 ...face/bc-layer/class-wp-fonts-resolver.php → ...face/bc-layer/class-wp-fonts-resolver.php
View file
Open in desktop
File renamed without changes.
0 ...nt-face/bc-layer/class-wp-fonts-utils.php → ...nt-face/bc-layer/class-wp-fonts-utils.php
View file
Open in desktop
File renamed without changes.
0 ...nts/font-face/bc-layer/class-wp-fonts.php → ...tal/font-face/bc-layer/class-wp-fonts.php
View file
Open in desktop
File renamed without changes.
0 ...font-face/bc-layer/class-wp-web-fonts.php → ...font-face/bc-layer/class-wp-web-fonts.php
View file
Open in desktop
File renamed without changes.
0 ...ayer/class-wp-webfonts-provider-local.php → ...ayer/class-wp-webfonts-provider-local.php
View file
Open in desktop
File renamed without changes.
0 ...e/bc-layer/class-wp-webfonts-provider.php → ...e/bc-layer/class-wp-webfonts-provider.php
View file
Open in desktop
File renamed without changes.
0 ...face/bc-layer/class-wp-webfonts-utils.php → ...face/bc-layer/class-wp-webfonts-utils.php
View file
Open in desktop
File renamed without changes.
0 .../font-face/bc-layer/class-wp-webfonts.php → .../font-face/bc-layer/class-wp-webfonts.php
View file
Open in desktop
File renamed without changes.
0 ...t-face/bc-layer/webfonts-deprecations.php → ...t-face/bc-layer/webfonts-deprecations.php
View file
Open in desktop
File renamed without changes.
38 changes: 19 additions & 19 deletions lib/load.php
View file
Open in desktop
Expand Up @@ -137,13 +137,13 @@ function gutenberg_is_experiment_enabled( $name ) {
remove_action( 'plugins_loaded', '_wp_theme_json_webfonts_handler' ); // Turns off WordPress 6.0's stopgap handler.

// 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-utils.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';
require __DIR__ . '/compat/wordpress-6.5/fonts/class-wp-font-collection.php';
require __DIR__ . '/compat/wordpress-6.5/fonts/class-wp-font-library.php';
require __DIR__ . '/compat/wordpress-6.5/fonts/class-wp-font-utils.php';
require __DIR__ . '/compat/wordpress-6.5/fonts/class-wp-rest-font-families-controller.php';
require __DIR__ . '/compat/wordpress-6.5/fonts/class-wp-rest-font-faces-controller.php';
require __DIR__ . '/compat/wordpress-6.5/fonts/class-wp-rest-font-collections-controller.php';
require __DIR__ . '/compat/wordpress-6.5/fonts/fonts.php';

// Load the Font Face and Font Face Resolver, if not already loaded by WordPress Core.
if ( ! class_exists( 'WP_Font_Face' ) ) {
Expand All @@ -160,18 +160,18 @@ function gutenberg_is_experiment_enabled( $name ) {

// Load the BC Layer to avoid fatal errors of extenders using the Fonts API.
// @core-merge: do not merge the BC layer files into WordPress Core.
require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider.php';
require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-utils.php';
require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts.php';
require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider-local.php';
require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-resolver.php';
require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-gutenberg-fonts-api-bc-layer.php';
require __DIR__ . '/experimental/fonts/font-face/bc-layer/webfonts-deprecations.php';
require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts-utils.php';
require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider.php';
require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider-local.php';
require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts.php';
require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-web-fonts.php';
require __DIR__ . '/experimental/font-face/bc-layer/class-wp-fonts-provider.php';
require __DIR__ . '/experimental/font-face/bc-layer/class-wp-fonts-utils.php';
require __DIR__ . '/experimental/font-face/bc-layer/class-wp-fonts.php';
require __DIR__ . '/experimental/font-face/bc-layer/class-wp-fonts-provider-local.php';
require __DIR__ . '/experimental/font-face/bc-layer/class-wp-fonts-resolver.php';
require __DIR__ . '/experimental/font-face/bc-layer/class-gutenberg-fonts-api-bc-layer.php';
require __DIR__ . '/experimental/font-face/bc-layer/webfonts-deprecations.php';
require __DIR__ . '/experimental/font-face/bc-layer/class-wp-webfonts-utils.php';
require __DIR__ . '/experimental/font-face/bc-layer/class-wp-webfonts-provider.php';
require __DIR__ . '/experimental/font-face/bc-layer/class-wp-webfonts-provider-local.php';
require __DIR__ . '/experimental/font-face/bc-layer/class-wp-webfonts.php';
require __DIR__ . '/experimental/font-face/bc-layer/class-wp-web-fonts.php';

// Plugin specific code.
require __DIR__ . '/script-loader.php';
Expand Down