Merge pull request facebook#3193 from fisherwebdev/remove_lodash

Remove lodash devDependency
nickkeers · Feb 19, 2015 · 02d225f · 02d225f
2 parents a2f7720 + 10d336d
commit 02d225f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/grunt/config/jsx.js b/grunt/config/jsx.js
@@ -1,7 +1,7 @@
 'use strict';
 
+var assign = require('../../src/stubs/Object.assign');
 var grunt = require('grunt');
-var _ = require('lodash');
 
 var rootIDs = [
   'React',
@@ -27,7 +27,7 @@ var test = {
     '**/__tests__/*.js'
   ]),
   getConfig: function() {
-    return _.merge({}, normal.getConfig(), {
+    return assign({}, normal.getConfig(), {
       mocking: true
     });
   },

diff --git a/package.json b/package.json
@@ -53,7 +53,6 @@
     "gzip-js": "~0.3.2",
     "jasmine-tapreporter": "~0.2.2",
     "jest-cli": "^0.2.1",
-    "lodash": "~2.4.1",
     "optimist": "~0.6.0",
     "phantomjs": "~1.9",
     "platform": "^1.1.0",