From 849fcdeca05a67e656f9f2c82eef194ff6f97231 Mon Sep 17 00:00:00 2001 From: Vladimir Kurchatkin Date: Tue, 28 Oct 2014 15:32:07 +0300 Subject: [PATCH 01/91] smalloc: fix copyOnto optimization copyOnto is broken when one argument has 1 byte size and the other > 1 byte. PR-URL: https://github.com/joyent/node/pull/8637 Reviewed-by: Trevor Norris --- src/smalloc.cc | 2 +- test/simple/test-smalloc.js | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/smalloc.cc b/src/smalloc.cc index 41298030ce1c25..c7913d90ff849a 100644 --- a/src/smalloc.cc +++ b/src/smalloc.cc @@ -207,7 +207,7 @@ void CopyOnto(const FunctionCallbackInfo& args) { size_t dest_size = ExternalArraySize(dest_type); // optimization for Uint8 arrays (i.e. Buffers) - if (source_size != 1 && dest_size != 1) { + if (source_size != 1 || dest_size != 1) { if (source_size == 0) return env->ThrowTypeError("unknown source external array type"); if (dest_size == 0) diff --git a/test/simple/test-smalloc.js b/test/simple/test-smalloc.js index be7e7ac32639f5..ea6f7bf4ad1477 100644 --- a/test/simple/test-smalloc.js +++ b/test/simple/test-smalloc.js @@ -161,6 +161,20 @@ if (os.endianness() === 'LE') { copyOnto(c, 0, b, 0, 2); assert.equal(b[0], 0.1); +var b = alloc(1, Types.Uint16); +var c = alloc(2, Types.Uint8); +c[0] = c[1] = 0xff; +copyOnto(c, 0, b, 0, 2); +assert.equal(b[0], 0xffff); + +var b = alloc(2, Types.Uint8); +var c = alloc(1, Types.Uint16); +c[0] = 0xffff; +copyOnto(c, 0, b, 0, 1); +assert.equal(b[0], 0xff); +assert.equal(b[1], 0xff); + + // verify checking external if has external memory From 59010135be9da6f90e7b4a3620f379bc170015a3 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Thu, 16 Oct 2014 23:14:45 +0200 Subject: [PATCH 02/91] src: make root_certs const Make the root_certs global fully const. As a side effect, that moves it from the .data section to the .rodata section. Makes it a little easier to reason about the remaining globals. --- src/node_crypto.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 5c378c4744c02c..90ec7e4f506353 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -110,7 +110,7 @@ struct ClearErrorOnReturn { static uv_rwlock_t* locks; -const char* root_certs[] = { +const char* const root_certs[] = { #include "node_root_certs.h" // NOLINT(build/include_order) nullptr }; From 29d7fd6bb85faa3b82218f343adf2e9fd1ed6aa8 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Mon, 3 Nov 2014 12:03:34 +0100 Subject: [PATCH 03/91] src: move debug agent from deps/ to src/ There is not much point in keeping it a separate project because it doesn't build standalone, plus it makes applying changes to core more difficult because of the implicit dependency on header files in src/. --- Makefile.build | 1 - deps/debugger-agent/debugger-agent.gyp | 24 ------- deps/debugger-agent/src/agent.h | 64 ------------------- .../_debugger_agent.js => lib/_debug_agent.js | 0 node.gyp | 5 +- .../src/agent.cc => src/debug-agent.cc | 3 +- .../debugger-agent.h => src/debug-agent.h | 44 ++++++++++--- src/env.h | 2 +- src/node.js | 2 +- 9 files changed, 42 insertions(+), 103 deletions(-) delete mode 100644 deps/debugger-agent/debugger-agent.gyp delete mode 100644 deps/debugger-agent/src/agent.h rename deps/debugger-agent/lib/_debugger_agent.js => lib/_debug_agent.js (100%) rename deps/debugger-agent/src/agent.cc => src/debug-agent.cc (99%) rename deps/debugger-agent/include/debugger-agent.h => src/debug-agent.h (79%) diff --git a/Makefile.build b/Makefile.build index 1aa5f56515d630..dad86cb517a9e6 100644 --- a/Makefile.build +++ b/Makefile.build @@ -233,7 +233,6 @@ NACL_ARCHES = nacl_ia32 nacl_x64 GYPFILES = \ common.gypi \ deps/cares/cares.gyp \ - deps/debugger-agent/debugger-agent.gyp \ deps/http_parser/http_parser.gyp \ deps/openssl/openssl.gyp \ deps/uv/uv.gyp \ diff --git a/deps/debugger-agent/debugger-agent.gyp b/deps/debugger-agent/debugger-agent.gyp deleted file mode 100644 index e98206849ab1aa..00000000000000 --- a/deps/debugger-agent/debugger-agent.gyp +++ /dev/null @@ -1,24 +0,0 @@ -{ - "targets": [{ - "target_name": "debugger-agent", - "type": "<(library)", - "include_dirs": [ - "src", - "include", - "../v8/include", - "../uv/include", - - # Private node.js folder and stuff needed to include from it - "../../src", - "../cares/include", - ], - "direct_dependent_settings": { - "include_dirs": [ - "include", - ], - }, - "sources": [ - "src/agent.cc", - ], - }], -} diff --git a/deps/debugger-agent/src/agent.h b/deps/debugger-agent/src/agent.h deleted file mode 100644 index 82db5e5e181d6a..00000000000000 --- a/deps/debugger-agent/src/agent.h +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright Fedor Indutny and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -#ifndef DEPS_DEBUGGER_AGENT_SRC_AGENT_H_ -#define DEPS_DEBUGGER_AGENT_SRC_AGENT_H_ - -#include "v8.h" -#include "v8-debug.h" -#include "queue.h" - -#include -#include - -namespace node { -namespace debugger { - -class AgentMessage { - public: - AgentMessage(uint16_t* val, int length) : length_(length) { - if (val == NULL) { - data_ = val; - } else { - data_ = new uint16_t[length]; - memcpy(data_, val, length * sizeof(*data_)); - } - } - - ~AgentMessage() { - delete[] data_; - data_ = NULL; - } - - inline const uint16_t* data() const { return data_; } - inline int length() const { return length_; } - - QUEUE member; - - private: - uint16_t* data_; - int length_; -}; - -} // namespace debugger -} // namespace node - -#endif // DEPS_DEBUGGER_AGENT_SRC_AGENT_H_ diff --git a/deps/debugger-agent/lib/_debugger_agent.js b/lib/_debug_agent.js similarity index 100% rename from deps/debugger-agent/lib/_debugger_agent.js rename to lib/_debug_agent.js diff --git a/node.gyp b/node.gyp index b1dc5f2ecac13f..21391e0e3bd359 100644 --- a/node.gyp +++ b/node.gyp @@ -16,6 +16,7 @@ 'node_v8_options%': '', 'library_files': [ 'src/node.js', + 'lib/_debug_agent.js', 'lib/_debugger.js', 'lib/_linklist.js', 'lib/assert.js', @@ -67,7 +68,6 @@ 'lib/util.js', 'lib/vm.js', 'lib/zlib.js', - 'deps/debugger-agent/lib/_debugger_agent.js', ], }, @@ -78,7 +78,6 @@ 'dependencies': [ 'node_js2c#host', - 'deps/debugger-agent/debugger-agent.gyp:debugger-agent', ], 'include_dirs': [ @@ -89,6 +88,7 @@ ], 'sources': [ + 'src/debug-agent.cc', 'src/fs_event_wrap.cc', 'src/cares_wrap.cc', 'src/handle_wrap.cc', @@ -124,6 +124,7 @@ 'src/async-wrap-inl.h', 'src/base-object.h', 'src/base-object-inl.h', + 'src/debug-agent.h', 'src/env.h', 'src/env-inl.h', 'src/handle_wrap.h', diff --git a/deps/debugger-agent/src/agent.cc b/src/debug-agent.cc similarity index 99% rename from deps/debugger-agent/src/agent.cc rename to src/debug-agent.cc index 335737ffe9e33f..78362afe96a86c 100644 --- a/deps/debugger-agent/src/agent.cc +++ b/src/debug-agent.cc @@ -19,8 +19,7 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#include "agent.h" -#include "debugger-agent.h" +#include "debug-agent.h" #include "node.h" #include "node_internals.h" // ARRAY_SIZE diff --git a/deps/debugger-agent/include/debugger-agent.h b/src/debug-agent.h similarity index 79% rename from deps/debugger-agent/include/debugger-agent.h rename to src/debug-agent.h index 762a687a0a071c..d3c7fcc382db19 100644 --- a/deps/debugger-agent/include/debugger-agent.h +++ b/src/debug-agent.h @@ -19,21 +19,24 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -#ifndef DEPS_DEBUGGER_AGENT_INCLUDE_DEBUGGER_AGENT_H_ -#define DEPS_DEBUGGER_AGENT_INCLUDE_DEBUGGER_AGENT_H_ +#ifndef SRC_DEBUG_AGENT_H_ +#define SRC_DEBUG_AGENT_H_ #include "uv.h" #include "v8.h" #include "v8-debug.h" +#include "queue.h" -namespace node { +#include -// Forward declaration +// Forward declaration to break recursive dependency chain with src/env.h. +namespace node { class Environment; +} // namespace node +namespace node { namespace debugger { -// Forward declaration class AgentMessage; class Agent { @@ -97,13 +100,38 @@ class Agent { uv_loop_t child_loop_; v8::Persistent api_; - // QUEUE - void* messages_[2]; + QUEUE messages_; DispatchHandler dispatch_handler_; }; +class AgentMessage { + public: + AgentMessage(uint16_t* val, int length) : length_(length) { + if (val == NULL) { + data_ = val; + } else { + data_ = new uint16_t[length]; + memcpy(data_, val, length * sizeof(*data_)); + } + } + + ~AgentMessage() { + delete[] data_; + data_ = NULL; + } + + inline const uint16_t* data() const { return data_; } + inline int length() const { return length_; } + + QUEUE member; + + private: + uint16_t* data_; + int length_; +}; + } // namespace debugger } // namespace node -#endif // DEPS_DEBUGGER_AGENT_INCLUDE_DEBUGGER_AGENT_H_ +#endif // SRC_DEBUG_AGENT_H_ diff --git a/src/env.h b/src/env.h index 77dbf33c86d147..5eac220ea16604 100644 --- a/src/env.h +++ b/src/env.h @@ -23,12 +23,12 @@ #define SRC_ENV_H_ #include "ares.h" +#include "debug-agent.h" #include "tree.h" #include "util.h" #include "uv.h" #include "v8.h" #include "queue.h" -#include "debugger-agent.h" #include diff --git a/src/node.js b/src/node.js index 19d9506446876e..0a82088893d1b9 100644 --- a/src/node.js +++ b/src/node.js @@ -85,7 +85,7 @@ } else if (process.argv[1] == '--debug-agent') { // Start the debugger agent - var d = NativeModule.require('_debugger_agent'); + var d = NativeModule.require('_debug_agent'); d.start(); } else if (process._eval != null) { From 084f3829ad65763ecb78bcd2e99d62f8307aaa54 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Mon, 3 Nov 2014 12:15:52 +0100 Subject: [PATCH 04/91] src: clean up root_certs iteration Drop the trailing nullptr and use ARRAY_SIZE. --- src/node_crypto.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 90ec7e4f506353..e4674a33be962c 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -112,7 +112,6 @@ static uv_rwlock_t* locks; const char* const root_certs[] = { #include "node_root_certs.h" // NOLINT(build/include_order) - nullptr }; X509_STORE* root_cert_store; @@ -670,7 +669,7 @@ void SecureContext::AddRootCerts(const FunctionCallbackInfo& args) { if (!root_cert_store) { root_cert_store = X509_STORE_new(); - for (int i = 0; root_certs[i]; i++) { + for (size_t i = 0; i < ARRAY_SIZE(root_certs); i++) { BIO* bp = NodeBIO::New(); if (!BIO_write(bp, root_certs[i], strlen(root_certs[i]))) { From b1dcaadb0e013daee866995c6be48841dbcf4af3 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Mon, 3 Nov 2014 13:19:17 +0100 Subject: [PATCH 05/91] src: replace NULL with nullptr in debug agent Update the debug agent to conform to the code style in src/. --- src/debug-agent.cc | 22 +++++++++++----------- src/debug-agent.h | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/debug-agent.cc b/src/debug-agent.cc index 78362afe96a86c..955adc6255bef6 100644 --- a/src/debug-agent.cc +++ b/src/debug-agent.cc @@ -55,8 +55,8 @@ Agent::Agent(Environment* env) : state_(kNone), port_(5858), wait_(false), parent_env_(env), - child_env_(NULL), - dispatch_handler_(NULL) { + child_env_(nullptr), + dispatch_handler_(nullptr) { int err; err = uv_sem_init(&start_sem_, 0); @@ -117,7 +117,7 @@ bool Agent::Start(int port, bool wait) { return true; thread_create_failed: - uv_close(reinterpret_cast(&child_signal_), NULL); + uv_close(reinterpret_cast(&child_signal_), nullptr); async_init_failed: err = uv_loop_close(&child_loop_); @@ -144,10 +144,10 @@ void Agent::Stop() { return; } - v8::Debug::SetMessageHandler(NULL); + v8::Debug::SetMessageHandler(nullptr); // Send empty message to terminate things - EnqueueMessage(new AgentMessage(NULL, 0)); + EnqueueMessage(new AgentMessage(nullptr, 0)); // Signal worker thread to make it stop err = uv_async_send(&child_signal_); @@ -156,7 +156,7 @@ void Agent::Stop() { err = uv_thread_join(&thread_); CHECK_EQ(err, 0); - uv_close(reinterpret_cast(&child_signal_), NULL); + uv_close(reinterpret_cast(&child_signal_), nullptr); uv_run(&child_loop_, UV_RUN_NOWAIT); err = uv_loop_close(&child_loop_); @@ -202,7 +202,7 @@ void Agent::WorkerRun() { env->CleanupHandles(); env->Dispose(); - env = NULL; + env = nullptr; } isolate->Dispose(); } @@ -263,7 +263,7 @@ void Agent::SendCommand(const FunctionCallbackInfo& args) { String::Value v(args[0]); v8::Debug::SendCommand(a->parent_env()->isolate(), *v, v.length()); - if (a->dispatch_handler_ != NULL) + if (a->dispatch_handler_ != nullptr) a->dispatch_handler_(a->parent_env()); } @@ -286,11 +286,11 @@ void Agent::ChildSignalCb(uv_async_t* signal) { AgentMessage* msg = ContainerOf(&AgentMessage::member, q); // Time to close everything - if (msg->data() == NULL) { + if (msg->data() == nullptr) { QUEUE_REMOVE(q); delete msg; - MakeCallback(isolate, api, "onclose", 0, NULL); + MakeCallback(isolate, api, "onclose", 0, nullptr); break; } @@ -331,7 +331,7 @@ void Agent::MessageHandler(const v8::Debug::Message& message) { Isolate* isolate = message.GetIsolate(); Environment* env = Environment::GetCurrent(isolate); Agent* a = env->debugger_agent(); - CHECK_NE(a, NULL); + CHECK_NE(a, nullptr); CHECK_EQ(isolate, a->parent_env()->isolate()); HandleScope scope(isolate); diff --git a/src/debug-agent.h b/src/debug-agent.h index d3c7fcc382db19..616fa9ff0d49bd 100644 --- a/src/debug-agent.h +++ b/src/debug-agent.h @@ -108,7 +108,7 @@ class Agent { class AgentMessage { public: AgentMessage(uint16_t* val, int length) : length_(length) { - if (val == NULL) { + if (val == nullptr) { data_ = val; } else { data_ = new uint16_t[length]; @@ -118,7 +118,7 @@ class AgentMessage { ~AgentMessage() { delete[] data_; - data_ = NULL; + data_ = nullptr; } inline const uint16_t* data() const { return data_; } From ef46ca61b5e0acd6c05860ae70d75651296ea260 Mon Sep 17 00:00:00 2001 From: Fedor Indutny Date: Tue, 4 Nov 2014 00:08:41 -0500 Subject: [PATCH 06/91] node: do not crash on IPC stdin When started with IPC pipe on fd=0 child process should not crash when referencing or using `process.stdin`. fix joyent/node#8669 PR-URL: https://github.com/node-forward/node/pull/45 Reviewed-By: Ben Noorhduis --- src/node.js | 23 ++++++++--- test/simple/test-child-process-stdin-ipc.js | 44 +++++++++++++++++++++ 2 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 test/simple/test-child-process-stdin-ipc.js diff --git a/src/node.js b/src/node.js index 0a82088893d1b9..fe2edabe830847 100644 --- a/src/node.js +++ b/src/node.js @@ -582,11 +582,24 @@ case 'PIPE': case 'TCP': var net = NativeModule.require('net'); - stdin = new net.Socket({ - fd: fd, - readable: true, - writable: false - }); + + // It could be that process has been started with an IPC channel + // sitting on fd=0, in such case the pipe for this fd is already + // present and creating a new one will lead to the assertion failure + // in libuv. + if (process._channel && process._channel.fd === fd) { + stdin = new net.Socket({ + handle: process._channel, + readable: true, + writable: false + }); + } else { + stdin = new net.Socket({ + fd: fd, + readable: true, + writable: false + }); + } break; default: diff --git a/test/simple/test-child-process-stdin-ipc.js b/test/simple/test-child-process-stdin-ipc.js new file mode 100644 index 00000000000000..cd6a921d005b5b --- /dev/null +++ b/test/simple/test-child-process-stdin-ipc.js @@ -0,0 +1,44 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +var common = require('../common'); +var assert = require('assert'); + +var spawn = require('child_process').spawn; + +if (process.argv[2] === 'child') { + // Just reference stdin, it should start it + process.stdin; + return; +} + +var proc = spawn(process.execPath, [__filename, 'child'], { + stdio: ['ipc', 'inherit', 'inherit'] +}); + +var childCode = -1; +proc.on('exit', function(code) { + childCode = code; +}); + +process.on('exit', function() { + assert.equal(childCode, 0); +}); From 7ab73ff735b26207c99b4259c4fd7c1aa8c23643 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Tue, 4 Nov 2014 17:57:11 +1000 Subject: [PATCH 07/91] windows: fix process description to say "Node.js" Newer incarnations of the task manager only show the description, not even the product name. PR-URL: https://github.com/node-forward/node/pull/46 Reviewed-By: Colin Ihrig Reviewed-By: Ben Noordhuis --- src/res/node.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/res/node.rc b/src/res/node.rc index 0bdb2a0dc74f90..90836d7375fe24 100644 --- a/src/res/node.rc +++ b/src/res/node.rc @@ -52,7 +52,7 @@ BEGIN BEGIN VALUE "CompanyName", "Joyent, Inc" VALUE "ProductName", "Node.js" - VALUE "FileDescription", "Evented I/O for V8 JavaScript" + VALUE "FileDescription", "Node.js: Evented I/O for V8 JavaScript" VALUE "FileVersion", NODE_VERSION_STRING VALUE "ProductVersion", NODE_VERSION_STRING VALUE "OriginalFilename", "node.exe" From f65a5cbcde51ef7da0ff5617dcab1a164b9a217b Mon Sep 17 00:00:00 2001 From: Vladimir Kurchatkin Date: Sat, 1 Nov 2014 01:15:12 +0300 Subject: [PATCH 08/91] smalloc: check if obj has external data PR-URL: https://github.com/joyent/node/pull/8655 Reviewed-by: Trevor Norris --- lib/smalloc.js | 2 ++ test/simple/test-smalloc.js | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/smalloc.js b/lib/smalloc.js index ba042c6c4c5ba1..fd82ba8c42a4f1 100644 --- a/lib/smalloc.js +++ b/lib/smalloc.js @@ -86,6 +86,8 @@ function dispose(obj) { throw new TypeError('obj must be an Object'); if (util.isBuffer(obj)) throw new TypeError('obj cannot be a Buffer'); + if (!smalloc.hasExternalData(obj)) + throw new Error('obj has no external array data'); smalloc.dispose(obj); } diff --git a/test/simple/test-smalloc.js b/test/simple/test-smalloc.js index ea6f7bf4ad1477..091f5aa7e08e6d 100644 --- a/test/simple/test-smalloc.js +++ b/test/simple/test-smalloc.js @@ -314,11 +314,15 @@ for (var i = 0; i < 5; i++) // only allow object to be passed to dispose assert.throws(function() { - alloc.dispose(null); + smalloc.dispose(null); }); // can't dispose a Buffer assert.throws(function() { - alloc.dispose(new Buffer()); + smalloc.dispose(new Buffer()); +}); + +assert.throws(function() { + smalloc.dispose({}); }); From 3589a62104eac1daae782ab479bec09f4df4dc9a Mon Sep 17 00:00:00 2001 From: Julien Gilli Date: Thu, 9 Oct 2014 13:01:27 -0700 Subject: [PATCH 09/91] build: fix build for SmartOS This change in V8: https://code.google.com/p/v8/source/detail?r=22210 has introduced a method named OS::GetCurrentThreadId which fails to compile on OSes where a "gettid" syscall does not exist. This build issue has been fixed upstream by several changes: - https://code.google.com/p/v8/source/detail?r=23459. - https://codereview.chromium.org/649553002 - https://codereview.chromium.org/642223003 Another minor fix to the upstream changes was also necessary. See https://code.google.com/p/v8/issues/detail?id=3620 for more information. The other build issue was due to the fact that alloca.h is not included by other system includes on SmartOS, which is assumed by V8. Built and tested on Linux, MacOS X, Windows and SmartOS. --- deps/v8/src/base/platform/platform-posix.cc | 10 +++++++--- deps/v8/src/base/platform/platform.h | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/deps/v8/src/base/platform/platform-posix.cc b/deps/v8/src/base/platform/platform-posix.cc index 252d2137552997..771634e24e9554 100644 --- a/deps/v8/src/base/platform/platform-posix.cc +++ b/deps/v8/src/base/platform/platform-posix.cc @@ -321,11 +321,15 @@ int OS::GetCurrentProcessId() { int OS::GetCurrentThreadId() { -#if defined(ANDROID) +#if V8_OS_MACOSX + return static_cast(pthread_mach_thread_np(pthread_self())); +#elif V8_OS_LINUX return static_cast(syscall(__NR_gettid)); +#elif V8_OS_ANDROID + return static_cast(gettid()); #else - return static_cast(syscall(SYS_gettid)); -#endif // defined(ANDROID) + return static_cast(pthread_self()); +#endif } diff --git a/deps/v8/src/base/platform/platform.h b/deps/v8/src/base/platform/platform.h index 8a5412626857af..9567572d800356 100644 --- a/deps/v8/src/base/platform/platform.h +++ b/deps/v8/src/base/platform/platform.h @@ -35,6 +35,7 @@ namespace std { int signbit(double x); } # endif +#include #endif #if V8_OS_QNX From 272aa589af50566a20a491910d4dc40bb3692102 Mon Sep 17 00:00:00 2001 From: Forrest L Norvell Date: Tue, 23 Sep 2014 18:59:35 -0700 Subject: [PATCH 10/91] test: more thorough tests for npm --- Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a42d3920736057..f84c2134499944 100644 --- a/Makefile +++ b/Makefile @@ -147,7 +147,19 @@ test-debugger: all $(PYTHON) tools/test.py debugger test-npm: node - ./node deps/npm/test/run.js + rm -rf npm-cache npm-tmp npm-prefix + mkdir npm-cache npm-tmp npm-prefix + cd deps/npm ; npm_config_cache="$(shell pwd)/npm-cache" \ + npm_config_prefix="$(shell pwd)/npm-prefix" \ + npm_config_tmp="$(shell pwd)/npm-tmp" \ + ../../node cli.js install + cd deps/npm ; npm_config_cache="$(shell pwd)/npm-cache" \ + npm_config_prefix="$(shell pwd)/npm-prefix" \ + npm_config_tmp="$(shell pwd)/npm-tmp" \ + ../../node cli.js run-script test-all && \ + ../../node cli.js prune --prod && \ + cd ../.. && \ + rm -rf npm-cache npm-tmp npm-prefix test-npm-publish: node npm_package_config_publishtest=true ./node deps/npm/test/run.js From 28ae70ebad8debd8aa7b521a693aa3de89ad84d6 Mon Sep 17 00:00:00 2001 From: Timothy J Fontaine Date: Tue, 4 Nov 2014 15:08:12 -0800 Subject: [PATCH 11/91] npm: Upgrade to v2.1.6 --- deps/npm/.eslintrc | 17 + deps/npm/.npmignore | 2 + deps/npm/CHANGELOG.md | 315 ++++ deps/npm/Makefile | 86 +- deps/npm/README.md | 2 +- deps/npm/bin/npm-cli.js | 2 +- deps/npm/doc/api/npm-bin.md | 2 +- deps/npm/doc/api/npm-help-search.md | 2 +- deps/npm/doc/api/npm-load.md | 6 +- deps/npm/doc/api/npm-submodule.md | 28 - deps/npm/doc/api/npm.md | 19 +- deps/npm/doc/cli/npm-adduser.md | 17 +- deps/npm/doc/cli/npm-explore.md | 1 - deps/npm/doc/cli/npm-init.md | 5 +- deps/npm/doc/cli/npm-publish.md | 4 +- deps/npm/doc/cli/npm-restart.md | 7 +- deps/npm/doc/cli/npm-run-script.md | 10 + deps/npm/doc/cli/npm-submodule.md | 28 - deps/npm/doc/files/package.json.md | 69 +- deps/npm/doc/misc/npm-coding-style.md | 2 +- deps/npm/doc/misc/npm-config.md | 32 +- deps/npm/doc/misc/npm-developers.md | 6 +- deps/npm/doc/misc/npm-faq.md | 2 +- deps/npm/doc/misc/npm-index.md | 8 - deps/npm/doc/misc/npm-scope.md | 4 +- deps/npm/doc/misc/npm-scripts.md | 11 +- deps/npm/doc/misc/semver.md | 2 +- deps/npm/html/doc/README.html | 16 +- deps/npm/html/doc/api/npm-bin.html | 4 +- deps/npm/html/doc/api/npm-bugs.html | 2 +- deps/npm/html/doc/api/npm-cache.html | 4 +- deps/npm/html/doc/api/npm-commands.html | 4 +- deps/npm/html/doc/api/npm-config.html | 4 +- deps/npm/html/doc/api/npm-deprecate.html | 8 +- deps/npm/html/doc/api/npm-docs.html | 2 +- deps/npm/html/doc/api/npm-edit.html | 2 +- deps/npm/html/doc/api/npm-explore.html | 2 +- deps/npm/html/doc/api/npm-help-search.html | 4 +- deps/npm/html/doc/api/npm-init.html | 4 +- deps/npm/html/doc/api/npm-install.html | 2 +- deps/npm/html/doc/api/npm-link.html | 2 +- deps/npm/html/doc/api/npm-load.html | 8 +- deps/npm/html/doc/api/npm-ls.html | 2 +- deps/npm/html/doc/api/npm-outdated.html | 2 +- deps/npm/html/doc/api/npm-owner.html | 6 +- deps/npm/html/doc/api/npm-pack.html | 2 +- deps/npm/html/doc/api/npm-prefix.html | 2 +- deps/npm/html/doc/api/npm-prune.html | 2 +- deps/npm/html/doc/api/npm-publish.html | 8 +- deps/npm/html/doc/api/npm-rebuild.html | 2 +- deps/npm/html/doc/api/npm-repo.html | 2 +- deps/npm/html/doc/api/npm-restart.html | 6 +- deps/npm/html/doc/api/npm-root.html | 2 +- deps/npm/html/doc/api/npm-run-script.html | 12 +- deps/npm/html/doc/api/npm-search.html | 2 +- deps/npm/html/doc/api/npm-shrinkwrap.html | 2 +- deps/npm/html/doc/api/npm-start.html | 2 +- deps/npm/html/doc/api/npm-stop.html | 2 +- deps/npm/html/doc/api/npm-submodule.html | 2 +- deps/npm/html/doc/api/npm-tag.html | 2 +- deps/npm/html/doc/api/npm-test.html | 2 +- deps/npm/html/doc/api/npm-uninstall.html | 2 +- deps/npm/html/doc/api/npm-unpublish.html | 2 +- deps/npm/html/doc/api/npm-update.html | 2 +- deps/npm/html/doc/api/npm-version.html | 2 +- deps/npm/html/doc/api/npm-view.html | 2 +- deps/npm/html/doc/api/npm-whoami.html | 2 +- deps/npm/html/doc/api/npm.html | 27 +- deps/npm/html/doc/cli/npm-adduser.html | 32 +- deps/npm/html/doc/cli/npm-bin.html | 14 +- deps/npm/html/doc/cli/npm-bugs.html | 18 +- deps/npm/html/doc/cli/npm-build.html | 10 +- deps/npm/html/doc/cli/npm-bundle.html | 4 +- deps/npm/html/doc/cli/npm-cache.html | 16 +- deps/npm/html/doc/cli/npm-completion.html | 8 +- deps/npm/html/doc/cli/npm-config.html | 16 +- deps/npm/html/doc/cli/npm-dedupe.html | 10 +- deps/npm/html/doc/cli/npm-deprecate.html | 6 +- deps/npm/html/doc/cli/npm-docs.html | 16 +- deps/npm/html/doc/cli/npm-edit.html | 16 +- deps/npm/html/doc/cli/npm-explore.html | 13 +- deps/npm/html/doc/cli/npm-help-search.html | 8 +- deps/npm/html/doc/cli/npm-help.html | 22 +- deps/npm/html/doc/cli/npm-init.html | 10 +- deps/npm/html/doc/cli/npm-install.html | 44 +- deps/npm/html/doc/cli/npm-link.html | 24 +- deps/npm/html/doc/cli/npm-ls.html | 22 +- deps/npm/html/doc/cli/npm-outdated.html | 8 +- deps/npm/html/doc/cli/npm-owner.html | 10 +- deps/npm/html/doc/cli/npm-pack.html | 12 +- deps/npm/html/doc/cli/npm-prefix.html | 16 +- deps/npm/html/doc/cli/npm-prune.html | 8 +- deps/npm/html/doc/cli/npm-publish.html | 22 +- deps/npm/html/doc/cli/npm-rebuild.html | 6 +- deps/npm/html/doc/cli/npm-repo.html | 6 +- deps/npm/html/doc/cli/npm-restart.html | 18 +- deps/npm/html/doc/cli/npm-rm.html | 14 +- deps/npm/html/doc/cli/npm-root.html | 14 +- deps/npm/html/doc/cli/npm-run-script.html | 19 +- deps/npm/html/doc/cli/npm-search.html | 12 +- deps/npm/html/doc/cli/npm-shrinkwrap.html | 10 +- deps/npm/html/doc/cli/npm-star.html | 8 +- deps/npm/html/doc/cli/npm-stars.html | 10 +- deps/npm/html/doc/cli/npm-start.html | 12 +- deps/npm/html/doc/cli/npm-stop.html | 12 +- deps/npm/html/doc/cli/npm-submodule.html | 4 +- deps/npm/html/doc/cli/npm-tag.html | 16 +- deps/npm/html/doc/cli/npm-test.html | 12 +- deps/npm/html/doc/cli/npm-uninstall.html | 16 +- deps/npm/html/doc/cli/npm-unpublish.html | 14 +- deps/npm/html/doc/cli/npm-update.html | 12 +- deps/npm/html/doc/cli/npm-version.html | 8 +- deps/npm/html/doc/cli/npm-view.html | 16 +- deps/npm/html/doc/cli/npm-whoami.html | 10 +- deps/npm/html/doc/cli/npm.html | 40 +- deps/npm/html/doc/files/npm-folders.html | 26 +- deps/npm/html/doc/files/npm-global.html | 30 +- deps/npm/html/doc/files/npm-json.html | 115 +- deps/npm/html/doc/files/npmrc.html | 14 +- deps/npm/html/doc/files/package.json.html | 111 +- deps/npm/html/doc/index.html | 208 ++- deps/npm/html/doc/misc/npm-coding-style.html | 12 +- deps/npm/html/doc/misc/npm-config.html | 62 +- deps/npm/html/doc/misc/npm-developers.html | 36 +- deps/npm/html/doc/misc/npm-disputes.html | 12 +- deps/npm/html/doc/misc/npm-faq.html | 34 +- deps/npm/html/doc/misc/npm-index.html | 206 ++- deps/npm/html/doc/misc/npm-registry.html | 20 +- deps/npm/html/doc/misc/npm-scope.html | 12 +- deps/npm/html/doc/misc/npm-scripts.html | 23 +- deps/npm/html/doc/misc/removing-npm.html | 10 +- deps/npm/html/doc/misc/semver.html | 4 +- deps/npm/html/partial/doc/README.html | 166 ++ deps/npm/html/partial/doc/api/npm-bin.html | 8 + deps/npm/html/partial/doc/api/npm-bugs.html | 13 + deps/npm/html/partial/doc/api/npm-cache.html | 22 + .../html/partial/doc/api/npm-commands.html | 16 + deps/npm/html/partial/doc/api/npm-config.html | 37 + .../html/partial/doc/api/npm-deprecate.html | 27 + deps/npm/html/partial/doc/api/npm-docs.html | 13 + deps/npm/html/partial/doc/api/npm-edit.html | 16 + .../npm/html/partial/doc/api/npm-explore.html | 11 + .../html/partial/doc/api/npm-help-search.html | 24 + deps/npm/html/partial/doc/api/npm-init.html | 19 + .../npm/html/partial/doc/api/npm-install.html | 12 + deps/npm/html/partial/doc/api/npm-link.html | 22 + deps/npm/html/partial/doc/api/npm-load.html | 17 + deps/npm/html/partial/doc/api/npm-ls.html | 43 + .../html/partial/doc/api/npm-outdated.html | 8 + deps/npm/html/partial/doc/api/npm-owner.html | 27 + deps/npm/html/partial/doc/api/npm-pack.html | 13 + deps/npm/html/partial/doc/api/npm-prefix.html | 9 + deps/npm/html/partial/doc/api/npm-prune.html | 10 + .../npm/html/partial/doc/api/npm-publish.html | 26 + .../npm/html/partial/doc/api/npm-rebuild.html | 10 + deps/npm/html/partial/doc/api/npm-repo.html | 13 + .../npm/html/partial/doc/api/npm-restart.html | 16 + deps/npm/html/partial/doc/api/npm-root.html | 9 + .../html/partial/doc/api/npm-run-script.html | 21 + deps/npm/html/partial/doc/api/npm-search.html | 33 + .../html/partial/doc/api/npm-shrinkwrap.html | 13 + deps/npm/html/partial/doc/api/npm-start.html | 8 + deps/npm/html/partial/doc/api/npm-stop.html | 8 + .../html/partial/doc/api/npm-submodule.html | 22 + deps/npm/html/partial/doc/api/npm-tag.html | 16 + deps/npm/html/partial/doc/api/npm-test.html | 10 + .../html/partial/doc/api/npm-uninstall.html | 10 + .../html/partial/doc/api/npm-unpublish.html | 13 + deps/npm/html/partial/doc/api/npm-update.html | 7 + .../npm/html/partial/doc/api/npm-version.html | 12 + deps/npm/html/partial/doc/api/npm-view.html | 61 + deps/npm/html/partial/doc/api/npm-whoami.html | 9 + deps/npm/html/partial/doc/api/npm.html | 89 + .../npm/html/partial/doc/cli/npm-adduser.html | 47 + deps/npm/html/partial/doc/cli/npm-bin.html | 15 + deps/npm/html/partial/doc/cli/npm-bugs.html | 34 + deps/npm/html/partial/doc/cli/npm-build.html | 18 + deps/npm/html/partial/doc/cli/npm-bundle.html | 11 + deps/npm/html/partial/doc/cli/npm-cache.html | 61 + .../html/partial/doc/cli/npm-completion.html | 22 + deps/npm/html/partial/doc/cli/npm-config.html | 46 + deps/npm/html/partial/doc/cli/npm-dedupe.html | 43 + .../html/partial/doc/cli/npm-deprecate.html | 18 + deps/npm/html/partial/doc/cli/npm-docs.html | 36 + deps/npm/html/partial/doc/cli/npm-edit.html | 29 + .../npm/html/partial/doc/cli/npm-explore.html | 29 + .../html/partial/doc/cli/npm-help-search.html | 26 + deps/npm/html/partial/doc/cli/npm-help.html | 32 + deps/npm/html/partial/doc/cli/npm-init.html | 20 + .../npm/html/partial/doc/cli/npm-install.html | 219 +++ deps/npm/html/partial/doc/cli/npm-link.html | 51 + deps/npm/html/partial/doc/cli/npm-ls.html | 65 + .../html/partial/doc/cli/npm-outdated.html | 47 + deps/npm/html/partial/doc/cli/npm-owner.html | 29 + deps/npm/html/partial/doc/cli/npm-pack.html | 21 + deps/npm/html/partial/doc/cli/npm-prefix.html | 18 + deps/npm/html/partial/doc/cli/npm-prune.html | 19 + .../npm/html/partial/doc/cli/npm-publish.html | 39 + .../npm/html/partial/doc/cli/npm-rebuild.html | 18 + deps/npm/html/partial/doc/cli/npm-repo.html | 22 + .../npm/html/partial/doc/cli/npm-restart.html | 15 + deps/npm/html/partial/doc/cli/npm-rm.html | 19 + deps/npm/html/partial/doc/cli/npm-root.html | 15 + .../html/partial/doc/cli/npm-run-script.html | 27 + deps/npm/html/partial/doc/cli/npm-search.html | 29 + .../html/partial/doc/cli/npm-shrinkwrap.html | 144 ++ deps/npm/html/partial/doc/cli/npm-star.html | 16 + deps/npm/html/partial/doc/cli/npm-stars.html | 17 + deps/npm/html/partial/doc/cli/npm-start.html | 14 + deps/npm/html/partial/doc/cli/npm-stop.html | 14 + .../html/partial/doc/cli/npm-submodule.html | 22 + deps/npm/html/partial/doc/cli/npm-tag.html | 24 + deps/npm/html/partial/doc/cli/npm-test.html | 17 + .../html/partial/doc/cli/npm-uninstall.html | 37 + .../html/partial/doc/cli/npm-unpublish.html | 27 + deps/npm/html/partial/doc/cli/npm-update.html | 20 + .../npm/html/partial/doc/cli/npm-version.html | 35 + deps/npm/html/partial/doc/cli/npm-view.html | 62 + deps/npm/html/partial/doc/cli/npm-whoami.html | 13 + deps/npm/html/partial/doc/cli/npm.html | 134 ++ .../html/partial/doc/files/npm-folders.html | 164 ++ .../html/partial/doc/files/npm-global.html | 164 ++ deps/npm/html/partial/doc/files/npm-json.html | 465 +++++ deps/npm/html/partial/doc/files/npmrc.html | 53 + .../html/partial/doc/files/package.json.html | 465 +++++ deps/npm/html/partial/doc/index.html | 210 +++ .../partial/doc/misc/npm-coding-style.html | 127 ++ .../npm/html/partial/doc/misc/npm-config.html | 739 ++++++++ .../html/partial/doc/misc/npm-developers.html | 161 ++ .../html/partial/doc/misc/npm-disputes.html | 92 + deps/npm/html/partial/doc/misc/npm-faq.html | 264 +++ deps/npm/html/partial/doc/misc/npm-index.html | 210 +++ .../html/partial/doc/misc/npm-registry.html | 50 + deps/npm/html/partial/doc/misc/npm-scope.html | 58 + .../html/partial/doc/misc/npm-scripts.html | 200 +++ .../html/partial/doc/misc/removing-npm.html | 37 + deps/npm/html/partial/doc/misc/semver.html | 243 +++ deps/npm/lib/adduser.js | 7 +- deps/npm/lib/build.js | 24 +- deps/npm/lib/cache.js | 112 +- deps/npm/lib/cache/add-local-tarball.js | 192 +-- deps/npm/lib/cache/add-local.js | 90 +- deps/npm/lib/cache/add-named.js | 106 +- deps/npm/lib/cache/add-remote-git.js | 68 +- deps/npm/lib/cache/add-remote-tarball.js | 34 +- deps/npm/lib/cache/cached-package-root.js | 14 + deps/npm/lib/cache/get-stat.js | 7 +- deps/npm/lib/completion.js | 4 +- deps/npm/lib/config.js | 14 +- .../npmconf/npmconf.js => lib/config/core.js} | 165 +- .../config-defs.js => lib/config/defaults.js} | 32 +- .../npmconf/lib => lib/config}/find-prefix.js | 0 .../config}/get-credentials-by-uri.js | 18 +- .../npmconf/lib => lib/config}/load-cafile.js | 9 +- .../npmconf/lib => lib/config}/load-prefix.js | 8 +- .../npmconf/lib => lib/config}/load-uid.js | 0 .../npmconf/lib => lib/config}/nerf-dart.js | 0 .../config}/set-credentials-by-uri.js | 18 +- .../npmconf/lib => lib/config}/set-user.js | 17 +- deps/npm/lib/explore.js | 2 +- deps/npm/lib/help.js | 16 +- deps/npm/lib/init.js | 40 +- deps/npm/lib/install.js | 235 ++- deps/npm/lib/npm.js | 9 +- deps/npm/lib/pack.js | 13 +- deps/npm/lib/publish.js | 33 +- deps/npm/lib/run-script.js | 33 +- deps/npm/lib/search.js | 2 +- deps/npm/lib/shrinkwrap.js | 3 +- deps/npm/lib/submodule.js | 90 - deps/npm/lib/unbuild.js | 5 +- deps/npm/lib/uninstall.js | 3 +- deps/npm/lib/utils/error-handler.js | 16 +- deps/npm/lib/utils/git.js | 5 + deps/npm/lib/utils/locker.js | 95 +- deps/npm/lib/utils/tar.js | 294 ++-- deps/npm/lib/version.js | 12 +- deps/npm/lib/view.js | 58 +- deps/npm/man/man1/npm-README.1 | 40 +- deps/npm/man/man1/npm-adduser.1 | 30 +- deps/npm/man/man1/npm-bin.1 | 6 +- deps/npm/man/man1/npm-bugs.1 | 6 +- deps/npm/man/man1/npm-build.1 | 6 +- deps/npm/man/man1/npm-bundle.1 | 2 +- deps/npm/man/man1/npm-cache.1 | 6 +- deps/npm/man/man1/npm-completion.1 | 6 +- deps/npm/man/man1/npm-config.1 | 26 +- deps/npm/man/man1/npm-dedupe.1 | 14 +- deps/npm/man/man1/npm-deprecate.1 | 10 +- deps/npm/man/man1/npm-docs.1 | 6 +- deps/npm/man/man1/npm-edit.1 | 6 +- deps/npm/man/man1/npm-explore.1 | 12 +- deps/npm/man/man1/npm-help-search.1 | 6 +- deps/npm/man/man1/npm-help.1 | 6 +- deps/npm/man/man1/npm-init.1 | 11 +- deps/npm/man/man1/npm-install.1 | 70 +- deps/npm/man/man1/npm-link.1 | 22 +- deps/npm/man/man1/npm-ls.1 | 12 +- deps/npm/man/man1/npm-outdated.1 | 6 +- deps/npm/man/man1/npm-owner.1 | 6 +- deps/npm/man/man1/npm-pack.1 | 6 +- deps/npm/man/man1/npm-prefix.1 | 6 +- deps/npm/man/man1/npm-prune.1 | 6 +- deps/npm/man/man1/npm-publish.1 | 10 +- deps/npm/man/man1/npm-rebuild.1 | 6 +- deps/npm/man/man1/npm-repo.1 | 6 +- deps/npm/man/man1/npm-restart.1 | 13 +- deps/npm/man/man1/npm-rm.1 | 6 +- deps/npm/man/man1/npm-root.1 | 6 +- deps/npm/man/man1/npm-run-script.1 | 20 +- deps/npm/man/man1/npm-search.1 | 6 +- deps/npm/man/man1/npm-shrinkwrap.1 | 34 +- deps/npm/man/man1/npm-star.1 | 6 +- deps/npm/man/man1/npm-stars.1 | 6 +- deps/npm/man/man1/npm-start.1 | 6 +- deps/npm/man/man1/npm-stop.1 | 6 +- deps/npm/man/man1/npm-submodule.1 | 6 +- deps/npm/man/man1/npm-tag.1 | 14 +- deps/npm/man/man1/npm-test.1 | 6 +- deps/npm/man/man1/npm-uninstall.1 | 14 +- deps/npm/man/man1/npm-unpublish.1 | 6 +- deps/npm/man/man1/npm-update.1 | 6 +- deps/npm/man/man1/npm-version.1 | 14 +- deps/npm/man/man1/npm-view.1 | 42 +- deps/npm/man/man1/npm-whoami.1 | 6 +- deps/npm/man/man1/npm.1 | 8 +- deps/npm/man/man3/npm-bin.3 | 8 +- deps/npm/man/man3/npm-bugs.3 | 6 +- deps/npm/man/man3/npm-cache.3 | 6 +- deps/npm/man/man3/npm-commands.3 | 6 +- deps/npm/man/man3/npm-config.3 | 6 +- deps/npm/man/man3/npm-deprecate.3 | 6 +- deps/npm/man/man3/npm-docs.3 | 6 +- deps/npm/man/man3/npm-edit.3 | 6 +- deps/npm/man/man3/npm-explore.3 | 6 +- deps/npm/man/man3/npm-help-search.3 | 8 +- deps/npm/man/man3/npm-init.3 | 6 +- deps/npm/man/man3/npm-install.3 | 6 +- deps/npm/man/man3/npm-link.3 | 10 +- deps/npm/man/man3/npm-load.3 | 16 +- deps/npm/man/man3/npm-ls.3 | 6 +- deps/npm/man/man3/npm-outdated.3 | 6 +- deps/npm/man/man3/npm-owner.3 | 6 +- deps/npm/man/man3/npm-pack.3 | 6 +- deps/npm/man/man3/npm-prefix.3 | 6 +- deps/npm/man/man3/npm-prune.3 | 6 +- deps/npm/man/man3/npm-publish.3 | 6 +- deps/npm/man/man3/npm-rebuild.3 | 6 +- deps/npm/man/man3/npm-repo.3 | 6 +- deps/npm/man/man3/npm-restart.3 | 6 +- deps/npm/man/man3/npm-root.3 | 6 +- deps/npm/man/man3/npm-run-script.3 | 6 +- deps/npm/man/man3/npm-search.3 | 6 +- deps/npm/man/man3/npm-shrinkwrap.3 | 6 +- deps/npm/man/man3/npm-start.3 | 6 +- deps/npm/man/man3/npm-stop.3 | 6 +- deps/npm/man/man3/npm-submodule.3 | 6 +- deps/npm/man/man3/npm-tag.3 | 6 +- deps/npm/man/man3/npm-test.3 | 6 +- deps/npm/man/man3/npm-uninstall.3 | 6 +- deps/npm/man/man3/npm-unpublish.3 | 6 +- deps/npm/man/man3/npm-update.3 | 8 +- deps/npm/man/man3/npm-version.3 | 6 +- deps/npm/man/man3/npm-view.3 | 42 +- deps/npm/man/man3/npm-whoami.3 | 6 +- deps/npm/man/man3/npm.3 | 35 +- deps/npm/man/man5/npm-folders.5 | 10 +- deps/npm/man/man5/npm-global.5 | 10 +- deps/npm/man/man5/npm-json.5 | 179 +- deps/npm/man/man5/npmrc.5 | 6 +- deps/npm/man/man5/package.json.5 | 179 +- deps/npm/man/man7/npm-coding-style.7 | 28 +- deps/npm/man/man7/npm-config.7 | 54 +- deps/npm/man/man7/npm-developers.7 | 32 +- deps/npm/man/man7/npm-disputes.7 | 2 +- deps/npm/man/man7/npm-faq.7 | 24 +- deps/npm/man/man7/npm-index.7 | 8 +- deps/npm/man/man7/npm-registry.7 | 2 +- deps/npm/man/man7/npm-scope.7 | 30 +- deps/npm/man/man7/npm-scripts.7 | 42 +- deps/npm/man/man7/removing-npm.7 | 22 +- deps/npm/man/man7/semver.7 | 12 +- deps/npm/node_modules/archy/LICENSE | 18 + deps/npm/node_modules/archy/README.markdown | 22 +- deps/npm/node_modules/archy/examples/beep.js | 24 + .../node_modules/archy/examples/multi_line.js | 25 + deps/npm/node_modules/archy/package.json | 77 +- deps/npm/node_modules/archy/test/beep.js | 40 + .../npm/node_modules/archy/test/multi_line.js | 45 + .../node_modules/archy/test/non_unicode.js | 40 + .../node_modules => }/config-chain/.npmignore | 0 .../node_modules => }/config-chain/LICENCE | 0 .../node_modules => }/config-chain/index.js | 0 .../node_modules/proto-list/LICENSE | 0 .../node_modules/proto-list/README.md | 0 .../node_modules/proto-list/package.json | 5 +- .../node_modules/proto-list/proto-list.js | 0 .../node_modules/proto-list/test/basic.js | 0 .../config-chain/package.json | 2 +- .../config-chain/readme.markdown | 0 .../config-chain/test/broken.js | 0 .../config-chain/test/broken.json | 0 .../config-chain/test/chain-class.js | 0 .../config-chain/test/env.js | 0 .../config-chain/test/find-file.js | 0 .../config-chain/test/get.js | 0 .../config-chain/test/ignore-unfound-file.js | 0 .../config-chain/test/ini.js | 0 .../config-chain/test/save.js | 0 deps/npm/node_modules/dezalgo/dezalgo.js | 3 +- .../dezalgo/node_modules/asap/package.json | 2 +- deps/npm/node_modules/dezalgo/package.json | 23 +- deps/npm/node_modules/dezalgo/test/basic.js | 12 +- .../fs-write-stream-atomic/LICENSE | 15 + .../fs-write-stream-atomic/README.md | 35 + .../fs-write-stream-atomic/index.js | 96 ++ .../fs-write-stream-atomic/package.json | 53 + .../fs-write-stream-atomic/test/basic.js | 89 + .../node_modules/fstream-npm/fstream-npm.js | 6 + .../node_modules/fstream-ignore/package.json | 22 +- .../npm/node_modules/fstream-npm/package.json | 30 +- deps/npm/node_modules/glob/README.md | 11 +- deps/npm/node_modules/glob/glob.js | 6 +- deps/npm/node_modules/glob/oh-my-glob.gif | Bin 0 -> 510360 bytes deps/npm/node_modules/glob/package.json | 27 +- .../node_modules/glob/test/negation-test.js | 16 + .../npm/node_modules/graceful-fs/package.json | 24 +- .../node_modules/graceful-fs/test/max-open.js | 69 + .../graceful-fs/test/readdir-sort.js | 1 - .../graceful-fs/test/write-then-read.js | 45 + deps/npm/node_modules/inflight/.eslintrc | 17 + deps/npm/node_modules/inflight/inflight.js | 39 +- deps/npm/node_modules/inflight/package.json | 32 +- deps/npm/node_modules/inflight/test.js | 64 + deps/npm/node_modules/inherits/package.json | 21 +- deps/npm/node_modules/ini/README.md | 59 +- deps/npm/node_modules/ini/ini.js | 28 +- deps/npm/node_modules/ini/package.json | 19 +- deps/npm/node_modules/ini/test/foo.js | 26 + .../node_modules/init-package-json/.npmignore | 2 + .../init-package-json/default-input.js | 59 +- .../init-package-json/init-package-json.js | 23 +- .../node_modules/promzard/package.json | 5 +- .../init-package-json/package.json | 34 +- .../init-package-json/test/npm-defaults.js | 49 + .../normalize-package-data/README.md | 6 +- .../normalize-package-data/lib/fixer.js | 7 + .../lib/warning_messages.json | 3 +- .../normalize-package-data/package.json | 19 +- .../test/dependencies.js | 3 +- .../node_modules/npm-package-arg/package.json | 12 +- .../npm-package-arg/test/basic.js | 2 +- .../npm-registry-client/lib/fetch.js | 6 +- .../npm-registry-client/lib/request.js | 5 +- .../npm-registry-client/package.json | 13 +- .../npm-registry-client/test/fetch-authed.js | 56 + .../test/fetch-not-authed.js | 52 + .../@npm/npm-registry-client/cache.json | 1 + .../test/fixtures/underscore/1.3.3/cache.json | 1 + .../fixtures/underscore/1.3.3/package.tgz | Bin 0 -> 58692 bytes .../test/fixtures/underscore/cache.json | 1 + .../npm-registry-client/test/lib/common.js | 4 + .../npm-user-validate/package.json | 39 +- deps/npm/node_modules/npmconf/.npmignore | 3 - deps/npm/node_modules/npmconf/README.md | 33 - deps/npm/node_modules/npmconf/package.json | 71 - .../npm/node_modules/npmconf/test/00-setup.js | 67 - deps/npm/node_modules/npmconf/test/basic.js | 58 - deps/npm/node_modules/npmconf/test/builtin.js | 59 - .../npm/node_modules/npmconf/test/certfile.js | 17 - .../node_modules/npmconf/test/credentials.js | 166 -- deps/npm/node_modules/npmconf/test/project.js | 60 - deps/npm/node_modules/npmconf/test/save.js | 84 - .../node_modules/npmconf/test/semver-tag.js | 65 - deps/npm/node_modules/once/once.js | 3 +- deps/npm/node_modules/once/package.json | 33 +- deps/npm/node_modules/once/test/once.js | 7 +- deps/npm/node_modules/opener/LICENSE.txt | 33 +- deps/npm/node_modules/opener/README.md | 101 +- deps/npm/node_modules/opener/opener.js | 2 +- deps/npm/node_modules/opener/package.json | 30 +- .../readable-stream/.npmignore | 0 .../{npmconf => readable-stream}/LICENSE | 0 .../readable-stream/README.md | 0 .../readable-stream/duplex.js | 0 .../readable-stream/lib/_stream_duplex.js | 0 .../lib/_stream_passthrough.js | 0 .../readable-stream/lib/_stream_readable.js | 0 .../readable-stream/lib/_stream_transform.js | 0 .../readable-stream/lib/_stream_writable.js | 0 .../node_modules/core-util-is/README.md | 0 .../node_modules/core-util-is/float.patch | 0 .../node_modules/core-util-is/lib/util.js | 0 .../node_modules/core-util-is/package.json | 5 +- .../node_modules/core-util-is/util.js | 0 .../node_modules/isarray/README.md | 0 .../node_modules/isarray/build/build.js | 0 .../node_modules/isarray/component.json | 0 .../node_modules/isarray/index.js | 0 .../node_modules/isarray/package.json | 0 .../node_modules/string_decoder/.npmignore | 0 .../node_modules/string_decoder/LICENSE | 0 .../node_modules/string_decoder/README.md | 0 .../node_modules/string_decoder/index.js | 0 .../node_modules/string_decoder/package.json | 2 +- .../readable-stream/package.json | 18 +- .../readable-stream/passthrough.js | 0 .../readable-stream/readable.js | 0 .../readable-stream/transform.js | 0 .../readable-stream/writable.js | 0 .../realize-package-specifier/.npmignore | 3 + .../realize-package-specifier/README.md | 58 + .../realize-package-specifier/index.js | 38 + .../realize-package-specifier/package.json | 53 + .../realize-package-specifier/test/basic.js | 121 ++ .../test/npa-basic.js | 207 +++ .../test/npa-windows.js | 42 + deps/npm/node_modules/request/.eslintrc | 22 + deps/npm/node_modules/request/.travis.yml | 13 +- deps/npm/node_modules/request/CONTRIBUTING.md | 25 +- deps/npm/node_modules/request/README.md | 243 ++- deps/npm/node_modules/request/index.js | 56 +- deps/npm/node_modules/request/lib/cookies.js | 48 +- deps/npm/node_modules/request/lib/copy.js | 4 +- deps/npm/node_modules/request/lib/debug.js | 4 +- deps/npm/node_modules/request/lib/helpers.js | 57 +- deps/npm/node_modules/request/lib/optional.js | 13 - .../node_modules/aws-sign2/package.json | 5 +- .../request/node_modules/bl/.jshintrc | 59 + .../request/node_modules/bl/LICENSE | 39 - .../request/node_modules/bl/LICENSE.md | 13 + .../request/node_modules/bl/README.md | 7 +- .../bl/node_modules/readable-stream/LICENSE | 27 - .../request/node_modules/bl/package.json | 21 +- .../node_modules/caseless/package.json | 2 +- .../node_modules/forever-agent/package.json | 5 +- .../form-data/node_modules/async/package.json | 2 +- .../node_modules/delayed-stream/package.json | 2 +- .../node_modules/combined-stream/package.json | 2 +- .../form-data/node_modules/mime/package.json | 5 +- .../node_modules/form-data/package.json | 2 +- .../hawk/node_modules/boom/package.json | 2 +- .../hawk/node_modules/cryptiles/package.json | 2 +- .../hawk/node_modules/hoek/package.json | 2 +- .../hawk/node_modules/sntp/package.json | 2 +- .../node_modules/asn1/package.json | 2 +- .../node_modules/assert-plus/package.json | 5 +- .../node_modules/ctype/package.json | 5 +- .../node_modules/http-signature/package.json | 2 +- .../json-stringify-safe/package.json | 5 +- .../node_modules/mime-types/package.json | 2 +- .../node_modules/node-uuid/package.json | 5 +- .../node_modules/oauth-sign/package.json | 2 +- .../request/node_modules/qs/.jshintrc | 10 + .../request/node_modules/qs/package.json | 2 +- .../node_modules/stringstream/package.json | 5 +- .../node_modules/punycode/LICENSE-MIT.txt | 2 +- .../node_modules/punycode/README.md | 6 +- .../node_modules/punycode/package.json | 32 +- .../node_modules/punycode/punycode.js | 12 +- .../node_modules/tunnel-agent/.jshintrc | 5 + .../node_modules/tunnel-agent/package.json | 5 +- deps/npm/node_modules/request/package.json | 52 +- deps/npm/node_modules/request/release.sh | 3 + deps/npm/node_modules/request/request.js | 1491 ++++++++++------- deps/npm/node_modules/retry/Readme.md | 8 +- deps/npm/node_modules/retry/package.json | 28 +- deps/npm/node_modules/semver/README.md | 2 +- deps/npm/node_modules/semver/bin/semver | 10 +- deps/npm/node_modules/semver/package.json | 23 +- .../npm/node_modules/semver/semver.browser.js | 62 +- .../node_modules/semver/semver.browser.js.gz | Bin 7391 -> 7595 bytes deps/npm/node_modules/semver/semver.js | 62 +- deps/npm/node_modules/semver/semver.min.js | 2 +- deps/npm/node_modules/semver/semver.min.js.gz | Bin 3397 -> 3472 bytes deps/npm/node_modules/semver/test/clean.js | 6 +- deps/npm/node_modules/semver/test/gtr.js | 2 +- deps/npm/node_modules/semver/test/index.js | 66 +- deps/npm/node_modules/sha/.npmignore | 6 +- deps/npm/node_modules/sha/LICENSE | 90 +- deps/npm/node_modules/sha/README.md | 96 +- deps/npm/node_modules/sha/index.js | 238 +-- .../sha/node_modules/readable-stream/LICENSE | 41 +- .../node_modules/readable-stream/README.md | 4 +- .../node_modules/readable-stream/float.patch | 923 ++++++++++ .../readable-stream/lib/_stream_readable.js | 377 ++--- .../readable-stream/lib/_stream_transform.js | 11 +- .../readable-stream/lib/_stream_writable.js | 181 +- .../node_modules/core-util-is/package.json | 3 +- .../node_modules/isarray/package.json | 5 +- .../node_modules/string_decoder/package.json | 3 +- .../node_modules/readable-stream/package.json | 20 +- .../node_modules/readable-stream/readable.js | 1 + deps/npm/node_modules/sha/package.json | 27 +- deps/npm/node_modules/wrappy/LICENSE | 15 + deps/npm/node_modules/wrappy/README.md | 36 + deps/npm/node_modules/wrappy/package.json | 52 + deps/npm/node_modules/wrappy/test/basic.js | 51 + deps/npm/node_modules/wrappy/wrappy.js | 33 + .../node_modules/write-file-atomic/.npmignore | 4 + .../node_modules/write-file-atomic/README.md | 44 + .../node_modules/write-file-atomic/index.js | 45 + .../write-file-atomic/package.json | 56 + .../write-file-atomic/test/basic.js | 97 ++ deps/npm/package.json | 64 +- deps/npm/scripts/doc-build.sh | 69 +- deps/npm/test/common-tap.js | 35 + .../fixtures => test/fixtures/config}/.npmrc | 0 .../fixtures => test/fixtures/config}/builtin | 0 .../fixtures/config}/globalconfig | 0 deps/npm/test/fixtures/config/malformed | 1 + .../fixtures/config}/multi-ca | 0 .../fixtures/config}/package.json | 0 .../fixtures/config}/userconfig | 0 .../test/fixtures/config/userconfig-with-gc | 22 + deps/npm/test/tap/00-check-mock-dep.js | 4 +- deps/npm/test/tap/00-config-setup.js | 68 + deps/npm/test/tap/00-verify-bundle-deps.js | 2 +- deps/npm/test/tap/00-verify-ls-ok.js | 15 +- deps/npm/test/tap/404-parent.js | 51 +- deps/npm/test/tap/builtin-config.js | 125 ++ .../test/tap/cache-add-localdir-fallback.js | 84 +- deps/npm/test/tap/cache-add-unpublished.js | 59 +- deps/npm/test/tap/cache-shasum-fork.js | 83 + .../cache-shasum-fork/underscore-1.5.1.tgz | Bin 0 -> 583 bytes deps/npm/test/tap/cache-shasum.js | 12 +- deps/npm/test/tap/circular-dep.js | 4 +- deps/npm/test/tap/config-basic.js | 66 + deps/npm/test/tap/config-builtin.js | 68 + deps/npm/test/tap/config-certfile.js | 18 + deps/npm/test/tap/config-credentials.js | 295 ++++ deps/npm/test/tap/config-malformed.js | 14 + deps/npm/test/tap/config-meta.js | 50 +- deps/npm/test/tap/config-project.js | 66 + deps/npm/test/tap/config-save.js | 88 + deps/npm/test/tap/config-semver-tag.js | 27 + deps/npm/test/tap/dedupe.js | 29 +- .../dev-dep-duplicate/desired-ls-results.json | 9 + .../test/tap/dev-dep-duplicate/package.json | 11 + deps/npm/test/tap/false_name.js | 54 +- deps/npm/test/tap/git-cache-locking.js | 32 +- deps/npm/test/tap/git-cache-no-hooks.js | 63 + deps/npm/test/tap/git-cache-permissions.js | 80 - .../tap/global-prefix-set-in-userconfig.js | 4 +- deps/npm/test/tap/ignore-install-link.js | 2 +- deps/npm/test/tap/ignore-scripts.js | 53 +- deps/npm/test/tap/ignore-shrinkwrap.js | 18 +- deps/npm/test/tap/install-at-locally.js | 52 +- deps/npm/test/tap/install-cli-production.js | 44 + .../dependency/package.json | 5 + .../dev-dependency/package.json | 5 + .../tap/install-cli-production/package.json | 14 + deps/npm/test/tap/install-cli-unicode.js | 37 +- deps/npm/test/tap/install-from-local.js | 33 +- .../package-scoped-dependency/package.json | 5 + .../package-with-scoped-paths/package.json | 8 + deps/npm/test/tap/install-save-exact.js | 81 +- deps/npm/test/tap/install-save-local.js | 59 +- deps/npm/test/tap/install-save-prefix.js | 122 +- .../tap/install-scoped-already-installed.js | 86 + deps/npm/test/tap/install-scoped-link.js | 49 +- .../tap/install-with-dev-dep-duplicate.js | 57 + deps/npm/test/tap/invalid-cmd-exit-code.js | 7 +- deps/npm/test/tap/lifecycle-path.js | 4 +- deps/npm/test/tap/lifecycle.js | 8 +- deps/npm/test/tap/locker.js | 89 + deps/npm/test/tap/login-always-auth.js | 142 ++ deps/npm/test/tap/ls-depth-cli.js | 48 +- deps/npm/test/tap/ls-depth-unmet.js | 51 +- deps/npm/test/tap/ls-no-results.js | 12 +- .../test/tap/noargs-install-config-save.js | 16 +- deps/npm/test/tap/npm-api-not-loaded-error.js | 2 +- .../optional-metadep-rollback-collision.js | 2 +- deps/npm/test/tap/outdated-color.js | 34 +- deps/npm/test/tap/outdated-depth.js | 38 +- deps/npm/test/tap/outdated-git.js | 21 +- .../tap/outdated-include-devdependencies.js | 10 +- deps/npm/test/tap/outdated-json.js | 41 +- deps/npm/test/tap/outdated-new-versions.js | 10 +- deps/npm/test/tap/outdated-notarget.js | 10 +- deps/npm/test/tap/outdated.js | 18 +- deps/npm/test/tap/pack-scoped.js | 52 +- deps/npm/test/tap/peer-deps-invalid.js | 16 +- deps/npm/test/tap/peer-deps-toplevel.js | 55 + .../desired-ls-results.json | 20 + .../test/tap/peer-deps-toplevel/package.json | 11 + .../tap/peer-deps-without-package-json.js | 24 +- deps/npm/test/tap/peer-deps.js | 4 +- deps/npm/test/tap/prepublish.js | 52 +- deps/npm/test/tap/prune.js | 99 +- deps/npm/test/tap/publish-config.js | 37 +- deps/npm/test/tap/publish-scoped.js | 34 +- deps/npm/test/tap/pwd-prefix.js | 8 +- deps/npm/test/tap/referer.js | 9 +- deps/npm/test/tap/registry.js | 68 +- deps/npm/test/tap/repo.js | 12 +- deps/npm/test/tap/run-script.js | 74 +- deps/npm/test/tap/run-script/package.json | 9 +- .../test/tap/scripts-whitespace-windows.js | 95 +- deps/npm/test/tap/search.js | 265 +++ deps/npm/test/tap/semver-doc.js | 4 +- deps/npm/test/tap/semver-tag.js | 2 +- deps/npm/test/tap/shrinkwrap-empty-deps.js | 5 +- deps/npm/test/tap/sorted-package-json.js | 13 +- deps/npm/test/tap/spawn-enoent.js | 2 +- deps/npm/test/tap/startstop.js | 52 +- deps/npm/test/tap/test-run-ls.js | 6 +- deps/npm/test/tap/uninstall-package.js | 3 +- deps/npm/test/tap/unpack-foreign-tarball.js | 42 +- deps/npm/test/tap/update-save.js | 82 +- deps/npm/test/tap/url-dependencies.js | 52 +- deps/npm/test/tap/version-no-git.js | 54 + deps/npm/test/tap/version-no-tags.js | 80 +- deps/npm/test/tap/view.js | 253 +++ deps/npm/test/tap/zz-cleanup.js | 15 + 715 files changed, 18443 insertions(+), 6525 deletions(-) create mode 100644 deps/npm/.eslintrc delete mode 100644 deps/npm/doc/api/npm-submodule.md delete mode 100644 deps/npm/doc/cli/npm-submodule.md create mode 100644 deps/npm/html/partial/doc/README.html create mode 100644 deps/npm/html/partial/doc/api/npm-bin.html create mode 100644 deps/npm/html/partial/doc/api/npm-bugs.html create mode 100644 deps/npm/html/partial/doc/api/npm-cache.html create mode 100644 deps/npm/html/partial/doc/api/npm-commands.html create mode 100644 deps/npm/html/partial/doc/api/npm-config.html create mode 100644 deps/npm/html/partial/doc/api/npm-deprecate.html create mode 100644 deps/npm/html/partial/doc/api/npm-docs.html create mode 100644 deps/npm/html/partial/doc/api/npm-edit.html create mode 100644 deps/npm/html/partial/doc/api/npm-explore.html create mode 100644 deps/npm/html/partial/doc/api/npm-help-search.html create mode 100644 deps/npm/html/partial/doc/api/npm-init.html create mode 100644 deps/npm/html/partial/doc/api/npm-install.html create mode 100644 deps/npm/html/partial/doc/api/npm-link.html create mode 100644 deps/npm/html/partial/doc/api/npm-load.html create mode 100644 deps/npm/html/partial/doc/api/npm-ls.html create mode 100644 deps/npm/html/partial/doc/api/npm-outdated.html create mode 100644 deps/npm/html/partial/doc/api/npm-owner.html create mode 100644 deps/npm/html/partial/doc/api/npm-pack.html create mode 100644 deps/npm/html/partial/doc/api/npm-prefix.html create mode 100644 deps/npm/html/partial/doc/api/npm-prune.html create mode 100644 deps/npm/html/partial/doc/api/npm-publish.html create mode 100644 deps/npm/html/partial/doc/api/npm-rebuild.html create mode 100644 deps/npm/html/partial/doc/api/npm-repo.html create mode 100644 deps/npm/html/partial/doc/api/npm-restart.html create mode 100644 deps/npm/html/partial/doc/api/npm-root.html create mode 100644 deps/npm/html/partial/doc/api/npm-run-script.html create mode 100644 deps/npm/html/partial/doc/api/npm-search.html create mode 100644 deps/npm/html/partial/doc/api/npm-shrinkwrap.html create mode 100644 deps/npm/html/partial/doc/api/npm-start.html create mode 100644 deps/npm/html/partial/doc/api/npm-stop.html create mode 100644 deps/npm/html/partial/doc/api/npm-submodule.html create mode 100644 deps/npm/html/partial/doc/api/npm-tag.html create mode 100644 deps/npm/html/partial/doc/api/npm-test.html create mode 100644 deps/npm/html/partial/doc/api/npm-uninstall.html create mode 100644 deps/npm/html/partial/doc/api/npm-unpublish.html create mode 100644 deps/npm/html/partial/doc/api/npm-update.html create mode 100644 deps/npm/html/partial/doc/api/npm-version.html create mode 100644 deps/npm/html/partial/doc/api/npm-view.html create mode 100644 deps/npm/html/partial/doc/api/npm-whoami.html create mode 100644 deps/npm/html/partial/doc/api/npm.html create mode 100644 deps/npm/html/partial/doc/cli/npm-adduser.html create mode 100644 deps/npm/html/partial/doc/cli/npm-bin.html create mode 100644 deps/npm/html/partial/doc/cli/npm-bugs.html create mode 100644 deps/npm/html/partial/doc/cli/npm-build.html create mode 100644 deps/npm/html/partial/doc/cli/npm-bundle.html create mode 100644 deps/npm/html/partial/doc/cli/npm-cache.html create mode 100644 deps/npm/html/partial/doc/cli/npm-completion.html create mode 100644 deps/npm/html/partial/doc/cli/npm-config.html create mode 100644 deps/npm/html/partial/doc/cli/npm-dedupe.html create mode 100644 deps/npm/html/partial/doc/cli/npm-deprecate.html create mode 100644 deps/npm/html/partial/doc/cli/npm-docs.html create mode 100644 deps/npm/html/partial/doc/cli/npm-edit.html create mode 100644 deps/npm/html/partial/doc/cli/npm-explore.html create mode 100644 deps/npm/html/partial/doc/cli/npm-help-search.html create mode 100644 deps/npm/html/partial/doc/cli/npm-help.html create mode 100644 deps/npm/html/partial/doc/cli/npm-init.html create mode 100644 deps/npm/html/partial/doc/cli/npm-install.html create mode 100644 deps/npm/html/partial/doc/cli/npm-link.html create mode 100644 deps/npm/html/partial/doc/cli/npm-ls.html create mode 100644 deps/npm/html/partial/doc/cli/npm-outdated.html create mode 100644 deps/npm/html/partial/doc/cli/npm-owner.html create mode 100644 deps/npm/html/partial/doc/cli/npm-pack.html create mode 100644 deps/npm/html/partial/doc/cli/npm-prefix.html create mode 100644 deps/npm/html/partial/doc/cli/npm-prune.html create mode 100644 deps/npm/html/partial/doc/cli/npm-publish.html create mode 100644 deps/npm/html/partial/doc/cli/npm-rebuild.html create mode 100644 deps/npm/html/partial/doc/cli/npm-repo.html create mode 100644 deps/npm/html/partial/doc/cli/npm-restart.html create mode 100644 deps/npm/html/partial/doc/cli/npm-rm.html create mode 100644 deps/npm/html/partial/doc/cli/npm-root.html create mode 100644 deps/npm/html/partial/doc/cli/npm-run-script.html create mode 100644 deps/npm/html/partial/doc/cli/npm-search.html create mode 100644 deps/npm/html/partial/doc/cli/npm-shrinkwrap.html create mode 100644 deps/npm/html/partial/doc/cli/npm-star.html create mode 100644 deps/npm/html/partial/doc/cli/npm-stars.html create mode 100644 deps/npm/html/partial/doc/cli/npm-start.html create mode 100644 deps/npm/html/partial/doc/cli/npm-stop.html create mode 100644 deps/npm/html/partial/doc/cli/npm-submodule.html create mode 100644 deps/npm/html/partial/doc/cli/npm-tag.html create mode 100644 deps/npm/html/partial/doc/cli/npm-test.html create mode 100644 deps/npm/html/partial/doc/cli/npm-uninstall.html create mode 100644 deps/npm/html/partial/doc/cli/npm-unpublish.html create mode 100644 deps/npm/html/partial/doc/cli/npm-update.html create mode 100644 deps/npm/html/partial/doc/cli/npm-version.html create mode 100644 deps/npm/html/partial/doc/cli/npm-view.html create mode 100644 deps/npm/html/partial/doc/cli/npm-whoami.html create mode 100644 deps/npm/html/partial/doc/cli/npm.html create mode 100644 deps/npm/html/partial/doc/files/npm-folders.html create mode 100644 deps/npm/html/partial/doc/files/npm-global.html create mode 100644 deps/npm/html/partial/doc/files/npm-json.html create mode 100644 deps/npm/html/partial/doc/files/npmrc.html create mode 100644 deps/npm/html/partial/doc/files/package.json.html create mode 100644 deps/npm/html/partial/doc/index.html create mode 100644 deps/npm/html/partial/doc/misc/npm-coding-style.html create mode 100644 deps/npm/html/partial/doc/misc/npm-config.html create mode 100644 deps/npm/html/partial/doc/misc/npm-developers.html create mode 100644 deps/npm/html/partial/doc/misc/npm-disputes.html create mode 100644 deps/npm/html/partial/doc/misc/npm-faq.html create mode 100644 deps/npm/html/partial/doc/misc/npm-index.html create mode 100644 deps/npm/html/partial/doc/misc/npm-registry.html create mode 100644 deps/npm/html/partial/doc/misc/npm-scope.html create mode 100644 deps/npm/html/partial/doc/misc/npm-scripts.html create mode 100644 deps/npm/html/partial/doc/misc/removing-npm.html create mode 100644 deps/npm/html/partial/doc/misc/semver.html create mode 100644 deps/npm/lib/cache/cached-package-root.js rename deps/npm/{node_modules/npmconf/npmconf.js => lib/config/core.js} (68%) rename deps/npm/{node_modules/npmconf/config-defs.js => lib/config/defaults.js} (95%) rename deps/npm/{node_modules/npmconf/lib => lib/config}/find-prefix.js (100%) rename deps/npm/{node_modules/npmconf/lib => lib/config}/get-credentials-by-uri.js (75%) rename deps/npm/{node_modules/npmconf/lib => lib/config}/load-cafile.js (72%) rename deps/npm/{node_modules/npmconf/lib => lib/config}/load-prefix.js (89%) rename deps/npm/{node_modules/npmconf/lib => lib/config}/load-uid.js (100%) rename deps/npm/{node_modules/npmconf/lib => lib/config}/nerf-dart.js (100%) rename deps/npm/{node_modules/npmconf/lib => lib/config}/set-credentials-by-uri.js (62%) rename deps/npm/{node_modules/npmconf/lib => lib/config}/set-user.js (63%) delete mode 100644 deps/npm/lib/submodule.js create mode 100644 deps/npm/node_modules/archy/LICENSE create mode 100644 deps/npm/node_modules/archy/examples/beep.js create mode 100644 deps/npm/node_modules/archy/examples/multi_line.js create mode 100644 deps/npm/node_modules/archy/test/beep.js create mode 100644 deps/npm/node_modules/archy/test/multi_line.js create mode 100644 deps/npm/node_modules/archy/test/non_unicode.js rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/.npmignore (100%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/LICENCE (100%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/index.js (100%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/node_modules/proto-list/LICENSE (100%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/node_modules/proto-list/README.md (100%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/node_modules/proto-list/package.json (93%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/node_modules/proto-list/proto-list.js (100%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/node_modules/proto-list/test/basic.js (100%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/package.json (99%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/readme.markdown (100%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/test/broken.js (100%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/test/broken.json (100%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/test/chain-class.js (100%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/test/env.js (100%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/test/find-file.js (100%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/test/get.js (100%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/test/ignore-unfound-file.js (100%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/test/ini.js (100%) rename deps/npm/node_modules/{npmconf/node_modules => }/config-chain/test/save.js (100%) create mode 100644 deps/npm/node_modules/fs-write-stream-atomic/LICENSE create mode 100644 deps/npm/node_modules/fs-write-stream-atomic/README.md create mode 100644 deps/npm/node_modules/fs-write-stream-atomic/index.js create mode 100644 deps/npm/node_modules/fs-write-stream-atomic/package.json create mode 100644 deps/npm/node_modules/fs-write-stream-atomic/test/basic.js create mode 100644 deps/npm/node_modules/glob/oh-my-glob.gif create mode 100644 deps/npm/node_modules/glob/test/negation-test.js create mode 100644 deps/npm/node_modules/graceful-fs/test/max-open.js create mode 100644 deps/npm/node_modules/graceful-fs/test/write-then-read.js create mode 100644 deps/npm/node_modules/inflight/.eslintrc create mode 100644 deps/npm/node_modules/init-package-json/.npmignore create mode 100644 deps/npm/node_modules/init-package-json/test/npm-defaults.js create mode 100644 deps/npm/node_modules/npm-registry-client/test/fetch-authed.js create mode 100644 deps/npm/node_modules/npm-registry-client/test/fetch-not-authed.js create mode 100644 deps/npm/node_modules/npm-registry-client/test/fixtures/@npm/npm-registry-client/cache.json create mode 100644 deps/npm/node_modules/npm-registry-client/test/fixtures/underscore/1.3.3/cache.json create mode 100644 deps/npm/node_modules/npm-registry-client/test/fixtures/underscore/1.3.3/package.tgz create mode 100644 deps/npm/node_modules/npm-registry-client/test/fixtures/underscore/cache.json delete mode 100644 deps/npm/node_modules/npmconf/.npmignore delete mode 100644 deps/npm/node_modules/npmconf/README.md delete mode 100644 deps/npm/node_modules/npmconf/package.json delete mode 100644 deps/npm/node_modules/npmconf/test/00-setup.js delete mode 100644 deps/npm/node_modules/npmconf/test/basic.js delete mode 100644 deps/npm/node_modules/npmconf/test/builtin.js delete mode 100644 deps/npm/node_modules/npmconf/test/certfile.js delete mode 100644 deps/npm/node_modules/npmconf/test/credentials.js delete mode 100644 deps/npm/node_modules/npmconf/test/project.js delete mode 100644 deps/npm/node_modules/npmconf/test/save.js delete mode 100644 deps/npm/node_modules/npmconf/test/semver-tag.js rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/.npmignore (100%) rename deps/npm/node_modules/{npmconf => readable-stream}/LICENSE (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/README.md (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/duplex.js (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/lib/_stream_duplex.js (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/lib/_stream_passthrough.js (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/lib/_stream_readable.js (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/lib/_stream_transform.js (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/lib/_stream_writable.js (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/node_modules/core-util-is/README.md (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/node_modules/core-util-is/float.patch (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/node_modules/core-util-is/lib/util.js (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/node_modules/core-util-is/package.json (94%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/node_modules/core-util-is/util.js (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/node_modules/isarray/README.md (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/node_modules/isarray/build/build.js (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/node_modules/isarray/component.json (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/node_modules/isarray/index.js (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/node_modules/isarray/package.json (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/node_modules/string_decoder/.npmignore (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/node_modules/string_decoder/LICENSE (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/node_modules/string_decoder/README.md (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/node_modules/string_decoder/index.js (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/node_modules/string_decoder/package.json (96%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/package.json (78%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/passthrough.js (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/readable.js (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/transform.js (100%) rename deps/npm/node_modules/{request/node_modules/bl/node_modules => }/readable-stream/writable.js (100%) create mode 100644 deps/npm/node_modules/realize-package-specifier/.npmignore create mode 100644 deps/npm/node_modules/realize-package-specifier/README.md create mode 100644 deps/npm/node_modules/realize-package-specifier/index.js create mode 100644 deps/npm/node_modules/realize-package-specifier/package.json create mode 100644 deps/npm/node_modules/realize-package-specifier/test/basic.js create mode 100644 deps/npm/node_modules/realize-package-specifier/test/npa-basic.js create mode 100644 deps/npm/node_modules/realize-package-specifier/test/npa-windows.js create mode 100644 deps/npm/node_modules/request/.eslintrc delete mode 100644 deps/npm/node_modules/request/lib/optional.js create mode 100644 deps/npm/node_modules/request/node_modules/bl/.jshintrc delete mode 100644 deps/npm/node_modules/request/node_modules/bl/LICENSE create mode 100644 deps/npm/node_modules/request/node_modules/bl/LICENSE.md delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/LICENSE create mode 100644 deps/npm/node_modules/request/node_modules/qs/.jshintrc create mode 100644 deps/npm/node_modules/request/node_modules/tunnel-agent/.jshintrc create mode 100755 deps/npm/node_modules/request/release.sh create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/float.patch create mode 100644 deps/npm/node_modules/wrappy/LICENSE create mode 100644 deps/npm/node_modules/wrappy/README.md create mode 100644 deps/npm/node_modules/wrappy/package.json create mode 100644 deps/npm/node_modules/wrappy/test/basic.js create mode 100644 deps/npm/node_modules/wrappy/wrappy.js create mode 100644 deps/npm/node_modules/write-file-atomic/.npmignore create mode 100644 deps/npm/node_modules/write-file-atomic/README.md create mode 100644 deps/npm/node_modules/write-file-atomic/index.js create mode 100644 deps/npm/node_modules/write-file-atomic/package.json create mode 100644 deps/npm/node_modules/write-file-atomic/test/basic.js rename deps/npm/{node_modules/npmconf/test/fixtures => test/fixtures/config}/.npmrc (100%) rename deps/npm/{node_modules/npmconf/test/fixtures => test/fixtures/config}/builtin (100%) rename deps/npm/{node_modules/npmconf/test/fixtures => test/fixtures/config}/globalconfig (100%) create mode 100644 deps/npm/test/fixtures/config/malformed rename deps/npm/{node_modules/npmconf/test/fixtures => test/fixtures/config}/multi-ca (100%) rename deps/npm/{node_modules/npmconf/test/fixtures => test/fixtures/config}/package.json (100%) rename deps/npm/{node_modules/npmconf/test/fixtures => test/fixtures/config}/userconfig (100%) create mode 100644 deps/npm/test/fixtures/config/userconfig-with-gc create mode 100644 deps/npm/test/tap/00-config-setup.js create mode 100644 deps/npm/test/tap/builtin-config.js create mode 100644 deps/npm/test/tap/cache-shasum-fork.js create mode 100644 deps/npm/test/tap/cache-shasum-fork/underscore-1.5.1.tgz create mode 100644 deps/npm/test/tap/config-basic.js create mode 100644 deps/npm/test/tap/config-builtin.js create mode 100644 deps/npm/test/tap/config-certfile.js create mode 100644 deps/npm/test/tap/config-credentials.js create mode 100644 deps/npm/test/tap/config-malformed.js create mode 100644 deps/npm/test/tap/config-project.js create mode 100644 deps/npm/test/tap/config-save.js create mode 100644 deps/npm/test/tap/config-semver-tag.js create mode 100644 deps/npm/test/tap/dev-dep-duplicate/desired-ls-results.json create mode 100644 deps/npm/test/tap/dev-dep-duplicate/package.json create mode 100644 deps/npm/test/tap/git-cache-no-hooks.js delete mode 100644 deps/npm/test/tap/git-cache-permissions.js create mode 100644 deps/npm/test/tap/install-cli-production.js create mode 100644 deps/npm/test/tap/install-cli-production/dependency/package.json create mode 100644 deps/npm/test/tap/install-cli-production/dev-dependency/package.json create mode 100644 deps/npm/test/tap/install-cli-production/package.json create mode 100644 deps/npm/test/tap/install-from-local/package-scoped-dependency/package.json create mode 100644 deps/npm/test/tap/install-from-local/package-with-scoped-paths/package.json create mode 100644 deps/npm/test/tap/install-scoped-already-installed.js create mode 100644 deps/npm/test/tap/install-with-dev-dep-duplicate.js create mode 100644 deps/npm/test/tap/locker.js create mode 100644 deps/npm/test/tap/login-always-auth.js create mode 100644 deps/npm/test/tap/peer-deps-toplevel.js create mode 100644 deps/npm/test/tap/peer-deps-toplevel/desired-ls-results.json create mode 100644 deps/npm/test/tap/peer-deps-toplevel/package.json create mode 100644 deps/npm/test/tap/search.js create mode 100644 deps/npm/test/tap/version-no-git.js create mode 100644 deps/npm/test/tap/view.js create mode 100644 deps/npm/test/tap/zz-cleanup.js diff --git a/deps/npm/.eslintrc b/deps/npm/.eslintrc new file mode 100644 index 00000000000000..ba3315042102ff --- /dev/null +++ b/deps/npm/.eslintrc @@ -0,0 +1,17 @@ +{ + "env" : { + "node" : true + }, + "rules" : { + "semi": [2, "never"], + "strict": 0, + "quotes": [1, "double", "avoid-escape"], + "no-use-before-define": 0, + "curly": 0, + "no-underscore-dangle": 0, + "no-lonely-if": 1, + "no-unused-vars": [2, {"vars" : "all", "args" : "after-used"}], + "no-mixed-requires": 0, + "space-infix-ops": 0 + } +} diff --git a/deps/npm/.npmignore b/deps/npm/.npmignore index 7232cea50a8dc5..a128c9b604b34d 100644 --- a/deps/npm/.npmignore +++ b/deps/npm/.npmignore @@ -25,3 +25,5 @@ html/*.png /npm-*.tgz *.pyc + +/test/tap/builtin-config diff --git a/deps/npm/CHANGELOG.md b/deps/npm/CHANGELOG.md index a8afe8ac75f166..e67cd290927ece 100644 --- a/deps/npm/CHANGELOG.md +++ b/deps/npm/CHANGELOG.md @@ -1,3 +1,318 @@ +### v2.1.6 (2014-10-23): + +* [`681b398`](https://github.com/npm/npm/commit/681b3987a18e7aba0aaf78c91a23c7cc0ab82ce8) + [#6523](https://github.com/npm/npm/issues/6523) fix default `logelevel` doc + ([@KenanY](https://github.com/KenanY)) +* [`80b368f`](https://github.com/npm/npm/commit/80b368ffd786d4d008734b56c4a6fe12d2cb2926) + [#6528](https://github.com/npm/npm/issues/6528) `npm version` should work in + a git directory without git ([@terinjokes](https://github.com/terinjokes)) +* [`5f5f9e4`](https://github.com/npm/npm/commit/5f5f9e4ddf544c2da6adf3f8c885238b0e745076) + [#6483](https://github.com/npm/npm/issues/6483) `init-package-json@1.1.1`: + Properly pick up default values from environment variables. + ([@othiym23](https://github.com/othiym23)) +* [`a114870`](https://github.com/npm/npm/commit/a1148702f53f82d49606b2e4dac7581261fff442) + perl 5.18.x doesn't like -pi without filenames + ([@othiym23](https://github.com/othiym23)) +* [`de5ba00`](https://github.com/npm/npm/commit/de5ba007a48db876eb5bfb6156435f3512d58977) + `request@2.46.0`: Tests and cleanup. + ([@othiym23](https://github.com/othiym23)) +* [`76933f1`](https://github.com/npm/npm/commit/76933f169f17b5273b32e924a7b392d5729931a7) + `fstream-npm@1.0.1`: Always include `LICENSE[.*]`, `LICENCE[.*]`, + `CHANGES[.*]`, `CHANGELOG[.*]`, and `HISTORY[.*]`. + ([@jonathanong](https://github.com/jonathanong)) + +### v2.1.5 (2014-10-16): + +* [`6a14b23`](https://github.com/npm/npm/commit/6a14b232a0e34158bd95bb25c607167be995c204) + [#6397](https://github.com/npm/npm/issues/6397) Defactor npmconf back into + npm. ([@othiym23](https://github.com/othiym23)) +* [`4000e33`](https://github.com/npm/npm/commit/4000e3333a76ca4844681efa8737cfac24b7c2c8) + [#6323](https://github.com/npm/npm/issues/6323) Install `peerDependencies` + from top. ([@othiym23](https://github.com/othiym23)) +* [`5d119ae`](https://github.com/npm/npm/commit/5d119ae246f27353b14ff063559d1ba8c616bb89) + [#6498](https://github.com/npm/npm/issues/6498) Better error messages on + malformed `.npmrc` properties. ([@nicks](https://github.com/nicks)) +* [`ae18efb`](https://github.com/npm/npm/commit/ae18efb65fed427b1ef18e4862885bf60b87b92e) + [#6093](https://github.com/npm/npm/issues/6093) Replace instances of 'hash' + with 'object' in documentation. ([@zeke](https://github.com/zeke)) +* [`53108b2`](https://github.com/npm/npm/commit/53108b276fec5f97a38250933a2768d58b6928da) + [#1558](https://github.com/npm/npm/issues/1558) Clarify how local paths + should be used. ([@KenanY](https://github.com/KenanY)) +* [`344fa1a`](https://github.com/npm/npm/commit/344fa1a219ac8867022df3dc58a47636dde8a242) + [#6488](https://github.com/npm/npm/issues/6488) Work around bug in marked. + ([@othiym23](https://github.com/othiym23)) + +OUTDATED DEPENDENCY CLEANUP JAMBOREE + +* [`60c2942`](https://github.com/npm/npm/commit/60c2942e13655d9ecdf6e0f1f97f10cb71a75255) + `realize-package-specifier@1.2.0`: Handle names and rawSpecs more + consistently. ([@iarna](https://github.com/iarna)) +* [`1b5c95f`](https://github.com/npm/npm/commit/1b5c95fbda77b87342bd48c5ecac5b1fd571ccfe) + `sha@1.3.0`: Change line endings? + ([@ForbesLindesay](https://github.com/ForbesLindesay)) +* [`d7dee3f`](https://github.com/npm/npm/commit/d7dee3f3f7d9e7c2061a4ecb4dd93e3e4bfe4f2e) + `request@2.45.0`: Dependency updates, better proxy support, better compressed + response handling, lots of 'use strict'. + ([@mikeal](https://github.com/mikeal)) +* [`3d75180`](https://github.com/npm/npm/commit/3d75180c2cc79fa3adfa0e4cb783a27192189a65) + `opener@1.4.0`: Added gratuitous return. + ([@Domenic](https://github.com/Domenic)) +* [`8e2703f`](https://github.com/npm/npm/commit/8e2703f78d280d1edeb749e257dda1f288bad6e3) + `retry@0.6.1` / `npm-registry-client@3.2.4`: Change of ownership. + ([@tim-kos](https://github.com/tim-kos)) +* [`c87b00f`](https://github.com/npm/npm/commit/c87b00f82f92434ee77831915012c77a6c244c39) + `once@1.3.1`: Wrap once with wrappy. ([@isaacs](https://github.com/isaacs)) +* [`01ec790`](https://github.com/npm/npm/commit/01ec790fd47def56eda6abb3b8d809093e8f493f) + `npm-user-validate@0.1.1`: Correct repository URL. + ([@robertkowalski](https://github.com/robertkowalski)) +* [`389e52c`](https://github.com/npm/npm/commit/389e52c2d94c818ca8935ccdcf392994fec564a2) + `glob@4.0.6`: Now absolutely requires `graceful-fs`. + ([@isaacs](https://github.com/isaacs)) +* [`e15ab15`](https://github.com/npm/npm/commit/e15ab15a27a8f14cf0d9dc6f11dee452080378a0) + `ini@1.3.0`: Tighten up whitespace handling. + ([@isaacs](https://github.com/isaacs)) +* [`7610f3e`](https://github.com/npm/npm/commit/7610f3e62e699292ece081bfd33084d436e3246d) + `archy@1.0.0` ([@substack](https://github.com/substack)) +* [`9c13149`](https://github.com/npm/npm/commit/9c1314985e513e20ffa3ea0ca333ba2ab78299c9) + `semver@4.1.0`: Add support for prerelease identifiers. + ([@bromanko](https://github.com/bromanko)) +* [`f096c25`](https://github.com/npm/npm/commit/f096c250441b031d758f03afbe8d2321f94c7703) + `graceful-fs@3.0.4`: Add a bunch of additional tests, skip the unfortunate + complications of `graceful-fs@3.0.3`. ([@isaacs](https://github.com/isaacs)) + +### v2.1.4 (2014-10-09): + +* [`3aeb440`](https://github.com/npm/npm/commit/3aeb4401444fad83cc7a8d11bf2507658afa5248) + [#6442](https://github.com/npm/npm/issues/6442) proxying git needs `GIT_SSL_CAINFO` + ([@wmertens](https://github.com/wmertens)) +* [`a8da8d6`](https://github.com/npm/npm/commit/a8da8d6e0cd56d97728c0b76b51604ee06ef6264) + [#6413](https://github.com/npm/npm/issues/6413) write builtin config on any + global npm install ([@isaacs](https://github.com/isaacs)) +* [`9e4d632`](https://github.com/npm/npm/commit/9e4d632c0142ba55df07d624667738b8727336fc) + [#6343](https://github.com/npm/npm/issues/6343) don't pass run arguments to + pre & post scripts ([@TheLudd](https://github.com/TheLudd)) +* [`d831b1f`](https://github.com/npm/npm/commit/d831b1f7ca1a9921ea5b394e39b7130ecbc6d7b4) + [#6399](https://github.com/npm/npm/issues/6399) race condition: inflight + installs, prevent `peerDependency` problems + ([@othiym23](https://github.com/othiym23)) +* [`82b775d`](https://github.com/npm/npm/commit/82b775d6ff34c4beb6c70b2344d491a9f2026577) + [#6384](https://github.com/npm/npm/issues/6384) race condition: inflight + caching by URL rather than semver range + ([@othiym23](https://github.com/othiym23)) +* [`7bee042`](https://github.com/npm/npm/commit/7bee0429066fedcc9e6e962c043eb740b3792809) + `inflight@1.0.4`: callback can take arbitrary number of parameters + ([@othiym23](https://github.com/othiym23)) +* [`3bff494`](https://github.com/npm/npm/commit/3bff494f4abf17d6d7e0e4a3a76cf7421ecec35a) + [#5195](https://github.com/npm/npm/issues/5195) fixed regex color regression + for `npm search` ([@chrismeyersfsu](https://github.com/chrismeyersfsu)) +* [`33ba2d5`](https://github.com/npm/npm/commit/33ba2d585160a0a2a322cb76c4cd989acadcc984) + [#6387](https://github.com/npm/npm/issues/6387) allow `npm view global` if + package is specified ([@evanlucas](https://github.com/evanlucas)) +* [`99c4cfc`](https://github.com/npm/npm/commit/99c4cfceed413396d952cf05f4e3c710f9682c23) + [#6388](https://github.com/npm/npm/issues/6388) npm-publish → + npm-developers(7) ([@kennydude](https://github.com/kennydude)) + +TEST CLEANUP EXTRAVAGANZA: + +* [`8d6bfcb`](https://github.com/npm/npm/commit/8d6bfcb88408f5885a2a67409854c43e5c3a23f6) + tap tests run with no system-wide side effects + ([@chrismeyersfsu](https://github.com/chrismeyersfsu)) +* [`7a1472f`](https://github.com/npm/npm/commit/7a1472fbdbe99956ad19f629e7eb1cc07ba026ef) + added npm cache cleanup script + ([@chrismeyersfsu](https://github.com/chrismeyersfsu)) +* [`0ce6a37`](https://github.com/npm/npm/commit/0ce6a3752fa9119298df15671254db6bc1d8e64c) + stripped out dead test code (othiym23) +* replace spawn with common.npm (@chrismeyersfsu): + * [`0dcd614`](https://github.com/npm/npm/commit/0dcd61446335eaf541bf5f2d5186ec1419f86a42) + test/tap/cache-shasum-fork.js + * [`97f861c`](https://github.com/npm/npm/commit/97f861c967606a7e51e3d5047cf805d9d1adea5a) + test/tap/false_name.js + * [`d01b3de`](https://github.com/npm/npm/commit/d01b3de6ce03f25bbf3db97bfcd3cc85830d6801) + test/tap/git-cache-locking.js + * [`7b63016`](https://github.com/npm/npm/commit/7b63016778124c6728d6bd89a045c841ae3900b6) + test/tap/pack-scoped.js + * [`c877553`](https://github.com/npm/npm/commit/c877553265c39673e03f0a97972f692af81a595d) + test/tap/scripts-whitespace-windows.js + * [`df98525`](https://github.com/npm/npm/commit/df98525331e964131299d457173c697cfb3d95b9) + test/tap/prepublish.js + * [`99c4cfc`](https://github.com/npm/npm/commit/99c4cfceed413396d952cf05f4e3c710f9682c23) + test/tap/prune.js + +### v2.1.3 (2014-10-02): + +BREAKING CHANGE FOR THE SQRT(i) PEOPLE ACTUALLY USING `npm submodule`: + +* [`1e64473`](https://github.com/npm/npm/commit/1e6447360207f45ad6188e5780fdf4517de6e23d) + `rm -rf npm submodule` command, which has been broken since the Carter + Administration ([@isaacs](https://github.com/isaacs)) + +BREAKING CHANGE IF YOU ARE FOR SOME REASON STILL USING NODE 0.6 AND YOU SHOULD +NOT BE DOING THAT CAN YOU NOT: + +* [`3e431f9`](https://github.com/npm/npm/commit/3e431f9d6884acb4cde8bcb8a0b122a76b33ee1d) + [joyent/node#8492](https://github.com/joyent/node/issues/8492) bye bye + customFds, hello stdio ([@othiym23](https://github.com/othiym23)) + +Other changes: + +* [`ea607a8`](https://github.com/npm/npm/commit/ea607a8a20e891ad38eed11b5ce2c3c0a65484b9) + [#6372](https://github.com/npm/npm/issues/6372) noisily error (without + aborting) on multi-{install,build} ([@othiym23](https://github.com/othiym23)) +* [`3ee2799`](https://github.com/npm/npm/commit/3ee2799b629fd079d2db21d7e8f25fa7fa1660d0) + [#6372](https://github.com/npm/npm/issues/6372) only make cache creation + requests in flight ([@othiym23](https://github.com/othiym23)) +* [`1a90ec2`](https://github.com/npm/npm/commit/1a90ec2f2cfbefc8becc6ef0c480e5edacc8a4cb) + [#6372](https://github.com/npm/npm/issues/6372) wait to put Git URLs in + flight until normalized ([@othiym23](https://github.com/othiym23)) +* [`664795b`](https://github.com/npm/npm/commit/664795bb7d8da7142417b3f4ef5986db3a394071) + [#6372](https://github.com/npm/npm/issues/6372) log what is and isn't in + flight ([@othiym23](https://github.com/othiym23)) +* [`00ef580`](https://github.com/npm/npm/commit/00ef58025a1f52dfabf2c4dc3898621d16a6e062) + `inflight@1.0.3`: fix largely theoretical race condition, because we really + really hate race conditions ([@isaacs](https://github.com/isaacs)) +* [`1cde465`](https://github.com/npm/npm/commit/1cde4658d897ae0f93ff1d65b258e1571b391182) + [#6363](https://github.com/npm/npm/issues/6363) + `realize-package-specifier@1.1.0`: handle local dependencies better + ([@iarna](https://github.com/iarna)) +* [`86f084c`](https://github.com/npm/npm/commit/86f084c6c6d7935cd85d72d9d94b8784c914d51e) + `realize-package-specifier@1.0.2`: dependency realization! in its own module! + ([@iarna](https://github.com/iarna)) +* [`553d830`](https://github.com/npm/npm/commit/553d830334552b83606b6bebefd821c9ea71e964) + `npm-package-arg@2.1.3`: simplified semver, better tests + ([@iarna](https://github.com/iarna)) +* [`bec9b61`](https://github.com/npm/npm/commit/bec9b61a316c19f5240657594f0905a92a474352) + `readable-stream@1.0.32`: for some reason + ([@rvagg](https://github.com/rvagg)) +* [`ff08ec5`](https://github.com/npm/npm/commit/ff08ec5f6d717bdbd559de0b2ede769306a9a763) + `dezalgo@1.0.1`: use wrappy for instrumentability + ([@isaacs](https://github.com/isaacs)) + +### v2.1.2 (2014-09-29): + +* [`a1aa20e`](https://github.com/npm/npm/commit/a1aa20e44bb8285c6be1e7fa63b9da920e3a70ed) + [#6282](https://github.com/npm/npm/issues/6282) + `normalize-package-data@1.0.3`: don't prune bundledDependencies + ([@isaacs](https://github.com/isaacs)) +* [`a1f5fe1`](https://github.com/npm/npm/commit/a1f5fe1005043ce20a06e8b17a3e201aa3215357) + move locks back into cache, now path-aware + ([@othiym23](https://github.com/othiym23)) +* [`a432c4b`](https://github.com/npm/npm/commit/a432c4b48c881294d6d79b5f41c2e1c16ad15a8a) + convert lib/utils/tar.js to use atomic streams + ([@othiym23](https://github.com/othiym23)) +* [`b8c3c74`](https://github.com/npm/npm/commit/b8c3c74a3c963564233204161cc263e0912c930b) + `fs-write-stream-atomic@1.0.2`: Now works with streams1 fs.WriteStreams. + ([@isaacs](https://github.com/isaacs)) +* [`c7ab76f`](https://github.com/npm/npm/commit/c7ab76f44cce5f42add5e3ba879bd10e7e00c3e6) + logging cleanup ([@othiym23](https://github.com/othiym23)) +* [`4b2d95d`](https://github.com/npm/npm/commit/4b2d95d0641435b09d047ae5cb2226f292bf38f0) + [#6329](https://github.com/npm/npm/issues/6329) efficiently validate tmp + tarballs safely ([@othiym23](https://github.com/othiym23)) + +### v2.1.1 (2014-09-26): + +* [`563225d`](https://github.com/npm/npm/commit/563225d813ea4c12f46d4f7821ac7f76ba8ee2d6) + [#6318](https://github.com/npm/npm/issues/6318) clean up locking; prefix + lockfile with "." ([@othiym23](https://github.com/othiym23)) +* [`c7f30e4`](https://github.com/npm/npm/commit/c7f30e4550fea882d31fcd4a55b681cd30713c44) + [#6318](https://github.com/npm/npm/issues/6318) remove locking code around + tarball packing and unpacking ([@othiym23](https://github.com/othiym23)) + +### v2.1.0 (2014-09-25): + +NEW FEATURE: + +* [`3635601`](https://github.com/npm/npm/commit/36356011b6f2e6a5a81490e85a0a44eb27199dd7) + [#5520](https://github.com/npm/npm/issues/5520) Add `'npm view .'`. + ([@evanlucas](https://github.com/evanlucas)) + +Other changes: + +* [`f24b552`](https://github.com/npm/npm/commit/f24b552b596d0627549cdd7c2d68fcf9006ea50a) + [#6294](https://github.com/npm/npm/issues/6294) Lock cache → lock cache + target. ([@othiym23](https://github.com/othiym23)) +* [`ad54450`](https://github.com/npm/npm/commit/ad54450104f94c82c501138b4eee488ce3a4555e) + [#6296](https://github.com/npm/npm/issues/6296) Ensure that npm-debug.log + file is created when rollbacks are done. + ([@isaacs](https://github.com/isaacs)) +* [`6810071`](https://github.com/npm/npm/commit/681007155a40ac9d165293bd6ec5d8a1423ccfca) + docs: Default loglevel "http" → "warn". + ([@othiym23](https://github.com/othiym23)) +* [`35ac89a`](https://github.com/npm/npm/commit/35ac89a940f23db875e882ce2888208395130336) + Skip installation of installed scoped packages. + ([@timoxley](https://github.com/timoxley)) +* [`e468527`](https://github.com/npm/npm/commit/e468527256ec599892b9b88d61205e061d1ab735) + Ensure cleanup executes for scripts-whitespace-windows test. + ([@timoxley](https://github.com/timoxley)) +* [`ef9101b`](https://github.com/npm/npm/commit/ef9101b7f346797749415086956a0394528a12c4) + Ensure cleanup executes for packed-scope test. + ([@timoxley](https://github.com/timoxley)) +* [`69b4d18`](https://github.com/npm/npm/commit/69b4d18cdbc2ae04c9afaffbd273b436a394f398) + `fs-write-stream-atomic@1.0.1`: Fix a race condition in our race-condition + fixer. ([@isaacs](https://github.com/isaacs)) +* [`26b17ff`](https://github.com/npm/npm/commit/26b17ff2e3b21ee26c6fdbecc8273520cff45718) + [#6272](https://github.com/npm/npm/issues/6272) `npmconf` decides what the + default prefix is. ([@othiym23](https://github.com/othiym23)) +* [`846faca`](https://github.com/npm/npm/commit/846facacc6427dafcf5756dcd36d9036539938de) + Fix development dependency is preferred over dependency. + ([@andersjanmyr](https://github.com/andersjanmyr)) +* [`9d1a9db`](https://github.com/npm/npm/commit/9d1a9db3af5adc48a7158a5a053eeb89ee41a0e7) + [#3265](https://github.com/npm/npm/issues/3265) Re-apply a71615a. Fixes + [#3265](https://github.com/npm/npm/issues/3265) again, with a test! + ([@glasser](https://github.com/glasser)) +* [`1d41db0`](https://github.com/npm/npm/commit/1d41db0b2744a7bd50971c35cc060ea0600fb4bf) + `marked-man@0.1.4`: Fixes formatting of synopsis blocks in man docs. + ([@kapouer](https://github.com/kapouer)) +* [`a623da0`](https://github.com/npm/npm/commit/a623da01bea1b2d3f3a18b9117cfd2d8e3cbdd77) + [#5867](https://github.com/npm/npm/issues/5867) Specify dummy git template + dir when cloning to prevent copying hooks. + ([@boneskull](https://github.com/boneskull)) + +### v2.0.2 (2014-09-19): + +* [`42c872b`](https://github.com/npm/npm/commit/42c872b32cadc0e555638fc78eab3a38a04401d8) + [#5920](https://github.com/npm/npm/issues/5920) + `fs-write-stream-atomic@1.0.0` ([@isaacs](https://github.com/isaacs)) +* [`6784767`](https://github.com/npm/npm/commit/6784767fe15e28b44c81a1d4bb1738c642a65d78) + [#5920](https://github.com/npm/npm/issues/5920) make all write streams atomic + ([@isaacs](https://github.com/isaacs)) +* [`f6fac00`](https://github.com/npm/npm/commit/f6fac000dd98ebdd5ea1d5921175735d463d328b) + [#5920](https://github.com/npm/npm/issues/5920) barf on 0-length cached + tarballs ([@isaacs](https://github.com/isaacs)) +* [`3b37592`](https://github.com/npm/npm/commit/3b37592a92ea98336505189ae8ca29248b0589f4) + `write-file-atomic@1.1.0`: use graceful-fs + ([@iarna](https://github.com/iarna)) + +### v2.0.1 (2014-09-18): + +* [`74c5ab0`](https://github.com/npm/npm/commit/74c5ab0a676793c6dc19a3fd5fe149f85fecb261) + [#6201](https://github.com/npm/npm/issues/6201) `npmconf@2.1.0`: scope + always-auth to registry URI ([@othiym23](https://github.com/othiym23)) +* [`774b127`](https://github.com/npm/npm/commit/774b127da1dd6fefe2f1299e73505d9146f00294) + [#6201](https://github.com/npm/npm/issues/6201) `npm-registry-client@3.2.2`: + use scoped always-auth settings ([@othiym23](https://github.com/othiym23)) +* [`f2d2190`](https://github.com/npm/npm/commit/f2d2190aa365d22378d03afab0da13f95614a583) + [#6201](https://github.com/npm/npm/issues/6201) support saving + `--always-auth` when logging in ([@othiym23](https://github.com/othiym23)) +* [`17c941a`](https://github.com/npm/npm/commit/17c941a2d583210fe97ed47e2968d94ce9f774ba) + [#6163](https://github.com/npm/npm/issues/6163) use `write-file-atomic` + instead of `fs.writeFile()` ([@fiws](https://github.com/fiws)) +* [`fb5724f`](https://github.com/npm/npm/commit/fb5724fd98e1509c939693568df83d11417ea337) + [#5925](https://github.com/npm/npm/issues/5925) `npm init -f`: allow `npm + init` to run without prompting + ([@michaelnisi](https://github.com/michaelnisi)) +* [`b706d63`](https://github.com/npm/npm/commit/b706d637d5965dbf8f7ce07dc5c4bc80887f30d8) + [#3059](https://github.com/npm/npm/issues/3059) disable prepublish when + running `npm install --production` + ([@jussi](https://github.com/jussi)-kalliokoski) +* [`119f068`](https://github.com/npm/npm/commit/119f068eae2a36fa8b9c9ca557c70377792243a4) + attach the node version used when publishing a package to its registry + metadata ([@othiym23](https://github.com/othiym23)) +* [`8fe0081`](https://github.com/npm/npm/commit/8fe008181665519c2ac201ee432a3ece9798c31f) + seriously, don't use `npm -g update npm` + ([@thomblake](https://github.com/thomblake)) +* [`ea5b3d4`](https://github.com/npm/npm/commit/ea5b3d446b86dcabb0dbc6dba374d3039342ecb3) + `request@2.44.0` ([@othiym23](https://github.com/othiym23)) + ### v2.0.0 (2014-09-12): BREAKING CHANGES: diff --git a/deps/npm/Makefile b/deps/npm/Makefile index fe2d963bbad844..34d4b62de27527 100644 --- a/deps/npm/Makefile +++ b/deps/npm/Makefile @@ -31,6 +31,28 @@ misc_mandocs = $(shell find doc/misc -name '*.md' \ |sed 's|doc/misc/|man/man7/|g' ) \ man/man7/npm-index.7 + +cli_partdocs = $(shell find doc/cli -name '*.md' \ + |sed 's|.md|.html|g' \ + |sed 's|doc/cli/|html/partial/doc/cli/|g' ) \ + html/partial/doc/README.html + +api_partdocs = $(shell find doc/api -name '*.md' \ + |sed 's|.md|.html|g' \ + |sed 's|doc/api/|html/partial/doc/api/|g' ) + +files_partdocs = $(shell find doc/files -name '*.md' \ + |sed 's|.md|.html|g' \ + |sed 's|doc/files/|html/partial/doc/files/|g' ) \ + html/partial/doc/files/npm-json.html \ + html/partial/doc/files/npm-global.html + +misc_partdocs = $(shell find doc/misc -name '*.md' \ + |sed 's|.md|.html|g' \ + |sed 's|doc/misc/|html/partial/doc/misc/|g' ) \ + html/partial/doc/index.html + + cli_htmldocs = $(shell find doc/cli -name '*.md' \ |sed 's|.md|.html|g' \ |sed 's|doc/cli/|html/doc/cli/|g' ) \ @@ -53,6 +75,8 @@ misc_htmldocs = $(shell find doc/misc -name '*.md' \ mandocs = $(api_mandocs) $(cli_mandocs) $(files_mandocs) $(misc_mandocs) +partdocs = $(api_partdocs) $(cli_partdocs) $(files_partdocs) $(misc_partdocs) + htmldocs = $(api_htmldocs) $(cli_htmldocs) $(files_htmldocs) $(misc_htmldocs) all: doc @@ -63,7 +87,7 @@ latest: @echo "in this folder that you're looking at right now." node cli.js install -g -f npm -install: docclean all +install: all node cli.js install -g -f # backwards compat @@ -79,7 +103,7 @@ clean: markedclean marked-manclean doc-clean uninstall uninstall: node cli.js rm npm -g -f -doc: $(mandocs) $(htmldocs) +doc: $(mandocs) $(htmldocs) $(partdocs) markedclean: rm -rf node_modules/marked node_modules/.bin/marked .building_marked @@ -119,43 +143,73 @@ man/man5/%.5: doc/files/%.md scripts/doc-build.sh package.json @[ -d man/man5 ] || mkdir -p man/man5 scripts/doc-build.sh $< $@ +man/man7/%.7: doc/misc/%.md scripts/doc-build.sh package.json + @[ -d man/man7 ] || mkdir -p man/man7 + scripts/doc-build.sh $< $@ + + doc/misc/npm-index.md: scripts/index-build.js package.json node scripts/index-build.js > $@ -html/doc/index.html: doc/misc/npm-index.md $(html_docdeps) - @[ -d html/doc ] || mkdir -p html/doc - scripts/doc-build.sh $< $@ -man/man7/%.7: doc/misc/%.md scripts/doc-build.sh package.json - @[ -d man/man7 ] || mkdir -p man/man7 +# html/doc depends on html/partial/doc +html/doc/%.html: html/partial/doc/%.html + @[ -d html/doc ] || mkdir -p html/doc scripts/doc-build.sh $< $@ -html/doc/README.html: README.md $(html_docdeps) +html/doc/README.html: html/partial/doc/README.html @[ -d html/doc ] || mkdir -p html/doc scripts/doc-build.sh $< $@ -html/doc/cli/%.html: doc/cli/%.md $(html_docdeps) +html/doc/cli/%.html: html/partial/doc/cli/%.html @[ -d html/doc/cli ] || mkdir -p html/doc/cli scripts/doc-build.sh $< $@ -html/doc/api/%.html: doc/api/%.md $(html_docdeps) +html/doc/misc/%.html: html/partial/doc/misc/%.html + @[ -d html/doc/misc ] || mkdir -p html/doc/misc + scripts/doc-build.sh $< $@ + +html/doc/files/%.html: html/partial/doc/files/%.html + @[ -d html/doc/files ] || mkdir -p html/doc/files + scripts/doc-build.sh $< $@ + +html/doc/api/%.html: html/partial/doc/api/%.html @[ -d html/doc/api ] || mkdir -p html/doc/api scripts/doc-build.sh $< $@ -html/doc/files/npm-json.html: html/doc/files/package.json.html + +html/partial/doc/index.html: doc/misc/npm-index.md $(html_docdeps) + @[ -d html/partial/doc ] || mkdir -p html/partial/doc + scripts/doc-build.sh $< $@ + +html/partial/doc/README.html: README.md $(html_docdeps) + @[ -d html/partial/doc ] || mkdir -p html/partial/doc + scripts/doc-build.sh $< $@ + +html/partial/doc/cli/%.html: doc/cli/%.md $(html_docdeps) + @[ -d html/partial/doc/cli ] || mkdir -p html/partial/doc/cli + scripts/doc-build.sh $< $@ + +html/partial/doc/api/%.html: doc/api/%.md $(html_docdeps) + @[ -d html/partial/doc/api ] || mkdir -p html/partial/doc/api + scripts/doc-build.sh $< $@ + +html/partial/doc/files/npm-json.html: html/partial/doc/files/package.json.html cp $< $@ -html/doc/files/npm-global.html: html/doc/files/npm-folders.html +html/partial/doc/files/npm-global.html: html/partial/doc/files/npm-folders.html cp $< $@ -html/doc/files/%.html: doc/files/%.md $(html_docdeps) - @[ -d html/doc/files ] || mkdir -p html/doc/files +html/partial/doc/files/%.html: doc/files/%.md $(html_docdeps) + @[ -d html/partial/doc/files ] || mkdir -p html/partial/doc/files scripts/doc-build.sh $< $@ -html/doc/misc/%.html: doc/misc/%.md $(html_docdeps) - @[ -d html/doc/misc ] || mkdir -p html/doc/misc +html/partial/doc/misc/%.html: doc/misc/%.md $(html_docdeps) + @[ -d html/partial/doc/misc ] || mkdir -p html/partial/doc/misc scripts/doc-build.sh $< $@ + + marked: node_modules/.bin/marked node_modules/.bin/marked: diff --git a/deps/npm/README.md b/deps/npm/README.md index 19ced3a81f31c0..ecb3f29e291bc9 100644 --- a/deps/npm/README.md +++ b/deps/npm/README.md @@ -154,7 +154,7 @@ use npm itself to do. if (er) return commandFailed(er) // command succeeded, and data might have some info }) - npm.on("log", function (message) { .... }) + npm.registry.log.on("log", function (message) { .... }) }) The `load` function takes an object hash of the command-line configs. diff --git a/deps/npm/bin/npm-cli.js b/deps/npm/bin/npm-cli.js index ed81a989a3de86..ace40ca791c459 100755 --- a/deps/npm/bin/npm-cli.js +++ b/deps/npm/bin/npm-cli.js @@ -21,7 +21,7 @@ log.info("it worked if it ends with", "ok") var path = require("path") , npm = require("../lib/npm.js") - , npmconf = require("npmconf") + , npmconf = require("../lib/config/core.js") , errorHandler = require("../lib/utils/error-handler.js") , configDefs = npmconf.defs diff --git a/deps/npm/doc/api/npm-bin.md b/deps/npm/doc/api/npm-bin.md index f3dc48286d372f..bd27af2fdca30e 100644 --- a/deps/npm/doc/api/npm-bin.md +++ b/deps/npm/doc/api/npm-bin.md @@ -10,4 +10,4 @@ npm-bin(3) -- Display npm bin folder Print the folder where npm will install executables. This function should not be used programmatically. Instead, just refer -to the `npm.bin` member. +to the `npm.bin` property. diff --git a/deps/npm/doc/api/npm-help-search.md b/deps/npm/doc/api/npm-help-search.md index 5c00cfc177d2e0..01b235ce72b4bd 100644 --- a/deps/npm/doc/api/npm-help-search.md +++ b/deps/npm/doc/api/npm-help-search.md @@ -27,4 +27,4 @@ array of results is returned. Each result is an object with these properties: * file: Name of the file that matched -The silent parameter is not neccessary not used, but it may in the future. +The silent parameter is not necessary not used, but it may in the future. diff --git a/deps/npm/doc/api/npm-load.md b/deps/npm/doc/api/npm-load.md index a95a6b295daa29..de412aff5b87b5 100644 --- a/deps/npm/doc/api/npm-load.md +++ b/deps/npm/doc/api/npm-load.md @@ -10,9 +10,9 @@ npm-load(3) -- Load config settings npm.load() must be called before any other function call. Both parameters are optional, but the second is recommended. -The first parameter is an object hash of command-line config params, and the -second parameter is a callback that will be called when npm is loaded and -ready to serve. +The first parameter is an object containing command-line config params, and the +second parameter is a callback that will be called when npm is loaded and ready +to serve. The first parameter should follow a similar structure as the package.json config object. diff --git a/deps/npm/doc/api/npm-submodule.md b/deps/npm/doc/api/npm-submodule.md deleted file mode 100644 index 2d8bafaa311d12..00000000000000 --- a/deps/npm/doc/api/npm-submodule.md +++ /dev/null @@ -1,28 +0,0 @@ -npm-submodule(3) -- Add a package as a git submodule -==================================================== - -## SYNOPSIS - - npm.commands.submodule(packages, callback) - -## DESCRIPTION - -For each package specified, npm will check if it has a git repository url -in its package.json description then add it as a git submodule at -`node_modules/`. - -This is a convenience only. From then on, it's up to you to manage -updates by using the appropriate git commands. npm will stubbornly -refuse to update, modify, or remove anything with a `.git` subfolder -in it. - -This command also does not install missing dependencies, if the package -does not include them in its git repository. If `npm ls` reports that -things are missing, you can either install, link, or submodule them yourself, -or you can do `npm explore -- npm install` to install the -dependencies into the submodule folder. - -## SEE ALSO - -* npm help json -* git help submodule diff --git a/deps/npm/doc/api/npm.md b/deps/npm/doc/api/npm.md index d05684e8b9d261..4b4dfcaddd2c6d 100644 --- a/deps/npm/doc/api/npm.md +++ b/deps/npm/doc/api/npm.md @@ -25,13 +25,12 @@ This is the API documentation for npm. To find documentation of the command line client, see `npm(1)`. -Prior to using npm's commands, `npm.load()` must be called. -If you provide `configObject` as an object hash of top-level -configs, they override the values stored in the various config -locations. In the npm command line client, this set of configs -is parsed from the command line options. Additional configuration -params are loaded from two configuration files. See `npm-config(1)`, -`npm-config(7)`, and `npmrc(5)` for more information. +Prior to using npm's commands, `npm.load()` must be called. If you provide +`configObject` as an object map of top-level configs, they override the values +stored in the various config locations. In the npm command line client, this +set of configs is parsed from the command line options. Additional +configuration params are loaded from two configuration files. See +`npm-config(1)`, `npm-config(7)`, and `npmrc(5)` for more information. After that, each of the functions are accessible in the commands object: `npm.commands.`. See `npm-index(7)` for a list of @@ -88,9 +87,9 @@ command. ## MAGIC -For each of the methods in the `npm.commands` hash, a method is added to -the npm object, which takes a set of positional string arguments rather -than an array and a callback. +For each of the methods in the `npm.commands` object, a method is added to the +npm object, which takes a set of positional string arguments rather than an +array and a callback. If the last argument is a callback, then it will use the supplied callback. However, if no callback is provided, then it will print out diff --git a/deps/npm/doc/cli/npm-adduser.md b/deps/npm/doc/cli/npm-adduser.md index d60d6e9a073b57..54e785b07fefb4 100644 --- a/deps/npm/doc/cli/npm-adduser.md +++ b/deps/npm/doc/cli/npm-adduser.md @@ -3,7 +3,7 @@ npm-adduser(1) -- Add a registry user account ## SYNOPSIS - npm adduser [--registry=url] [--scope=@orgname] + npm adduser [--registry=url] [--scope=@orgname] [--always-auth] ## DESCRIPTION @@ -45,6 +45,21 @@ e.g. This will set a registry for the given scope and login or create a user for that registry at the same time. +### always-auth + +Default: false + +If specified, save configuration indicating that all requests to the given +registry should include authorization information. Useful for private +registries. Can be used with `--registry` and / or `--scope`, e.g. + + npm adduser --registry=http://private-registry.example.com --always-auth + +This will ensure that all requests to that registry (including for tarballs) +include an authorization header. See `always-auth` in `npm-config(7)` for more +details on always-auth. Registry-specific configuaration of `always-auth` takes +precedence over any global configuration. + ## SEE ALSO * npm-registry(7) diff --git a/deps/npm/doc/cli/npm-explore.md b/deps/npm/doc/cli/npm-explore.md index 3642d7399d03c5..fded5340870776 100644 --- a/deps/npm/doc/cli/npm-explore.md +++ b/deps/npm/doc/cli/npm-explore.md @@ -32,7 +32,6 @@ The shell to run for the `npm explore` command. ## SEE ALSO -* npm-submodule(1) * npm-folders(5) * npm-edit(1) * npm-rebuild(1) diff --git a/deps/npm/doc/cli/npm-init.md b/deps/npm/doc/cli/npm-init.md index bd63a8879daa69..08e517d79a4672 100644 --- a/deps/npm/doc/cli/npm-init.md +++ b/deps/npm/doc/cli/npm-init.md @@ -3,7 +3,7 @@ npm-init(1) -- Interactively create a package.json file ## SYNOPSIS - npm init + npm init [-f|--force|-y|--yes] ## DESCRIPTION @@ -18,6 +18,9 @@ the options in there. It is strictly additive, so it does not delete options from your package.json without a really good reason to do so. +If you invoke it with `-f`, `--force`, `-y`, or `--yes`, it will use only +defaults and not prompt you for any options. + ## SEE ALSO * diff --git a/deps/npm/doc/cli/npm-publish.md b/deps/npm/doc/cli/npm-publish.md index 8860b88fc7d55c..30e816c7fdf20c 100644 --- a/deps/npm/doc/cli/npm-publish.md +++ b/deps/npm/doc/cli/npm-publish.md @@ -9,7 +9,9 @@ npm-publish(1) -- Publish a package ## DESCRIPTION -Publishes a package to the registry so that it can be installed by name. +Publishes a package to the registry so that it can be installed by name. See +`npm-developers(7)` for details on what's included in the published package, as +well as details on how the package is built. By default npm will publish to the public registry. This can be overridden by specifying a different default registry or using a `npm-scope(7)` in the name diff --git a/deps/npm/doc/cli/npm-restart.md b/deps/npm/doc/cli/npm-restart.md index 7b039a8f8f1baf..6d594a26c1bdcc 100644 --- a/deps/npm/doc/cli/npm-restart.md +++ b/deps/npm/doc/cli/npm-restart.md @@ -7,11 +7,8 @@ npm-restart(1) -- Start a package ## DESCRIPTION -This runs a package's "restart" script, if one was provided. -Otherwise it runs package's "stop" script, if one was provided, and then -the "start" script. - -If no version is specified, then it restarts the "active" version. +This runs a package's "restart" script, if one was provided. Otherwise it runs +package's "stop" script, if one was provided, and then the "start" script. ## SEE ALSO diff --git a/deps/npm/doc/cli/npm-run-script.md b/deps/npm/doc/cli/npm-run-script.md index 09a546b9a81fa4..74f416e0bec8c6 100644 --- a/deps/npm/doc/cli/npm-run-script.md +++ b/deps/npm/doc/cli/npm-run-script.md @@ -16,6 +16,16 @@ is provided, it will list the available top level scripts. It is used by the test, start, restart, and stop commands, but can be called directly, as well. +As of [`npm@2.0.0`](http://blog.npmjs.org/post/98131109725/npm-2-0-0), you can +use custom arguments when executing scripts. The special option `--` is used by +[getopt](http://goo.gl/KxMmtG) to delimit the end of the options. npm will pass +all the arguments after the `--` directly to your script: + + npm run test -- --grep="pattern" + +The arguments will only be passed to the script specified after ```npm run``` +and not to any pre or post script. + ## SEE ALSO * npm-scripts(7) diff --git a/deps/npm/doc/cli/npm-submodule.md b/deps/npm/doc/cli/npm-submodule.md deleted file mode 100644 index 7f0fbfc9fbf7c6..00000000000000 --- a/deps/npm/doc/cli/npm-submodule.md +++ /dev/null @@ -1,28 +0,0 @@ -npm-submodule(1) -- Add a package as a git submodule -==================================================== - -## SYNOPSIS - - npm submodule - -## DESCRIPTION - -If the specified package has a git repository url in its package.json -description, then this command will add it as a git submodule at -`node_modules/`. - -This is a convenience only. From then on, it's up to you to manage -updates by using the appropriate git commands. npm will stubbornly -refuse to update, modify, or remove anything with a `.git` subfolder -in it. - -This command also does not install missing dependencies, if the package -does not include them in its git repository. If `npm ls` reports that -things are missing, you can either install, link, or submodule them yourself, -or you can do `npm explore -- npm install` to install the -dependencies into the submodule folder. - -## SEE ALSO - -* package.json(5) -* git help submodule diff --git a/deps/npm/doc/files/package.json.md b/deps/npm/doc/files/package.json.md index 82b94052243871..1138bc2749e699 100644 --- a/deps/npm/doc/files/package.json.md +++ b/deps/npm/doc/files/package.json.md @@ -219,7 +219,7 @@ will create entries for `man foo` and `man 2 foo` The CommonJS [Packages](http://wiki.commonjs.org/wiki/Packages/1.0) spec details a few ways that you can indicate the structure of your package using a `directories` -hash. If you look at [npm's package.json](http://registry.npmjs.org/npm/latest), +object. If you look at [npm's package.json](http://registry.npmjs.org/npm/latest), you'll see that it has directories for doc, lib, and man. In the future, this information may be used in other creative ways. @@ -231,10 +231,10 @@ with the lib folder in any way, but it's useful meta info. ### directories.bin -If you specify a "bin" directory, then all the files in that folder will -be used as the "bin" hash. +If you specify a `bin` directory, then all the files in that folder will +be added as children of the `bin` path. -If you have a "bin" hash already, then this has no effect. +If you have a `bin` path already, then this has no effect. ### directories.man @@ -274,7 +274,7 @@ html project page that you put in your browser. It's for computers. ## scripts -The "scripts" member is an object hash of script commands that are run +The "scripts" property is a dictionary containing script commands that are run at various times in the lifecycle of your package. The key is the lifecycle event, and the value is the command to run at that point. @@ -282,9 +282,9 @@ See `npm-scripts(7)` to find out more about writing package scripts. ## config -A "config" hash can be used to set configuration -parameters used in package scripts that persist across upgrades. For -instance, if a package had the following: +A "config" object can be used to set configuration parameters used in package +scripts that persist across upgrades. For instance, if a package had the +following: { "name" : "foo" , "config" : { "port" : "8080" } } @@ -298,13 +298,13 @@ configs. ## dependencies -Dependencies are specified with a simple hash of package name to +Dependencies are specified in a simple object that maps a package name to a version range. The version range is a string which has one or more -space-separated descriptors. Dependencies can also be identified with -a tarball or git URL. +space-separated descriptors. Dependencies can also be identified with a +tarball or git URL. **Please do not put test harnesses or transpilers in your -`dependencies` hash.** See `devDependencies`, below. +`dependencies` object.** See `devDependencies`, below. See semver(7) for more details about specifying version ranges. @@ -340,7 +340,7 @@ For example, these are all valid: , "two" : "2.x" , "thr" : "3.3.x" , "lat" : "latest" - , "dyl" : "~/projects/dyl" + , "dyl" : "file:../dyl" } } @@ -378,14 +378,25 @@ As of version 1.1.65, you can refer to GitHub urls as just "foo": "user/foo-proj ## Local Paths -As of version 2.0.0 you can provide a path to a local directory that -contains a package. Local paths can be in the form: +As of version 2.0.0 you can provide a path to a local directory that contains a +package. Local paths can be saved using `npm install --save`, using any of +these forms: ../foo/bar ~/foo/bar ./foo/bar /foo/bar +in which case they will be normalized to a relative path and added to your +`package.json`. For example: + + { + "name": "baz", + "dependencies": { + "bar": "file:../foo/bar" + } + } + This feature is helpful for local offline development and creating tests that require npm installing where you don't want to hit an external server, but should not be used when publishing packages @@ -397,8 +408,8 @@ If someone is planning on downloading and using your module in their program, then they probably don't want or need to download and build the external test or documentation framework that you use. -In this case, it's best to list these additional items in a -`devDependencies` hash. +In this case, it's best to map these additional items in a `devDependencies` +object. These things will be installed when doing `npm link` or `npm install` from the root of a package, and can be managed like any other npm @@ -469,11 +480,11 @@ If this is spelled `"bundleDependencies"`, then that is also honorable. ## optionalDependencies -If a dependency can be used, but you would like npm to proceed if it -cannot be found or fails to install, then you may put it in the -`optionalDependencies` hash. This is a map of package name to version -or url, just like the `dependencies` hash. The difference is that -failure is tolerated. +If a dependency can be used, but you would like npm to proceed if it cannot be +found or fails to install, then you may put it in the `optionalDependencies` +object. This is a map of package name to version or url, just like the +`dependencies` object. The difference is that build failures do not cause +installation to fail. It is still your program's responsibility to handle the lack of the dependency. For example, something like this: @@ -521,12 +532,12 @@ field is advisory only. ## engineStrict If you are sure that your module will *definitely not* run properly on -versions of Node/npm other than those specified in the `engines` hash, +versions of Node/npm other than those specified in the `engines` object, then you can set `"engineStrict": true` in your package.json file. This will override the user's `engine-strict` config setting. Please do not do this unless you are really very very sure. If your -engines hash is something overly restrictive, you can quite easily and +engines object is something overly restrictive, you can quite easily and inadvertently lock yourself into obscurity and prevent your users from updating to new versions of Node. Consider this choice carefully. If people abuse it, it will be removed in a future version of npm. @@ -575,11 +586,11 @@ does help prevent some confusion if it doesn't work as expected. If you set `"private": true` in your package.json, then npm will refuse to publish it. -This is a way to prevent accidental publication of private repositories. -If you would like to ensure that a given package is only ever published -to a specific registry (for example, an internal registry), -then use the `publishConfig` hash described below -to override the `registry` config param at publish-time. +This is a way to prevent accidental publication of private repositories. If +you would like to ensure that a given package is only ever published to a +specific registry (for example, an internal registry), then use the +`publishConfig` dictionary described below to override the `registry` config +param at publish-time. ## publishConfig diff --git a/deps/npm/doc/misc/npm-coding-style.md b/deps/npm/doc/misc/npm-coding-style.md index b6a4a620fb6e34..80609f4f2fef7f 100644 --- a/deps/npm/doc/misc/npm-coding-style.md +++ b/deps/npm/doc/misc/npm-coding-style.md @@ -147,7 +147,7 @@ Use appropriate log levels. See `npm-config(7)` and search for ## Case, naming, etc. Use `lowerCamelCase` for multiword identifiers when they refer to objects, -functions, methods, members, or anything not specified in this section. +functions, methods, properties, or anything not specified in this section. Use `UpperCamelCase` for class names (things that you'd pass to "new"). diff --git a/deps/npm/doc/misc/npm-config.md b/deps/npm/doc/misc/npm-config.md index 8b5ae12c0d0692..6e7d995dd8e5d9 100644 --- a/deps/npm/doc/misc/npm-config.md +++ b/deps/npm/doc/misc/npm-config.md @@ -384,35 +384,35 @@ documentation for the [init-package-json](https://github.com/isaacs/init-package-json) module for more information, or npm-init(1). -### init.author.name +### init-author-name * Default: "" * Type: String The value `npm init` should use by default for the package author's name. -### init.author.email +### init-author-email * Default: "" * Type: String The value `npm init` should use by default for the package author's email. -### init.author.url +### init-author-url * Default: "" * Type: String The value `npm init` should use by default for the package author's homepage. -### init.license +### init-license * Default: "ISC" * Type: String The value `npm init` should use by default for the package license. -### init.version +### init-version * Default: "0.0.0" * Type: semver @@ -464,7 +464,7 @@ to the npm registry. Must be IPv4 in versions of Node prior to 0.12. ### loglevel -* Default: "http" +* Default: "warn" * Type: String * Values: "silent", "error", "warn", "http", "info", "verbose", "silly" @@ -472,7 +472,7 @@ What level of logs to report. On failure, *all* logs are written to `npm-debug.log` in the current working directory. Any logs of a higher level than the setting are shown. -The default is "http", which shows http, warn, and error output. +The default is "warn", which shows warn and error output. ### logstream @@ -510,7 +510,7 @@ Any "%s" in the message will be replaced with the version number. * Default: process.version * Type: semver or false -The node version to use when checking package's "engines" hash. +The node version to use when checking a package's `engines` map. ### npat @@ -532,7 +532,7 @@ usage. * Default: true * Type: Boolean -Attempt to install packages in the `optionalDependencies` hash. Note +Attempt to install packages in the `optionalDependencies` object. Note that if these packages fail to install, the overall installation process is not aborted. @@ -610,8 +610,8 @@ Remove failed installs. Save installed packages to a package.json file as dependencies. -When used with the `npm rm` command, it removes it from the dependencies -hash. +When used with the `npm rm` command, it removes it from the `dependencies` +object. Only works if there is already a package.json file present. @@ -632,10 +632,10 @@ bundledDependencies list. * Default: false * Type: Boolean -Save installed packages to a package.json file as devDependencies. +Save installed packages to a package.json file as `devDependencies`. When used with the `npm rm` command, it removes it from the -devDependencies hash. +`devDependencies` object. Only works if there is already a package.json file present. @@ -657,7 +657,7 @@ Save installed packages to a package.json file as optionalDependencies. When used with the `npm rm` command, it removes it from the -devDependencies hash. +`devDependencies` object. Only works if there is already a package.json file present. @@ -848,8 +848,8 @@ Only relevant when specified explicitly on the command line. * Default: false * Type: boolean -If true, output the npm version as well as node's `process.versions` -hash, and exit successfully. +If true, output the npm version as well as node's `process.versions` map, and +exit successfully. Only relevant when specified explicitly on the command line. diff --git a/deps/npm/doc/misc/npm-developers.md b/deps/npm/doc/misc/npm-developers.md index 5e53301f38300a..f6ea01176fae9a 100644 --- a/deps/npm/doc/misc/npm-developers.md +++ b/deps/npm/doc/misc/npm-developers.md @@ -76,7 +76,7 @@ least, you need: * scripts: If you have a special compilation or installation script, then you - should put it in the `scripts` hash. You should definitely have at + should put it in the `scripts` object. You should definitely have at least a basic smoke-test command as the "scripts.test" field. See npm-scripts(7). @@ -86,8 +86,8 @@ least, you need: then you need to specify that in the "main" field. * directories: - This is a hash of folders. The best ones to include are "lib" and - "doc", but if you specify a folder full of man pages in "man", then + This is an object mapping names to folders. The best ones to include are + "lib" and "doc", but if you use "man" to specify a folder full of man pages, they'll get installed just like these ones. You can use `npm init` in the root of your package in order to get you diff --git a/deps/npm/doc/misc/npm-faq.md b/deps/npm/doc/misc/npm-faq.md index 4dca3cd71efb0d..72891271f95be9 100644 --- a/deps/npm/doc/misc/npm-faq.md +++ b/deps/npm/doc/misc/npm-faq.md @@ -135,7 +135,7 @@ Arguments are greps. `npm search jsdom` shows jsdom packages. ## How do I update npm? - npm update npm -g + npm install npm -g You can also update all outdated local packages by doing `npm update` without any arguments, or global packages by doing `npm update -g`. diff --git a/deps/npm/doc/misc/npm-index.md b/deps/npm/doc/misc/npm-index.md index cf969868f96de7..9c804bf802c409 100644 --- a/deps/npm/doc/misc/npm-index.md +++ b/deps/npm/doc/misc/npm-index.md @@ -161,10 +161,6 @@ Start a package Stop a package -### npm-submodule(1) - -Add a package as a git submodule - ### npm-tag(1) Tag a published version @@ -325,10 +321,6 @@ Start a package Stop a package -### npm-submodule(3) - -Add a package as a git submodule - ### npm-tag(3) Tag a published version diff --git a/deps/npm/doc/misc/npm-scope.md b/deps/npm/doc/misc/npm-scope.md index a4ee1a0825cc11..66a9255d66d200 100644 --- a/deps/npm/doc/misc/npm-scope.md +++ b/deps/npm/doc/misc/npm-scope.md @@ -25,8 +25,8 @@ scoped modules will be in `node_modules/@myorg/packagename`. The scope folder (`@myorg`) is simply the name of the scope preceded by an @-symbol, and can contain any number of scoped packages. -A scoped package is install by referencing it by name, preceded by an @-symbol, -in `npm install`: +A scoped package is installed by referencing it by name, preceded by an +@-symbol, in `npm install`: npm install @myorg/mypackage diff --git a/deps/npm/doc/misc/npm-scripts.md b/deps/npm/doc/misc/npm-scripts.md index 7ef8fb10d135da..054886b4d548c5 100644 --- a/deps/npm/doc/misc/npm-scripts.md +++ b/deps/npm/doc/misc/npm-scripts.md @@ -3,7 +3,7 @@ npm-scripts(7) -- How npm handles the "scripts" field ## DESCRIPTION -npm supports the "scripts" member of the package.json script, for the +npm supports the "scripts" property of the package.json script, for the following scripts: * prepublish: @@ -33,9 +33,10 @@ following scripts: Run by the `npm restart` command. Note: `npm restart` will run the stop and start scripts if no `restart` script is provided. -Additionally, arbitrary scripts can be executed by running `npm run-script - `. *Pre* and *post* commands with matching names will be run for -those as well (e.g. `premyscript`, `myscript`, `postmyscript`). +Additionally, arbitrary scripts can be executed by running `npm +run-script `. *Pre* and *post* commands with matching +names will be run for those as well (e.g. `premyscript`, `myscript`, +`postmyscript`). ## NOTE: INSTALL SCRIPTS ARE AN ANTIPATTERN @@ -136,7 +137,7 @@ Configuration parameters are put in the environment with the `npm_config_` prefix. For instance, you can view the effective `root` config by checking the `npm_config_root` environment variable. -### Special: package.json "config" hash +### Special: package.json "config" object The package.json "config" keys are overwritten in the environment if there is a config param of `[@]:`. For example, diff --git a/deps/npm/doc/misc/semver.md b/deps/npm/doc/misc/semver.md index af83d717c9d134..bd697d959e1d5d 100644 --- a/deps/npm/doc/misc/semver.md +++ b/deps/npm/doc/misc/semver.md @@ -140,7 +140,7 @@ numeric values in the `[major, minor, patch]` tuple. A partial version range is treated as an X-Range, so the special character is in fact optional. -* `` (empty string) := `*` := `>=0.0.0` +* `""` (empty string) := `*` := `>=0.0.0` * `1` := `1.x.x` := `>=1.0.0 <2.0.0` * `1.2` := `1.2.x` := `>=1.2.0 <1.3.0` diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html index 64bb15f3196749..96bc06401a00c8 100644 --- a/deps/npm/html/doc/README.html +++ b/deps/npm/html/doc/README.html @@ -108,7 +108,7 @@

