Bump to v3.3.0.

lodash.merge/README.md

@@ -1,4 +1,4 @@
-# lodash.merge v3.2.1
+# lodash.merge v3.3.0
 
 The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.merge` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
 
@@ -17,4 +17,4 @@ In Node.js/io.js:
 var merge = require('lodash.merge');
 ```
 
-See the [documentation](https://lodash.com/docs#merge) or [package source](https://github.com/lodash/lodash/blob/3.2.1-npm-packages/lodash.merge) for more details.
+See the [documentation](https://lodash.com/docs#merge) or [package source](https://github.com/lodash/lodash/blob/3.3.0-npm-packages/lodash.merge) for more details.

lodash.merge/index.js

@@ -1,5 +1,5 @@
 /**
- * lodash 3.2.1 (Custom Build) <https://lodash.com/>
+ * lodash 3.3.0 (Custom Build) <https://lodash.com/>
  * Build: `lodash modern modularize exports="npm" -o ./`
  * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
  * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
@@ -9,9 +9,9 @@
 var arrayCopy = require('lodash._arraycopy'),
     arrayEach = require('lodash._arrayeach'),
     createAssigner = require('lodash._createassigner'),
+    getNative = require('lodash._getnative'),
     isArguments = require('lodash.isarguments'),
     isArray = require('lodash.isarray'),
-    isNative = require('lodash.isnative'),
     isPlainObject = require('lodash.isplainobject'),
     isTypedArray = require('lodash.istypedarray'),
     keys = require('lodash.keys'),
@@ -29,18 +29,11 @@ function isObjectLike(value) {
   return !!value && typeof value == 'object';
 }
 
-/** Used for native method references. */
-var arrayProto = Array.prototype;
-
-/** Native method references. */
-var getOwnPropertySymbols = isNative(getOwnPropertySymbols = Object.getOwnPropertySymbols) && getOwnPropertySymbols,
-    push = arrayProto.push;
-
 /**
  * Used as the [maximum length](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.max_safe_integer)
  * of an array-like value.
  */
-var MAX_SAFE_INTEGER = Math.pow(2, 53) - 1;
+var MAX_SAFE_INTEGER = 9007199254740991;
 
 /**
  * The base implementation of `_.merge` without support for argument juggling,
@@ -58,11 +51,9 @@ function baseMerge(object, source, customizer, stackA, stackB) {
   if (!isObject(object)) {
     return object;
   }
-  var isSrcArr = isArrayLike(source) && (isArray(source) || isTypedArray(source));
-  if (!isSrcArr) {
-    var props = keys(source);
-    push.apply(props, getSymbols(source));
-  }
+  var isSrcArr = isArrayLike(source) && (isArray(source) || isTypedArray(source)),
+      props = isSrcArr ? null : keys(source);
+
   arrayEach(props || source, function(srcValue, key) {
     if (props) {
       key = srcValue;
@@ -81,7 +72,7 @@ function baseMerge(object, source, customizer, stackA, stackB) {
       if (isCommon) {
         result = srcValue;
       }
-      if ((isSrcArr || result !== undefined) &&
+      if ((result !== undefined || (isSrcArr && !(key in object))) &&
           (isCommon || (result === result ? (result !== value) : (value === value)))) {
         object[key] = result;
       }
@@ -173,17 +164,6 @@ function baseProperty(key) {
  */
 var getLength = baseProperty('length');
 
-/**
- * Creates an array of the own symbols of `object`.
- *
- * @private
- * @param {Object} object The object to query.
- * @returns {Array} Returns the array of symbols.
- */
-var getSymbols = !getOwnPropertySymbols ? constant([]) : function(object) {
-  return getOwnPropertySymbols(toObject(object));
-};
-
 /**
  * Checks if `value` is array-like.
  *
@@ -208,17 +188,6 @@ function isLength(value) {
   return typeof value == 'number' && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
 }
 
-/**
- * Converts `value` to an object if it is not one.
- *
- * @private
- * @param {*} value The value to process.
- * @returns {Object} Returns the object.
- */
-function toObject(value) {
-  return isObject(value) ? value : Object(value);
-}
-
 /**
  * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.
  * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
@@ -243,7 +212,7 @@ function isObject(value) {
   // Avoid a V8 JIT bug in Chrome 19-20.
   // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.
   var type = typeof value;
-  return type == 'function' || (!!value && type == 'object');
+  return !!value && (type == 'object' || type == 'function');
 }
 
 /**
@@ -296,26 +265,4 @@ function isObject(value) {
  */
 var merge = createAssigner(baseMerge);
 
-/**
- * Creates a function that returns `value`.
- *
- * @static
- * @memberOf _
- * @category Utility
- * @param {*} value The value to return from the new function.
- * @returns {Function} Returns the new function.
- * @example
- *
- * var object = { 'user': 'fred' };
- * var getter = _.constant(object);
- *
- * getter() === object;
- * // => true
- */
-function constant(value) {
-  return function() {
-    return value;
-  };
-}
-
 module.exports = merge;

lodash.merge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lodash.merge",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "description": "The modern build of lodash’s `_.merge` as a module.",
   "homepage": "https://lodash.com/",
   "icon": "https://lodash.com/icon.svg",
@@ -20,9 +20,9 @@
     "lodash._arraycopy": "^3.0.0",
     "lodash._arrayeach": "^3.0.0",
     "lodash._createassigner": "^3.0.0",
+    "lodash._getnative": "^3.0.0",
     "lodash.isarguments": "^3.0.0",
     "lodash.isarray": "^3.0.0",
-    "lodash.isnative": "^3.0.0",
     "lodash.isplainobject": "^3.0.0",
     "lodash.istypedarray": "^3.0.0",
     "lodash.keys": "^3.0.0",