Skip to content

feat: new merge function #2484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
obecny merged 5 commits into from
Oct 12, 2021
Merged

feat: new merge function #2484

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20fc6cb
feat: new merge function
obecny Sep 21, 2021
667f0a7
chore: updating info about lodash.merge util
obecny Sep 23, 2021
467d4f8
Merge branch 'main' into merge
obecny Sep 23, 2021
9114417
chore: merge branch 'main' into merge
obecny Oct 12, 2021
7a7c012
Merge branch 'merge' of github.com:obecny/opentelemetry-js into merge
obecny Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: updating info about lodash.merge util
  • Loading branch information
@obecny
obecny committed Sep 23, 2021
commit 667f0a7034a04afd462c2e8d11201b7ceb7fb516
9 changes: 5 additions & 4 deletions packages/opentelemetry-core/src/utils/lodash.merge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
/* eslint-disable @typescript-eslint/no-explicit-any */

/**
* based on lodash.merge
* @TODO - should I add here more info ?
*/
* based on lodash in order to support esm builds without esModuleInterop.
* lodash is using MIT License.
**/

const objectTag = '[object Object]';
const nullTag = '[object Null]';
const undefinedTag = '[object Undefined]';
Expand Down Expand Up @@ -82,7 +83,7 @@ export function isPlainObject(value: any) {
if (proto === null) {
return true;
}
const Ctor = hasOwnProperty.call(proto, 'constructor') && proto.constructor;
const Ctor = hasOwnProperty.call(proto, 'constructor') && proto.constructor;
return typeof Ctor == 'function' && Ctor instanceof Ctor &&
funcToString.call(Ctor) === objectCtorString;
}
Expand Down