single-file-core 1.2.10 → 1.2.12

package/modules/css-medias-alt-minifier.js

@@ -38,12 +38,15 @@ export {
 
 function process(stylesheets) {
 	const stats = { processed: 0, discarded: 0 };
-	stylesheets.forEach((stylesheetInfo, element) => {
+	stylesheets.forEach((stylesheetInfo, key) => {
 		if (matchesMediaType(stylesheetInfo.mediaText || MEDIA_ALL, MEDIA_SCREEN) && stylesheetInfo.stylesheet.children) {
 			const removedRules = processRules(stylesheetInfo.stylesheet.children, stats);
 			removedRules.forEach(({ cssRules, cssRule }) => cssRules.remove(cssRule));
 		} else {
-			stylesheets.delete(element);
+			stylesheets.delete(key);
+			if (key.element) {
+				key.element.remove();
+			}
 		}
 	});
 	return stats;

package/package.json

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

package/processors/compression/compression-extract.js

@@ -58,7 +58,7 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 	const REGEXP_MATCH_SCRIPT = /scripts\/[0-9]+\.js/;
 	const REGEXP_MATCH_ROOT_INDEX = /^([0-9_]+\/)?index\.html$/;
 	const REGEXP_MATCH_INDEX = /index\.html$/;
-	const REGEXP_ESCAPE = /([{}()^$&.*?/+|[\\\\]|\]|-)/g;
+	const REGEXP_MATCH_FRAMES = /frames\//;
 	const CHARSET_UTF8 = ";charset=utf-8";
 	if (Array.isArray(content)) {
 		content = new Blob([new Uint8Array(content)]);
@@ -87,7 +87,7 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 					mimeType = "text/javascript" + CHARSET_UTF8;
 				}
 				if (textContent !== undefined) {
-					content = await getDataURI(textContent, mimeType);
+					content = noBlobURL ? await getDataURI(textContent, mimeType) : URL.createObjectURL(new Blob([textContent], { type: mimeType }));
 				} else {
 					content = "data:text/plain,";
 				}
@@ -99,7 +99,7 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 			} else {
 				mimeType = "application/octet-stream";
 			}
-			if (filename.match(/frames\//) || noBlobURL) {
+			if (filename.match(REGEXP_MATCH_FRAMES) || noBlobURL) {
 				content = await entry.getData(new zip.Data64URIWriter(mimeType), options);
 			} else {
 				const blob = await entry.getData(new zip.BlobWriter(mimeType), options);
@@ -129,16 +129,19 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 					if (filename.startsWith(prefixPath) && filename != resourceFilename) {
 						const relativeFilename = filename.substring(prefixPath.length);
 						if (!relativeFilename.match(/manifest\.json$/)) {
-							const searchRegExp = new RegExp(relativeFilename.replace(REGEXP_ESCAPE, "\\$1"), "g");
-							const position = textContent.search(searchRegExp);
+							const position = textContent.indexOf(relativeFilename);
 							if (position != -1) {
 								parentResources.push(resourceFilename);
-								textContent = textContent.replace(searchRegExp, content);
+								textContent = textContent.replaceAll(relativeFilename, content);
 							}
 						}
 					}
 				}));
-				resource.content = await getDataURI(textContent, mimeType);
+				if (filename.match(REGEXP_MATCH_INDEX) || filename.match(REGEXP_MATCH_FRAMES) || noBlobURL) {
+					resource.content = await getDataURI(textContent, mimeType);
+				} else {
+					resource.content = URL.createObjectURL(new Blob([textContent], { type: mimeType }));
+				}
 				resource.textContent = textContent;
 			}
 			if (filename.match(REGEXP_MATCH_INDEX)) {
@@ -158,7 +161,7 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 		const reader = new FileReader();
 		reader.readAsDataURL(new Blob([textContent], { type: mimeType }));
 		return new Promise((resolve, reject) => {
-			reader.onload = () => resolve(reader.result);
+			reader.onload = () => resolve(reader.result.replace(CHARSET_UTF8, ""));
 			reader.onerror = reject;
 		});
 	}

package/single-file-editor-helper.js

@@ -24,6 +24,9 @@
 import * as serializer from "./modules/html-serializer.js";
 import * as infobar from "./core/infobar.js";
 import { getInstance } from "./core/util.js";
+import * as zip from "./vendor/zip/zip.js";
+import { extract } from "./processors/compression/compression-extract.js";
+import { display } from "./processors/compression/compression-display.js";
 
 const util = getInstance();
 const helper = {
@@ -42,6 +45,9 @@ const helper = {
 	displayIcon(doc, useShadowRoot) {
 		return infobar.displayIcon(doc, useShadowRoot);
 	},
+	zip,
+	extract,
+	display,
 	INFOBAR_TAGNAME: infobar.INFOBAR_TAGNAME
 };