From 2d796bde762e392803ab56c6f924055050201977 Mon Sep 17 00:00:00 2001 From: Konstantin Vyatkin Date: Wed, 10 Jun 2020 15:14:32 -0400 Subject: [PATCH] upgrade fetch-blob to 1.0.7 (#870) Co-authored-by: Antoni Kepinski --- @types/index.d.ts | 9 +++++---- @types/index.test-d.ts | 11 ++++++----- package.json | 2 +- src/body.js | 7 +++---- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/@types/index.d.ts b/@types/index.d.ts index 31533a2..b4d16ec 100644 --- a/@types/index.d.ts +++ b/@types/index.d.ts @@ -2,14 +2,15 @@ /* eslint-disable no-var, import/no-mutable-exports */ -import {Agent} from 'http'; -import * as Blob from 'fetch-blob'; +import { Agent } from 'http'; +import { URL, URLSearchParams } from 'url' +import Blob = require('fetch-blob'); type AbortSignal = { readonly aborted: boolean; - addEventListener(type: "abort", listener: (this: AbortSignal, ev: Event) => any, options?: boolean | { passive?: boolean; once?: boolean; }): void; - removeEventListener(type: "abort", listener: (this: AbortSignal, ev: Event) => any, options?: boolean | { capture?: boolean; }): void; + addEventListener(type: "abort", listener: (this: AbortSignal) => void): void; + removeEventListener(type: "abort", listener: (this: AbortSignal) => void): void; }; type HeadersInit = Headers | Record | Iterable | Iterable>; diff --git a/@types/index.test-d.ts b/@types/index.test-d.ts index d00d142..60332bb 100644 --- a/@types/index.test-d.ts +++ b/@types/index.test-d.ts @@ -1,7 +1,8 @@ -import {expectType, expectAssignable} from 'tsd'; +import { expectType, expectAssignable } from 'tsd'; import AbortController from 'abort-controller'; +import Blob = require('fetch-blob'); -import fetch, {Request, Response, Headers, Body, FetchError, AbortError} from '.'; +import fetch, { Request, Response, Headers, Body, FetchError, AbortError } from '.'; import * as _fetch from '.'; import __fetch = require('.'); @@ -39,7 +40,7 @@ async function run() { expectType(request.url); expectType(request.headers); - const headers = new Headers({byaka: 'buke'}); + const headers = new Headers({ byaka: 'buke' }); expectType<(a: string, b: string) => void>(headers.append); expectType<(a: string) => string | null>(headers.get); expectType<(name: string, value: string) => void>(headers.set); @@ -48,7 +49,7 @@ async function run() { expectType<() => IterableIterator<[string, string]>>(headers.entries); expectType<() => IterableIterator<[string, string]>>(headers[Symbol.iterator]); - const postRes = await fetch(request, {method: 'POST', headers}); + const postRes = await fetch(request, { method: 'POST', headers }); expectType(await postRes.blob()); } catch (error) { if (error instanceof FetchError) { @@ -85,7 +86,7 @@ async function run() { const request = new Request('url', { signal: abortController.signal }); expectAssignable(request); - new Headers({'Header': 'value'}); + new Headers({ 'Header': 'value' }); // new Headers(['header', 'value']); // should not work new Headers([['header', 'value']]); new Headers(new Headers()); diff --git a/package.json b/package.json index 31c5f61..ac59b83 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ }, "dependencies": { "data-uri-to-buffer": "^3.0.1", - "fetch-blob": "^1.0.6" + "fetch-blob": "^2.0.0" }, "esm": { "sourceMap": true, diff --git a/src/body.js b/src/body.js index a415a95..b6cf43d 100644 --- a/src/body.js +++ b/src/body.js @@ -94,11 +94,10 @@ export default class Body { */ async blob() { const ct = (this.headers && this.headers.get('content-type')) || (this[INTERNALS].body && this[INTERNALS].body.type) || ''; - const buf = await consumeBody(this); + const buf = await this.buffer(); - return new Blob([], { - type: ct.toLowerCase(), - buffer: buf + return new Blob([buf], { + type: ct }); }