Merge branch 'release/2.5.1' into production

This commit is contained in:
Miroslav Bajtoš 2014-12-08 08:09:35 +01:00
commit 4f65067348
5 changed files with 12 additions and 7 deletions

View File

@ -1,3 +1,9 @@
2014-12-08, Version 2.5.1
=========================
* Replace underscore with lodash (Ryan Graham)
2014-12-02, Version 2.5.0 2014-12-02, Version 2.5.0
========================= =========================

View File

@ -1,7 +1,7 @@
var fs = require('fs'); var fs = require('fs');
var path = require('path'); var path = require('path');
var commondir = require('commondir'); var commondir = require('commondir');
var cloneDeep = require('lodash.clonedeep'); var cloneDeep = require('lodash').cloneDeep;
/** /**
* Add boot instructions to a browserify bundler. * Add boot instructions to a browserify bundler.

View File

@ -1,5 +1,5 @@
var assert = require('assert'); var assert = require('assert');
var cloneDeep = require('lodash.clonedeep'); var cloneDeep = require('lodash').cloneDeep;
var fs = require('fs'); var fs = require('fs');
var path = require('path'); var path = require('path');
var toposort = require('toposort'); var toposort = require('toposort');

View File

@ -1,5 +1,5 @@
var assert = require('assert'); var assert = require('assert');
var _ = require('underscore'); var _ = require('lodash');
var semver = require('semver'); var semver = require('semver');
var debug = require('debug')('loopback:boot:executor'); var debug = require('debug')('loopback:boot:executor');
var async = require('async'); var async = require('async');

View File

@ -1,6 +1,6 @@
{ {
"name": "loopback-boot", "name": "loopback-boot",
"version": "2.5.0", "version": "2.5.1",
"description": "Convention-based bootstrapper for LoopBack applications", "description": "Convention-based bootstrapper for LoopBack applications",
"keywords": [ "keywords": [
"StrongLoop", "StrongLoop",
@ -26,10 +26,9 @@
"async": "~0.9.0", "async": "~0.9.0",
"commondir": "0.0.1", "commondir": "0.0.1",
"debug": "^2.0.0", "debug": "^2.0.0",
"lodash.clonedeep": "^2.4.1", "lodash": "^2.4.1",
"semver": "^4.1.0", "semver": "^4.1.0",
"toposort": "^0.2.10", "toposort": "^0.2.10"
"underscore": "^1.6.0"
}, },
"devDependencies": { "devDependencies": {
"browserify": "^4.1.8", "browserify": "^4.1.8",