diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d7e2c904b2..b895855c9cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,8 @@ release. -8.7.0
+8.8.0
+8.7.0
8.6.0
8.5.0
8.4.0
@@ -61,7 +62,8 @@ release. 7.0.0
-6.11.4
+6.11.5
+6.11.4
6.11.3
6.11.2
6.11.1
@@ -91,7 +93,8 @@ release. 6.0.0
-4.8.4
+4.8.5
+4.8.4
4.8.3
4.8.2
4.8.1
diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index b0db4aa92aa..acbd3fa9b5d 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -677,4 +677,4 @@ LTS working group and the Release team. [backporting guide]: doc/guides/backporting-to-release-lines.md [Stability Index]: doc/api/documentation.md#stability-index [Enhancement Proposal]: https://github.com/nodejs/node-eps -[git-username]: https://help.github.com/articles/setting-your-username-in-git/ \ No newline at end of file +[git-username]: https://help.github.com/articles/setting-your-username-in-git/ diff --git a/common.gypi b/common.gypi index c23c81ef7ec..727d22d5ab6 100644 --- a/common.gypi +++ b/common.gypi @@ -164,6 +164,7 @@ 'BasicRuntimeChecks': 3, # /RTC1 'AdditionalOptions': [ '/bigobj', # prevent error C1128 in VS2015 + '/MP', # compile across multiple CPUs ], }, 'VCLinkerTool': { @@ -222,6 +223,9 @@ 'EnableFunctionLevelLinking': 'true', 'EnableIntrinsicFunctions': 'true', 'RuntimeTypeInfo': 'false', + 'AdditionalOptions': [ + '/MP', # compile across multiple CPUs + ], }, 'VCLibrarianTool': { 'AdditionalOptions': [ @@ -254,9 +258,6 @@ # and their sheer number drowns out other, more legitimate warnings. 'DisableSpecificWarnings': ['4267'], 'WarnAsError': 'false', - 'AdditionalOptions': [ - '/MP', # compile across multiple CPUs - ], }, 'VCLibrarianTool': { }, diff --git a/doc/api/child_process.md b/doc/api/child_process.md index 413949c287d..64bee59a661 100644 --- a/doc/api/child_process.md +++ b/doc/api/child_process.md @@ -128,7 +128,7 @@ exec('"my script.cmd" a b', (err, stdout, stderr) => { @@ -244,7 +244,7 @@ lsExample(); @@ -375,7 +375,7 @@ supported by `child_process.fork()` and will be ignored if set. -* {net.Socket} +* {net.Socket|tls.TLSSocket} -Returns a Proxy object that acts as a `net.Socket` but applies getters, -setters and methods based on HTTP/2 logic. +Returns a Proxy object that acts as a `net.Socket` (or `tls.TLSSocket`) but +applies getters, setters and methods based on HTTP/2 logic. `destroyed`, `readable`, and `writable` properties will be retrieved from and set on `request.stream`. @@ -2293,7 +2318,7 @@ will result in a [`TypeError`][] being thrown. added: v8.4.0 --> -* {net.Socket} +* {net.Socket|tls.TLSSocket} See [`response.socket`][]. @@ -2510,10 +2535,10 @@ Returns `response`. added: v8.4.0 --> -* {net.Socket} +* {net.Socket|tls.TLSSocket} -Returns a Proxy object that acts as a `net.Socket` but applies getters, -setters and methods based on HTTP/2 logic. +Returns a Proxy object that acts as a `net.Socket` (or `tls.TLSSocket`) but +applies getters, setters and methods based on HTTP/2 logic. `destroyed`, `readable`, and `writable` properties will be retrieved from and set on `response.stream`. diff --git a/doc/api/modules.md b/doc/api/modules.md index afddbc14c4f..c6a25df417a 100644 --- a/doc/api/modules.md +++ b/doc/api/modules.md @@ -598,14 +598,36 @@ filename scales linearly with the number of registered extensions. In other words, adding extensions slows down the module loader and should be discouraged. -#### require.resolve() +#### require.resolve(request[, options]) +* `request` {string} The module path to resolve. +* `options` {Object} + * `paths` {Array} Paths to resolve module location from. If present, these + paths are used instead of the default resolution paths. Note that each of + these paths is used as a starting point for the module resolution algorithm, + meaning that the `node_modules` hierarchy is checked from this location. +* Returns: {string} + Use the internal `require()` machinery to look up the location of a module, but rather than loading the module, just return the resolved filename. +#### require.resolve.paths(request) + + +* `request` {string} The module path whose lookup paths are being retrieved. +* Returns: {Array} + +Returns an array containing the paths searched during resolution of `request`. + ## The `module` Object