single-file-core 1.0.14 → 1.0.15

package/package.json

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

package/processors/hooks/content/content-hooks-frames.js

@@ -41,7 +41,6 @@ const NEW_FONT_FACE_EVENT = "single-file-new-font-face";
 const DELETE_FONT_EVENT = "single-file-delete-font";
 const CLEAR_FONTS_EVENT = "single-file-clear-fonts";
 
-const browser = globalThis.browser;
 const addEventListener = (type, listener, options) => globalThis.addEventListener(type, listener, options);
 const dispatchEvent = event => { try { globalThis.dispatchEvent(event); } catch (error) {  /* ignored */ } };
 const CustomEvent = globalThis.CustomEvent;
@@ -69,17 +68,6 @@ if (document instanceof Document) {
 		fontFaces.delete(JSON.stringify(key));
 	});
 	addEventListener(CLEAR_FONTS_EVENT, () => fontFaces = new Map());
-	let scriptElement = document.createElement("script");
-	scriptElement.src = "data:," + "(" + injectedScript.toString() + ")()";
-	(document.documentElement || document).appendChild(scriptElement);
-	scriptElement.remove();
-	if (browser && browser.runtime && browser.runtime.getURL) {
-		scriptElement = document.createElement("script");
-		scriptElement.src = browser.runtime.getURL("/lib/single-file-hooks-frames.js");
-		scriptElement.async = false;
-		(document.documentElement || document).appendChild(scriptElement);
-		scriptElement.remove();
-	}
 }
 
 export {
@@ -135,80 +123,4 @@ function loadDeferredImagesResetZoomLevel(options) {
 	} else {
 		dispatchEvent(new CustomEvent(LOAD_DEFERRED_IMAGES_RESET_EVENT));
 	}
-}
-
-function injectedScript() {
-	if (typeof globalThis == "undefined") {
-		window.globalThis = window;
-	}
-	const document = globalThis.document;
-	const console = globalThis.console;
-	const dispatchEvent = event => globalThis.dispatchEvent(event);
-	const CustomEvent = globalThis.CustomEvent;
-	const FileReader = globalThis.FileReader;
-	const Blob = globalThis.Blob;
-	const warn = (console && console.warn && ((...args) => console.warn(...args))) || (() => { });
-	const NEW_FONT_FACE_EVENT = "single-file-new-font-face";
-	const DELETE_FONT_EVENT = "single-file-delete-font";
-	const CLEAR_FONTS_EVENT = "single-file-clear-fonts";
-	const FONT_STYLE_PROPERTIES = {
-		family: "font-family",
-		style: "font-style",
-		weight: "font-weight",
-		stretch: "font-stretch",
-		unicodeRange: "unicode-range",
-		variant: "font-variant",
-		featureSettings: "font-feature-settings"
-	};
-
-	if (globalThis.FontFace) {
-		const FontFace = globalThis.FontFace;
-		let warningFontFaceDisplayed;
-		globalThis.FontFace = function () {
-			if (!warningFontFaceDisplayed) {
-				warn("SingleFile is hooking the FontFace constructor, document.fonts.delete and document.fonts.clear to handle dynamically loaded fonts.");
-				warningFontFaceDisplayed = true;
-			}
-			getDetailObject(...arguments).then(detail => dispatchEvent(new CustomEvent(NEW_FONT_FACE_EVENT, { detail })));
-			return new FontFace(...arguments);
-		};
-		globalThis.FontFace.toString = function () { return "function FontFace() { [native code] }"; };
-		const deleteFont = document.fonts.delete;
-		document.fonts.delete = function (fontFace) {
-			getDetailObject(fontFace.family).then(detail => dispatchEvent(new CustomEvent(DELETE_FONT_EVENT, { detail })));
-			return deleteFont.call(document.fonts, fontFace);
-		};
-		document.fonts.delete.toString = function () { return "function delete() { [native code] }"; };
-		const clearFonts = document.fonts.clear;
-		document.fonts.clear = function () {
-			dispatchEvent(new CustomEvent(CLEAR_FONTS_EVENT));
-			return clearFonts.call(document.fonts);
-		};
-		document.fonts.clear.toString = function () { return "function clear() { [native code] }"; };
-	}
-
-	async function getDetailObject(fontFamily, src, descriptors) {
-		const detail = {};
-		detail["font-family"] = fontFamily;
-		detail.src = src;
-		if (descriptors) {
-			Object.keys(descriptors).forEach(descriptor => {
-				if (FONT_STYLE_PROPERTIES[descriptor]) {
-					detail[FONT_STYLE_PROPERTIES[descriptor]] = descriptors[descriptor];
-				}
-			});
-		}
-		return new Promise(resolve => {
-			if (detail.src instanceof ArrayBuffer) {
-				const reader = new FileReader();
-				reader.readAsDataURL(new Blob([detail.src]));
-				reader.addEventListener("load", () => {
-					detail.src = "url(" + reader.result + ")";
-					resolve(detail);
-				});
-			} else {
-				resolve(detail);
-			}
-		});
-	}
 }

package/processors/index.js

@@ -22,13 +22,11 @@
  */
 
 import * as frameTree from "./frame-tree/content/content-frame-tree.js";
-import * as hooks from "./hooks/content/content-hooks.js";
 import * as hooksFrames from "./hooks/content/content-hooks-frames.js";
 import * as lazy from "./lazy/content/content-lazy-loader.js";
 
 export {
 	frameTree,
-	hooks,
 	hooksFrames,
 	lazy
 };

package/processors/hooks/content/content-hooks.js

@@ -1,39 +0,0 @@
-/*
- * Copyright 2010-2022 Gildas Lormeau
- * contact : gildas.lormeau <at> gmail.com
- * 
- * This file is part of SingleFile.
- *
- *   The code in this file is free software: you can redistribute it and/or 
- *   modify it under the terms of the GNU Affero General Public License 
- *   (GNU AGPL) as published by the Free Software Foundation, either version 3
- *   of the License, or (at your option) any later version.
- * 
- *   The code in this file is distributed in the hope that it will be useful, 
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of 
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero 
- *   General Public License for more details.
- *
- *   As additional permission under GNU AGPL version 3 section 7, you may 
- *   distribute UNMODIFIED VERSIONS OF THIS file without the copy of the GNU 
- *   AGPL normally required by section 4, provided you include this license 
- *   notice and a URL through which recipients can access the Corresponding 
- *   Source.
- */
-
-/* global globalThis */
-
-const browser = globalThis.browser;
-const document = globalThis.document;
-const Document = globalThis.Document;
-
-if (document instanceof Document) {
-	const scriptElement = document.createElement("script");
-	scriptElement.async = false;
-	if (browser && browser.runtime && browser.runtime.getURL) {
-		scriptElement.src = browser.runtime.getURL("/lib/single-file-hooks.js");
-		scriptElement.async = false;
-	}
-	(document.documentElement || document).appendChild(scriptElement);
-	scriptElement.remove();
-}