From a9e150b000321bc20659834547019de507f9996a Mon Sep 17 00:00:00 2001
From: Sarat Addepalli <sarat.addepalli@paytm.com>
Date: Fri, 3 Aug 2018 14:54:14 +0530
Subject: [PATCH 1/6] doc: add doc for --loader option

---
 doc/api/cli.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 4986d019129b4e..88b4058f539c1e 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -132,6 +132,13 @@ V8 inspector integration allows tools such as Chrome DevTools and IDEs to debug
 and profile Node.js instances. The tools attach to Node.js instances via a
 tcp port and communicate using the [Chrome DevTools Protocol][].
 
+### `--loader`
+<!--
+added: v9.0.0
+-->
+
+Specify a customer loader, to load [ECMAScript Modules][].
+
 ### `--napi-modules`
 <!-- YAML
 added: v7.10.0
@@ -687,3 +694,4 @@ greater than `4` (its current default value). For more information, see the
 [debugger]: debugger.html
 [emit_warning]: process.html#process_process_emitwarning_warning_type_code_ctor
 [libuv threadpool documentation]: http://docs.libuv.org/en/latest/threadpool.html
+[ECMAScript Modules]: esm.html#loader_hooks
\ No newline at end of file

From 1b930e2ec537ef4c3fd89afea89bf8f5acc7f8de Mon Sep 17 00:00:00 2001
From: Sarat Addepalli <sarat.addepalli@paytm.com>
Date: Mon, 6 Aug 2018 10:12:00 +0530
Subject: [PATCH 2/6] doc: fix typos in doc for --loader option

---
 doc/api/cli.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 88b4058f539c1e..c6ee9ea65b2386 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -137,7 +137,7 @@ tcp port and communicate using the [Chrome DevTools Protocol][].
 added: v9.0.0
 -->
 
-Specify a customer loader, to load [ECMAScript Modules][].
+Specify a custom loader, to load [ECMAScript Modules][].
 
 ### `--napi-modules`
 <!-- YAML
@@ -694,4 +694,4 @@ greater than `4` (its current default value). For more information, see the
 [debugger]: debugger.html
 [emit_warning]: process.html#process_process_emitwarning_warning_type_code_ctor
 [libuv threadpool documentation]: http://docs.libuv.org/en/latest/threadpool.html
-[ECMAScript Modules]: esm.html#loader_hooks
\ No newline at end of file
+[ECMAScript Modules]: esm.html#esm_loader_hooks
\ No newline at end of file

From 1553d785c49935c9b2e4ad9cbe77e64d5a3896e7 Mon Sep 17 00:00:00 2001
From: Sarat Addepalli <sarat.addepalli@paytm.com>
Date: Mon, 6 Aug 2018 10:32:55 +0530
Subject: [PATCH 3/6] doc: add docs for --loader in man pages as well as ./node
 --help

---
 doc/api/cli.md | 4 ++--
 doc/node.1     | 6 ++++++
 src/node.cc    | 3 +++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index c6ee9ea65b2386..04ac38b953d540 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -132,12 +132,12 @@ V8 inspector integration allows tools such as Chrome DevTools and IDEs to debug
 and profile Node.js instances. The tools attach to Node.js instances via a
 tcp port and communicate using the [Chrome DevTools Protocol][].
 
-### `--loader`
+### `--loader=file`
 <!--
 added: v9.0.0
 -->
 
-Specify a custom loader, to load [ECMAScript Modules][].
+Specify the `file` as a custom loader, to load [ECMAScript Modules][].
 
 ### `--napi-modules`
 <!-- YAML
diff --git a/doc/node.1 b/doc/node.1
index 31d39c22681860..e437cc2e2ae81b 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -124,6 +124,12 @@ Default is
 V8 Inspector integration allows attaching Chrome DevTools and IDEs to Node.js instances for debugging and profiling.
 It uses the Chrome DevTools Protocol.
 .