Using npm Programmatically

if (er) return commandFailed(er) // command succeeded, and data might have some info }) - npm.on("log", function (message) { .... }) + npm.registry.log.on("log", function (message) { .... }) })

The load function takes an object hash of the command-line configs. The various npm.commands.<cmd> functions take an array of @@ -141,7 +141,7 @@

If you have a complaint about a package in the public npm registry, and cannot resolve it with the package owner, please email -support@npmjs.com and explain the situation.

+support@npmjs.com and explain the situation.

Any data published to The npm Registry (including user account information) may be removed or modified at the sole discretion of the npm server administrators.

@@ -161,7 +161,7 @@

BUGS

  • web: https://github.com/npm/npm/issues
  • email: -npm-@googlegroups.com
    • +npm-@googlegroups.com

    Be sure to include all of the output from the npm command that didn't work as expected. The npm-debug.log file is also helpful to provide.

    @@ -169,10 +169,10 @@

    BUGS

    will no doubt tell you to put the output in a gist or email.

    SEE ALSO

    @@ -186,5 +186,5 @@

    SEE ALSO

           - + diff --git a/deps/npm/html/doc/api/npm-bin.html b/deps/npm/html/doc/api/npm-bin.html index ec775346b5f451..a25612475695ce 100644 --- a/deps/npm/html/doc/api/npm-bin.html +++ b/deps/npm/html/doc/api/npm-bin.html @@ -15,7 +15,7 @@

    SYNOPSIS

    DESCRIPTION

    Print the folder where npm will install executables.

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

    +to the npm.bin property.

    @@ -28,5 +28,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-bugs.html b/deps/npm/html/doc/api/npm-bugs.html index cc941e0233caa4..9cf2cc4131fc22 100644 --- a/deps/npm/html/doc/api/npm-bugs.html +++ b/deps/npm/html/doc/api/npm-bugs.html @@ -33,5 +33,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-cache.html b/deps/npm/html/doc/api/npm-cache.html index 2bd5bb527c0e68..6dfc4a0e5cc3bf 100644 --- a/deps/npm/html/doc/api/npm-cache.html +++ b/deps/npm/html/doc/api/npm-cache.html @@ -18,7 +18,7 @@

    SYNOPSIS

    npm.commands.cache.add([args], callback) npm.commands.cache.read(name, version, forceBypass, callback)

    DESCRIPTION

    -

    This acts much the same ways as the npm-cache(1) command line +

    This acts much the same ways as the npm-cache(1) command line functionality.

    The callback is called with the package.json data of the thing that is eventually added to or read from the cache.

    @@ -42,5 +42,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-commands.html b/deps/npm/html/doc/api/npm-commands.html index 577eae8d06e9c6..3f3ae544e99c43 100644 --- a/deps/npm/html/doc/api/npm-commands.html +++ b/deps/npm/html/doc/api/npm-commands.html @@ -22,7 +22,7 @@

    SYNOPSIS

    usage, or man 3 npm-<command> for programmatic usage.

    SEE ALSO

    @@ -36,5 +36,5 @@

    SEE ALSO

           - + diff --git a/deps/npm/html/doc/api/npm-config.html b/deps/npm/html/doc/api/npm-config.html index 37313a90ba2fe6..3767a46aca5fb8 100644 --- a/deps/npm/html/doc/api/npm-config.html +++ b/deps/npm/html/doc/api/npm-config.html @@ -43,7 +43,7 @@

    SYNOPSIS

    functions instead.

    SEE ALSO

    @@ -57,5 +57,5 @@

    SEE ALSO

           - + diff --git a/deps/npm/html/doc/api/npm-deprecate.html b/deps/npm/html/doc/api/npm-deprecate.html index dda88578a82755..a235c2baa96a33 100644 --- a/deps/npm/html/doc/api/npm-deprecate.html +++ b/deps/npm/html/doc/api/npm-deprecate.html @@ -31,9 +31,9 @@

    SYNOPSIS

    To un-deprecate a package, specify an empty string ("") for the message argument.

    SEE ALSO

    @@ -47,5 +47,5 @@

    SEE ALSO

           - + diff --git a/deps/npm/html/doc/api/npm-docs.html b/deps/npm/html/doc/api/npm-docs.html index 076e9b4f820db8..222b90e70a811a 100644 --- a/deps/npm/html/doc/api/npm-docs.html +++ b/deps/npm/html/doc/api/npm-docs.html @@ -33,5 +33,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-edit.html b/deps/npm/html/doc/api/npm-edit.html index c9702a0b46378d..aa3d7bdb0ba566 100644 --- a/deps/npm/html/doc/api/npm-edit.html +++ b/deps/npm/html/doc/api/npm-edit.html @@ -36,5 +36,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-explore.html b/deps/npm/html/doc/api/npm-explore.html index be8556656ff4d9..fbfd0cccc2d3ac 100644 --- a/deps/npm/html/doc/api/npm-explore.html +++ b/deps/npm/html/doc/api/npm-explore.html @@ -31,5 +31,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-help-search.html b/deps/npm/html/doc/api/npm-help-search.html index 852f0bc46e0010..886d0c5acbe779 100644 --- a/deps/npm/html/doc/api/npm-help-search.html +++ b/deps/npm/html/doc/api/npm-help-search.html @@ -31,7 +31,7 @@

    SYNOPSIS

  • file: Name of the file that matched
    • -

    The silent parameter is not neccessary not used, but it may in the future.

    +

    The silent parameter is not necessary not used, but it may in the future.

    @@ -44,5 +44,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-init.html b/deps/npm/html/doc/api/npm-init.html index dac576d345e744..80b14a41df3b67 100644 --- a/deps/npm/html/doc/api/npm-init.html +++ b/deps/npm/html/doc/api/npm-init.html @@ -26,7 +26,7 @@

    SYNOPSIS

    preferred method. If you're sure you want to handle command-line prompting, then go ahead and use this programmatically.

    SEE ALSO

    -

    package.json(5)

    +

    package.json(5)

    @@ -39,5 +39,5 @@

    SEE ALSO

           - + diff --git a/deps/npm/html/doc/api/npm-install.html b/deps/npm/html/doc/api/npm-install.html index 204f1dfb893a7e..43cf4f166ff958 100644 --- a/deps/npm/html/doc/api/npm-install.html +++ b/deps/npm/html/doc/api/npm-install.html @@ -32,5 +32,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-link.html b/deps/npm/html/doc/api/npm-link.html index 4eef789e6b76e0..c41a31c9b4b89c 100644 --- a/deps/npm/html/doc/api/npm-link.html +++ b/deps/npm/html/doc/api/npm-link.html @@ -42,5 +42,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-load.html b/deps/npm/html/doc/api/npm-load.html index 64a9bd4b09ae4c..fbf22994f6d808 100644 --- a/deps/npm/html/doc/api/npm-load.html +++ b/deps/npm/html/doc/api/npm-load.html @@ -15,9 +15,9 @@

    SYNOPSIS

    DESCRIPTION

    npm.load() must be called before any other function call. Both parameters are optional, but the second is recommended.

    -

    The first parameter is an object hash of command-line config params, and the -second parameter is a callback that will be called when npm is loaded and -ready to serve.

    +

    The first parameter is an object containing command-line config params, and the +second parameter is a callback that will be called when npm is loaded and ready +to serve.

    The first parameter should follow a similar structure as the package.json config object.

    For example, to emulate the --dev flag, pass an object that looks like this:

    @@ -37,5 +37,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-ls.html b/deps/npm/html/doc/api/npm-ls.html index a3807d8fd319fb..e221bab4a0f152 100644 --- a/deps/npm/html/doc/api/npm-ls.html +++ b/deps/npm/html/doc/api/npm-ls.html @@ -63,5 +63,5 @@

    global

           - + diff --git a/deps/npm/html/doc/api/npm-outdated.html b/deps/npm/html/doc/api/npm-outdated.html index c566630a402217..91fafce32974f5 100644 --- a/deps/npm/html/doc/api/npm-outdated.html +++ b/deps/npm/html/doc/api/npm-outdated.html @@ -28,5 +28,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-owner.html b/deps/npm/html/doc/api/npm-owner.html index d2b336bd95a4ea..878a9e59d865d8 100644 --- a/deps/npm/html/doc/api/npm-owner.html +++ b/deps/npm/html/doc/api/npm-owner.html @@ -32,8 +32,8 @@

    SYNOPSIS

    that is not implemented at this time.

    SEE ALSO

    @@ -47,5 +47,5 @@

    SEE ALSO

           - + diff --git a/deps/npm/html/doc/api/npm-pack.html b/deps/npm/html/doc/api/npm-pack.html index 1adb04959b9811..1e146e41f4fb49 100644 --- a/deps/npm/html/doc/api/npm-pack.html +++ b/deps/npm/html/doc/api/npm-pack.html @@ -33,5 +33,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-prefix.html b/deps/npm/html/doc/api/npm-prefix.html index 605bc497044686..bd406009c5afc9 100644 --- a/deps/npm/html/doc/api/npm-prefix.html +++ b/deps/npm/html/doc/api/npm-prefix.html @@ -29,5 +29,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-prune.html b/deps/npm/html/doc/api/npm-prune.html index d85c01e42a893f..0e446c26f588ea 100644 --- a/deps/npm/html/doc/api/npm-prune.html +++ b/deps/npm/html/doc/api/npm-prune.html @@ -30,5 +30,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-publish.html b/deps/npm/html/doc/api/npm-publish.html index ae352eb5651f10..0e41c2ad0ef60c 100644 --- a/deps/npm/html/doc/api/npm-publish.html +++ b/deps/npm/html/doc/api/npm-publish.html @@ -30,9 +30,9 @@

    SYNOPSIS

    the registry. Overwrites when the "force" environment variable is set.

    SEE ALSO

    @@ -46,5 +46,5 @@

    SEE ALSO

           - + diff --git a/deps/npm/html/doc/api/npm-rebuild.html b/deps/npm/html/doc/api/npm-rebuild.html index 1cb5fffc23f623..f5d2e6a6629b37 100644 --- a/deps/npm/html/doc/api/npm-rebuild.html +++ b/deps/npm/html/doc/api/npm-rebuild.html @@ -30,5 +30,5 @@

    CONFIGURATION

           - + diff --git a/deps/npm/html/doc/api/npm-repo.html b/deps/npm/html/doc/api/npm-repo.html index 2c40c8ed1faf76..024e7279b76cdf 100644 --- a/deps/npm/html/doc/api/npm-repo.html +++ b/deps/npm/html/doc/api/npm-repo.html @@ -33,5 +33,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-restart.html b/deps/npm/html/doc/api/npm-restart.html index 382d44ac97f2ad..29d1a566708ff0 100644 --- a/deps/npm/html/doc/api/npm-restart.html +++ b/deps/npm/html/doc/api/npm-restart.html @@ -21,8 +21,8 @@

    SYNOPSIS

    in the packages parameter.

    SEE ALSO

    @@ -36,5 +36,5 @@

    SEE ALSO

           - + diff --git a/deps/npm/html/doc/api/npm-root.html b/deps/npm/html/doc/api/npm-root.html index c9d4b17435ee70..b639a33e7d8bba 100644 --- a/deps/npm/html/doc/api/npm-root.html +++ b/deps/npm/html/doc/api/npm-root.html @@ -29,5 +29,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-run-script.html b/deps/npm/html/doc/api/npm-run-script.html index b5ef6879973bca..26707808009501 100644 --- a/deps/npm/html/doc/api/npm-run-script.html +++ b/deps/npm/html/doc/api/npm-run-script.html @@ -23,11 +23,11 @@

    SYNOPSIS

    assumed to be the command to run. All other elements are ignored.

    SEE ALSO

    @@ -41,5 +41,5 @@

    SEE ALSO

           - + diff --git a/deps/npm/html/doc/api/npm-search.html b/deps/npm/html/doc/api/npm-search.html index a4484a3780231b..903aa521eb59be 100644 --- a/deps/npm/html/doc/api/npm-search.html +++ b/deps/npm/html/doc/api/npm-search.html @@ -53,5 +53,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-shrinkwrap.html b/deps/npm/html/doc/api/npm-shrinkwrap.html index e5bf33ae4cd194..eed523cdc5fcaa 100644 --- a/deps/npm/html/doc/api/npm-shrinkwrap.html +++ b/deps/npm/html/doc/api/npm-shrinkwrap.html @@ -33,5 +33,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-start.html b/deps/npm/html/doc/api/npm-start.html index fa8a3db835e9c8..23678bc9ec1e74 100644 --- a/deps/npm/html/doc/api/npm-start.html +++ b/deps/npm/html/doc/api/npm-start.html @@ -28,5 +28,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-stop.html b/deps/npm/html/doc/api/npm-stop.html index bdcf72bde8e88c..ed3b714f07985e 100644 --- a/deps/npm/html/doc/api/npm-stop.html +++ b/deps/npm/html/doc/api/npm-stop.html @@ -28,5 +28,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-submodule.html b/deps/npm/html/doc/api/npm-submodule.html index f7dfcca4343485..d70ee36d49f992 100644 --- a/deps/npm/html/doc/api/npm-submodule.html +++ b/deps/npm/html/doc/api/npm-submodule.html @@ -42,5 +42,5 @@

    SEE ALSO

           - + diff --git a/deps/npm/html/doc/api/npm-tag.html b/deps/npm/html/doc/api/npm-tag.html index 2f94ed7f23a8fb..b4a326161e1758 100644 --- a/deps/npm/html/doc/api/npm-tag.html +++ b/deps/npm/html/doc/api/npm-tag.html @@ -36,5 +36,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-test.html b/deps/npm/html/doc/api/npm-test.html index 3247238ef981a1..78168084c2dfe1 100644 --- a/deps/npm/html/doc/api/npm-test.html +++ b/deps/npm/html/doc/api/npm-test.html @@ -30,5 +30,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-uninstall.html b/deps/npm/html/doc/api/npm-uninstall.html index ffd317e48447cf..962ff879c3ddf9 100644 --- a/deps/npm/html/doc/api/npm-uninstall.html +++ b/deps/npm/html/doc/api/npm-uninstall.html @@ -30,5 +30,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-unpublish.html b/deps/npm/html/doc/api/npm-unpublish.html index e35acac1d1d28f..2b9a5c58f61bf7 100644 --- a/deps/npm/html/doc/api/npm-unpublish.html +++ b/deps/npm/html/doc/api/npm-unpublish.html @@ -33,5 +33,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-update.html b/deps/npm/html/doc/api/npm-update.html index 18da44c1ee50b6..f60e83de3f54ca 100644 --- a/deps/npm/html/doc/api/npm-update.html +++ b/deps/npm/html/doc/api/npm-update.html @@ -27,5 +27,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-version.html b/deps/npm/html/doc/api/npm-version.html index 376d8b9807a09b..c4ce078a4820d6 100644 --- a/deps/npm/html/doc/api/npm-version.html +++ b/deps/npm/html/doc/api/npm-version.html @@ -32,5 +32,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm-view.html b/deps/npm/html/doc/api/npm-view.html index 482d912677c892..75c75fdbb478b4 100644 --- a/deps/npm/html/doc/api/npm-view.html +++ b/deps/npm/html/doc/api/npm-view.html @@ -81,5 +81,5 @@

    RETURN VALUE

           - + diff --git a/deps/npm/html/doc/api/npm-whoami.html b/deps/npm/html/doc/api/npm-whoami.html index 1a41af4ef6929c..4ed6d79a42818a 100644 --- a/deps/npm/html/doc/api/npm-whoami.html +++ b/deps/npm/html/doc/api/npm-whoami.html @@ -29,5 +29,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/api/npm.html b/deps/npm/html/doc/api/npm.html index 72265ec71ad27e..67ff3d32f8ad5d 100644 --- a/deps/npm/html/doc/api/npm.html +++ b/deps/npm/html/doc/api/npm.html @@ -23,20 +23,19 @@

    SYNOPSIS

    npm.commands.install(["package"], cb) })

    VERSION

    -

    2.0.0

    +

    2.1.6

    DESCRIPTION

    This is the API documentation for npm. To find documentation of the command line -client, see npm(1).

    -

    Prior to using npm's commands, npm.load() must be called. -If you provide configObject as an object hash of top-level -configs, they override the values stored in the various config -locations. In the npm command line client, this set of configs -is parsed from the command line options. Additional configuration -params are loaded from two configuration files. See npm-config(1), -npm-config(7), and npmrc(5) for more information.

    +client, see npm(1).

    +

    Prior to using npm's commands, npm.load() must be called. If you provide +configObject as an object map of top-level configs, they override the values +stored in the various config locations. In the npm command line client, this +set of configs is parsed from the command line options. Additional +configuration params are loaded from two configuration files. See +npm-config(1), npm-config(7), and npmrc(5) for more information.

    After that, each of the functions are accessible in the -commands object: npm.commands.<cmd>. See npm-index(7) for a list of +commands object: npm.commands.<cmd>. See npm-index(7) for a list of all possible commands.

    All commands on the command object take an array of positional argument strings. The last argument to any function is a callback. Some @@ -80,9 +79,9 @@

    METHODS AND PROPERTIES

    MAGIC

    -

    For each of the methods in the npm.commands hash, a method is added to -the npm object, which takes a set of positional string arguments rather -than an array and a callback.

    +

    For each of the methods in the npm.commands object, a method is added to the +npm object, which takes a set of positional string arguments rather than an +array and a callback.

    If the last argument is a callback, then it will use the supplied callback. However, if no callback is provided, then it will print out the error or results.

    @@ -110,5 +109,5 @@

    ABBREVS

           - + diff --git a/deps/npm/html/doc/cli/npm-adduser.html b/deps/npm/html/doc/cli/npm-adduser.html index 9c2b20b51ef366..84f0ac389efbdd 100644 --- a/deps/npm/html/doc/cli/npm-adduser.html +++ b/deps/npm/html/doc/cli/npm-adduser.html @@ -11,11 +11,11 @@

    npm-adduser

    Add a registry user account

    SYNOPSIS

    -
    npm adduser [--registry=url] [--scope=@orgname]
