refactor(transpile): use semver-try-require instead of internal tryRe…

…quire
sverweij · Jan 21, 2018 · d36cfd8 · d36cfd8
1 parent eb3d3ad
commit d36cfd8
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 94 deletions.
diff --git a/Makefile b/Makefile
@@ -194,16 +194,13 @@ src/extract/transpile/meta.js: \
 	src/extract/transpile/typeScriptWrap.js
 
 src/extract/transpile/coffeeWrap.js: \
-	package.json \
-	src/extract/transpile/tryRequire.js
+	package.json
 
 src/extract/transpile/liveScriptWrap.js: \
-	package.json \
-	src/extract/transpile/tryRequire.js
+	package.json
 
 src/extract/transpile/typeScriptWrap.js: \
-	package.json \
-	src/extract/transpile/tryRequire.js
+	package.json
 
 src/extract/transpile/index.js: \
 	src/extract/transpile/meta.js
@@ -254,7 +251,6 @@ ALL_SRC=src/main/index.js \
 	src/extract/transpile/javaScriptWrap.js \
 	src/extract/transpile/liveScriptWrap.js \
 	src/extract/transpile/meta.js \
-	src/extract/transpile/tryRequire.js \
 	src/extract/transpile/typeScriptWrap.js \
 	src/main/options/defaults.json \
 	src/main/options/normalize.js \
@@ -343,16 +339,13 @@ src/extract/transpile/meta.js: \
 	src/extract/transpile/typeScriptWrap.js
 
 src/extract/transpile/coffeeWrap.js: \
-	package.json \
-	src/extract/transpile/tryRequire.js
+	package.json
 
 src/extract/transpile/liveScriptWrap.js: \
-	package.json \
-	src/extract/transpile/tryRequire.js
+	package.json
 
 src/extract/transpile/typeScriptWrap.js: \
-	package.json \
-	src/extract/transpile/tryRequire.js
+	package.json
 
 src/extract/transpile/index.js: \
 	src/extract/transpile/meta.js
@@ -449,9 +442,6 @@ test/extract/transpile/meta.spec.js: \
 	src/extract/transpile/liveScriptWrap.js \
 	src/extract/transpile/meta.js
 
-test/extract/transpile/tryRequire.spec.js: \
-	src/extract/transpile/tryRequire.js
-
 test/extract/transpile/typeScriptWrap.spec.js: \
 	src/extract/transpile/typeScriptWrap.js
 

diff --git a/doc/real-world-samples/dependency-cruiser-without-node_modules.png b/doc/real-world-samples/dependency-cruiser-without-node_modules.png
diff --git a/package.json b/package.json
@@ -74,7 +74,8 @@
     "normalize-newline": "3.0.0",
     "resolve": "1.5.0",
     "safe-regex": "1.1.0",
-    "semver": "5.5.0"
+    "semver": "5.5.0",
+    "semver-try-require": "1.0.5"
   },
   "engines": {
     "node": ">=4"

diff --git a/src/extract/transpile/coffeeWrap.js b/src/extract/transpile/coffeeWrap.js
@@ -1,5 +1,5 @@
 "use strict";
-const tryRequire   = require("./tryRequire");
+const tryRequire   = require("semver-try-require");
 const $package     = require("../../../package.json");
 
 /*

diff --git a/src/extract/transpile/liveScriptWrap.js b/src/extract/transpile/liveScriptWrap.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const tryRequire = require("./tryRequire");
+const tryRequire = require("semver-try-require");
 const livescript = tryRequire(
     "livescript",
     require("../../../package.json").supportedTranspilers.livescript

diff --git a/src/extract/transpile/tryRequire.js b/src/extract/transpile/tryRequire.js
diff --git a/src/extract/transpile/typeScriptWrap.js b/src/extract/transpile/typeScriptWrap.js
@@ -1,5 +1,5 @@
 "use strict";
-const tryRequire = require("./tryRequire");
+const tryRequire = require("semver-try-require");
 const typescript = tryRequire(
     "typescript",
     require("../../../package.json").supportedTranspilers.typescript

diff --git a/test/extract/transpile/tryRequire.spec.js b/test/extract/transpile/tryRequire.spec.js