From 86bc1db2b78b12ce28edba2536088438752a8bbc Mon Sep 17 00:00:00 2001
From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
Date: Sat, 27 Jun 2020 15:40:00 +0200
Subject: [PATCH 1/2] =?UTF-8?q?util:=20add=C2=A0`util/types`=20alias=C2=A0?=
 =?UTF-8?q?module?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refs: https://github.com/nodejs/node/pull/31553
Refs: https://github.com/nodejs/node/pull/32953
Refs: https://github.com/nodejs/node/pull/33950
Refs: https://github.com/nodejs/node/pull/34001
Refs: https://github.com/nodejs/node/pull/34002
---
 doc/api/util.md                         | 6 ++++++
 lib/util/types.js                       | 3 +++
 node.gyp                                | 1 +
 test/es-module/test-esm-util-types.mjs  | 6 ++++++
 test/parallel/test-util-types-exists.js | 6 ++++++
 5 files changed, 22 insertions(+)
 create mode 100644 lib/util/types.js
 create mode 100644 test/es-module/test-esm-util-types.mjs
 create mode 100644 test/parallel/test-util-types-exists.js

diff --git a/doc/api/util.md b/doc/api/util.md
index 3b400400e08cae..ab7388b4d8affa 100644
--- a/doc/api/util.md
+++ b/doc/api/util.md
@@ -1237,6 +1237,10 @@ The encoding supported by the `TextEncoder` instance. Always set to `'utf-8'`.
 ## `util.types`
 <!-- YAML
 added: v10.0.0
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/34055
+    description: Exposed as `require('util/types')`
 -->
 
 `util.types` provides type checks for different kinds of built-in objects.
@@ -1248,6 +1252,8 @@ The result generally does not make any guarantees about what kinds of
 properties or behavior a value exposes in JavaScript. They are primarily
 useful for addon developers who prefer to do type checking in JavaScript.
 
+The API is accessible via `require('util').types` or `require('util/types')`.
+
 ### `util.types.isAnyArrayBuffer(value)`
 <!-- YAML
 added: v10.0.0
diff --git a/lib/util/types.js b/lib/util/types.js
new file mode 100644
index 00000000000000..a48a552d6d37e7
--- /dev/null
+++ b/lib/util/types.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('internal/util/types');
diff --git a/node.gyp b/node.gyp
index 47ce95de75591a..b0f46620c6e722 100644
--- a/node.gyp
+++ b/node.gyp
@@ -95,6 +95,7 @@
       'lib/tty.js',
       'lib/url.js',
       'lib/util.js',
+      'lib/util/types.js',
       'lib/v8.js',
       'lib/vm.js',
       'lib/wasi.js',
diff --git a/test/es-module/test-esm-util-types.mjs b/test/es-module/test-esm-util-types.mjs
new file mode 100644
index 00000000000000..c13e5ccc7abc73
--- /dev/null
+++ b/test/es-module/test-esm-util-types.mjs
@@ -0,0 +1,6 @@
+import '../common/index.mjs';
+import assert from 'assert';
+import { types } from 'util';
+import utilTypes from 'util/types';
+
+assert.strictEqual(types, utilTypes);
diff --git a/test/parallel/test-util-types-exists.js b/test/parallel/test-util-types-exists.js
new file mode 100644
index 00000000000000..6a66be87fb384b
--- /dev/null
+++ b/test/parallel/test-util-types-exists.js
@@ -0,0 +1,6 @@
+'use strict';
+
+require('../common');
+const assert = require('assert');
+
+assert.strictEqual(require('util/types'), require('util').types);

From 81d2bed976a5f14cf69bc6face736b7c5c6ddc43 Mon Sep 17 00:00:00 2001
From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
Date: Mon, 19 Oct 2020 14:48:23 +0200
Subject: [PATCH 2/2] =?UTF-8?q?fixup!=20util:=20add=C2=A0`util/types`=20al?=
 =?UTF-8?q?ias=C2=A0module?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Rich Trott <rtrott@gmail.com>
---
 doc/api/util.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/util.md b/doc/api/util.md
index ab7388b4d8affa..e7fbc689d5794f 100644
--- a/doc/api/util.md
+++ b/doc/api/util.md
@@ -1240,7 +1240,7 @@ added: v10.0.0
 changes:
   - version: REPLACEME
     pr-url: https://github.com/nodejs/node/pull/34055
-    description: Exposed as `require('util/types')`
+    description: Exposed as `require('util/types')`.
 -->
 
 `util.types` provides type checks for different kinds of built-in objects.