+
    npm adduser [--registry=url] [--scope=@orgname] [--always-auth]
 
    DESCRIPTION
    
 
    Create or verify a user named <username> in the specified registry, and
 save the credentials to the .npmrc file. If no registry is specified,
-the default registry will be used (see npm-config(7)).
    
+the default registry will be used (see npm-config(7)).
    
 
    The username, password, and email are read in from prompts.
    
 
    You may use this command to change your email address, but not username
 or password.
    
@@ -27,23 +27,33 @@ 
    CONFIGURATION
    
 
    registry
    
 
    Default: http://registry.npmjs.org/
    
 
    The base URL of the npm package registry. If scope is also specified,
-this registry will only be used for packages with that scope. See npm-scope(7).
    
+this registry will only be used for packages with that scope. See npm-scope(7).
    
 
    scope
    
 
    Default: none
    
 
    If specified, the user and login credentials given will be associated
-with the specified scope. See npm-scope(7). You can use both at the same time,
+with the specified scope. See npm-scope(7). You can use both at the same time,
 e.g.
    
 
    npm adduser --registry=http://myregistry.example.com --scope=@myco
 
    This will set a registry for the given scope and login or create a user for
 that registry at the same time.
    
+
    always-auth
    
+
    Default: false
    
+
    If specified, save configuration indicating that all requests to the given
