Skip to content

Commit aa12ad0

Browse files
committed
Merge pull request #40 from elrrrrrrr/fix/fixUnderscore
Fix/fix underscore
2 parents 2cdf11b + a842ed6 commit aa12ad0

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

lib/util.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
var debug = require('debug')('spm-client:util');
44

5-
var ID_REGEX = /^([a-z][a-z0-9\-\.]*)(?:@(.+))?$/;
6-
var NAME_REGEX = /^[a-z][a-z0-9\-\.]*$/;
5+
var ID_REGEX = /^([a-z][a-z0-9\-\._]*)(?:@(.+))?$/;
6+
var NAME_REGEX = /^[a-z][a-z0-9\-\._]*$/;
77

88
exports.errorHandle = errorHandle;
99
exports.resolveid = resolveid;

test/publish.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ describe('/lib/publish.js', function() {
104104
} catch(e) {
105105
err = e;
106106
}
107-
err.message.should.eql('name is invalid, should match /^[a-z][a-z0-9\\-\\.]*$/');
107+
err.message.should.eql('name is invalid, should match /^[a-z][a-z0-9\\-\\._]*$/');
108108

109109
try {
110110
err = undefined;

test/util.test.js

+7
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,11 @@ describe('/lib/util.js', function() {
1717
(util.resolveid('@1.0.0') === null).should.be.true;
1818
(util.resolveid('_@1.0.0') === null).should.be.true;
1919
});
20+
21+
it('should resolve id contains underscore', function* () {
22+
util.resolveid('lodash._getnative@1.0').should.eql({
23+
name: 'lodash._getnative',
24+
version: '1.0'
25+
});
26+
});
2027
});

0 commit comments

Comments
 (0)