Merge remote-tracking branch 'upstream/master' into refactor/use-repl…

…ace-test-with-includes
rollup · Dec 15, 2024 · 7862b7e · 7862b7e
2 parents 831b717 + 118d463
commit 7862b7e
Show file tree

Hide file tree

Showing 25 changed files with 256 additions and 69 deletions.
diff --git a/packages/commonjs/CHANGELOG.md b/packages/commonjs/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @rollup/plugin-commonjs ChangeLog
 
+## v28.0.2
+
+_2024-12-15_
+
+### Updates
+
+- docs: `output.exports` recommendation also applies to IIFE (#1810)
+
+## v28.0.1
+
+_2024-10-16_
+
+### Updates
+
+- chore: upgrade picomatch (#1775)
+
 ## v28.0.0
 
 _2024-09-23_

diff --git a/packages/commonjs/README.md b/packages/commonjs/README.md
@@ -408,7 +408,7 @@ export default {
 };
 ```
 
-When bundling to CommonJS, i.e `output.format === 'cjs'`, make sure that you do not set `output.exports` to `'named'`. The default value of `'auto'` will usually work, but you can also set it explicitly to `'default'`. That makes sure that Rollup assigns the default export that was generated for your CommonJS entry point to `module.exports`, and semantics do not change.
+When bundling to CommonJS or IIFE, i.e `output.format === 'cjs'` / `output.format === 'iife'`, make sure that you do not set `output.exports` to `'named'`. The default value of `'auto'` will usually work, but you can also set it explicitly to `'default'`. That makes sure that Rollup assigns the default export that was generated for your CommonJS entry point to `module.exports`, and semantics do not change.
 
 ## Using with @rollup/plugin-node-resolve
 

diff --git a/packages/commonjs/package.json b/packages/commonjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-commonjs",
-  "version": "28.0.0",
+  "version": "28.0.2",
   "publishConfig": {
     "access": "public"
   },
@@ -65,10 +65,10 @@
     "@rollup/pluginutils": "^5.0.1",
     "commondir": "^1.0.1",
     "estree-walker": "^2.0.2",
-    "fdir": "^6.1.1",
+    "fdir": "^6.2.0",
     "is-reference": "1.2.1",
     "magic-string": "^0.30.3",
-    "picomatch": "^2.3.1"
+    "picomatch": "^4.0.2"
   },
   "devDependencies": {
     "@rollup/plugin-json": "^5.0.0",

diff --git a/packages/dynamic-import-vars/CHANGELOG.md b/packages/dynamic-import-vars/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @rollup/plugin-dynamic-import-vars ChangeLog
 
+## v2.1.5
+
+_2024-10-21_
+
+### Updates
+
+- chore: revert 2.1.4 changes (#1799)
+
+## v2.1.4
+
+_2024-10-16_
+
+### Updates
+
+- chore: switch to tinyglobby for fewer dependencies (#1780)
+
 ## v2.1.3
 
 _2024-09-22_

diff --git a/packages/dynamic-import-vars/package.json b/packages/dynamic-import-vars/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-dynamic-import-vars",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/html/CHANGELOG.md b/packages/html/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @rollup/plugin-html ChangeLog
 
+## v1.1.0
+
+_2024-12-15_
+
+### Features
+
+- feat: implement scripts on head tag (#1816)
+
+## v1.0.5
+
+_2024-12-15_
+
+### Bugfixes
+
+- fix: types for plugin (#1264)
+
 ## v1.0.4
 
 _2024-09-22_

diff --git a/packages/html/README.md b/packages/html/README.md
@@ -48,6 +48,13 @@ Once run successfully, an HTML file should be written to the bundle output desti
 
 ## Options
 
+### `addScriptsToHead`
+
+Type: `Boolean`<br>
+Default: `false`
+
+Place scripts in the `<head>` tag instead of `<body>`.
+
 ### `attributes`
 
 Type: `Object`<br>

diff --git a/packages/html/package.json b/packages/html/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-html",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "publishConfig": {
     "access": "public"
   },

diff --git 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, addScriptsToHead }) => {
     let scripts = [...(files.js || [])];
     let links = [...(files.css || [])];
 
@@ -43,6 +43,11 @@ export default function htmlTemplate(externals) {
       })
       .join('\n');
 
+    if (addScriptsToHead === 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
@@ -31,22 +31,28 @@ const defaultTemplate = async ({
   files,
   meta,
   publicPath,
-  title
+  title,
+  addScriptsToHead
 }: 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 (addScriptsToHead === true) {
+    links += scripts;
+    scripts = '';
+  }
+
   const metas = meta
     .map((input) => {
       const attrs = makeHtmlAttributes(input);
@@ -70,7 +76,7 @@ const defaultTemplate = async ({
 
 const supportedFormats = ['es', 'esm', 'iife', 'umd'];
 
-const defaults = {
+const defaults: Required<RollupHtmlOptions> = {
   attributes: {
     link: null,
     html: { lang: 'en' },
@@ -80,15 +86,20 @@ const defaults = {
   meta: [{ charset: 'utf-8' }],
   publicPath: '',
   template: defaultTemplate,
-  title: 'Rollup Bundle'
+  title: 'Rollup Bundle',
+  addScriptsToHead: false
 };
 
 export default function html(opts: RollupHtmlOptions = {}): Plugin {
-  const { attributes, fileName, meta, publicPath, template, title } = Object.assign(
-    {},
-    defaults,
-    opts
-  );
+  const {
+    addScriptsToHead,
+    attributes,
+    fileName,
+    meta,
+    publicPath,
+    template,
+    title
+  }: Required<RollupHtmlOptions> = Object.assign({}, defaults, opts);
 
   return {
     name: 'html',
@@ -113,6 +124,7 @@ export default function html(opts: RollupHtmlOptions = {}): Plugin {
       const files = getFiles(bundle);
       const source = await template({
         attributes,
+        addScriptsToHead,
         bundle,
         files,
         meta,

diff --git 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
diff --git 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 }
+        },
+        addScriptsToHead: 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
@@ -1,21 +1,23 @@
 import type { Plugin, OutputChunk, OutputAsset, OutputBundle } from 'rollup';
 
 export interface RollupHtmlTemplateOptions {
-  title: string;
+  addScriptsToHead?: boolean;
   attributes: Record<string, any>;
-  publicPath: string;
-  meta: Record<string, any>[];
   bundle: OutputBundle;
   files: Record<string, (OutputChunk | OutputAsset)[]>;
+  meta: Record<string, any>[];
+  publicPath: string;
+  title: string;
 }
 
 export interface RollupHtmlOptions {
-  title?: string;
+  addScriptsToHead?: boolean;
   attributes?: Record<string, any>;
   fileName?: string;
   meta?: Record<string, any>[];
   publicPath?: string;
-  template?: (templateoptions: RollupHtmlTemplateOptions) => string;
+  template?: (templateoptions: RollupHtmlTemplateOptions) => string | Promise<string>;
+  title?: string;
 }
 
 export function makeHtmlAttributes(attributes: Record<string, string>): string;

diff --git a/packages/pluginutils/CHANGELOG.md b/packages/pluginutils/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @rollup/pluginutils ChangeLog
 
+## v5.1.3
+
+_2024-10-23_
+
+### Bugfixes
+
+- fix: upgrade picomatch (#1796)
+
 ## v5.1.2
 
 _2024-09-23_

diff --git a/packages/pluginutils/package.json b/packages/pluginutils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rollup/pluginutils",
-  "version": "5.1.2",
+  "version": "5.1.3",
   "publishConfig": {
     "access": "public"
   },
@@ -63,7 +63,7 @@
   "dependencies": {
     "@types/estree": "^1.0.0",
     "estree-walker": "^2.0.2",
-    "picomatch": "^2.3.1"
+    "picomatch": "^4.0.2"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^23.0.0",

diff --git a/packages/replace/CHANGELOG.md b/packages/replace/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @rollup/plugin-replace ChangeLog
 
+## v6.0.2
+
+_2024-12-15_
+
+### Bugfixes
+
+- fix: add missing types for `objectGuards` option (#1818)
+
 ## v6.0.1
 
 _2024-09-23_

diff --git a/packages/replace/package.json b/packages/replace/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-replace",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/replace/test/types.ts b/packages/replace/test/types.ts
@@ -16,6 +16,7 @@ const config: RollupOptions = {
       include: 'config.js',
       exclude: 'node_modules/**',
       delimiters: ['<@', '@>'],
+      objectGuards: true,
       preventAssignment: true,
       VERSION: '1.0.0',
       ENVIRONMENT: JSON.stringify('development'),
-Original file line number
+Diff line change
@@ Expand Up / @@ -408,7 +408,7 @@ export default { @@
     };
     ```
-    When bundling to CommonJS, i.e `output.format === 'cjs'`, make sure that you do not set `output.exports` to `'named'`. The default value of `'auto'` will usually work, but you can also set it explicitly to `'default'`. That makes sure that Rollup assigns the default export that was generated for your CommonJS entry point to `module.exports`, and semantics do not change.
+    When bundling to CommonJS or IIFE, i.e `output.format === 'cjs'` / `output.format === 'iife'`, make sure that you do not set `output.exports` to `'named'`. The default value of `'auto'` will usually work, but you can also set it explicitly to `'default'`. That makes sure that Rollup assigns the default export that was generated for your CommonJS entry point to `module.exports`, and semantics do not change.
     ## Using with @rollup/plugin-node-resolve
@@ Expand Down @@