fix: cherry pick lodash modules (#289)

Author: tychenjiajun

gulpfile.js

@@ -26,16 +26,15 @@ var ARGV = require("yargs").
     argv;
 
 var webpack = require("webpack-stream"),
-    lodash = require("lodash"),
     gulp = require("gulp"),
     gutil = require("gulp-util"),
     karma = require("karma"),
     mocha = require("gulp-mocha"),
     istanbul = require("gulp-istanbul"),
     del = require("del");
 
-var clone = lodash.clone;
-var merge = lodash.merge;
+var clone = require("lodash/clone");
+var merge = require("lodash/merge");
 // ### 'CONSTANTS' ###
 var SOURCES = ["./lib/**/*.js", "!(./lib/old/**/*.js)"],
     TESTS = "./test/**/*-test.js";

lib/algorithms/ec-util.js

@@ -5,7 +5,7 @@
  */
 "use strict";
 
-var clone = require("lodash").clone,
+var clone = require("lodash/clone"),
     ecc = require("../deps/ecc"),
     forge = require("../deps/forge.js"),
     util = require("../util");

lib/algorithms/ecdh.js

@@ -5,8 +5,7 @@
  */
 "use strict";
 
-var lodash = require("lodash"),
-    merge = require("../util/merge"),
+var merge = require("../util/merge"),
     util = require("../util"),
     ecUtil = require("./ec-util.js"),
     hkdf = require("./hkdf.js"),
@@ -15,9 +14,9 @@ var lodash = require("lodash"),
     helpers = require("./helpers.js"),
     CONSTANTS = require("./constants.js");
 
-var clone = lodash.clone;
-var omit = lodash.omit;
-var pick = lodash.pick;
+var clone = require("lodash/clone");
+var omit = require("lodash/omit");
+var pick = require("lodash/pick");
 
 function idealHash(curve) {
   switch (curve) {

lib/algorithms/rsa-util.js

@@ -5,7 +5,7 @@
  */
 "use strict";
 
-var clone = require("lodash").clone,
+var clone = require("lodash/clone"),
     forge = require("../deps/forge.js"),
     util = require("../util");
 

lib/deps/ciphermodes/gcm/helpers.js

@@ -6,7 +6,7 @@
 "use strict";
 
 var Long = require("long"),
-    fill = require("lodash").fill,
+    fill = require("lodash/fill"),
     pack = require("../pack.js");
 
 var E1 = 0xe1000000,

lib/jwe/encrypt.js

@@ -5,17 +5,15 @@
  */
 "use strict";
 
-var lodash = require("lodash"),
-    util = require("../util"),
+var util = require("../util"),
     generateCEK = require("./helpers").generateCEK,
     JWK = require("../jwk"),
     slice = require("./helpers").slice,
     pako = require("pako"),
     CONSTANTS = require("../algorithms/constants");
 
-var assign = lodash.assign;
-var clone = lodash.clone;
-
+var assign = require("lodash/assign");
+var clone = require("lodash/clone");
 var DEFAULTS = require("./defaults");
 
 /**

lib/jwk/basekey.js

@@ -5,17 +5,16 @@
  */
 "use strict";
 
-var lodash = require("lodash"),
-    merge = require("../util/merge"),
+var merge = require("../util/merge"),
     uuid = require("uuid");
 
-var assign = lodash.assign;
-var clone = lodash.clone;
-var flatten = lodash.flatten;
-var intersection = lodash.intersection;
-var omit = lodash.omit;
-var pick = lodash.pick;
-var uniq = lodash.uniq;
+var assign = require("lodash/assign");
+var clone = require("lodash/clone");
+var flatten = require("lodash/flatten");
+var intersection = require("lodash/intersection");
+var omit = require("lodash/omit");
+var pick = require("lodash/pick");
+var uniq = require("lodash/uniq");
 
 var ALGORITHMS = require("../algorithms"),
     CONSTANTS = require("./constants.js"),

lib/jwk/helpers.js

@@ -5,7 +5,7 @@
  */
 "use strict";
 
-var clone = require("lodash").clone,
+var clone = require("lodash/clone"),
     util = require("../util"),
     forge = require("../deps/forge");
 

lib/jwk/keystore.js

@@ -5,7 +5,7 @@
  */
 "use strict";
 
-var clone = require("lodash").clone,
+var clone = require("lodash/clone"),
     merge = require("../util/merge"),
     forge = require("../deps/forge"),
     util = require("../util");

lib/jws/sign.js

@@ -5,14 +5,13 @@
  */
 "use strict";
 
-var lodash = require("lodash"),
-    merge = require("../util/merge"),
+var merge = require("../util/merge"),
     util = require("../util"),
     JWK = require("../jwk"),
     slice = require("./helpers").slice;
 
-var clone = lodash.clone;
-var uniq = lodash.uniq;
+var clone = require("lodash/clone");
+var uniq = require("lodash/uniq");
 
 var DEFAULTS = require("./defaults");
 

lib/jws/verify.js

@@ -5,7 +5,7 @@
  */
 "use strict";
 
-var clone = require("lodash").clone,
+var clone = require("lodash/clone"),
     merge = require("../util/merge"),
     base64url = require("../util/base64url"),
     AlgConfig = require("../util/algconfig"),

lib/util/merge.js

@@ -5,10 +5,8 @@
  */
 "use strict";
 
-var lodash = require("lodash");
-
-var partialRight = lodash.partialRight;
-var merge = lodash.merge;
+var partialRight = require("lodash/partialRight");
+var merge = require("lodash/merge");
 
 var typedArrayCtors = (function() {
   var ctors = [];

test/algorithms/ecdh-test.js

@@ -4,7 +4,7 @@
  */
 "use strict";
 
-var omit = require("lodash").omit,
+var omit = require("lodash/omit"),
     chai = require("chai"),
     bowser = require("bowser");
 var assert = chai.assert;

test/jwe/invalidecdh-test.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-var forEach = require("lodash").forEach;
+var forEach = require("lodash/forEach")
 var chai = require("chai");
 
 var JWE = require("../../lib/jwe"),

test/jwe/jwe-test.js

@@ -4,8 +4,8 @@
  */
 "use strict";
 
-var cloneDeep = require("lodash").cloneDeep;
-var forEach = require("lodash").forEach;
+var cloneDeep = require("lodash/cloneDeep");
+var forEach = require("lodash/forEach")
 var chai = require("chai");
 
 var JWE = require("../../lib/jwe"),

test/jwe/roundtrip-test.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var forEach = require("lodash").forEach;
+var forEach = require("lodash/forEach")
 var chai = require("chai");
 
 var JWE = require("../../lib/jwe"),

test/jwk/eckey-test.js

@@ -5,11 +5,11 @@
 "use strict";
 
 var chai = require("chai"),
-    bind = require("lodash").bind,
-    clone = require("lodash").clone,
+    bind = require("lodash/bind"),
+    clone = require("lodash/clone"),
     merge = require("../../lib/util/merge"),
-    omit = require("lodash").omit,
-    pick = require("lodash").pick;
+    omit = require("lodash/omit"),
+    pick = require("lodash/pick");
 var assert = chai.assert;
 
 var JWK = {

test/jwk/octkey-test.js

@@ -6,7 +6,7 @@
 
 var chai = require("chai"),
     forge = require("node-forge"),
-    clone = require("lodash").clone,
+    clone = require("lodash/clone"),
     merge = require("../../lib/util/merge");
 var assert = chai.assert;
 

test/jwk/rsakey-test.js

@@ -5,11 +5,11 @@
 "use strict";
 
 var chai = require("chai");
-var bind = require("lodash").bind;
-var clone = require("lodash").clone;
+var bind = require("lodash/bind");
+var clone = require("lodash/clone");
 var merge = require("../../lib/util/merge");
-var omit = require("lodash").omit;
-var pick = require("lodash").pick;
+var omit = require("lodash/omit");
+var pick = require("lodash/pick");
 var assert = chai.assert;
 
 var JWK = {

test/jws/jws-test.js

@@ -4,8 +4,8 @@
  */
 "use strict";
 
-var cloneDeep = require("lodash").cloneDeep;
-var forEach = require("lodash").forEach;
+var cloneDeep = require("lodash/cloneDeep");
+var forEach = require("lodash/forEach")
 var chai = require("chai");
 var bowser = require("bowser");
 

test/parse/compact-test.js

@@ -7,7 +7,7 @@
 var chai = require("chai");
 var assert = chai.assert;
 
-var cloneDeep = require("lodash").cloneDeep;
+var cloneDeep = require("lodash/cloneDeep");
 var parseCompact = require("../../lib/parse/compact");
 var jose = {
   JWK: require("../../lib/jwk")

test/parse/index-test.js

@@ -7,7 +7,7 @@
 var chai = require("chai");
 var assert = chai.assert;
 
-var cloneDeep = require("lodash").cloneDeep;
+var cloneDeep = require("lodash/cloneDeep");
 var merge = require("../../lib/util/merge");
 
 var jose = {

test/parse/json-test.js

@@ -7,7 +7,7 @@
 var chai = require("chai");
 var assert = chai.assert;
 
-var cloneDeep = require("lodash").cloneDeep;
+var cloneDeep = require("lodash/cloneDeep");
 var merge = require("../../lib/util/merge");
 var parseJSON = require("../../lib/parse/json");