Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nodejs/node.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Lau <riclau@uk.ibm.com>2020-08-26 16:56:55 +0300
committerMyles Borins <mylesborins@github.com>2020-08-26 19:48:06 +0300
commitcc39bdf72442aa7800d20c9a832b3aa0a069acdf (patch)
treec5217bbcc0c13b5d8d707217430afc39471ba18b
parent4332f738326d9a067d859ef86e78fadeb95f1b2c (diff)
module: drop `-u` alias for `--conditions`
Old versions of mocha break after https://github.com/nodejs/node/pull/34637. This was a bug in mocha, but since this is a widely used module we can expect ecosystem breakage until modules are updated to the latest version of mocha. Drop the conflicting `-u` alias -- we can potentially bring it back once modules have been updated. PR-URL: https://github.com/nodejs/node/pull/34935 Refs: https://github.com/mochajs/mocha/issues/4417 Refs: https://github.com/nodejs/node/pull/34637 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Jan Krems <jan.krems@gmail.com> Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Shelley Vohr <codebytere@gmail.com>
-rw-r--r--doc/api/cli.md4
-rw-r--r--doc/node.12
-rw-r--r--src/node_options.cc1
-rw-r--r--test/es-module/test-esm-custom-exports.mjs2
4 files changed, 4 insertions, 5 deletions
diff --git a/doc/api/cli.md b/doc/api/cli.md
index b6314947ba1..6dea20b879f 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -76,7 +76,7 @@ $ node --completion-bash > node_bash_completion
$ source node_bash_completion
```
-### `-u`, `--conditions=condition`
+### `--conditions=condition`
<!-- YAML
added: REPLACEME
-->
@@ -1247,7 +1247,7 @@ node --require "./a.js" --require "./b.js"
Node.js options that are allowed are:
<!-- node-options-node start -->
-* `--conditions`, `-u`
+* `--conditions`
* `--diagnostic-dir`
* `--disable-proto`
* `--enable-fips`
diff --git a/doc/node.1 b/doc/node.1
index 7eb877bb1c8..b6b062cd346 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 u , Fl -conditions Ar string
+.It Fl -conditions Ar string
Use custom conditional exports conditions
.Ar string
.
diff --git a/src/node_options.cc b/src/node_options.cc
index d3fdc459de1..671cdc591e0 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -285,7 +285,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
"additional user conditions for conditional exports and imports",
&EnvironmentOptions::conditions,
kAllowedInEnvironment);
- AddAlias("-u", "--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 ad81abfdafd..cf0557fa442 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 -u another
+// Flags: --conditions=custom-condition --conditions another
import { mustCall } from '../common/index.mjs';
import { strictEqual } from 'assert';
import { requireFixture, importFixture } from '../fixtures/pkgexports.mjs';