@web/rollup-plugin-html 2.4.0 → 3.0.0

package/dist/output/injectedUpdatedAssetPaths.js

@@ -20,7 +20,7 @@ function getSrcSetUrlWidthPairs(srcset) {
     return urls;
 }
 function injectedUpdatedAssetPaths(args) {
-    const { document, input, outputDir, rootDir, emittedAssets, externalAssets, publicPath = './', absolutePathPrefix, } = args;
+    const { document, input, outputDir, rootDir, emittedAssets, extractAssets = true, externalAssets, publicPath = './', absolutePathPrefix, } = args;
     const assetNodes = (0, utils_js_1.findAssets)(document);
     const isExternal = (0, utils_js_1.createAssetPicomatchMatcher)(externalAssets);
     for (const node of assetNodes) {
@@ -31,7 +31,9 @@ function injectedUpdatedAssetPaths(args) {
             const htmlFilePath = input.filePath ? input.filePath : path_1.default.join(rootDir, input.name);
             const htmlDir = path_1.default.dirname(htmlFilePath);
             const filePath = (0, utils_js_1.resolveAssetFilePath)(sourcePath, htmlDir, rootDir, absolutePathPrefix);
-            const assetPaths = (0, utils_js_1.isHashedAsset)(node) ? emittedAssets.hashed : emittedAssets.static;
+            const assetPaths = (0, utils_js_1.isHashedAsset)(node, extractAssets)
+                ? emittedAssets.hashed
+                : emittedAssets.static;
             const relativeOutputPath = assetPaths.get(filePath);
             if (!relativeOutputPath) {
                 throw (0, utils_js_2.createError)(`Something went wrong while bundling HTML file ${input.name}. Could not find ${filePath} in emitted rollup assets.`);

package/dist/output/injectedUpdatedAssetPaths.js.map

@@ -1 +1 @@
-{"version":3,"file":"injectedUpdatedAssetPaths.js","sourceRoot":"","sources":["../../src/output/injectedUpdatedAssetPaths.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"injectedUpdatedAssetPaths.js","sourceRoot":"","sources":["../../src/output/injectedUpdatedAssetPaths.ts"],"names":[],"mappings":"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"}

package/dist/rollupPluginHTML.d.ts

@@ -4,7 +4,7 @@ import { RollupPluginHTMLOptions, TransformHtmlFunction } from './RollupPluginHT
 export interface RollupPluginHtml extends Plugin {
     api: {
         getInputs(): InputData[];
-        addHtmlTransformer(transformHtmlFunction: TransformHtmlFunction, transformStage?: 'input' | 'output'): void;
+        addHtmlTransformer(transformHtmlFunction: TransformHtmlFunction): void;
         disableDefaultInject(): void;
         addOutput(name: string): Plugin;
     };

package/dist/rollupPluginHTML.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rollupPluginHTML.d.ts","sourceRoot":"","sources":["../src/rollupPluginHTML.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAKhC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGjD,OAAO,EAEL,uBAAuB,EAEvB,qBAAqB,EACtB,MAAM,8BAA8B,CAAC;AAItC,MAAM,WAAW,gBAAiB,SAAQ,MAAM;IAC9C,GAAG,EAAE;QACH,SAAS,IAAI,SAAS,EAAE,CAAC;QACzB,kBAAkB,CAChB,qBAAqB,EAAE,qBAAqB,EAC5C,cAAc,CAAC,EAAE,OAAO,GAAG,QAAQ,GAClC,IAAI,CAAC;QACR,oBAAoB,IAAI,IAAI,CAAC;QAC7B,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;KACjC,CAAC;CACH;AAED,wBAAgB,gBAAgB,CAAC,aAAa,GAAE,uBAA4B,GAAG,gBAAgB,CAkN9F"}
+{"version":3,"file":"rollupPluginHTML.d.ts","sourceRoot":"","sources":["../src/rollupPluginHTML.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAKhC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGjD,OAAO,EAEL,uBAAuB,EAEvB,qBAAqB,EACtB,MAAM,8BAA8B,CAAC;AAItC,MAAM,WAAW,gBAAiB,SAAQ,MAAM;IAC9C,GAAG,EAAE;QACH,SAAS,IAAI,SAAS,EAAE,CAAC;QACzB,kBAAkB,CAAC,qBAAqB,EAAE,qBAAqB,GAAG,IAAI,CAAC;QACvE,oBAAoB,IAAI,IAAI,CAAC;QAC7B,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;KACjC,CAAC;CACH;AAED,wBAAgB,gBAAgB,CAAC,aAAa,GAAE,uBAA4B,GAAG,gBAAgB,CAsM9F"}

package/dist/rollupPluginHTML.js

@@ -14,8 +14,7 @@ function rollupPluginHTML(pluginOptions = {}) {
     const multiOutputNames = [];
     let inputs = [];
     let generatedBundles = [];
-    let inputExternalTransformHtmlFns = [];
-    let outputExternalTransformHtmlFns = [];
+    let externalTransformHtmlFns = [];
     let defaultInjectDisabled = false;
     let serviceWorkerPath = '';
     let injectServiceWorker = false;
@@ -24,8 +23,7 @@ function rollupPluginHTML(pluginOptions = {}) {
     function reset() {
         inputs = [];
         generatedBundles = [];
-        inputExternalTransformHtmlFns = [];
-        outputExternalTransformHtmlFns = [];
+        externalTransformHtmlFns = [];
     }
     return {
         name: '@web/rollup-plugin-html',
@@ -53,7 +51,6 @@ function rollupPluginHTML(pluginOptions = {}) {
             if (pluginOptions.strictCSPInlineScripts) {
                 strictCSPInlineScripts = pluginOptions.strictCSPInlineScripts;
             }
-            pluginOptions.bundleAssetsFromCss = !!pluginOptions.bundleAssetsFromCss;
             if (pluginOptions.input == null) {
                 // we are reading rollup input, so replace whatever was there
                 return Object.assign(Object.assign({}, inputOptions), { input: moduleImports.map(mod => mod.importPath) });
@@ -118,8 +115,7 @@ function rollupPluginHTML(pluginOptions = {}) {
                 inputs,
                 emittedAssets,
                 generatedBundles,
-                inputExternalTransformHtmlFns,
-                outputExternalTransformHtmlFns,
+                externalTransformHtmlFns,
                 pluginOptions,
                 defaultInjectDisabled,
                 serviceWorkerPath,
@@ -135,13 +131,8 @@ function rollupPluginHTML(pluginOptions = {}) {
             getInputs() {
                 return inputs;
             },
-            addHtmlTransformer(transformHtmlFunction, transformStage = 'output') {
-                if (transformStage === 'input') {
-                    inputExternalTransformHtmlFns.push(transformHtmlFunction);
-                }
-                else {
-                    outputExternalTransformHtmlFns.push(transformHtmlFunction);
-                }
+            addHtmlTransformer(transformHtmlFunction) {
+                externalTransformHtmlFns.push(transformHtmlFunction);
             },
             disableDefaultInject() {
                 defaultInjectDisabled = true;
@@ -170,8 +161,7 @@ function rollupPluginHTML(pluginOptions = {}) {
                                 inputs,
                                 emittedAssets,
                                 generatedBundles,
-                                inputExternalTransformHtmlFns,
-                                outputExternalTransformHtmlFns,
+                                externalTransformHtmlFns,
                                 pluginOptions,
                                 defaultInjectDisabled,
                                 serviceWorkerPath,

package/dist/rollupPluginHTML.js.map

@@ -1 +1 @@
-{"version":3,"file":"rollupPluginHTML.js","sourceRoot":"","sources":["../src/rollupPluginHTML.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rollupPluginHTML.js","sourceRoot":"","sources":["../src/rollupPluginHTML.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web/rollup-plugin-html",
-  "version": "2.4.0",
+  "version": "3.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -52,8 +52,11 @@
     "picomatch": "^2.2.2"
   },
   "devDependencies": {
+    "@prettier/sync": "^0.6.1",
     "@types/html-minifier-terser": "^7.0.0",
     "@types/picomatch": "^2.2.1",
+    "@types/prettier": "^3.0.0",
+    "prettier": "^3.6.2",
     "rollup": "^4.4.0"
   }
 }

package/src/RollupPluginHTMLOptions.ts

@@ -27,8 +27,8 @@ export interface RollupPluginHTMLOptions {
   transformAsset?: TransformAssetFunction | TransformAssetFunction[];
   /** Transform HTML file before output. */
   transformHtml?: TransformHtmlFunction | TransformHtmlFunction[];
-  /** Whether to extract and bundle assets referenced in HTML. Defaults to true. */
-  extractAssets?: boolean;
+  /** Whether to extract and bundle assets referenced in HTML and CSS. Defaults to true. */
+  extractAssets?: boolean | 'legacy-html' | 'legacy-html-and-css';
   /** Whether to ignore assets referenced in HTML and CSS with glob patterns. */
   externalAssets?: string | string[];
   /** Define a full absolute url to your site (e.g. https://domain.com) */
@@ -43,8 +43,6 @@ export interface RollupPluginHTMLOptions {
   absolutePathPrefix?: string;
   /** When set to true, will insert meta tags for CSP and add script-src values for inline scripts by sha256-hashing the contents */
   strictCSPInlineScripts?: boolean;
-  /** Bundle assets reference from CSS via `url` */
-  bundleAssetsFromCss?: boolean;
 }
 
 export interface GeneratedBundle {

package/src/assets/utils.ts

@@ -5,8 +5,18 @@ import { findElements, getTagName, getAttribute } from '@web/parse5-utils';
 import { createError } from '../utils.js';
 import { serialize } from 'v8';
 
-const hashedLinkRels = ['stylesheet'];
-const linkRels = [...hashedLinkRels, 'icon', 'manifest', 'apple-touch-icon', 'mask-icon'];
+const assetLinkRels = [
+  'icon',
+  'apple-touch-icon',
+  'mask-icon',
+  'stylesheet',
+  'manifest',
+  'preload',
+  'prefetch',
+  'modulepreload',
+];
+const legacyHashedLinkRels = ['stylesheet'];
+const assetMetaProperties = ['og:image'];
 
 function getSrcSetUrls(srcset: string) {
   if (!srcset) {
@@ -41,13 +51,14 @@ function isAsset(node: Element) {
         path = extractFirstUrlOfSrcSet(node) ?? '';
       }
       break;
-    case 'link':
-      if (linkRels.includes(getAttribute(node, 'rel') ?? '')) {
+    case 'link': {
+      if (assetLinkRels.includes(getAttribute(node, 'rel') ?? '')) {
         path = getAttribute(node, 'href') ?? '';
       }
       break;
+    }
     case 'meta':
-      if (getAttribute(node, 'property') === 'og:image' && getAttribute(node, 'content')) {
+      if (assetMetaProperties.includes(getAttribute(node, 'property') ?? '')) {
         path = getAttribute(node, 'content') ?? '';
       }
       break;
@@ -70,7 +81,10 @@ function isAsset(node: Element) {
   }
 }
 
-export function isHashedAsset(node: Element) {
+export function isHashedAsset(
+  node: Element,
+  extractAssets: boolean | 'legacy-html' | 'legacy-html-and-css',
+) {
   switch (getTagName(node)) {
     case 'img':
       return true;
@@ -78,8 +92,13 @@ export function isHashedAsset(node: Element) {
       return true;
     case 'script':
       return true;
-    case 'link':
-      return hashedLinkRels.includes(getAttribute(node, 'rel')!);
+    case 'link': {
+      if (extractAssets === 'legacy-html' || extractAssets === 'legacy-html-and-css') {
+        return legacyHashedLinkRels.includes(getAttribute(node, 'rel') ?? '');
+      } else {
+        return true;
+      }
+    }
     case 'meta':
       return true;
     default:

package/src/input/extract/extractAssets.ts

@@ -15,6 +15,7 @@ export interface ExtractAssetsParams {
   htmlFilePath: string;
   htmlDir: string;
   rootDir: string;
+  extractAssets: boolean | 'legacy-html' | 'legacy-html-and-css';
   externalAssets?: string | string[];
   absolutePathPrefix?: string;
 }
@@ -35,7 +36,7 @@ export function extractAssets(params: ExtractAssetsParams): InputAsset[] {
         params.rootDir,
         params.absolutePathPrefix,
       );
-      const hashed = isHashedAsset(node);
+      const hashed = isHashedAsset(node, params.extractAssets);
       const alreadyHandled = allAssets.find(a => a.filePath === filePath && a.hashed === hashed);
       if (!alreadyHandled) {
         try {
@@ -49,7 +50,7 @@ export function extractAssets(params: ExtractAssetsParams): InputAsset[] {
         }
 
         const content = fs.readFileSync(filePath);
-        allAssets.push({ filePath, hashed, content });
+        allAssets.push({ filePath, hashed: hashed, content });
       }
     }
   }

package/src/input/extract/extractModulesAndAssets.ts

@@ -7,7 +7,7 @@ export interface ExtractParams {
   html: string;
   htmlFilePath: string;
   rootDir: string;
-  extractAssets: boolean;
+  extractAssets: boolean | 'legacy-html' | 'legacy-html-and-css';
   externalAssets?: string | string[];
   absolutePathPrefix?: string;
 }
@@ -30,6 +30,7 @@ export function extractModulesAndAssets(params: ExtractParams) {
         htmlDir,
         htmlFilePath,
         rootDir,
+        extractAssets: params.extractAssets,
         externalAssets,
         absolutePathPrefix,
       })

package/src/input/getInputData.ts

@@ -30,14 +30,21 @@ export interface CreateInputDataParams {
   html: string;
   rootDir: string;
   filePath?: string;
-  extractAssets: boolean;
+  extractAssets: boolean | 'legacy-html' | 'legacy-html-and-css';
   externalAssets?: string | string[];
   absolutePathPrefix?: string;
 }
 
 function createInputData(params: CreateInputDataParams): InputData {
-  const { name, html, rootDir, filePath, extractAssets, externalAssets, absolutePathPrefix } =
-    params;
+  const {
+    name,
+    html,
+    rootDir,
+    filePath,
+    extractAssets = true,
+    externalAssets,
+    absolutePathPrefix,
+  } = params;
   const htmlFilePath = filePath ? filePath : path.resolve(rootDir, name);
   const result = extractModulesAndAssets({
     html,

package/src/output/createHTMLOutput.ts

@@ -1,3 +1,4 @@
+import * as path from 'path';
 import { getEntrypointBundles } from './getEntrypointBundles.js';
 import { getOutputHTML } from './getOutputHTML.js';
 import { createError } from '../utils.js';
@@ -15,8 +16,7 @@ export interface CreateHTMLAssetParams {
   input: InputData;
   emittedAssets: EmittedAssets;
   generatedBundles: GeneratedBundle[];
-  inputExternalTransformHtmlFns: TransformHtmlFunction[];
-  outputExternalTransformHtmlFns: TransformHtmlFunction[];
+  externalTransformHtmlFns: TransformHtmlFunction[];
   pluginOptions: RollupPluginHTMLOptions;
   defaultInjectDisabled: boolean;
   serviceWorkerPath: string;
@@ -31,8 +31,7 @@ export async function createHTMLAsset(params: CreateHTMLAssetParams): Promise<Em
     input,
     emittedAssets,
     generatedBundles,
-    inputExternalTransformHtmlFns,
-    outputExternalTransformHtmlFns,
+    externalTransformHtmlFns,
     pluginOptions,
     defaultInjectDisabled,
     serviceWorkerPath,
@@ -59,8 +58,7 @@ export async function createHTMLAsset(params: CreateHTMLAssetParams): Promise<Em
     input,
     outputDir,
     emittedAssets,
-    inputExternalTransformHtmlFns,
-    outputExternalTransformHtmlFns,
+    externalTransformHtmlFns,
     defaultInjectDisabled,
     serviceWorkerPath,
     injectServiceWorker,
@@ -68,7 +66,14 @@ export async function createHTMLAsset(params: CreateHTMLAssetParams): Promise<Em
     strictCSPInlineScripts,
   });
 
-  return { fileName: input.name, name: input.name, source: outputHtml, type: 'asset' };
+  const normalizedInputName = input.name.split(path.sep).join('/');
+
+  return {
+    fileName: normalizedInputName,
+    name: normalizedInputName,
+    source: outputHtml,
+    type: 'asset',
+  };
 }
 
 export interface CreateHTMLAssetsParams {
@@ -76,8 +81,7 @@ export interface CreateHTMLAssetsParams {
   inputs: InputData[];
   emittedAssets: EmittedAssets;
   generatedBundles: GeneratedBundle[];
-  inputExternalTransformHtmlFns: TransformHtmlFunction[];
-  outputExternalTransformHtmlFns: TransformHtmlFunction[];
+  externalTransformHtmlFns: TransformHtmlFunction[];
   pluginOptions: RollupPluginHTMLOptions;
   defaultInjectDisabled: boolean;
   serviceWorkerPath: string;

package/src/output/emitAssets.ts

@@ -4,6 +4,7 @@ import { transform } from 'lightningcss';
 import fs from 'fs';
 
 import { InputAsset, InputData } from '../input/InputData';
+import { toBrowserPath } from './utils.js';
 import { createAssetPicomatchMatcher } from '../assets/utils.js';
 import { RollupPluginHTMLOptions, TransformAssetFunction } from '../RollupPluginHTMLOptions';
 
@@ -39,6 +40,8 @@ export async function emitAssets(
   inputs: InputData[],
   options: RollupPluginHTMLOptions,
 ) {
+  const extractAssets = options.extractAssets ?? true;
+  const extractAssetsLegacyCss = options.extractAssets === 'legacy-html-and-css';
   const emittedStaticAssets = new Map<string, string>();
   const emittedHashedAssets = new Map<string, string>();
   const emittedStaticAssetNames = new Set();
@@ -85,7 +88,7 @@ export async function emitAssets(
       const isExternal = createAssetPicomatchMatcher(options.externalAssets);
       const emittedExternalAssets = new Map();
       if (asset.hashed) {
-        if (basename.endsWith('.css') && options.bundleAssetsFromCss) {
+        if (basename.endsWith('.css') && extractAssets) {
           let updatedCssSource = false;
           const { code } = await transform({
             filename: basename,
@@ -104,22 +107,47 @@ export async function emitAssets(
 
                   // Avoid duplicates
                   if (!emittedExternalAssets.has(assetLocation)) {
-                    const fontFileRef = this.emitFile({
+                    const basename = path.basename(filePath);
+                    const fileRef = this.emitFile({
                       type: 'asset',
-                      name: path.join('assets', path.basename(filePath)),
+                      name: extractAssetsLegacyCss ? `assets/${basename}` : basename,
                       source: assetContent,
                     });
-                    const emittedAssetFilePath = path.basename(this.getFileName(fontFileRef));
-                    emittedExternalAssets.set(assetLocation, emittedAssetFilePath);
+                    const emittedAssetFilepath = this.getFileName(fileRef);
+                    const emittedAssetBasename = path.basename(emittedAssetFilepath);
+                    emittedExternalAssets.set(assetLocation, emittedAssetFilepath);
                     // Update the URL in the original CSS file to point to the emitted asset file
-                    url.url = `assets/${
-                      idRef ? `${emittedAssetFilePath}#${idRef}` : emittedAssetFilePath
-                    }`;
+                    if (extractAssetsLegacyCss) {
+                      url.url = `assets/${emittedAssetBasename}`;
+                    } else {
+                      if (options.publicPath) {
+                        url.url = toBrowserPath(
+                          path.join(options.publicPath, emittedAssetFilepath),
+                        );
+                      } else {
+                        url.url = emittedAssetBasename;
+                      }
+                    }
+                    if (idRef) {
+                      url.url = `${url.url}#${idRef}`;
+                    }
                   } else {
-                    const emittedAssetFilePath = emittedExternalAssets.get(assetLocation);
-                    url.url = `assets/${
-                      idRef ? `${emittedAssetFilePath}#${idRef}` : emittedAssetFilePath
-                    }`;
+                    const emittedAssetFilepath = emittedExternalAssets.get(assetLocation);
+                    const emittedAssetBasename = path.basename(emittedAssetFilepath);
+                    if (extractAssetsLegacyCss) {
+                      url.url = `assets/${emittedAssetBasename}`;
+                    } else {
+                      if (options.publicPath) {
+                        url.url = toBrowserPath(
+                          path.join(options.publicPath, emittedAssetFilepath),
+                        );
+                      } else {
+                        url.url = emittedAssetBasename;
+                      }
+                    }
+                    if (idRef) {
+                      url.url = `${url.url}#${idRef}`;
+                    }
                   }
                 }
                 updatedCssSource = true;

package/src/output/getOutputHTML.ts

@@ -19,8 +19,7 @@ export interface GetOutputHTMLParams {
   emittedAssets: EmittedAssets;
   pluginOptions: RollupPluginHTMLOptions;
   entrypointBundles: Record<string, EntrypointBundle>;
-  inputExternalTransformHtmlFns?: TransformHtmlFunction[];
-  outputExternalTransformHtmlFns?: TransformHtmlFunction[];
+  externalTransformHtmlFns?: TransformHtmlFunction[];
   defaultInjectDisabled: boolean;
   serviceWorkerPath: string;
   injectServiceWorker: boolean;
@@ -32,8 +31,7 @@ export async function getOutputHTML(params: GetOutputHTMLParams) {
   const {
     pluginOptions,
     entrypointBundles,
-    inputExternalTransformHtmlFns,
-    outputExternalTransformHtmlFns,
+    externalTransformHtmlFns,
     input,
     outputDir,
     emittedAssets,
@@ -46,20 +44,8 @@ export async function getOutputHTML(params: GetOutputHTMLParams) {
   const { default: defaultBundle, ...multiBundles } = entrypointBundles;
   const { absoluteSocialMediaUrls = true, rootDir = process.cwd() } = pluginOptions;
 
-  let inputHtml = input.html;
-
-  // run transform functions on input HTML
-  const inputTransforms = [...(inputExternalTransformHtmlFns ?? [])];
-  for (const transform of inputTransforms) {
-    inputHtml = await transform(inputHtml, {
-      bundle: defaultBundle,
-      bundles: multiBundles,
-      htmlFileName: input.name,
-    });
-  }
-
   // inject rollup output into HTML
-  let document = parse(inputHtml);
+  let document = parse(input.html);
   if (pluginOptions.extractAssets !== false) {
     injectedUpdatedAssetPaths({
       document,
@@ -67,6 +53,7 @@ export async function getOutputHTML(params: GetOutputHTMLParams) {
       outputDir,
       rootDir,
       emittedAssets,
+      extractAssets: pluginOptions.extractAssets,
       externalAssets: pluginOptions.externalAssets,
       absolutePathPrefix,
       publicPath: pluginOptions.publicPath,
@@ -89,17 +76,17 @@ export async function getOutputHTML(params: GetOutputHTMLParams) {
 
   let outputHtml = serialize(document);
 
-  const outputTransforms = [...(outputExternalTransformHtmlFns ?? [])];
+  const transforms = [...(externalTransformHtmlFns ?? [])];
   if (pluginOptions.transformHtml) {
     if (Array.isArray(pluginOptions.transformHtml)) {
-      outputTransforms.push(...pluginOptions.transformHtml);
+      transforms.push(...pluginOptions.transformHtml);
     } else {
-      outputTransforms.push(pluginOptions.transformHtml);
+      transforms.push(pluginOptions.transformHtml);
     }
   }
 
   // run transform functions on output HTML
-  for (const transform of outputTransforms) {
+  for (const transform of transforms) {
     outputHtml = await transform(outputHtml, {
       bundle: defaultBundle,
       bundles: multiBundles,

package/src/output/injectedUpdatedAssetPaths.ts

@@ -21,6 +21,7 @@ export interface InjectUpdatedAssetPathsArgs {
   outputDir: string;
   rootDir: string;
   emittedAssets: EmittedAssets;
+  extractAssets?: boolean | 'legacy-html' | 'legacy-html-and-css';
   externalAssets?: string | string[];
   publicPath?: string;
   absolutePathPrefix?: string;
@@ -44,6 +45,7 @@ export function injectedUpdatedAssetPaths(args: InjectUpdatedAssetPathsArgs) {
     outputDir,
     rootDir,
     emittedAssets,
+    extractAssets = true,
     externalAssets,
     publicPath = './',
     absolutePathPrefix,
@@ -59,7 +61,9 @@ export function injectedUpdatedAssetPaths(args: InjectUpdatedAssetPathsArgs) {
       const htmlFilePath = input.filePath ? input.filePath : path.join(rootDir, input.name);
       const htmlDir = path.dirname(htmlFilePath);
       const filePath = resolveAssetFilePath(sourcePath, htmlDir, rootDir, absolutePathPrefix);
-      const assetPaths = isHashedAsset(node) ? emittedAssets.hashed : emittedAssets.static;
+      const assetPaths = isHashedAsset(node, extractAssets)
+        ? emittedAssets.hashed
+        : emittedAssets.static;
       const relativeOutputPath = assetPaths.get(filePath);
 
       if (!relativeOutputPath) {

package/src/rollupPluginHTML.ts

@@ -18,10 +18,7 @@ import { emitAssets } from './output/emitAssets.js';
 export interface RollupPluginHtml extends Plugin {
   api: {
     getInputs(): InputData[];
-    addHtmlTransformer(
-      transformHtmlFunction: TransformHtmlFunction,
-      transformStage?: 'input' | 'output',
-    ): void;
+    addHtmlTransformer(transformHtmlFunction: TransformHtmlFunction): void;
     disableDefaultInject(): void;
     addOutput(name: string): Plugin;
   };
@@ -31,8 +28,7 @@ export function rollupPluginHTML(pluginOptions: RollupPluginHTMLOptions = {}): R
   const multiOutputNames: string[] = [];
   let inputs: InputData[] = [];
   let generatedBundles: GeneratedBundle[] = [];
-  let inputExternalTransformHtmlFns: TransformHtmlFunction[] = [];
-  let outputExternalTransformHtmlFns: TransformHtmlFunction[] = [];
+  let externalTransformHtmlFns: TransformHtmlFunction[] = [];
   let defaultInjectDisabled = false;
   let serviceWorkerPath = '';
   let injectServiceWorker = false;
@@ -42,8 +38,7 @@ export function rollupPluginHTML(pluginOptions: RollupPluginHTMLOptions = {}): R
   function reset() {
     inputs = [];
     generatedBundles = [];
-    inputExternalTransformHtmlFns = [];
-    outputExternalTransformHtmlFns = [];
+    externalTransformHtmlFns = [];
   }
 
   return {
@@ -77,7 +72,6 @@ export function rollupPluginHTML(pluginOptions: RollupPluginHTMLOptions = {}): R
       if (pluginOptions.strictCSPInlineScripts) {
         strictCSPInlineScripts = pluginOptions.strictCSPInlineScripts;
       }
-      pluginOptions.bundleAssetsFromCss = !!pluginOptions.bundleAssetsFromCss;
 
       if (pluginOptions.input == null) {
         // we are reading rollup input, so replace whatever was there
@@ -151,8 +145,7 @@ export function rollupPluginHTML(pluginOptions: RollupPluginHTMLOptions = {}): R
         inputs,
         emittedAssets,
         generatedBundles,
-        inputExternalTransformHtmlFns,
-        outputExternalTransformHtmlFns,
+        externalTransformHtmlFns,
         pluginOptions,
         defaultInjectDisabled,
         serviceWorkerPath,
@@ -171,15 +164,8 @@ export function rollupPluginHTML(pluginOptions: RollupPluginHTMLOptions = {}): R
         return inputs;
       },
 
-      addHtmlTransformer(
-        transformHtmlFunction: TransformHtmlFunction,
-        transformStage: 'input' | 'output' = 'output',
-      ) {
-        if (transformStage === 'input') {
-          inputExternalTransformHtmlFns.push(transformHtmlFunction);
-        } else {
-          outputExternalTransformHtmlFns.push(transformHtmlFunction);
-        }
+      addHtmlTransformer(transformHtmlFunction: TransformHtmlFunction) {
+        externalTransformHtmlFns.push(transformHtmlFunction);
       },
 
       disableDefaultInject() {
@@ -218,8 +204,7 @@ export function rollupPluginHTML(pluginOptions: RollupPluginHTMLOptions = {}): R
                 inputs,
                 emittedAssets,
                 generatedBundles,
-                inputExternalTransformHtmlFns,
-                outputExternalTransformHtmlFns,
+                externalTransformHtmlFns,
                 pluginOptions,
                 defaultInjectDisabled,
                 serviceWorkerPath,