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

Closes #7066: 3.18 - Preconnect and prefetch removal #7101

Merged
merged 8 commits into from
Nov 15, 2024
Merged

Closes #7066: 3.18 - Preconnect and prefetch removal #7101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3857689
Closes #7066: Remove preconnect and prefetch from the html
Miraeld Nov 13, 2024
a417d68
Add tests
Miraeld Nov 13, 2024
9f1da2d
Updated namespace
jeawhanlee Nov 13, 2024
b85edf8
Remove useless condition
Miraeld Nov 14, 2024
fb73f3d
Merge branch 'feature/host-google-fonts' into enhancement/7066-remove…
Miraeld Nov 14, 2024
965f2f7
Fix linters
Miraeld Nov 14, 2024
cacca2e
Added filter documentation
jeawhanlee Nov 14, 2024
9e97dbb
Updated filter doc
jeawhanlee Nov 14, 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
31 changes: 31 additions & 0 deletions inc/Engine/Media/Fonts/Frontend/Controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ public function rewrite_fonts( string $html ): string {
$html = $this->replace_font( $font, $html );
}

$html = $this->remove_preconnect_and_prefetch( $html );

return $html;
}

Expand Down Expand Up @@ -111,6 +113,35 @@ protected function get_optimized_markup( string $hash, string $original_url ): s
);
}

/**

* Removes preconnect and prefetch links for Google Fonts from the HTML content.
*
* @param string $html HTML content.
*
* @return string Modified HTML content without preconnect and prefetch links.
*/
private function remove_preconnect_and_prefetch( string $html ) {
/**
* Filters the removal of Google preconnect/prefetch links.
*
* @since 3.18
*
* @param bool $enable_removal Enable or disable removal of Google preconnect/prefetch links.
*/
$remove_links = wpm_apply_filters_typed( 'boolean', 'rocket_remove_font_pre_links', true );

if ( ! $remove_links ) {
return $html;
}

$pattern = '/<link(?:[^>]*)(?:rel=["\'](?:dns-prefetch|preconnect)["\'])(?:[^>]*)(?:href=["\'](?:https?:)?\/\/(?:fonts\.(?:googleapis|gstatic)\.com)["\'])(?:[^>]*)>/i';

$html = preg_replace( $pattern, '', $html );

return $html;
}

/**
* Disables the preload of Google Fonts.
*
Expand Down
2 changes: 2 additions & 0 deletions tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/input_v1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Google Font V1 Template</title>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
<style>
Expand Down
2 changes: 2 additions & 0 deletions tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/input_v1_v2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Google Font V1 and V2 Template</title>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css?family=Roboto|Open+Sans" rel="stylesheet"> <!-- V1 Fonts -->
<link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700&family=Montserrat:wght@400;700&display=swap" rel="stylesheet"> <!-- V2 Fonts -->
<style>
Expand Down
2 changes: 2 additions & 0 deletions tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/input_v2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Google Font V2 Template</title>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap" rel="stylesheet">
<style>
Expand Down
Loading