From 8fb77eed89c56e9c153d7b095759b97964e05a47 Mon Sep 17 00:00:00 2001 From: Luigi Pinca Date: Tue, 16 Oct 2018 08:07:20 +0200 Subject: [PATCH] Do not use the deprecated Buffer() constructor Refs: https://github.com/nodejs/citgm/issues/605 Refs: https://nodejs.org/api/deprecations.html#deprecations_dep0005_buffer_constructor --- lib/minify.js | 10 ++++++++-- test/mocha/sourcemaps.js | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/minify.js b/lib/minify.js index d84f6825..fda40546 100644 --- a/lib/minify.js +++ b/lib/minify.js @@ -1,10 +1,16 @@ "use strict"; var to_ascii = typeof atob == "undefined" ? function(b64) { - return new Buffer(b64, "base64").toString(); + var buf = Buffer.from && Buffer.from !== Uint8Array.from + ? Buffer.from(b64, "base64") + : new Buffer(b64, "base64"); + return buf.toString(); } : atob; var to_base64 = typeof btoa == "undefined" ? function(str) { - return new Buffer(str).toString("base64"); + var buf = Buffer.from && Buffer.from !== Uint8Array.from + ? Buffer.from(str) + : new Buffer(str); + return buf.toString("base64"); } : btoa; function read_source_map(name, code) { diff --git a/test/mocha/sourcemaps.js b/test/mocha/sourcemaps.js index ccaa68e1..46289ca6 100644 --- a/test/mocha/sourcemaps.js +++ b/test/mocha/sourcemaps.js @@ -238,7 +238,10 @@ describe("sourcemaps", function() { assert.strictEqual(map.sourcesContent.length, 1); assert.strictEqual(map.sourcesContent[0], code); var encoded = result.code.slice(result.code.lastIndexOf(",") + 1); - map = JSON.parse(new Buffer(encoded, "base64").toString()); + var buf = Buffer.from && Buffer.from !== Uint8Array.from + ? Buffer.from(encoded, "base64") + : new Buffer(encoded, "base64"); + map = JSON.parse(buf.toString()); assert.strictEqual(map.sourcesContent.length, 1); assert.strictEqual(map.sourcesContent[0], code); result = UglifyJS.minify(result.code, {