From ea842a39c89731e777fbba102f22a560b3d7a954 Mon Sep 17 00:00:00 2001 From: Mike McNeil Date: Fri, 18 Nov 2016 19:48:34 -0600 Subject: [PATCH] lodash->sailshq/lodash to pick up the _.isFunction() I backported from JDs patch in Lodash 4. (see https://github.com/lodash/lodash/issues/2768) --- bin/_commander.js | 2 +- bin/sails-console.js | 2 +- bin/sails-deploy.js | 2 +- bin/sails-generate.js | 2 +- bin/sails-lift.js | 2 +- bin/sails-new.js | 2 +- bin/sails-www.js | 2 +- bin/sails.js | 2 +- lib/app/Sails.js | 2 +- lib/app/configuration/index.js | 2 +- lib/app/configuration/load.js | 2 +- lib/app/get-route-for.js | 2 +- lib/app/index.js | 2 +- lib/app/lift.js | 2 +- lib/app/load.js | 2 +- lib/app/lower.js | 2 +- lib/app/private/after.js | 2 +- lib/app/private/exposeGlobals.js | 2 +- lib/app/private/initialize.js | 2 +- lib/app/private/inspect.js | 2 +- lib/app/private/loadHooks.js | 2 +- lib/app/private/toJSON.js | 2 +- lib/app/request.js | 2 +- lib/hooks/blueprints/actionUtil.js | 2 +- lib/hooks/blueprints/actions/add.js | 2 +- lib/hooks/blueprints/actions/create.js | 66 +++---- lib/hooks/blueprints/actions/find.js | 2 +- lib/hooks/blueprints/actions/remove.js | 2 +- lib/hooks/blueprints/actions/update.js | 2 +- lib/hooks/blueprints/coercePK.js | 100 +++++----- .../private/is-eq-filter.js | 2 +- .../validate-where-clause-strict.js | 2 +- lib/hooks/blueprints/index.js | 2 +- lib/hooks/blueprints/onRoute.js | 2 +- lib/hooks/controllers/index.js | 2 +- .../controllers/to-interpret-route-syntax.js | 2 +- .../to-load-and-register-controllers.js | 2 +- lib/hooks/cors/index.js | 2 +- lib/hooks/cors/to-prepare-send-headers.js | 2 +- lib/hooks/csrf/index.js | 2 +- lib/hooks/grunt/index.js | 2 +- .../get-configured-http-middleware-fns.js | 2 +- lib/hooks/http/index.js | 2 +- lib/hooks/http/initialize.js | 2 +- lib/hooks/i18n/index.js | 182 +++++++++--------- lib/hooks/index.js | 2 +- lib/hooks/moduleloader/index.js | 2 +- lib/hooks/policies/index.js | 2 +- lib/hooks/pubsub/index.js | 2 +- lib/hooks/request/locals.js | 44 ++--- lib/hooks/request/params.all.js | 2 +- lib/hooks/request/validate.js | 2 +- lib/hooks/responses/index.js | 2 +- lib/hooks/services/index.js | 2 +- lib/hooks/session/generateSecret.js | 2 +- lib/hooks/session/index.js | 2 +- lib/hooks/userconfig/index.js | 88 ++++----- lib/hooks/userhooks/index.js | 42 ++-- lib/hooks/views/configure.js | 2 +- lib/hooks/views/escape-html-entities-deep.js | 2 +- lib/hooks/views/html-scriptify.js | 2 +- lib/hooks/views/onRoute.js | 2 +- lib/hooks/views/render.js | 2 +- lib/hooks/views/res.view.js | 2 +- lib/router/bind.js | 2 +- lib/router/bindDefaultHandlers.js | 2 +- lib/router/index.js | 2 +- lib/router/req.js | 2 +- lib/router/res.js | 2 +- test/benchmarks/helpers/benchmarx.js | 2 +- test/benchmarks/sails.load.test.js | 2 +- test/benchmarks/sails.request.generic.test.js | 2 +- test/helpers/RouteFactory.helper.js | 2 +- test/helpers/router.js | 2 +- test/helpers/sails.js | 2 +- ...pawning-sails-lift-child-process-in-cwd.js | 2 +- test/hooks/pubsub/publishAdd.test.js | 2 +- test/hooks/pubsub/publishCreate.test.js | 2 +- test/hooks/views/skipAssets.test.js | 2 +- test/integration/helpers/appHelper.js | 2 +- .../hook.blueprints.blacklist.test.js | 2 +- ...ook.pubsub.modelEvents.subscribers.test.js | 2 +- test/integration/hook.views.js | 2 +- .../middleware.compression.test.js | 2 +- .../middleware.cookieParser.test.js | 2 +- test/integration/middleware.favicon.test.js | 2 +- test/integration/middleware.session.test.js | 2 +- test/integration/middleware.static.test.js | 2 +- test/integration/new.test.js | 2 +- .../router.blueprintOptions.test.js | 2 +- test/integration/router.viewRendering.test.js | 2 +- test/unit/app.initializeHooks.test.js | 2 +- test/unit/req.session.test.js | 2 +- 93 files changed, 348 insertions(+), 348 deletions(-) diff --git a/bin/_commander.js b/bin/_commander.js index ff4981725..b825baada 100644 --- a/bin/_commander.js +++ b/bin/_commander.js @@ -2,7 +2,7 @@ * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var program = require('commander'); diff --git a/bin/sails-console.js b/bin/sails-console.js index a0f45b1c5..20aec2676 100644 --- a/bin/sails-console.js +++ b/bin/sails-console.js @@ -8,7 +8,7 @@ var nodepath = require('path'); var REPL = require('repl'); var fs = require('fs'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var chalk = require('chalk'); var CaptainsLog = require('captains-log'); var Sails = require('../lib/app'); diff --git a/bin/sails-deploy.js b/bin/sails-deploy.js index 72130158d..d17e3465d 100644 --- a/bin/sails-deploy.js +++ b/bin/sails-deploy.js @@ -5,7 +5,7 @@ * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var util = require('util'); var path = require('path'); var rconf = require('../lib/app/configuration/rc'); diff --git a/bin/sails-generate.js b/bin/sails-generate.js index efa513525..157cd6e90 100644 --- a/bin/sails-generate.js +++ b/bin/sails-generate.js @@ -5,7 +5,7 @@ * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var util = require('util'); var path = require('path'); var async = require('async'); diff --git a/bin/sails-lift.js b/bin/sails-lift.js index df25a050d..56eb164a2 100644 --- a/bin/sails-lift.js +++ b/bin/sails-lift.js @@ -6,7 +6,7 @@ */ var nodepath = require('path'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var chalk = require('chalk'); var captains = require('captains-log'); var package = require('../package.json'); diff --git a/bin/sails-new.js b/bin/sails-new.js index 26efff23d..2bbf2c726 100644 --- a/bin/sails-new.js +++ b/bin/sails-new.js @@ -6,7 +6,7 @@ */ var nodepath = require('path'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var sailsgen = require('sails-generate'); var package = require('../package.json'); var rconf = require('../lib/app/configuration/rc'); diff --git a/bin/sails-www.js b/bin/sails-www.js index 06b73e703..a7969e2da 100644 --- a/bin/sails-www.js +++ b/bin/sails-www.js @@ -6,7 +6,7 @@ */ var nodepath = require('path'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var CaptainsLog = require('captains-log'); var Sails = require('../lib/app'); var rconf = require('../lib/app/configuration/rc'); diff --git a/bin/sails.js b/bin/sails.js index fe4048df7..f3ff2c602 100755 --- a/bin/sails.js +++ b/bin/sails.js @@ -5,7 +5,7 @@ * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var program = require('./_commander'); var package = require('../package.json'); var NOOP = function() {}; diff --git a/lib/app/Sails.js b/lib/app/Sails.js index fb4915b94..fce751f55 100644 --- a/lib/app/Sails.js +++ b/lib/app/Sails.js @@ -3,7 +3,7 @@ */ var events = require('events'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var util = require('util'); var loadSails = require('./load'); var mixinAfter = require('./private/after'); diff --git a/lib/app/configuration/index.js b/lib/app/configuration/index.js index 0a81a788e..c01332e87 100644 --- a/lib/app/configuration/index.js +++ b/lib/app/configuration/index.js @@ -2,7 +2,7 @@ * Module dependencies. */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var path = require('path'); var DEFAULT_HOOKS = require('./default-hooks'); diff --git a/lib/app/configuration/load.js b/lib/app/configuration/load.js index e6f655111..754413515 100644 --- a/lib/app/configuration/load.js +++ b/lib/app/configuration/load.js @@ -2,7 +2,7 @@ * Module dependencies. */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var async = require('async'); var CaptainsLog = require('captains-log'); var path = require('path'); diff --git a/lib/app/get-route-for.js b/lib/app/get-route-for.js index 505f42843..0106870d4 100644 --- a/lib/app/get-route-for.js +++ b/lib/app/get-route-for.js @@ -3,7 +3,7 @@ */ var util = require('util'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var sailsUtil = require('sails-util'); diff --git a/lib/app/index.js b/lib/app/index.js index 8b585fd5b..4dd79280f 100644 --- a/lib/app/index.js +++ b/lib/app/index.js @@ -4,7 +4,7 @@ // try {console.time('require_core');}catch(e){} var Sails = require('./Sails'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); /** diff --git a/lib/app/lift.js b/lib/app/lift.js index ddbdf4035..13c25b096 100644 --- a/lib/app/lift.js +++ b/lib/app/lift.js @@ -3,7 +3,7 @@ */ var async = require('async'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var chalk = require('chalk'); /** diff --git a/lib/app/load.js b/lib/app/load.js index dd53fbeaf..a30c30df0 100644 --- a/lib/app/load.js +++ b/lib/app/load.js @@ -1,5 +1,5 @@ var async = require('async'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var util = require('util'); var __Configuration = require('./configuration'); var __initializeHooks = require('./private/loadHooks'); diff --git a/lib/app/lower.js b/lib/app/lower.js index 575c8f7b7..d3bbd3115 100644 --- a/lib/app/lower.js +++ b/lib/app/lower.js @@ -3,7 +3,7 @@ */ var async = require('async'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); /** diff --git a/lib/app/private/after.js b/lib/app/private/after.js index 90074720c..2535cff1f 100644 --- a/lib/app/private/after.js +++ b/lib/app/private/after.js @@ -2,7 +2,7 @@ * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var async = require('async'); diff --git a/lib/app/private/exposeGlobals.js b/lib/app/private/exposeGlobals.js index c467389ea..9ab6c5799 100644 --- a/lib/app/private/exposeGlobals.js +++ b/lib/app/private/exposeGlobals.js @@ -2,7 +2,7 @@ * Module dependencies. */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var async = require('async'); diff --git a/lib/app/private/initialize.js b/lib/app/private/initialize.js index 315d131de..f814c85a6 100644 --- a/lib/app/private/initialize.js +++ b/lib/app/private/initialize.js @@ -3,7 +3,7 @@ */ var util = require('util'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var async = require('async'); diff --git a/lib/app/private/inspect.js b/lib/app/private/inspect.js index a8fdd50a4..6534eb549 100644 --- a/lib/app/private/inspect.js +++ b/lib/app/private/inspect.js @@ -3,7 +3,7 @@ */ var util = require('util'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); diff --git a/lib/app/private/loadHooks.js b/lib/app/private/loadHooks.js index d73cdcfb6..26a25a663 100644 --- a/lib/app/private/loadHooks.js +++ b/lib/app/private/loadHooks.js @@ -1,4 +1,4 @@ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var async = require('async'); var __hooks = require('../../hooks'); var defaultsDeep = require('merge-defaults'); diff --git a/lib/app/private/toJSON.js b/lib/app/private/toJSON.js index 7852bc4ba..5dfebe73f 100644 --- a/lib/app/private/toJSON.js +++ b/lib/app/private/toJSON.js @@ -2,7 +2,7 @@ * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); /** diff --git a/lib/app/request.js b/lib/app/request.js index cac70f026..02365301d 100644 --- a/lib/app/request.js +++ b/lib/app/request.js @@ -2,7 +2,7 @@ * Module dependencies. */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var util = require('util'); var QS = require('querystring'); var Transform = require('stream').Transform; diff --git a/lib/hooks/blueprints/actionUtil.js b/lib/hooks/blueprints/actionUtil.js index 3929e4af3..764657c3e 100644 --- a/lib/hooks/blueprints/actionUtil.js +++ b/lib/hooks/blueprints/actionUtil.js @@ -3,7 +3,7 @@ */ var util = require('util'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var isString = _.isString; var isArray = _.isArray; var isObject = _.isObject; diff --git a/lib/hooks/blueprints/actions/add.js b/lib/hooks/blueprints/actions/add.js index 1d2a1bed0..1a56ba731 100644 --- a/lib/hooks/blueprints/actions/add.js +++ b/lib/hooks/blueprints/actions/add.js @@ -2,7 +2,7 @@ * Module dependencies */ var actionUtil = require('../actionUtil'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var async = require('async'); /** diff --git a/lib/hooks/blueprints/actions/create.js b/lib/hooks/blueprints/actions/create.js index bb8b5306c..ece9b00b8 100644 --- a/lib/hooks/blueprints/actions/create.js +++ b/lib/hooks/blueprints/actions/create.js @@ -2,7 +2,7 @@ * Module dependencies */ var actionUtil = require('../actionUtil'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); /** * Create Record @@ -19,36 +19,36 @@ var _ = require('lodash'); */ module.exports = function createRecord (req, res) { - var Model = actionUtil.parseModel(req); - - // Create data object (monolithic combination of all parameters) - // Omit the blacklisted params (like JSONP callback param, etc.) - var data = actionUtil.parseValues(req); - - - // Create new instance of model using data from params - Model.create(data).exec(function created (err, newInstance) { - - // Differentiate between waterline-originated validation errors - // and serious underlying issues. Respond with badRequest if a - // validation error is encountered, w/ validation info. - if (err) return res.negotiate(err); - - // If we have the pubsub hook, use the model class's publish method - // to notify all subscribers about the created item - if (req._sails.hooks.pubsub) { - if (req.isSocket) { - Model.subscribe(req, newInstance); - Model.introduce(newInstance); - } - // Make sure data is JSON-serializable before publishing - var publishData = _.isArray(newInstance) ? - _.map(newInstance, function(instance) {return instance.toJSON();}) : - newInstance.toJSON(); - Model.publishCreate(publishData, !req.options.mirror && req); - } - - // Send JSONP-friendly response if it's supported - res.created(newInstance); - }); + var Model = actionUtil.parseModel(req); + + // Create data object (monolithic combination of all parameters) + // Omit the blacklisted params (like JSONP callback param, etc.) + var data = actionUtil.parseValues(req); + + + // Create new instance of model using data from params + Model.create(data).exec(function created (err, newInstance) { + + // Differentiate between waterline-originated validation errors + // and serious underlying issues. Respond with badRequest if a + // validation error is encountered, w/ validation info. + if (err) return res.negotiate(err); + + // If we have the pubsub hook, use the model class's publish method + // to notify all subscribers about the created item + if (req._sails.hooks.pubsub) { + if (req.isSocket) { + Model.subscribe(req, newInstance); + Model.introduce(newInstance); + } + // Make sure data is JSON-serializable before publishing + var publishData = _.isArray(newInstance) ? + _.map(newInstance, function(instance) {return instance.toJSON();}) : + newInstance.toJSON(); + Model.publishCreate(publishData, !req.options.mirror && req); + } + + // Send JSONP-friendly response if it's supported + res.created(newInstance); + }); }; diff --git a/lib/hooks/blueprints/actions/find.js b/lib/hooks/blueprints/actions/find.js index ee82519e5..c61d2c01c 100644 --- a/lib/hooks/blueprints/actions/find.js +++ b/lib/hooks/blueprints/actions/find.js @@ -2,7 +2,7 @@ * Module dependencies */ var actionUtil = require('../actionUtil'), - _ = require('lodash'); + _ = require('@sailshq/lodash'); /** * Find Records diff --git a/lib/hooks/blueprints/actions/remove.js b/lib/hooks/blueprints/actions/remove.js index f6f4d2a2f..6427eac83 100644 --- a/lib/hooks/blueprints/actions/remove.js +++ b/lib/hooks/blueprints/actions/remove.js @@ -2,7 +2,7 @@ * Module dependencies */ var actionUtil = require('../actionUtil'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); /** diff --git a/lib/hooks/blueprints/actions/update.js b/lib/hooks/blueprints/actions/update.js index 338b988d5..021e1f386 100644 --- a/lib/hooks/blueprints/actions/update.js +++ b/lib/hooks/blueprints/actions/update.js @@ -4,7 +4,7 @@ var actionUtil = require('../actionUtil'); var util = require('util'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); /** diff --git a/lib/hooks/blueprints/coercePK.js b/lib/hooks/blueprints/coercePK.js index 881566e47..ffeee53d1 100644 --- a/lib/hooks/blueprints/coercePK.js +++ b/lib/hooks/blueprints/coercePK.js @@ -2,67 +2,67 @@ * Module dependencies. */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); module.exports = function (sails) { - /** - * @param {Natural|String} id - * @param {String} controllerId - * @param {String} actionId - * @returns id :: - * If `id` is undefined, no `id` was provided - * If `id` is false, `id` is invalid, and probably unintentional - * Otherwise, `id` is valid and probably intentional - */ - return function validId (id, controllerId, actionId) { + /** + * @param {Natural|String} id + * @param {String} controllerId + * @param {String} actionId + * @returns id :: + * If `id` is undefined, no `id` was provided + * If `id` is false, `id` is invalid, and probably unintentional + * Otherwise, `id` is valid and probably intentional + */ + return function validId (id, controllerId, actionId) { - // Interlace app-global `config.controllers` with this controller's `_config` - var controllerConfig = _.merge({}, - sails.config.controllers, - sails.controllers[controllerId]._config || {}); + // Interlace app-global `config.controllers` with this controller's `_config` + var controllerConfig = _.merge({}, + sails.config.controllers, + sails.controllers[controllerId]._config || {}); - // The other CRUD methods are special reserved words-- in which case we always pass - // As long as the CRUD 'shortcuts' are enabled, you cannot search for models - // with an id of 'find', 'update', 'create', or 'destroy' - if ( controllerConfig.blueprints.shortcuts && ( - id === 'find' || - id === 'update' || - id === 'create' || - id === 'destroy' )) { - return false; - } + // The other CRUD methods are special reserved words-- in which case we always pass + // As long as the CRUD 'shortcuts' are enabled, you cannot search for models + // with an id of 'find', 'update', 'create', or 'destroy' + if ( controllerConfig.blueprints.shortcuts && ( + id === 'find' || + id === 'update' || + id === 'create' || + id === 'destroy' )) { + return false; + } - // If expectIntegerId check is disabled, `id` is always ok - if ( !controllerConfig.blueprints.expectIntegerId ) { - return id; - } + // If expectIntegerId check is disabled, `id` is always ok + if ( !controllerConfig.blueprints.expectIntegerId ) { + return id; + } - // Ensure that id is numeric (unless this check is disabled) - var castId = +id; - if (id && _.isNaN(castId)) { + // Ensure that id is numeric (unless this check is disabled) + var castId = +id; + if (id && _.isNaN(castId)) { - // If it's not, move on to next middleware - // but emit a console warning explaining the situation - // (if the app is in development mode): - if (sails.config.environment === 'development') { - sails.log.warn('\n', - 'Just then, you were prevented from being routed \n', - 'to the `' + actionId + '` blueprint for controller: ' + controllerId + - ' using `id='+id+'`.\n', - 'This is because REST blueprint routes expect natural number ids by default, '+ - 'and so the `' + actionId + '()` middleware was skipped- \n', - 'If you\'d like to disable this restriction, you can do so by setting \n', - '`expectIntegerId: false` in the blueprint config for this controller.'); - } - return false; - } + // If it's not, move on to next middleware + // but emit a console warning explaining the situation + // (if the app is in development mode): + if (sails.config.environment === 'development') { + sails.log.warn('\n', + 'Just then, you were prevented from being routed \n', + 'to the `' + actionId + '` blueprint for controller: ' + controllerId + + ' using `id='+id+'`.\n', + 'This is because REST blueprint routes expect natural number ids by default, '+ + 'and so the `' + actionId + '()` middleware was skipped- \n', + 'If you\'d like to disable this restriction, you can do so by setting \n', + '`expectIntegerId: false` in the blueprint config for this controller.'); + } + return false; + } - // Id is an integer - return parseInt(id, 10); - }; + // Id is an integer + return parseInt(id, 10); + }; }; diff --git a/lib/hooks/blueprints/criteria-validator/private/is-eq-filter.js b/lib/hooks/blueprints/criteria-validator/private/is-eq-filter.js index 5dbd71966..c09cde976 100644 --- a/lib/hooks/blueprints/criteria-validator/private/is-eq-filter.js +++ b/lib/hooks/blueprints/criteria-validator/private/is-eq-filter.js @@ -2,7 +2,7 @@ * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); /** diff --git a/lib/hooks/blueprints/criteria-validator/validate-where-clause-strict.js b/lib/hooks/blueprints/criteria-validator/validate-where-clause-strict.js index dee3d2598..dc6bde292 100644 --- a/lib/hooks/blueprints/criteria-validator/validate-where-clause-strict.js +++ b/lib/hooks/blueprints/criteria-validator/validate-where-clause-strict.js @@ -3,7 +3,7 @@ */ var util = require('util'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var flaverr = require('flaverr'); var isEqFilter = require('./private/is-eq-filter'); diff --git a/lib/hooks/blueprints/index.js b/lib/hooks/blueprints/index.js index 5c781e707..d8f0c6695 100644 --- a/lib/hooks/blueprints/index.js +++ b/lib/hooks/blueprints/index.js @@ -2,7 +2,7 @@ * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var util = require('util'); var pluralize = require('pluralize'); var STRINGFILE = require('sails-stringfile'); diff --git a/lib/hooks/blueprints/onRoute.js b/lib/hooks/blueprints/onRoute.js index e71d0370b..cbe1d8353 100644 --- a/lib/hooks/blueprints/onRoute.js +++ b/lib/hooks/blueprints/onRoute.js @@ -2,7 +2,7 @@ * Module dependencies. */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); diff --git a/lib/hooks/controllers/index.js b/lib/hooks/controllers/index.js index bf85e3dbe..ba5fbc229 100644 --- a/lib/hooks/controllers/index.js +++ b/lib/hooks/controllers/index.js @@ -2,7 +2,7 @@ * Module dependencies. */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var toLoadAndRegisterControllers = require('./to-load-and-register-controllers'); var toInterpretRouteSyntax = require('./to-interpret-route-syntax'); diff --git a/lib/hooks/controllers/to-interpret-route-syntax.js b/lib/hooks/controllers/to-interpret-route-syntax.js index c4fab45cf..8f5efdb88 100644 --- a/lib/hooks/controllers/to-interpret-route-syntax.js +++ b/lib/hooks/controllers/to-interpret-route-syntax.js @@ -2,7 +2,7 @@ * Module dependencies. */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var sailsUtil = require('sails-util'); diff --git a/lib/hooks/controllers/to-load-and-register-controllers.js b/lib/hooks/controllers/to-load-and-register-controllers.js index a3531e3a2..7d7135ba9 100644 --- a/lib/hooks/controllers/to-load-and-register-controllers.js +++ b/lib/hooks/controllers/to-load-and-register-controllers.js @@ -2,7 +2,7 @@ * Module dependencies. */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var sailsUtil = require('sails-util'); diff --git a/lib/hooks/cors/index.js b/lib/hooks/cors/index.js index b4345926f..1e8b45957 100644 --- a/lib/hooks/cors/index.js +++ b/lib/hooks/cors/index.js @@ -4,7 +4,7 @@ module.exports = function(sails) { * Module dependencies. */ - var _ = require('lodash'); + var _ = require('@sailshq/lodash'); var clearHeaders = require('./clear-headers'); var prepareSendHeaders = require('./to-prepare-send-headers')(sails); diff --git a/lib/hooks/cors/to-prepare-send-headers.js b/lib/hooks/cors/to-prepare-send-headers.js index bd76f153d..c20538ca8 100644 --- a/lib/hooks/cors/to-prepare-send-headers.js +++ b/lib/hooks/cors/to-prepare-send-headers.js @@ -2,7 +2,7 @@ * Module dependencies. */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var clearHeaders = require('./clear-headers'); diff --git a/lib/hooks/csrf/index.js b/lib/hooks/csrf/index.js index e61c4f5b3..1c281953c 100644 --- a/lib/hooks/csrf/index.js +++ b/lib/hooks/csrf/index.js @@ -4,7 +4,7 @@ module.exports = function(sails) { * Module dependencies. */ - var _ = require('lodash'), + var _ = require('@sailshq/lodash'), util = require('sails-util'), pathToRegexp = require('path-to-regexp'); diff --git a/lib/hooks/grunt/index.js b/lib/hooks/grunt/index.js index b030de6d4..57a957acd 100644 --- a/lib/hooks/grunt/index.js +++ b/lib/hooks/grunt/index.js @@ -4,7 +4,7 @@ module.exports = function(sails) { * Module dependencies */ - var _ = require('lodash'); + var _ = require('@sailshq/lodash'); var Err = require('../../../errors'); var path = require('path'); var fs = require('fs'); diff --git a/lib/hooks/http/get-configured-http-middleware-fns.js b/lib/hooks/http/get-configured-http-middleware-fns.js index 0ca092d2b..615301894 100644 --- a/lib/hooks/http/get-configured-http-middleware-fns.js +++ b/lib/hooks/http/get-configured-http-middleware-fns.js @@ -4,7 +4,7 @@ var Path = require('path'); var util = require('util'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var pathToRegexp = require('path-to-regexp'); diff --git a/lib/hooks/http/index.js b/lib/hooks/http/index.js index 126b91f31..2715a3b8d 100644 --- a/lib/hooks/http/index.js +++ b/lib/hooks/http/index.js @@ -3,7 +3,7 @@ */ var path = require('path'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var mergeDefaults = require('merge-defaults'); var toStartServer = require('./start'); diff --git a/lib/hooks/http/initialize.js b/lib/hooks/http/initialize.js index 9ee2d7715..e17b70e32 100644 --- a/lib/hooks/http/initialize.js +++ b/lib/hooks/http/initialize.js @@ -2,7 +2,7 @@ * Module dependencies. */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var getConfiguredHttpMiddlewareFns = require('./get-configured-http-middleware-fns'); diff --git a/lib/hooks/i18n/index.js b/lib/hooks/i18n/index.js index 2493c86ef..04783602e 100644 --- a/lib/hooks/i18n/index.js +++ b/lib/hooks/i18n/index.js @@ -1,94 +1,94 @@ module.exports = function(sails) { - /** - * Module dependencies. - */ - - var _ = require('lodash'), - i18n, - domain = require('domain'); - - - /** - * Expose hook definition - */ - - return { - - defaults: { - // i18n - i18n: { - locales: ['en', 'es', 'fr', 'de'], - defaultLocale: 'en', - localesDirectory: '/config/locales' - } - }, - - routes: { - - before: { - - 'all /*': function addLocalizationMethod (req, res, next) { - - i18n.init(req, res, function() { - res.locals.i18n = res.i18n = res.__; - next(); - }); - - } - } - }, - - initialize: function(cb) { - - // Hackily include the i18n custom debug levels - var debugLevel = process.env.DEBUG || ''; - switch (sails.config.log.level) { - case 'silly': - case 'verbose': - case 'debug': - debugLevel += ' i18n:debug i18n:warn i18n:error'; - break; - case 'info': - case 'blank': - case 'warn': - debugLevel += ' i18n:warn i18n:error'; - break; - case 'error': - debugLevel += ' i18n:error'; - break; - case 'crit': - case 'silent': - break; - default: - break; - } - process.env.DEBUG = debugLevel; - - i18n = require('i18n'); - domain.create() - - // Catch - .on('error', function(err) { - sails.log.error(err); - }) - - // Try - .run(function() { - i18n.configure(_.defaults(sails.config.i18n, { - cookie: null, - directory: sails.config.appPath + sails.config.i18n.localesDirectory, - updateFiles: false, - extension: '.json' - })); - - // Expose global access to locale strings - sails.__ = i18n.__; - }); - - // Finally - cb(); - } - - }; + /** + * Module dependencies. + */ + + var _ = require('@sailshq/lodash'), + i18n, + domain = require('domain'); + + + /** + * Expose hook definition + */ + + return { + + defaults: { + // i18n + i18n: { + locales: ['en', 'es', 'fr', 'de'], + defaultLocale: 'en', + localesDirectory: '/config/locales' + } + }, + + routes: { + + before: { + + 'all /*': function addLocalizationMethod (req, res, next) { + + i18n.init(req, res, function() { + res.locals.i18n = res.i18n = res.__; + next(); + }); + + } + } + }, + + initialize: function(cb) { + + // Hackily include the i18n custom debug levels + var debugLevel = process.env.DEBUG || ''; + switch (sails.config.log.level) { + case 'silly': + case 'verbose': + case 'debug': + debugLevel += ' i18n:debug i18n:warn i18n:error'; + break; + case 'info': + case 'blank': + case 'warn': + debugLevel += ' i18n:warn i18n:error'; + break; + case 'error': + debugLevel += ' i18n:error'; + break; + case 'crit': + case 'silent': + break; + default: + break; + } + process.env.DEBUG = debugLevel; + + i18n = require('i18n'); + domain.create() + + // Catch + .on('error', function(err) { + sails.log.error(err); + }) + + // Try + .run(function() { + i18n.configure(_.defaults(sails.config.i18n, { + cookie: null, + directory: sails.config.appPath + sails.config.i18n.localesDirectory, + updateFiles: false, + extension: '.json' + })); + + // Expose global access to locale strings + sails.__ = i18n.__; + }); + + // Finally + cb(); + } + + }; }; diff --git a/lib/hooks/index.js b/lib/hooks/index.js index d24a659ae..21f2cb0d6 100644 --- a/lib/hooks/index.js +++ b/lib/hooks/index.js @@ -2,7 +2,7 @@ * Module dependencies. */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var async = require('async'); diff --git a/lib/hooks/moduleloader/index.js b/lib/hooks/moduleloader/index.js index bcb62ea3e..b35563818 100644 --- a/lib/hooks/moduleloader/index.js +++ b/lib/hooks/moduleloader/index.js @@ -6,7 +6,7 @@ module.exports = function(sails) { var path = require('path'); var fs = require('fs'); var async = require('async'); - var _ = require('lodash'); + var _ = require('@sailshq/lodash'); var walk = require('walk'); var includeAll = require('include-all'); diff --git a/lib/hooks/policies/index.js b/lib/hooks/policies/index.js index 405ca6700..75e8c7398 100644 --- a/lib/hooks/policies/index.js +++ b/lib/hooks/policies/index.js @@ -1,4 +1,4 @@ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var util = require('sails-util'); var Err = require('../../../errors'); diff --git a/lib/hooks/pubsub/index.js b/lib/hooks/pubsub/index.js index 7dbc3e1c2..f2b85485a 100644 --- a/lib/hooks/pubsub/index.js +++ b/lib/hooks/pubsub/index.js @@ -3,7 +3,7 @@ */ var util = require('util'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var STRINGFILE = require('sails-stringfile'); diff --git a/lib/hooks/request/locals.js b/lib/hooks/request/locals.js index a72fb72cc..c1c7fe450 100644 --- a/lib/hooks/request/locals.js +++ b/lib/hooks/request/locals.js @@ -1,8 +1,8 @@ /** * Module dependencies */ -var _ = require('lodash'), - util = require('sails-util'); +var _ = require('@sailshq/lodash'), + util = require('sails-util'); /** @@ -24,27 +24,27 @@ var _ = require('lodash'), module.exports = function _mixinLocals(req, res) { - // TODO: - // Actually take advantage of `app.locals` - // for this logic. + // TODO: + // Actually take advantage of `app.locals` + // for this logic. - // TODO: - // we might look at pruning the stuff being - // passed in here, to improve the optimizations - // of Express's production view cache. + // TODO: + // we might look at pruning the stuff being + // passed in here, to improve the optimizations + // of Express's production view cache. - _.extend(res.locals, { - _: _, - util: util, - session: req.session, - req: req, - res: res, - sails: req._sails - }); + _.extend(res.locals, { + _: _, + util: util, + session: req.session, + req: req, + res: res, + sails: req._sails + }); - // May be deprecated in an upcoming release: - res.locals.title = req._sails.config.appName; - if (req.options.action) { - ' | ' + util.str.capitalize(req.param('action')); - } + // May be deprecated in an upcoming release: + res.locals.title = req._sails.config.appName; + if (req.options.action) { + ' | ' + util.str.capitalize(req.param('action')); + } }; diff --git a/lib/hooks/request/params.all.js b/lib/hooks/request/params.all.js index 8f16c1416..af92735f2 100644 --- a/lib/hooks/request/params.all.js +++ b/lib/hooks/request/params.all.js @@ -1,7 +1,7 @@ /** * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var defaultsDeep = require('merge-defaults'); diff --git a/lib/hooks/request/validate.js b/lib/hooks/request/validate.js index 282b8e58e..eefbd4564 100644 --- a/lib/hooks/request/validate.js +++ b/lib/hooks/request/validate.js @@ -2,7 +2,7 @@ * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var anchor = require('anchor'); diff --git a/lib/hooks/responses/index.js b/lib/hooks/responses/index.js index 33936d1f2..150a493be 100644 --- a/lib/hooks/responses/index.js +++ b/lib/hooks/responses/index.js @@ -2,7 +2,7 @@ * Dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var Err = require('../../../errors/fatal'); var onRoute = require('./onRoute'); var STRINGFILE = require('sails-stringfile'); diff --git a/lib/hooks/services/index.js b/lib/hooks/services/index.js index 8fd264078..540c7531b 100644 --- a/lib/hooks/services/index.js +++ b/lib/hooks/services/index.js @@ -2,7 +2,7 @@ * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); diff --git a/lib/hooks/session/generateSecret.js b/lib/hooks/session/generateSecret.js index ecbca5768..5018cbdee 100644 --- a/lib/hooks/session/generateSecret.js +++ b/lib/hooks/session/generateSecret.js @@ -2,7 +2,7 @@ * Module dependencies */ var crypto = require('crypto'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); /** diff --git a/lib/hooks/session/index.js b/lib/hooks/session/index.js index a3681ea8c..8a2aad93b 100644 --- a/lib/hooks/session/index.js +++ b/lib/hooks/session/index.js @@ -4,7 +4,7 @@ var path = require('path'); var util = require('util'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); // generateSecret is used to generate a one-off session secret if one wasn't configured diff --git a/lib/hooks/userconfig/index.js b/lib/hooks/userconfig/index.js index e9dd5fff9..bc469efdc 100644 --- a/lib/hooks/userconfig/index.js +++ b/lib/hooks/userconfig/index.js @@ -1,66 +1,66 @@ module.exports = function(sails) { - /** - * Module dependencies - */ + /** + * Module dependencies + */ - var _ = require('lodash'); + var _ = require('@sailshq/lodash'); - /** - * Userconfig - * - * Load configuration files. - */ - return { + /** + * Userconfig + * + * Load configuration files. + */ + return { - // Default configuration - defaults: {}, + // Default configuration + defaults: {}, - /** - * Fetch relevant modules, exposing them on `sails` subglobal if necessary, - */ - loadModules: function (cb) { + /** + * Fetch relevant modules, exposing them on `sails` subglobal if necessary, + */ + loadModules: function (cb) { - sails.log.verbose('Loading app config...'); + sails.log.verbose('Loading app config...'); - // Grab reference to mapped overrides - var overrides = _.cloneDeep(sails.config); + // Grab reference to mapped overrides + var overrides = _.cloneDeep(sails.config); - // If appPath not specified yet, use process.cwd() - // (the directory where this Sails process is being initiated from) - if ( ! overrides.appPath ) { - sails.config.appPath = process.cwd(); - } + // If appPath not specified yet, use process.cwd() + // (the directory where this Sails process is being initiated from) + if ( ! overrides.appPath ) { + sails.config.appPath = process.cwd(); + } - // Load config dictionary from app modules - sails.modules.loadUserConfig(function loadedAppConfigModules (err, userConfig) { - if (err) return cb(err); + // Load config dictionary from app modules + sails.modules.loadUserConfig(function loadedAppConfigModules (err, userConfig) { + if (err) return cb(err); - // Finally, extend user config with overrides - var config = {}; + // Finally, extend user config with overrides + var config = {}; - config = _.merge(userConfig, overrides); + config = _.merge(userConfig, overrides); - // Ensure final configuration object is valid - // (in case moduleloader fails miserably) - config = _.isObject(config) ? config : (sails.config || {}); + // Ensure final configuration object is valid + // (in case moduleloader fails miserably) + config = _.isObject(config) ? config : (sails.config || {}); - // Save final config into sails.config - sails.config = config; + // Save final config into sails.config + sails.config = config; - // Other hooks may use process.env.NODE_ENV to determine the environment, - // so set that here. The userconfig hook will set the environment based - // on the overrides (command line or environment var), local.js key - // (if available) or else a default of "development" - process.env.NODE_ENV = sails.config.environment; + // Other hooks may use process.env.NODE_ENV to determine the environment, + // so set that here. The userconfig hook will set the environment based + // on the overrides (command line or environment var), local.js key + // (if available) or else a default of "development" + process.env.NODE_ENV = sails.config.environment; - cb(); - }); - } - }; + cb(); + }); + } + }; }; diff --git a/lib/hooks/userhooks/index.js b/lib/hooks/userhooks/index.js index 74db85d26..976e42616 100644 --- a/lib/hooks/userhooks/index.js +++ b/lib/hooks/userhooks/index.js @@ -1,28 +1,28 @@ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); module.exports = function(sails) { - /** - * `userhooks` - * - * Sails hook for loading user plugins (hooks) - */ - return { + /** + * `userhooks` + * + * Sails hook for loading user plugins (hooks) + */ + return { - defaults: { }, + defaults: { }, - initialize: function(cb) { + initialize: function(cb) { - if ( !sails.config.hooks.moduleloader ) { - return cb('Cannot load user hooks without `moduleloader` hook enabled!'); - } + if ( !sails.config.hooks.moduleloader ) { + return cb('Cannot load user hooks without `moduleloader` hook enabled!'); + } - // Wait for moduleloader - sails.log.verbose('Loading user hooks...'); + // Wait for moduleloader + sails.log.verbose('Loading user hooks...'); - // Load user hook definitions - sails.modules.loadUserHooks(function hookDefinitionsLoaded(err, hooks) { - if (err) return cb(err); + // Load user hook definitions + sails.modules.loadUserHooks(function hookDefinitionsLoaded(err, hooks) { + if (err) return cb(err); // Ensure hooks is valid hooks = _.isObject(hooks) ? hooks : {}; @@ -30,9 +30,9 @@ module.exports = function(sails) { // Add the user hooks to the list of hooks to load _.extend(sails.hooks, hooks); - return cb(); + return cb(); - }); - } - }; + }); + } + }; }; diff --git a/lib/hooks/views/configure.js b/lib/hooks/views/configure.js index 47797498f..dd8a990c3 100644 --- a/lib/hooks/views/configure.js +++ b/lib/hooks/views/configure.js @@ -4,7 +4,7 @@ var path = require('path'); var util = require('util'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var consolidate = require('consolidate'); diff --git a/lib/hooks/views/escape-html-entities-deep.js b/lib/hooks/views/escape-html-entities-deep.js index a13eab941..3b824c2db 100644 --- a/lib/hooks/views/escape-html-entities-deep.js +++ b/lib/hooks/views/escape-html-entities-deep.js @@ -2,7 +2,7 @@ * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var rttc = require('rttc'); diff --git a/lib/hooks/views/html-scriptify.js b/lib/hooks/views/html-scriptify.js index 76742adb5..75c7eeb6f 100644 --- a/lib/hooks/views/html-scriptify.js +++ b/lib/hooks/views/html-scriptify.js @@ -2,7 +2,7 @@ * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var rttc = require('rttc'); var escapeHtmlEntitiesDeep = require('./escape-html-entities-deep'); diff --git a/lib/hooks/views/onRoute.js b/lib/hooks/views/onRoute.js index 58161f910..2b215d430 100644 --- a/lib/hooks/views/onRoute.js +++ b/lib/hooks/views/onRoute.js @@ -3,7 +3,7 @@ */ var path = require('path'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); diff --git a/lib/hooks/views/render.js b/lib/hooks/views/render.js index 31c3b7737..3ee12125c 100644 --- a/lib/hooks/views/render.js +++ b/lib/hooks/views/render.js @@ -3,7 +3,7 @@ */ var path = require('path'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); // TODO: reuse code in res.view.js for most of this to make it more maintainable diff --git a/lib/hooks/views/res.view.js b/lib/hooks/views/res.view.js index b6b0bfbc2..191a7f62d 100644 --- a/lib/hooks/views/res.view.js +++ b/lib/hooks/views/res.view.js @@ -4,7 +4,7 @@ var path = require('path'); var util = require('util'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var htmlScriptify = require('./html-scriptify'); diff --git a/lib/router/bind.js b/lib/router/bind.js index 3afe8d5bb..0bde586a1 100644 --- a/lib/router/bind.js +++ b/lib/router/bind.js @@ -2,7 +2,7 @@ * Module dependencies. */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var sailsUtil = require('sails-util'); diff --git a/lib/router/bindDefaultHandlers.js b/lib/router/bindDefaultHandlers.js index cc53ecbfd..d6a304276 100644 --- a/lib/router/bindDefaultHandlers.js +++ b/lib/router/bindDefaultHandlers.js @@ -2,7 +2,7 @@ * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); /** diff --git a/lib/router/index.js b/lib/router/index.js index 248d37a16..19d730217 100644 --- a/lib/router/index.js +++ b/lib/router/index.js @@ -4,7 +4,7 @@ var Readable = require('stream').Readable; var QS = require('querystring'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var Express = require('express'); var buildReq = require('./req'); diff --git a/lib/router/req.js b/lib/router/req.js index 65f4ca179..6e7cea093 100644 --- a/lib/router/req.js +++ b/lib/router/req.js @@ -2,7 +2,7 @@ * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var defaultsDeep = require('merge-defaults'); var MockReq = require('mock-req'); var parseurl = require('parseurl'); diff --git a/lib/router/res.js b/lib/router/res.js index 4804dd18f..780cc5b5d 100644 --- a/lib/router/res.js +++ b/lib/router/res.js @@ -3,7 +3,7 @@ */ var util = require('util'); var Transform = require('stream').Transform; -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var MockRes = require('mock-res'); diff --git a/test/benchmarks/helpers/benchmarx.js b/test/benchmarks/helpers/benchmarx.js index 35da2bebf..74cc70c37 100644 --- a/test/benchmarks/helpers/benchmarx.js +++ b/test/benchmarks/helpers/benchmarx.js @@ -1,5 +1,5 @@ var Benchmark = require('benchmark'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); /** * benchmarx() diff --git a/test/benchmarks/sails.load.test.js b/test/benchmarks/sails.load.test.js index ae6e2bac5..f4dc0b6fb 100644 --- a/test/benchmarks/sails.load.test.js +++ b/test/benchmarks/sails.load.test.js @@ -1,4 +1,4 @@ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var chalk = require('chalk'); var portfinder = require('portfinder'); portfinder.basePort = 2001; diff --git a/test/benchmarks/sails.request.generic.test.js b/test/benchmarks/sails.request.generic.test.js index 4134db67e..d069477d8 100644 --- a/test/benchmarks/sails.request.generic.test.js +++ b/test/benchmarks/sails.request.generic.test.js @@ -5,7 +5,7 @@ var util = require('util'); var assert = require('assert'); var tmp = require('tmp'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var request = require('request'); var child_process = require('child_process'); var path = require('path'); diff --git a/test/helpers/RouteFactory.helper.js b/test/helpers/RouteFactory.helper.js index 7b4632512..3dad25891 100644 --- a/test/helpers/RouteFactory.helper.js +++ b/test/helpers/RouteFactory.helper.js @@ -2,7 +2,7 @@ * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var util = require('util'); diff --git a/test/helpers/router.js b/test/helpers/router.js index 4171b5000..125b54dbe 100644 --- a/test/helpers/router.js +++ b/test/helpers/router.js @@ -1,7 +1,7 @@ /** * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); diff --git a/test/helpers/sails.js b/test/helpers/sails.js index 44f5e2363..924e13d7a 100644 --- a/test/helpers/sails.js +++ b/test/helpers/sails.js @@ -1,7 +1,7 @@ /** * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var util = require('util'); var should = require('should'); var domain = require('domain'); diff --git a/test/helpers/test-spawning-sails-lift-child-process-in-cwd.js b/test/helpers/test-spawning-sails-lift-child-process-in-cwd.js index f3dbfa6be..2a2610afa 100644 --- a/test/helpers/test-spawning-sails-lift-child-process-in-cwd.js +++ b/test/helpers/test-spawning-sails-lift-child-process-in-cwd.js @@ -3,7 +3,7 @@ */ var path = require('path'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var request = require('request'); var MProcess = require('machinepack-process'); diff --git a/test/hooks/pubsub/publishAdd.test.js b/test/hooks/pubsub/publishAdd.test.js index 81eecc34c..9f053e9b0 100644 --- a/test/hooks/pubsub/publishAdd.test.js +++ b/test/hooks/pubsub/publishAdd.test.js @@ -4,7 +4,7 @@ var util = require('util'); var assert = require('assert'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var async = require('async'); var Sails = require('../../../lib').Sails; var socketIOClient = require('socket.io-client'); diff --git a/test/hooks/pubsub/publishCreate.test.js b/test/hooks/pubsub/publishCreate.test.js index 1c40dbec7..5d5105e0f 100644 --- a/test/hooks/pubsub/publishCreate.test.js +++ b/test/hooks/pubsub/publishCreate.test.js @@ -3,7 +3,7 @@ */ var assert = require('assert'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var async = require('async'); var Sails = require('../../../lib').Sails; var socketIOClient = require('socket.io-client'); diff --git a/test/hooks/views/skipAssets.test.js b/test/hooks/views/skipAssets.test.js index 09b10fc48..0e2047cb7 100644 --- a/test/hooks/views/skipAssets.test.js +++ b/test/hooks/views/skipAssets.test.js @@ -4,7 +4,7 @@ var path = require('path'); var util = require('util'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var request = require('request'); var MProcess = require('machinepack-process'); var MFilesystem = require('machinepack-fs'); diff --git a/test/integration/helpers/appHelper.js b/test/integration/helpers/appHelper.js index ef8f6b8d5..8d5dacd44 100644 --- a/test/integration/helpers/appHelper.js +++ b/test/integration/helpers/appHelper.js @@ -6,7 +6,7 @@ var path = require('path'); var child_process = require('child_process'); var exec = child_process.exec; var fs = require('fs-extra'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var SocketIOClient = require('socket.io-client'); var SailsIOClient = require('./sails.io.js'); var Sails = require('../../../lib/app'); diff --git a/test/integration/hook.blueprints.blacklist.test.js b/test/integration/hook.blueprints.blacklist.test.js index b3df06e4a..f736f8dc2 100644 --- a/test/integration/hook.blueprints.blacklist.test.js +++ b/test/integration/hook.blueprints.blacklist.test.js @@ -8,7 +8,7 @@ var appHelper = require('./helpers/appHelper'); var util = require('util'); var async = require('async'); var fixture = require('./fixtures/users.js'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var fs = require('fs-extra'); var path = require('path'); var Sails = require('../../lib/app'); diff --git a/test/integration/hook.pubsub.modelEvents.subscribers.test.js b/test/integration/hook.pubsub.modelEvents.subscribers.test.js index ddc4eb7a1..d3c0a70d3 100644 --- a/test/integration/hook.pubsub.modelEvents.subscribers.test.js +++ b/test/integration/hook.pubsub.modelEvents.subscribers.test.js @@ -3,7 +3,7 @@ */ var util = require('util'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var assert = require('assert'); var socketHelper = require('./helpers/socketHelper.js'); var appHelper = require('./helpers/appHelper'); diff --git a/test/integration/hook.views.js b/test/integration/hook.views.js index 9c6c5705e..88733fe43 100644 --- a/test/integration/hook.views.js +++ b/test/integration/hook.views.js @@ -5,7 +5,7 @@ var assert = require('assert'); var httpHelper = require('./helpers/httpHelper.js'); var appHelper = require('./helpers/appHelper'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var fs = require('fs'); diff --git a/test/integration/middleware.compression.test.js b/test/integration/middleware.compression.test.js index 79c7ae468..4e426c88a 100644 --- a/test/integration/middleware.compression.test.js +++ b/test/integration/middleware.compression.test.js @@ -1,4 +1,4 @@ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var request = require('request'); var Sails = require('../../lib').Sails; var assert = require('assert'); diff --git a/test/integration/middleware.cookieParser.test.js b/test/integration/middleware.cookieParser.test.js index 52e10b36d..dbad5c39b 100644 --- a/test/integration/middleware.cookieParser.test.js +++ b/test/integration/middleware.cookieParser.test.js @@ -2,7 +2,7 @@ * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var request = require('request'); var Sails = require('../../lib').Sails; var assert = require('assert'); diff --git a/test/integration/middleware.favicon.test.js b/test/integration/middleware.favicon.test.js index c727ae523..412e09c69 100644 --- a/test/integration/middleware.favicon.test.js +++ b/test/integration/middleware.favicon.test.js @@ -1,4 +1,4 @@ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var request = require('request'); var Sails = require('../../lib').Sails; var assert = require('assert'); diff --git a/test/integration/middleware.session.test.js b/test/integration/middleware.session.test.js index 8654c3c30..fffb7a9f4 100644 --- a/test/integration/middleware.session.test.js +++ b/test/integration/middleware.session.test.js @@ -1,4 +1,4 @@ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var request = require('request'); var Sails = require('../../lib').Sails; var assert = require('assert'); diff --git a/test/integration/middleware.static.test.js b/test/integration/middleware.static.test.js index addebd22c..aa48896e4 100644 --- a/test/integration/middleware.static.test.js +++ b/test/integration/middleware.static.test.js @@ -2,7 +2,7 @@ * Module dependencies */ -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var request = require('request'); var Sails = require('../../lib').Sails; var assert = require('assert'); diff --git a/test/integration/new.test.js b/test/integration/new.test.js index c4fd5cefb..42403a024 100644 --- a/test/integration/new.test.js +++ b/test/integration/new.test.js @@ -5,7 +5,7 @@ var assert = require('assert'); var fs = require('fs-extra'); var exec = require('child_process').exec; -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var appHelper = require('./helpers/appHelper'); var path = require('path'); var util = require('util'); diff --git a/test/integration/router.blueprintOptions.test.js b/test/integration/router.blueprintOptions.test.js index 2dc0a1c00..7f2b5b3b2 100644 --- a/test/integration/router.blueprintOptions.test.js +++ b/test/integration/router.blueprintOptions.test.js @@ -3,7 +3,7 @@ */ var assert = require('assert'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var httpHelper = require('./helpers/httpHelper.js'); var appHelper = require('./helpers/appHelper'); var bootstrap31FakeUsers = require('./fixtures/users.js'); diff --git a/test/integration/router.viewRendering.test.js b/test/integration/router.viewRendering.test.js index 002c3f39a..162306234 100644 --- a/test/integration/router.viewRendering.test.js +++ b/test/integration/router.viewRendering.test.js @@ -5,7 +5,7 @@ var assert = require('assert'); var httpHelper = require('./helpers/httpHelper.js'); var appHelper = require('./helpers/appHelper'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var fs = require('fs'); diff --git a/test/unit/app.initializeHooks.test.js b/test/unit/app.initializeHooks.test.js index 30276178d..005e3125e 100644 --- a/test/unit/app.initializeHooks.test.js +++ b/test/unit/app.initializeHooks.test.js @@ -3,7 +3,7 @@ */ var should = require('should'); var assert = require('assert'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var constants = require('../fixtures/constants'); var customHooks = require('../fixtures/customHooks'); diff --git a/test/unit/req.session.test.js b/test/unit/req.session.test.js index 7192bfe50..0b363baa3 100644 --- a/test/unit/req.session.test.js +++ b/test/unit/req.session.test.js @@ -4,7 +4,7 @@ var assert = require('assert'); var util = require('util'); -var _ = require('lodash'); +var _ = require('@sailshq/lodash'); var async = require('async'); var Sails = require('../../lib').Sails;