moved back-end scripts into /cli/back-ends

cli/single-file-jsdom.js → cli/back-ends/jsdom.js

@@ -33,22 +33,22 @@ const iconv = require("iconv-lite");
 const request = require("request-promise-native");
 
 const SCRIPTS = [
-	"../lib/single-file/util/doc-util.js",
-	"../lib/single-file/util/doc-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/util/doc-util.js",
+	"../../lib/single-file/util/doc-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"
 ];
 
 SCRIPTS.forEach(scriptPath => eval(fs.readFileSync(require.resolve(scriptPath)).toString()));

cli/single-file-puppeteer.js → cli/back-ends/puppeteer.js

@@ -28,26 +28,26 @@ const fs = require("fs");
 const puppeteer = require("puppeteer-core");
 
 const SCRIPTS = [
-	"../lib/hooks/hooks-frame.js",
-	"../lib/frame-tree/frame-tree.js",
-	"../lib/single-file/util/doc-util.js",
-	"../lib/single-file/util/doc-helper.js",
-	"../lib/single-file/util/timeout.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-browser.js"
+	"../../lib/hooks/hooks-frame.js",
+	"../../lib/frame-tree/frame-tree.js",
+	"../../lib/single-file/util/doc-util.js",
+	"../../lib/single-file/util/doc-helper.js",
+	"../../lib/single-file/util/timeout.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-browser.js"
 ];
 
 exports.getPageData = async options => {
@@ -72,7 +72,7 @@ exports.getPageData = async options => {
 			await page.setBypassCSP(true);
 		}
 		if (options.loadDeferredImages) {
-			SCRIPTS.unshift("../lib/lazy/web/web-lazy-loader-before");
+			SCRIPTS.unshift("../../lib/lazy/web/web-lazy-loader-before");
 		}
 		await Promise.all(SCRIPTS.map(scriptPath => page.evaluateOnNewDocument(fs.readFileSync(require.resolve(scriptPath)).toString())));
 		await page.goto(options.url, {

cli/single-file-webdriver.js → cli/back-ends/webdriver.js

@@ -28,25 +28,25 @@ const chrome = require("selenium-webdriver/chrome");
 const { Builder } = require("selenium-webdriver");
 
 const SCRIPTS = [
-	"../lib/frame-tree/frame-tree.js",
-	"../lib/single-file/util/doc-util.js",
-	"../lib/single-file/util/doc-helper.js",
-	"../lib/single-file/util/timeout.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-browser.js"
+	"../../lib/frame-tree/frame-tree.js",
+	"../../lib/single-file/util/doc-util.js",
+	"../../lib/single-file/util/doc-helper.js",
+	"../../lib/single-file/util/timeout.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-browser.js"
 ];
 
 exports.getPageData = async options => {
@@ -68,7 +68,7 @@ exports.getPageData = async options => {
 		await driver.get(options.url);
 		let scripts = (await Promise.all(SCRIPTS.map(scriptPath => fs.readFileSync(require.resolve(scriptPath)).toString()))).join("\n");
 		if (options.loadDeferredImages) {
-			scripts += "\ntry {\n" + fs.readFileSync(require.resolve("../lib/lazy/web/web-lazy-loader-before")) + "\n} catch (error) {}";
+			scripts += "\ntry {\n" + fs.readFileSync(require.resolve("../../lib/lazy/web/web-lazy-loader-before")) + "\n} catch (error) {}";
 		}
 		const mainWindowHandle = driver.getWindowHandle();
 		const windowHandles = await driver.getAllWindowHandles();

cli/single-file-cli.js

@@ -102,9 +102,9 @@ const args = require("yargs")
 	.argv;
 
 const backEnds = {
-	jsdom: "./single-file-jsdom.js",
-	puppeteer: "./single-file-puppeteer.js",
-	webdriver: "./single-file-webdriver.js"
+	jsdom: "./back-ends/jsdom.js",
+	puppeteer: "./back-ends/puppeteer.js",
+	webdriver: "./back-ends/webdriver.js"
 };
 require(backEnds[args.backEnd]).getPageData(args).then(pageData => {
 	if (args.output) {