single-file-core 1.0.65 → 1.0.66

package/package.json

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

package/single-file-core.js

@@ -494,9 +494,6 @@ class Processor {
 			);
 			this.doc.documentElement.insertBefore(commentNode, this.doc.documentElement.firstChild);
 		}
-		if (this.options.includeInfobar) {
-			util.appendInfobar(this.doc, this.options);
-		}
 		if (this.doc.querySelector("template[" + SHADOWROOT_ATTRIBUTE_NAME + "]") || (this.options.shadowRoots && this.options.shadowRoots.length)) {
 			if (this.options.blockScripts) {
 				this.doc.querySelectorAll("script[" + SCRIPT_TEMPLATE_SHADOW_ROOT + "]").forEach(element => element.remove());
@@ -867,9 +864,9 @@ class Processor {
 	}
 
 	saveFavicon() {
-		let faviconElement = this.doc.querySelector("link[href][rel=\"icon\"]");
+		let faviconElement = this.doc.querySelector("link[href][rel=\"shortcut icon\"]");
 		if (!faviconElement) {
-			faviconElement = this.doc.querySelector("link[href][rel=\"shortcut icon\"]");
+			faviconElement = this.doc.querySelector("link[href][rel=\"icon\"]");
 		}
 		if (!faviconElement) {
 			faviconElement = this.doc.createElement("link");
@@ -1167,6 +1164,13 @@ class Processor {
 					if (shadowRootData) {
 						const templateElement = doc.createElement("template");
 						templateElement.setAttribute(SHADOWROOT_ATTRIBUTE_NAME, shadowRootData.mode);
+						if (shadowRootData.adoptedStyleSheets) {
+							shadowRootData.adoptedStyleSheets.forEach(stylesheetContent => {
+								const styleElement = doc.createElement("style");
+								styleElement.textContent = stylesheetContent;
+								templateElement.appendChild(styleElement);
+							});
+						}
 						const shadowDoc = util.parseDocContent(shadowRootData.content);
 						if (shadowDoc.head) {
 							const metaCharset = shadowDoc.head.querySelector("meta[charset]");
@@ -1184,13 +1188,6 @@ class Processor {
 						} else {
 							element.appendChild(templateElement);
 						}
-						if (shadowRootData.adoptedStyleSheets) {
-							shadowRootData.adoptedStyleSheets.forEach(stylesheetContent => {
-								const styleElement = doc.createElement("style");
-								styleElement.textContent = stylesheetContent;
-								templateElement.appendChild(styleElement);
-							});
-						}
 					}
 				}
 			});
@@ -1516,11 +1513,14 @@ class ProcessorHelper {
 	}
 
 	static processShortcutIcons(doc) {
-		let shortcutIcon = findShortcutIcon(Array.from(doc.querySelectorAll("link[href][rel=\"icon\"], link[href][rel=\"shortcut icon\"]")));
+		let shortcutIcon = findShortcutIcon(Array.from(doc.querySelectorAll("link[href][rel=\"shortcut icon\"]")));
+		if (!shortcutIcon) {
+			shortcutIcon = findShortcutIcon(Array.from(doc.querySelectorAll("link[href][rel=\"icon\"]")));
+		}
 		if (!shortcutIcon) {
 			shortcutIcon = findShortcutIcon(Array.from(doc.querySelectorAll("link[href][rel*=\"icon\"]")));
 			if (shortcutIcon) {
-				shortcutIcon.rel = "icon";
+				shortcutIcon.rel = "shortcut icon";
 			}
 		}
 		if (shortcutIcon) {

package/single-file-mini-helper.js

@@ -23,11 +23,16 @@
 
 import * as serializer from "./modules/html-serializer.js";
 import * as infobar from "./common/infobar.js";
+import { getInstance } from "./single-file-util.js";
 
+const util = getInstance();
 const helper = {
 	serialize(doc, compressHTML) {
 		return serializer.process(doc, compressHTML);
 	},
+	getDoctypeString(doc) {
+		return util.getDoctypeString(doc);
+	},
 	appendInfobar(doc, options, useShadowRoot) {
 		return infobar.appendInfobar(doc, options, useShadowRoot);
 	},