single-file-core 1.2.29 → 1.2.31

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

@@ -224,7 +224,7 @@ class ProcessorHelperCommon {
 								// ignored
 							}
 							if (testValidURL(resourceURL)) {
-								await this.processImageSrcset(resourceURL, srcsetValue, resources, batchRequest);
+								return this.processImageSrcset(resourceURL, srcsetValue, resources, batchRequest);
 							} else {
 								return "";
 							}

package/core/lib/processor-helper.js

@@ -91,7 +91,9 @@ function getProcessorHelperClass(utilInstance) {
 		}
 
 		replaceStylesheets(doc, stylesheets, options, resources) {
-			for (const [key, stylesheetInfo] of stylesheets) {
+			const entries = Array.from(stylesheets);
+			entries.reverse();
+			for (const [key, stylesheetInfo] of entries) {
 				if (key.urlNode) {
 					const name = "stylesheet_" + resources.stylesheets.size + ".css";
 					if (!isDataURL(stylesheetInfo.url) && options.saveOriginalURLs) {
@@ -100,10 +102,7 @@ function getProcessorHelperClass(utilInstance) {
 						key.urlNode.value = name;
 					}
 					resources.stylesheets.set(resources.stylesheets.size, { name, content: this.generateStylesheetContent(stylesheetInfo.stylesheet, options), url: stylesheetInfo.url });
-				}
-			}
-			for (const [key, stylesheetInfo] of stylesheets) {
-				if (key.element) {
+				} else {
 					if (key.element.tagName.toUpperCase() == "LINK") {
 						const linkElement = key.element;
 						const name = "stylesheet_" + resources.stylesheets.size + ".css";

package/modules/css-fonts-minifier.js

@@ -181,8 +181,16 @@ function testUsedFont(ruleData, familyName, declaredFonts, filteredUsedFonts) {
 					fontInfo[2] = "normal";
 					return getUsedFontWeight(fontInfo, fontStyle, declaredFontsWeights);
 				});
+				test = testFontweight(fontWeight, usedFontWeights);
+				if (!test) {
+					usedFontWeights = optionalUsedFonts.map(fontInfo => {
+						fontInfo = Array.from(fontInfo);
+						fontInfo[2] = fontStyle = "normal";
+						return getUsedFontWeight(fontInfo, fontStyle, declaredFontsWeights);
+					});
+					test = testFontweight(fontWeight, usedFontWeights);
+				}
 			}
-			test = testFontweight(fontWeight, usedFontWeights);
 		} else {
 			test = true;
 		}

package/package.json

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

package/processors/compression/compression-extract.js

@@ -127,9 +127,7 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 		}
 	}));
 	await zipReader.close();
-	resources.sort(sortByFilenameLength);
 	indexPages.sort(sortByFilenameLength);
-	resources.sort((resourceLeft, resourceRight) => resourceRight.textContent ? -1 : resourceLeft.textContent ? 1 : 0);
 	resources = resources.concat(...indexPages);
 	for (const resource of resources) {
 		let { textContent, mimeType, filename } = resource;