11/**
2- * Copyright (c) 2013-present, Facebook, Inc.
3- * All rights reserved.
2+ * @generated SignedSource<<b68d78236d45828b3f7f7fcc740782a9>>
43 *
5- * This source code is licensed under the BSD-style license found in the
6- * LICENSE file in the root directory of this source tree. An additional grant
7- * of patent rights can be found in the PATENTS file in the same directory.
4+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5+ * !! This file is a check-in of a static_upstream project! !!
6+ * !! !!
7+ * !! You should not modify this file directly. Instead: !!
8+ * !! 1) Use `fjs use-upstream` to temporarily replace this with !!
9+ * !! the latest version from upstream. !!
10+ * !! 2) Make your changes, test them, etc. !!
11+ * !! 3) Use `fjs push-upstream` to copy your changes back to !!
12+ * !! static_upstream. !!
13+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
14+ *
15+ * Copyright 2013-2014 Facebook, Inc.
16+ *
17+ * Licensed under the Apache License, Version 2.0 (the "License");
18+ * you may not use this file except in compliance with the License.
19+ * You may obtain a copy of the License at
20+ *
21+ * http://www.apache.org/licenses/LICENSE-2.0
22+ *
23+ * Unless required by applicable law or agreed to in writing, software
24+ * distributed under the License is distributed on an "AS IS" BASIS,
25+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
26+ * See the License for the specific language governing permissions and
27+ * limitations under the License.
828 *
929 * @providesModule mergeHelpers
1030 *
1131 * requiresPolyfills: Array.isArray
1232 */
1333
14- ' use strict' ;
34+ " use strict" ;
1535
1636var invariant = require ( 'fbjs/lib/invariant' ) ;
37+ var keyMirror = require ( 'fbjs/lib/keyMirror' ) ;
1738
1839/**
1940 * Maximum number of levels to traverse. Will catch circular structures.
@@ -23,12 +44,12 @@ var MAX_MERGE_DEPTH = 36;
2344
2445/**
2546 * We won't worry about edge cases like new String('x') or new Boolean(true).
26- * Functions and Dates are considered terminals, and arrays are not.
47+ * Functions are considered terminals, and arrays are not.
2748 * @param {* } o The item/object/value to test.
2849 * @return {boolean } true iff the argument is a terminal.
2950 */
3051var isTerminal = function ( o ) {
31- return typeof o !== 'object' || o instanceof Date || o === null ;
52+ return typeof o !== 'object' || o === null ;
3253} ;
3354
3455var mergeHelpers = {
@@ -129,11 +150,10 @@ var mergeHelpers = {
129150 * - `indexByIndex`: The result is achieved by recursively deep merging at
130151 * each index. (not yet supported.)
131152 */
132- ArrayStrategies : {
133- Clobber : 'Clobber' ,
134- Concat : 'Concat' ,
135- IndexByIndex : 'IndexByIndex' ,
136- } ,
153+ ArrayStrategies : keyMirror ( {
154+ Clobber : true ,
155+ IndexByIndex : true
156+ } )
137157
138158} ;
139159
0 commit comments