single-file-core 1.5.55 → 1.5.57

package/core/index.js

@@ -893,7 +893,8 @@ class Processor {
 		if (!this.options.saveFavicon) {
 			this.doc.querySelectorAll("link[rel*=\"icon\"]").forEach(element => element.remove());
 		}
-		this.doc.querySelectorAll("a[ping]").forEach(element => element.removeAttribute("ping"));
+		this.doc.querySelectorAll("a[ping], area[ping]").forEach(element => element.removeAttribute("ping"));
+		this.doc.querySelectorAll("a[attributionsrc], img[attributionsrc], script[attributionsrc]").forEach(element => element.removeAttribute("attributionsrc"));
 		this.doc.querySelectorAll("link[rel=import][href]").forEach(element => element.remove());
 	}
 

package/core/lib/processor-helper.js

@@ -247,9 +247,9 @@ function getProcessorHelperClass(utilInstance) {
 
 		async processFrame(frameElement, pageData, options, resources, frameWindowId, frameData) {
 			const name = "frames/" + resources.frames.size + "/";
-			let sandbox = "allow-popups allow-top-navigation-by-user-activation";
+			let sandbox = "allow-popups allow-top-navigation-by-user-activation allow-scripts";
 			if (pageData.content.match(NOSCRIPT_TAG_FOUND) || pageData.content.match(CANVAS_TAG_FOUND) || pageData.content.match(SCRIPT_TAG_FOUND) || options.saveRawPage) {
-				sandbox += " allow-scripts allow-modals allow-popups allow-downloads allow-pointer-lock allow-presentation";
+				sandbox += " allow-modals allow-popups allow-downloads allow-pointer-lock allow-presentation";
 			}
 			frameElement.setAttribute("sandbox", sandbox);
 			if (frameElement.tagName.toUpperCase() == "OBJECT") {

package/modules/css-rules-minifier.js

@@ -217,7 +217,7 @@ function minifyRule(ruleData, cssRule, stylesheets, processingContext, removedRu
 	}
 }
 
-function minifyImportRule(ruleData, cssRule, stylesheets, processingContext, removedRules, docContext) {
+function minifyImportRule(ruleData, _cssRule, stylesheets, processingContext, _removedRules, docContext) {
 	const urlNode = ruleData.prelude.children.head.data;
 	const topConditionalStack = urlNode.importedMediaText ? [{ name: "media", prelude: urlNode.importedMediaText }] : [];
 	if (urlNode.importedLayerName !== undefined) {
@@ -417,8 +417,12 @@ function collectDeclarationItemsForElement(element, docContext) {
 				const { type, value } = declaration.data;
 				if (type === DECLARATION_TYPE && value) {
 					const isRawValue = value.type === RAW_TYPE;
-					const isVendorValue = value.type === VALUE_TYPE && hasChildNodes(value) && value.children.head.data.name && value.children.head.data.name.startsWith(VENDOR_PREFIX);
-					const isInvalidValue = value.type === VALUE_TYPE && hasChildNodes(value) && value.children.head.data.name && INVALID_CSS_ESCAPE_TEST.test(value.children.head.data.name);
+					const isSingleValue = value.type === VALUE_TYPE &&
+						hasChildNodes(value) &&
+						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 (!isRawValue && !isVendorValue && !isInvalidValue) {
 						allDeclarations.push({
 							declaration,
@@ -590,8 +594,8 @@ function compareDeclarations(declarationA, declarationB, docContext) {
 	}
 	if (declarationA.isInline && !declarationB.isInline) return 1;
 	if (!declarationA.isInline && declarationB.isInline) return -1;
-	let selectorDataA = declarationA.selector ? docContext.selectorData.get(declarationA.selector) : null;
-	let selectorDataB = declarationB.selector ? docContext.selectorData.get(declarationB.selector) : null;
+	const selectorDataA = declarationA.selector ? docContext.selectorData.get(declarationA.selector) : null;
+	const selectorDataB = declarationB.selector ? docContext.selectorData.get(declarationB.selector) : null;
 	if (selectorDataA && selectorDataB) {
 		const layerComparison = compareLayers(selectorDataA.layerStack, selectorDataB.layerStack, docContext);
 		if (layerComparison !== 0) {

package/package.json

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

package/processors/frame-tree/content/content-frame-tree.js

@@ -439,7 +439,7 @@ function getFrames(document) {
 	document.querySelectorAll(ALL_ELEMENTS_CSS_SELECTOR).forEach(element => {
 		const shadowRoot = helper.getShadowRoot(element);
 		if (shadowRoot) {
-			frames = frames.concat(...shadowRoot.querySelectorAll(FRAMES_CSS_SELECTOR));
+			frames = frames.concat(...getFrames(shadowRoot));
 		}
 	});
 	return frames;

package/processors/hooks/content/content-hooks-frames-web.js

@@ -52,12 +52,16 @@
 	const BOOTSTRAP_EVENT = "single-file-bootstrap";
 	const FONT_STYLE_PROPERTIES = {
 		family: "font-family",
-		style: "font-style",
-		weight: "font-weight",
+		ascentOverride: "ascent-override",
+		descentOverride: "descent-override",
+		display: "font-display",
+		featureSettings: "font-feature-settings",
+		lineGapOverride: "line-gap-override",
 		stretch: "font-stretch",
+		style: "font-style",
 		unicodeRange: "unicode-range",
-		variant: "font-variant",
-		featureSettings: "font-feature-settings"
+		variationSettings: "font-variation-settings",
+		weight: "font-weight"
 	};
 
 	const fetch = globalThis.fetch.bind(globalThis);