From 8beaac38c1d0a6ee8e1268bb97cdd7c580f402e7 Mon Sep 17 00:00:00 2001
From: Myles Borins <myles.borins@gmail.com>
Date: Thu, 25 Apr 2019 00:29:22 -0400
Subject: [PATCH 1/3] module: add createRequire method

This is an abstraction on top of creatRequireFromPath that can accept
both paths, URL Strings, and URL Objects.

PR-URL: https://github.com/nodejs/node/pull/27405
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jan Krems <jan.krems@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Rich Trott <rtrott@gmail.com>
---
 doc/api/deprecations.md                     |  1 -
 doc/api/modules.md                          | 20 +++++++++
 lib/internal/modules/cjs/loader.js          | 48 ++++++++++++++++++---
 test/fixtures/experimental                  |  1 +
 test/parallel/test-module-create-require.js | 24 ++++++++++-
 5 files changed, 86 insertions(+), 8 deletions(-)
 create mode 100644 test/fixtures/experimental

diff --git a/doc/api/deprecations.md b/doc/api/deprecations.md
index 90c2ad5d4f2197..87e537ee4dd194 100644
--- a/doc/api/deprecations.md
+++ b/doc/api/deprecations.md
@@ -2107,7 +2107,6 @@ Type: Documentation-only
 [`fs.read()`]: fs.html#fs_fs_read_fd_buffer_offset_length_position_callback
 [`fs.readSync()`]: fs.html#fs_fs_readsync_fd_buffer_offset_length_position
 [`fs.stat()`]: fs.html#fs_fs_stat_path_options_callback
-[`os.networkInterfaces`]: os.html#os_os_networkinterfaces
 [`os.tmpdir()`]: os.html#os_os_tmpdir
 [`process.env`]: process.html#process_process_env
 [`punycode`]: punycode.html
diff --git a/doc/api/modules.md b/doc/api/modules.md
index b032f168460c3e..66e0b9f32ddc83 100644
--- a/doc/api/modules.md
+++ b/doc/api/modules.md
@@ -905,6 +905,26 @@ by the [module wrapper][]. To access it, require the `Module` module:
 const builtin = require('module').builtinModules;
 ```
 
+### module.createRequire(filename)
+<!-- YAML
+added:
+  - REPLACEME
+  - v12.2.0
+-->
+
+* `filename` {string|URL} Filename to be used to construct the require
+  function. Must be a file URL object, file URL string, or absolute path
+  string.
+* Returns: {[`require`][]} Require function
+
+```js
+const { createRequire } = require('module');
+const requireUtil = createRequire(require.resolve('../src/utils/'));
+
+// Require `../src/utils/some-tool`
+requireUtil('./some-tool');
+```
+
 ### module.createRequireFromPath(filename)
 <!-- YAML
 added: v10.12.0
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
index 44c35718735426..d4e432ab9c5b35 100644
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -23,7 +23,7 @@
 
 const { NativeModule } = require('internal/bootstrap/loaders');
 const util = require('util');
-const { pathToFileURL } = require('internal/url');
+const { pathToFileURL, fileURLToPath, URL } = require('internal/url');
 const vm = require('vm');
 const assert = require('assert').ok;
 const fs = require('fs');
@@ -834,12 +834,48 @@ Module.runMain = function() {
   process._tickCallback();
 };
 
-Module.createRequireFromPath = (filename) => {
-  const m = new Module(filename);
-  m.filename = filename;
-  m.paths = Module._nodeModulePaths(path.dirname(filename));
+function createRequireFromPath(filename) {
+  // Allow a directory to be passed as the filename
+  const trailingSlash =
+    filename.endsWith(path.sep) || path.sep !== '/' && filename.endsWith('\\');
+
+  const proxyPath = trailingSlash ?
+    path.join(filename, 'noop.js') :
+    filename;
+
+  const m = new Module(proxyPath);
+  m.filename = proxyPath;
+
+  m.paths = Module._nodeModulePaths(path.dirname(proxyPath));
   return makeRequireFunction(m);
-};
+}
+
+Module.createRequireFromPath = createRequireFromPath;
+
+const createRequireError = 'must be a file URL object, file URL string, or' +
+  'absolute path string';
+
+function createRequire(filename) {
+  let filepath;
+  if (typeof filename === 'object' && !(filename instanceof URL)) {
+    throw new ERR_INVALID_ARG_VALUE('filename', filename, createRequireError);
+  } else if (typeof filename === 'object' ||
+    typeof filename === 'string' && !path.isAbsolute(filename)) {
+    try {
+      filepath = fileURLToPath(filename);
+    } catch {
+      throw new ERR_INVALID_ARG_VALUE('filename', filename,
+                                      createRequireError);
+    }
+  } else if (typeof filename !== 'string') {
+    throw new ERR_INVALID_ARG_VALUE('filename', filename, createRequireError);
+  } else {
+    filepath = filename;
+  }
+  return createRequireFromPath(filepath);
+}
+
+Module.createRequire = createRequire;
 
 Module._initPaths = function() {
   const isWindows = process.platform === 'win32';
diff --git a/test/fixtures/experimental b/test/fixtures/experimental
new file mode 100644
index 00000000000000..08f779d605aa9e
--- /dev/null
+++ b/test/fixtures/experimental
@@ -0,0 +1 @@
+module.exports.ofLife=42
\ No newline at end of file
diff --git a/test/parallel/test-module-create-require.js b/test/parallel/test-module-create-require.js
index 03ed31939fba67..fa25b87f95921b 100644
--- a/test/parallel/test-module-create-require.js
+++ b/test/parallel/test-module-create-require.js
@@ -4,9 +4,31 @@ require('../common');
 const assert = require('assert');
 const path = require('path');
 
-const { createRequireFromPath } = require('module');
+const { createRequire, createRequireFromPath } = require('module');
 
 const p = path.resolve(__dirname, '..', 'fixtures', 'fake.js');
+const u = new URL(`file://${p}`);
 
 const req = createRequireFromPath(p);
 assert.strictEqual(req('./baz'), 'perhaps I work');
