single-file-core 1.5.83 → 1.5.85

package/core/lib/processor-helper-inline.js

@@ -140,7 +140,7 @@ function getProcessorHelperClass(utilInstance) {
 							doc.head.appendChild(styleElement);
 						}
 						element.textContent = "/* */";
-						element.setAttribute("onload", "this.textContent=document.querySelector('style[" + DUPLICATE_STYLESHEET_ATTRIBUTE_NAME + "=\"" + stylesheetRefIndex + "\"]')?.textContent;this.removeAttribute(\"onload\")");
+						element.setAttribute("onload", "this.textContent=document.querySelector('style[" + DUPLICATE_STYLESHEET_ATTRIBUTE_NAME + "=\"" + stylesheetRefIndex + "\"]')?.textContent;this.removeAttribute('onload')");
 					} else {
 						element.textContent = options.inlineStylesheets.get(stylesheetRefIndex).content;
 					}

package/modules/html-minifier.js

@@ -113,7 +113,8 @@ const redundantAttributes = {
 };
 
 const REGEXP_WHITESPACE = /[ \t\f\r]+/g;
-const REGEXP_NEWLINE = /[\n]+/g;
+const REGEXP_WHITESPACE_COLLAPSE = /[ \t\f\r]{2,}|[\t\f\r]/g;
+const REGEXP_NEWLINE = /\n{2,}/g;
 const REGEXP_ENDS_WHITESPACE = /^\s+$/;
 const NodeFilter_SHOW_ALL = 4294967295;
 const Node_ELEMENT_NODE = 1;
@@ -179,7 +180,17 @@ function collapseWhitespace(node, options) {
 				noWhitespace = element && noWhitespaceCollapse(element);
 			}
 			if ((!element || noWhitespace) && textContent.length > 1) {
-				node.textContent = textContent.replace(REGEXP_WHITESPACE, getWhiteSpace(node)).replace(REGEXP_NEWLINE, "\n");
+				const whitespace = getWhiteSpace(node);
+				let newTextContent;
+				if (whitespace == " ") {
+					newTextContent = textContent.replace(REGEXP_WHITESPACE_COLLAPSE, " ");
+				} else {
+					newTextContent = textContent.replace(REGEXP_WHITESPACE, whitespace);
+				}
+				newTextContent = newTextContent.replace(REGEXP_NEWLINE, "\n");
+				if (newTextContent != textContent) {
+					node.textContent = newTextContent;
+				}
 			}
 		}
 	}

package/modules/template-parser.js

@@ -26,7 +26,7 @@
 /*
  * Generated by PEG.js 0.10.0.
  *
- * http://pegjs.org/
+ * https://github.com/pegjs/pegjs
  */
 
 /* Modified manually by Gildas Lormeau in order to support async/await callbacks */

package/package.json

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

package/processors/compression/compression-display.js

@@ -29,7 +29,7 @@ export {
 
 async function display(document, docContent, { disableFramePointerEvents } = {}) {
 	docContent = docContent.replace(/<noscript/gi, "<template disabled-noscript");
-	docContent = docContent.replaceAll(/<\/noscript/gi, "</template");
+	docContent = docContent.replace(/<\/noscript/gi, "</template");
 	const doc = (new DOMParser()).parseFromString(docContent, "text/html");
 	if (disableFramePointerEvents) {
 		doc.querySelectorAll("iframe").forEach(element => {

package/processors/compression/compression-extract.js

@@ -27,7 +27,7 @@ export {
 	extract
 };
 
-async function extract(content, { password, prompt = () => { }, zipOptions = { useWebWorkers: false }, noBlobURL } = {}) {
+async function extract(content, { password, prompt = () => { }, zipOptions = { useWebWorkers: true }, noBlobURL } = {}) {
 	const KNOWN_MIMETYPES = {
 		"gif": "image/gif",
 		"jpg": "image/jpeg",
@@ -74,13 +74,17 @@ async function extract(content, { password, prompt = () => { }, zipOptions = { u
 	const REGEXP_MATCH_MANIFEST = /manifest\.json$/;
 	const CHARSET_UTF8 = ";charset=utf-8";
 	const REGEXP_ESCAPE = /([{}()^$&.*?/+|[\\\\]|\]|-)/g;
-
-	if (Array.isArray(content)) {
-		content = new Blob([new Uint8Array(content)]);
-	}
+	let reader;
 	zip.configure(zipOptions);
-	const blobReader = new zip.BlobReader(content);
-	const zipReader = new zip.ZipReader(blobReader);
+	if (content.readUint8Array) {
+		reader = content;
+	} else {
+		if (Array.isArray(content)) {
+			content = new Blob([new Uint8Array(content)]);
+		}
+		reader = new zip.BlobReader(content);
+	}
+	const zipReader = new zip.ZipReader(reader);
 	const entries = await zipReader.getEntries();
 	const options = { password };
 	let docContent, origDocContent, url, resources = [], indexPages = [], textResources = [];
@@ -98,7 +102,11 @@ async function extract(content, { password, prompt = () => { }, zipOptions = { u
 				textResources.push(resourceInfo);
 			}
 			dataWriter = new zip.TextWriter();
-			textContent = await entry.getData(dataWriter, options);
+			if (entry.uncompressedSize > 0) {
+				textContent = await entry.getData(dataWriter, options);
+			} else {
+				textContent = "";
+			}
 			if (filename.match(REGEXP_MATCH_INDEX)) {
 				mimeType = "text/html" + CHARSET_UTF8;
 			} else {