single-file-core 1.0.38 → 1.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "single-file-core",
-  "version": "1.0.38",
+  "version": "1.0.40",
   "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());
@@ -791,14 +791,16 @@ class Processor {
 	replaceInvalidElements() {
 		this.doc.querySelectorAll("template[" + util.INVALID_ELEMENT_ATTRIBUTE_NAME + "]").forEach(templateElement => {
 			const placeHolderElement = this.doc.createElement("span");
-			const originalElement = templateElement.content.firstChild;
-			if (originalElement) {
-				if (originalElement.hasAttributes()) {
-					Array.from(originalElement.attributes).forEach(attribute => placeHolderElement.setAttribute(attribute.name, attribute.value));
+			if (templateElement.content) {
+				const originalElement = templateElement.content.firstChild;
+				if (originalElement) {
+					if (originalElement.hasAttributes()) {
+						Array.from(originalElement.attributes).forEach(attribute => placeHolderElement.setAttribute(attribute.name, attribute.value));
+					}
+					originalElement.childNodes.forEach(childNode => placeHolderElement.appendChild(childNode.cloneNode(true)));
 				}
-				originalElement.childNodes.forEach(childNode => placeHolderElement.appendChild(childNode.cloneNode(true)));
+				templateElement.replaceWith(placeHolderElement);
 			}
-			templateElement.replaceWith(placeHolderElement);
 		});
 	}
 
@@ -1222,7 +1224,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"],