nodejs · MylesBorins · Sep 5, 2017 · May 2, 2017 · May 24, 2017 · Jul 20, 2017
diff --git a/.eslintrc.yaml b/.eslintrc.yaml
@@ -62,6 +62,9 @@ rules:
   no-delete-var: 2
   no-undef: 2
   no-unused-vars: [2, {args: none}]
+  no-use-before-define: [2, {classes: true,
+                             functions: false,
+                             variables: false}]
 
   # Node.js and CommonJS
   # http://eslint.org/docs/rules/#nodejs-and-commonjs
@@ -96,18 +99,13 @@ rules:
   func-call-spacing: 2
   func-name-matching: 2
   func-style: [2, declaration, {allowArrowFunctions: true}]
-  # indent: [2, 2, {ArrayExpression: first,
-  #                 CallExpression: {arguments: first},
-  #                 FunctionDeclaration: {parameters: first},
-  #                 FunctionExpression: {parameters: first},
-  #                 MemberExpression: off,
-  #                 ObjectExpression: first,
-  #                 SwitchCase: 1}]
-  indent-legacy: [2, 2, {ArrayExpression: first,
-                         CallExpression: {arguments: first},
-                         MemberExpression: 1,
-                         ObjectExpression: first,
-                         SwitchCase: 1}]
+  indent: [2, 2, {ArrayExpression: first,
+                  CallExpression: {arguments: first},
+                  FunctionDeclaration: {parameters: first},
+                  FunctionExpression: {parameters: first},
+                  MemberExpression: off,
+                  ObjectExpression: first,
+                  SwitchCase: 1}]
   key-spacing: [2, {mode: minimum}]
   keyword-spacing: 2
   linebreak-style: [2, unix]
@@ -163,7 +161,6 @@ rules:
   template-curly-spacing: 2
 
   # Custom rules in tools/eslint-rules
-  align-multiline-assignment: 2
   assert-throws-arguments: [2, { requireTwo: true }]
 
 # Global scoped method and vars

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,7 +26,8 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V6.md#6.11.2">6.11.2</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V6.md#6.11.3">6.11.3</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V6.md#6.11.2">6.11.2</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.11.1">6.11.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.11.0">6.11.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.10.3">6.10.3</a><br/>

diff --git a/Makefile b/Makefile
@@ -565,7 +565,8 @@ $(PKG): release-only
 		--release-urlbase=$(RELEASE_URLBASE) \
 		$(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)
 	$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)
-	SIGN="$(CODESIGN_CERT)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
+	SIGN="$(CODESIGN_CERT)" PKGDIR="$(PKGDIR)/usr/local" bash \
+		tools/osx-codesign.sh
 	cat tools/osx-pkg.pmdoc/index.xml.tmpl \
 		| sed -E "s/\\{nodeversion\\}/$(FULLVERSION)/g" \
 		| sed -E "s/\\{npmversion\\}/$(NPMVERSION)/g" \
@@ -670,6 +671,9 @@ $(BINARYTAR): release-only
 	cp README.md $(BINARYNAME)
 	cp LICENSE $(BINARYNAME)
 	cp CHANGELOG.md $(BINARYNAME)
+ifeq ($(OSTYPE),darwin)
+	SIGN="$(CODESIGN_CERT)" PKGDIR="$(BINARYNAME)" bash tools/osx-codesign.sh
+endif
 	tar -cf $(BINARYNAME).tar $(BINARYNAME)
 	$(RM) -r $(BINARYNAME)
 	gzip -c -f -9 $(BINARYNAME).tar > $(BINARYNAME).tar.gz

diff --git a/README.md b/README.md
@@ -81,12 +81,13 @@ The Node.js project maintains multiple types of releases:
   ordered codenames, beginning with v4 Argon. LTS releases are less frequent
   and will attempt to maintain consistent major and minor version numbers,
   only incrementing patch version numbers. There are no breaking changes or