+registry should include authorization information. Useful for private
+registries. Can be used with --registry and / or --scope, e.g.
    
+
    npm adduser --registry=http://private-registry.example.com --always-auth
+
    This will ensure that all requests to that registry (including for tarballs)
+include an authorization header. See always-auth in npm-config(7) for more
+details on always-auth. Registry-specific configuaration of always-auth takes
+precedence over any global configuration.
    
 
    SEE ALSO
    
 
 
 
@@ -57,5 +67,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-bin.html b/deps/npm/html/doc/cli/npm-bin.html
index e3c993f506dd21..7f6e3a5c0dd53b 100644
--- a/deps/npm/html/doc/cli/npm-bin.html
+++ b/deps/npm/html/doc/cli/npm-bin.html
@@ -16,12 +16,12 @@ 
    SYNOPSIS
    
 
    Print the folder where npm will install executables.
    
 
    SEE ALSO
    
 
 
 
@@ -35,5 +35,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-bugs.html b/deps/npm/html/doc/cli/npm-bugs.html
index e7ce93bc9d67d1..7758efa72641e0 100644
--- a/deps/npm/html/doc/cli/npm-bugs.html
+++ b/deps/npm/html/doc/cli/npm-bugs.html
@@ -33,14 +33,14 @@ 
    registry
    
 
    The base URL of the npm package registry.
    
 
    SEE ALSO
    
 
 
 
