diff --git a/deps/npm/.gitmodules b/deps/npm/.gitmodules deleted file mode 100644 index 169c87505c..0000000000 --- a/deps/npm/.gitmodules +++ /dev/null @@ -1,60 +0,0 @@ -[submodule "node_modules/semver"] - path = node_modules/semver - url = https://github.com/isaacs/node-semver.git -[submodule "node_modules/abbrev"] - path = node_modules/abbrev - url = https://github.com/isaacs/abbrev-js.git -[submodule "node_modules/nopt"] - path = node_modules/nopt - url = https://github.com/isaacs/nopt.git -[submodule "node_modules/node-uuid"] - path = node_modules/node-uuid - url = https://github.com/broofa/node-uuid -[submodule "node_modules/minimatch"] - path = node_modules/minimatch - url = https://github.com/isaacs/minimatch.git -[submodule "node_modules/graceful-fs"] - path = node_modules/graceful-fs - url = https://github.com/isaacs/node-graceful-fs.git -[submodule "node_modules/slide"] - path = node_modules/slide - url = https://github.com/isaacs/slide-flow-control.git -[submodule "node_modules/rimraf"] - path = node_modules/rimraf - url = https://github.com/isaacs/rimraf.git -[submodule "node_modules/proto-list"] - path = node_modules/proto-list - url = https://github.com/isaacs/proto-list.git -[submodule "node_modules/ini"] - path = node_modules/ini - url = https://github.com/isaacs/ini.git -[submodule "node_modules/which"] - path = node_modules/which - url = https://github.com/isaacs/node-which.git -[submodule "node_modules/request"] - path = node_modules/request - url = https://github.com/mikeal/request.git -[submodule "node_modules/tar"] - path = node_modules/tar - url = https://github.com/isaacs/node-tar.git -[submodule "node_modules/fstream"] - path = node_modules/fstream - url = https://github.com/isaacs/fstream.git -[submodule "node_modules/inherits"] - path = node_modules/inherits - url = https://github.com/isaacs/inherits.git -[submodule "node_modules/block-stream"] - path = node_modules/block-stream - url = https://github.com/isaacs/block-stream.git -[submodule "node_modules/mkdirp"] - path = node_modules/mkdirp - url = https://github.com/isaacs/node-mkdirp.git -[submodule "node_modules/fast-list"] - path = node_modules/fast-list - url = https://github.com/isaacs/fast-list.git -[submodule "node_modules/read"] - path = node_modules/read - url = https://github.com/isaacs/read.git -[submodule "node_modules/lru-cache"] - path = node_modules/lru-cache - url = https://github.com/isaacs/node-lru-cache.git diff --git a/deps/npm/.npmignore b/deps/npm/.npmignore index 7ba078e516..6ab186883a 100644 --- a/deps/npm/.npmignore +++ b/deps/npm/.npmignore @@ -10,3 +10,4 @@ node_modules/.bin npm-debug.log ./npmrc .gitignore +release/ diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS index 59d7257e81..c977af8c48 100644 --- a/deps/npm/AUTHORS +++ b/deps/npm/AUTHORS @@ -48,3 +48,6 @@ Jameson Little cspotcode Maciej Małecki Stephen Sugden +Gautham Pai +David Trejo +Paul Vorbach diff --git a/deps/npm/Makefile b/deps/npm/Makefile index 7d3e106535..415a1b3d68 100644 --- a/deps/npm/Makefile +++ b/deps/npm/Makefile @@ -27,12 +27,9 @@ mandocs = $(api_mandocs) $(cli_mandocs) htmldocs = $(api_htmldocs) $(cli_htmldocs) -all: submodules doc +all: doc -submodules: - ! [ -d .git ] || git submodule update --init --recursive - -latest: submodules +latest: @echo "Installing latest published npm" @echo "Use 'make install' or 'make link' to install the code" @echo "in this folder that you're looking at right now." @@ -51,7 +48,7 @@ clean: doc-clean uninstall rm npmrc node cli.js cache clean -uninstall: submodules +uninstall: node cli.js rm npm -g -f doc: $(mandocs) $(htmldocs) @@ -94,14 +91,14 @@ html/api/%.html: doc/api/%.md html/dochead.html html/docfoot.html scripts/doc-bu doc/cli/index.md: $(markdowns) scripts/index-build.js scripts/doc-build.sh package.json node scripts/index-build.js > $@ -node_modules/ronn: +node_modules/.bin/ronn: node cli.js install https://github.com/isaacs/ronnjs/tarball/master doc: man man: $(cli_docs) $(api_docs) -test: submodules +test: node cli.js test version: link @@ -109,9 +106,10 @@ version: link git ci -m v$(shell npm -v) publish: link doc - git tag -d v$(shell npm -v) || true - git push origin :v$(shell npm -v) || true - npm unpublish npm@$(shell npm -v) || true + @git tag -d v$(shell npm -v) || true + @git push origin :v$(shell npm -v) || true + @npm unpublish npm@$(shell npm -v) || true + git clean -fd git tag -s -m v$(shell npm -v) v$(shell npm -v) &&\ git push origin --tags &&\ npm publish &&\ diff --git a/deps/npm/bin/npm b/deps/npm/bin/npm new file mode 100755 index 0000000000..5fbcd3b035 --- /dev/null +++ b/deps/npm/bin/npm @@ -0,0 +1,6 @@ +#!/bin/sh +if [ -x "`dirname "$0"`/node.exe" ]; then + "`dirname "$0"`/node.exe" "`dirname "$0"`/node_modules/npm/bin/npm-cli.js" "$@" +else + node "`dirname "$0"`/node_modules/npm/bin/npm-cli.js" "$@" +fi diff --git a/deps/npm/bin/npm-g.cmd b/deps/npm/bin/npm-g.cmd deleted file mode 100644 index bac9e5f1c4..0000000000 --- a/deps/npm/bin/npm-g.cmd +++ /dev/null @@ -1,6 +0,0 @@ -:: Created by npm, please don't edit manually. -@IF EXIST "%~dp0"\"node.exe" ( - "%~dp0"\"node.exe" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %* -) ELSE ( - node "%~dp0\.\node_modules\npm\bin\npm-cli.js" %* -) \ No newline at end of file diff --git a/deps/npm/bin/npm_g.cmd b/deps/npm/bin/npm_g.cmd deleted file mode 100644 index bac9e5f1c4..0000000000 --- a/deps/npm/bin/npm_g.cmd +++ /dev/null @@ -1,6 +0,0 @@ -:: Created by npm, please don't edit manually. -@IF EXIST "%~dp0"\"node.exe" ( - "%~dp0"\"node.exe" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %* -) ELSE ( - node "%~dp0\.\node_modules\npm\bin\npm-cli.js" %* -) \ No newline at end of file diff --git a/deps/npm/doc/cli/config.md b/deps/npm/doc/cli/config.md index e70acc258a..2c6ca26c02 100644 --- a/deps/npm/doc/cli/config.md +++ b/deps/npm/doc/cli/config.md @@ -101,6 +101,7 @@ The following shorthands are parsed on the command-line: * `-v`: `--version` * `-h`, `-?`, `--help`, `-H`: `--usage` * `-s`, `--silent`: `--loglevel silent` +* `-q`, `--quiet`: `--loglevel warn` * `-d`: `--loglevel info` * `-dd`, `--verbose`: `--loglevel verbose` * `-ddd`: `--loglevel silly` @@ -278,6 +279,15 @@ Makes various commands more forceful. * skips cache when requesting from the registry. * prevents checks against clobbering non-npm files. +### git + +* Default: `"git"` +* Type: String + +The command to use for git commands. If git is installed on the +computer, but is not in the `PATH`, then set this to the full path to +the git binary. + ### global * Default: false diff --git a/deps/npm/html/api/bin.html b/deps/npm/html/api/bin.html index a5bd3325c4..c4392671df 100644 --- a/deps/npm/html/api/bin.html +++ b/deps/npm/html/api/bin.html @@ -19,7 +19,7 @@

This function should not be used programmatically. Instead, just refer to the npm.bin member.

- +