Merge tag 'v2.3.0'

2.3.0
This commit is contained in:
Miroslav Bajtoš 2014-10-27 11:14:50 +01:00
commit 176f96e242
2 changed files with 3 additions and 3 deletions

View File

@ -47,7 +47,7 @@ module.exports = function compile(options) {
// require directories
var bootDirs = options.bootDirs || []; // precedence
bootDirs = bootDirs.concat(path.join(appRootDir, 'boot'));
var bootScripts = options.bootScripts || [];
bootDirs.forEach(function(dir) {
bootScripts = bootScripts.concat(findScripts(dir));
@ -308,7 +308,7 @@ function loadModelDefinition(rootDir, jsonFile, allFiles) {
var definition = require(jsonFile);
var basename = path.basename(jsonFile, path.extname(jsonFile));
// find a matching file with `.js` or any other supported extension like `.coffee`
// find a matching file with a supported extension like `.js` or `.coffee`
var base, ext, validFileType;
var sourceFile = allFiles
.filter(function(f) {

View File

@ -1,6 +1,6 @@
{
"name": "loopback-boot",
"version": "2.2.0",
"version": "2.3.0",
"description": "Convention-based bootstrapper for LoopBack applications",
"keywords": [
"StrongLoop",