@@ -54,5 +54,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-build.html b/deps/npm/html/doc/cli/npm-build.html
index e2f60bb118197c..ca62cb246517ee 100644
--- a/deps/npm/html/doc/cli/npm-build.html
+++ b/deps/npm/html/doc/cli/npm-build.html
@@ -21,10 +21,10 @@ 
    DESCRIPTION
    
 
    It should generally not be called directly.
    
 
    SEE ALSO
    
 
 
 
@@ -38,5 +38,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-bundle.html b/deps/npm/html/doc/cli/npm-bundle.html
index 0bdbb1ef979a11..9b833d0b6dd92a 100644
--- a/deps/npm/html/doc/cli/npm-bundle.html
+++ b/deps/npm/html/doc/cli/npm-bundle.html
@@ -17,7 +17,7 @@ 
    DESCRIPTION
    
 
    Just use npm install now to do what npm bundle used to do.
    
 
    SEE ALSO
    
 
 
 
@@ -31,5 +31,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-cache.html b/deps/npm/html/doc/cli/npm-cache.html
index a384b71b2fb99e..53835b35db3a58 100644
--- a/deps/npm/html/doc/cli/npm-cache.html
+++ b/deps/npm/html/doc/cli/npm-cache.html
@@ -61,13 +61,13 @@ 
    cache
    
 
    The root cache folder.
    
 
    SEE ALSO
    
 
 
 
