removed options.basePath

Former-commit-id: 174b3e402d1a8b62a57a3e44d35e1cbe6ce426f8

cli/back-ends/common/scripts.js

@@ -26,41 +26,43 @@
 const fs = require("fs");
 
 const SCRIPTS = [
-	"/lib/single-file/processors/hooks/content/content-hooks.js",
-	"/lib/single-file/processors/hooks/content/content-hooks-frames.js",
-	"/lib/single-file/processors/frame-tree/content/content-frame-tree.js",
-	"/lib/single-file/processors/lazy/content/content-lazy-loader.js",
-	"/lib/single-file/single-file-util.js",
-	"/lib/single-file/single-file-helper.js",
-	"/lib/single-file/vendor/css-tree.js",
-	"/lib/single-file/vendor/html-srcset-parser.js",
-	"/lib/single-file/vendor/css-minifier.js",
-	"/lib/single-file/vendor/css-font-property-parser.js",
-	"/lib/single-file/vendor/css-media-query-parser.js",
-	"/lib/single-file/modules/html-minifier.js",
-	"/lib/single-file/modules/css-fonts-minifier.js",
-	"/lib/single-file/modules/css-fonts-alt-minifier.js",
-	"/lib/single-file/modules/css-matched-rules.js",
-	"/lib/single-file/modules/css-medias-alt-minifier.js",
-	"/lib/single-file/modules/css-rules-minifier.js",
-	"/lib/single-file/modules/html-images-alt-minifier.js",
-	"/lib/single-file/modules/html-serializer.js",
-	"/lib/single-file/single-file-core.js",
-	"/lib/single-file/single-file.js",
-	"/common/ui/content/content-infobar.js"
+	"lib/single-file/processors/hooks/content/content-hooks.js",
+	"lib/single-file/processors/hooks/content/content-hooks-frames.js",
+	"lib/single-file/processors/frame-tree/content/content-frame-tree.js",
+	"lib/single-file/processors/lazy/content/content-lazy-loader.js",
+	"lib/single-file/single-file-util.js",
+	"lib/single-file/single-file-helper.js",
+	"lib/single-file/vendor/css-tree.js",
+	"lib/single-file/vendor/html-srcset-parser.js",
+	"lib/single-file/vendor/css-minifier.js",
+	"lib/single-file/vendor/css-font-property-parser.js",
+	"lib/single-file/vendor/css-media-query-parser.js",
+	"lib/single-file/modules/html-minifier.js",
+	"lib/single-file/modules/css-fonts-minifier.js",
+	"lib/single-file/modules/css-fonts-alt-minifier.js",
+	"lib/single-file/modules/css-matched-rules.js",
+	"lib/single-file/modules/css-medias-alt-minifier.js",
+	"lib/single-file/modules/css-rules-minifier.js",
+	"lib/single-file/modules/html-images-alt-minifier.js",
+	"lib/single-file/modules/html-serializer.js",
+	"lib/single-file/single-file-core.js",
+	"lib/single-file/single-file.js",
+	"common/ui/content/content-infobar.js"
 ];
 
 const INDEX_SCRIPTS = [
-	"/lib/single-file/index.js",
-	"/common/index.js"
+	"lib/single-file/index.js",
+	"common/index.js"
 ];
 
 const WEB_SCRIPTS = [
-	"/lib/single-file/processors/hooks/content/content-hooks-web.js",
-	"/lib/single-file/processors/hooks/content/content-hooks-frames-web.js",
-	"/common/ui/content/content-infobar-web.js"
+	"lib/single-file/processors/hooks/content/content-hooks-web.js",
+	"lib/single-file/processors/hooks/content/content-hooks-frames-web.js",
+	"common/ui/content/content-infobar-web.js"
 ];
 
+const basePath = "../../../";
+
 exports.get = async options => {
 	let scripts = await readScriptFiles(INDEX_SCRIPTS);
 	const webScripts = {};
@@ -71,11 +73,11 @@ exports.get = async options => {
 	return scripts;
 };
 
-async function readScriptFiles(paths, basePath) {
-	return (await Promise.all(paths.map(path => readScriptFile(path, basePath)))).join("");
+async function readScriptFiles(paths) {
+	return (await Promise.all(paths.map(path => readScriptFile(path)))).join("");
 }
 
-function readScriptFile(path, basePath = "../../..") {
+function readScriptFile(path) {
 	return new Promise((resolve, reject) =>
 		fs.readFile(require.resolve(basePath + path), (err, data) => {
 			if (err) {

extension/lib/single-file/core/bg/scripts.js

@@ -63,6 +63,8 @@ singlefile.extension.lib.core.bg.scripts = (() => {
 		"extension/lib/single-file/fetch/content/content-fetch.js"
 	];
 
+	const basePath = "../../../";
+
 	return {
 		async inject(tabId, options) {
 			await initScripts(options);
@@ -91,21 +93,20 @@ singlefile.extension.lib.core.bg.scripts = (() => {
 
 	async function initScripts(options) {
 		const extensionScriptFiles = options.extensionScriptFiles || [];
-		const basePath = options.basePath || "";
 		if (!contentScript && !frameScript) {
 			[contentScript, frameScript] = await Promise.all([
-				getScript(contentScriptFiles.concat(extensionScriptFiles), basePath),
-				getScript(frameScriptFiles, basePath)
+				getScript(contentScriptFiles.concat(extensionScriptFiles)),
+				getScript(frameScriptFiles)
 			]);
 		}
 	}
 
-	async function getScript(scriptFiles, basePath) {
+	async function getScript(scriptFiles) {
 		const scriptsPromises = scriptFiles.map(async scriptFile => {
 			if (typeof scriptFile == "function") {
 				return "(" + scriptFile.toString() + ")();";
 			} else {
-				const scriptResource = await fetch(browser.runtime.getURL((!basePath || !basePath.startsWith("/") ? "/" : "") + basePath + (basePath && !basePath.endsWith("/") ? "/" : "") + scriptFile));
+				const scriptResource = await fetch(browser.runtime.getURL(basePath + scriptFile));
 				return new TextDecoder().decode(await scriptResource.arrayBuffer());
 			}
 		});