From 78a92f511754084d162d472ba5d7fa69c2e0c173 Mon Sep 17 00:00:00 2001
From: TrueXPixells <umutfahriozkan@gmail.com>
Date: Fri, 22 Nov 2024 20:35:43 +0000
Subject: [PATCH 1/2] impl feat

---
 packages/html/README.md                       |   7 +++
 packages/html/recipes/external-files/index.js |   9 +++-
 packages/html/src/index.ts                    |  20 +++++---
 packages/html/test/snapshots/test.js.md       |  46 ++++++++++++++++++
 packages/html/test/snapshots/test.js.snap     | Bin 1452 -> 1529 bytes
 packages/html/test/test.js                    |  17 +++++++
 packages/html/types/index.d.ts                |   2 +
 7 files changed, 93 insertions(+), 8 deletions(-)

diff --git a/packages/html/README.md b/packages/html/README.md
index 56e5d68b0..b3a047543 100644
--- a/packages/html/README.md
+++ b/packages/html/README.md
@@ -121,6 +121,13 @@ Default: `'Rollup Bundle'`
 
 Specifies the HTML document title.
 
+### `scriptsOnHead`
+
+Type: `Boolean`<br>
+Default: `false`
+
+Place scripts in head instead body.
+
 ## Exports
 
 ### `makeHtmlAttributes(attributes)`
diff --git a/packages/html/recipes/external-files/index.js b/packages/html/recipes/external-files/index.js
index ea6697fe2..2c0553b20 100644
--- a/packages/html/recipes/external-files/index.js
+++ b/packages/html/recipes/external-files/index.js
@@ -4,10 +4,10 @@
  * @param {Array} externals List of external files.
  *   The format is: [{ type: 'js', file: '//xxxx1.js', pos: 'before' }, { type: 'css', file: '//xxxx1.css' }]
  *
