feat(html): builtins.html should inject <script href="xxxx" /> in…

… `<head />` (#2770) done
web-infra-dev · Apr 16, 2023 · 094c379 · 094c379
1 parent a72daa0
commit 094c379
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 34 deletions.
diff --git a/crates/rspack_plugin_html/src/plugin.rs b/crates/rspack_plugin_html/src/plugin.rs
@@ -150,7 +150,7 @@ impl Plugin for HtmlPlugin {
             Some(if let Some(inject) = &config.inject {
               *inject
             } else {
-              HtmlPluginConfigInject::Body
+              HtmlPluginConfigInject::Head
             }),
             &config.script_loading,
           ))

diff --git a/crates/rspack_plugin_html/tests/fixtures/basic/expected/index.html b/crates/rspack_plugin_html/tests/fixtures/basic/expected/index.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>rspack</title>
-  <link href="/main.css" rel="stylesheet" /></head>
+  <script src="/runtime.js" defer></script><script src="/main.js" defer></script><link href="/main.css" rel="stylesheet" /></head>
   <body>
 
-<script src="/runtime.js" defer></script><script src="/main.js" defer></script></body></html>
+</body></html>
diff --git a/crates/rspack_plugin_html/tests/fixtures/chunks/expected/index.html b/crates/rspack_plugin_html/tests/fixtures/chunks/expected/index.html
@@ -3,10 +3,10 @@
 <head>
   <meta charset="UTF-8" />
   <title>Rspack App</title>
-</head>
+<script src="/runtime.js" defer></script><script src="/chunk1.js" defer></script></head>
 
 <body>
 
 
 
-<script src="/runtime.js" defer></script><script src="/chunk1.js" defer></script></body></html>
+</body></html>
diff --git a/crates/rspack_plugin_html/tests/fixtures/favicon/expected/index.html b/crates/rspack_plugin_html/tests/fixtures/favicon/expected/index.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>rspack</title>
-  <link rel="icon" href="/favicon.ico" /></head>
+  <link rel="icon" href="/favicon.ico" /><script src="/runtime.js" defer></script><script src="/index.js" defer></script></head>
   <body>
 
-<script src="/runtime.js" defer></script><script src="/index.js" defer></script></body></html>
+</body></html>
diff --git a/crates/rspack_plugin_html/tests/fixtures/filename/expected/default.c58a17e264b8bc1.html b/crates/rspack_plugin_html/tests/fixtures/filename/expected/default.c58a17e264b8bc1.html
diff --git a/crates/rspack_plugin_html/tests/fixtures/filename/expected/default.cf6dd0ecc5222c7a.html b/crates/rspack_plugin_html/tests/fixtures/filename/expected/default.cf6dd0ecc5222c7a.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>rspack</title>
+  <script src="/runtime.js" defer></script><script src="/main.js" defer></script><link href="/main.css" rel="stylesheet" /></head>
+  <body>
+
+</body></html>
diff --git a/...name/expected/index.9abfee7e7d4b36c9.html → ...name/expected/index.14c6c3011e162801.html b/...name/expected/index.9abfee7e7d4b36c9.html → ...name/expected/index.14c6c3011e162801.html
@@ -3,10 +3,10 @@
 <head>
   <meta charset="UTF-8" />
   <title>Rspack App</title>
-<link href="/main.css" rel="stylesheet" /></head>
+<script src="/runtime.js" defer></script><script src="/main.js" defer></script><link href="/main.css" rel="stylesheet" /></head>
 
 <body>
 
 
 
-<script src="/runtime.js" defer></script><script src="/main.js" defer></script></body></html>
+</body></html>
diff --git a/crates/rspack_plugin_html/tests/fixtures/meta/expected/index.html b/crates/rspack_plugin_html/tests/fixtures/meta/expected/index.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>rspack</title>
-  <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport" /></head>
+  <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport" /><script src="/runtime.js" defer></script><script src="/index.js" defer></script></head>
   <body>
 