@@ -81,5 +81,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-completion.html b/deps/npm/html/doc/cli/npm-completion.html
index 2d0dae8c8d9525..5a678ba352f019 100644
--- a/deps/npm/html/doc/cli/npm-completion.html
+++ b/deps/npm/html/doc/cli/npm-completion.html
@@ -26,9 +26,9 @@ 
    SYNOPSIS
    
 completions based on the arguments.
    
 
    SEE ALSO
    
 
 
 
@@ -42,5 +42,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-config.html b/deps/npm/html/doc/cli/npm-config.html
index cf19f65265a057..d97845e708a79b 100644
--- a/deps/npm/html/doc/cli/npm-config.html
+++ b/deps/npm/html/doc/cli/npm-config.html
@@ -22,8 +22,8 @@ 
    SYNOPSIS

    DESCRIPTION

    npm gets its config settings from the command line, environment variables, npmrc files, and in some cases, the package.json file.

    -

    See npmrc(5) for more information about the npmrc files.

    -

    See npm-config(7) for a more thorough discussion of the mechanisms +

    See npmrc(5) for more information about the npmrc files.

    +

    See npm-config(7) for a more thorough discussion of the mechanisms involved.

    The npm config command can be used to update and edit the contents of the user and global npmrc files.

    @@ -48,11 +48,11 @@

    edit

    global config.

    SEE ALSO

    @@ -66,5 +66,5 @@

    SEE ALSO

           - + diff --git a/deps/npm/html/doc/cli/npm-dedupe.html b/deps/npm/html/doc/cli/npm-dedupe.html index 0e40c7e30ee216..bf6c9974ea4807 100644 --- a/deps/npm/html/doc/cli/npm-dedupe.html +++ b/deps/npm/html/doc/cli/npm-dedupe.html @@ -23,7 +23,7 @@

    SYNOPSIS

    | `-- c@1.0.3 `-- d <-- depends on c@~1.0.9 `-- c@1.0.10 -

    In this case, npm-dedupe(1) will transform the tree to:

    +

    In this case, npm-dedupe(1) will transform the tree to:

    a
 +-- b
 +-- d
@@ -47,9 +47,9 @@ 
    SYNOPSIS
    
 versions.
    
 
    SEE ALSO
    
 
 
 
@@ -63,5 +63,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-deprecate.html b/deps/npm/html/doc/cli/npm-deprecate.html
index f4c568cc6d87dc..8182c6ecf1b8d4 100644
--- a/deps/npm/html/doc/cli/npm-deprecate.html
+++ b/deps/npm/html/doc/cli/npm-deprecate.html
@@ -23,8 +23,8 @@ 
    SYNOPSIS
    
 
    To un-deprecate a package, specify an empty string ("") for the message argument.
    
 
    SEE ALSO
    
 
 
 
@@ -38,5 +38,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-docs.html b/deps/npm/html/doc/cli/npm-docs.html
index 14f447987c7fbb..e9f2c9e732eb3b 100644
--- a/deps/npm/html/doc/cli/npm-docs.html
+++ b/deps/npm/html/doc/cli/npm-docs.html
@@ -36,13 +36,13 @@ 
    registry
    
 
    The base URL of the npm package registry.
    
 
    SEE ALSO
    
 
 
 
@@ -56,5 +56,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-edit.html b/deps/npm/html/doc/cli/npm-edit.html
index 542404cd913e6a..24a70fe7fc1d06 100644
--- a/deps/npm/html/doc/cli/npm-edit.html
+++ b/deps/npm/html/doc/cli/npm-edit.html
@@ -14,7 +14,7 @@ 
    SYNOPSIS
    
 
    npm edit <name>[@<version>]
 
    DESCRIPTION
    
 
    Opens the package folder in the default editor (or whatever you've
-configured as the npm editor config -- see npm-config(7).)
    
+configured as the npm editor config -- see npm-config(7).)
    
 
    After it has been edited, the package is rebuilt so as to pick up any
 changes in compiled packages.
    
 
    For instance, you can do npm install connect to install connect
@@ -30,12 +30,12 @@ 
    editor
    
 
    The command to run for npm edit or npm config edit.
    
 
    SEE ALSO
    
 
 
 
@@ -49,5 +49,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-explore.html b/deps/npm/html/doc/cli/npm-explore.html
index 15d7761ce08c7c..eeb49064486fdf 100644
--- a/deps/npm/html/doc/cli/npm-explore.html
+++ b/deps/npm/html/doc/cli/npm-explore.html
@@ -31,12 +31,11 @@ 
    shell
    
 
    The shell to run for the npm explore command.
    
 
    SEE ALSO
    
 
 
 
@@ -50,5 +49,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-help-search.html b/deps/npm/html/doc/cli/npm-help-search.html
index 22ddb9dd5194c1..2cf7506f03f1d7 100644
--- a/deps/npm/html/doc/cli/npm-help-search.html
+++ b/deps/npm/html/doc/cli/npm-help-search.html
@@ -30,9 +30,9 @@ 
    long
    
 
    If false, then help-search will just list out the help topics found.
    
 
    SEE ALSO
    
 
 
 
@@ -46,5 +46,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-help.html b/deps/npm/html/doc/cli/npm-help.html
index 52096aa57e7136..12c6c0e8fd2d13 100644
--- a/deps/npm/html/doc/cli/npm-help.html
+++ b/deps/npm/html/doc/cli/npm-help.html
@@ -29,16 +29,16 @@ 
    viewer
    
 
    Set to "browser" to view html help content in the default web browser.
    
 
    SEE ALSO
    
 
 
 
@@ -52,5 +52,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-init.html b/deps/npm/html/doc/cli/npm-init.html
index 6b4bfe10cb955b..e7640ea46c6f6f 100644
--- a/deps/npm/html/doc/cli/npm-init.html
+++ b/deps/npm/html/doc/cli/npm-init.html
@@ -11,7 +11,7 @@
 
 
    npm-init
     
    Interactively create a package.json file
    
 
    SYNOPSIS
    
-
    npm init
+
    npm init [-f|--force|-y|--yes]
 
    DESCRIPTION
    
 
    This will ask you a bunch of questions, and then write a package.json for you.
    
 
    It attempts to make reasonable guesses about what you want things to be set to,
@@ -20,11 +20,13 @@ 
    SYNOPSIS
    
 the options in there.
    
 
    It is strictly additive, so it does not delete options from your package.json
 without a really good reason to do so.
    
+
    If you invoke it with -f, --force, -y, or --yes, it will use only
+defaults and not prompt you for any options.
    
 
    SEE ALSO
    
 
 
 
@@ -38,5 +40,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-install.html b/deps/npm/html/doc/cli/npm-install.html
index 38d160fac2b430..3759f011559a73 100644
--- a/deps/npm/html/doc/cli/npm-install.html
+++ b/deps/npm/html/doc/cli/npm-install.html
@@ -23,13 +23,13 @@ 
    SYNOPSIS
    
 
    DESCRIPTION
    
 
    This command installs a package, and any packages that it depends on. If the
 package has a shrinkwrap file, the installation of dependencies will be driven
-by that. See npm-shrinkwrap(1).
    
+by that. See npm-shrinkwrap(1).
    
 
    A package is:
    
 
      
 
    • a) a folder containing a program described by a package.json file
      • 
 
    • b) a gzipped tarball containing (a)
      • 
 
    • c) a url that resolves to (b)
      • 
-
    • d) a <name>@<version> that is published on the registry (see npm-registry(7)) with (c)
      • 
+
    • d) a <name>@<version> that is published on the registry (see npm-registry(7)) with (c)
      • 
 
    • e) a <name>@<tag> that points to (d)
      • 
 
    • f) a <name> that has a "latest" tag satisfying (e)
      • 
 
    • g) a <git remote url> that resolves to (b)
      • 
@@ -66,7 +66,7 @@ 
      SYNOPSIS

  • npm install [@<scope>/]<name> [--save|--save-dev|--save-optional]:

    Do a <name>@<tag> install, where <tag> is the "tag" config. (See - npm-config(7).)

    + npm-config(7).)

    In most cases, this will install the latest version of the module published on npm.

    Example:

    @@ -87,7 +87,7 @@

    SYNOPSIS

    operator.

    <scope> is optional. The package will be downloaded from the registry associated with the specified scope. If no registry is associated with -the given scope the default registry is assumed. See npm-scope(7).

    +the given scope the default registry is assumed. See npm-scope(7).

    Note: if you do not include the @-symbol on your scope name, npm will interpret this as a GitHub repository instead, see below. Scopes names must also be followed by a slash.

    @@ -123,7 +123,7 @@

    SYNOPSIS

  • npm install [@<scope>/]<name>@<version range>:

    Install a version of the package matching the specified version range. This - will follow the same rules for resolving dependencies described in package.json(5).

    + will follow the same rules for resolving dependencies described in package.json(5).

    Note that most version ranges must be put in quotes so that your shell will treat it as a single argument.

    Example:

    @@ -161,7 +161,7 @@

    SYNOPSIS

    local copy exists on disk.

    npm install sax --force

    The --global argument will cause npm to install the package globally -rather than locally. See npm-folders(5).

    +rather than locally. See npm-folders(5).

    The --link argument will cause npm to link global installs into the local space in some cases.

    The --no-bin-links argument will prevent npm from creating symlinks for @@ -172,7 +172,7 @@

    SYNOPSIS

    shrinkwrap file and use the package.json instead.

    The --nodedir=/path/to/node/source argument will allow npm to find the node source code so that npm can compile native modules.

    -

    See npm-config(7). Many of the configuration params have some +

    See npm-config(7). Many of the configuration params have some effect on installation, since that's most of what npm does.

    ALGORITHM

    To install a package, npm uses the following algorithm:

    @@ -193,7 +193,7 @@

    ALGORITHM

    `-- D

    That is, the dependency from B to C is satisfied by the fact that A already caused C to be installed at a higher level.

    -

    See npm-folders(5) for a more detailed description of the specific +

    See npm-folders(5) for a more detailed description of the specific folder structures that npm creates.

    Limitations of npm's Install Algorithm

    There are some very rare and pathological edge-cases where a cycle can @@ -213,19 +213,19 @@

    Limitations of npm's Install affects a real use-case, it will be investigated.

    SEE ALSO

    @@ -239,5 +239,5 @@

    SEE ALSO

           - + diff --git a/deps/npm/html/doc/cli/npm-link.html b/deps/npm/html/doc/cli/npm-link.html index 0d28a7ddf85b0d..8d085892df2e5a 100644 --- a/deps/npm/html/doc/cli/npm-link.html +++ b/deps/npm/html/doc/cli/npm-link.html @@ -18,12 +18,12 @@

    SYNOPSIS

    Package linking is a two-step process.

    First, npm link in a package folder will create a globally-installed symbolic link from prefix/package-name to the current folder (see -npm-config(7) for the value of prefix).

    +npm-config(7) for the value of prefix).

    Next, in some other location, npm link package-name will create a symlink from the local node_modules folder to the global symlink.

    Note that package-name is taken from package.json, not from directory name.

    -

    The package name can be optionally prefixed with a scope. See npm-scope(7). +

    The package name can be optionally prefixed with a scope. See npm-scope(7). The scope must by preceded by an @-symbol and followed by a slash.

    When creating tarballs for npm publish, the linked packages are "snapshotted" to their current state by resolving the symbolic links.

    @@ -45,19 +45,19 @@

    SYNOPSIS

    npm link redis

    That is, it first creates a global link, and then links the global installation target into your project's node_modules folder.

    -

    If your linked package is scoped (see npm-scope(7)) your link command must +

    If your linked package is scoped (see npm-scope(7)) your link command must include that scope, e.g.

    npm link @myorg/privatepackage

    SEE ALSO

    @@ -71,5 +71,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/cli/npm-ls.html b/deps/npm/html/doc/cli/npm-ls.html index a52b117c330049..30419bdb0d6103 100644 --- a/deps/npm/html/doc/cli/npm-ls.html +++ b/deps/npm/html/doc/cli/npm-ls.html @@ -22,7 +22,7 @@

    SYNOPSIS

    limit the results to only the paths to the packages named. Note that nested packages will also show the paths to the specified packages. For example, running npm ls promzard in npm's source tree will show:

    -
    npm@2.0.0 /path/to/npm
