Skip to content

Send preload links via HTTP Link headers in addition to LINK tags #1323

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
westonruter merged 10 commits into from
Jul 8, 2024
Merged

Send preload links via HTTP Link headers in addition to LINK tags #1323

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7fdc181
Add support for sending preload links via HTTP headers
AhmarZaidi Jun 28, 2024
1e3a242
PR Changes
AhmarZaidi Jul 2, 2024
e7103c6
Merge branch 'trunk' into preload-links
AhmarZaidi Jul 2, 2024
b36959a
Prepare links
AhmarZaidi Jul 3, 2024
c3acee8
PR Changes
AhmarZaidi Jul 4, 2024
9a47aae
Add test for http link response headers
AhmarZaidi Jul 7, 2024
f2fbe38
Remove unnecessary global namespace backslash
westonruter Jul 8, 2024
d1cd8d4
Escape quoted strings according to RFC 9110
westonruter Jul 8, 2024
25299f7
Merge branch 'trunk' into preload-links
westonruter Jul 8, 2024
f4ab19a
Use array_map() instead of reference
westonruter Jul 8, 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
PR Changes 
- Update documentation
- Fix preload link without href using about:blank fallback
  • Loading branch information
@AhmarZaidi
AhmarZaidi committed Jul 4, 2024
commit c3acee819e3aac37b9c02e67fdee99654d806b03
19 changes: 10 additions & 9 deletions plugins/optimization-detective/class-od-preload-link-collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ public function add_link( array $attributes, ?int $minimum_viewport_width, ?int
}

/**
* Prepare links by deduplicating adjacent links and adding media attributes.
* Prepares links by deduplicating adjacent links and adding media attributes.
*
* When two links are identical except for their minimum/maximum widths which are also consecutive, then merge them
* together. Also, add media attributes to the links.
*
* @return array<int, Link> Prepared links with adjacent-duplicates merged together and media attributes added.
*/
private function prepare_links(): array {
private function get_prepared_links(): array {
$links = $this->links;

usort(
Expand All @@ -100,7 +100,7 @@ static function ( array $a, array $b ): int {
}
);

// Deduplicating adjacent links.
// Deduplicate adjacent links.
$prepared_links = array_reduce(
$links,
/**
Expand Down Expand Up @@ -159,7 +159,7 @@ static function ( array $carry, array $link ): array {
public function get_html(): string {
$link_tags = array();

foreach ( $this->prepare_links() as $link ) {
foreach ( $this->get_prepared_links() as $link ) {
$link_tag = '<link data-od-added-tag rel="preload"';
foreach ( $link['attributes'] as $name => $value ) {
$link_tag .= sprintf( ' %s="%s"', $name, esc_attr( $value ) );
Expand All @@ -180,12 +180,13 @@ public function get_html(): string {
public function get_response_header(): ?string {
$link_headers = array();

foreach ( $this->prepare_links() as $link ) {
$link_header = '<' . esc_url_raw( $link['attributes']['href'] ?? '' ) . '>; rel="preload"';
foreach ( $this->get_prepared_links() as $link ) {
// The about:blank is present since a Link without a reference-uri is invalid so any imagesrcset would otherwise not get downloaded.
$link['attributes']['href'] = isset( $link['attributes']['href'] ) ? esc_url_raw( $link['attributes']['href'] ) : 'about:blank';
$link_header = '<' . $link['attributes']['href'] . '>; rel="preload"';
unset( $link['attributes']['href'] );
foreach ( $link['attributes'] as $name => $value ) {
if ( 'href' !== $name ) {
$link_header .= sprintf( '; %s="%s"', $name, rawurlencode( $value ) );
}
$link_header .= sprintf( '; %s="%s"', $name, rawurlencode( $value ) );
Comment thread
westonruter marked this conversation as resolved.
Outdated
}

$link_headers[] = $link_header;
Expand Down