single-file-core 1.0.37 → 1.0.39

package/package.json

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

package/single-file-core.js

@@ -502,7 +502,7 @@ class Processor {
 		if (this.options.insertMetaCSP) {
 			const metaTag = this.doc.createElement("meta");
 			metaTag.httpEquiv = "content-security-policy";
-			metaTag.content = "default-src 'none'; font-src 'self' data:; img-src 'self' data:; style-src 'unsafe-inline'; media-src 'self' data:; script-src 'unsafe-inline' data:; object-src 'self' data:;";
+			metaTag.content = "default-src 'none'; font-src 'self' data:; img-src 'self' data:; style-src 'unsafe-inline'; media-src 'self' data:; script-src 'unsafe-inline' data:; object-src 'self' data:; frame-src 'self' data:;";
 			this.doc.head.appendChild(metaTag);
 		}
 		if (this.options.insertMetaNoIndex) {
@@ -764,7 +764,7 @@ class Processor {
 			placeholderElement.replaceWith(noscriptElement);
 		});
 		this.doc.querySelectorAll("meta[http-equiv=\"content-security-policy\"]").forEach(element => element.remove());
-		const objectElements = this.doc.querySelectorAll("applet, object[data]:not([type=\"image/svg+xml\"]):not([type=\"image/svg-xml\"]):not([type=\"text/html\"]), embed[src]:not([src*=\".svg\"]):not([src*=\".pdf\"])");
+		const objectElements = this.doc.querySelectorAll("applet, object[data]:not([type=\"image/svg+xml\"]):not([type=\"image/svg-xml\"]):not([type=\"text/html\"]):not([data*=\".svg\"]):not([data*=\".pdf\"]), embed[src]:not([src*=\".svg\"]):not([src*=\".pdf\"])");
 		this.stats.set("discarded", "objects", objectElements.length);
 		this.stats.set("processed", "objects", objectElements.length);
 		objectElements.forEach(element => element.remove());
@@ -887,10 +887,10 @@ class Processor {
 
 	insertFonts() {
 		if (this.options.fonts && this.options.fonts.length) {
-			let stylesheetContent = "";
+			let firstStylesheet = this.doc.querySelector("style, link[rel=stylesheet]"), previousStyleElement;
 			this.options.fonts.forEach(fontData => {
 				if (fontData["font-family"] && fontData.src) {
-					stylesheetContent += "@font-face{";
+					let stylesheetContent = "@font-face{";
 					let stylesContent = "";
 					Object.keys(fontData).forEach(fontStyle => {
 						if (stylesContent) {
@@ -899,18 +899,18 @@ class Processor {
 						stylesContent += fontStyle + ":" + fontData[fontStyle];
 					});
 					stylesheetContent += stylesContent + "}";
+					const styleElement = this.doc.createElement("style");
+					styleElement.textContent = stylesheetContent;
+					if (previousStyleElement) {
+						previousStyleElement.insertAdjacentElement("afterend", styleElement);
+					} else if (firstStylesheet) {
+						firstStylesheet.parentElement.insertBefore(styleElement, firstStylesheet);
+					} else {
+						this.doc.head.appendChild(styleElement);
+					}
+					previousStyleElement = styleElement;
 				}
 			});
-			if (stylesheetContent) {
-				const styleElement = this.doc.createElement("style");
-				styleElement.textContent = stylesheetContent;
-				const existingStyleElement = this.doc.querySelector("style");
-				if (existingStyleElement) {
-					existingStyleElement.parentElement.insertBefore(styleElement, existingStyleElement);
-				} else {
-					this.doc.head.insertBefore(styleElement, this.doc.head.firstChild);
-				}
-			}
 		}
 	}
 
@@ -1222,7 +1222,7 @@ class Processor {
 	async processPageResources() {
 		const processAttributeArgs = [
 			["link[href][rel*=\"icon\"]", "href", false, true],
-			["object[type=\"image/svg+xml\"], object[type=\"image/svg-xml\"]", "data"],
+			["object[type=\"image/svg+xml\"], object[type=\"image/svg-xml\"], object[data*=\".svg\"], object[data*=\".pdf\"]", "data"],
 			["img[src], input[src][type=image]", "src", true],
 			["embed[src*=\".svg\"], embed[src*=\".pdf\"]", "src"],
 			["video[poster]", "poster"],