From f4a3636e0b846902637504fe000893f28e77dbbb Mon Sep 17 00:00:00 2001 From: Mark Macdonald Date: Sat, 8 Nov 2025 16:46:27 +0000 Subject: [PATCH 1/4] Upgrade css-tree --- package-lock.json | 47 ++++++++++++++++++++++++++++++----------------- package.json | 4 ++-- src/parse.ts | 2 +- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index b8436c7..eb2876d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,20 +1,20 @@ { "name": "react-pdf-html", - "version": "2.1.2", + "version": "2.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "react-pdf-html", - "version": "2.1.2", + "version": "2.1.3", "license": "MIT", "dependencies": { - "css-tree": "^1.1.3", + "css-tree": "^3.1.0", "node-html-parser": "^6.1.13" }, "devDependencies": { "@react-pdf/renderer": "^3.4.4", - "@types/css-tree": "^1.0.7", + "@types/css-tree": "^2.3.11", "@types/jest": "^25.2.3", "@types/node": "^14.0.25", "@types/react": "^17.0.5", @@ -1252,10 +1252,11 @@ } }, "node_modules/@types/css-tree": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@types/css-tree/-/css-tree-1.0.7.tgz", - "integrity": "sha512-Pz+DfVODpQTAV6PwPBK6kzyy7+f6EyPbr1+mYkc1YolJfl2NAJ4wbg0TC/AJPBsqn9jWfyiO19A/sgpvFLfqnw==", - "dev": true + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/@types/css-tree/-/css-tree-2.3.11.tgz", + "integrity": "sha512-aEokibJOI77uIlqoBOkVbaQGC9zII0A+JH1kcTNKW2CwyYWD8KM6qdo+4c77wD3wZOQfJuNWAr9M4hdk+YhDIg==", + "dev": true, + "license": "MIT" }, "node_modules/@types/graceful-fs": { "version": "4.1.9", @@ -2085,15 +2086,16 @@ } }, "node_modules/css-tree": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", - "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.1.0.tgz", + "integrity": "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==", + "license": "MIT", "dependencies": { - "mdn-data": "2.0.14", - "source-map": "^0.6.1" + "mdn-data": "2.12.2", + "source-map-js": "^1.0.1" }, "engines": { - "node": ">=8.0.0" + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" } }, "node_modules/css-what": { @@ -3768,9 +3770,10 @@ } }, "node_modules/mdn-data": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", - "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==" + "version": "2.12.2", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.2.tgz", + "integrity": "sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==", + "license": "CC0-1.0" }, "node_modules/media-engine": { "version": "1.0.3", @@ -4506,6 +4509,16 @@ }, "node_modules/source-map": { "version": "0.6.1", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" diff --git a/package.json b/package.json index e05e4b5..06ab93a 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "node": ">=16.0.0" }, "dependencies": { - "css-tree": "^1.1.3", + "css-tree": "^3.1.0", "node-html-parser": "^6.1.13" }, "peerDependencies": { @@ -47,7 +47,7 @@ }, "devDependencies": { "@react-pdf/renderer": "^3.4.4", - "@types/css-tree": "^1.0.7", + "@types/css-tree": "^2.3.11", "@types/jest": "^25.2.3", "@types/node": "^14.0.25", "@types/react": "^17.0.5", diff --git a/src/parse.ts b/src/parse.ts index cc4989c..0d88bbd 100644 --- a/src/parse.ts +++ b/src/parse.ts @@ -7,7 +7,7 @@ import { } from 'node-html-parser'; import { Tag } from './tags.js'; import { Block, Declaration, List, Rule, StyleSheet } from 'css-tree'; -import cssTree from 'css-tree'; +import * as cssTree from 'css-tree'; const { generate, parse: cssParse } = cssTree; import supportedStyles from './supportedStyles.js'; From 10e20b9e1ee23b536f77647aafcfacb538879528 Mon Sep 17 00:00:00 2001 From: Mark Macdonald Date: Sat, 8 Nov 2025 17:01:03 +0000 Subject: [PATCH 2/4] fix styles tests and build --- src/parse.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parse.ts b/src/parse.ts index 0d88bbd..016d627 100644 --- a/src/parse.ts +++ b/src/parse.ts @@ -102,7 +102,7 @@ export const convertElementStyle = ( const rules = parsed.children.filter( (rule) => rule.type === 'Rule' && rule.prelude?.type === 'SelectorList' ) as List; - const firstRule = rules?.first(); + const firstRule = rules?.first; return firstRule ? convertRule(firstRule.block, tag) : undefined; } catch (e) { console.error( From c67f2cd00fe3fddf9aadf88ee29a3610772cda85 Mon Sep 17 00:00:00 2001 From: Mark Macdonald Date: Sat, 8 Nov 2025 17:06:18 +0000 Subject: [PATCH 3/4] Fork package --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 06ab93a..a7e081f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "react-pdf-html", - "version": "2.1.3", - "author": "Dan Blaisdell dan@manifestwebdesign.com", + "name": "react-pdf-html-simple", + "version": "2.1.4", + "author": "Mark Macdonald forked from Dan Blaisdell dan@manifestwebdesign.com", "description": "Html component for react-pdf with CSS support", "keywords": [ "PDF", From f4039843eb590be38e34fa3ea8278dd4862a0519 Mon Sep 17 00:00:00 2001 From: Mark Macdonald Date: Mon, 10 Nov 2025 08:13:08 +0000 Subject: [PATCH 4/4] Revert "Fork package" This reverts commit c67f2cd00fe3fddf9aadf88ee29a3610772cda85. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a7e081f..06ab93a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "react-pdf-html-simple", - "version": "2.1.4", - "author": "Mark Macdonald forked from Dan Blaisdell dan@manifestwebdesign.com", + "name": "react-pdf-html", + "version": "2.1.3", + "author": "Dan Blaisdell dan@manifestwebdesign.com", "description": "Html component for react-pdf with CSS support", "keywords": [ "PDF",