Skip to content

Commit ae446f0

Browse files
ariporadsindresorhus
authored andcommitted
Make --require relative to where the command is run
closes #346
1 parent 5add6ad commit ae446f0

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

api.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ var Promise = require('bluebird');
88
var figures = require('figures');
99
var globby = require('globby');
1010
var chalk = require('chalk');
11+
var resolveCwd = require('resolve-cwd');
1112
var fork = require('./lib/fork');
1213
var formatter = require('./lib/enhance-assert').formatter();
1314

@@ -19,6 +20,7 @@ function Api(files, options) {
1920
EventEmitter.call(this);
2021

2122
this.options = options || {};
23+
this.options.require = (this.options.require || []).map(resolveCwd);
2224

2325
this.rejectionCount = 0;
2426
this.exceptionCount = 0;

lib/babel.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ if (debug.enabled) {
1616
// Bind globals first, before anything has a chance to interfere.
1717
var globals = require('./globals');
1818

19-
var resolveCwd = require('resolve-cwd');
20-
(opts.require || []).forEach(function (moduleId) {
21-
require(resolveCwd(moduleId));
22-
});
19+
(opts.require || []).forEach(require);
2320

2421
var sourceMapCache = Object.create(null);
2522

test/api.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,11 @@ test('test file in node_modules is ignored', function (t) {
314314
test('Node.js-style --require CLI argument', function (t) {
315315
t.plan(1);
316316

317+
var requirePath = './' + path.relative('.', path.join(__dirname, 'fixture/install-global.js')).replace(/\\/g, '/');
318+
317319
var api = new Api(
318320
[path.join(__dirname, 'fixture/validate-installed-global.js')],
319-
{require: [path.join(__dirname, 'fixture', 'install-global.js')]}
321+
{require: [requirePath]}
320322
);
321323

322324
api.run()

0 commit comments

Comments
 (0)