From f8afc5fa175ca21f17dda6e5a1a3caffd2d9e4b5 Mon Sep 17 00:00:00 2001 From: Jesse McCarthy Date: Wed, 3 Jun 2015 09:03:32 -0400 Subject: [PATCH 1/2] Revert "Add test for require-hook node_modules check." This reverts commit 1488d88c81c4b8a31f96c0fb1045f3328302b2e2. Wrong branch was accidentally merged. There is a better test. --- .../fixtures/require-hook/not_node_modules/input.js | 1 - test/core/require-hook.js | 12 ------------ 2 files changed, 13 deletions(-) delete mode 100644 test/core/fixtures/require-hook/not_node_modules/input.js delete 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 deleted file mode 100644 index ff14abefe9..0000000000 --- a/test/core/fixtures/require-hook/not_node_modules/input.js +++ /dev/null @@ -1 +0,0 @@ -() => {}; diff --git a/test/core/require-hook.js b/test/core/require-hook.js deleted file mode 100644 index 6a61c3cb9d..0000000000 --- a/test/core/require-hook.js +++ /dev/null @@ -1,12 +0,0 @@ -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 6f3501876a0c52e6484952c75ef3db7c14ed1f4a Mon Sep 17 00:00:00 2001 From: Jesse McCarthy Date: Tue, 2 Jun 2015 08:58:44 -0400 Subject: [PATCH 2/2] Add test for require-hook node_modules check. --- .../fixtures/bin/babel-node/require/in-files/foo2.js | 1 + .../babel-node/require/in-files/not_node_modules.jsx | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 test/core/fixtures/bin/babel-node/require/in-files/not_node_modules.jsx diff --git a/test/core/fixtures/bin/babel-node/require/in-files/foo2.js b/test/core/fixtures/bin/babel-node/require/in-files/foo2.js index 2aa7251446..71db6cd5b2 100644 --- a/test/core/fixtures/bin/babel-node/require/in-files/foo2.js +++ b/test/core/fixtures/bin/babel-node/require/in-files/foo2.js @@ -1,4 +1,5 @@ import "./bar2"; +import "./not_node_modules"; var foo = () => console.log("foo"); foo(); diff --git a/test/core/fixtures/bin/babel-node/require/in-files/not_node_modules.jsx b/test/core/fixtures/bin/babel-node/require/in-files/not_node_modules.jsx new file mode 100644 index 0000000000..f14bae58e1 --- /dev/null +++ b/test/core/fixtures/bin/babel-node/require/in-files/not_node_modules.jsx @@ -0,0 +1,10 @@ +/* +The purpose of this file is to test that the node_modules check in the require +hook doesn't mistakenly exclude something like "not_node_modules". To pass, this +file merely needs to be transpiled. The transpiled code won't, and doesn't need +to, execute without error. It won't execute because React will be undefined. +*/ +try { + ; +} +catch (e) {}