From 6ed4048e0248caff2e6abeaf9772cf0c978ac0a8 Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 8 Nov 2026 23:10:56 +1100 Subject: [PATCH] Return html fragments without html, head and body tags cheerio 1.x parses input as a full document by default, so a fragment came back wrapped in . inline-css, style-data and list-stylesheets now load input as a fragment unless it has a doctype or an html, head or body tag. Fixes #117 --- .changeset/keep-html-fragments.md | 7 +++++++ lib/inline-css.js | 8 ++++++-- packages/list-stylesheets/index.js | 8 ++++++-- packages/list-stylesheets/test/main.js | 7 +++++++ packages/style-data/index.js | 8 ++++++-- packages/style-data/test/main.js | 8 ++++++++ test/main.js | 9 +++++++++ 7 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 .changeset/keep-html-fragments.md diff --git a/.changeset/keep-html-fragments.md b/.changeset/keep-html-fragments.md new file mode 100644 index 0000000..c738e41 --- /dev/null +++ b/.changeset/keep-html-fragments.md @@ -0,0 +1,7 @@ +--- +"inline-css": patch +"style-data": patch +"list-stylesheets": patch +--- + +Return an HTML fragment as a fragment. Since the move to cheerio 1.x, a fragment came back wrapped in `` tags. diff --git a/lib/inline-css.js b/lib/inline-css.js index 7d05967..9ed2526 100644 --- a/lib/inline-css.js +++ b/lib/inline-css.js @@ -9,6 +9,8 @@ const removeClassId = require('./removeClassId'); const setTableAttrs = require('./setTableAttrs'); const pick = require('pick-util'); +const isDocument = html => /<(?:!doctype|html|head|body)[\s>]/i.test(html); + function replaceCodeBlock(html, re, block) { return html.replace(re, () => block); } @@ -50,14 +52,16 @@ module.exports = (html, css, options) => { const decodeEntities = _html => decodeCodeBlocks(_html); let $; - $ = cheerio.load(encodeEntities(html), pick(opts, [ + const encoded = encodeEntities(html); + + $ = cheerio.load(encoded, pick(opts, [ 'xmlMode', 'decodeEntities', 'lowerCaseTags', 'lowerCaseAttributeNames', 'recognizeCDATA', 'recognizeSelfClosing' - ])); + ]), isDocument(encoded)); try { rules = parseCSS(css); diff --git a/packages/list-stylesheets/index.js b/packages/list-stylesheets/index.js index 699a90e..e6c1981 100644 --- a/packages/list-stylesheets/index.js +++ b/packages/list-stylesheets/index.js @@ -1,6 +1,8 @@ const cheerio = require('cheerio'); const pick = require('pick-util'); +const isDocument = html => /<(?:!doctype|html|head|body)[\s>]/i.test(html); + function replaceCodeBlock(html, re, block) { return html.replace(re, () => block); } @@ -41,7 +43,9 @@ module.exports = (html, options) => { const decodeEntities = _html => decodeCodeBlocks(_html); let $; - $ = cheerio.load(encodeEntities(html), Object.assign({ + const encoded = encodeEntities(html); + + $ = cheerio.load(encoded, Object.assign({ decodeEntities: false }, pick(options, [ 'xmlMode', @@ -50,7 +54,7 @@ module.exports = (html, options) => { 'lowerCaseAttributeNames', 'recognizeCDATA', 'recognizeSelfClosing' - ]))); + ])), isDocument(encoded)); results.hrefs = []; diff --git a/packages/list-stylesheets/test/main.js b/packages/list-stylesheets/test/main.js index 039856b..b85fa11 100644 --- a/packages/list-stylesheets/test/main.js +++ b/packages/list-stylesheets/test/main.js @@ -116,4 +116,11 @@ describe('list-stylesheets', () => { done ); }); + + it('Should leave an html fragment without html, head and body tags', () => { + const data = getStylesheetList('

Hi

', { applyLinkTags: true, removeLinkTags: true }); + + data.hrefs.should.be.eql(['file.css']); + data.html.should.be.equal('

Hi

'); + }); }); diff --git a/packages/style-data/index.js b/packages/style-data/index.js index 02a9b52..e0cd17c 100644 --- a/packages/style-data/index.js +++ b/packages/style-data/index.js @@ -2,6 +2,8 @@ const mediaQueryText = require('mediaquery-text'); const cheerio = require('cheerio'); const pick = require('pick-util'); +const isDocument = html => /<(?:!doctype|html|head|body)[\s>]/i.test(html); + function replaceCodeBlock(html, re, block) { return html.replace(re, () => block); } @@ -49,7 +51,9 @@ module.exports = (html, options, callback) => { let styleDataList; let styleData; - $ = cheerio.load(encodeEntities(html), Object.assign({ + const encoded = encodeEntities(html); + + $ = cheerio.load(encoded, Object.assign({ decodeEntities: false }, pick(options, [ 'xmlMode', @@ -58,7 +62,7 @@ module.exports = (html, options, callback) => { 'lowerCaseAttributeNames', 'recognizeCDATA', 'recognizeSelfClosing' - ]))); + ])), isDocument(encoded)); results.css = []; diff --git a/packages/style-data/test/main.js b/packages/style-data/test/main.js index bdcd960..ae06cf2 100644 --- a/packages/style-data/test/main.js +++ b/packages/style-data/test/main.js @@ -144,4 +144,12 @@ describe('style-data', () => { done ); }); + + it('Should leave an html fragment without html, head and body tags', done => { + getStylesData('

Hi

', { applyStyleTags: true, removeStyleTags: true }, (err, results) => { + results.html.should.be.equal('

Hi

'); + should.deepEqual(results.css, ['.a { color: red; }']); + done(); + }); + }); }); diff --git a/test/main.js b/test/main.js index 0475abb..87badf4 100644 --- a/test/main.js +++ b/test/main.js @@ -298,4 +298,13 @@ describe('inline-css', () => { }; compare(path.join('test', 'fixtures', 'codeblocks-external.html'), path.join('test', 'expected', 'codeblocks-external.html'), options, done); }); + + it('Should leave an html fragment without html, head and body tags', done => { + inlineCss('
Hi
', { url: `file://${path.resolve('test')}/` }) + .then(html => { + html.should.be.equal('
Hi
'); + done(); + }) + .catch(done); + }); });