From 1488d88c81c4b8a31f96c0fb1045f3328302b2e2 Mon Sep 17 00:00:00 2001 From: Jesse McCarthy Date: Mon, 1 Jun 2015 16:23:35 -0400 Subject: [PATCH 1/2] Add test for require-hook node_modules check. (Failing.) --- .../fixtures/require-hook/not_node_modules/input.js | 1 + test/core/require-hook.js | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 test/core/fixtures/require-hook/not_node_modules/input.js create mode 100644 test/core/require-hook.js diff --git a/test/core/fixtures/require-hook/not_node_modules/input.js b/test/core/fixtures/require-hook/not_node_modules/input.js new file mode 100644 index 0000000000..ff14abefe9 --- /dev/null +++ b/test/core/fixtures/require-hook/not_node_modules/input.js @@ -0,0 +1 @@ +() => {}; diff --git a/test/core/require-hook.js b/test/core/require-hook.js new file mode 100644 index 0000000000..6a61c3cb9d --- /dev/null +++ b/test/core/require-hook.js @@ -0,0 +1,12 @@ +var chai = require("chai"); + +// Require-hook. +require("../../lib/babel/api/register/node"); + +suite("require hook", function () { + test("not node_modules", function () { + chai.expect(function () { + require("./fixtures/require-hook/not_node_modules/input"); + }).to.not.throw(); + }); +}); From efb3b042253b0bca2ded6caf7e01b6374516c59e Mon Sep 17 00:00:00 2001 From: Jesse McCarthy Date: Mon, 1 Jun 2015 15:41:50 -0400 Subject: [PATCH 2/2] Make node_modules path check robust. --- src/babel/api/register/node.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/babel/api/register/node.js b/src/babel/api/register/node.js index 86bee9a300..fee7f04933 100644 --- a/src/babel/api/register/node.js +++ b/src/babel/api/register/node.js @@ -6,6 +6,7 @@ import * as babel from "../node"; import each from "lodash/collection/each"; import * as util from "../../util"; import fs from "fs"; +import path from "path"; sourceMapSupport.install({ handleUncaughtExceptions: false, @@ -81,7 +82,7 @@ var compile = function (filename) { var shouldIgnore = function (filename) { if (!ignore && !only) { - return /node_modules/.test(filename); + return filename.split(path.sep).indexOf("node_modules") >= 0; } else { return util.shouldIgnore(filename, ignore || [], only || []); }