Skip to content

Commit 68a081d

Browse files
committed
Revert "[New] add searched extensions to error messages"
This reverts commit 1260d9d.
1 parent c6966fd commit 68a081d

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

lib/async.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ var fs = require('fs');
33
var path = require('path');
44
var caller = require('./caller.js');
55
var nodeModulesPaths = require('./node-modules-paths.js');
6-
var format = require('util').format;
76

87
module.exports = function resolve(x, options, callback) {
98
var cb = callback;
@@ -44,7 +43,7 @@ module.exports = function resolve(x, options, callback) {
4443
else if (n) cb(null, n, pkg);
4544
else if (core[x]) return cb(null, x);
4645
else {
47-
var moduleError = new Error(format("Cannot find module '%s' from '%s' with extension in %j", x, y, extensions));
46+
var moduleError = new Error("Cannot find module '" + x + "' from '" + y + "'");
4847
moduleError.code = 'MODULE_NOT_FOUND';
4948
cb(moduleError);
5049
}
@@ -57,7 +56,7 @@ module.exports = function resolve(x, options, callback) {
5756
if (err) cb(err);
5857
else if (d) cb(null, d, pkg);
5958
else {
60-
var moduleError = new Error(format("Cannot find module '%s' from '%s' with extension in %j", x, y, extensions));
59+
var moduleError = new Error("Cannot find module '" + x + "' from '" + y + "'");
6160
moduleError.code = 'MODULE_NOT_FOUND';
6261
cb(moduleError);
6362
}

lib/sync.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ var fs = require('fs');
33
var path = require('path');
44
var caller = require('./caller.js');
55
var nodeModulesPaths = require('./node-modules-paths.js');
6-
var format = require('util').format;
76

87
module.exports = function (x, options) {
98
var opts = options || {};
@@ -35,7 +34,7 @@ module.exports = function (x, options) {
3534

3635
if (core[x]) return x;
3736

38-
var err = new Error(format("Cannot find module '%s' from '%s' with extension in %j", x, y, extensions));
37+
var err = new Error("Cannot find module '" + x + "' from '" + y + "'");
3938
err.code = 'MODULE_NOT_FOUND';
4039
throw err;
4140

test/mock.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ test('mock', function (t) {
3333
});
3434

3535
resolve('baz', opts('/foo/bar'), function (err, res) {
36-
t.equal(err.message, "Cannot find module 'baz' from '" + path.resolve('/foo/bar') + "' with extension in [\".js\"]");
36+
t.equal(err.message, "Cannot find module 'baz' from '" + path.resolve('/foo/bar') + "'");
3737
t.equal(err.code, 'MODULE_NOT_FOUND');
3838
});
3939

4040
resolve('../baz', opts('/foo/bar'), function (err, res) {
41-
t.equal(err.message, "Cannot find module '../baz' from '" + path.resolve('/foo/bar') + "' with extension in [\".js\"]");
41+
t.equal(err.message, "Cannot find module '../baz' from '" + path.resolve('/foo/bar') + "'");
4242
t.equal(err.code, 'MODULE_NOT_FOUND');
4343
});
4444
});
@@ -75,12 +75,12 @@ test('mock from package', function (t) {
7575
});
7676

7777
resolve('baz', opts('/foo/bar'), function (err, res) {
78-
t.equal(err.message, "Cannot find module 'baz' from '" + path.resolve('/foo/bar') + "' with extension in [\".js\"]");
78+
t.equal(err.message, "Cannot find module 'baz' from '" + path.resolve('/foo/bar') + "'");
7979
t.equal(err.code, 'MODULE_NOT_FOUND');
8080
});
8181

8282
resolve('../baz', opts('/foo/bar'), function (err, res) {
83-
t.equal(err.message, "Cannot find module '../baz' from '" + path.resolve('/foo/bar') + "' with extension in [\".js\"]");
83+
t.equal(err.message, "Cannot find module '../baz' from '" + path.resolve('/foo/bar') + "'");
8484
t.equal(err.code, 'MODULE_NOT_FOUND');
8585
});
8686
});

test/resolver.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ test('async foo', function (t) {
3131
});
3232

3333
resolve('foo', { basedir: dir }, function (err) {
34-
t.equal(err.message, "Cannot find module 'foo' from '" + path.resolve(dir) + "' with extension in [\".js\"]");
34+
t.equal(err.message, "Cannot find module 'foo' from '" + path.resolve(dir) + "'");
3535
t.equal(err.code, 'MODULE_NOT_FOUND');
3636
});
3737
});
@@ -190,7 +190,7 @@ test('cup', function (t) {
190190
});
191191

192192
resolve('./cup', { basedir: dir, extensions: ['.js'] }, function (err, res) {
193-
t.equal(err.message, "Cannot find module './cup' from '" + path.resolve(dir) + "' with extension in [\".js\"]");
193+
t.equal(err.message, "Cannot find module './cup' from '" + path.resolve(dir) + "'");
194194
t.equal(err.code, 'MODULE_NOT_FOUND');
195195
});
196196
});
@@ -231,12 +231,12 @@ test('other path', function (t) {
231231
});
232232

233233
resolve('root', { basedir: dir }, function (err, res) {
234-
t.equal(err.message, "Cannot find module 'root' from '" + path.resolve(dir) + "' with extension in [\".js\"]");
234+
t.equal(err.message, "Cannot find module 'root' from '" + path.resolve(dir) + "'");
235235
t.equal(err.code, 'MODULE_NOT_FOUND');
236236
});
237237

238238
resolve('zzz', { basedir: dir, paths: [otherDir] }, function (err, res) {
239-
t.equal(err.message, "Cannot find module 'zzz' from '" + path.resolve(dir) + "' with extension in [\".js\"]");
239+
t.equal(err.message, "Cannot find module 'zzz' from '" + path.resolve(dir) + "'");
240240
t.equal(err.code, 'MODULE_NOT_FOUND');
241241
});
242242
});

0 commit comments

Comments
 (0)