meta: merge node/master into node-chakracore/master

Merge 04ae486 as of 2017-12-13 This commit was automatically generated. For any problems, please contact jackhorton Reviewed-By: Taylor Woll <tawoll@ntdev.microsoft.com>
nodejs · Jan 18, 2018 · 78e8680 · 78e8680
2 parents 7714b4d + 04ae486
commit 78e8680
Show file tree

Hide file tree

Showing 54 changed files with 1,029 additions and 291 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,7 +29,8 @@ release.
 </tr>
 <tr>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V9.md#9.2.1">9.2.1</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V9.md#9.3.0">9.3.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V9.md#9.2.1">9.2.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V9.md#9.2.0">9.2.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V9.md#9.1.0">9.1.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V9.md#9.0.0">9.0.0</a><br/>

diff --git a/doc/api/console.md b/doc/api/console.md
@@ -241,7 +241,7 @@ undefined
 <!-- YAML
 added: v8.0.0
 changes:
-  - version: REPLACEME
+  - version: 9.3.0
     pr-url: https://github.com/nodejs/node/pull/17033
     description: "`console.debug` is now an alias for `console.log`."
 -->
@@ -280,7 +280,7 @@ Defaults to `false`. Colors are customizable; see
 <!-- YAML
 added: v8.0.0
 changes:
-  - version: REPLACEME
+  - version: 9.3.0
     pr-url: https://github.com/nodejs/node/pull/17152
     description: "`console.dirxml` now calls `console.log` for its arguments."
 -->

diff --git a/doc/api/crypto.md b/doc/api/crypto.md
@@ -1622,7 +1622,7 @@ higher the number of iterations, the more secure the derived key will be,
 but will take a longer amount of time to complete.
 
 The `salt` should also be as unique as possible. It is recommended that the
-salts are random and their lengths are greater than 16 bytes. See
+salts are random and their lengths are at least 16 bytes. See
 [NIST SP 800-132][] for details.
 
 Example:
@@ -1686,7 +1686,7 @@ higher the number of iterations, the more secure the derived key will be,
 but will take a longer amount of time to complete.
 
 The `salt` should also be as unique as possible. It is recommended that the
-salts are random and their lengths are greater than 16 bytes. See
+salts are random and their lengths are at least 16 bytes. See
 [NIST SP 800-132][] for details.
 
 Example:
@@ -1792,6 +1792,11 @@ be passed instead of a public key.
 ### crypto.randomBytes(size[, callback])
 <!-- YAML
 added: v0.5.8
+changes:
+  - version: v9.0.0
+    pr-url: https://github.com/nodejs/node/pull/16454
+    description: Passing `null` as the `callback` argument now throws
+                 `ERR_INVALID_CALLBACK`.
 -->
 - `size` {number}
 - `callback` {Function}
@@ -1847,10 +1852,10 @@ added: v7.10.0
 changes:
   - version: v9.0.0
     pr-url: https://github.com/nodejs/node/pull/15231
-    description: The `buffer` argument may be any ArrayBufferView
+    description: The `buffer` argument may be any `TypedArray` or `DataView`.
 -->
 
-* `buffer` {Buffer|Uint8Array|ArrayBufferView} Must be supplied.
+* `buffer` {Buffer|TypedArray|DataView} Must be supplied.
 * `offset` {number} Defaults to `0`.
 * `size` {number} Defaults to `buffer.length - offset`.
 
@@ -1889,10 +1894,10 @@ added: v7.10.0
 changes:
   - version: v9.0.0
     pr-url: https://github.com/nodejs/node/pull/15231
-    description: The `buffer` argument may be any ArrayBufferView
+    description: The `buffer` argument may be any `TypedArray` or `DataView`.
 -->
 
-* `buffer` {Buffer|Uint8Array|ArrayBufferView} Must be supplied.
+* `buffer` {Buffer|TypedArray|DataView} Must be supplied.
 * `offset` {number} Defaults to `0`.
 * `size` {number} Defaults to `buffer.length - offset`.
 * `callback` {Function} `function(err, buf) {}`.

diff --git a/doc/api/esm.md b/doc/api/esm.md
@@ -33,15 +33,14 @@ node --experimental-modules my-app.mjs
 ### Supported
 
 Only the CLI argument for the main entry point to the program can be an entry
-point into an ESM graph. In the future `import()` can be used to create entry
-points into ESM graphs at run time.
+point into an ESM graph. Dynamic import can also be used with the flag
+`--harmony-dynamic-import` to create entry points into ESM graphs at run time.
 
 ### Unsupported
 
 | Feature | Reason |
 | --- | --- |
-| `require('./foo.mjs')` | ES Modules have differing resolution and timing, use language standard `import()` |
-| `import()` | pending newer V8 release used in Node.js |
+| `require('./foo.mjs')` | ES Modules have differing resolution and timing, use dynamic import |
 | `import.meta` | pending V8 implementation |
 
 ## Notable differences between `import` and `require`