-  feature additions, except in some special circumstances. More information
-  can be found in the [LTS README](https://github.com/nodejs/LTS/).
+  feature additions, except in some special circumstances.
 * **Nightly**: Versions of code in this repository on the current Current
   branch, automatically built every 24-hours where changes exist. Use with
   caution.
 
+More information can be found in the [LTS README](https://github.com/nodejs/LTS/).
+
 ## Download
 
 Binaries, installers, and source tarballs are available at
@@ -240,6 +241,8 @@ more information about the governance of the Node.js project, see
 
 * [abouthiroppy](https://github.com/abouthiroppy) -
 **Yuta Hiroto** &lt;[email protected]&gt; (he/him)
+* [addaleax](https://github.com/addaleax) -
+**Anna Henningsen** &lt;[email protected]&gt; (she/her)
 * [ak239](https://github.com/ak239) -
 **Aleksei Koziatinskii** &lt;[email protected]&gt;
 * [andrasq](https://github.com/andrasq) -
@@ -256,12 +259,20 @@ more information about the governance of the Node.js project, see
 **Benjamin Gruenbaum** &lt;[email protected]&gt;
 * [bmeck](https://github.com/bmeck) -
 **Bradley Farias** &lt;[email protected]&gt;
+* [bnoordhuis](https://github.com/bnoordhuis) -
+**Ben Noordhuis** &lt;[email protected]&gt;
 * [brendanashworth](https://github.com/brendanashworth) -
 **Brendan Ashworth** &lt;[email protected]&gt;
 * [bzoz](https://github.com/bzoz) -
 **Bartosz Sosnowski** &lt;[email protected]&gt;
 * [calvinmetcalf](https://github.com/calvinmetcalf) -
 **Calvin Metcalf** &lt;[email protected]&gt;
+* [ChALkeR](https://github.com/ChALkeR) -
+**Сковорода Никита Андреевич** &lt;[email protected]&gt; (he/him)
+* [chrisdickinson](https://github.com/chrisdickinson) -
+**Chris Dickinson** &lt;[email protected]&gt;
+* [cjihrig](https://github.com/cjihrig) -
+**Colin Ihrig** &lt;[email protected]&gt;
 * [claudiorodriguez](https://github.com/claudiorodriguez) -
 **Claudio Rodriguez** &lt;[email protected]&gt;
 * [danbev](https://github.com/danbev) -
@@ -276,22 +287,38 @@ more information about the governance of the Node.js project, see
 **Alexander Makarenko** &lt;[email protected]&gt;
 * [eugeneo](https://github.com/eugeneo) -
 **Eugene Ostroukhov** &lt;[email protected]&gt;
+* [evanlucas](https://github.com/evanlucas) -
+**Evan Lucas** &lt;[email protected]&gt; (he/him)
+* [fhinkel](https://github.com/fhinkel) -
+**Franziska Hinkelmann** &lt;[email protected]&gt;
 * [firedfox](https://github.com/firedfox) -
 **Daniel Wang** &lt;[email protected]&gt;
+* [Fishrock123](https://github.com/Fishrock123) -
+**Jeremiah Senkpiel** &lt;[email protected]&gt;
+* [gabrielschulhof](https://github.com/gabrielschulhof) -
+**Gabriel Schulhof** &lt;[email protected]&gt;
 * [geek](https://github.com/geek) -
 **Wyatt Preul** &lt;[email protected]&gt;
 * [gibfahn](https://github.com/gibfahn) -
 **Gibson Fahnestock** &lt;[email protected]&gt; (he/him)
+* [gireeshpunathil](https://github.com/gireeshpunathil) -
+**Gireesh Punathil** &lt;[email protected]&gt; (he/him)
 * [iarna](https://github.com/iarna) -
 **Rebecca Turner** &lt;[email protected]&gt;
 * [imran-iq](https://github.com/imran-iq) -
 **Imran Iqbal** &lt;[email protected]&gt;
 * [imyller](https://github.com/imyller) -
 **Ilkka Myller** &lt;[email protected]&gt;
+* [indutny](https://github.com/indutny) -
+**Fedor Indutny** &lt;[email protected]&gt;
+* [isaacs](https://github.com/isaacs) -
+**Isaac Z. Schlueter** &lt;[email protected]&gt;
 * [italoacasas](https://github.com/italoacasas) -
 **Italo A. Casas** &lt;[email protected]&gt; (he/him)
 * [JacksonTian](https://github.com/JacksonTian) -
 **Jackson Tian** &lt;[email protected]&gt;
+* [jasnell](https://github.com/jasnell) -
+**James M Snell** &lt;[email protected]&gt; (he/him)
 * [jasongin](https://github.com/jasongin) -
 **Jason Ginchereau** &lt;[email protected]&gt;
 * [jbergstroem](https://github.com/jbergstroem) -
@@ -304,6 +331,8 @@ more information about the governance of the Node.js project, see
 **João Reis** &lt;[email protected]&gt;
 * [joshgav](https://github.com/joshgav) -
 **Josh Gavant** &lt;[email protected]&gt;
+* [joyeecheung](https://github.com/joyeecheung) -
+**Joyee Cheung** &lt;[email protected]&gt; (she/her)
 * [julianduque](https://github.com/julianduque) -
 **Julian Duque** &lt;[email protected]&gt; (he/him)
 * [JungMinu](https://github.com/JungMinu) -
@@ -322,22 +351,38 @@ more information about the governance of the Node.js project, see
 **Aleksey Smolenchuk** &lt;[email protected]&gt;
 * [matthewloring](https://github.com/matthewloring) -
 **Matthew Loring** &lt;[email protected]&gt;
+* [mcollina](https://github.com/mcollina) -
+**Matteo Collina** &lt;[email protected]&gt; (he/him)
+* [mhdawson](https://github.com/mhdawson) -
+**Michael Dawson** &lt;[email protected]&gt; (he/him)
 * [micnic](https://github.com/micnic) -
 **Nicu Micleușanu** &lt;[email protected]&gt; (he/him)
 * [mikeal](https://github.com/mikeal) -
 **Mikeal Rogers** &lt;[email protected]&gt;
+* [misterdjules](https://github.com/misterdjules) -
+**Julien Gilli** &lt;[email protected]&gt;
 * [monsanto](https://github.com/monsanto) -
 **Christopher Monsanto** &lt;[email protected]&gt;
+* [mscdex](https://github.com/mscdex) -
+**Brian White** &lt;[email protected]&gt;
+* [MylesBorins](https://github.com/MylesBorins) -
+**Myles Borins** &lt;[email protected]&gt; (he/him)
 * [not-an-aardvark](https://github.com/not-an-aardvark) -
 **Teddy Katz** &lt;[email protected]&gt;
+* [ofrobots](https://github.com/ofrobots) -
+**Ali Ijaz Sheikh** &lt;[email protected]&gt;
 * [Olegas](https://github.com/Olegas) -
 **Oleg Elifantiev** &lt;[email protected]&gt;
+* [orangemocha](https://github.com/orangemocha) -
+**Alexis Campailla** &lt;[email protected]&gt;
 * [othiym23](https://github.com/othiym23) -
 **Forrest L Norvell** &lt;[email protected]&gt; (he/him)
 * [petkaantonov](https://github.com/petkaantonov) -
 **Petka Antonov** &lt;[email protected]&gt;
 * [phillipj](https://github.com/phillipj) -
 **Phillip Johnsen** &lt;[email protected]&gt;
+* [piscisaureus](https://github.com/piscisaureus) -
+**Bert Belder** &lt;[email protected]&gt;
 * [pmq20](https://github.com/pmq20) -
 **Minqi Pan** &lt;[email protected]&gt;
 * [princejwesley](https://github.com/princejwesley) -
@@ -360,6 +405,8 @@ more information about the governance of the Node.js project, see
 **Ron Korving** &lt;[email protected]&gt;
 * [RReverser](https://github.com/RReverser) -
 **Ingvar Stepanyan** &lt;[email protected]&gt;
+* [rvagg](https://github.com/rvagg) -
+**Rod Vagg** &lt;[email protected]&gt;
 * [saghul](https://github.com/saghul) -
 **Saúl Ibarra Corretgé** &lt;[email protected]&gt;
 * [sam-github](https://github.com/sam-github) -
@@ -368,14 +415,20 @@ more information about the governance of the Node.js project, see
 **Santiago Gimeno** &lt;[email protected]&gt;
 * [seishun](https://github.com/seishun) -
 **Nikolai Vavilov** &lt;[email protected]&gt;
+* [shigeki](https://github.com/shigeki) -
+**Shigeki Ohtsu** &lt;[email protected]&gt; (he/him)
 * [silverwind](https://github.com/silverwind) -
 **Roman Reiss** &lt;[email protected]&gt;
 * [srl295](https://github.com/srl295) -
 **Steven R Loomis** &lt;[email protected]&gt;
 * [stefanmb](https://github.com/stefanmb) -
 **Stefan Budeanu** &lt;[email protected]&gt;
+* [targos](https://github.com/targos) -
+**Michaël Zasso** &lt;[email protected]&gt; (he/him)
 * [tellnes](https://github.com/tellnes) -
 **Christian Tellnes** &lt;[email protected]&gt;
+* [thefourtheye](https://github.com/thefourtheye) -
+**Sakthipriyan Vairamani** &lt;[email protected]&gt; (he/him)
 * [thekemkid](https://github.com/thekemkid) -
 **Glen Keane** &lt;[email protected]&gt; (he/him)
 * [thlorenz](https://github.com/thlorenz) -
@@ -384,6 +437,10 @@ more information about the governance of the Node.js project, see
 **Timothy Gu** &lt;[email protected]&gt; (he/him)
 * [tniessen](https://github.com/tniessen) -
 **Tobias Nießen** &lt;[email protected]&gt;
+* [trevnorris](https://github.com/trevnorris) -
+**Trevor Norris** &lt;[email protected]&gt;
+* [Trott](https://github.com/Trott) -
+**Rich Trott** &lt;[email protected]&gt; (he/him)
 * [tunniclm](https://github.com/tunniclm) -
 **Mike Tunnicliffe** &lt;[email protected]&gt;
 * [vkurchatkin](https://github.com/vkurchatkin) -
@@ -394,14 +451,15 @@ more information about the governance of the Node.js project, see
 **Daijiro Wachi** &lt;[email protected]&gt; (he/him)
 * [whitlockjc](https://github.com/whitlockjc) -
 **Jeremy Whitlock** &lt;[email protected]&gt;
+* [XadillaX](https://github.com/XadillaX) -
+**Khaidi Chu** &lt;[email protected]&gt; (he/him)
 * [yorkie](https://github.com/yorkie) -
 **Yorkie Liu** &lt;[email protected]&gt;
 * [yosuke-furukawa](https://github.com/yosuke-furukawa) -
 **Yosuke Furukawa** &lt;[email protected]&gt;
 
-Collaborators (which includes CTC members) follow the
-[COLLABORATOR_GUIDE.md](./COLLABORATOR_GUIDE.md) in maintaining the Node.js
-project.
+Collaborators follow the [COLLABORATOR_GUIDE.md](./COLLABORATOR_GUIDE.md) in
+maintaining the Node.js project.
 
 ### Release Team
 

diff --git a/benchmark/README.md b/benchmark/README.md
@@ -37,15 +37,15 @@ example, buffers/buffer-read.js has the following configuration:
 <!-- eslint-disable strict, no-undef, no-unused-vars -->
 ```js
 var bench = common.createBenchmark(main, {
-    noAssert: [false, true],
-    buffer: ['fast', 'slow'],
-    type: ['UInt8', 'UInt16LE', 'UInt16BE',
-           'UInt32LE', 'UInt32BE',
-           'Int8', 'Int16LE', 'Int16BE',
-           'Int32LE', 'Int32BE',
-           'FloatLE', 'FloatBE',
-           'DoubleLE', 'DoubleBE'],
-    millions: [1]
+  noAssert: [false, true],
+  buffer: ['fast', 'slow'],
+  type: ['UInt8', 'UInt16LE', 'UInt16BE',
+         'UInt32LE', 'UInt32BE',
+         'Int8', 'Int16LE', 'Int16BE',
+         'Int32LE', 'Int32BE',
+         'FloatLE', 'FloatBE',
+         'DoubleLE', 'DoubleBE'],
+  millions: [1]
 });
 ```
 The runner takes one item from each of the property array value to build a list

diff --git a/benchmark/buffers/buffer-compare-offset.js b/benchmark/buffers/buffer-compare-offset.js
@@ -50,7 +50,7 @@ function main(conf) {
   const iter = (conf.millions >>> 0) * 1e6;
   const size = (conf.size >>> 0);
   const method = conf.method === 'slice' ?
-      compareUsingSlice : compareUsingOffset;
+    compareUsingSlice : compareUsingOffset;
   method(Buffer.alloc(size, 'a'),
          Buffer.alloc(size, 'b'),
          size >> 1,

diff --git a/benchmark/child_process/child-process-read-ipc.js b/benchmark/child_process/child-process-read-ipc.js
@@ -26,7 +26,7 @@ if (process.argv[2] === 'child') {
 
     const options = { 'stdio': ['ignore', 1, 2, 'ipc'] };
     const child = spawn(process.argv[0],
-      [process.argv[1], 'child', len], options);
+                        [process.argv[1], 'child', len], options);
 
     var bytes = 0;
     child.on('message', function(msg) {

diff --git a/benchmark/util/inspect-proxy.js b/benchmark/util/inspect-proxy.js
@@ -9,7 +9,7 @@ const bench = common.createBenchmark(main, {
 });
 
 function twoDifferentProxies(n) {
-  // This one should be slower between we're looking up multiple proxies.
+  // This one should be slower because we're looking up multiple proxies.
   const proxyA = new Proxy({}, {get: () => {}});
   const proxyB = new Proxy({}, {get: () => {}});
   bench.start();

diff --git a/configure b/configure
@@ -40,6 +40,7 @@ import nodedownload
 # imports in tools/
 sys.path.insert(0, os.path.join(root_dir, 'tools'))
 import getmoduleversion
+from gyp_node import run_gyp
 
 # parse our options
 parser = optparse.OptionParser()
@@ -419,12 +420,12 @@ parser.add_option('--without-perfctr',
 # Dummy option for backwards compatibility
 parser.add_option('--with-snapshot',
     action='store_true',
-    dest='with_snapshot',
+    dest='unused_with_snapshot',
     help=optparse.SUPPRESS_HELP)
 
 parser.add_option('--without-snapshot',
     action='store_true',
-    dest='unused_without_snapshot',
+    dest='without_snapshot',
     help=optparse.SUPPRESS_HELP)
 
 parser.add_option('--without-ssl',
@@ -802,7 +803,7 @@ def configure_node(o):
   cross_compiling = (options.cross_compiling
                      if options.cross_compiling is not None
                      else target_arch != host_arch)
-  want_snapshots = 1 if options.with_snapshot else 0
+  want_snapshots = not options.without_snapshot
   o['variables']['want_separate_host_toolset'] = int(
       cross_compiling and want_snapshots)
 
@@ -946,7 +947,7 @@ def configure_v8(o):
   o['variables']['v8_no_strict_aliasing'] = 1  # Work around compiler bugs.
   o['variables']['v8_optimized_debug'] = 0  # Compile with -O0 in debug builds.
   o['variables']['v8_random_seed'] = 0  # Use a random seed for hash tables.
-  o['variables']['v8_use_snapshot'] = b(options.with_snapshot)
+  o['variables']['v8_use_snapshot'] = 'false' if options.without_snapshot else 'true'
   o['variables']['node_use_v8_platform'] = b(not options.without_v8_platform)
   o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8)
   o['variables']['force_dynamic_crt'] = 1 if options.shared else 0
@@ -967,12 +968,18 @@ def configure_openssl(o):
     o['variables']['openssl_fips'] = options.openssl_fips
     fips_dir = os.path.join(root_dir, 'deps', 'openssl', 'fips')
     fips_ld = os.path.abspath(os.path.join(fips_dir, 'fipsld'))
+    # LINK is for Makefiles, LD/LDXX is for ninja
     o['make_fips_settings'] = [
       ['LINK', fips_ld + ' <(openssl_fips)/bin/fipsld'],
+      ['LD', fips_ld + ' <(openssl_fips)/bin/fipsld'],
+      ['LDXX', fips_ld + ' <(openssl_fips)/bin/fipsld'],
     ]
   else:
     o['variables']['openssl_fips'] = ''
-
+    try:
+      os.remove('config_fips.gypi')
+    except OSError:
+      pass
 
   if options.without_ssl:
     def without_ssl_error(option):
@@ -1370,7 +1377,7 @@ config = '\n'.join(map('='.join, config.iteritems())) + '\n'
 
 write('config.mk', do_not_edit + config)
 
-gyp_args = [sys.executable, 'tools/gyp_node.py', '--no-parallel']
+gyp_args = ['--no-parallel']
 
 if options.use_xcode:
   gyp_args += ['-f', 'xcode']
@@ -1389,4 +1396,4 @@ gyp_args += args
 if warn.warned:
   warn('warnings were emitted in the configure phase')
 
-sys.exit(subprocess.call(gyp_args))
+run_gyp(gyp_args)