Skip to content

fix(rollup-plugin-html): revert suport transform on input html #3006

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
merged 2 commits into from
Dec 3, 2025
Merged

fix(rollup-plugin-html): revert suport transform on input html #3006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9729c3a
Revert "feat(rollup-plugin-html): suport transform on input html"
bashmish Dec 3, 2025
bd12d3c
chore: add changeset
bashmish Dec 3, 2025
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
5 changes: 5 additions & 0 deletions .changeset/tall-experts-wait.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@web/rollup-plugin-html': patch
---

revert support transform on input html
12 changes: 4 additions & 8 deletions packages/rollup-plugin-html/src/output/createHTMLOutput.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ export interface CreateHTMLAssetParams {
input: InputData;
emittedAssets: EmittedAssets;
generatedBundles: GeneratedBundle[];
inputExternalTransformHtmlFns: TransformHtmlFunction[];
outputExternalTransformHtmlFns: TransformHtmlFunction[];
externalTransformHtmlFns: TransformHtmlFunction[];
pluginOptions: RollupPluginHTMLOptions;
defaultInjectDisabled: boolean;
serviceWorkerPath: string;
Expand All @@ -31,8 +30,7 @@ export async function createHTMLAsset(params: CreateHTMLAssetParams): Promise<Em
input,
emittedAssets,
generatedBundles,
inputExternalTransformHtmlFns,
outputExternalTransformHtmlFns,
externalTransformHtmlFns,
pluginOptions,
defaultInjectDisabled,
serviceWorkerPath,
Expand All @@ -59,8 +57,7 @@ export async function createHTMLAsset(params: CreateHTMLAssetParams): Promise<Em
input,
outputDir,
emittedAssets,
inputExternalTransformHtmlFns,
outputExternalTransformHtmlFns,
externalTransformHtmlFns,
defaultInjectDisabled,
serviceWorkerPath,
injectServiceWorker,
Expand All @@ -76,8 +73,7 @@ export interface CreateHTMLAssetsParams {
inputs: InputData[];
emittedAssets: EmittedAssets;
generatedBundles: GeneratedBundle[];
inputExternalTransformHtmlFns: TransformHtmlFunction[];
outputExternalTransformHtmlFns: TransformHtmlFunction[];
externalTransformHtmlFns: TransformHtmlFunction[];
pluginOptions: RollupPluginHTMLOptions;
defaultInjectDisabled: boolean;
serviceWorkerPath: string;
Expand Down
28 changes: 7 additions & 21 deletions packages/rollup-plugin-html/src/output/getOutputHTML.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -32,8 +31,7 @@ export async function getOutputHTML(params: GetOutputHTMLParams) {
const {
pluginOptions,
entrypointBundles,
inputExternalTransformHtmlFns,
outputExternalTransformHtmlFns,
externalTransformHtmlFns,
input,
outputDir,
emittedAssets,
Expand All @@ -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,
Expand Down Expand Up @@ -89,17 +75,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,
Expand Down
28 changes: 7 additions & 21 deletions packages/rollup-plugin-html/src/rollupPluginHTML.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand All @@ -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;
Expand All @@ -42,8 +38,7 @@ export function rollupPluginHTML(pluginOptions: RollupPluginHTMLOptions = {}): R
function reset() {
inputs = [];
generatedBundles = [];
inputExternalTransformHtmlFns = [];
outputExternalTransformHtmlFns = [];
externalTransformHtmlFns = [];
}

return {
Expand Down Expand Up @@ -151,8 +146,7 @@ export function rollupPluginHTML(pluginOptions: RollupPluginHTMLOptions = {}): R
inputs,
emittedAssets,
generatedBundles,
inputExternalTransformHtmlFns,
outputExternalTransformHtmlFns,
externalTransformHtmlFns,
pluginOptions,
defaultInjectDisabled,
serviceWorkerPath,
Expand All @@ -171,15 +165,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() {
Expand Down Expand Up @@ -218,8 +205,7 @@ export function rollupPluginHTML(pluginOptions: RollupPluginHTMLOptions = {}): R
inputs,
emittedAssets,
generatedBundles,
inputExternalTransformHtmlFns,
outputExternalTransformHtmlFns,
externalTransformHtmlFns,
pluginOptions,
defaultInjectDisabled,
serviceWorkerPath,
Expand Down
14 changes: 2 additions & 12 deletions packages/rollup-plugin-html/test/rollup-plugin-html.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,16 +626,7 @@ describe('rollup-plugin-html', () => {
return false;
});
plugin!.api.addHtmlTransformer((html: string) =>
html.replace('</body>', '<!-- injected to output --></body>'),
);
plugin!.api.addHtmlTransformer(
(html: string) =>
html.replace('<!-- injected to output -->', '<!-- injected to output 2 -->'),
'output',
);
plugin!.api.addHtmlTransformer(
(html: string) => html.replace('</body>', '<!-- injected to input --></body>'),
'input',
html.replace('</body>', '<!-- injected --></body>'),
);
},
} as Plugin,
Expand All @@ -650,10 +641,9 @@ describe('rollup-plugin-html', () => {
expect(entryB).to.include("console.log('entrypoint-b.js');");
expect(stripNewlines(getAsset(output, 'index.html').source)).to.equal(
'<html><head></head><body><h1>hello world</h1>' +
'<!-- injected to input -->' +
'<script type="module" src="./entrypoint-a.js"></script>' +
'<script type="module" src="./entrypoint-b.js"></script>' +
'<!-- injected to output 2 --></body></html>',
'<!-- injected --></body></html>',
);
});

Expand Down
4 changes: 2 additions & 2 deletions packages/rollup-plugin-html/test/src/output/getOutputHTML.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ describe('getOutputHTML()', () => {
);
});

it('can combine external and regular output transform functions', async () => {
it('can combine external and regular transform functions', async () => {
const output = await getOutputHTML({
...defaultOptions,
pluginOptions: {
...defaultOptions.pluginOptions,
transformHtml: html => html.replace('Input HTML', 'Transformed Input HTML'),
},
outputExternalTransformHtmlFns: [html => html.replace(/h1/g, 'h2')],
externalTransformHtmlFns: [html => html.replace(/h1/g, 'h2')],
});

expect(output).to.equal(
Expand Down
Loading