-<script src="/runtime.js" defer></script><script src="/index.js" defer></script></body></html>
+</body></html>
diff --git a/crates/rspack_plugin_html/tests/fixtures/minify/expected/index.html b/crates/rspack_plugin_html/tests/fixtures/minify/expected/index.html
@@ -1 +1 @@
-<!doctype html><meta charset=utf-8><title>rspack</title><body><script src=/runtime.js defer></script><script src=/index.js defer></script>
+<!doctype html><meta charset=utf-8><title>rspack</title><script src=/runtime.js defer></script><script src=/index.js defer></script>
diff --git a/crates/rspack_plugin_html/tests/fixtures/mpa/expected/chunk1.html b/crates/rspack_plugin_html/tests/fixtures/mpa/expected/chunk1.html
@@ -3,10 +3,10 @@
 <head>
   <meta charset="UTF-8" />
   <title>Rspack App</title>
-</head>
+<script src="/runtime.js" defer></script><script src="/chunk1.js" defer></script></head>
 
 <body>
 
 
 
-<script src="/runtime.js" defer></script><script src="/chunk1.js" defer></script></body></html>
+</body></html>
diff --git a/crates/rspack_plugin_html/tests/fixtures/mpa/expected/chunk2.html b/crates/rspack_plugin_html/tests/fixtures/mpa/expected/chunk2.html
@@ -3,10 +3,10 @@
 <head>
   <meta charset="UTF-8" />
   <title>Rspack App</title>
-</head>
+<script src="/runtime.js" defer></script><script src="/chunk2.js" defer></script></head>
 
 <body>
 
 
 
-<script src="/runtime.js" defer></script><script src="/chunk2.js" defer></script></body></html>
+</body></html>
diff --git a/crates/rspack_plugin_html/tests/fixtures/mpa/expected/chunk3.html b/crates/rspack_plugin_html/tests/fixtures/mpa/expected/chunk3.html
@@ -3,10 +3,10 @@
 <head>
   <meta charset="UTF-8" />
   <title>Rspack App</title>
-</head>
+<script src="/runtime.js" defer></script><script src="/chunk3.js" defer></script></head>
 
 <body>
 
 
 
-<script src="/runtime.js" defer></script><script src="/chunk3.js" defer></script></body></html>
+</body></html>
diff --git a/crates/rspack_plugin_html/tests/fixtures/public-path/expected/index.html b/crates/rspack_plugin_html/tests/fixtures/public-path/expected/index.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>rspack</title>
-  <link rel="icon" href="/favicon.ico" /></head>
+  <link rel="icon" href="/favicon.ico" /><script src="/runtime.js" defer></script><script src="/index.js" defer></script></head>
   <body>
 
-<script src="/runtime.js" defer></script><script src="/index.js" defer></script></body></html>
+</body></html>
diff --git a/crates/rspack_plugin_html/tests/fixtures/template+templateParameters/expected/index.html b/crates/rspack_plugin_html/tests/fixtures/template+templateParameters/expected/index.html
@@ -3,9 +3,9 @@
 <head>
   <meta charset="UTF-8" />
   <title>bar</title>
-</head>
+<script src="/runtime.js" defer></script><script src="/index.js" defer></script></head>
 
 <body>
 
 
-<script src="/runtime.js" defer></script><script src="/index.js" defer></script></body></html>
+</body></html>
diff --git a/.../rspack_plugin_html/tests/fixtures/templateContent+templateParameters/expected/index.html b/.../rspack_plugin_html/tests/fixtures/templateContent+templateParameters/expected/index.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html>
 <html>
-<head></head><body><div>bar</div><script src="/runtime.js" defer></script><script src="/index.js" defer></script></body></html>
+<head><script src="/runtime.js" defer></script><script src="/index.js" defer></script></head><body><div>bar</div></body></html>
diff --git a/crates/rspack_plugin_html/tests/fixtures/title/expected/index.html b/crates/rspack_plugin_html/tests/fixtures/title/expected/index.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>Rspack title</title>
-  </head>
+  <script src="/runtime.js" defer></script><script src="/index.js" defer></script></head>
   <body>
 
-<script src="/runtime.js" defer></script><script src="/index.js" defer></script></body></html>
+</body></html>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><meta charset=utf-8><title>rspack</title><body><script src=/runtime.js defer></script><script src=/index.js defer></script>
		<!doctype html><meta charset=utf-8><title>rspack</title><script src=/runtime.js defer></script><script src=/index.js defer></script>