Skip to content

Hoist <script> and <style> tags to after <body> tag #1565

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
ang-zeyu merged 16 commits into from
May 30, 2021
Merged

Hoist <script> and <style> tags to after <body> tag #1565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8192f98
Implement hoist scripts for page and layout to the bottom
wxwxwxwx9 May 7, 2021
179ad4f
Implement hoist styles for page and layout to the bottom
wxwxwxwx9 May 7, 2021
6907b5d
Remove Vue SSR unescaping of special characters
wxwxwxwx9 May 7, 2021
82b7dc2
Update tests
wxwxwxwx9 May 7, 2021
433139f
Update comment
wxwxwxwx9 May 7, 2021
5ba35b6
Change userScriptsAndStyles to pageUserScriptsAndStyles
wxwxwxwx9 May 7, 2021
74e8d8d
Prevent hoisting of head and bottom scripts
wxwxwxwx9 May 26, 2021
fe2bc20
Update page.njk whitespace trimming
wxwxwxwx9 May 26, 2021
3f1c079
Update test
wxwxwxwx9 May 26, 2021
16c3a19
Improve code quality
wxwxwxwx9 May 26, 2021
7ede046
Pass down userScriptsAndStyles array
wxwxwxwx9 May 26, 2021
14cf6cc
Remove docId object assignment
wxwxwxwx9 May 26, 2021
22eba1a
Add comment for non-processing of head/bottom script tags
wxwxwxwx9 May 26, 2021
8e99453
Exclude external scripts from processing
wxwxwxwx9 May 30, 2021
70c2679
Change implementation of not processing external scripts
wxwxwxwx9 May 30, 2021
eda8880
Update comments and variable naming
wxwxwxwx9 May 30, 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
Binary file modified ...ges/cli/test/functional/test_site/expected/9c9e77fc0a983cb6b592e65733787bec.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions packages/cli/test/functional/test_site/expected/bugs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -28,7 +28,7 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/functional/test_site/expected/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -28,7 +28,7 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/functional/test_site/expected/sub_site/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -28,7 +28,7 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -28,7 +28,7 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
4 changes: 2 additions & 2 deletions ...est/functional/test_site/expected/sub_site/nested_sub_site/testNunjucksPathResolving.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -28,7 +28,7 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/functional/test_site/expected/sub_site/testNunjucksPathResolving.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -28,7 +28,7 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/functional/test_site/expected/testAnchorGeneration.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -28,7 +28,7 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/functional/test_site/expected/testAntiFOUCStyles.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -28,7 +28,7 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/functional/test_site/expected/testCodeBlocks.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -28,7 +28,7 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/functional/test_site/expected/testDates.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -28,7 +28,7 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
8 changes: 4 additions & 4 deletions packages/cli/test/functional/test_site/expected/testEmptyFrontmatter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>


<script src="/test_site/headFiles/customScriptTop2.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop2.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -31,10 +31,10 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>


<script src="/test_site/headFiles/customScriptBottom2.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom2.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
8 changes: 4 additions & 4 deletions packages/cli/test/functional/test_site/expected/testExternalScripts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>


<script src="/test_site/headFiles/customScriptTop2.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop2.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -31,10 +31,10 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>


<script src="/test_site/headFiles/customScriptBottom2.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom2.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/functional/test_site/expected/testIncludeBoilerplate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -28,7 +28,7 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/functional/test_site/expected/testIncludeMultipleModals.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -28,7 +28,7 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/functional/test_site/expected/testIncludePluginsRendered.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -28,7 +28,7 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
8 changes: 4 additions & 4 deletions packages/cli/test/functional/test_site/expected/testLayouts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>


<script src="/test_site/headFiles/customScriptTop2.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop2.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -31,10 +31,10 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>


<script src="/test_site/headFiles/customScriptBottom2.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom2.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
8 changes: 4 additions & 4 deletions packages/cli/test/functional/test_site/expected/testLayoutsOverride.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>


<script src="/test_site/headFiles/customScriptTop2.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop2.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -31,10 +31,10 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>


<script src="/test_site/headFiles/customScriptBottom2.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom2.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/functional/test_site/expected/testNunjucksPathResolving.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -28,7 +28,7 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/functional/test_site/expected/testPanelMarkdownParsing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -28,7 +28,7 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/functional/test_site/expected/testPlantUML.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>

<meta name="default-head-top">
<script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptTop.js"></script>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand All @@ -28,7 +28,7 @@

<meta name="default-head-bottom">
<link rel="stylesheet" href="/test_site/stylesheets/styles.css">
<script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
<script src="/test_site/headFiles/customScriptBottom.js"></script>
<link rel="icon" href="/test_site/favicon.png">
</head>
<script>
Expand Down
Loading