+.It Fl -loader Ns = Ns Ar file
+Specify the
+.Ar file
+as a custom loader, to load
+.Fl -experimental-modules .
+.
 .It Fl -napi-modules
 This option is a no-op.
 It is kept for compatibility.
diff --git a/src/node.cc b/src/node.cc
index ba5f713d8dfff5..1c79f8f907923c 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -2621,6 +2621,9 @@ static void PrintHelp() {
          "  --inspect[=[host:]port]    activate inspector on host:port\n"
          "                             (default: 127.0.0.1:9229)\n"
 #endif  // HAVE_INSPECTOR
+         "  --loader=file              (with --experimental-modules) use the \n"
+         "                             specified file as a custom loader\n"
+         "                             for ECMAScript Modules \n"
          "  --napi-modules             load N-API modules (no-op - option\n"
          "                             kept for compatibility)\n"
          "  --no-deprecation           silence deprecation warnings\n"

From d90e3ea7e92424f5c18775f3165a1419374e7014 Mon Sep 17 00:00:00 2001
From: Sarat Addepalli <sarat.addepalli@paytm.com>
Date: Mon, 6 Aug 2018 11:23:01 +0530
Subject: [PATCH 4/6] doc: fix linter issue in cli.md

---
 doc/api/cli.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 04ac38b953d540..3a273dd53d3a05 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -694,4 +694,4 @@ greater than `4` (its current default value). For more information, see the
 [debugger]: debugger.html
 [emit_warning]: process.html#process_process_emitwarning_warning_type_code_ctor
 [libuv threadpool documentation]: http://docs.libuv.org/en/latest/threadpool.html
-[ECMAScript Modules]: esm.html#esm_loader_hooks
\ No newline at end of file
+[ECMAScript Modules]: esm.html#esm_loader_hooks

From 188fb32502989d8c40166d06c63c3c788b57543e Mon Sep 17 00:00:00 2001
From: Sarat Addepalli <sarat.addepalli@paytm.com>
Date: Thu, 16 Aug 2018 10:10:47 +0530
Subject: [PATCH 5/6] doc: mention that --loader option is experimental

---
 doc/api/cli.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 3a273dd53d3a05..565f438cf59f04 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -137,7 +137,7 @@ tcp port and communicate using the [Chrome DevTools Protocol][].
 added: v9.0.0
 -->
 
-Specify the `file` as a custom loader, to load [ECMAScript Modules][].
+Specify the `file` of the custom [experimental ECMAScript Module][] loader.
 
 ### `--napi-modules`
 <!-- YAML
@@ -694,4 +694,4 @@ greater than `4` (its current default value). For more information, see the
 [debugger]: debugger.html
 [emit_warning]: process.html#process_process_emitwarning_warning_type_code_ctor
 [libuv threadpool documentation]: http://docs.libuv.org/en/latest/threadpool.html
-[ECMAScript Modules]: esm.html#esm_loader_hooks
+[experimental ECMAScript Module]: esm.html#esm_loader_hooks

From 6e6192b623ccc888d35bd8677c84b3ab9a9cc3c4 Mon Sep 17 00:00:00 2001
From: Sarat Addepalli <sarat.addepalli@paytm.com>
Date: Thu, 16 Aug 2018 13:15:56 +0530
Subject: [PATCH 6/6] doc: md references should be alphabetical

---
 doc/api/cli.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 565f438cf59f04..637c1cd9050557 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -693,5 +693,5 @@ greater than `4` (its current default value). For more information, see the
 [REPL]: repl.html
 [debugger]: debugger.html
 [emit_warning]: process.html#process_process_emitwarning_warning_type_code_ctor
-[libuv threadpool documentation]: http://docs.libuv.org/en/latest/threadpool.html
 [experimental ECMAScript Module]: esm.html#esm_loader_hooks
+[libuv threadpool documentation]: http://docs.libuv.org/en/latest/threadpool.html