single-file-core 1.2.421 → 1.3.1

package/core/infobar.js

@@ -154,7 +154,8 @@ function appendInfobar(doc, options, useShadowRoot) {
 			infoData = options.saveDate;
 		}
 		infoData = infoData || "No info";
-		const infobarElement = createElement(doc, INFOBAR_TAGNAME, doc.body);
+		const parentElement = doc.body.tagName == "BODY" ? doc.body : doc.documentElement;
+		const infobarElement = createElement(doc, INFOBAR_TAGNAME, parentElement);
 		let infobarContainer;
 		if (useShadowRoot) {
 			infobarContainer = infobarElement.attachShadow({ mode: "open" });
@@ -210,7 +211,6 @@ function appendInfobar(doc, options, useShadowRoot) {
 			shadowRootContent.appendChild(scriptElement);
 			infobarContainer.innerHTML = shadowRootContent.outerHTML;
 		}
-		doc.body.appendChild(infobarElement);
 	}
 }
 

package/core/lib/processor-helper.js

@@ -77,9 +77,9 @@ function getProcessorHelperClass(utilInstance) {
 				if (element.tagName.toUpperCase() == "LINK") {
 					await this.resolveLinkStylesheetURLs(stylesheetInfo, element, element.href, baseURI, options, workStyleElement, resources, stylesheets);
 				} else {
-					stylesheets.set({ element }, stylesheetInfo);
 					stylesheetInfo.stylesheet = cssTree.parse(element.textContent, { context: "stylesheet", parseCustomProperty: true });
 					await this.resolveImportURLs(stylesheetInfo, baseURI, options, workStyleElement, resources, stylesheets);
+					stylesheets.set({ element }, stylesheetInfo);
 				}
 			} else {
 				if (element.tagName.toUpperCase() == "LINK") {
@@ -92,7 +92,6 @@ function getProcessorHelperClass(utilInstance) {
 
 		replaceStylesheets(doc, stylesheets, options, resources) {
 			const entries = Array.from(stylesheets);
-			entries.reverse();
 			for (const [key, stylesheetInfo] of entries) {
 				if (key.urlNode) {
 					const name = "stylesheet_" + resources.stylesheets.size + ".css";
@@ -149,7 +148,6 @@ function getProcessorHelperClass(utilInstance) {
 									scoped,
 									mediaText
 								};
-								stylesheets.set({ urlNode }, stylesheetInfo);
 								const content = await this.getStylesheetContent(resourceURL, options);
 								stylesheetInfo.url = resourceURL = content.resourceURL;
 								const existingStylesheet = Array.from(stylesheets).find(([, stylesheetInfo]) => stylesheetInfo.resourceURL == resourceURL);
@@ -159,6 +157,7 @@ function getProcessorHelperClass(utilInstance) {
 									content.data = getUpdatedResourceContent(resourceURL, content, options);
 									stylesheetInfo.stylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
 									await this.resolveImportURLs(stylesheetInfo, resourceURL, options, workStylesheet, resources, stylesheets);
+									stylesheets.set({ urlNode }, stylesheetInfo);
 								}
 							}
 						}
@@ -178,7 +177,6 @@ function getProcessorHelperClass(utilInstance) {
 						mediaText: stylesheetInfo.mediaText
 					});
 				} else {
-					stylesheets.set({ element }, stylesheetInfo);
 					const content = await util.getContent(resourceURL, {
 						maxResourceSize: options.maxResourceSize,
 						maxResourceSizeEnabled: options.maxResourceSizeEnabled,
@@ -207,6 +205,7 @@ function getProcessorHelperClass(utilInstance) {
 						content.data = getUpdatedResourceContent(content.resourceURL, content, options);
 						stylesheetInfo.stylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
 						await this.resolveImportURLs(stylesheetInfo, resourceURL, options, workStylesheet, resources, stylesheets);
+						stylesheets.set({ element }, stylesheetInfo);
 					}
 				}
 			}

package/modules/template-formatter.js

@@ -16900,8 +16900,9 @@ async function evalTemplate(template = "", options, content, doc, dontReplaceSla
 	const dontReplaceSlashIfUndefined = dontReplaceSlash === undefined ? true : dontReplaceSlash;
 	const urlSuffix = PUBLIC_SUFFIX_LIST.find(urlTopLevelDomainName => url.hostname.endsWith("." + urlTopLevelDomainName) && urlTopLevelDomainName);
 	const urlDomainName = urlSuffix ? url.hostname.substring(0, url.hostname.length - urlSuffix.length - 1) : url.hostname;
-	let urlSubDomains = urlDomainName.substring(0, urlDomainName.lastIndexOf("."));
-	const urlDomain = urlDomainName.substring(urlSubDomains.length + 1);
+	const indexLastDotCharacter = urlDomainName.lastIndexOf(".");
+	let urlSubDomains = urlDomainName.substring(0, indexLastDotCharacter == -1 ? 0 : indexLastDotCharacter);
+	const urlDomain = urlDomainName.substring(urlSubDomains.length ? urlSubDomains.length + 1 : 0);
 	const urlRoot = urlDomain + "." + urlSuffix;
 	if (urlSubDomains.startsWith("www.")) {
 		urlSubDomains = urlSubDomains.substring(4);

package/package.json

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