From f265275e805f48bffe01b3314ba9c3da53ffdd5c Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Mon, 26 Mar 2018 01:57:50 +0200
Subject: [PATCH] =?UTF-8?q?zlib,stream:=20use=20=E2=80=9Cofficial=E2=80=9D?=
 =?UTF-8?q?=20`util.types`=20typechecks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The old variants have been deprecated since b20af8088a4d5cccb19.

Refs: https://github.com/nodejs/node/pull/18415
---
 lib/stream.js | 13 ++++++-------
 lib/zlib.js   | 10 +++++++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/stream.js b/lib/stream.js
index 9a816600a05e5a..ba056026d8b20b 100644
--- a/lib/stream.js
+++ b/lib/stream.js
@@ -38,16 +38,15 @@ Stream.Stream = Stream;
 
 // Internal utilities
 try {
-  Stream._isUint8Array = require('internal/util/types').isUint8Array;
-} catch (e) {
-  // Throws for code outside of Node.js core.
-
-  try {
-    Stream._isUint8Array = process.binding('util').isUint8Array;
-  } catch (e) {
+  const types = require('util').types;
+  if (types && typeof types.isUint8Array === 'function') {
+    Stream._isUint8Array = types.isUint8Array;
+  } else {
     // This throws for Node < 4.2.0 because there's no util binding and
     // returns undefined for Node < 7.4.0.
+    Stream._isUint8Array = process.binding('util').isUint8Array;
   }
+} catch (e) {
 }
 
 if (!Stream._isUint8Array) {
diff --git a/lib/zlib.js b/lib/zlib.js
index 317fd83ce0f5f2..01a2ebe9335bad 100644
--- a/lib/zlib.js
+++ b/lib/zlib.js
@@ -28,9 +28,13 @@ const {
   ERR_ZLIB_INITIALIZATION_FAILED
 } = require('internal/errors').codes;
 const Transform = require('_stream_transform');
-const { _extend } = require('util');
-const { isAnyArrayBuffer } = process.binding('util');
-const { isArrayBufferView } = require('internal/util/types');
+const {
+  _extend,
+  types: {
+    isAnyArrayBuffer,
+    isArrayBufferView
+  }
+} = require('util');
 const binding = process.binding('zlib');
 const assert = require('assert').ok;
 const {