diff --git a/bin/_babel-node b/bin/_babel-node index 9d14ca4e2e..ea07f9bc4b 100644 --- a/bin/_babel-node +++ b/bin/_babel-node @@ -1,13 +1,14 @@ #!/usr/bin/env node -var commander = require("commander"); -var Module = require("module"); -var babel = require("../lib/babel/api/node"); -var path = require("path"); -var repl = require("repl"); -var util = require("../lib/babel/util"); -var vm = require("vm"); -var _ = require("lodash"); +var pathIsAbsolute = require("path-is-absolute"); +var commander = require("commander"); +var Module = require("module"); +var babel = require("../lib/babel/api/node"); +var path = require("path"); +var repl = require("repl"); +var util = require("../lib/babel/util"); +var vm = require("vm"); +var _ = require("lodash"); var program = new commander.Command("babel-node"); @@ -85,7 +86,7 @@ if (program.eval || program.print) { // make the filename absolute var filename = args[0] - if (!util.isAbsolute(filename)) args[0] = path.join(process.cwd(), filename); + if (!pathIsAbsolute(filename)) args[0] = path.join(process.cwd(), filename); // add back on node and concat the sliced args process.argv = ["node"].concat(args); diff --git a/lib/babel/util.js b/lib/babel/util.js index 32438efddc..1a6292a620 100644 --- a/lib/babel/util.js +++ b/lib/babel/util.js @@ -69,13 +69,6 @@ exports.arrayify = function (val) { throw new TypeError("illegal type for arrayify"); }; -exports.isAbsolute = function (loc) { - if (!loc) return false; - if (loc[0] === "/") return true; // unix - if (loc[1] === ":" && loc[2] === "\\") return true; // windows - return false; -}; - var templateVisitor = { enter: function (node, parent, scope, nodes) { if (t.isExpressionStatement(node)) { diff --git a/package.json b/package.json index a114f810d9..3f784c5242 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "leven": "^1.0.1", "lodash": "^3.2.0", "output-file-sync": "^1.1.0", + "path-is-absolute": "^1.0.0", "private": "^0.1.6", "regenerator-babel": "0.8.10-2", "regexpu": "^1.1.1", diff --git a/test/util.js b/test/util.js index 3a87261256..2562750dc2 100644 --- a/test/util.js +++ b/test/util.js @@ -50,16 +50,6 @@ suite("util", function () { assert.ok(!util.canCompile("/scripts/test.css")); }); - test("isAbsolute", function () { - assert.ok(util.isAbsolute("/test.js")); - assert.ok(util.isAbsolute("C:\\test.js")); - - assert.ok(!util.isAbsolute()); - assert.ok(!util.isAbsolute("")); - assert.ok(!util.isAbsolute("test.js")); - assert.ok(!util.isAbsolute("test/test.js")); - }); - test("list", function () { assert.deepEqual(util.list(undefined), []); assert.deepEqual(util.list(false), []);