- * @return {Function} The templae method required by plugin-html
+ * @return {Function} The template method required by plugin-html
  */
 export default function htmlTemplate(externals) {
-  return ({ attributes, files, meta, publicPath, title }) => {
+  return ({ attributes, files, meta, publicPath, title, scriptsOnHead }) => {
     let scripts = [...(files.js || [])];
     let links = [...(files.css || [])];
 
@@ -43,6 +43,11 @@ export default function htmlTemplate(externals) {
       })
       .join('\n');
 
+    if (scriptsOnHead === true) {
+      links += scripts;
+      scripts = '';
+    }
+
     const metas = meta
       .map((input) => {
         const attrs = makeHtmlAttributes(input);
diff --git a/packages/html/src/index.ts b/packages/html/src/index.ts
index c22650057..aec6aeef0 100644
--- a/packages/html/src/index.ts
+++ b/packages/html/src/index.ts
@@ -31,22 +31,28 @@ const defaultTemplate = async ({
   files,
   meta,
   publicPath,
-  title
+  title,
+  scriptsOnHead
 }: RollupHtmlTemplateOptions) => {
-  const scripts = (files.js || [])
+  let scripts = (files.js || [])
     .map(({ fileName }) => {
       const attrs = makeHtmlAttributes(attributes.script);
       return `<script src="${publicPath}${fileName}"${attrs}></script>`;
     })
     .join('\n');
 
-  const links = (files.css || [])
+  let links = (files.css || [])
     .map(({ fileName }) => {
       const attrs = makeHtmlAttributes(attributes.link);
       return `<link href="${publicPath}${fileName}" rel="stylesheet"${attrs}>`;
     })
     .join('\n');
 
+  if (scriptsOnHead === true) {
+    links += scripts;
+    scripts = '';
+  }
+
   const metas = meta
     .map((input) => {
       const attrs = makeHtmlAttributes(input);
@@ -80,11 +86,12 @@ const defaults = {
   meta: [{ charset: 'utf-8' }],
   publicPath: '',
   template: defaultTemplate,
-  title: 'Rollup Bundle'
+  title: 'Rollup Bundle',
+  scriptsOnHead: false
 };
 
 export default function html(opts: RollupHtmlOptions = {}): Plugin {
-  const { attributes, fileName, meta, publicPath, template, title } = Object.assign(
+  const { attributes, fileName, meta, publicPath, template, title, scriptsOnHead } = Object.assign(
     {},
     defaults,
     opts
@@ -117,7 +124,8 @@ export default function html(opts: RollupHtmlOptions = {}): Plugin {
         files,
         meta,
         publicPath,
-        title
+        title,
+        scriptsOnHead
       });
 
       const htmlFile: EmittedAsset = {
diff --git a/packages/html/test/snapshots/test.js.md b/packages/html/test/snapshots/test.js.md
index 39485f833..60a6d7206 100644
--- a/packages/html/test/snapshots/test.js.md
+++ b/packages/html/test/snapshots/test.js.md
@@ -353,3 +353,49 @@ Generated by [AVA](https://avajs.dev).
         source: '<html><body><main></main></body></html>',
       },
     ]
+
+## scripts on head
+
+> Snapshot 1
+
+    [
+      {
+        code: `(function (factory) {␊
+        	typeof define === 'function' && define.amd ? define(factory) :␊
+        	factory();␊
+        })((function () { 'use strict';␊
+        ␊
+        ␊
+        ␊
+        }));␊
+        `,
+        fileName: 'joker.js',
+        map: null,
+        source: undefined,
+      },
+      {
+        code: undefined,
+        fileName: 'joker.css',
+        map: undefined,
+        source: Buffer @Uint8Array [
+          2a207b20 77696474 683a2031 3030253b 207d0a
+        ],
+      },
+      {
+        code: undefined,
+        fileName: 'index.html',
+        map: undefined,
+        source: `␊
+        <!doctype html>␊
+        <html>␊
+          <head>␊
+            <meta charset="utf-8">␊
+            <title>Rollup Bundle</title>␊
+            <link href="joker.css" rel="stylesheet"><script src="joker.js" defer="true"></script>␊
+          </head>␊
+          <body>␊
+            ␊
+          </body>␊
+        </html>`,
+      },
+    ]
diff --git a/packages/html/test/snapshots/test.js.snap b/packages/html/test/snapshots/test.js.snap
index 8d01f6b5c7b41ccd803c846940ae1c093c57d6e6..0a08f11f73716863bfddb0d148d7344e76ec311f 100644
GIT binary patch
literal 1529
zcmV<V1qS*-RzV<BZeeh9Xm4~Nb~6eC0M`SAR*o;yegSIWx~vP{-OTlolb6}@?_tk9
zFx~s1qaTY100000000B+SxsykMHK$t+WFfwKW(^FmCCTFb%OHK0;;0Kc1hH#DulEu
zjj94tJKi0~lkAV#olR@1R8TlTB@j0_Afc8Ea6w$)NX6fwcO;HQ^u~b$Cj=6(UfXG0
zr*3GICN#e6?Cg8b&$Hk6y*J}4`JC;U^TFk-LP=!{&k}ha+KPEaB|SHgfy;|Q!BfHO
zS1gMwep>r0fi^@RYNy0L00#g(1E7yuw^Pf6@ADE-b=1?-1JXensFUcq*s+u7Vsxb_
zM#~ofz5;NDfVT<wm@2VakLBissYt60dwYA!F4qY7fq<V0*row{wK|u?a+fYp64Zk}
z(jK7%sAW4PP0tdQ8|^as^Py`-KbiICxv4zAG{7$C9ja6mUY=PZFI~YhnG8!+4O49I
z-pYev?pW+#<z~r$Oz)_S`v=DL#ex1?zGQ%1V5u+=EKt5QRcc(<b$xMQU|g@uvpp|u
zG0mN7uGEp^%Hi(tTu^73aCosiPIT2hX$`#4H{%FxT}_swt={{#40P#Q;{0$yIrd5^
z+!o~46k4`xUqVkmW_f0`zAOrq)zi_1+1#DY7{WEOI%DaA;8rwXEbR!znOWd|AXLT(
zReosHs5~koH+#af?XbuuL)WrJdL*7K8$^*ts-e<3&ni_M1Jjp9#RA{V7`0V3vgwid
zLD_sHwoi|gv#ii$c13z5W;Pf-x-=lQMUQo)M`tC2d*Men-5-9$(=K;J##oTzT+#ED
z!A#Fp!c`f=k*;(?XDBeaEi(HDnRKO+++LbECoNUTSYkn%VyJwxoOP32nS9~D@hx&3
zSrzXrDf6O1P5NN1NcSgzJp>$VPP&%~$Putez$XNJQ}41m(ot$T9rTU{eCXd4gxIPV
zrU;w{uzhW<VEZG0zX9xQ4%-6+qzO1hz$F4cyhqs5!vV<eHZUMrlvKuWJS()t-N5tw
z&d?3QVpJT2#k^1zL&fr*?{Kw*+Dlc`zPnba{RKc50jcJwJw(8>1PB7&BjB@pL~T!<
zxNc#1(_r}iis`F0SSCLO@Hv2=0PJcC$>fs+j1piHu&ch|PTmH`#GT-{?eO!*Po6$A
zIWv7|>TsQ5n<IjN&(>@oKO$V=^N6|JWx^?{5;F^-J3q!M>uC&wx{0zHP<3jFTEd`t
zBHhQQW{w=4K67f~#PreWBX>?kdmlwRoR#iS^kT-?$%0reCM;#n1t}&2=6Z@*(if((
zOROe6!)$_?VW2#RomIjq+FXgVk$KVgay)03m@i%lr5{<oP}8e8cEF@-+My-Jm<R@$
z2%JF{b&G>6bgX(F#A()kaZI9i(o7AI+H%Mw>LEj*ZBew^Vz$Q1T&?wH&|qJfJbMc~
zlTQN}18@kyv1SlWl!5tT4WjQ<AlgZEEgEWNMf@GW9{{fWtBltPxY=ApNdww6z|epx
z4ahgyCbm<{MGbgU13uD#>l$#g-lgULyR&Sc^X7&B042X8PQVOS%pi)<P4ru0iRqOb
zHbTAmbv^4%+LrD-EBGRxF>32(FkjdiBTyw<1O*{f{EbcPQuWQRqAY=SQ(|`#7)=7%
zWR)h9VLmVXs2=Du(p94|(|dbBk75V)J;5%-TkbKof8V}6<7`nczd5Q~Sv^-$VoJEP
zs!*OvQeQ=W=D1S6%!NucQlU4tRA@_u)=7nSBsZiAt$4JS<0_D|F1Is==Nc7J%5n7o
zREb4w9a@mK<Zi`q)k<ZFyzn!I^256js);1<QWD_nCsec2i5j>@XXx!~d4~QL0au&L
z($@rhPrwZVIyGR=Lv)7T?t3}8$v3y(Zn({Dbx~J;K2xY}h8mn9+8gZurmeqYHy>Fj
zRi;KZMsC{S(#@tvDwlX}86LeDumSU27NNdDqdBwHXl`;~Z=Oc;=EmIa-dLdmJ%CN_
f>RZGH#cYMvu`dY>C4r~bp>_NRFmgxFuOt8fKY`|2

literal 1452
zcmV;d1ylM#RzV<BZeeh9Xm4~Nb~6eC081bWk%3xv>SYy9^m?uXzrYB2^CvG^5gXcI
zk|@6}tRIUA00000000B+SxsydRUDtUyZsvI2jGQ};ByS!*3cG=A*Adswt*0|7J@Vc
zHKA{3-t4}1KGu0}3acqm^dKf0Z+b8>;6=R{FM5>tb>ME|Q6o1G9y}RM^fx=RTe>VP
z6<S*9Ccn&^ng9RofBy6P{olu2v5Ssx&dbYJxf06ZzQt`8I*R%gC45f`>9L9|`%1ok
z#j==UXH$QtwJt6Ck#3UShvNa@X<!HG+(tSkf`C;Cski$3`!%9#B&CrpgghHNqIEGk
zlBkc4FVOr7I7c+?GVn1;`szGUoa3e<sYY{PV4&u54JJPTzW`fPnl_kfa!D_D>D5R^
zBmJ;RJwnnN>DWdxCZ07pNxiKN*`a4fk4%SbW-33Z4%1il9#ySy-=@fl@Hoxq^E6vG
z%+kTZ<i;p-EqXXPS@Iv(dy@9h@F9J1c<81-LGLshN=~H;gsHNJbo>^FVb>IAw=En#
z&D?sdq^HP~%e>J!*<_h^S*6xa_cq<>lztePaSvU+ZPL-z?0riFy6`N1VYIAV=XN37
z(#g#sAmLwXdhRjHH>3R0sH1|Oiw@LbUMX*I&nW1W=E|H|Q3FkvD@M&S3nW*0BUJXt
zK_j_UV{YM;?>J$FPKKW4@Z4B@v1SnUG*<5_SM;rF;wa5PR1}qgnKv3)H43@0_(siq
zEVf4nQIv^HO1G6qdS;!;qZiW1Zpvc~<*_A+;9m66NA8b4;>#YQ%Nq-VpRf3VGN|c$
zihD3~g(uw59g!w;cz*w0igP8HvvlFSuv9s3@daV>k=n^})lD*GvW5Sqx5#m9MY^+u
zuz8Cy>4Vi0-Cw{SsOWHe(Y*wdBCrU20({f#vNF+;>~cBiJuUPwv>^nsIbN7tx-Dq?
z+G^4EN8le|XM5TnfJqKG16%?=yhqxShl7yctz$ycC@2(n-wGXmH}t%)GxTIwi3SI5
zQ9o3bP*K|tT&9*-d#TRacUOzGzXH9WU$#AKkHF*^fCKLVpWP#C`<sgECWki+hwpDO
zeWgLm%%^C64*Ue{YD>w?lQ205n82>)33uieI;QVL$E`=7J9+x-xyhO7BU4A447*$|
zB`Y;-A3w%D9<WHc%%j|`s48Aj=*^GQB%j8pM*0XTAgH=iM>Hjr?E~pMIW=?a`1H9m
z6Q`z+PanH;D5>|giW8QEHxj*=aeBJUmlqS7HRoiO3Q0X*QA-5Khf}4E(lbgYs2NJ-
zyL49JNgO=YY-C;u{30vDG~h3XaD(OZjd~ULEirdBozUXrl*_$<i`gt@i+gG4TFp9$
z!)!cpETV3bGLa&YT27gCGiAVztx<1{WOl}Bu8;MmY_TrP%-%%L%u_gy14n=p?I@bA
z5%YxxMc+v%isrSbnW|O9KhXRWxB~iJ2X3@4qVUwZ00Wo;>^93pxLkzEo4`lFb>K#`
zOUM6rW!XLF&-35`mi(SL0PyQh6(36fJ-wv#B!=}c-u$+f<4w*H-aIV_+|C<~ycsAU
zPTr8J>Tp@+T*d#`c3i5z`4tRH8re<KyE7OQfI_A&lgZGwc@T{U`i$_@!C2`7Q2L|V
zcCzCMu(P(x9;f^F?b~yRF6y;6N18IL7psa-aj&GxwM!YYBPl;~Oo7<NQ1Mn(=#9-P
zv{{ALs0wY*tjj8N+pRT>;!>16h63SxMpBe;@c~pN8mV<;K{$eWiQ$SX73j!=yrF{d
zE(+BI-qni$Tf0J45^gksYqf{oy_$RIZvj`^m!+>^@;&e~um$yH&qK6_-i_(D*x-xX
zZ`a-8ww~0L@6VL$i=h^Kh|W6u-n98ScH@bKWNXqW#LUgPOn6{ra)__ReEb(41#k2(
GAOHYrHP#aV

diff --git a/packages/html/test/test.js b/packages/html/test/test.js
index a6a361eff..676664863 100644
--- a/packages/html/test/test.js
+++ b/packages/html/test/test.js
@@ -120,3 +120,20 @@ test.serial('template', async (t) => {
   const code = await getCode(bundle, output, true);
   t.snapshot(code);
 });
+
+test.serial('scripts on head', async (t) => {
+  const bundle = await rollup({
+    input: 'joker.js',
+    plugins: [
+      css({ extract: true }),
+      html({
+        attributes: {
+          script: { defer: true }
+        },
+        scriptsOnHead: true
+      })
+    ]
+  });
+  const code = await getCode(bundle, output, true);
+  t.snapshot(code);
+});
diff --git a/packages/html/types/index.d.ts b/packages/html/types/index.d.ts
index 715e9a03c..4fb36d744 100644
--- a/packages/html/types/index.d.ts
+++ b/packages/html/types/index.d.ts
@@ -7,6 +7,7 @@ export interface RollupHtmlTemplateOptions {
   meta: Record<string, any>[];
   bundle: OutputBundle;
   files: Record<string, (OutputChunk | OutputAsset)[]>;
+  scriptsOnHead?: boolean;
 }
 
 export interface RollupHtmlOptions {
@@ -16,6 +17,7 @@ export interface RollupHtmlOptions {
   meta?: Record<string, any>[];
   publicPath?: string;
   template?: (templateoptions: RollupHtmlTemplateOptions) => string;
+  scriptsOnHead?: boolean;
 }
 
 export function makeHtmlAttributes(attributes: Record<string, string>): string;

From 5426ba997761e63b3fe8dfe36639a6cb8e00c8c4 Mon Sep 17 00:00:00 2001
From: shellscape <andrew@shellscape.org>
Date: Sun, 15 Dec 2024 10:54:13 -0500
Subject: [PATCH 2/2] chore: refactor option name

---
 packages/html/src/index.ts | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/html/src/index.ts b/packages/html/src/index.ts
index bd10b6496..73cd7f1a1 100644
--- a/packages/html/src/index.ts
+++ b/packages/html/src/index.ts
@@ -91,13 +91,15 @@ const defaults: Required<RollupHtmlOptions> = {
 };
 
 export default function html(opts: RollupHtmlOptions = {}): Plugin {
-  // const { attributes, fileName, meta, publicPath, template, title, addScriptsToHead } = Object.assign(
-  //   {},
-  //   defaults,
-  //   opts
-  // );
-  const { attributes, fileName, meta, publicPath, template, title }: Required<RollupHtmlOptions> =
-    Object.assign({}, defaults, opts);
+  const {
+    addScriptsToHead,
+    attributes,
+    fileName,
+    meta,
+    publicPath,
+    template,
+    title
+  }: Required<RollupHtmlOptions> = Object.assign({}, defaults, opts);
 
   return {
     name: 'html',
@@ -122,12 +124,12 @@ export default function html(opts: RollupHtmlOptions = {}): Plugin {
       const files = getFiles(bundle);
       const source = await template({
         attributes,
+        addScriptsToHead,
         bundle,
         files,
         meta,
         publicPath,
-        title,
-        addScriptsToHead
+        title
       });
 
       const htmlFile: EmittedAsset = {