From db6de3dcab1ada7e442a9c0b7a94a4855bd5d815 Mon Sep 17 00:00:00 2001
From: Guy Bedford <guybedford@gmail.com>
Date: Fri, 21 May 2021 16:16:12 +0200
Subject: [PATCH 1/6] cli: add -m alias for --conditions flag

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

diff --git a/doc/api/cli.md b/doc/api/cli.md
index e8fb68a538b6a0..9b0ae4cfe58d62 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -80,7 +80,7 @@ $ node --completion-bash > node_bash_completion
 $ source node_bash_completion
 ```
 
-### `--conditions=condition`
+### `-m`, `--conditions=condition`
 <!-- YAML
 added:
   - v14.9.0
diff --git a/doc/node.1 b/doc/node.1
index 5f5a23319cfd8a..f7521ccffafa58 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -78,7 +78,7 @@ Aborting instead of exiting causes a core file to be generated for analysis.
 .It Fl -completion-bash
 Print source-able bash completion script for Node.js.
 .
-.It Fl -conditions Ar string
+.It Fl m , Fl -conditions Ar string
 Use custom conditional exports conditions.
 .Ar string
 .
diff --git a/src/node_options.cc b/src/node_options.cc
index d5c2600688767b..e8ab3435a9c014 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -292,6 +292,7 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "additional user conditions for conditional exports and imports",
             &EnvironmentOptions::conditions,
             kAllowedInEnvironment);
+  AddAlias("-m", "--conditions");
   AddOption("--diagnostic-dir",
             "set dir for all output files"
             " (default: current working directory)",

From e3b2689a51f0f4f8d679a6d452a7d216920b6e8a Mon Sep 17 00:00:00 2001
From: Guy Bedford <guybedford@gmail.com>
Date: Fri, 21 May 2021 16:18:07 +0200
Subject: [PATCH 2/6] exports ref

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

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 9b0ae4cfe58d62..368e81736aa44e 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -80,7 +80,7 @@ $ node --completion-bash > node_bash_completion
 $ source node_bash_completion
 ```
 
-### `-m`, `--conditions=condition`
+### `-m=condition`, `--conditions=condition`
 <!-- YAML
 added:
   - v14.9.0
@@ -89,7 +89,7 @@ added:
 
 > Stability: 1 - Experimental
 
-Enable experimental support for custom conditional exports resolution
+Enable experimental support for custom [conditional exports][] resolution
 conditions.
 
 Any number of custom string condition names are permitted.
@@ -97,6 +97,12 @@ Any number of custom string condition names are permitted.
 The default Node.js conditions of `"node"`, `"default"`, `"import"`, and
 `"require"` will always apply as defined.
 
+For example, to run a module with "development" resolutions:
+
+```console
+$ node -m=development app.js
+```
+
 ### `--cpu-prof`
 <!-- YAML
 added: v12.0.0
@@ -1748,6 +1754,7 @@ $ node --max-old-space-size=1536 index.js
 ```
 
 [Chrome DevTools Protocol]: https://chromedevtools.github.io/devtools-protocol/
+[Conditional exports]: packages.md#packages_conditional_exports
 [ECMAScript Module loader]: esm.md#esm_loaders
 [REPL]: repl.md
 [ScriptCoverage]: https://chromedevtools.github.io/devtools-protocol/tot/Profiler#type-ScriptCoverage

From 1d4c7afc00b74aa22f413e7f0a9880526f543976 Mon Sep 17 00:00:00 2001
From: Guy Bedford <guybedford@gmail.com>
Date: Fri, 21 May 2021 16:26:45 +0200
Subject: [PATCH 3/6] test

---
 doc/api/cli.md                             | 2 +-
 test/es-module/test-esm-custom-exports.mjs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 368e81736aa44e..aa692125e7acbc 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -1754,7 +1754,7 @@ $ node --max-old-space-size=1536 index.js
 ```
 
 [Chrome DevTools Protocol]: https://chromedevtools.github.io/devtools-protocol/
-[Conditional exports]: packages.md#packages_conditional_exports
+[conditional exports]: packages.md#packages_conditional_exports
 [ECMAScript Module loader]: esm.md#esm_loaders
 [REPL]: repl.md
 [ScriptCoverage]: https://chromedevtools.github.io/devtools-protocol/tot/Profiler#type-ScriptCoverage
diff --git a/test/es-module/test-esm-custom-exports.mjs b/test/es-module/test-esm-custom-exports.mjs
index cf0557fa44215e..695b9ea62e0cc0 100644
--- a/test/es-module/test-esm-custom-exports.mjs
+++ b/test/es-module/test-esm-custom-exports.mjs
@@ -1,4 +1,4 @@
-// Flags: --conditions=custom-condition --conditions another
+// Flags: --conditions=custom-condition -m another
 import { mustCall } from '../common/index.mjs';
 import { strictEqual } from 'assert';
 import { requireFixture, importFixture } from '../fixtures/pkgexports.mjs';

From d7d89989ea1b3461667b084ce667e50131f57422 Mon Sep 17 00:00:00 2001
From: Guy Bedford <guybedford@gmail.com>
Date: Fri, 21 May 2021 16:28:49 +0200
Subject: [PATCH 4/6] reorder toc

