single-file-core 1.0.36 → 1.0.38

package/common/content-infobar-web.js

@@ -142,10 +142,10 @@
 		let singleFileComment = result && result.singleNodeValue;
 		if (singleFileComment && isSingleFileComment(singleFileComment)) {
 			const info = singleFileComment.textContent.split("\n");
-			const [, , urlData, saveDate, ...infoData] = info;
+			const [, , urlData, ...optionalData] = info;
 			const urlMatch = urlData.match(/^ url: (.*) $/);
 			const url = urlMatch && urlMatch[1];
-			if (url && saveDate) {
+			if (url) {
 				let options;
 				if (browser && browser.runtime && browser.runtime.sendMessage) {
 					try {
@@ -157,7 +157,7 @@
 					options = { displayInfobar: true };
 				}
 				if (options.displayInfobar) {
-					await initInfobar(url, saveDate, infoData);
+					await initInfobar(url, optionalData);
 				}
 			}
 		}
@@ -167,19 +167,26 @@
 		return node.nodeType == Node.COMMENT_NODE && node.textContent.includes(SINGLEFILE_COMMENT);
 	}
 
-	async function initInfobar(url, saveDate, infoData) {
+	async function initInfobar(url, optionalData /* saveDate, infoData */) {
 		let infobarElement = document.querySelector(INFOBAR_TAGNAME);
 		if (!infobarElement) {
-			saveDate = saveDate.split("saved date: ")[1];
-			if (infoData && infoData.length > 1) {
-				let content = infoData[0].split("info: ")[1].trim();
-				for (let indexLine = 1; indexLine < infoData.length - 1; indexLine++) {
-					content += "\n" + infoData[indexLine].trim();
+			let infoData = "";
+			if (optionalData.length) {
+				const saveDate = optionalData[0].split("saved date: ")[1];
+				if (saveDate) {
+					optionalData.shift();
+				}
+				if (optionalData.length > 1) {
+					let content = optionalData[0].split("info: ")[1].trim();
+					for (let indexLine = 1; indexLine < optionalData.length - 1; indexLine++) {
+						content += "\n" + optionalData[indexLine].trim();
+					}
+					infoData = content.trim();
+				} else {
+					infoData = saveDate;
 				}
-				infoData = content.trim();
-			} else {
-				infoData = saveDate;
 			}
+			infoData = infoData || "No info";
 			infobarElement = createElement(INFOBAR_TAGNAME, document.body);
 			infobarElement.className = SINGLE_FILE_UI_ELEMENT_CLASS;
 			const shadowRoot = await getShadowRoot(infobarElement);

package/package.json

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

package/processors/lazy/content/content-lazy-loader.js

@@ -69,10 +69,14 @@ export {
 async function process(options) {
 	if (document.documentElement) {
 		timeouts.clear();
-		const maxScrollY = Math.max(document.documentElement.scrollHeight - (document.documentElement.clientHeight * 1.5), 0);
-		const maxScrollX = Math.max(document.documentElement.scrollWidth - (document.documentElement.clientWidth * 1.5), 0);
-		if (globalThis.scrollY <= maxScrollY && globalThis.scrollX <= maxScrollX) {
-			return triggerLazyLoading(options);
+		const bodyHeight = (document.body && document.body.scrollHeight) || document.documentElement.scrollHeight;
+		const bodyWidth = (document.body && document.body.scrollWidth) || document.documentElement.scrollWidth;
+		if (bodyHeight > globalThis.innerHeight || bodyWidth > globalThis.innerWidth) {
+			const maxScrollY = Math.max(bodyHeight - (globalThis.innerHeight * 1.5), 0);
+			const maxScrollX = Math.max(bodyWidth - (globalThis.innerWidth * 1.5), 0);
+			if (globalThis.scrollY < maxScrollY || globalThis.scrollX < maxScrollX) {
+				return triggerLazyLoading(options);
+			}
 		}
 	}
 }

package/single-file-core.js

@@ -484,7 +484,7 @@ class Processor {
 			const infobarContent = (this.options.infobarContent || "").replace(/\\n/g, "\n").replace(/\\t/g, "\t");
 			const commentNode = this.doc.createComment("\n " + (this.options.useLegacyCommentHeader ? util.COMMENT_HEADER_LEGACY : util.COMMENT_HEADER) +
 				" \n url: " + infobarURL +
-				" \n saved date: " + infobarSaveDate +
+				(this.options.removeSavedDate ? " " : " \n saved date: " + infobarSaveDate) +
 				(infobarContent ? " \n info: " + infobarContent : "") + "\n");
 			this.doc.documentElement.insertBefore(commentNode, this.doc.documentElement.firstChild);
 		}
@@ -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);
-				}
-			}
 		}
 	}
 

package/vendor/css-minifier.js

@@ -367,7 +367,9 @@ function collectComments(content, comments) {
  */
 
 // const REGEXP_EMPTY_RULES = /[^};{/]+\{\}/g;
-const REGEXP_PRESERVE_STRING = /"([^\\"]|\\.|\\)*"/g;
+const REGEXP_PRESERVE_STRING1 = /"([^\\"])*"/g;
+const REGEXP_PRESERVE_STRING1_BIS = /"(\\.)*"/g;
+const REGEXP_PRESERVE_STRING1_TER = /"(\\)*"/g;
 const REGEXP_PRESERVE_STRING2 = /'([^\\']|\\.|\\)*'/g;
 const REGEXP_MINIFY_ALPHA = /progid:DXImageTransform.Microsoft.Alpha\(Opacity=/gi;
 const REGEXP_PRESERVE_TOKEN1 = /\r\n/g;
@@ -444,7 +446,9 @@ function processString(content = "", options = defaultOptions) {
 	content = collectComments(content, comments);
 
 	// preserve strings so their content doesn't get accidentally minified
-	preserveString(REGEXP_PRESERVE_STRING);
+	preserveString(REGEXP_PRESERVE_STRING1);
+	preserveString(REGEXP_PRESERVE_STRING1_BIS);
+	preserveString(REGEXP_PRESERVE_STRING1_TER);
 	preserveString(REGEXP_PRESERVE_STRING2);
 
 	function preserveString(pattern) {
@@ -562,8 +566,12 @@ function processString(content = "", options = defaultOptions) {
 	// remove the spaces before the things that should not have spaces before them.
 	// but, be careful not to turn 'p :link {...}' into 'p:link{...}'
 	// swap out any pseudo-class colons with the token, and then swap back.
-	pattern = REGEXP_REMOVE_SPACES;
-	content = content.replace(pattern, token => token.replace(REGEXP_COLUMN, "___PSEUDOCLASSCOLON___"));
+	try {
+		pattern = REGEXP_REMOVE_SPACES;
+		content = content.replace(pattern, token => token.replace(REGEXP_COLUMN, "___PSEUDOCLASSCOLON___"));
+	} catch (_error) {
+		// ignored
+	}
 
 	// remove spaces before the things that should not have spaces before them.
 	content = content.replace(REGEXP_REMOVE_SPACES2, "$1");