deps: update npm to 6.13.0

PR-URL: #30271 Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
nodejs · Nov 17, 2019 · 401d2e9 · 401d2e9
1 parent 2deea28
commit 401d2e9
Show file tree

Hide file tree

Showing 464 changed files with 36,262 additions and 19,708 deletions.
diff --git a/deps/npm/.eslintrc b/deps/npm/.eslintrc
@@ -0,0 +1,3 @@
+{
+  "extends": "standard"
+}
diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS
@@ -663,3 +663,7 @@ Christian Clauss <[email protected]>
 Nikita Lebedev <[email protected]>
 Henrik Gemal <[email protected]>
 Philip Harrison <[email protected]>
+Jason Etcovitch <[email protected]>
+Darcy Clarke <[email protected]>
+orion <[email protected]>
+NoDocCat <[email protected]>
diff --git a/deps/npm/CHANGELOG.md b/deps/npm/CHANGELOG.md
@@ -1,3 +1,52 @@
+## 6.13.0 (2019-11-05)
+
+### NEW FEATURES
+
+* [`4414b06d9`](https://github.com/npm/cli/commit/4414b06d944c56bee05ccfb85260055a767ee334)
+  [#273](https://github.com/npm/cli/pull/273)
+  add fund command
+  ([@ruyadorno](https://github.com/ruyadorno))
+
+### DOCUMENTATION
+
+* [`ae4c74d04`](https://github.com/npm/cli/commit/ae4c74d04f820a0255a92bdfe77ecf97af134fae)
+  [#274](https://github.com/npm/cli/pull/274)
+  migrate existing docs to gatsby
+  ([@claudiahdz](https://github.com/claudiahdz))
+* [`4ff1bb180`](https://github.com/npm/cli/commit/4ff1bb180b1db8c72e51b3d57bd4e268b738e049)
+  [#277](https://github.com/npm/cli/pull/277)
+  updated documentation copy
+  ([@oletizi](https://github.com/oletizi))
+
+### BUG FIXES
+
+* [`e4455409f`](https://github.com/npm/cli/commit/e4455409fe6fe9c198b250b488129171f0b4624a)
+  [#281](https://github.com/npm/cli/pull/281)
+  delete ps1 files on package removal
+  ([@NoDocCat](https://github.com/NoDocCat))
+* [`cd14d4701`](https://github.com/npm/cli/commit/cd14d47014e8c96ffd6a18791e8752028b19d637)
+  [#279](https://github.com/npm/cli/pull/279)
+  update supported node list to remove v6.0, v6.1, v9.0 - v9.2
+  ([@ljharb](https://github.com/ljharb))
+
+### DEPENDENCIES
+
+* [`a37296b20`](https://github.com/npm/cli/commit/a37296b20ca3e19c2bbfa78fedcfe695e03fda69)
+  `[email protected]`
+* [`d3cb3abe8`](https://github.com/npm/cli/commit/d3cb3abe8cee54bd2624acdcf8043932ef0d660a)
+  `[email protected]`
+
+### TESTING
+
+* [`688cd97be`](https://github.com/npm/cli/commit/688cd97be94ca949719424ff69ff515a68c5caba)
+  [#272](https://github.com/npm/cli/pull/272)
+  use github actions for CI
+  ([@JasonEtco](https://github.com/JasonEtco))
+* [`9a2d8af84`](https://github.com/npm/cli/commit/9a2d8af84f7328f13d8f578cf4b150b9d5f09517)
+  [#240](https://github.com/npm/cli/pull/240)
+  Clean up some flakiness and inconsistency
+  ([@isaacs](https://github.com/isaacs))
+
 ## 6.12.1 (2019-10-29)
 
 ### BUG FIXES

diff --git a/deps/npm/Makefile b/deps/npm/Makefile
@@ -4,51 +4,25 @@ SHELL = bash
 PUBLISHTAG = $(shell node scripts/publish-tag.js)
 BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
 
-markdowns = $(shell find doc -name '*.md' | grep -v 'index') README.md
+markdowns = $(shell find docs -name '*.md' | grep -v 'index') README.md
 
-html_docdeps = html/dochead.html \
-               html/docfoot.html \
-               scripts/doc-build.sh \
-               package.json
-
-cli_mandocs = $(shell find doc/cli -name '*.md' \
+cli_mandocs = $(shell find docs/content/cli-commands -name '*.md' \
                |sed 's|.md|.1|g' \
-               |sed 's|doc/cli/|man/man1/|g' ) \
+               |sed 's|docs/content/cli-commands/|man/man1/|g' ) \
                man/man1/npm-README.1 \
                man/man1/npx.1
 
-files_mandocs = $(shell find doc/files -name '*.md' \
+files_mandocs = $(shell find docs/content/configuring-npm -name '*.md' \
                |sed 's|.md|.5|g' \
-               |sed 's|doc/files/|man/man5/|g' ) \
-               man/man5/npm-json.5 \
-               man/man5/npm-global.5
+               |sed 's|docs/content/configuring-npm/|man/man5/|g' ) \
 
-misc_mandocs = $(shell find doc/misc -name '*.md' \
+misc_mandocs = $(shell find docs/content/using-npm -name '*.md' \
                |sed 's|.md|.7|g' \
-               |sed 's|doc/misc/|man/man7/|g' ) \
-               man/man7/npm-index.7
-
-cli_htmldocs = $(shell find doc/cli -name '*.md' \
-                |sed 's|.md|.html|g' \
-                |sed 's|doc/cli/|html/doc/cli/|g' ) \
-                html/doc/README.html
-
-files_htmldocs = $(shell find doc/files -name '*.md' \
-                  |sed 's|.md|.html|g' \
-                  |sed 's|doc/files/|html/doc/files/|g' ) \
-                  html/doc/files/npm-json.html \
-                  html/doc/files/npm-global.html
-
-misc_htmldocs = $(shell find doc/misc -name '*.md' \
-                 |sed 's|.md|.html|g' \
-                 |sed 's|doc/misc/|html/doc/misc/|g' ) \
-                 html/doc/index.html
+               |sed 's|docs/content/using-npm/|man/man7/|g' ) \
 
 mandocs = $(cli_mandocs) $(files_mandocs) $(misc_mandocs)
 
-htmldocs = $(cli_htmldocs) $(files_htmldocs) $(misc_htmldocs)
-
-all: doc
+all: docs
 
 latest:
 	@echo "Installing latest published npm"
@@ -65,88 +39,67 @@ dev: install
 link: uninstall
 	node bin/npm-cli.js link -f
 
-clean: markedclean marked-manclean doc-clean
+clean: markedclean marked-manclean docs-clean
 	rm -rf npmrc
 	node bin/npm-cli.js cache clean --force
 
 uninstall:
 	node bin/npm-cli.js rm npm -g -f
 
-doc: $(mandocs) $(htmldocs)
+mandocs: $(mandocs)
+
+htmldocs:
+	cd docs && node ../bin/npm-cli.js install && \
+	node ../bin/npm-cli.js run build:static echo>&2 && \
+	rm -rf node_modules .cache public/*js public/*json public/404* public/page-data public/manifest*
+
+docs: mandocs htmldocs
 
 markedclean:
 	rm -rf node_modules/marked node_modules/.bin/marked .building_marked
 
 marked-manclean:
 	rm -rf node_modules/marked-man node_modules/.bin/marked-man .building_marked-man
 
-docclean: doc-clean
-doc-clean:
+docsclean: docs-clean
+docs-clean:
 	rm -rf \
     .building_marked \
     .building_marked-man \
-    html/doc \
-    man
+    man \
+    docs/node_modules \
+    docs/public \
+    docs/.cache
 
 ## build-time tools for the documentation
 build-doc-tools := node_modules/.bin/marked \
                    node_modules/.bin/marked-man
 
 # use `npm install marked-man` for this to work.
-man/man1/npm-README.1: README.md scripts/doc-build.sh package.json $(build-doc-tools)
+man/man1/npm-README.1: README.md scripts/docs-build.js package.json $(build-doc-tools)
 	@[ -d man/man1 ] || mkdir -p man/man1
-	scripts/doc-build.sh $< $@
+	node scripts/docs-build.js $< $@
 
-man/man1/%.1: doc/cli/%.md scripts/doc-build.sh package.json $(build-doc-tools)
+man/man1/%.1: docs/content/cli-commands/%.md scripts/docs-build.js package.json $(build-doc-tools)
 	@[ -d man/man1 ] || mkdir -p man/man1
-	scripts/doc-build.sh $< $@
+	node scripts/docs-build.js $< $@
 
 man/man1/npx.1: node_modules/libnpx/libnpx.1
 	cat $< | sed s/libnpx/npx/ > $@
 
 man/man5/npm-json.5: man/man5/package.json.5
 	cp $< $@
 
-man/man5/npm-global.5: man/man5/npm-folders.5
+man/man5/npm-global.5: man/man5/folders.5
 	cp $< $@
 
-man/man5/%.5: doc/files/%.md scripts/doc-build.sh package.json $(build-doc-tools)
+man/man5/%.5: docs/content/configuring-npm/%.md scripts/docs-build.js package.json $(build-doc-tools)
 	@[ -d man/man5 ] || mkdir -p man/man5
-	scripts/doc-build.sh $< $@
-
-doc/misc/npm-index.md: scripts/index-build.js package.json $(build-doc-tools)
-	node scripts/index-build.js > $@
+	node scripts/docs-build.js $< $@
 
-html/doc/index.html: doc/misc/npm-index.md $(html_docdeps) $(build-doc-tools)
-	@[ -d html/doc ] || mkdir -p html/doc
-	scripts/doc-build.sh $< $@
-
-man/man7/%.7: doc/misc/%.md scripts/doc-build.sh package.json $(build-doc-tools)
+man/man7/%.7: docs/content/using-npm/%.md scripts/docs-build.js package.json $(build-doc-tools)
 	@[ -d man/man7 ] || mkdir -p man/man7
-	scripts/doc-build.sh $< $@
-
-html/doc/README.html: README.md $(html_docdeps) $(build-doc-tools)
-	@[ -d html/doc ] || mkdir -p html/doc
-	scripts/doc-build.sh $< $@
-
-html/doc/cli/%.html: doc/cli/%.md $(html_docdeps) $(build-doc-tools)
-	@[ -d html/doc/cli ] || mkdir -p html/doc/cli
-	scripts/doc-build.sh $< $@
-
-html/doc/files/npm-json.html: html/doc/files/package.json.html
-	cp $< $@
-
-html/doc/files/npm-global.html: html/doc/files/npm-folders.html
-	cp $< $@
-
-html/doc/files/%.html: doc/files/%.md $(html_docdeps) $(build-doc-tools)
-	@[ -d html/doc/files ] || mkdir -p html/doc/files
-	scripts/doc-build.sh $< $@
-
-html/doc/misc/%.html: doc/misc/%.md $(html_docdeps) $(build-doc-tools)
-	@[ -d html/doc/misc ] || mkdir -p html/doc/misc
-	scripts/doc-build.sh $< $@
-
+	node scripts/docs-build.js $< $@
 
 marked: node_modules/.bin/marked
 
@@ -158,11 +111,7 @@ marked-man: node_modules/.bin/marked-man
 node_modules/.bin/marked-man:
 	node bin/npm-cli.js install marked-man --no-global --no-timing --no-save
 
-doc: man
-
-man: $(cli_docs)
-
-test: doc
+test: docs
 	node bin/npm-cli.js test
 
 tag:
@@ -174,17 +123,17 @@ ls-ok:
 gitclean:
 	git clean -fd
 
-publish: gitclean ls-ok link doc-clean doc
+publish: gitclean ls-ok link docs-clean docs
 	@git push origin :v$(shell node bin/npm-cli.js --no-timing -v) 2>&1 || true
 	git push origin $(BRANCH) &&\
 	git push origin --tags &&\
 	node bin/npm-cli.js publish --tag=$(PUBLISHTAG)
 
-release: gitclean ls-ok markedclean marked-manclean doc-clean doc
+release: gitclean ls-ok markedclean marked-manclean docs-clean doc
 	node bin/npm-cli.js prune --production --no-save
 	@bash scripts/release.sh
 
 sandwich:
 	@[ $$(whoami) = "root" ] && (echo "ok"; echo "ham" > sandwich) || (echo "make it yourself" && exit 13)
 
-.PHONY: all latest install dev link doc clean uninstall test man doc-clean docclean release ls-ok realclean
+.PHONY: all latest install dev link doc clean uninstall test man docs-clean docclean release ls-ok realclean
diff --git a/deps/npm/README.md b/deps/npm/README.md
@@ -163,4 +163,3 @@ doubt tell you to put the output in a gist or email.
 
 * npm(1)
 * npm-help(1)
-* npm-index(7)
diff --git a/deps/npm/doc/cli/npm-bin.md b/deps/npm/doc/cli/npm-bin.md
diff --git a/deps/npm/doc/cli/npm-bugs.md b/deps/npm/doc/cli/npm-bugs.md
diff --git a/deps/npm/doc/cli/npm-build.md b/deps/npm/doc/cli/npm-build.md
Original file line number	Diff line number	Diff line change
Expand Up		@@ -163,4 +163,3 @@ doubt tell you to put the output in a gist or email.

		* npm(1)
		* npm-help(1)
		* npm-index(7)