single-file-core 1.2.30 → 1.2.32

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/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.30",
+  "version": "1.2.32",
   "description": "SingleFile Core",
   "author": "Gildas Lormeau",
   "license": "AGPL-3.0-or-later",

package/processors/compression/compression-extract.js

@@ -84,6 +84,12 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 	await Promise.all(entries.map(async entry => {
 		const { filename } = entry;
 		let dataWriter, content, textContent, mimeType;
+		const resourceInfo = {};
+		if (filename.match(REGEXP_MATCH_INDEX)) {
+			indexPages.push(resourceInfo);
+		} else {
+			resources.push(resourceInfo);
+		}
 		if (!options.password && entry.encrypted) {
 			options.password = prompt("Please enter the password to view the page");
 		}
@@ -119,18 +125,18 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 			}
 		}
 		const name = entry.filename.match(/^([0-9_]+\/)?(.*)$/)[2];
-		const resourceInfo = { filename: entry.filename, name, url: entry.comment, content, mimeType, textContent, parentResources: [] };
-		if (filename.match(REGEXP_MATCH_INDEX)) {
-			indexPages.push(resourceInfo);
-		} else {
-			resources.push(resourceInfo);
-		}
+		Object.assign(resourceInfo, {
+			filename: entry.filename,
+			name,
+			url: entry.comment,
+			content,
+			mimeType,
+			textContent,
+			parentResources: []
+		});
 	}));
 	await zipReader.close();
-	resources.reverse();
-	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;