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

Filter duplicate extensions by src URL #1192

Merged
merged 11 commits into from
Apr 8, 2021
Merged

Filter duplicate extensions by src URL #1192

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2efc49d
Filter duplicate extensions by src URL
sebastianbenz Apr 6, 2021
d96effd
move resource hints up
sebastianbenz Apr 6, 2021
118fab7
move runtime styles after resource hints
sebastianbenz Apr 6, 2021
ec427be
don't forget the modulepreload...
sebastianbenz Apr 6, 2021
0ce925f
Sort extensions alphabetically and don't filter nomodule v0.js
sebastianbenz Apr 7, 2021
85396ef
workaround for lack of Array#flat in Node10
sebastianbenz Apr 7, 2021
63ef718
swap module and nomodule
sebastianbenz Apr 7, 2021
68804c2
inject resource hints before other meta tags
sebastianbenz Apr 7, 2021
3192282
run ReOrderHeadTransformer last
sebastianbenz Apr 7, 2021
6901062
Move viewport after meta charset
sebastianbenz Apr 7, 2021
f8d0d1c
clean up
sebastianbenz Apr 7, 2021
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
8 changes: 4 additions & 4 deletions packages/optimizer/lib/transformers/ReorderHeadTransformer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ class HeadNodes {
}

_removeDuplicateCustomExtensions(extensions) {
const nodesByName = new Map();
const nodesBySrc = new Map();
for (const node of extensions) {
const name = this._getName(node);
nodesByName.set(name, node);
const src = node.attribs['src'];
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this remove the host to make sure a same extension is not downloaded twice from two different hosts?

nodesBySrc.set(src, node);
}
return Array.from(nodesByName.values());
return Array.from(nodesBySrc.values());
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I took an alternative approach to this in PHP, to do the deduplication in the registerScript function itself: https://github.com/ampproject/amp-toolbox-php/pull/130/files#diff-b0da2cc892f74bf1ebc7a84e63d7065894b24541a48f3a26089f23860ee1209fR156-R190

This also accounts for module and nomodule variations.


appendToHead(head) {
Expand Down
16 changes: 16 additions & 0 deletions ...ptimizer/spec/transformers/valid/ReorderHeadTransformer/supports_esm/expected_output.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!doctype html>
<html ⚡>
<head>
<link rel="stylesheet" href="https://cdn.ampproject.org/v0.css">
<script async src="https://cdn.ampproject.org/v0.mjs" type="module" crossorigin="anonymous"></script>

This comment was marked as resolved.

Sign in to view

<script async nomodule src="https://cdn.ampproject.org/v0/amp-experiment-0.1.js" custom-element="amp-experiment"></script>
<script async custom-element="amp-experiment" src="https://cdn.ampproject.org/v0/amp-experiment-0.1.mjs" type="module" crossorigin="anonymous"></script>
<script async nomodule src="https://cdn.ampproject.org/v0/amp-mustache-0.2.js" custom-template="amp-mustache"></script>
<script async custom-template="amp-mustache" src="https://cdn.ampproject.org/v0/amp-mustache-0.2.mjs" type="module" crossorigin="anonymous"></script>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can the order be reversed, with the nomodule one coming after?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

<link href="https://example.com/favicon.ico" rel="icon">
<link rel="preload" href="https://cdn.ampproject.org/v0.css" as="style">
<link href="https://fonts.googleapis.com/css?foobar" rel="stylesheet" type="text/css">
<link as="script" crossorigin="anonymous" href="https://cdn.ampproject.org/v0.mjs" rel="modulepreload">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't the link[rel=preload] and link[rel=modulepreload] be moved to the beginning of the head?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Copy link
Member

@westonruter westonruter Apr 6, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This modulepreload link needs to be moved up along with the preload as well. Ref ampproject/amp-toolbox-php@a3a99fd

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the patience taking it up with my empty brain today...

</head>
<body></body>
</html>
19 changes: 19 additions & 0 deletions packages/optimizer/spec/transformers/valid/ReorderHeadTransformer/supports_esm/input.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!doctype html>
<html ⚡>
<head>
<script async nomodule src="https://cdn.ampproject.org/v0.js"></script>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Big problem: The nomodule v0.js script is getting dropped in the output. Here's one thing I had to do in the PHP version to account for this: ampproject/amp-toolbox-php@4bad718

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

<script async src="https://cdn.ampproject.org/v0.mjs" type="module" crossorigin="anonymous"></script>
<script async nomodule src="https://cdn.ampproject.org/v0/amp-mustache-0.2.js" custom-template="amp-mustache"></script>
<script async custom-template="amp-mustache" src="https://cdn.ampproject.org/v0/amp-mustache-0.2.mjs" type="module" crossorigin="anonymous"></script>
<script async nomodule src="https://cdn.ampproject.org/v0/amp-experiment-0.1.js" custom-element="amp-experiment"></script>
<script async nomodule src="https://cdn.ampproject.org/v0/amp-experiment-0.1.js" custom-element="amp-experiment"></script>
<script async custom-element="amp-experiment" src="https://cdn.ampproject.org/v0/amp-experiment-0.1.mjs" type="module" crossorigin="anonymous"></script>
<script async custom-element="amp-experiment" src="https://cdn.ampproject.org/v0/amp-experiment-0.1.mjs" type="module" crossorigin="anonymous"></script>
<link rel="stylesheet" href="https://cdn.ampproject.org/v0.css">
<link href="https://fonts.googleapis.com/css?foobar" rel="stylesheet" type="text/css">
<link href="https://example.com/favicon.ico" rel="icon">
<link as="script" crossorigin="anonymous" href="https://cdn.ampproject.org/v0.mjs" rel="modulepreload">
<link rel="preload" href="https://cdn.ampproject.org/v0.css" as="style">
</head>
<body></body>
</html>