removed dependency from core to extension

Former-commit-id: 78628cd6ad25e4100d0ab94bf4472f1c5b90f4bd

extension/core/bg/autosave.js

@@ -120,7 +120,9 @@ singlefile.extension.core.bg.autosave = (() => {
 		options.incognito = tab.incognito;
 		options.tabId = tabId;
 		options.tabIndex = tab.index;
-		const processor = new (singlefile.lib.SingleFile.getClass())(options);
+		const processor = new (singlefile.lib.SingleFile.getClass({
+			fetch: singlefile.extension.lib.fetch.content.resources.fetch
+		}))(options);
 		await processor.run();
 		const pageData = await processor.getPageData();
 		if (options.includeInfobar) {

extension/core/content/content-main.js

@@ -28,7 +28,9 @@ this.singlefile.extension.core.content.main = this.singlefile.extension.core.con
 	const singlefile = this.singlefile;
 
 	const MAX_CONTENT_SIZE = 32 * (1024 * 1024);
-	const SingleFile = singlefile.lib.SingleFile.getClass();
+	const SingleFile = singlefile.lib.SingleFile.getClass({
+		fetch: singlefile.extension.lib.fetch.content.resources.fetch
+	});
 
 	let ui, processing = false, processor;
 

extension/ui/content/content-ui-main.js

@@ -25,7 +25,10 @@
 
 this.singlefile.extension.ui.content.main = this.singlefile.extension.ui.content.main || (() => {
 
-	const SingleFile = this.singlefile.lib.SingleFile.getClass();
+	const singlefile = this.singlefile;
+	const SingleFile = this.singlefile.lib.SingleFile.getClass({
+		fetch: singlefile.extension.lib.fetch.content.resources.fetch
+	});
 
 	const MASK_TAGNAME = "singlefile-mask";
 	const PROGRESS_BAR_TAGNAME = "singlefile-progress-bar";

lib/single-file/single-file.js

@@ -51,9 +51,12 @@ this.singlefile.lib.SingleFile = this.singlefile.lib.SingleFile || (() => {
 		digestText
 	};
 	const SingleFile = singlefile.lib.core.getClass(singlefile.lib.util.getInstance(modules, util), singlefile.lib.vendor.cssTree);
-	const fetchResource = (singlefile.extension && singlefile.extension.lib.fetch.content.resources.fetch) || fetch;
+	let fetchResource;
 	return {
-		getClass: () => SingleFile
+		getClass: options => {
+			fetchResource = (options && options.fetch) || fetch;
+			return SingleFile;
+		}
 	};
 
 	async function getResourceContent(resourceURL) {