deps: upgrade to npm 2.14.18

.eslintignore

@@ -1,5 +1,5 @@
 lib/punycode.js
-test/addons/doc-*/
+test/addons/??_*/
 test/fixtures
 test/**/node_modules
 test/disabled

.eslintrc

@@ -27,8 +27,6 @@ rules:
   no-duplicate-case: 2
   ## disallow assignment of exceptional params
   no-ex-assign: 2
-  ## disallow use of reserved words as keys like enum, class
-  no-reserved-keys: 2
   ## disallow unreachable code
   no-unreachable: 2
   ## require valid typeof compared string like typeof foo === 'strnig'
@@ -44,7 +42,7 @@ rules:
   ## use single quote, we can use double quote when escape chars
   quotes: [2, "single", "avoid-escape"]
   ## 2 space indentation
-  indent: [2, 2]
+  indent: [2, 2, {SwitchCase: 1}]
   ## add space after comma
   comma-spacing: 2
   ## put semi-colon
@@ -67,8 +65,10 @@ rules:
   eol-last: 2
   ## no trailing spaces
   no-trailing-spaces: 2
-  # require space after keywords, eg 'for (..)'
+  ## require space after keywords, eg 'for (..)'
   space-after-keywords: 2
+  ## no leading/trailing spaces in parens
+  space-in-parens: [2, "never"]
 
   # ECMAScript 6
   # list: http://eslint.org/docs/rules/#ecmascript-6
@@ -112,5 +112,3 @@ globals:
   DTRACE_NET_SERVER_CONNECTION         : false
   LTTNG_NET_SERVER_CONNECTION          : false
   COUNTER_NET_SERVER_CONNECTION        : false
-  escape                               : false
-  unescape                             : false

.gitignore

@@ -24,7 +24,7 @@ icu_config.gypi
 
 # various stuff that VC++ produces/uses
 Debug/
-!node_modules/debug/
+!**/node_modules/debug/
 Release/
 !doc/blog/**
 *.sln
@@ -50,7 +50,7 @@ ipch/
 /npm.wxs
 /tools/msvs/npm.wixobj
 /tools/osx-pkg.pmdoc/index.xml
-/test/addons/doc-*/
+/test/addons/??_*/
 email.md
 deps/v8-*
 deps/icu

CODE_OF_CONDUCT.md

