File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 33const DataTypes = require ( './data-types' ) ;
44const SqlString = require ( './sql-string' ) ;
55const _ = require ( 'lodash' ) ;
6+ const baseIsNative = require ( 'lodash/_baseIsNative' ) ;
67const uuidv1 = require ( 'uuid' ) . v1 ;
78const uuidv4 = require ( 'uuid' ) . v4 ;
89const operators = require ( './operators' ) ;
@@ -51,7 +52,9 @@ function mergeDefaults(a, b) {
5152 return _ . mergeWith ( a , b , ( objectValue , sourceValue ) => {
5253 // If it's an object, let _ handle it this time, we will be called again for each property
5354 if ( ! _ . isPlainObject ( objectValue ) && objectValue !== undefined ) {
54- if ( _ . isFunction ( objectValue ) && _ . isNative ( objectValue ) ) {
55+ // _.isNative includes a check for core-js and throws an error if present.
56+ // Depending on _baseIsNative bypasses the core-js check.
57+ if ( _ . isFunction ( objectValue ) && baseIsNative ( objectValue ) ) {
5558 return sourceValue || objectValue ;
5659 }
5760 return objectValue ;
You can’t perform that action at this time.
0 commit comments