Merge pull request #128 from strongloop/lodash-upgrade-1.x

Upgrade to lodash 3.x
This commit is contained in:
Ryan Graham 2015-04-23 09:31:43 -07:00
commit 622c64ebde
3 changed files with 7 additions and 5 deletions

View File

@ -1,5 +1,5 @@
var assert = require('assert'); var assert = require('assert');
var cloneDeep = require('lodash.clonedeep'); var cloneDeep = require('lodash/lang/cloneDeep');
var fs = require('fs'); var fs = require('fs');
var path = require('path'); var path = require('path');
var ConfigLoader = require('./config-loader'); var ConfigLoader = require('./config-loader');

View File

@ -25,16 +25,17 @@
"dependencies": { "dependencies": {
"commondir": "0.0.1", "commondir": "0.0.1",
"debug": "^0.8.1", "debug": "^0.8.1",
"lodash.clonedeep": "^2.4.1", "lodash": "^3.7.0",
"semver": "^2.3.0", "semver": "^2.3.0",
"underscore": "^1.6.0" "underscore": "^1.6.0"
}, },
"devDependencies": { "devDependencies": {
"browserify": "^4.1.8",
"fs-extra": "^0.9.1",
"jshint": "^2.7.0",
"loopback": "^1.5.0", "loopback": "^1.5.0",
"mocha": "^1.19.0", "mocha": "^1.19.0",
"must": "^0.11.0", "must": "^0.11.0",
"supertest": "^0.13.0", "supertest": "^0.13.0"
"fs-extra": "^0.9.1",
"browserify": "^4.1.8"
} }
} }

View File

@ -8,6 +8,7 @@ var vm = require('vm');
describe('browser support', function() { describe('browser support', function() {
this.timeout(60000); // 60s to give browserify enough time to finish this.timeout(60000); // 60s to give browserify enough time to finish
beforeEach(sandbox.reset);
it('has API for bundling and executing boot instructions', function(done) { it('has API for bundling and executing boot instructions', function(done) {
var appDir = path.resolve(__dirname, './fixtures/browser-app'); var appDir = path.resolve(__dirname, './fixtures/browser-app');