[v6.x backport] build: enable cpplint on windows

.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

CONTRIBUTING.md

@@ -176,7 +176,8 @@ Running `make test`/`vcbuild test` will run the linter as well unless one or
 more tests fail.
 
 If you want to run the linter without running tests, use
-`make lint`/`vcbuild lint`.
+`make lint`/`vcbuild lint`. It will run both JavaScript linting and
+C++ linting.
 
 If you are updating tests and just want to run a single test to check it, you
 can use this syntax to run it exactly as the test harness would:

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
@@ -294,6 +295,8 @@ more information about the governance of the Node.js project, see
 **Daniel Wang** <[email protected]>
 * [Fishrock123](https://github.com/Fishrock123) -
 **Jeremiah Senkpiel** <[email protected]>
+* [gabrielschulhof](https://github.com/gabrielschulhof) -
+**Gabriel Schulhof** <[email protected]>
 * [geek](https://github.com/geek) -
 **Wyatt Preul** <[email protected]>
 * [gibfahn](https://github.com/gibfahn) -
@@ -448,6 +451,8 @@ more information about the governance of the Node.js project, see
 **Daijiro Wachi** <[email protected]> (he/him)
 * [whitlockjc](https://github.com/whitlockjc) -
 **Jeremy Whitlock** <[email protected]>
+* [XadillaX](https://github.com/XadillaX) -
+**Khaidi Chu** <[email protected]> (he/him)
 * [yorkie](https://github.com/yorkie) -
 **Yorkie Liu** <[email protected]>
 * [yosuke-furukawa](https://github.com/yosuke-furukawa) -

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

@@ -968,8 +968,11 @@ 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'] = ''

deps/cares/src/ares_parse_naptr_reply.c

@@ -110,18 +110,19 @@ ares_parse_naptr_reply (const unsigned char *abuf, int alen,
           status = ARES_EBADRESP;
           break;
         }
-      /* RR must contain at least 7 bytes = 2 x int16 + 3 x name */
-      if (rr_len < 7)
-        {
-          status = ARES_EBADRESP;
-          break;
-        }
 
       /* Check if we are really looking at a NAPTR record */
       if (rr_class == C_IN && rr_type == T_NAPTR)
         {
           /* parse the NAPTR record itself */
 
+          /* RR must contain at least 7 bytes = 2 x int16 + 3 x name */
+          if (rr_len < 7)
+            {
+              status = ARES_EBADRESP;
+              break;
+            }
+
           /* Allocate storage for this NAPTR answer appending it to the list */
           naptr_curr = ares_malloc_data(ARES_DATATYPE_NAPTR_REPLY);
           if (!naptr_curr)

deps/v8/include/v8-version.h

@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 5
 #define V8_MINOR_VERSION 1
 #define V8_BUILD_NUMBER 281
-#define V8_PATCH_LEVEL 105
+#define V8_PATCH_LEVEL 107
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)

deps/v8/src/debug/debug.js

@@ -864,6 +864,7 @@ Debug.debuggerFlags = function() {
 };
 
 Debug.MakeMirror = MakeMirror;
+Debug.MakeMirrorSerializer = MakeMirrorSerializer;
 
 function MakeExecutionState(break_id) {
   return new ExecutionState(break_id);

deps/v8/src/debug/mirrors.js

@@ -60,6 +60,7 @@ utils.Import(function(from) {
 //   - FrameMirror
 //   - ScriptMirror
 //   - ScopeMirror
+//   - ProxyMirror
 
 // Type names of the different mirrors.
 var MirrorType = {
@@ -84,6 +85,7 @@ var MirrorType = {
   SET_TYPE : 'set',
   ITERATOR_TYPE : 'iterator',
   GENERATOR_TYPE : 'generator',
+  PROXY_TYPE : 'proxy',
 }
 
 
@@ -157,6 +159,8 @@ function MakeMirror(value, opt_transient) {
     mirror = new StringMirror(value);
   } else if (IS_SYMBOL(value)) {
     mirror = new SymbolMirror(value);
+  } else if (IS_PROXY(value)) {
+    mirror = new ProxyMirror(value);
   } else if (IS_ARRAY(value)) {
     mirror = new ArrayMirror(value);
   } else if (IS_DATE(value)) {
@@ -342,6 +346,15 @@ Mirror.prototype.isSymbol = function() {
 };
 
 
+/**
+ * Check whether the mirror reflects a proxy object.
+ * @returns {boolean} True if the mirror reflects a proxy object.
+ */
+Mirror.prototype.isProxy = function() {
+  return this instanceof ProxyMirror;
+};
+
+
 /**
  * Check whether the mirror reflects an object.
  * @returns {boolean} True if the mirror reflects an object
@@ -2439,6 +2452,29 @@ ContextMirror.prototype.data = function() {
 };
 
 
+/**
+ * Mirror object for proxies.
+ * @param {value} value The value reflected by this mirror.
+ * @constructor
+ * @extends Mirror
+ */
+function ProxyMirror(value) {
+  %_Call(Mirror, this, MirrorType.PROXY_TYPE);
+  this.value_ = value;
+}
+inherits(ProxyMirror, Mirror);
+
+
+ProxyMirror.prototype.value = function() {
+  return this.value_;
+};
+
+
+ProxyMirror.prototype.toText = function() {
+  return '#<Proxy>';
+};
+
+
 /**
  * Returns a mirror serializer
  *

doc/api/crypto.md

@@ -544,7 +544,7 @@ const aliceSecret = alice.computeSecret(bobKey);
 const bobSecret = bob.computeSecret(aliceKey);
 
 assert.strictEqual(aliceSecret.toString('hex'), bobSecret.toString('hex'));
-  // OK
+// OK
 ```
 
 ### ecdh.computeSecret(other_public_key[, input_encoding][, output_encoding])
@@ -684,10 +684,11 @@ const hash = crypto.createHash('sha256');
 
 hash.on('readable', () => {
   const data = hash.read();
-  if (data)
+  if (data) {
     console.log(data.toString('hex'));
     // Prints:
     //   6a2da20943931e9834fc12cfe5bb47bbd9ae43489a30726962b576f4e3993e50
+  }
 });
 
 hash.write('some data to hash');
@@ -767,10 +768,11 @@ const hmac = crypto.createHmac('sha256', 'a secret');
 
 hmac.on('readable', () => {
   const data = hmac.read();
-  if (data)
+  if (data) {
     console.log(data.toString('hex'));
     // Prints:
     //   7fd04df92f636fd450bc841c9418e5825c17f33ad9c87c518115a45971f7f77e
+  }
 });
 
 hmac.write('some data to hash');

doc/api/documentation.md

@@ -3,20 +3,20 @@
 <!-- type=misc -->
 
 The goal of this documentation is to comprehensively explain the Node.js
-API, both from a reference as well as a conceptual point of view.  Each
+API, both from a reference as well as a conceptual point of view. Each
 section describes a built-in module or high-level concept.
 
 Where appropriate, property types, method arguments, and the arguments
 provided to event handlers are detailed in a list underneath the topic
 heading.
 
 Every `.html` document has a corresponding `.json` document presenting
-the same information in a structured manner.  This feature is
+the same information in a structured manner. This feature is
 experimental, and added for the benefit of IDEs and other utilities that
 wish to do programmatic things with the documentation.
 
 Every `.html` and `.json` file is generated based on the corresponding
-`.md` file in the `doc/api/` folder in Node.js's source tree.  The
+`.md` file in the `doc/api/` folder in Node.js's source tree. The
 documentation is generated using the `tools/doc/generate.js` program.
 The HTML template is located at `doc/template.html`.
 
@@ -39,17 +39,29 @@ The stability indices are as follows:
 
 ```txt
 Stability: 0 - Deprecated
-This feature is known to be problematic, and changes are
-planned.  Do not rely on it.  Use of the feature may cause warnings.  Backwards
-compatibility should not be expected.
+This feature is known to be problematic, and changes may be planned. Do
+not rely on it. Use of the feature may cause warnings to be emitted.
+Backwards compatibility across major versions should not be expected.
 ```
 
 ```txt
 Stability: 1 - Experimental
-This feature is subject to change, and is gated by a command line flag.
-It may change or be removed in future versions.
+This feature is still under active development and subject to non-backwards
+compatible changes, or even removal, in any future version. Use of the feature
+is not recommended in production environments. Experimental features are not
+subject to the Node.js Semantic Versioning model.
 ```
 
+*Note*: Caution must be used when making use of `Experimental` features,
+particularly within modules that may be used as dependencies (or dependencies
+of dependencies) within a Node.js application. End users may not be aware that
+experimental features are being used, and therefore may experience unexpected
+failures or behavioral changes when changes occur. To help avoid such surprises,
+`Experimental` features may require a command-line flag to explicitly enable
+them, or may cause a process warning to be emitted. By default, such warnings
+are printed to `stderr` and may be handled by attaching a listener to the
+`process.on('warning')` event.
+
 ```txt
 Stability: 2 - Stable
 The API has proven satisfactory. Compatibility with the npm ecosystem
@@ -63,7 +75,7 @@ is a high priority, and will not be broken unless absolutely necessary.
 Every HTML file in the markdown has a corresponding JSON file with the
 same data.
 
-This feature was added in Node.js v0.6.12.  It is experimental.
+This feature was added in Node.js v0.6.12. It is experimental.
 
 ## Syscalls and man pages
 
@@ -72,7 +84,7 @@ and the underlying operating system. Node functions which simply wrap a syscall,
 like `fs.open()`, will document that. The docs link to the corresponding man
 pages (short for manual pages) which describe how the syscalls work.
 
-**Caveat:** some syscalls, like lchown(2), are BSD-specific. That means, for
+**Note:** some syscalls, like lchown(2), are BSD-specific. That means, for
 example, that `fs.lchown()` only works on macOS and other BSD-derived systems,
 and is not available on Linux.