summaryrefslogtreecommitdiff
path: root/deps/npm/docs/content
diff options
context:
space:
mode:
authorRuy Adorno <ruyadorno@hotmail.com>2020-05-04 14:57:47 -0400
committerShelley Vohr <shelley.vohr@gmail.com>2020-06-07 09:51:59 -0700
commit4d6f56a76a7c149a69d8d9d1011188f427e15ad9 (patch)
tree1b8e8f10bad39b6e5dd8a3281e69d89e8dfe0334 /deps/npm/docs/content
parent964adfafa56ba2601d7c18f754a3476894ab8224 (diff)
downloadnode-new-4d6f56a76a7c149a69d8d9d1011188f427e15ad9.tar.gz
deps: upgrade npm to 6.14.5
PR-URL: https://github.com/nodejs/node/pull/33239 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Michaƫl Zasso <targos@protonmail.com>
Diffstat (limited to 'deps/npm/docs/content')
-rw-r--r--deps/npm/docs/content/cli-commands/npm.md10
-rw-r--r--deps/npm/docs/content/using-npm/scripts.md42
2 files changed, 33 insertions, 19 deletions
diff --git a/deps/npm/docs/content/cli-commands/npm.md b/deps/npm/docs/content/cli-commands/npm.md
index 01a9308204..2d9789dd77 100644
--- a/deps/npm/docs/content/cli-commands/npm.md
+++ b/deps/npm/docs/content/cli-commands/npm.md
@@ -57,14 +57,14 @@ on a preinstalled git.
If one of the packages npm tries to install is a native node module and
requires compiling of C++ Code, npm will use
-[node-gyp](https://github.com/TooTallNate/node-gyp) for that task.
-For a Unix system, [node-gyp](https://github.com/TooTallNate/node-gyp)
+[node-gyp](https://github.com/nodejs/node-gyp) for that task.
+For a Unix system, [node-gyp](https://github.com/nodejs/node-gyp)
needs Python, make and a buildchain like GCC. On Windows,
Python and Microsoft Visual Studio C++ are needed. Python 3 is
-not supported by [node-gyp](https://github.com/TooTallNate/node-gyp).
+not supported by [node-gyp](https://github.com/nodejs/node-gyp).
For more information visit
-[the node-gyp repository](https://github.com/TooTallNate/node-gyp) and
-the [node-gyp Wiki](https://github.com/TooTallNate/node-gyp/wiki).
+[the node-gyp repository](https://github.com/nodejs/node-gyp) and
+the [node-gyp Wiki](https://github.com/nodejs/node-gyp/wiki).
### Directories
diff --git a/deps/npm/docs/content/using-npm/scripts.md b/deps/npm/docs/content/using-npm/scripts.md
index a9ca433fde..befedd0724 100644
--- a/deps/npm/docs/content/using-npm/scripts.md
+++ b/deps/npm/docs/content/using-npm/scripts.md
@@ -145,9 +145,15 @@ suites, then those executables will be added to the `PATH` for
executing the scripts. So, if your package.json has this:
```json
-{ "name" : "foo"
-, "dependencies" : { "bar" : "0.1.x" }
-, "scripts": { "start" : "bar ./test" } }
+{
+ "name" : "foo",
+ "dependencies" : {
+ "bar" : "0.1.x"
+ },
+ "scripts": {
+ "start" : "bar ./test"
+ }
+}
```
then you could run `npm start` to execute the `bar` script, which is
@@ -176,9 +182,15 @@ there is a config param of `<name>[@<version>]:<key>`. For example,
if the package.json has this:
```json
-{ "name" : "foo"
-, "config" : { "port" : "8080" }
-, "scripts" : { "start" : "node server.js" } }
+{
+ "name" : "foo",
+ "config" : {
+ "port" : "8080"
+ },
+ "scripts" : {
+ "start" : "node server.js"
+ }
+}
```
and the server.js is this:
@@ -213,10 +225,11 @@ process.env.npm_package_scripts_install === "foo.js"
For example, if your package.json contains this:
```json
-{ "scripts" :
- { "install" : "scripts/install.js"
- , "postinstall" : "scripts/postinstall.js"
- , "uninstall" : "scripts/uninstall.js"
+{
+ "scripts" : {
+ "install" : "scripts/install.js",
+ "postinstall" : "scripts/install.js",
+ "uninstall" : "scripts/uninstall.js"
}
}
```
@@ -232,10 +245,11 @@ If you want to run a make command, you can do so. This works just
fine:
```json
-{ "scripts" :
- { "preinstall" : "./configure"
- , "install" : "make && make install"
- , "test" : "make test"
+{
+ "scripts" : {
+ "preinstall" : "./configure",
+ "install" : "make && make install",
+ "test" : "make test"
}
}
```