single-file-core 1.3.20 → 1.3.22

package/core/lib/processor-helper.js

@@ -394,7 +394,7 @@ function getProcessorHelperClass(utilInstance) {
 		}
 
 		setMetaCSP(metaElement) {
-			metaElement.content = "default-src 'none'; connect-src 'self'; font-src 'self' data: blob:; img-src 'self' data: blob:; style-src 'self' 'unsafe-inline' data: blob:; frame-src 'self' data: blob:; media-src 'self' data: blob:; script-src 'self' 'unsafe-inline' data: blob:; object-src 'self' data: blob:;";
+			metaElement.content = "default-src 'none'; connect-src 'self' data: blob:; font-src 'self' data: blob:; img-src 'self' data: blob:; style-src 'self' 'unsafe-inline' data: blob:; frame-src 'self' data: blob:; media-src 'self' data: blob:; script-src 'self' 'unsafe-inline' data: blob:; object-src 'self' data: blob:;";
 		}
 
 		removeUnusedStylesheets() {

package/modules/css-fonts-minifier.js

@@ -176,21 +176,27 @@ function testUsedFont(ruleData, familyName, declaredFonts, filteredUsedFonts) {
 				.filter(fontInfo => fontInfo.fontFamily == familyName && fontInfo.fontStyle == fontStyle)
 				.map(fontInfo => fontInfo.fontWeight.split(" "))
 				.sort((weight1, weight2) => Number.parseInt(weight1[0], 10) - Number.parseInt(weight2[0], 10));
-			let usedFontWeights = optionalUsedFonts.map(fontInfo => getUsedFontWeight(fontInfo, fontStyle, declaredFontsWeights));
+			let usedFontWeights = optionalUsedFonts
+				.map(fontInfo => getUsedFontWeight(fontInfo, fontStyle, declaredFontsWeights))
+				.filter(fontWeight => fontWeight);
 			test = testFontweight(fontWeight, usedFontWeights);
 			if (!test) {
-				usedFontWeights = optionalUsedFonts.map(fontInfo => {
-					fontInfo = Array.from(fontInfo);
-					fontInfo[2] = "normal";
-					return getUsedFontWeight(fontInfo, fontStyle, declaredFontsWeights);
-				});
-				test = testFontweight(fontWeight, usedFontWeights);
-				if (!test) {
-					usedFontWeights = optionalUsedFonts.map(fontInfo => {
+				usedFontWeights = optionalUsedFonts
+					.map(fontInfo => {
 						fontInfo = Array.from(fontInfo);
-						fontInfo[2] = fontStyle = "normal";
+						fontInfo[2] = "normal";
 						return getUsedFontWeight(fontInfo, fontStyle, declaredFontsWeights);
-					});
+					})
+					.filter(fontWeight => fontWeight);
+				test = testFontweight(fontWeight, usedFontWeights);
+				if (!test) {
+					usedFontWeights = optionalUsedFonts
+						.map(fontInfo => {
+							fontInfo = Array.from(fontInfo);
+							fontInfo[2] = fontStyle = "normal";
+							return getUsedFontWeight(fontInfo, fontStyle, declaredFontsWeights);
+						})
+						.filter(fontWeight => fontWeight);
 					test = testFontweight(fontWeight, usedFontWeights);
 				}
 			}
@@ -205,12 +211,31 @@ function testUsedFont(ruleData, familyName, declaredFonts, filteredUsedFonts) {
 
 function testFontweight(fontWeight, usedFontWeights) {
 	let test;
-	for (const value of fontWeight.split(",")) {
-		test = test || usedFontWeights.includes(helper.getFontWeight(helper.removeQuotes(value.trim())));
+	for (const fontWeightValue of fontWeight.split(",")) {
+		let { min: fontWeightMin, max: fontWeightMax } = parseFontWeight(fontWeightValue);
+		if (!fontWeightMax) {
+			fontWeightMax = 900;
+		}
+		test = test || usedFontWeights.find(usedFontWeight => {
+			let { min: usedFontWeightMin, max: usedFontWeightMax } = parseFontWeight(usedFontWeight);
+			if (!usedFontWeightMax) {
+				usedFontWeightMax = usedFontWeightMin;
+			}
+			return usedFontWeightMin >= fontWeightMin && usedFontWeightMax <= fontWeightMax;
+		});
 	}
 	return test;
 }
 
+function parseFontWeight(fontWeight) {
+	const fontWeightValues = fontWeight.split(" ");
+	const min = Number.parseInt(helper.getFontWeight(fontWeightValues[0]), 10);
+	const max = fontWeightValues[1] && Number.parseInt(helper.getFontWeight(fontWeightValues[1]), 10);
+	return {
+		min, max
+	};
+}
+
 function getDeclarationValue(declarations, propertyName) {
 	let property;
 	if (declarations) {

package/modules/css-medias-alt-minifier.js

@@ -69,21 +69,23 @@ function processRules(cssRules, stats, removedRules = []) {
 }
 
 function matchesMediaType(mediaText) {
-	const foundMediaTypes = helper.flatten(mediaQueryParser.parseMediaList(mediaText).map(node => getMediaTypes(node, MEDIA_SCREEN)));
-	return foundMediaTypes.find(mediaTypeInfo => (!mediaTypeInfo.not && (mediaTypeInfo.value == MEDIA_SCREEN || mediaTypeInfo.value == MEDIA_ALL))
-		|| (mediaTypeInfo.not && (mediaTypeInfo.value == MEDIA_ALL || mediaTypeInfo.value == MEDIA_SCREEN)));
+	const foundMediaTypes = helper.flatten(mediaQueryParser.parseMediaList(mediaText).map(node => getMediaTypes(node)));
+	return foundMediaTypes.find(mediaTypeInfo =>
+		(!mediaTypeInfo.not && (mediaTypeInfo.value == MEDIA_SCREEN || mediaTypeInfo.value == MEDIA_ALL)) ||
+		(mediaTypeInfo.not && (mediaTypeInfo.value != MEDIA_SCREEN && mediaTypeInfo.value != MEDIA_ALL)));
 }
 
-function getMediaTypes(parentNode, mediaType, mediaTypes = []) {
+function getMediaTypes(parentNode, mediaTypes = []) {
 	parentNode.nodes.map((node, indexNode) => {
 		if (node.type == "media-query") {
-			return getMediaTypes(node, mediaType, mediaTypes);
+			return getMediaTypes(node);
 		} else {
 			if (node.type == "media-type") {
-				const nodeMediaType = { not: Boolean(indexNode && parentNode.nodes[0].type == "keyword" && parentNode.nodes[0].value == "not"), value: node.value };
-				if (!mediaTypes.find(mediaType => nodeMediaType.not == mediaType.not && nodeMediaType.value == mediaType.value)) {
-					mediaTypes.push(nodeMediaType);
-				}
+				const nodeMediaType = {
+					not: Boolean(indexNode && parentNode.nodes[0].type == "keyword" && parentNode.nodes[0].value == "not"),
+					value: node.value
+				};
+				mediaTypes.push(nodeMediaType);
 			}
 		}
 	});

package/package.json

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

package/processors/compression/compression.js

@@ -39,7 +39,7 @@ import {
 
 const { Blob, fetch, TextEncoder, DOMParser } = globalThis;
 
-const NO_COMPRESSION_EXTENSIONS = [".jpg", ".jpeg", ".png", ".pdf", ".woff2", ".mp4", ".mp3", ".ogg", ".webp", ".webm", ".avi", ".mpeg", ".ts", ".ogv"];
+const NO_COMPRESSION_EXTENSIONS = [".jpg", ".jpeg", ".png", ".avi", ".apng", ".pdf", ".woff2", ".mp4", ".mp3", ".ogg", ".webp", ".webm", ".avi", ".mpeg", ".ts", ".ogv", ".heif", ".heic"];
 const SCRIPT_PATH = "/lib/single-file-zip.min.js";
 const EXTRA_DATA_TAGS = [
 	["<noscript>", "</noscript>"],
@@ -295,6 +295,9 @@ function getHTMLStartData(pageData, options) {
 	if (pageData.viewport) {
 		pageContent += "<meta name=viewport content=" + JSON.stringify(pageData.viewport) + ">";
 	}
+	if (options.insertMetaCSP) {
+		pageContent += "<meta http-equiv=content-security-policy content=\"default-src 'none'; connect-src 'self' data: blob:; font-src 'self' data: blob:; img-src 'self' data: blob:; style-src 'self' 'unsafe-inline' data: blob:; frame-src 'self' data: blob:; media-src 'self' data: blob:; script-src 'self' 'unsafe-inline' data: blob:; object-src 'self' data: blob:\">";
+	}
 	pageContent += "<style>@keyframes display-wait-message{0%{opacity:0}100%{opacity:1}};body{color:transparent};div{color:initial}</style>";
 	pageContent += "<body hidden>";
 	return pageContent;

package/single-file.js

@@ -115,6 +115,7 @@ async function getPageData(options = {}, initOptions, doc = globalThis.document,
 			preventAppendedData: options.preventAppendedData,
 			insertCanonicalLink: options.insertCanonicalLink,
 			insertMetaNoIndex: options.insertMetaNoIndex,
+			insertMetaCSP: options.insertMetaCSP,
 			password: options.password,
 			zipScript: options.zipScript
 		});