diff --git a/doc/api/https.md b/doc/api/https.md
@@ -150,8 +150,8 @@ Global instance of [`https.Agent`][] for all HTTPS client requests.
 <!-- YAML
 added: v0.3.6
 changes:
-  - version: REPLACEME
-    pr-url: https://github.com/nodejs/node/pull/6569
+  - version: v9.3.0
+    pr-url: https://github.com/nodejs/node/pull/14903
     description: The `options` parameter can now include `clientCertEngine`.
   - version: v7.5.0
     pr-url: https://github.com/nodejs/node/pull/10638

diff --git a/doc/api/modules.md b/doc/api/modules.md
@@ -833,7 +833,7 @@ via `require('module')`.
 
 ### module.builtinModules
 <!-- YAML
-added: REPLACEME
+added: v9.3.0
 -->
 
 * {string[]}

diff --git a/doc/api/n-api.md b/doc/api/n-api.md
@@ -3695,7 +3695,7 @@ a specific `napi_env`.
 
 ### napi_get_uv_event_loop
 <!-- YAML
-added: REPLACEME
+added: v9.3.0
 -->
 ```C
 NAPI_EXTERN napi_status napi_get_uv_event_loop(napi_env env,

diff --git a/doc/api/process.md b/doc/api/process.md
@@ -1137,7 +1137,7 @@ or Android).
 
 ## process.hasUncaughtExceptionCaptureCallback()
 <!-- YAML
-added: REPLACEME
+added: v9.3.0
 -->
 
 * Returns: {boolean}
@@ -1647,7 +1647,7 @@ or Android).
 
 ## process.setUncaughtExceptionCaptureCallback(fn)
 <!-- YAML
-added: REPLACEME
+added: v9.3.0
 -->
 
 * `fn` {Function|null}

diff --git a/doc/api/stream.md b/doc/api/stream.md
@@ -439,7 +439,7 @@ See also: [`writable.cork()`][].
 
 ##### writable.writableHighWaterMark
 <!-- YAML
-added: REPLACEME
+added: v9.3.0
 -->
 
 Return the value of `highWaterMark` passed when constructing this
@@ -889,7 +889,7 @@ options.
 
 ##### readable.readableHighWaterMark
 <!-- YAML
-added: REPLACEME
+added: v9.3.0
 -->
 
 Return the value of `highWaterMark` passed when constructing this

diff --git a/doc/api/tls.md b/doc/api/tls.md
@@ -961,8 +961,8 @@ port or host argument.
 <!-- YAML
 added: v0.11.13
 changes:
-  - version: REPLACEME
-    pr-url: https://github.com/nodejs/node/pull/6569
+  - version: v9.3.0
+    pr-url: https://github.com/nodejs/node/pull/14903
     description: The `options` parameter can now include `clientCertEngine`.
   - version: v7.3.0
     pr-url: https://github.com/nodejs/node/pull/10294
@@ -1076,8 +1076,8 @@ publicly trusted list of CAs as given in
 <!-- YAML
 added: v0.3.2
 changes:
-  - version: REPLACEME
-    pr-url: https://github.com/nodejs/node/pull/6569
+  - version: v9.3.0
+    pr-url: https://github.com/nodejs/node/pull/14903
     description: The `options` parameter can now include `clientCertEngine`.
   - version: v8.0.0
     pr-url: https://github.com/nodejs/node/pull/11984

diff --git a/doc/api/util.md b/doc/api/util.md
@@ -348,8 +348,9 @@ changes:
     line. Defaults to 60 for legacy compatibility.
 
 The `util.inspect()` method returns a string representation of `object` that is
-primarily useful for debugging. Additional `options` may be passed that alter
-certain aspects of the formatted string.
+intended for debugging. The output of `util.inspect` may change at any time
+and should not be depended upon programmatically. Additional `options` may be
+passed that alter certain aspects of the formatted string.
 `util.inspect()` will use the constructor's name and/or `@@toStringTag` to make an
 identifiable tag for an inspected value.
 
@@ -552,8 +553,10 @@ If there is an `original[util.promisify.custom]` property present, `promisify`
 will return its value, see [Custom promisified functions][].
 
 `promisify()` assumes that `original` is a function taking a callback as its
-final argument in all cases, and the returned function will result in undefined
-behavior if it does not.
+final argument in all cases. If `original` is not a function, `promisify()`
+will throw an error. If `original` is a function but its last argument is not a
+Node.js style callback, it will still be passed a Node.js style callback
+as its last argument.
 
 ### Custom promisified functions
 
@@ -588,6 +591,8 @@ doSomething[util.promisify.custom] = (foo) => {
   });
 };
 ```
+If `promisify.custom` is defined but is not a function, `promisify()` will
+throw an error.
 
 ### util.promisify.custom
 <!-- YAML