From 9e8f13a491f491c03b4a7621720461bcfffed375 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Mon, 13 Sep 2021 15:53:56 +0200 Subject: [PATCH] fix: ignore undefined values in options --- packages/ipfs-unixfs-importer/src/options.js | 5 ++--- packages/ipfs-unixfs/src/unixfs.d.ts | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/ipfs-unixfs-importer/src/options.js b/packages/ipfs-unixfs-importer/src/options.js index 39efd91e..e1e5b6c6 100644 --- a/packages/ipfs-unixfs-importer/src/options.js +++ b/packages/ipfs-unixfs-importer/src/options.js @@ -2,8 +2,6 @@ import mergeOptions from 'merge-options' import { sha256 } from 'multiformats/hashes/sha2' import { murmur3128 } from '@multiformats/murmur3' -mergeOptions.bind({ ignoreUndefined: true }) - /** * @param {Uint8Array} buf */ @@ -61,5 +59,6 @@ const defaultOptions = { * @returns {ImporterOptions} */ export default (options = {}) => { - return mergeOptions(defaultOptions, options) + const defaults = mergeOptions.bind({ ignoreUndefined: true }) + return defaults(defaultOptions, options) } diff --git a/packages/ipfs-unixfs/src/unixfs.d.ts b/packages/ipfs-unixfs/src/unixfs.d.ts index ca5a8549..6a64ac75 100644 --- a/packages/ipfs-unixfs/src/unixfs.d.ts +++ b/packages/ipfs-unixfs/src/unixfs.d.ts @@ -1,4 +1,4 @@ -import * as $protobuf from "protobufjs"; +import $protobuf from "protobufjs/minimal.js"; /** Properties of a Data. */ export interface IData {