@@ -1,11 +1,14 @@
 ## Code of Conduct
 
 This Code of Conduct is adapted from [Rust's wonderful
-CoC](http://www.rust-lang.org/conduct.html).
+CoC](http://www.rust-lang.org/conduct.html) as well as the
+[Contributor Covenant v1.3.0](http://contributor-covenant.org/version/1/3/0/).
 
 * We are committed to providing a friendly, safe and welcoming
-  environment for all, regardless of gender, sexual orientation,
-  disability, ethnicity, religion, or similar personal characteristic.
+  environment for all, regardless of level of experience, gender
+  identity and expression, sexual orientation, disability,
+  personal appearance, body size, race, ethnicity, age, religion,
+  nationality, or other similar characteristic.
 * Please avoid using overtly sexual nicknames or other nicknames that
   might detract from a friendly, safe and welcoming environment for
   all.

Makefile

@@ -105,12 +105,12 @@ test/gc/node_modules/weak/build/Release/weakref.node: $(NODE_EXE)
 
 # Implicitly depends on $(NODE_EXE), see the build-addons rule for rationale.
 test/addons/.docbuildstamp: doc/api/addons.markdown
-	$(RM) -r test/addons/doc-*/
+	$(RM) -r test/addons/??_*/
 	$(NODE) tools/doc/addon-verify.js
 	touch $@
 
 ADDONS_BINDING_GYPS := \
-	$(filter-out test/addons/doc-*/binding.gyp, \
+	$(filter-out test/addons/??_*/binding.gyp, \
 		$(wildcard test/addons/*/binding.gyp))
 
 # Implicitly depends on $(NODE_EXE), see the build-addons rule for rationale.
@@ -510,7 +510,7 @@ bench-idle:
 
 jslint:
 	$(NODE) tools/eslint/bin/eslint.js src lib test tools/eslint-rules \
-		--rulesdir tools/eslint-rules --reset --quiet
+		--rulesdir tools/eslint-rules --quiet
 
 CPPLINT_EXCLUDE ?=
 CPPLINT_EXCLUDE += src/node_lttng.cc
@@ -520,7 +520,7 @@ CPPLINT_EXCLUDE += src/node_win32_perfctr_provider.cc
 CPPLINT_EXCLUDE += src/queue.h
 CPPLINT_EXCLUDE += src/tree.h
 CPPLINT_EXCLUDE += src/v8abbr.h
-CPPLINT_EXCLUDE += $(wildcard test/addons/doc-*/*.cc test/addons/doc-*/*.h)
+CPPLINT_EXCLUDE += $(wildcard test/addons/??_*/*.cc test/addons/??_*/*.h)
 
 CPPLINT_FILES = $(filter-out $(CPPLINT_EXCLUDE), $(wildcard \
 	deps/debugger-agent/include/* \

WORKING_GROUPS.md

@@ -31,6 +31,7 @@ back in to the TSC.
 * [Post-mortem](#post-mortem)
 * [Intl](#intl)
 * [HTTP](#http)
+* [Documentation](#documentation)
 
 #### Process:
 
@@ -270,6 +271,22 @@ Its responsibilities are:
 + Defining and adding common structures to the dumps generated
   in order to support tools that want to introspect those dumps
 
+### [Documentation](https://github.com/nodejs/docs)
+
+The Documentation working group exists to support the improvement of Node.js
+documentation, both in the core API documentation, and elsewhere, such as the
+Node.js website. Its intent is to work closely with Evangelism, Website, and
+Intl working groups to make excellent documentation available and accessible
+to all.
+
+Its responsibilities are:
+
+* Defining and maintaining documentation style and content standards.
+* Producing documentation in a format acceptable for the Website WG to consume.
+* Ensuring that Node's documentation addresses a wide variety of audiences.
+* Creating and operating a process for documentation review that produces
+  quality documentation and avoids impeding the progress of Core work.
+
 ## Starting a WG
 
 A Working Group is established by first defining a charter  that can be

benchmark/querystring/querystring-parse.js

@@ -3,7 +3,7 @@ var querystring = require('querystring');
 var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
-  type: ['noencode', 'encodemany', 'encodelast'],
+  type: ['noencode', 'encodemany', 'encodelast', 'multivalue'],
   n: [1e6],
 });
 
@@ -14,7 +14,8 @@ function main(conf) {
   var inputs = {
     noencode: 'foo=bar&baz=quux&xyzzy=thud',
     encodemany: '%66%6F%6F=bar&%62%61%7A=quux&xyzzy=%74h%75d',
-    encodelast: 'foo=bar&baz=quux&xyzzy=thu%64'
+    encodelast: 'foo=bar&baz=quux&xyzzy=thu%64',
+    multivalue: 'foo=bar&foo=baz&foo=quux&quuy=quuz'
   };
   var input = inputs[type];
 

deps/npm/.travis.yml

@@ -1,4 +1,5 @@
 language: node_js
+sudo: false
 node_js:
   - "5"
   - "4"
@@ -11,7 +12,7 @@ env:
 before_install:
   - "npm config set spin false"
   - "npm install -g npm/npm#2.x"
-  - "sudo mkdir -p /var/run/couchdb"
+  - "mkdir -p /var/run/couchdb"
 script: "npm run-script test-all"
 notifications:
     slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8

deps/npm/AUTHORS

@@ -317,3 +317,28 @@ Juan Caicedo <[email protected]>
 Ashley Williams <[email protected]>
 Andrew Marcinkevičius <[email protected]>
 Jorrit Schippers <[email protected]>
+Alex Lukin <[email protected]>
+Aria Stewart <[email protected]>
+Tim <[email protected]>
+Nick Williams <[email protected]>
+Louis Larry <[email protected]>
+Jakub Gieryluk <[email protected]>
+Martin von Gagern <[email protected]>
+Eymen Gunay <[email protected]>
+ekmartin <[email protected]>
+Rafał Pocztarski <[email protected]>
+Ashley Williams <[email protected]>
+Mark Reeder <[email protected]>
+Tiago Rodrigues <[email protected]>
+Chris Rebert <[email protected]>
+Jeff McMahan <[email protected]>
+Scott Addie <[email protected]>
+Julian Simioni <[email protected]>
+Jimb Esser <[email protected]>
+Hal Henke <[email protected]>
+Alexis Campailla <[email protected]>
+Beau Gunderson <[email protected]>
+s100 <[email protected]>
+Jonathan Persson <[email protected]>
+Vedat Mahir YILMAZ <[email protected]>
+Jan Schär <[email protected]>