---
 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 aa692125e7acbc..097bc8a84339b1 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -1754,7 +1754,6 @@ $ node --max-old-space-size=1536 index.js
 ```
 
 [Chrome DevTools Protocol]: https://chromedevtools.github.io/devtools-protocol/
-[conditional exports]: packages.md#packages_conditional_exports
 [ECMAScript Module loader]: esm.md#esm_loaders
 [REPL]: repl.md
 [ScriptCoverage]: https://chromedevtools.github.io/devtools-protocol/tot/Profiler#type-ScriptCoverage
@@ -1773,6 +1772,7 @@ $ node --max-old-space-size=1536 index.js
 [`tls.DEFAULT_MIN_VERSION`]: tls.md#tls_tls_default_min_version
 [`unhandledRejection`]: process.md#process_event_unhandledrejection
 [`worker_threads.threadId`]: worker_threads.md#worker_threads_worker_threadid
+[conditional exports]: packages.md#packages_conditional_exports
 [context-aware]: addons.md#addons_context_aware_addons
 [customizing ESM specifier resolution]: esm.md#esm_customizing_esm_specifier_resolution_algorithm
 [debugger]: debugger.md

From c5b814daefc4eb35aef2bbe88db6452466149fa3 Mon Sep 17 00:00:00 2001
From: Guy Bedford <guybedford@gmail.com>
Date: Sat, 22 May 2021 11:35:44 +0200
Subject: [PATCH 5/6] use -C flag

---
 doc/api/cli.md                             | 6 +++---
 doc/node.1                                 | 2 +-
 src/node_options.cc                        | 2 +-
 test/es-module/test-esm-custom-exports.mjs | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 097bc8a84339b1..38f72769d9d7ee 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -80,7 +80,7 @@ $ node --completion-bash > node_bash_completion
 $ source node_bash_completion
 ```
 
-### `-m=condition`, `--conditions=condition`
+### `-C=condition`, `--conditions=condition`
 <!-- YAML
 added:
   - v14.9.0
@@ -100,7 +100,7 @@ The default Node.js conditions of `"node"`, `"default"`, `"import"`, and
 For example, to run a module with "development" resolutions:
 
 ```console
-$ node -m=development app.js
+$ node -C=development app.js
 ```
 
 ### `--cpu-prof`
@@ -1376,7 +1376,7 @@ node --require "./a.js" --require "./b.js"
 
 Node.js options that are allowed are:
 <!-- node-options-node start -->
-* `--conditions`
+* `--conditions`, `-C`
 * `--diagnostic-dir`
 * `--disable-proto`
 * `--enable-fips`
diff --git a/doc/node.1 b/doc/node.1
index f7521ccffafa58..a65ec7451a88cc 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -78,7 +78,7 @@ Aborting instead of exiting causes a core file to be generated for analysis.
 .It Fl -completion-bash
 Print source-able bash completion script for Node.js.
 .
-.It Fl m , Fl -conditions Ar string
+.It Fl C , Fl -conditions Ar string
 Use custom conditional exports conditions.
 .Ar string
 .
diff --git a/src/node_options.cc b/src/node_options.cc
index e8ab3435a9c014..b8809df58f0552 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -292,7 +292,7 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "additional user conditions for conditional exports and imports",
             &EnvironmentOptions::conditions,
             kAllowedInEnvironment);
-  AddAlias("-m", "--conditions");
+  AddAlias("-C", "--conditions");
   AddOption("--diagnostic-dir",
             "set dir for all output files"
             " (default: current working directory)",
diff --git a/test/es-module/test-esm-custom-exports.mjs b/test/es-module/test-esm-custom-exports.mjs
index 695b9ea62e0cc0..e6023387cf8afc 100644
--- a/test/es-module/test-esm-custom-exports.mjs
+++ b/test/es-module/test-esm-custom-exports.mjs
@@ -1,4 +1,4 @@
-// Flags: --conditions=custom-condition -m another
+// Flags: --conditions=custom-condition -C another
 import { mustCall } from '../common/index.mjs';
 import { strictEqual } from 'assert';
 import { requireFixture, importFixture } from '../fixtures/pkgexports.mjs';

From 9aef2d342577055d7a66253f0ee7833fa3a073cf Mon Sep 17 00:00:00 2001
From: Guy Bedford <guybedford@gmail.com>
Date: Sat, 22 May 2021 13:47:07 +0200
Subject: [PATCH 6/6] extend allowed check

---
 test/parallel/test-process-env-allowed-flags.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/parallel/test-process-env-allowed-flags.js b/test/parallel/test-process-env-allowed-flags.js
index 1d50e02d7abe0c..9337263d5cc979 100644
--- a/test/parallel/test-process-env-allowed-flags.js
+++ b/test/parallel/test-process-env-allowed-flags.js
@@ -51,7 +51,7 @@ const assert = require('assert');
 // Assert all "canonical" flags begin with dash(es)
 {
   process.allowedNodeEnvironmentFlags.forEach((flag) => {
-    assert(/^--?[a-z0-9._-]+$/.test(flag),
+    assert(/^--?[a-zA-Z0-9._-]+$/.test(flag),
            `Unexpected format for flag ${flag}`);
   });
 }