Update lodash usage for v4

ember-cli · Jan 25, 2016 · 474bd65 · 474bd65
1 parent 8c51fdb
commit 474bd65
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/lib/commands/init.js b/lib/commands/init.js
@@ -1,7 +1,7 @@
 'use strict';
 
-var copy                  = require('lodash/lang/clone');
-var merge                 = require('lodash/object/merge');
+var clone                 = require('lodash/clone');
+var merge                 = require('lodash/merge');
 var Command               = require('../models/command');
 var Promise               = require('../ext/promise');
 var SilentError           = require('silent-error');
@@ -87,7 +87,7 @@ module.exports = Command.extend({
       return Promise.reject(new SilentError(message));
     }
 
-    var blueprintOpts = copy(commandOptions);
+    var blueprintOpts = clone(commandOptions);
     merge(blueprintOpts, {
       rawName: packageName,
       targetFiles: rawArgs || '',

diff --git a/lib/tasks/install-blueprint.js b/lib/tasks/install-blueprint.js
@@ -7,7 +7,7 @@ var isGitRepo     = require('is-git-url');
 var temp          = require('temp');
 var childProcess  = require('child_process');
 var path          = require('path');
-var merge         = require('lodash/object/merge');
+var merge         = require('lodash/merge');
 
 // Automatically track and cleanup temp files at exit
 temp.track();

diff --git a/tests/unit/commands/init-test.js b/tests/unit/commands/init-test.js
@@ -4,7 +4,7 @@ var fs            = require('fs');
 var os            = require('os');
 var path          = require('path');
 var expect        = require('chai').expect;
-var pluck         = require('lodash/collection/pluck');
+var map           = require('lodash/map');
 var MockUI        = require('../../helpers/mock-ui');
 var MockAnalytics = require('../../helpers/mock-analytics');
 var stub          = require('../../helpers/stub');
@@ -224,7 +224,7 @@ describe('init command', function() {
     buildCommand();
 
     command.beforeRun(['app']);
-    expect(pluck(command.availableOptions, 'name')).to.contain('custom-blueprint-option');
+    expect(map(command.availableOptions, 'name')).to.contain('custom-blueprint-option');
   });
 
   it('Passes command options through to the install blueprint task', function() {

diff --git a/tests/unit/commands/new-test.js b/tests/unit/commands/new-test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var expect         = require('chai').expect;
-var pluck          = require('lodash/collection/pluck');
+var map          = require('lodash/map');
 var commandOptions = require('../../factories/command-options');
 var stub           = require('../../helpers/stub');
 var NewCommand     = require('../../../lib/commands/new');
@@ -118,7 +118,7 @@ describe('new command', function() {
     }, true);
 
     command.beforeRun(['app']);
-    expect(pluck(command.availableOptions, 'name')).to.contain('custom-blueprint-option');
+    expect(map(command.availableOptions, 'name')).to.contain('custom-blueprint-option');
   });
 
   it('passes command options through to init command', function() {