v6.11.3-proposal

.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

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/>

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

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** <hello@about-hiroppy.com> (he/him)
+* [addaleax](https://github.com/addaleax) -
+**Anna Henningsen** <anna@addaleax.net> (she/her)
 * [ak239](https://github.com/ak239) -
 **Aleksei Koziatinskii** <ak239spb@gmail.com>
 * [andrasq](https://github.com/andrasq) -
@@ -256,12 +259,20 @@ more information about the governance of the Node.js project, see
 **Benjamin Gruenbaum** <benjamingr@gmail.com>
 * [bmeck](https://github.com/bmeck) -
 **Bradley Farias** <bradley.meck@gmail.com>
+* [bnoordhuis](https://github.com/bnoordhuis) -
+**Ben Noordhuis** <info@bnoordhuis.nl>
 * [brendanashworth](https://github.com/brendanashworth) -
 **Brendan Ashworth** <brendan.ashworth@me.com>
 * [bzoz](https://github.com/bzoz) -
 **Bartosz Sosnowski** <bartosz@janeasystems.com>
 * [calvinmetcalf](https://github.com/calvinmetcalf) -
 **Calvin Metcalf** <calvin.metcalf@gmail.com>
+* [ChALkeR](https://github.com/ChALkeR) -
+**Сковорода Никита Андреевич** <chalkerx@gmail.com> (he/him)
+* [chrisdickinson](https://github.com/chrisdickinson) -
+**Chris Dickinson** <christopher.s.dickinson@gmail.com>
+* [cjihrig](https://github.com/cjihrig) -
+**Colin Ihrig** <cjihrig@gmail.com>
 * [claudiorodriguez](https://github.com/claudiorodriguez) -
 **Claudio Rodriguez** <cjrodr@yahoo.com>
 * [danbev](https://github.com/danbev) -
@@ -276,22 +287,38 @@ more information about the governance of the Node.js project, see
 **Alexander Makarenko** <estliberitas@gmail.com>
 * [eugeneo](https://github.com/eugeneo) -
 **Eugene Ostroukhov** <eostroukhov@google.com>
+* [evanlucas](https://github.com/evanlucas) -
+**Evan Lucas** <evanlucas@me.com> (he/him)
+* [fhinkel](https://github.com/fhinkel) -
+**Franziska Hinkelmann** <franziska.hinkelmann@gmail.com>
 * [firedfox](https://github.com/firedfox) -
 **Daniel Wang** <wangyang0123@gmail.com>
+* [Fishrock123](https://github.com/Fishrock123) -
+**Jeremiah Senkpiel** <fishrock123@rocketmail.com>
+* [gabrielschulhof](https://github.com/gabrielschulhof) -
+**Gabriel Schulhof** <gabriel.schulhof@intel.com>
 * [geek](https://github.com/geek) -
 **Wyatt Preul** <wpreul@gmail.com>
 * [gibfahn](https://github.com/gibfahn) -
 **Gibson Fahnestock** <gibfahn@gmail.com> (he/him)
+* [gireeshpunathil](https://github.com/gireeshpunathil) -
+**Gireesh Punathil** <gpunathi@in.ibm.com> (he/him)
 * [iarna](https://github.com/iarna) -
 **Rebecca Turner** <me@re-becca.org>
 * [imran-iq](https://github.com/imran-iq) -
 **Imran Iqbal** <imran@imraniqbal.org>
 * [imyller](https://github.com/imyller) -
 **Ilkka Myller** <ilkka.myller@nodefield.com>
+* [indutny](https://github.com/indutny) -
+**Fedor Indutny** <fedor.indutny@gmail.com>
+* [isaacs](https://github.com/isaacs) -
+**Isaac Z. Schlueter** <i@izs.me>
 * [italoacasas](https://github.com/italoacasas) -
 **Italo A. Casas** <me@italoacasas.com> (he/him)
 * [JacksonTian](https://github.com/JacksonTian) -
 **Jackson Tian** <shyvo1987@gmail.com>
+* [jasnell](https://github.com/jasnell) -
+**James M Snell** <jasnell@gmail.com> (he/him)
 * [jasongin](https://github.com/jasongin) -
 **Jason Ginchereau** <jasongin@microsoft.com>
 * [jbergstroem](https://github.com/jbergstroem) -
@@ -304,6 +331,8 @@ more information about the governance of the Node.js project, see
 **João Reis** <reis@janeasystems.com>
 * [joshgav](https://github.com/joshgav) -
 **Josh Gavant** <josh.gavant@outlook.com>
+* [joyeecheung](https://github.com/joyeecheung) -
+**Joyee Cheung** <joyeec9h3@gmail.com> (she/her)
 * [julianduque](https://github.com/julianduque) -
 **Julian Duque** <julianduquej@gmail.com> (he/him)
 * [JungMinu](https://github.com/JungMinu) -
@@ -322,22 +351,38 @@ more information about the governance of the Node.js project, see
 **Aleksey Smolenchuk** <lxe@lxe.co>
 * [matthewloring](https://github.com/matthewloring) -
 **Matthew Loring** <mattloring@google.com>
+* [mcollina](https://github.com/mcollina) -
+**Matteo Collina** <matteo.collina@gmail.com> (he/him)
+* [mhdawson](https://github.com/mhdawson) -
+**Michael Dawson** <michael_dawson@ca.ibm.com> (he/him)
 * [micnic](https://github.com/micnic) -
 **Nicu Micleușanu** <micnic90@gmail.com> (he/him)
 * [mikeal](https://github.com/mikeal) -
 **Mikeal Rogers** <mikeal.rogers@gmail.com>
+* [misterdjules](https://github.com/misterdjules) -
+**Julien Gilli** <jgilli@nodejs.org>
 * [monsanto](https://github.com/monsanto) -
 **Christopher Monsanto** <chris@monsan.to>
+* [mscdex](https://github.com/mscdex) -
+**Brian White** <mscdex@mscdex.net>
+* [MylesBorins](https://github.com/MylesBorins) -
+**Myles Borins** <myles.borins@gmail.com> (he/him)
 * [not-an-aardvark](https://github.com/not-an-aardvark) -
 **Teddy Katz** <teddy.katz@gmail.com>
+* [ofrobots](https://github.com/ofrobots) -
+**Ali Ijaz Sheikh** <ofrobots@google.com>
 * [Olegas](https://github.com/Olegas) -
 **Oleg Elifantiev** <oleg@elifantiev.ru>
+* [orangemocha](https://github.com/orangemocha) -
+**Alexis Campailla** <orangemocha@nodejs.org>
 * [othiym23](https://github.com/othiym23) -
 **Forrest L Norvell** <ogd@aoaioxxysz.net> (he/him)
 * [petkaantonov](https://github.com/petkaantonov) -
 **Petka Antonov** <petka_antonov@hotmail.com>
 * [phillipj](https://github.com/phillipj) -
 **Phillip Johnsen** <johphi@gmail.com>
+* [piscisaureus](https://github.com/piscisaureus) -
+**Bert Belder** <bertbelder@gmail.com>
 * [pmq20](https://github.com/pmq20) -
 **Minqi Pan** <pmq2001@gmail.com>
 * [princejwesley](https://github.com/princejwesley) -
@@ -360,6 +405,8 @@ more information about the governance of the Node.js project, see
 **Ron Korving** <ron@ronkorving.nl>
 * [RReverser](https://github.com/RReverser) -
 **Ingvar Stepanyan** <me@rreverser.com>
+* [rvagg](https://github.com/rvagg) -
+**Rod Vagg** <rod@vagg.org>
 * [saghul](https://github.com/saghul) -
 **Saúl Ibarra Corretgé** <saghul@gmail.com>
 * [sam-github](https://github.com/sam-github) -
@@ -368,14 +415,20 @@ more information about the governance of the Node.js project, see
 **Santiago Gimeno** <santiago.gimeno@gmail.com>
 * [seishun](https://github.com/seishun) -
 **Nikolai Vavilov** <vvnicholas@gmail.com>
+* [shigeki](https://github.com/shigeki) -
+**Shigeki Ohtsu** <ohtsu@ohtsu.org> (he/him)
 * [silverwind](https://github.com/silverwind) -
 **Roman Reiss** <me@silverwind.io>
 * [srl295](https://github.com/srl295) -
 **Steven R Loomis** <srloomis@us.ibm.com>
 * [stefanmb](https://github.com/stefanmb) -
 **Stefan Budeanu** <stefan@budeanu.com>
+* [targos](https://github.com/targos) -
+**Michaël Zasso** <targos@protonmail.com> (he/him)
 * [tellnes](https://github.com/tellnes) -
 **Christian Tellnes** <christian@tellnes.no>
+* [thefourtheye](https://github.com/thefourtheye) -
+**Sakthipriyan Vairamani** <thechargingvolcano@gmail.com> (he/him)
 * [thekemkid](https://github.com/thekemkid) -
 **Glen Keane** <glenkeane.94@gmail.com> (he/him)
 * [thlorenz](https://github.com/thlorenz) -
@@ -384,6 +437,10 @@ more information about the governance of the Node.js project, see
 **Timothy Gu** <timothygu99@gmail.com> (he/him)
 * [tniessen](https://github.com/tniessen) -
 **Tobias Nießen** <tniessen@tnie.de>
+* [trevnorris](https://github.com/trevnorris) -
+**Trevor Norris** <trev.norris@gmail.com>
+* [Trott](https://github.com/Trott) -
+**Rich Trott** <rtrott@gmail.com> (he/him)
 * [tunniclm](https://github.com/tunniclm) -
 **Mike Tunnicliffe** <m.j.tunnicliffe@gmail.com>
 * [vkurchatkin](https://github.com/vkurchatkin) -
@@ -394,14 +451,15 @@ more information about the governance of the Node.js project, see
 **Daijiro Wachi** <daijiro.wachi@gmail.com> (he/him)
 * [whitlockjc](https://github.com/whitlockjc) -
 **Jeremy Whitlock** <jwhitlock@apache.org>
+* [XadillaX](https://github.com/XadillaX) -
+**Khaidi Chu** <i@2333.moe> (he/him)
 * [yorkie](https://github.com/yorkie) -
 **Yorkie Liu** <yorkiefixer@gmail.com>
 * [yosuke-furukawa](https://github.com/yosuke-furukawa) -
 **Yosuke Furukawa** <yosuke.furukawa@gmail.com>
 
-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
 

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

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,

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) {

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();

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)