Apply suggestions from code review

Co-authored-by: Jordan Harband <ljharb@gmail.com> Co-authored-by: Jan Olaf Krems <jan.krems@gmail.com>
nodejs · guybedford · Aug 5, 2020 · Aug 5, 2020 · Aug 5, 2020 · Aug 5, 2020
commit acbe3ee460e24e46d7d64dd729d7fa99783e8844
diff --git a/doc/api/cli.md b/doc/api/cli.md
@@ -88,7 +88,7 @@ conditions.
 
 Any custom comma-separated string condition names are permitted.
 
-The default Node.js conditions of `"node"`, `"default"`, `"import"` and
+The default Node.js conditions of `"node"`, `"default"`, `"import"`, and
 `"require"` will always apply as defined.
 
 ### `--cpu-prof`

diff --git a/doc/api/esm.md b/doc/api/esm.md
@@ -504,14 +504,14 @@ conditions behave analogously to nested JavaScript `if` statements.
 #### Resolving custom conditions
 
 When running Node.js, custom comma-separated conditions can be set with the
-`--conditions` or `-m` flag:
+`--conditions` or `-u` flag:
 
 ```bash
 node --conditions=development main.js
 ```
 
 which would then resolve the `"development"` condition in exports, along with
-the existing `"node"`, `"default"`, `"import"` and `"require"` conditions as
+the existing `"node"`, `"default"`, `"import"`, and `"require"` conditions as
 appropriate.
 
 #### Self-referencing a package using its name

diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -86,7 +86,7 @@ const manifest = getOptionValue('--experimental-policy') ?
   null;
 const { compileFunction } = internalBinding('contextify');
 const userConditions = getOptionValue('--conditions') &&
-    getOptionValue('--conditions').split(',');
+    StringPrototypeSplit(getOptionValue('--conditions'), ',');
 
 // Whether any user-provided CJS modules had been loaded (executed).
 // Used for internal assertions.

diff --git a/lib/internal/modules/esm/resolve.js b/lib/internal/modules/esm/resolve.js
@@ -52,7 +52,7 @@ const { Module: CJSModule } = require('internal/modules/cjs/loader');
 
 const packageJsonReader = require('internal/modules/package_json_reader');
 const userConditions = getOptionValue('--conditions') &&
-    getOptionValue('--conditions').split(',');
+    StringPrototypeSplit(getOptionValue('--conditions'), ',');
 const DEFAULT_CONDITIONS = ObjectFreeze(['node', 'import', ...userConditions]);
 const DEFAULT_CONDITIONS_SET = new SafeSet(DEFAULT_CONDITIONS);
 

diff --git a/src/node_options.cc b/src/node_options.cc
@@ -282,7 +282,7 @@ DebugOptionsParser::DebugOptionsParser() {
 
 EnvironmentOptionsParser::EnvironmentOptionsParser() {
   AddOption("--conditions",
-            "set the conditional exports conditions",
+            "additional user conditions for conditional exports and imports",
             &EnvironmentOptions::conditions,
             kAllowedInEnvironment);
   AddAlias("-u", "--conditions");