refactor deprecated `new Buffer` with Buffer.from and Buffer.alloc (#299)
* refactor deprecated `new Buffer` with Buffer.from and Buffer.alloc * don't need new ArrayBuffer instance when already an ArrayBuffer
This commit is contained in:
parent
6b990d0631
commit
76e8ad8b24
|
@ -31,13 +31,13 @@ export default class Blob {
|
|||
if (element instanceof Buffer) {
|
||||
buffer = element;
|
||||
} else if (ArrayBuffer.isView(element)) {
|
||||
buffer = new Buffer(new Uint8Array(element.buffer, element.byteOffset, element.byteLength));
|
||||
buffer = Buffer.from(element.buffer, element.byteOffset, element.byteLength);
|
||||
} else if (element instanceof ArrayBuffer) {
|
||||
buffer = new Buffer(new Uint8Array(element));
|
||||
buffer = Buffer.from(element);
|
||||
} else if (element instanceof Blob) {
|
||||
buffer = element[BUFFER];
|
||||
} else {
|
||||
buffer = new Buffer(typeof element === 'string' ? element : String(element));
|
||||
buffer = Buffer.from(typeof element === 'string' ? element : String(element));
|
||||
}
|
||||
buffers.push(buffer);
|
||||
}
|
||||
|
|
|
@ -151,12 +151,12 @@ function consumeBody(body) {
|
|||
|
||||
// body is null
|
||||
if (this.body === null) {
|
||||
return Body.Promise.resolve(new Buffer(0));
|
||||
return Body.Promise.resolve(Buffer.alloc(0));
|
||||
}
|
||||
|
||||
// body is string
|
||||
if (typeof this.body === 'string') {
|
||||
return Body.Promise.resolve(new Buffer(this.body));
|
||||
return Body.Promise.resolve(Buffer.from(this.body));
|
||||
}
|
||||
|
||||
// body is blob
|
||||
|
@ -171,7 +171,7 @@ function consumeBody(body) {
|
|||
|
||||
// istanbul ignore if: should never happen
|
||||
if (!(this.body instanceof Stream)) {
|
||||
return Body.Promise.resolve(new Buffer(0));
|
||||
return Body.Promise.resolve(Buffer.alloc(0));
|
||||
}
|
||||
|
||||
// body is stream
|
||||
|
|
|
@ -720,7 +720,7 @@ describe('node-fetch', () => {
|
|||
url = `${base}inspect`;
|
||||
opts = {
|
||||
method: 'POST'
|
||||
, body: new Buffer('a=1', 'utf-8')
|
||||
, body: Buffer.from('a=1', 'utf-8')
|
||||
};
|
||||
return fetch(url, opts).then(res => {
|
||||
return res.json();
|
||||
|
@ -1432,7 +1432,7 @@ describe('node-fetch', () => {
|
|||
res.j = NaN;
|
||||
res.k = true;
|
||||
res.l = false;
|
||||
res.m = new Buffer('test');
|
||||
res.m = Buffer.from('test');
|
||||
|
||||
const h1 = new Headers(res);
|
||||
h1.set('n', [1, 2]);
|
||||
|
@ -1728,7 +1728,7 @@ describe('node-fetch', () => {
|
|||
});
|
||||
|
||||
it('should support buffer as body in Response constructor', function() {
|
||||
const res = new Response(new Buffer('a=1'));
|
||||
const res = new Response(Buffer.from('a=1'));
|
||||
return res.text().then(result => {
|
||||
expect(result).to.equal('a=1');
|
||||
});
|
||||
|
@ -1824,7 +1824,7 @@ describe('node-fetch', () => {
|
|||
url = base;
|
||||
var req = new Request(url, {
|
||||
method: 'POST',
|
||||
body: new Buffer('a=1')
|
||||
body: Buffer.from('a=1')
|
||||
});
|
||||
expect(req.url).to.equal(url);
|
||||
return req.blob().then(function(result) {
|
||||
|
|
Loading…
Reference in New Issue