+
    npm@2.1.6 /path/to/npm
 └─┬ init-package-json@0.0.4
   └── promzard@0.1.5
 
    It will print out extraneous, missing, and invalid packages.
    
@@ -63,15 +63,15 @@ 
    depth
    
 
    Max display depth of the dependency tree.
    
 
    SEE ALSO
    
 
 
 
@@ -85,5 +85,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-outdated.html b/deps/npm/html/doc/cli/npm-outdated.html
index 6d12d1a337d6e3..07a0a933d76035 100644
--- a/deps/npm/html/doc/cli/npm-outdated.html
+++ b/deps/npm/html/doc/cli/npm-outdated.html
@@ -51,9 +51,9 @@ 
    depth
    
 
    Max depth for checking dependency tree.
    
 
    SEE ALSO
    
 
 
 
@@ -67,5 +67,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-owner.html b/deps/npm/html/doc/cli/npm-owner.html
index b2f8f84e5796c6..3600e087f15049 100644
--- a/deps/npm/html/doc/cli/npm-owner.html
+++ b/deps/npm/html/doc/cli/npm-owner.html
@@ -32,10 +32,10 @@ 
    SYNOPSIS
    
 that is not implemented at this time.
    
 
    SEE ALSO
    
 
 
 
@@ -49,5 +49,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-pack.html b/deps/npm/html/doc/cli/npm-pack.html
index 5518eb188d9d67..987ba3f792b9cb 100644
--- a/deps/npm/html/doc/cli/npm-pack.html
+++ b/deps/npm/html/doc/cli/npm-pack.html
@@ -23,11 +23,11 @@ 
    SYNOPSIS
    
 
    If no arguments are supplied, then npm packs the current package folder.
    
 
    SEE ALSO
    
 
 
 
@@ -41,5 +41,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-prefix.html b/deps/npm/html/doc/cli/npm-prefix.html
index 95780b9b100837..7b6a3c58a51e57 100644
--- a/deps/npm/html/doc/cli/npm-prefix.html
+++ b/deps/npm/html/doc/cli/npm-prefix.html
@@ -16,15 +16,15 @@ 
    SYNOPSIS
    
 
    Print the local prefix to standard out. This is the closest parent directory
 to contain a package.json file unless -g is also specified.
    
 
    If -g is specified, this will be the value of the global prefix. See
-npm-config(7) for more detail.
    
+npm-config(7) for more detail.
    
 
    SEE ALSO
    
 
 
 
@@ -38,5 +38,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-prune.html b/deps/npm/html/doc/cli/npm-prune.html
index 49bb31e37a325f..dea291b4909bc8 100644
--- a/deps/npm/html/doc/cli/npm-prune.html
+++ b/deps/npm/html/doc/cli/npm-prune.html
@@ -23,9 +23,9 @@ 
    SYNOPSIS
    
 packages specified in your devDependencies.
    
 
    SEE ALSO
    
 
 
 
@@ -39,5 +39,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-publish.html b/deps/npm/html/doc/cli/npm-publish.html
index 3969f35040560a..e1b46d21d0b3f3 100644
--- a/deps/npm/html/doc/cli/npm-publish.html
+++ b/deps/npm/html/doc/cli/npm-publish.html
@@ -14,10 +14,12 @@ 
    SYNOPSIS
    
 
    npm publish <tarball> [--tag <tag>]
 npm publish <folder> [--tag <tag>]
 
    DESCRIPTION
    
-
    Publishes a package to the registry so that it can be installed by name.
    
+
    Publishes a package to the registry so that it can be installed by name. See
+npm-developers(7) for details on what's included in the published package, as
+well as details on how the package is built.
    
 
    By default npm will publish to the public registry. This can be overridden by
-specifying a different default registry or using a npm-scope(7) in the name
-(see package.json(5)).
    
+specifying a different default registry or using a npm-scope(7) in the name
+(see package.json(5)).
    
 
      
 
    • <folder>:
 A folder containing a package.json file
      
@@ -36,14 +38,14 @@ 
      SYNOPSIS
      
 the specified registry.
      
 
      Once a package is published with a given name and version, that
 specific name and version combination can never be used again, even if
-it is removed with npm-unpublish(1).
      
+it is removed with npm-unpublish(1).
      
 
      SEE ALSO
      
 
 
 
@@ -57,5 +59,5 @@ 
      SEE ALSO
      
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-rebuild.html b/deps/npm/html/doc/cli/npm-rebuild.html
index 01d0f33eaf7429..4da97a70518b19 100644
--- a/deps/npm/html/doc/cli/npm-rebuild.html
+++ b/deps/npm/html/doc/cli/npm-rebuild.html
@@ -23,8 +23,8 @@ 
      DESCRIPTION
      
 the new binary.
      
 
      SEE ALSO
      
 
 
 
@@ -38,5 +38,5 @@ 
      SEE ALSO
      
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-repo.html b/deps/npm/html/doc/cli/npm-repo.html
index 350f2fd9c087dc..02335b4f4a19e7 100644
--- a/deps/npm/html/doc/cli/npm-repo.html
+++ b/deps/npm/html/doc/cli/npm-repo.html
@@ -27,8 +27,8 @@ 
      browser
      
 
      The browser that is called by the npm repo command to open websites.
      
 
      SEE ALSO
      
 
 
 
@@ -42,5 +42,5 @@ 
      SEE ALSO
      
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-restart.html b/deps/npm/html/doc/cli/npm-restart.html
index c4a0acefd3f5ae..d7536f81fdfe00 100644
--- a/deps/npm/html/doc/cli/npm-restart.html
+++ b/deps/npm/html/doc/cli/npm-restart.html
@@ -13,17 +13,15 @@ 
      npm-restart
       
      Start a package
      SYNOPSIS
 
      npm restart [-- <args>]
 
      DESCRIPTION
      
-
      This runs a package's "restart" script, if one was provided.
-Otherwise it runs package's "stop" script, if one was provided, and then
-the "start" script.
      
-
      If no version is specified, then it restarts the "active" version.
      
+
      This runs a package's "restart" script, if one was provided.  Otherwise it runs
+package's "stop" script, if one was provided, and then the "start" script.
      
 
      SEE ALSO
      
 
 
 
@@ -37,5 +35,5 @@ 
      SEE ALSO
      
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-rm.html b/deps/npm/html/doc/cli/npm-rm.html
index 188cb517c88b18..3b28aaad4d3e8d 100644
--- a/deps/npm/html/doc/cli/npm-rm.html
+++ b/deps/npm/html/doc/cli/npm-rm.html
@@ -20,12 +20,12 @@ 
      SYNOPSIS
      
 on its behalf.
      
 
      SEE ALSO
      
 
 
 
@@ -39,5 +39,5 @@ 
      SEE ALSO
      
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-root.html b/deps/npm/html/doc/cli/npm-root.html
index 4eeb0ae2a5f4e6..f6b8b22dfcba96 100644
--- a/deps/npm/html/doc/cli/npm-root.html
+++ b/deps/npm/html/doc/cli/npm-root.html
@@ -16,12 +16,12 @@ 
      SYNOPSIS
      
 
      Print the effective node_modules folder to standard out.
      
 
      SEE ALSO
      
 
 
 
@@ -35,5 +35,5 @@ 
      SEE ALSO
      
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-run-script.html b/deps/npm/html/doc/cli/npm-run-script.html
index dec511ccbcf032..8ca2ea2a5ed4e9 100644
--- a/deps/npm/html/doc/cli/npm-run-script.html
+++ b/deps/npm/html/doc/cli/npm-run-script.html
@@ -20,13 +20,20 @@ 
      SYNOPSIS
      
 is provided, it will list the available top level scripts.
      
 
      It is used by the test, start, restart, and stop commands, but can be
 called directly, as well.
      
+
      As of npm@2.0.0, you can
+use custom arguments when executing scripts. The special option -- is used by
+getopt to delimit the end of the options. npm will pass
+all the arguments after the -- directly to your script:
      
+
      npm run test -- --grep="pattern"
+
      The arguments will only be passed to the script specified after npm run
+and not to any pre or post script.
      
 
      SEE ALSO
      
 
 
 
@@ -40,5 +47,5 @@ 
      SEE ALSO
      
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-search.html b/deps/npm/html/doc/cli/npm-search.html
index fac2fac7d71466..f5fe720baa11c0 100644
--- a/deps/npm/html/doc/cli/npm-search.html
+++ b/deps/npm/html/doc/cli/npm-search.html
@@ -31,11 +31,11 @@ 
      long
      
 fall on multiple lines.
      
 
      SEE ALSO
      
 
 
 
@@ -49,5 +49,5 @@ 
      SEE ALSO
      
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-shrinkwrap.html b/deps/npm/html/doc/cli/npm-shrinkwrap.html
index ec54bc8eb7ddc6..fbfaa6c3dc00a3 100644
--- a/deps/npm/html/doc/cli/npm-shrinkwrap.html
+++ b/deps/npm/html/doc/cli/npm-shrinkwrap.html
@@ -120,7 +120,7 @@ 
      Building shrinkwrapped packages
      
 
    • Run "npm shrinkwrap", commit the new npm-shrinkwrap.json, and
 publish your package.
      • 
 
-
      You can use npm-outdated(1) to view dependencies with newer versions
+
      You can use npm-outdated(1) to view dependencies with newer versions
 available.
      
 
      Other Notes
      
 
      A shrinkwrap file must be consistent with the package's package.json
@@ -148,9 +148,9 @@ 
      Caveats
      
 contents rather than versions.
      
 
      SEE ALSO
      
 
 
 
@@ -164,5 +164,5 @@ 
      SEE ALSO
      
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-star.html b/deps/npm/html/doc/cli/npm-star.html
index 9b7035784b0fb2..d3bbde5b9d696f 100644
--- a/deps/npm/html/doc/cli/npm-star.html
+++ b/deps/npm/html/doc/cli/npm-star.html
@@ -20,9 +20,9 @@ 
      SYNOPSIS
      
 
      It's a boolean thing.  Starring repeatedly has no additional effect.
      
 
      SEE ALSO
      
 
 
 
@@ -36,5 +36,5 @@ 
      SEE ALSO
      
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-stars.html b/deps/npm/html/doc/cli/npm-stars.html
index 9c3b24da52da02..7873880f4159e3 100644
--- a/deps/npm/html/doc/cli/npm-stars.html
+++ b/deps/npm/html/doc/cli/npm-stars.html
@@ -20,10 +20,10 @@ 
      SYNOPSIS
      
 you will most certainly enjoy this command.
      
 
      SEE ALSO
      
 
 
 
@@ -37,5 +37,5 @@ 
      SEE ALSO
      
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-start.html b/deps/npm/html/doc/cli/npm-start.html
index 8e98cc3b045dcf..0a3134bc82e3e1 100644
--- a/deps/npm/html/doc/cli/npm-start.html
+++ b/deps/npm/html/doc/cli/npm-start.html
@@ -16,11 +16,11 @@ 
      SYNOPSIS
      
 
      This runs a package's "start" script, if one was provided.
      
 
      SEE ALSO
      
 
 
 
@@ -34,5 +34,5 @@ 
      SEE ALSO
      
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-stop.html b/deps/npm/html/doc/cli/npm-stop.html
index 9526880781194b..01638ee4daf773 100644
--- a/deps/npm/html/doc/cli/npm-stop.html
+++ b/deps/npm/html/doc/cli/npm-stop.html
@@ -16,11 +16,11 @@ 
      SYNOPSIS
      
 
      This runs a package's "stop" script, if one was provided.
      
 
      SEE ALSO
      
 
 
 
@@ -34,5 +34,5 @@ 
      SEE ALSO
      
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-submodule.html b/deps/npm/html/doc/cli/npm-submodule.html
index 899005f061b7f2..4ac55a88525bfa 100644
--- a/deps/npm/html/doc/cli/npm-submodule.html
+++ b/deps/npm/html/doc/cli/npm-submodule.html
@@ -27,7 +27,7 @@ 
      SYNOPSIS
      
 dependencies into the submodule folder.
      
 
      SEE ALSO
      
 
 
@@ -42,5 +42,5 @@ 
      SEE ALSO
      
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-tag.html b/deps/npm/html/doc/cli/npm-tag.html
index 7dfbd1849f60d2..946d5fa767c8c5 100644
--- a/deps/npm/html/doc/cli/npm-tag.html
+++ b/deps/npm/html/doc/cli/npm-tag.html
@@ -24,13 +24,13 @@ 
      SYNOPSIS
      
 
      Publishing a package always sets the "latest" tag to the published version.
      
 
      SEE ALSO
      
 
 
 
@@ -44,5 +44,5 @@ 
      SEE ALSO
      
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-test.html b/deps/npm/html/doc/cli/npm-test.html
index 4d9779e8260535..6c5467de51fdd0 100644
--- a/deps/npm/html/doc/cli/npm-test.html
+++ b/deps/npm/html/doc/cli/npm-test.html
@@ -19,11 +19,11 @@ 
      SYNOPSIS
      
 true.
      
 
      SEE ALSO
      
 
 
 
@@ -37,5 +37,5 @@ 
      SEE ALSO
      
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-uninstall.html b/deps/npm/html/doc/cli/npm-uninstall.html
index c4e7858ebfc685..2a3c12c148d050 100644
--- a/deps/npm/html/doc/cli/npm-uninstall.html
+++ b/deps/npm/html/doc/cli/npm-uninstall.html
@@ -30,7 +30,7 @@ 
      SYNOPSIS
      
 
    • --save-optional: Package will be removed from your optionalDependencies.
      
 
      • 
 
    
-
    Scope is optional and follows the usual rules for npm-scope(7).
    
+
    Scope is optional and follows the usual rules for npm-scope(7).
    
 
    Examples:
    
 
    npm uninstall sax --save
 npm uninstall @myorg/privatepackage --save
@@ -38,12 +38,12 @@ 
    SYNOPSIS
    
 npm uninstall dtrace-provider --save-optional
 
    SEE ALSO
    
 
 
 
@@ -57,5 +57,5 @@ 
    SYNOPSIS
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-unpublish.html b/deps/npm/html/doc/cli/npm-unpublish.html
index eb175920eb6f73..59b278e23da596 100644
--- a/deps/npm/html/doc/cli/npm-unpublish.html
+++ b/deps/npm/html/doc/cli/npm-unpublish.html
@@ -26,14 +26,14 @@ 
    DESCRIPTION
    
 
    Even if a package version is unpublished, that specific name and
 version combination can never be reused.  In order to publish the
 package again, a new version number must be used.
    
-
    The scope is optional and follows the usual rules for npm-scope(7).
    
+
    The scope is optional and follows the usual rules for npm-scope(7).
    
 
    SEE ALSO
    
 
 
 
@@ -47,5 +47,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-update.html b/deps/npm/html/doc/cli/npm-update.html
index 0c2d19ea743452..5fa7846f5348ef 100644
--- a/deps/npm/html/doc/cli/npm-update.html
+++ b/deps/npm/html/doc/cli/npm-update.html
@@ -22,11 +22,11 @@ 
    SYNOPSIS
    
 or local) will be updated.
    
 
    SEE ALSO
    
 
 
 
@@ -40,5 +40,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-version.html b/deps/npm/html/doc/cli/npm-version.html
index de67a1b666a58f..6477726f495f07 100644
--- a/deps/npm/html/doc/cli/npm-version.html
+++ b/deps/npm/html/doc/cli/npm-version.html
@@ -39,9 +39,9 @@ 
    SYNOPSIS
    
 Enter passphrase:

    SEE ALSO

    @@ -55,5 +55,5 @@

    SYNOPSIS

           - + diff --git a/deps/npm/html/doc/cli/npm-view.html b/deps/npm/html/doc/cli/npm-view.html index bc134c928255e3..3b87ba0be205aa 100644 --- a/deps/npm/html/doc/cli/npm-view.html +++ b/deps/npm/html/doc/cli/npm-view.html @@ -46,7 +46,7 @@

    SYNOPSIS

    npm view express contributors.name contributors.email

    "Person" fields are shown as a string if they would be shown as an object. So, for example, this will show the list of npm contributors in -the shortened string format. (See package.json(5) for more on this.)

    +the shortened string format. (See package.json(5) for more on this.)

    npm view npm contributors

    If a version range is provided, then data will be printed for every matching version of the package. This will show which version of jsdom @@ -63,12 +63,12 @@

    SYNOPSIS

    the field name.

    SEE ALSO

    @@ -82,5 +82,5 @@

    SEE ALSO

           - + diff --git a/deps/npm/html/doc/cli/npm-whoami.html b/deps/npm/html/doc/cli/npm-whoami.html index 2cd0f274e9b118..a2705c40c3a95a 100644 --- a/deps/npm/html/doc/cli/npm-whoami.html +++ b/deps/npm/html/doc/cli/npm-whoami.html @@ -16,10 +16,10 @@

    SYNOPSIS

    Print the username config to standard output.

    SEE ALSO

    @@ -33,5 +33,5 @@

    SEE ALSO

           - + diff --git a/deps/npm/html/doc/cli/npm.html b/deps/npm/html/doc/cli/npm.html index 66b875393064aa..3bd3849d2ad257 100644 --- a/deps/npm/html/doc/cli/npm.html +++ b/deps/npm/html/doc/cli/npm.html @@ -13,7 +13,7 @@

    npm

    node package manager

    SYNOPSIS

    npm <command> [args]

    VERSION

    -

    2.0.0

    +

    2.1.6

    DESCRIPTION

    npm is the package manager for the Node JavaScript platform. It puts modules in place so that node can find them, and manages dependency @@ -25,7 +25,7 @@

    DESCRIPTION

    INTRODUCTION

    You probably got npm because you want to install stuff.

    Use npm install blerg to install the latest version of "blerg". Check out -npm-install(1) for more info. It can do a lot of stuff.

    +npm-install(1) for more info. It can do a lot of stuff.

    Use the npm search command to show everything that's available. Use npm ls to show everything you've installed.

    DEPENDENCIES

    @@ -42,7 +42,7 @@

    DEPENDENCIES

    the node-gyp repository and the node-gyp Wiki.

    DIRECTORIES

    -

    See npm-folders(5) to learn about where npm puts stuff.

    +

    See npm-folders(5) to learn about where npm puts stuff.

    In particular, npm has two modes of operation:

    • global mode:
      npm installs packages into the install prefix at @@ -58,7 +58,7 @@

      DEVELOPER USAGE

      following help topics:

      • json: -Make a package.json file. See package.json(5).
        • +Make a package.json file. See package.json(5).
      • link: For linking your current working code into Node's path, so that you don't have to reinstall every time you make a change. Use @@ -93,12 +93,12 @@

        CONFIGURATION

      • Defaults:
        npm's default configuration options are defined in lib/utils/config-defs.js. These must not be changed.
      -

      See npm-config(7) for much much more information.

      +

      See npm-config(7) for much much more information.

      CONTRIBUTIONS

      Patches welcome!

      Be sure to include all of the output from the npm command that didn't work as expected. The npm-debug.log file is also helpful to provide.

      @@ -128,19 +128,19 @@

      AUTHOR

      Isaac Z. Schlueter :: isaacs :: @izs :: -i@izs.me

      +i@izs.me

      SEE ALSO

      @@ -154,5 +154,5 @@

      SEE ALSO

             - + diff --git a/deps/npm/html/doc/files/npm-folders.html b/deps/npm/html/doc/files/npm-folders.html index cb2b56c29e3f51..ec320399971e4a 100644 --- a/deps/npm/html/doc/files/npm-folders.html +++ b/deps/npm/html/doc/files/npm-folders.html @@ -44,7 +44,7 @@

      Node Modules

      Scoped packages are installed the same way, except they are grouped together in a sub-folder of the relevant node_modules folder with the name of that scope prefix by the @ symbol, e.g. npm install @myorg/package would place -the package in {prefix}/node_modules/@myorg/package. See scopes(7) for +the package in {prefix}/node_modules/@myorg/package. See scopes(7) for more details.

      If you wish to require() a package, then install it locally.

      Executables

      @@ -59,7 +59,7 @@

      Man Pages

      When in local mode, man pages are not installed.

      Man pages are not installed on Windows systems.

      Cache

      -

      See npm-cache(1). Cache files are stored in ~/.npm on Posix, or +

      See npm-cache(1). Cache files are stored in ~/.npm on Posix, or ~/npm-cache on Windows.

      This is controlled by the cache configuration param.

      Temp Files

      @@ -159,18 +159,18 @@

      Publishing

      not be included in the package tarball.

      This allows a package maintainer to install all of their dependencies (and dev dependencies) locally, but only re-publish those items that -cannot be found elsewhere. See package.json(5) for more information.

      +cannot be found elsewhere. See package.json(5) for more information.

      SEE ALSO

      @@ -184,5 +184,5 @@

      SEE ALSO

             - + diff --git a/deps/npm/html/doc/files/npm-global.html b/deps/npm/html/doc/files/npm-global.html index cb2b56c29e3f51..90e5dcaf1dc3c6 100644 --- a/deps/npm/html/doc/files/npm-global.html +++ b/deps/npm/html/doc/files/npm-global.html @@ -1,9 +1,9 @@ - npm-folders + npm-global - + @@ -44,7 +44,7 @@

      Node Modules

      Scoped packages are installed the same way, except they are grouped together in a sub-folder of the relevant node_modules folder with the name of that scope prefix by the @ symbol, e.g. npm install @myorg/package would place -the package in {prefix}/node_modules/@myorg/package. See scopes(7) for +the package in {prefix}/node_modules/@myorg/package. See scopes(7) for more details.

      If you wish to require() a package, then install it locally.

      Executables

      @@ -59,7 +59,7 @@

      Man Pages

      When in local mode, man pages are not installed.

      Man pages are not installed on Windows systems.

      Cache

      -

      See npm-cache(1). Cache files are stored in ~/.npm on Posix, or +

      See npm-cache(1). Cache files are stored in ~/.npm on Posix, or ~/npm-cache on Windows.

      This is controlled by the cache configuration param.

      Temp Files

      @@ -159,18 +159,18 @@

      Publishing

      not be included in the package tarball.

      This allows a package maintainer to install all of their dependencies (and dev dependencies) locally, but only re-publish those items that -cannot be found elsewhere. See package.json(5) for more information.

      +cannot be found elsewhere. See package.json(5) for more information.

      SEE ALSO

      @@ -184,5 +184,5 @@

      SEE ALSO

             - + diff --git a/deps/npm/html/doc/files/npm-json.html b/deps/npm/html/doc/files/npm-json.html index b00032dba985d6..ade4fd07ec4d01 100644 --- a/deps/npm/html/doc/files/npm-json.html +++ b/deps/npm/html/doc/files/npm-json.html @@ -1,9 +1,9 @@ - package.json + npm-json - + @@ -14,7 +14,7 @@

      DESCRIPTION

      This document is all you need to know about what's required in your package.json file. It must be actual JSON, not just a JavaScript object literal.

      A lot of the behavior described in this document is affected by the config -settings described in npm-config(7).

      +settings described in npm-config(7).

      name

      The most important things in your package.json are the name and version fields. Those are actually required, and your package won't install without @@ -35,7 +35,7 @@

      name

      already, before you get too attached to it. http://registry.npmjs.org/

    A name can be optionally prefixed by a scope, e.g. @myorg/mypackage. See -npm-scope(7) for more detail.

    +npm-scope(7) for more detail.

    version

    The most important things in your package.json are the name and version fields. Those are actually required, and your package won't install without @@ -45,7 +45,7 @@

    version

    Version must be parseable by node-semver, which is bundled with npm as a dependency. (npm install semver to use it yourself.)

    -

    More on version numbers and ranges at semver(7).

    +

    More on version numbers and ranges at semver(7).

    description

    Put a description in it. It's a string. This helps people discover your package, as it's listed in npm search.

    @@ -161,16 +161,16 @@

    bin

    directories

    The CommonJS Packages spec details a few ways that you can indicate the structure of your package using a directories -hash. If you look at npm's package.json, +object. If you look at npm's package.json, you'll see that it has directories for doc, lib, and man.

    In the future, this information may be used in other creative ways.

    directories.lib

    Tell people where the bulk of your library is. Nothing special is done with the lib folder in any way, but it's useful meta info.

    directories.bin

    -

    If you specify a "bin" directory, then all the files in that folder will -be used as the "bin" hash.

    -

    If you have a "bin" hash already, then this has no effect.

    +

    If you specify a bin directory, then all the files in that folder will +be added as children of the bin path.

    +

    If you have a bin path already, then this has no effect.

    directories.man

    A folder that is full of man pages. Sugar to generate a "man" array by walking the folder.

    @@ -197,37 +197,37 @@

    repository

    directly to a VCS program without any modification. It should not be a url to an html project page that you put in your browser. It's for computers.

    scripts

    -

    The "scripts" member is an object hash of script commands that are run +

    The "scripts" property is a dictionary containing script commands that are run at various times in the lifecycle of your package. The key is the lifecycle event, and the value is the command to run at that point.

    -

    See npm-scripts(7) to find out more about writing package scripts.

    +

    See npm-scripts(7) to find out more about writing package scripts.

    config

    -

    A "config" hash can be used to set configuration -parameters used in package scripts that persist across upgrades. For -instance, if a package had the following:

    +

    A "config" object can be used to set configuration parameters used in package +scripts that persist across upgrades. For instance, if a package had the +following:

    { "name" : "foo"
 , "config" : { "port" : "8080" } }

    and then had a "start" command that then referenced the npm_package_config_port environment variable, then the user could override that by doing npm config set foo:port 8001.

    -

    See npm-config(7) and npm-scripts(7) for more on package +

    See npm-config(7) and npm-scripts(7) for more on package configs.

    dependencies

    -

    Dependencies are specified with a simple hash of package name to +

    Dependencies are specified in a simple object that maps a package name to a version range. The version range is a string which has one or more -space-separated descriptors. Dependencies can also be identified with -a tarball or git URL.

    +space-separated descriptors. Dependencies can also be identified with a +tarball or git URL.

    Please do not put test harnesses or transpilers in your -dependencies hash. See devDependencies, below.

    -

    See semver(7) for more details about specifying version ranges.

    +dependencies object. See devDependencies, below.

    +

    See semver(7) for more details about specifying version ranges.

    • version Must match version exactly
    • >version Must be greater than version
    • >=version etc
    • <version
    • <=version
      • -
    • ~version "Approximately equivalent to version" See semver(7)
      • -
    • ^version "Compatible with version" See semver(7)
      • +
    • ~version "Approximately equivalent to version" See semver(7)
      • +
    • ^version "Compatible with version" See semver(7)
    • 1.2.x 1.2.0, 1.2.1, etc., but not 1.3.0
    • http://... See 'URLs as Dependencies' below
    • * Matches any version
      • @@ -236,7 +236,7 @@

      dependencies

    • range1 || range2 Passes if either range1 or range2 are satisfied.
    • git... See 'Git URLs as Dependencies' below
    • user/repo See 'GitHub URLs' below
      • -
    • tag A specific version tagged and published as tag See npm-tag(1)
      • +
    • tag A specific version tagged and published as tag See npm-tag(1)
    • path/path/path See Local Paths below

    For example, these are all valid:

    @@ -252,7 +252,7 @@

    dependencies

    , "two" : "2.x" , "thr" : "3.3.x" , "lat" : "latest" - , "dyl" : "~/projects/dyl" + , "dyl" : "file:../dyl" } }

    URLs as Dependencies

    @@ -278,12 +278,21 @@

    GitHub URLs

    } }

    Local Paths

    -

    As of version 2.0.0 you can provide a path to a local directory that -contains a package. Local paths can be in the form:

    +

    As of version 2.0.0 you can provide a path to a local directory that contains a +package. Local paths can be saved using npm install --save, using any of +these forms:

    ../foo/bar
 ~/foo/bar
 ./foo/bar
 /foo/bar
