single-file-core 1.2.39 → 1.2.40

package/core/helper.js

@@ -244,7 +244,7 @@ function getElementsInfo(win, doc, element, options, data = { usedFonts: new Map
 			}
 			getResourcesInfo(win, doc, element, options, data, elementHidden, computedStyle);
 			const shadowRoot = !((element instanceof win.SVGElement) || (element instanceof globalThis.SVGElement)) && getShadowRoot(element);
-			if (shadowRoot && !element.classList.contains(SINGLE_FILE_UI_ELEMENT_CLASS)) {
+			if (shadowRoot && !element.classList.contains(SINGLE_FILE_UI_ELEMENT_CLASS) && element.tagName.toLowerCase() != INFOBAR_TAGNAME) {
 				const shadowRootInfo = {};
 				element.setAttribute(SHADOW_ROOT_ATTRIBUTE_NAME, data.shadowRoots.length);
 				data.markedElements.push(element);

package/core/index.js

@@ -651,6 +651,10 @@ class Processor {
 	}
 
 	saveFilenameTemplateData() {
+		const existingScript = this.doc.querySelector("script[" + SCRIPT_OPTIONS + "][type=\"application/json\"]");
+		if (existingScript) {
+			existingScript.remove();
+		}
 		const optionsElement = this.doc.createElement("script");
 		optionsElement.type = "application/json";
 		optionsElement.setAttribute(SCRIPT_OPTIONS, "");
@@ -1036,15 +1040,25 @@ class Processor {
 		this.stats.set("discarded", "hidden elements", removedElements.length);
 		this.stats.set("processed", "hidden elements", removedElements.length);
 		if (hiddenElements.length) {
-			const styleElement = this.doc.createElement("style");
-			styleElement.textContent = ".sf-hidden{display:none!important;}";
-			this.doc.head.appendChild(styleElement);
+			const className = "sf-hidden";
+			const stylesheetContent = "." + className + "{display:none!important}";
+			let foundStylesheet = false;
+			this.doc.querySelectorAll("style").forEach(styleElement => {
+				if (styleElement.textContent == stylesheetContent) {
+					foundStylesheet = true;
+				}
+			});
+			if (!foundStylesheet) {
+				const styleElement = this.doc.createElement("style");
+				styleElement.textContent = stylesheetContent;
+				this.doc.head.appendChild(styleElement);
+			}
 			hiddenElements.forEach(element => {
 				if (element.style.getPropertyValue("display") != "none") {
 					if (element.style.getPropertyPriority("display") == "important") {
 						element.style.setProperty("display", "none", "important");
-					} else {
-						element.classList.add("sf-hidden");
+					} else if (!element.classList.contains(className)) {
+						element.classList.add(className);
 					}
 				}
 			});

package/package.json

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