single-file-core 1.5.82 → 1.5.83

package/core/index.js

@@ -678,6 +678,7 @@ class Processor {
 				replaceEmojisInFilename: this.options.replaceEmojisInFilename,
 				compressContent: this.options.compressContent,
 				selfExtractingArchive: this.options.selfExtractingArchive,
+				disableCompression: this.options.disableCompression,
 				extractDataFromPage: this.options.extractDataFromPage,
 				referrer: this.options.referrer,
 				title: this.options.title,

package/core/lib/processor-helper-common.js

@@ -98,8 +98,8 @@ class ProcessorHelperCommon {
 			["embed[src*=\".svg\"]", "src"],
 			["video[poster]", "poster"],
 			["*[background]", "background"],
-			["image", "xlink:href"],
-			["image", "href"]
+			["image, feImage", "xlink:href"],
+			["image, feImage", "href"]
 		];
 		if (options.blockImages) {
 			doc.querySelectorAll("svg").forEach(element => element.remove());

package/modules/css-rules-minifier.js

@@ -482,16 +482,24 @@ function collectDeclarationItemsForElement(element, docContext) {
 	return allDeclarations;
 
 	function addDeclaration(declaration, specificity, isInline, selector) {
-		const { value } = declaration.data;
+		const { property, value } = declaration.data;
 		const isRawValue = value.type === RAW_TYPE;
 		const hasValueChildNodes = hasChildNodes(value) || value.type === RAW_TYPE;
-		const isSingleValue = value.type === VALUE_TYPE &&
+		let isInvalidValue;
+		if (value.type === VALUE_TYPE &&
 			hasValueChildNodes &&
-			value.children.length == 1 &&
-			value.children.head.data.name;
-		const isVendorValue = isSingleValue && value.children.head.data.name.startsWith(VENDOR_PREFIX);
-		const isInvalidValue = isSingleValue && INVALID_CSS_ESCAPE_TEST.test(value.children.head.data.name);
-		if (hasValueChildNodes && !isRawValue && !isVendorValue && !isInvalidValue) {
+			value.children.size == 1) {
+			if (value.children.head.data.name) {
+				isInvalidValue = value.children.head.data.name.startsWith(VENDOR_PREFIX) || INVALID_CSS_ESCAPE_TEST.test(value.children.head.data.name);
+			} if (!property.startsWith(VENDOR_PREFIX) && value.children.head.data.value) {
+				try {
+					isInvalidValue = !cssTree.lexer.matchProperty(property, value).matched;
+				} catch {
+					// ignored
+				}
+			}
+		}
+		if (hasValueChildNodes && !isRawValue && !isInvalidValue) {
 			allDeclarations.push({
 				declaration,
 				selector,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "single-file-core",
-  "version": "1.5.82",
+  "version": "1.5.83",
   "description": "SingleFile Core",
   "author": "Gildas Lormeau",
   "license": "AGPL-3.0-or-later",

package/processors/compression/compression.js

@@ -133,7 +133,7 @@ async function process(pageData, options, lastModDate = new Date()) {
 	const startOffset = zipDataWriter.offset;
 	pageData.url = options.url;
 	pageData.archiveTime = (new Date()).toISOString();
-	await addPageResources(zipWriter, pageData, { password: options.password }, options.createRootDirectory ? String(Date.now()) + "_" + (options.tabId || 0) + "/" : "", options.url);
+	await addPageResources(zipWriter, pageData, { password: options.password, disableCompression: options.disableCompression }, options.createRootDirectory ? String(Date.now()) + "_" + (options.tabId || 0) + "/" : "", options.url);
 	const data = await zipWriter.close(null, { preventClose: true });
 	if (options.selfExtractingArchive) {
 		const insertionsCRLF = [];
@@ -393,25 +393,25 @@ async function addPageResources(zipWriter, pageData, options, prefixName, url) {
 	}, null, 2);
 	await Promise.all([
 		Promise.all([
-			addFile(zipWriter, prefixName, { name: "index.html", extension: ".html", content: pageData.content, url, password: options.password }),
-			addFile(zipWriter, prefixName, { name: "manifest.json", extension: ".json", content: jsonContent, password: options.password })
+			addFile(zipWriter, prefixName, { name: "index.html", extension: ".html", content: pageData.content, url, password: options.password }, options.disableCompression),
+			addFile(zipWriter, prefixName, { name: "manifest.json", extension: ".json", content: jsonContent, password: options.password }, options.disableCompression)
 		]),
 		Promise.all(Object.keys(pageData.resources).map(async resourceType =>
 			Promise.all(pageData.resources[resourceType].map(data => {
 				if (resourceType == "frames") {
 					return addPageResources(zipWriter, data, options, prefixName + data.name, data.url);
 				} else {
-					return addFile(zipWriter, prefixName, data, true);
+					return addFile(zipWriter, prefixName, data, options.disableCompression);
 				}
 			}))
 		))
 	]);
 }
 
-async function addFile(zipWriter, prefixName, data) {
+async function addFile(zipWriter, prefixName, data, disableCompresson) {
 	const dataReader = typeof data.content == "string" ? new TextReader(data.content) : new BlobReader(new Blob([new Uint8Array(data.content)]));
 	const options = { comment: data.url && data.url.startsWith("data:") ? "data:" : data.url, password: data.password, bufferedWrite: true };
-	if (NO_COMPRESSION_EXTENSIONS.includes(data.extension)) {
+	if (NO_COMPRESSION_EXTENSIONS.includes(data.extension) || disableCompresson) {
 		options.level = 0;
 	}
 	await zipWriter.add(prefixName + data.name, dataReader, options);

package/single-file.js

@@ -116,6 +116,7 @@ async function getPageData(options = {}, initOptions, doc, win) {
 			url: options.url,
 			createRootDirectory: options.createRootDirectory,
 			selfExtractingArchive: options.selfExtractingArchive,
+			disableCompression: options.disableCompression,
 			extractDataFromPage: options.extractDataFromPage,
 			preventAppendedData: options.preventAppendedData,
 			insertCanonicalLink: options.insertCanonicalLink,