+

    in which case they will be normalized to a relative path and added to your +package.json. For example:

    +
    {
+  "name": "baz",
+  "dependencies": {
+    "bar": "file:../foo/bar"
+  }
+}

    This feature is helpful for local offline development and creating tests that require npm installing where you don't want to hit an external server, but should not be used when publishing packages @@ -292,11 +301,11 @@

    devDependencies

    If someone is planning on downloading and using your module in their program, then they probably don't want or need to download and build the external test or documentation framework that you use.

    -

    In this case, it's best to list these additional items in a -devDependencies hash.

    +

    In this case, it's best to map these additional items in a devDependencies +object.

    These things will be installed when doing npm link or npm install from the root of a package, and can be managed like any other npm -configuration param. See npm-config(7) for more on the topic.

    +configuration param. See npm-config(7) for more on the topic.

    For build steps that are not platform-specific, such as compiling CoffeeScript or other languages to JavaScript, use the prepublish script to do this, and make the required package a devDependency.

    @@ -346,11 +355,11 @@

    bundledDependencies

    Array of package names that will be bundled when publishing the package.

    If this is spelled "bundleDependencies", then that is also honorable.

    optionalDependencies

    -

    If a dependency can be used, but you would like npm to proceed if it -cannot be found or fails to install, then you may put it in the -optionalDependencies hash. This is a map of package name to version -or url, just like the dependencies hash. The difference is that -failure is tolerated.

    +

    If a dependency can be used, but you would like npm to proceed if it cannot be +found or fails to install, then you may put it in the optionalDependencies +object. This is a map of package name to version or url, just like the +dependencies object. The difference is that build failures do not cause +installation to fail.

    It is still your program's responsibility to handle the lack of the dependency. For example, something like this:

    try {
@@ -385,11 +394,11 @@ 
    engines
    
 field is advisory only.
    
 
    engineStrict
    
 
    If you are sure that your module will definitely not run properly on
-versions of Node/npm other than those specified in the engines hash,
+versions of Node/npm other than those specified in the engines object,
 then you can set "engineStrict": true in your package.json file.
 This will override the user's engine-strict config setting.
    
 
    Please do not do this unless you are really very very sure.  If your
-engines hash is something overly restrictive, you can quite easily and
+engines object is something overly restrictive, you can quite easily and
 inadvertently lock yourself into obscurity and prevent your users from
 updating to new versions of Node.  Consider this choice carefully.  If
 people abuse it, it will be removed in a future version of npm.
    
@@ -419,11 +428,11 @@ 
    preferGlobal
    
 
    private
    
 
    If you set "private": true in your package.json, then npm will refuse
 to publish it.
    
-
    This is a way to prevent accidental publication of private repositories.
-If you would like to ensure that a given package is only ever published
-to a specific registry (for example, an internal registry),
-then use the publishConfig hash described below
-to override the registry config param at publish-time.
    
+
    This is a way to prevent accidental publication of private repositories.  If
+you would like to ensure that a given package is only ever published to a
+specific registry (for example, an internal registry), then use the
+publishConfig dictionary described below to override the registry config
+param at publish-time.
    
 
    publishConfig
    
 
    This is a set of config values that will be used at publish-time.  It's
 especially handy if you want to set the tag or registry, so that you can
@@ -431,7 +440,7 @@ 
    publishConfig
    
 the global public registry by default.
    
 
    Any config values can be overridden, but of course only "tag" and
 "registry" probably matter for the purposes of publishing.
    
-
    See npm-config(7) to see the list of config options that can be
+
    See npm-config(7) to see the list of config options that can be
 overridden.
    
 
    DEFAULT VALUES
    
 
    npm will default some values based on package contents.
    
@@ -453,16 +462,16 @@ 
    DEFAULT VALUES
    
 
 
    SEE ALSO
    
 
 
 
@@ -476,5 +485,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/files/npmrc.html b/deps/npm/html/doc/files/npmrc.html
index f1f4817eb3402c..9f379006f09515 100644
--- a/deps/npm/html/doc/files/npmrc.html
+++ b/deps/npm/html/doc/files/npmrc.html
@@ -15,7 +15,7 @@ 
    DESCRIPTION
    
 variables, and npmrc files.
    
 
    The npm config command can be used to update and edit the contents
 of the user and global npmrc files.
    
-
    For a list of available configuration options, see npm-config(7).
    
+
    For a list of available configuration options, see npm-config(7).
    
 
    FILES
    
 
    The four relevant files are:
    
 
      
@@ -55,11 +55,11 @@ 
      Built-in config file
      
 manner.
      
 
      SEE ALSO
      
 
 
 
@@ -73,5 +73,5 @@ 
      SEE ALSO
      
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/files/package.json.html b/deps/npm/html/doc/files/package.json.html
index b00032dba985d6..183ad8ea5d6a4f 100644
--- a/deps/npm/html/doc/files/package.json.html
+++ b/deps/npm/html/doc/files/package.json.html
@@ -14,7 +14,7 @@ 
      DESCRIPTION
      
 
      This document is all you need to know about what's required in your package.json
 file.  It must be actual JSON, not just a JavaScript object literal.
      
 
      A lot of the behavior described in this document is affected by the config
-settings described in npm-config(7).
      
+settings described in npm-config(7).
      
 
      name
      
 
      The most important things in your package.json are the name and version fields.
 Those are actually required, and your package won't install without
@@ -35,7 +35,7 @@ 
      name
      
 already, before you get too attached to it.  http://registry.npmjs.org/
 
    
 
    A name can be optionally prefixed by a scope, e.g. @myorg/mypackage. See
-npm-scope(7) for more detail.
    
+npm-scope(7) for more detail.
    
 
    version
    
 
    The most important things in your package.json are the name and version fields.
 Those are actually required, and your package won't install without
@@ -45,7 +45,7 @@ 
    version
    
 
    Version must be parseable by
 node-semver, which is bundled
 with npm as a dependency.  (npm install semver to use it yourself.)
    
-
    More on version numbers and ranges at semver(7).
    
+
    More on version numbers and ranges at semver(7).
    
 
    description
    
 
    Put a description in it.  It's a string.  This helps people discover your
 package, as it's listed in npm search.
    
@@ -161,16 +161,16 @@ 
    bin
    
 
    directories
    
 
    The CommonJS Packages spec details a
 few ways that you can indicate the structure of your package using a directories
-hash. If you look at npm's package.json,
+object. If you look at npm's package.json,
 you'll see that it has directories for doc, lib, and man.
    
 
    In the future, this information may be used in other creative ways.
    
 
    directories.lib
    
 
    Tell people where the bulk of your library is.  Nothing special is done
 with the lib folder in any way, but it's useful meta info.
    
 
    directories.bin
    
-
    If you specify a "bin" directory, then all the files in that folder will
-be used as the "bin" hash.
    
-
    If you have a "bin" hash already, then this has no effect.
    
+
    If you specify a bin directory, then all the files in that folder will
+be added as children of the bin path.
    
+
    If you have a bin path already, then this has no effect.
    
 
    directories.man
    
 
    A folder that is full of man pages.  Sugar to generate a "man" array by
 walking the folder.
    
@@ -197,37 +197,37 @@ 
    repository
    
 directly to a VCS program without any modification.  It should not be a url to an
 html project page that you put in your browser.  It's for computers.
    
 
    scripts
    
-
    The "scripts" member is an object hash of script commands that are run
+
    The "scripts" property is a dictionary containing script commands that are run
 at various times in the lifecycle of your package.  The key is the lifecycle
 event, and the value is the command to run at that point.
    
-
    See npm-scripts(7) to find out more about writing package scripts.
    
+
    See npm-scripts(7) to find out more about writing package scripts.
    
 
    config
    
-
    A "config" hash can be used to set configuration
-parameters used in package scripts that persist across upgrades.  For
-instance, if a package had the following:
    
+
    A "config" object can be used to set configuration parameters used in package
+scripts that persist across upgrades.  For instance, if a package had the
+following:
    
 
    { "name" : "foo"
 , "config" : { "port" : "8080" } }
 
    and then had a "start" command that then referenced the
 npm_package_config_port environment variable, then the user could
 override that by doing npm config set foo:port 8001.
    
-
    See npm-config(7) and npm-scripts(7) for more on package
+
    See npm-config(7) and npm-scripts(7) for more on package
 configs.
    
 
    dependencies
    
-
    Dependencies are specified with a simple hash of package name to
+
    Dependencies are specified in a simple object that maps a package name to a
 version range. The version range is a string which has one or more
-space-separated descriptors.  Dependencies can also be identified with
-a tarball or git URL.
    
+space-separated descriptors.  Dependencies can also be identified with a
+tarball or git URL.
    
 
    Please do not put test harnesses or transpilers in your
-dependencies hash.  See devDependencies, below.
    
-
    See semver(7) for more details about specifying version ranges.
    
+dependencies object.  See devDependencies, below.
    
+
    See semver(7) for more details about specifying version ranges.
    
 
      
 
    • version Must match version exactly
      • 
 
    • >version Must be greater than version
      • 
 
    • >=version etc
      • 
 
    • <version
      • 
 
    • <=version
      • 
-
    • ~version "Approximately equivalent to version"  See semver(7)
      • 
-
    • ^version "Compatible with version"  See semver(7)
      • 
+
    • ~version "Approximately equivalent to version"  See semver(7)
      • 
+
    • ^version "Compatible with version"  See semver(7)
      • 
 
    • 1.2.x 1.2.0, 1.2.1, etc., but not 1.3.0
      • 
 
    • http://... See 'URLs as Dependencies' below
      • 
 
    • * Matches any version
      • 
@@ -236,7 +236,7 @@ 
      dependencies
      
 
    • range1 || range2 Passes if either range1 or range2 are satisfied.
      • 
 
    • git... See 'Git URLs as Dependencies' below
      • 
 
    • user/repo See 'GitHub URLs' below
      • 
-
    • tag A specific version tagged and published as tag  See npm-tag(1)
      • 
+
    • tag A specific version tagged and published as tag  See npm-tag(1)
      • 
 
    • path/path/path See Local Paths below
      • 
 
    
 
    For example, these are all valid:
    
@@ -252,7 +252,7 @@ 
    dependencies
    
   , "two" : "2.x"
   , "thr" : "3.3.x"
   , "lat" : "latest"
-  , "dyl" : "~/projects/dyl"
+  , "dyl" : "file:../dyl"
   }
 }

    URLs as Dependencies

    @@ -278,12 +278,21 @@

    GitHub URLs

    } }

    Local Paths

    -

    As of version 2.0.0 you can provide a path to a local directory that -contains a package. Local paths can be in the form:

    +

    As of version 2.0.0 you can provide a path to a local directory that contains a +package. Local paths can be saved using npm install --save, using any of +these forms:

    ../foo/bar
 ~/foo/bar
 ./foo/bar
 /foo/bar
+

    in which case they will be normalized to a relative path and added to your +package.json. For example:

    +
    {
+  "name": "baz",
+  "dependencies": {
+    "bar": "file:../foo/bar"
+  }
+}

    This feature is helpful for local offline development and creating tests that require npm installing where you don't want to hit an external server, but should not be used when publishing packages @@ -292,11 +301,11 @@

    devDependencies

    If someone is planning on downloading and using your module in their program, then they probably don't want or need to download and build the external test or documentation framework that you use.

    -

    In this case, it's best to list these additional items in a -devDependencies hash.

    +

    In this case, it's best to map these additional items in a devDependencies +object.

    These things will be installed when doing npm link or npm install from the root of a package, and can be managed like any other npm -configuration param. See npm-config(7) for more on the topic.

    +configuration param. See npm-config(7) for more on the topic.

    For build steps that are not platform-specific, such as compiling CoffeeScript or other languages to JavaScript, use the prepublish script to do this, and make the required package a devDependency.

    @@ -346,11 +355,11 @@

    bundledDependencies

    Array of package names that will be bundled when publishing the package.

    If this is spelled "bundleDependencies", then that is also honorable.

    optionalDependencies

    -

    If a dependency can be used, but you would like npm to proceed if it -cannot be found or fails to install, then you may put it in the -optionalDependencies hash. This is a map of package name to version -or url, just like the dependencies hash. The difference is that -failure is tolerated.

    +

    If a dependency can be used, but you would like npm to proceed if it cannot be +found or fails to install, then you may put it in the optionalDependencies +object. This is a map of package name to version or url, just like the +dependencies object. The difference is that build failures do not cause +installation to fail.

    It is still your program's responsibility to handle the lack of the dependency. For example, something like this:

    try {
@@ -385,11 +394,11 @@ 
    engines
    
 field is advisory only.
    
 
    engineStrict
    
 
    If you are sure that your module will definitely not run properly on
-versions of Node/npm other than those specified in the engines hash,
+versions of Node/npm other than those specified in the engines object,
 then you can set "engineStrict": true in your package.json file.
 This will override the user's engine-strict config setting.
    
 
    Please do not do this unless you are really very very sure.  If your
-engines hash is something overly restrictive, you can quite easily and
+engines object is something overly restrictive, you can quite easily and
 inadvertently lock yourself into obscurity and prevent your users from
 updating to new versions of Node.  Consider this choice carefully.  If
 people abuse it, it will be removed in a future version of npm.
    
@@ -419,11 +428,11 @@ 
    preferGlobal
    
 
    private
    
 
    If you set "private": true in your package.json, then npm will refuse
 to publish it.
    
-
    This is a way to prevent accidental publication of private repositories.
-If you would like to ensure that a given package is only ever published
-to a specific registry (for example, an internal registry),
-then use the publishConfig hash described below
-to override the registry config param at publish-time.
    
+
    This is a way to prevent accidental publication of private repositories.  If
+you would like to ensure that a given package is only ever published to a
+specific registry (for example, an internal registry), then use the
+publishConfig dictionary described below to override the registry config
+param at publish-time.
    
 
    publishConfig
    
 
    This is a set of config values that will be used at publish-time.  It's
 especially handy if you want to set the tag or registry, so that you can
@@ -431,7 +440,7 @@ 
    publishConfig
    
 the global public registry by default.
    
 
    Any config values can be overridden, but of course only "tag" and
 "registry" probably matter for the purposes of publishing.
    
-
    See npm-config(7) to see the list of config options that can be
+
    See npm-config(7) to see the list of config options that can be
 overridden.
    
 
    DEFAULT VALUES
    
 
    npm will default some values based on package contents.
    
@@ -453,16 +462,16 @@ 
    DEFAULT VALUES
    
 
 
    SEE ALSO
    
 
 
 
@@ -476,5 +485,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/index.html b/deps/npm/html/doc/index.html
index bae8566262629c..6c68895e073001 100644
--- a/deps/npm/html/doc/index.html
+++ b/deps/npm/html/doc/index.html
@@ -1,6 +1,6 @@
 
 
-  npm-index
+  index
   
   
   
@@ -10,217 +10,213 @@
     
    
 
 
    npm-index
     
    Index of all npm documentation
    
-
    README
    
+
    README
    
 
    node package manager
    
 
    Command Line Documentation
    
 
    Using npm on the command line
    
-
    npm(1)
    
+
    npm(1)
    
 
    node package manager
    
-
    npm-adduser(1)
    
+
    npm-adduser(1)
    
 
    Add a registry user account
    
-
    npm-bin(1)
    
+
    npm-bin(1)
    
 
    Display npm bin folder
    
-
    npm-bugs(1)
    
+
    npm-bugs(1)
    
 
    Bugs for a package in a web browser maybe
    
-
    npm-build(1)
    
+
    npm-build(1)
    
 
    Build a package
    
-
    npm-bundle(1)
    
+
    npm-bundle(1)
    
 
    REMOVED
    
-
    npm-cache(1)
    
+
    npm-cache(1)
    
 
    Manipulates packages cache
    
-
    npm-completion(1)
    
+
    npm-completion(1)
    
 
    Tab Completion for npm
    
-
    npm-config(1)
    
+
    npm-config(1)
    
 
    Manage the npm configuration files
    
-
    npm-dedupe(1)
    
+
    npm-dedupe(1)
    
 
    Reduce duplication
    
-
    npm-deprecate(1)
    
+
    npm-deprecate(1)
    
 
    Deprecate a version of a package
    
-
    npm-docs(1)
    
+
    npm-docs(1)
    
 
    Docs for a package in a web browser maybe
    
-
    npm-edit(1)
    
+
    npm-edit(1)
    
 
    Edit an installed package
    
-
    npm-explore(1)
    
+
    npm-explore(1)
    
 
    Browse an installed package
    
-
    npm-help-search(1)
    
+
    npm-help-search(1)
    
 
    Search npm help documentation
    
-
    npm-help(1)
    
+
    npm-help(1)
    
 
    Get help on npm
    
-
    npm-init(1)
    
+
    npm-init(1)
    
 
    Interactively create a package.json file
    
-
    npm-install(1)
    
+
    npm-install(1)
    
 
    Install a package
    
-
    npm-link(1)
    
+
    npm-link(1)
    
 
    Symlink a package folder
    
-
    npm-ls(1)
    
+
    npm-ls(1)
    
 
    List installed packages
    
-
    npm-outdated(1)
    
+
    npm-outdated(1)
    
 
    Check for outdated packages
    
-
    npm-owner(1)
    
+
    npm-owner(1)
    
 
    Manage package owners
    
-
    npm-pack(1)
    
+
    npm-pack(1)
    
 
    Create a tarball from a package
    
-
    npm-prefix(1)
    
+
    npm-prefix(1)
    
 
    Display prefix
    
-
    npm-prune(1)
    
+
    npm-prune(1)
    
 
    Remove extraneous packages
    
-
    npm-publish(1)
    
+
    npm-publish(1)
    
 
    Publish a package
    
-
    npm-rebuild(1)
    
+
    npm-rebuild(1)
    
 
    Rebuild a package
    
-
    npm-repo(1)
    
+
    npm-repo(1)
    
 
    Open package repository page in the browser
    
-
    npm-restart(1)
    
+
    npm-restart(1)
    
 
    Start a package
    
-
    npm-rm(1)
    
+
    npm-rm(1)
    
 
    Remove a package
    
-
    npm-root(1)
    
+
    npm-root(1)
    
 
    Display npm root
    
-
    npm-run-script(1)
    
+
    npm-run-script(1)
    
 
    Run arbitrary package scripts
    
-
    npm-search(1)
    
+
    npm-search(1)
    
 
    Search for packages
    
-
    npm-shrinkwrap(1)
    
+
    npm-shrinkwrap(1)
    
 
    Lock down dependency versions
    
-
    npm-star(1)
    
+
    npm-star(1)
    
 
    Mark your favorite packages
    
-
    npm-stars(1)
    
+
    npm-stars(1)
    
 
    View packages marked as favorites
    
-
    npm-start(1)
    
+
    npm-start(1)
    
 
    Start a package
    
-
    npm-stop(1)
    
+
    npm-stop(1)
    
 
    Stop a package
    
-
    npm-submodule(1)
    
-
    Add a package as a git submodule
    
-
    npm-tag(1)
    
+
    npm-tag(1)
    
 
    Tag a published version
    
-
    npm-test(1)
    
+
    npm-test(1)
    
 
    Test a package
    
-
    npm-uninstall(1)
    
+
    npm-uninstall(1)
    
 
    Remove a package
    
-
    npm-unpublish(1)
    
+
    npm-unpublish(1)
    
 
    Remove a package from the registry
    
-
    npm-update(1)
    
+
    npm-update(1)
    
 
    Update a package
    
-
    npm-version(1)
    
+
    npm-version(1)
    
 
    Bump a package version
    
-
    npm-view(1)
    
+
    npm-view(1)
    
 
    View registry info
    
-
    npm-whoami(1)
    
+
    npm-whoami(1)
    
 
    Display npm username
    
 
    API Documentation
    
 
    Using npm in your Node programs
    
-
    npm(3)
    
+
    npm(3)
    
 
    node package manager
    
-
    npm-bin(3)
    
+
    npm-bin(3)
    
 
    Display npm bin folder
    
-
    npm-bugs(3)
    
+
    npm-bugs(3)
    
 
    Bugs for a package in a web browser maybe
    
-
    npm-cache(3)
    
+
    npm-cache(3)
    
 
    manage the npm cache programmatically
    
-
    npm-commands(3)
    
+
    npm-commands(3)
    
 
    npm commands
    
-
    npm-config(3)
    
+
    npm-config(3)
    
 
    Manage the npm configuration files
    
-
    npm-deprecate(3)
    
+
    npm-deprecate(3)
    
 
    Deprecate a version of a package
    
-
    npm-docs(3)
    
+
    npm-docs(3)
    
 
    Docs for a package in a web browser maybe
    
-
    npm-edit(3)
    
+
    npm-edit(3)
    
 
    Edit an installed package
    
-
    npm-explore(3)
    
+
    npm-explore(3)
    
 
    Browse an installed package
    
-
    npm-help-search(3)
    
+
    npm-help-search(3)
    
 
    Search the help pages
    
-
    npm-init(3)
    
+
    npm-init(3)
    
 
    Interactively create a package.json file
    
-
    npm-install(3)
    
+
    npm-install(3)
    
 
    install a package programmatically
    
-
    npm-link(3)
    
+
    npm-link(3)
    
 
    Symlink a package folder
    
-
    npm-load(3)
    
+
    npm-load(3)
    
 
    Load config settings
    
-
    npm-ls(3)
    
+
    npm-ls(3)
    
 
    List installed packages
    
-
    npm-outdated(3)
    
+
    npm-outdated(3)
    
 
    Check for outdated packages
    
-
    npm-owner(3)
    
+
    npm-owner(3)
    
 
    Manage package owners
    
-
    npm-pack(3)
    
+
    npm-pack(3)
    
 
    Create a tarball from a package
    
-
    npm-prefix(3)
    
+
    npm-prefix(3)
    
 
    Display prefix
    
-
    npm-prune(3)
    
+
    npm-prune(3)
    
 
    Remove extraneous packages
    
-
    npm-publish(3)
    
+
    npm-publish(3)
    
 
    Publish a package
    
-
    npm-rebuild(3)
    
+
    npm-rebuild(3)
    
 
    Rebuild a package
    
-
    npm-repo(3)
    
+
    npm-repo(3)
    
 
    Open package repository page in the browser
    
-
    npm-restart(3)
    
+
    npm-restart(3)
    
 
    Start a package
    
-
    npm-root(3)
    
+
    npm-root(3)
    
 
    Display npm root
    
-
    npm-run-script(3)
    
+
    npm-run-script(3)
    
 
    Run arbitrary package scripts
    
-
    npm-search(3)
    
+
    npm-search(3)
    
 
    Search for packages
    
-
    npm-shrinkwrap(3)
    
+
    npm-shrinkwrap(3)
    
 
    programmatically generate package shrinkwrap file
    
-
    npm-start(3)
    
+
    npm-start(3)
    
 
    Start a package
    
-
    npm-stop(3)
    
+
    npm-stop(3)
    
 
    Stop a package
    
-
    npm-submodule(3)
    
-
    Add a package as a git submodule
    
-
    npm-tag(3)
    
+
    npm-tag(3)
    
 
    Tag a published version
    
-
    npm-test(3)
    
+
    npm-test(3)
    
 
    Test a package
    
-
    npm-uninstall(3)
    
+
    npm-uninstall(3)
    
 
    uninstall a package programmatically
    
-
    npm-unpublish(3)
    
+
    npm-unpublish(3)
    
 
    Remove a package from the registry
    
-
    npm-update(3)
    
+
    npm-update(3)
    
 
    Update a package
    
-
    npm-version(3)
    
+
    npm-version(3)
    
 
    Bump a package version
    
-
    npm-view(3)
    
+
    npm-view(3)
    
 
    View registry info
    
-
    npm-whoami(3)
    
+
    npm-whoami(3)
    
 
    Display npm username
    
 
    Files
    
 
    File system structures npm uses
    
-
    npm-folders(5)
    
+
    npm-folders(5)
    
 
    Folder Structures Used by npm
    
-
    npmrc(5)
    
+
    npmrc(5)
    
 
    The npm config files
    
-
    package.json(5)
    
+
    package.json(5)
    
 
    Specifics of npm's package.json handling
    
 
    Misc
    
 
    Various other bits and bobs
    
-
    npm-coding-style(7)
    
+
    npm-coding-style(7)
    
 
    npm's "funny" coding style
    
-
    npm-config(7)
    
+
    npm-config(7)
    
 
    More than you probably want to know about npm configuration
    
-
    npm-developers(7)
    
+
    npm-developers(7)
    
 
    Developer Guide
    
-
    npm-disputes(7)
    
+
    npm-disputes(7)
    
 
    Handling Module Name Disputes
    
-
    npm-faq(7)
    
+
    npm-faq(7)
    
 
    Frequently Asked Questions
    
-
    npm-index(7)
    
+
    npm-index(7)
    
 
    Index of all npm documentation
    
-
    npm-registry(7)
    
+
    npm-registry(7)
    
 
    The JavaScript Package Registry
    
-
    npm-scope(7)
    
+
    npm-scope(7)
    
 
    Scoped packages
    
-
    npm-scripts(7)
    
+
    npm-scripts(7)
    
 
    How npm handles the "scripts" field
    
-
    removing-npm(7)
    
+
    removing-npm(7)
    
 
    Cleaning the Slate
    
-
    semver(7)
    
+
    semver(7)
    
 
    The semantic versioner for npm
    
 
 
    
@@ -234,5 +230,5 @@ 
    semver(7)
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-coding-style.html b/deps/npm/html/doc/misc/npm-coding-style.html
index 5d94f84bf0ed13..30d3e07cfab492 100644
--- a/deps/npm/html/doc/misc/npm-coding-style.html
+++ b/deps/npm/html/doc/misc/npm-coding-style.html
@@ -109,11 +109,11 @@ 
    Logging
    
 logging the same object over and over again is not helpful.  Logs should
 report what's happening so that it's easier to track down where a fault
 occurs.
    
-
    Use appropriate log levels.  See npm-config(7) and search for
+
    Use appropriate log levels.  See npm-config(7) and search for
 "loglevel".
    
 
    Case, naming, etc.
    
 
    Use lowerCamelCase for multiword identifiers when they refer to objects,
-functions, methods, members, or anything not specified in this section.
    
+functions, methods, properties, or anything not specified in this section.
    
 
    Use UpperCamelCase for class names (things that you'd pass to "new").
    
 
    Use all-lower-hyphen-css-case for multiword filenames and config keys.
    
 
    Use named functions.  They make stack traces easier to follow.
    
@@ -131,9 +131,9 @@ 
    null, undefined, false, 0
    
 
    Boolean objects are verboten.
    
 
    SEE ALSO
    
 
 
 
@@ -147,5 +147,5 @@ 
    SEE ALSO
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-config.html b/deps/npm/html/doc/misc/npm-config.html
index e7696f491eae68..249d5934c9eb76 100644
--- a/deps/npm/html/doc/misc/npm-config.html
+++ b/deps/npm/html/doc/misc/npm-config.html
@@ -33,7 +33,7 @@ 
    npmrc Files
    
 
  • global config file ($PREFIX/npmrc)
    • 
 
  • npm builtin config file (/path/to/npm/npmrc)
    • 
 
-
    See npmrc(5) for more details.
    
+
    See npmrc(5) for more details.
    
 
    Default Configs
    
 
    A set of configuration parameters that are internal to npm, and are
 defaults if nothing else is specified.
    
@@ -79,7 +79,7 @@ 
    Shorthands and Other CLI Niceties

    Per-Package Config Settings

    -

    When running scripts (see npm-scripts(7)) the package.json "config" +

    When running scripts (see npm-scripts(7)) the package.json "config" keys are overwritten in the environment if there is a config param of <name>[@<version>]:<key>. For example, if the package.json has this:

    @@ -90,7 +90,7 @@

    Shorthands and Other CLI Niceties

    http.createServer(...).listen(process.env.npm_package_config_port)

    then the user could change the behavior by doing:

    npm config set foo:port 80
-

    See package.json(5) for more information.

    +

    See package.json(5) for more information.

    Config Settings

    always-auth

      @@ -138,7 +138,7 @@

      cache

    • Default: Windows: %AppData%\npm-cache, Posix: ~/.npm
    • Type: path
    -

    The location of npm's cache directory. See npm-cache(1)

    +

    The location of npm's cache directory. See npm-cache(1)

    cache-lock-stale

    • Default: 60000 (1 minute)
      • @@ -285,7 +285,7 @@

      global

    Operates in "global" mode, so that packages are installed into the prefix folder instead of the current working directory. See -npm-folders(5) for more on the differences in behavior.

    +npm-folders(5) for more on the differences in behavior.