Explorar el Código

resolve script paths

Gildas hace 7 años
padre
commit
8e8865d790
Se han modificado 2 ficheros con 18 adiciones y 18 borrados
  1. 1 1
      node-jsdom/example.-jsdom.js
  2. 17 17
      node-jsdom/single-file-jsdom.js

+ 1 - 1
node-jsdom/example.-jsdom.js

@@ -25,7 +25,7 @@
 
 
 const fs = require("fs");
 const fs = require("fs");
 
 
-const SingleFile = require("./single-file-puppeteer.js");
+const SingleFile = require("../node-index.js").jsdom;
 
 
 SingleFile.getPageData({
 SingleFile.getPageData({
 	url: "https://github.com/gildas-lormeau/SingleFile",
 	url: "https://github.com/gildas-lormeau/SingleFile",

+ 17 - 17
node-jsdom/single-file-jsdom.js

@@ -33,25 +33,25 @@ const iconv = require("iconv-lite");
 const request = require("request-promise-native");
 const request = require("request-promise-native");
 
 
 const SCRIPTS = [
 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(scriptPath).toString()));
+SCRIPTS.forEach(scriptPath => eval(fs.readFileSync(require.resolve(scriptPath)).toString()));
 const docHelper = this.docHelper;
 const docHelper = this.docHelper;
 const modules = {
 const modules = {
 	docHelper: docHelper,
 	docHelper: docHelper,