Skip to content
This repository has been archived by the owner on Aug 11, 2022. It is now read-only.

Commit

Permalink
npm: don't bail if require() onload-script throws
Browse files Browse the repository at this point in the history
instead, log the error using the warn log level and also log a notice
that the require failed.

Fixes: #10347
PR-URL: #11289
Credit: @evanlucas
Reviewed-By: @iarna
  • Loading branch information
evanlucas authored and iarna committed Jan 28, 2016
1 parent 2609a29 commit 5dec02a
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 1 deletion.
7 changes: 6 additions & 1 deletion lib/npm.js
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,12 @@
loadCb(loadErr = er)
onload = onload && npm.config.get('onload-script')
if (onload) {
require(onload)
try {
require(onload)
} catch (err) {
log.warn('onload-script', 'failed to require onload script', onload)
log.warn('onload-script', err)
}
onload = false
}
}
Expand Down
1 change: 1 addition & 0 deletions test/fixtures/onload.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.error('called onload')
39 changes: 39 additions & 0 deletions test/tap/onload.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
var path = require('path')
var test = require('tap').test
var rimraf = require('rimraf')
var common = require('../common-tap.js')
var opts = { cwd: __dirname }
var binDir = '../../node_modules/.bin'
var fixture = path.resolve(__dirname, binDir)
var onload = path.resolve(__dirname, '../fixtures/onload.js')

test('setup', function (t) {
rimraf.sync(path.join(__dirname, 'node_modules'))
t.end()
})

test('npm bin with valid onload script', function (t) {
var args = ['--onload', onload, 'bin']
common.npm(args, opts, function (err, code, stdout, stderr) {
t.ifError(err, 'bin ran without issue')
t.equal(stderr.trim(), 'called onload')
t.equal(code, 0, 'exit ok')
t.equal(stdout, fixture + '\n')
t.end()
})
})

test('npm bin with invalid onload script', function (t) {
var onloadScript = onload + 'jsfd'
var args = ['--onload', onloadScript, '--loglevel=warn', 'bin']
common.npm(args, opts, function (err, code, stdout, stderr) {
t.ifError(err, 'bin ran without issue')
t.match(stderr, /npm WARN onload-script failed to require onload script/)
t.match(stderr, /MODULE_NOT_FOUND/)
t.notEqual(stderr.indexOf(onloadScript), -1)
t.equal(code, 0, 'exit ok')
var res = path.resolve(stdout)
t.equal(res, fixture + '\n')
t.end()
})
})

0 comments on commit 5dec02a

Please sign in to comment.