Auto merge of #5367 - jcope2013:lodash-4, r=<try>

Update to lodash 4

Relevant change include

- Removed category names from module paths
- contains alias removed in favor of includes
- pluck removed in favor of map
- where removed in favor of filter
- omit no longer takes function argument, use omitBy/isNull
- uniq no longer takes function argument, use uniqBy

https://github.com/lodash/lodash/wiki/Changelog

blueprints/addon/index.js

@@ -5,7 +5,7 @@ var existsSync  = require('exists-sync');
 var path        = require('path');
 var walkSync    = require('walk-sync');
 var stringUtil  = require('ember-cli-string-utils');
-var uniq        = require('lodash/array/uniq');
+var uniq        = require('lodash/uniq');
 var SilentError = require('silent-error');
 var date        = new Date();
 

blueprints/resource/index.js

@@ -2,7 +2,7 @@
 
 var Blueprint  = require('../../lib/models/blueprint');
 var Promise    = require('../../lib/ext/promise');
-var merge      = require('lodash/object/merge');
+var merge      = require('lodash/merge');
 var inflection = require('inflection');
 
 module.exports = {

lib/broccoli/ember-app.js

@@ -34,8 +34,9 @@ var WatchedDir    = require('broccoli-source').WatchedDir;
 var UnwatchedDir  = require('broccoli-source').UnwatchedDir;
 
 var defaults      = require('merge-defaults');
-var merge         = require('lodash/object/merge');
-var omit          = require('lodash/object/omit');
+var merge         = require('lodash/merge');
+var omitBy        = require('lodash/omitBy');
+var isNull        = require('lodash/isNull');
 var Funnel        = require('broccoli-funnel');
 var funnelReducer = require('broccoli-funnel-reducer');
 
@@ -255,7 +256,7 @@ EmberApp.prototype._initVendorFiles = function() {
     handlebarsVendorFiles = null;
   }
 
-  this.vendorFiles = omit(merge({
+  this.vendorFiles = omitBy(merge({
     'loader.js': this.options.loader,
     'jquery.js': this.bowerDirectory + '/jquery/dist/jquery.js',
     'handlebars.js': handlebarsVendorFiles,
@@ -288,9 +289,7 @@ EmberApp.prototype._initVendorFiles = function() {
         }
       }
     ]
-  }, this.options.vendorFiles), function(value) {
-    return value === null;
-  });
+  }, this.options.vendorFiles), isNull);
 
   if (!!this.registry.availablePlugins['ember-resolver']) {
     // if the project is using `ember-resolver` as an addon

lib/cli/index.js

@@ -10,7 +10,7 @@ var tasks         = requireAsHash('../tasks/*.js', Task);
 var CLI           = require('./cli');
 var packageConfig = require('../../package.json');
 var debug         = require('debug')('ember-cli:cli/index');
-var merge         = require('lodash/object/merge');
+var merge         = require('lodash/merge');
 var path          = require('path');
 
 var version      = packageConfig.version;

lib/commands/destroy.js

@@ -3,7 +3,7 @@
 var Command     = require('../models/command');
 var Promise     = require('../ext/promise');
 var Blueprint   = require('../models/blueprint');
-var merge       = require('lodash/object/merge');
+var merge       = require('lodash/merge');
 var SilentError = require('silent-error');
 
 module.exports = Command.extend({

lib/commands/generate.js

@@ -4,8 +4,8 @@ var chalk       = require('chalk');
 var Command     = require('../models/command');
 var Promise     = require('../ext/promise');
 var Blueprint   = require('../models/blueprint');
-var merge       = require('lodash/object/merge');
-var reject      = require('lodash/collection/reject');
+var merge       = require('lodash/merge');
+var reject      = require('lodash/reject');
 var EOL         = require('os').EOL;
 var SilentError = require('silent-error');
 

lib/commands/help.js

@@ -4,7 +4,7 @@ var path            = require('path');
 var Command         = require('../models/command');
 var lookupCommand   = require('../cli/lookup-command');
 var string          = require('../utilities/string');
-var assign          = require('lodash/object/assign');
+var assign          = require('lodash/assign');
 var GenerateCommand = require('./generate');
 
 var RootCommand = Command.extend({

lib/commands/serve.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var assign      = require('lodash/object/assign');
+var assign      = require('lodash/assign');
 var path        = require('path');
 var Command     = require('../models/command');
 var Promise     = require('../ext/promise');

lib/commands/test.js

@@ -33,7 +33,7 @@ module.exports = Command.extend({
   ],
 
   init: function() {
-    this.assign    = require('lodash/object/assign');
+    this.assign    = require('lodash/assign');
     this.quickTemp = require('quick-temp');
 
     this.Builder = this.Builder || Builder;

lib/models/addon-discovery.js

@@ -4,7 +4,7 @@
 @module ember-cli
 */
 
-var assign     = require('lodash/object/assign');
+var assign     = require('lodash/assign');
 var debug      = require('debug')('ember-cli:addon-discovery');
 var existsSync = require('exists-sync');
 var path       = require('path');

lib/models/addon.js

@@ -6,7 +6,7 @@
 
 var existsSync   = require('exists-sync');
 var path         = require('path');
-var assign       = require('lodash/object/assign');
+var assign       = require('lodash/assign');
 var SilentError  = require('silent-error');
 var Reexporter   = require('../utilities/reexport');
 var debug        = require('debug')('ember-cli:addon');

lib/models/blueprint.js

@@ -17,16 +17,16 @@ var minimatch           = require('minimatch');
 var path                = require('path');
 var stat                = Promise.denodeify(fs.stat);
 var stringUtils         = require('ember-cli-string-utils');
-var compact             = require('lodash/array/compact');
-var intersect           = require('lodash/array/intersection');
-var uniq                = require('lodash/array/uniq');
-var zipObject           = require('lodash/array/zipObject');
-var contains            = require('lodash/collection/contains');
-var any                 = require('lodash/collection/some');
-var cloneDeep           = require('lodash/lang/cloneDeep');
-var keys                = require('lodash/object/keys');
-var merge               = require('lodash/object/merge');
-var values              = require('lodash/object/values');
+var compact             = require('lodash/compact');
+var intersect           = require('lodash/intersection');
+var uniq                = require('lodash/uniq');
+var zipObject           = require('lodash/zipObject');
+var includes            = require('lodash/includes');
+var any                 = require('lodash/some');
+var cloneDeep           = require('lodash/cloneDeep');
+var keys                = require('lodash/keys');
+var merge               = require('lodash/merge');
+var values              = require('lodash/values');
 var walkSync            = require('walk-sync');
 var writeFile           = Promise.denodeify(fs.outputFile);
 var removeFile          = Promise.denodeify(fs.remove);
@@ -1388,7 +1388,7 @@ Blueprint.list = function(options) {
 
       if (blueprint) {
         name = blueprint.name;
-        blueprint.overridden = contains(seen, name);
+        blueprint.overridden = includes(seen, name);
         seen.push(name);
 
         return blueprint;

lib/models/command.js

@@ -9,14 +9,15 @@ var getCallerFile       = require('get-caller-file');
 var printableProperties = require('../utilities/printable-properties').command;
 var printCommand        = require('../utilities/print-command');
 var Promise             = require('../ext/promise');
-var union               = require('lodash/array/union');
-var uniq                = require('lodash/array/uniq');
-var pluck               = require('lodash/collection/pluck');
-var reject              = require('lodash/collection/reject');
-var where               = require('lodash/collection/where');
-var assign              = require('lodash/object/assign');
-var defaults            = require('lodash/object/defaults');
-var keys                = require('lodash/object/keys');
+var union               = require('lodash/union');
+var uniq                = require('lodash/uniq');
+var uniqBy                = require('lodash/uniqBy');
+var map                 = require('lodash/map');
+var reject              = require('lodash/reject');
+var filter              = require('lodash/filter');
+var assign              = require('lodash/assign');
+var defaults            = require('lodash/defaults');
+var keys                = require('lodash/keys');
 var EOL                 = require('os').EOL;
 var CoreObject          = require('core-object');
 var debug               = require('debug')('ember-cli:command');
@@ -79,7 +80,7 @@ Command.prototype.registerOptions = function(options) {
   // merge any availableOptions
   this.availableOptions = union(this.availableOptions.slice(0), extendedAvailableOptions);
 
-  var optionKeys = uniq(pluck(this.availableOptions, 'name'));
+  var optionKeys = uniq(map(this.availableOptions, 'name'));
 
   optionKeys.map(this.mergeDuplicateOption.bind(this));
 
@@ -163,13 +164,13 @@ Command.prototype.validateAndRun = function(args) {
 Command.prototype.mergeDuplicateOption = function(key) {
   var duplicateOptions, mergedOption, mergedAliases;
   // get duplicates to merge
-  duplicateOptions = where(this.availableOptions, { 'name': key });
+  duplicateOptions = filter(this.availableOptions, { 'name': key });
 
   if (duplicateOptions.length > 1) {
     // TODO: warn on duplicates and overwriting
     mergedAliases = [];
 
-    pluck(duplicateOptions, 'aliases').map(function(alias) {
+    map(duplicateOptions, 'aliases').map(function(alias) {
       alias.map(function(a) {
         mergedAliases.push(a);
       });
@@ -179,7 +180,7 @@ Command.prototype.mergeDuplicateOption = function(key) {
     mergedOption = assign.apply(null,duplicateOptions);
 
     // replace aliases with unique aliases
-    mergedOption.aliases = uniq(mergedAliases, function(alias) {
+    mergedOption.aliases = uniqBy(mergedAliases, function(alias) {
       if(typeof alias === 'object') {
         return alias[Object.keys(alias)[0]];
       }

lib/models/file-info.js

@@ -15,7 +15,7 @@ function processTemplate(content, context) {
     interpolate: /<%=([\s\S]+?)%>/g,
     escape:      /<%-([\s\S]+?)%>/g
   };
-  return require('lodash/string/template')(content, options)(context);
+  return require('lodash/template')(content, options)(context);
 }
 
 function diffHighlight(line) {

lib/models/project.js

@@ -9,10 +9,10 @@ var findup              = Promise.denodeify(require('findup'));
 var resolve             = Promise.denodeify(require('resolve'));
 var fs                  = require('fs');
 var existsSync          = require('exists-sync');
-var find                = require('lodash/collection/find');
-var assign              = require('lodash/object/assign');
-var forOwn              = require('lodash/object/forOwn');
-var merge               = require('lodash/object/merge');
+var find                = require('lodash/find');
+var assign              = require('lodash/assign');
+var forOwn              = require('lodash/forOwn');
+var merge               = require('lodash/merge');
 var debug               = require('debug')('ember-cli:project');
 var AddonDiscovery      = require('../models/addon-discovery');
 var AddonsFactory       = require('../models/addons-factory');

lib/tasks/addon-install.js

@@ -2,7 +2,7 @@
 
 var Task                = require('../models/task');
 var SilentError         = require('silent-error');
-var merge               = require('lodash/object/merge');
+var merge               = require('lodash/merge');
 var getPackageBaseName  = require('../utilities/get-package-base-name');
 var Promise             = require('../ext/promise');
 

lib/tasks/generate-from-blueprint.js

@@ -6,7 +6,7 @@ var Promise      = require('../ext/promise');
 var Blueprint    = require('../models/blueprint');
 var Task         = require('../models/task');
 var parseOptions = require('../utilities/parse-options');
-var merge        = require('lodash/object/merge');
+var merge        = require('lodash/merge');
 
 module.exports = Task.extend({
   blueprintFunction: 'install',

lib/tasks/git-init.js

@@ -6,7 +6,7 @@ var exec     = Promise.denodeify(require('child_process').exec);
 var path     = require('path');
 var pkg      = require('../../package.json');
 var fs       = require('fs');
-var template = require('lodash/string/template');
+var template = require('lodash/template');
 
 var gitEnvironmentVariables = {
   GIT_AUTHOR_NAME: 'Tomster',

lib/tasks/server/express-server.js

@@ -5,7 +5,7 @@ var EventEmitter  = require('events').EventEmitter;
 var chalk         = require('chalk');
 var fs            = require('fs');
 var existsSync    = require('exists-sync');
-var debounce      = require('lodash/function/debounce');
+var debounce      = require('lodash/debounce');
 var mapSeries     = require('promise-map-series');
 var Promise       = require('../../ext/promise');
 var Task          = require('../../models/task');

lib/utilities/markdown-color.js

@@ -5,8 +5,8 @@ var existsSync  = require('exists-sync');
 
 var chalk       = require('chalk');
 var SilentError = require('silent-error');
-var isArray     = require('lodash/lang/isArray');
-var merge       = require('lodash/object/merge');
+var isArray     = require('lodash/isArray');
+var merge       = require('lodash/merge');
 
 var colors = ['red', 'green', 'blue', 'cyan', 'magenta', 'yellow', 'black', 'white', 'grey', 'gray'];
 var backgroundColors = ['bgRed', 'bgGreen', 'bgBlue', 'bgCyan', 'bgMagenta', 'bgYellow', 'bgWhite', 'bgBlack'];

lib/utilities/parse-options.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var reduce = require('lodash/collection/reduce');
+var reduce = require('lodash/reduce');
 
 module.exports = function parseOptions(args) {
   return reduce(args, function(result, arg) {

package.json

@@ -90,7 +90,7 @@
     "is-git-url": "^0.2.0",
     "isbinaryfile": "^2.0.3",
     "leek": "0.0.21",
-    "lodash": "^3.6.0",
+    "lodash": "^4.0.0",
     "markdown-it": "4.3.0",
     "markdown-it-terminal": "0.0.3",
     "merge-defaults": "^0.2.1",

tests/acceptance/init-test.js

@@ -12,10 +12,10 @@ var root       = process.cwd();
 var util       = require('util');
 var conf       = require('../helpers/conf');
 var minimatch  = require('minimatch');
-var intersect  = require('lodash/array/intersection');
-var remove     = require('lodash/array/remove');
-var forEach    = require('lodash/collection/forEach');
-var any        = require('lodash/collection/some');
+var intersect  = require('lodash/intersection');
+var remove     = require('lodash/remove');
+var forEach    = require('lodash/forEach');
+var any        = require('lodash/some');
 var EOL        = require('os').EOL;
 
 var defaultIgnoredFiles = Blueprint.ignoredFiles;

tests/acceptance/new-test.js

@@ -4,7 +4,7 @@ var fs         = require('fs-extra');
 var ember      = require('../helpers/ember');
 var existsSync = require('exists-sync');
 var expect     = require('chai').expect;
-var forEach    = require('lodash/collection/forEach');
+var forEach    = require('lodash/forEach');
 var walkSync   = require('walk-sync');
 var Blueprint  = require('../../lib/models/blueprint');
 var path       = require('path');

tests/factories/command-options.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var defaults      = require('lodash/object/defaults');
+var defaults      = require('lodash/defaults');
 var MockUI        = require('../helpers/mock-ui');
 var MockAnalytics = require('../helpers/mock-analytics');
 var MockProject   = require('../helpers/mock-project');

tests/helpers/assert-file.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var expect     = require('chai').expect;
-var flatten    = require('lodash/array/flatten');
-var contains   = require('lodash/collection/contains');
+var flatten    = require('lodash/flatten');
+var includes   = require('lodash/includes');
 var fs         = require('fs-extra');
 var path       = require('path');
 var EOL        = require('os').EOL;
@@ -55,7 +55,7 @@ module.exports = function assertFile(file, options) {
       if (expected.test) {
         pass = expected.test(actual);
       } else {
-        pass = contains(actual, expected);
+        pass = includes(actual, expected);
       }
 
       var message =  'expected: `' + file + '`';
@@ -77,7 +77,7 @@ module.exports = function assertFile(file, options) {
       if (unexpected.test) {
         pass = !unexpected.test(actual);
       } else {
-        pass = !contains(actual, unexpected);
+        pass = !includes(actual, unexpected);
       }
 
       expect(pass).to.equal(true, EOL + EOL + 'expected ' + file + ':' + EOL + EOL +

tests/helpers/run-command.js

@@ -4,7 +4,7 @@ var RSVP           = require('rsvp');
 var Promise        = require('../../lib/ext/promise');
 var chalk          = require('chalk');
 var spawn          = require('child_process').spawn;
-var defaults       = require('lodash/object/defaults');
+var defaults       = require('lodash/defaults');
 var killCliProcess = require('./kill-cli-process');
 var logOnFailure   = require('./log-on-failure');
 

tests/unit/models/addon-discovery-test.js

@@ -2,7 +2,7 @@
 
 var path = require('path');
 var expect = require('chai').expect;
-var assign = require('lodash/object/assign');
+var assign = require('lodash/assign');
 var Project = require('../../../lib/models/project');
 var AddonDiscovery = require('../../../lib/models/addon-discovery');
 var fixturePath = path.resolve(__dirname, '../../fixtures/addon');

tests/unit/models/addon-test.js

@@ -8,7 +8,7 @@ var Promise = require('../../../lib/ext/promise');
 var expect  = require('chai').expect;
 var remove  = Promise.denodeify(fs.remove);
 var path    = require('path');
-var findWhere = require('lodash/collection/find');
+var findWhere = require('lodash/find');
 var MockUI = require('../../helpers/mock-ui');
 var mkTmpDirIn = require('../../../lib/utilities/mk-tmp-dir-in');