Skip to content

Commit

Permalink
Merge pull request #36 from tildeio/0.1.2
Browse files Browse the repository at this point in the history
Bump to 0.1.2, include VERSION on RouteRecognizer export
  • Loading branch information
machty committed Dec 13, 2014
2 parents 65b5856 + 2c8e2ec commit 5f016bc
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 2 deletions.
12 changes: 11 additions & 1 deletion Brocfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ var jsHint = require('broccoli-jshint');
var Funnel = require('broccoli-funnel');
var mergeTrees = require('broccoli-merge-trees');
var concat = require('broccoli-concat');
var replace = require('broccoli-replace');

/**
* Builds the consumable lib
Expand Down Expand Up @@ -66,7 +67,16 @@ var lib = new Funnel( 'lib', {
destDir: '/'
});

var version = require('./package.json').version;

lib = replace(lib, {
files: [ '**/*.js' ],
patterns: [
{ match: /VERSION_STRING_PLACEHOLDER/g, replacement: version }
]
});

var testSuite = buildTestSuite(lib);
var distLibs = buildDistLib(lib);

module.exports = mergeTrees([distLibs, testSuite]);
module.exports = mergeTrees([distLibs, testSuite]);
2 changes: 2 additions & 0 deletions dist/route-recognizer.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions lib/route-recognizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -525,4 +525,6 @@ RouteRecognizer.prototype = {

RouteRecognizer.prototype.map = map;

RouteRecognizer.VERSION = 'VERSION_STRING_PLACEHOLDER';

export default RouteRecognizer;
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "route-recognizer",
"version": "0.1.1",
"version": "0.1.2",
"description": "A lightweight JavaScript library that matches paths against registered routes.",
"author": "Yehuda Katz",
"repository": {
Expand All @@ -12,6 +12,7 @@
"broccoli-concat": "0.0.12",
"broccoli-funnel": "^0.1.6",
"broccoli-jshint": "~0.5.1",
"broccoli-replace": "~0.1.6",
"broccoli-merge-trees": "^0.2.1",
"ember-cli": "0.0.40"
},
Expand Down

0 comments on commit 5f016bc

Please sign in to comment.