From fe267e30b95e8f48ddc670b97d485f18fb64d39e Mon Sep 17 00:00:00 2001 From: Brian Ford Date: Tue, 13 Aug 2013 13:17:09 -0700 Subject: fix(grunt): fix regex in grunt util to handle pre-release versions NOTE: this also includes a temporary work-around for Bower --- lib/grunt/utils.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js index ff2c6e1d..97e7c416 100644 --- a/lib/grunt/utils.js +++ b/lib/grunt/utils.js @@ -17,7 +17,9 @@ module.exports = { if (version) return version; var package = JSON.parse(fs.readFileSync('package.json', 'UTF-8')); - var match = package.version.match(/^([^\-]*)(-snapshot)?$/); + // TODO(brian): change `(-|rc)` to `-` in the regex below after bower + // fixes this issue: https://github.com/bower/bower/issues/782 + var match = package.version.match(/^([^\-]*)(?:(-|rc)(.+))?$/); var semver = match[1].split('.'); var hash = shell.exec('git rev-parse --short HEAD', {silent: true}).output.replace('\n', ''); -- cgit v1.2.3