Switch to sailshq/lodash which patched security vulnerabilities (#1)

* Switch to @sailshq/lodash

* Actually use the right lodash

* Switch to released versions of the forks

example/express/express-example.js

@@ -3,7 +3,7 @@
  */
 
 var express = require('express'),
-    _ = require('lodash'),
+    _ = require('@sailshq/lodash'),
     app = express(),
     Waterline = require('waterline'),
     bodyParser = require('body-parser'),
@@ -154,6 +154,6 @@ orm.initialize(config, function(err, models) {
 
   // Start Server
   app.listen(3000);
-  
+
   console.log("To see saved users, visit http://localhost:3000/users");
 });

example/raw/bootstrap.js

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var _ = require('lodash')
+var _ = require('@sailshq/lodash')
   , Waterline = require('../../lib/waterline');
 
 
@@ -36,7 +36,7 @@ module.exports = function bootstrap( options, cb ) {
     // Make sure our adapter defs have `identity` properties
     def.identity = def.identity || identity;
   });
-  
+
 
   var extendedCollections = [];
   _(collections).each(function (def, identity) {

lib/waterline.js

@@ -1,4 +1,4 @@
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var async = require('async');
 var Schema = require('waterline-schema');
 var Connections = require('./waterline/connections');

lib/waterline/adapter/aggregateQueries.js

@@ -2,7 +2,7 @@
  * Aggregate Queries Adapter Normalization
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var async = require('async');
 var normalize = require('../utils/normalize');
 var hasOwnProperty = require('../utils/helpers').object.hasOwnProperty;

lib/waterline/adapter/compoundQueries.js

@@ -2,7 +2,7 @@
  * Compound Queries Adapter Normalization
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var normalize = require('../utils/normalize');
 var hasOwnProperty = require('../utils/helpers').object.hasOwnProperty;
 

lib/waterline/adapter/ddl/alter/index.js

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var async = require('async');
 var normalize = require('../../../utils/normalize');
 var hasOwnProperty = require('../../../utils/helpers').object.hasOwnProperty;

lib/waterline/adapter/ddl/index.js

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var normalize = require('../../utils/normalize');
 var getRelations = require('../../utils/getRelations');
 var hasOwnProperty = require('../../utils/helpers').object.hasOwnProperty;

lib/waterline/adapter/dql.js

@@ -5,7 +5,7 @@
 var normalize = require('../utils/normalize');
 var schema = require('../utils/schema');
 var hasOwnProperty = require('../utils/helpers').object.hasOwnProperty;
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 
 
 /**

lib/waterline/adapter/errors.js

@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 
 
 /**

lib/waterline/adapter/index.js

@@ -2,7 +2,7 @@
  * Base Adapter Definition
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 
 var Adapter = module.exports = function(options) {
 

lib/waterline/adapter/sync/strategies/alter.js

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var async = require('async');
 var getRelations = require('../../../utils/getRelations');
 

lib/waterline/adapter/sync/strategies/create.js

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var async = require('async');
 var hasOwnProperty = require('../../../utils/helpers').object.hasOwnProperty;
 

lib/waterline/adapter/sync/strategies/drop.js

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var getRelations = require('../../../utils/getRelations');
 
 

lib/waterline/adapter/sync/strategies/safe.js

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 
 
 /**

lib/waterline/collection/index.js

@@ -2,7 +2,7 @@
  * Dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var extend = require('../utils/extend');
 var inherits = require('util').inherits;
 

lib/waterline/connections/index.js

@@ -1,7 +1,7 @@
 /**
  * Module Dependencies
  */
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var util = require('util');
 var hasOwnProperty = require('../utils/helpers').object.hasOwnProperty;
 var API_VERSION = require('../VERSION');

lib/waterline/core/dictionary.js

@@ -1,4 +1,4 @@
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 
 /**
  * Handle Building an Adapter/Connection dictionary

lib/waterline/core/index.js

@@ -2,7 +2,7 @@
  * Dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var schemaUtils = require('../utils/schema');
 var COLLECTION_DEFAULTS = require('../collection/defaults');
 var Model = require('../model');

lib/waterline/core/schema.js

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var types = require('../utils/types');
 var utils = require('../utils/helpers');
 var hasOwnProperty = utils.object.hasOwnProperty;

lib/waterline/core/transformations.js

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var utils = require('../utils/helpers');
 var hasOwnProperty = utils.object.hasOwnProperty;
 

lib/waterline/core/typecast.js

@@ -5,7 +5,7 @@
 var types = require('../utils/types');
 var utils = require('../utils/helpers');
 var hasOwnProperty = utils.object.hasOwnProperty;
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 
 /**
  * Cast Types

lib/waterline/core/validations.js

@@ -5,7 +5,7 @@
  * https://github.com/balderdashy/anchor
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var anchor = require('anchor');
 var async = require('async');
 var utils = require('../utils/helpers');

lib/waterline/error/WLError.js

@@ -1,5 +1,5 @@
 var util = require('util');
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 
 /**
  * WLError

lib/waterline/error/WLValidationError.js

@@ -5,7 +5,7 @@
 var WLError = require('./WLError');
 var WLUsageError = require('./WLUsageError');
 var util = require('util');
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 
 
 /**

lib/waterline/error/index.js

@@ -3,7 +3,7 @@
  */
 
 var util = require('util');
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var WLError = require('./WLError');
 var WLValidationError = require('./WLValidationError');
 

lib/waterline/model/index.js

@@ -3,7 +3,7 @@
  * Module dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var Bluebird = require('bluebird');
 var Model = require('./lib/model');
 var defaultMethods = require('./lib/defaultMethods');

lib/waterline/model/lib/associationMethods/add.js

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var async = require('async');
 var utils = require('../../../utils/helpers');
 var hasOwnProperty = utils.object.hasOwnProperty;

lib/waterline/model/lib/associationMethods/remove.js

@@ -1,4 +1,4 @@
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var async = require('async');
 var utils = require('../../../utils/helpers');
 var hasOwnProperty = utils.object.hasOwnProperty;

lib/waterline/model/lib/associationMethods/update.js

@@ -3,7 +3,7 @@
  * Module dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var utils = require('../../../utils/helpers');
 var nestedOperations = require('../../../utils/nestedOperations');
 var hop = utils.object.hasOwnProperty;

lib/waterline/model/lib/defaultMethods/save.js

@@ -1,4 +1,4 @@
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var async = require('async');
 var deep = require('deep-diff');
 var updateInstance = require('../associationMethods/update');

lib/waterline/model/lib/defaultMethods/toObject.js

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var utils = require('../../../utils/helpers');
 var hasOwnProperty = utils.object.hasOwnProperty;
 

lib/waterline/model/lib/internalMethods/defineAssociations.js

@@ -3,7 +3,7 @@
  * Module dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var Association = require('../association');
 var utils = require('../../../utils/helpers');
 var hasOwnProperty = utils.object.hasOwnProperty;

lib/waterline/model/lib/model.js

@@ -4,7 +4,7 @@
  */
 
 var extend = require('../../utils/extend');
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var util = require('util');
 
 /**

lib/waterline/query/aggregate.js

@@ -3,7 +3,7 @@
  */
 
 var async = require('async');
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var usageError = require('../utils/usageError');
 var utils = require('../utils/helpers');
 var normalize = require('../utils/normalize');

lib/waterline/query/composite.js

@@ -3,7 +3,7 @@
  */
 
 var async = require('async');
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var usageError = require('../utils/usageError');
 var utils = require('../utils/helpers');
 var normalize = require('../utils/normalize');

lib/waterline/query/deferred.js

@@ -6,7 +6,7 @@
 
 var util = require('util');
 var Promise = require('bluebird');
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var normalize = require('../utils/normalize');
 var utils = require('../utils/helpers');
 var acyclicTraversal = require('../utils/acyclicTraversal');

lib/waterline/query/dql/count.js

@@ -2,7 +2,7 @@
  * Module Dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var usageError = require('../../utils/usageError');
 var utils = require('../../utils/helpers');
 var normalize = require('../../utils/normalize');

lib/waterline/query/dql/create.js

@@ -3,7 +3,7 @@
  */
 
 var async = require('async');
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var utils = require('../../utils/helpers');
 var Deferred = require('../deferred');
 var callbacks = require('../../utils/callbacksRunner');

lib/waterline/query/dql/destroy.js

@@ -3,7 +3,7 @@
  */
 
 var async = require('async');
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var usageError = require('../../utils/usageError');
 var utils = require('../../utils/helpers');
 var normalize = require('../../utils/normalize');

lib/waterline/query/dql/update.js

@@ -3,7 +3,7 @@
  */
 
 var async = require('async');
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var usageError = require('../../utils/usageError');
 var utils = require('../../utils/helpers');
 var normalize = require('../../utils/normalize');

lib/waterline/query/finders/basic.js

@@ -11,7 +11,7 @@ var Joins = require('./joins');
 var Operations = require('./operations');
 var Integrator = require('../integrator');
 var waterlineCriteria = require('waterline-criteria');
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var async = require('async');
 var hasOwnProperty = utils.object.hasOwnProperty;
 

lib/waterline/query/finders/dynamicFinders.js

@@ -4,7 +4,7 @@
  * Query the collection using the name of the attribute directly
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var usageError = require('../../utils/usageError');
 var utils = require('../../utils/helpers');
 var normalize = require('../../utils/normalize');

lib/waterline/query/finders/joins.js

@@ -2,7 +2,7 @@
  * Module Dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var utils = require('../../utils/helpers');
 var hop = utils.object.hasOwnProperty;
 

lib/waterline/query/finders/operations.js

@@ -3,7 +3,7 @@
  * Module Dependencies
  */
 
-var _ = require('lodash');
+var _ = require('@sailshq/lodash');
 var async = require('async');
 var utils = require('../../utils/helpers');
 var normalize = require('../../utils/normalize');