+
+const reqToo = createRequire(u);
+assert.deepStrictEqual(reqToo('./experimental'), { ofLife: 42 });
+
+assert.throws(() => {
+  createRequire('https://github.com/nodejs/node/pull/27405/');
+}, {
+  code: 'ERR_INVALID_ARG_VALUE'
+});
+
+assert.throws(() => {
+  createRequire('../');
+}, {
+  code: 'ERR_INVALID_ARG_VALUE'
+});
+
+assert.throws(() => {
+  createRequire({});
+}, {
+  code: 'ERR_INVALID_ARG_VALUE'
+});

From a3ca21e22c79f53e4d6c544f48080dff826f96bd Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Thu, 9 May 2019 16:47:56 -0400
Subject: [PATCH 2/3] module: simplify createRequire() validation

PR-URL: https://github.com/nodejs/node/pull/27629
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/internal/modules/cjs/loader.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
index d4e432ab9c5b35..3b51d9c550c851 100644
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -857,10 +857,9 @@ const createRequireError = 'must be a file URL object, file URL string, or' +
 
 function createRequire(filename) {
   let filepath;
-  if (typeof filename === 'object' && !(filename instanceof URL)) {
-    throw new ERR_INVALID_ARG_VALUE('filename', filename, createRequireError);
-  } else if (typeof filename === 'object' ||
-    typeof filename === 'string' && !path.isAbsolute(filename)) {
+
+  if (filename instanceof URL ||
+      (typeof filename === 'string' && !path.isAbsolute(filename))) {
     try {
       filepath = fileURLToPath(filename);
     } catch {

From e81b9de20d9dcc16fd03e7dd790ddaae10dd8d32 Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Sat, 18 May 2019 09:10:20 -0400
Subject: [PATCH 3/3] doc: improve createRequire() example

Update the example to use import and import.meta.url instead
of require() and require.resolve().

PR-URL: https://github.com/nodejs/node/pull/27762
Fixes: https://github.com/nodejs/node/issues/27758
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com>
---
 .eslintrc.js       | 1 +
 doc/api/modules.md | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index d13fb1709ba8e9..b51b858cc68859 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -38,6 +38,7 @@ module.exports = {
     {
       files: [
         'doc/api/esm.md',
+        'doc/api/modules.md',
         '*.mjs',
         'test/es-module/test-esm-example-loader.js',
       ],
diff --git a/doc/api/modules.md b/doc/api/modules.md
index 66e0b9f32ddc83..9b66eeeeee58d0 100644
--- a/doc/api/modules.md
+++ b/doc/api/modules.md
@@ -918,11 +918,11 @@ added:
 * Returns: {[`require`][]} Require function
 
 ```js
-const { createRequire } = require('module');
-const requireUtil = createRequire(require.resolve('../src/utils/'));
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
 
-// Require `../src/utils/some-tool`
-requireUtil('./some-tool');
+// sibling-module.js is a CommonJS module.
+const siblingModule = require('./sibling-module');
 ```
 
 ### module.createRequireFromPath(filename)