single-file-core 1.2.39 → 1.2.41

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.41",
   "description": "SingleFile Core",
   "author": "Gildas Lormeau",
   "license": "AGPL-3.0-or-later",

package/vendor/zip/zip.js

@@ -1,4 +1,4 @@
-const { Array, Object, String, Number, BigInt, Math, Date, Map, Set, Response, URL, Error, Uint8Array, Uint16Array, Uint32Array, DataView, Blob, Promise, TextEncoder, TextDecoder, document, crypto, btoa, TransformStream, ReadableStream, WritableStream, CompressionStream, DecompressionStream, navigator, Worker } = typeof globalThis !== 'undefined' ? globalThis : this || self;
+const { Array, Object, String, Number, BigInt, Math, Date, Map, Set, Response, URL, Error, Uint8Array, Uint16Array, Uint32Array, DataView, Blob, Promise, TextEncoder, TextDecoder, crypto, btoa, TransformStream, ReadableStream, WritableStream, CompressionStream, DecompressionStream, navigator, Worker } = globalThis;
 
 /*
  Copyright (c) 2022 Gildas Lormeau. All rights reserved.
@@ -4940,7 +4940,7 @@ function getLength(...arrayLikes) {
  derived from this software without specific prior written permission.
 
  THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WA    RRANTIES OF MERCHANTABILITY AND
  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
  INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT