Merge branch 'xplat-merge' into xplat

nodejs · Jan 13, 2017 · 2096aa2 · 2096aa2
2 parents 6413bab + e97cab1
commit 2096aa2
Show file tree

Hide file tree

Showing 3,014 changed files with 107,880 additions and 80,085 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -4,13 +4,11 @@ root = true
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
+insert_final_newline = true
 
 [vcbuild.bat]
 end_of_line = crlf
 
-[*.{md,markdown}]
-trim_trailing_whitespace = false
-
 [{lib,src,test}/**.js]
 indent_style = space
 indent_size = 2
@@ -37,3 +35,6 @@ indent_size = ignore
 end_of_line = ignore
 trim_trailing_whitespace = ignore
 charset = ignore
+
+[{test/fixtures,deps,tools/eslint,tools/gyp,tools/icu,tools/msvs}/**]
+insert_final_newline = false
diff --git a/.eslintrc b/.eslintrc
@@ -2,6 +2,9 @@ env:
   node: true
   es6: true
 
+parserOptions:
+  ecmaVersion: 2016
+
 rules:
   # Possible Errors
   # http://eslint.org/docs/rules/#possible-errors
@@ -63,26 +66,35 @@ rules:
     object: assert,
     property: deepEqual,
     message: Please use assert.deepStrictEqual().
+  }, {
+    property: __defineGetter__,
+    message: __defineGetter__ is deprecated.
+  }, {
+    property: __defineSetter__,
+    message: __defineSetter__ is deprecated.
   }]
 
   # Stylistic Issues
   # http://eslint.org/docs/rules/#stylistic-issues
+  block-spacing: 2
   brace-style: [2, 1tbs, {allowSingleLine: true}]
   comma-spacing: 2
   comma-style: 2
   computed-property-spacing: 2
   eol-last: 2
   func-call-spacing: 2
+  func-name-matching: 2
   indent: [2, 2, {SwitchCase: 1, MemberExpression: 1}]
   key-spacing: [2, {mode: minimum}]
   keyword-spacing: 2
   linebreak-style: [0, unix]
   max-len: [2, 80, 2]
   new-parens: 2
   no-mixed-spaces-and-tabs: 2
-  no-multiple-empty-lines: [2, {max: 2}]
+  no-multiple-empty-lines: [2, {max: 2, maxEOF: 0, maxBOF: 0}]
   no-tabs: 2
   no-trailing-spaces: 2
+  operator-linebreak: [2, after]
   quotes: [2, single, avoid-escape]
   semi: 2
   semi-spacing: 2
@@ -111,8 +123,9 @@ rules:
   align-function-arguments: 2
   align-multiline-assignment: 2
   assert-fail-single-argument: 2
+  assert-throws-arguments: [2, { requireTwo: false }]
   new-with-error: [2, Error, RangeError, TypeError, SyntaxError, ReferenceError]
-  no-definegetter-definesetter: 2
+  no-useless-regex-char-class-escape: [2, { override: ['[', ']'] }]
 
 # Global scoped method and vars
 globals:

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,5 +1,11 @@
 <!--
 Thank you for reporting an issue.
+
+This issue tracker is for bugs and issues found within Node.js core.
+If you require more general support please file an issue on our help
+repo. https://github.com/nodejs/help
+
+
 Please fill in as much of the template below as you're able.
 
 Version: output of `node -v`

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,7 +9,7 @@ Contributors guide: https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
 ##### Checklist
 <!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
 
-- [ ] `make -j8 test` (UNIX), or `vcbuild test nosign` (Windows) passes
+- [ ] `make -j4 test` (UNIX), or `vcbuild test` (Windows) passes
 - [ ] tests and/or benchmarks are included
 - [ ] documentation is changed or added
 - [ ] commit message follows commit guidelines

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,19 @@
+# Whitelist dotfiles
+.*
+!deps/**/.*
+!test/fixtures/**/.*
+!tools/eslint/**/.*
+!tools/doc/node_modules/**/.*
+!.editorconfig
+!.eslintignore
+!.eslintrc
+!.gitattributes
+!.github
+!.gitignore
+!.gitkeep
+!.mailmap
+!.remarkrc
+
 core
 vgcore.*
 v8*.log
@@ -16,8 +32,6 @@ node
 node_g
 *.swp
 .benchmark_reports
-/.project
-/.cproject
 icu_config.gypi
 .eslintcache
 
@@ -89,7 +103,7 @@ deps/npm/node_modules/.bin/
 # test artifacts
 tools/faketime
 icu_config.gypi
-test.tap
+*.tap
 
 # Xcode workspaces and project folders
 *.xcodeproj

diff --git a/BUILDING.md b/BUILDING.md
@@ -20,20 +20,37 @@ Prerequisites:
 
 On OS X, you will also need:
 * [Xcode](https://developer.apple.com/xcode/download/)
-  * You also need to install the `Command Line Tools` via Xcode. You can find 
+  * You also need to install the `Command Line Tools` via Xcode. You can find
     this under the menu `Xcode -> Preferences -> Downloads`
   * This step will install `gcc` and the related toolchain containing `make`
 
+* After building, you may want to setup [firewall rules](tools/macosx-firewall.sh)
+to avoid popups asking to accept incoming network connections when running tests:
+
+```console
+$ sudo ./tools/macosx-firewall.sh
+```
+Running this script will add rules for the executable `node` in the out
+directory and the symbolic `node` link in the projects root directory.
+
 On FreeBSD and OpenBSD, you may also need:
 * libexecinfo
 
 To build Node.js:
 
 ```console
 $ ./configure
-$ make
+$ make -j4
 ```
 
+Running `make` with the `-j4` flag will cause it to run 4 compilation jobs
+concurrently which may significantly reduce build time. The number after `-j`
+can be changed to best suit the number of processor cores on your machine. If
+you run into problems running `make` with concurrency, try running it without
+the `-j4` flag. See the
+[GNU Make Documentation](https://www.gnu.org/software/make/manual/html_node/Parallel.html)
+for more information.
+
 Note that the above requires that `python` resolve to Python 2.6 or 2.7 and not a newer version.
 
 To run the tests:
@@ -98,7 +115,7 @@ Prerequisites:
   and tools which can be included in the global `PATH`.
 
 ```console
-> .\vcbuild nosign
+> .\vcbuild
 ```
 
 To run the tests:
@@ -113,7 +130,7 @@ To test if Node.js was built correctly:
 > Release\node -e "console.log('Hello from Node.js', process.version)"
 ```
 
-### Android / Android-based devices (e.g., Firefox OS)
+### Android / Android-based devices (e.g. Firefox OS)
 
 Although these instructions for building on Android are provided, please note
 that Android is not an officially supported platform at this time. Patches to
@@ -230,7 +247,7 @@ as `deps/icu` (You'll have: `deps/icu/source/...`)
 NOTE: Windows is not yet supported
 
 It is possible to build Node.js with
-[OpenSSL FIPS module](https://www.openssl.org/docs/fips/fipsnotes.html).
+[OpenSSL FIPS module](https://www.openssl.org/docs/fipsnotes.html).
 
 **Note**: building in this way does **not** allow you to claim that the
 runtime is FIPS 140-2 validated. Instead you can indicate that the runtime

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ release lines.
 
 Select a Node.js version below to view the changelog history:
 
+* [Node.js v7](doc/changelogs/CHANGELOG_V7.md)
 * [Node.js v6](doc/changelogs/CHANGELOG_V6.md)
 * [Node.js v5](doc/changelogs/CHANGELOG_V5.md)
 * [Node.js v4](doc/changelogs/CHANGELOG_V4.md)
@@ -18,15 +19,28 @@ release.
 
 <table>
 <tr>
-  <th><a href="doc/changelogs/CHANGELOG_V6.md">v6</a><sup>Current</sup</th>
+  <th><a href="doc/changelogs/CHANGELOG_V7.md">v7</a><sup>Current</sup></td>
+  <th title="LTS Until 2019-04"><a href="doc/changelogs/CHANGELOG_V6.md">v6</a><sup>LTS</sup</th>
   <th><a href="doc/changelogs/CHANGELOG_V5.md">v5</a></th>
   <th title="LTS Until 2018-04"><a href="doc/changelogs/CHANGELOG_V4.md">v4</a><sup>LTS</sup></th>
   <th title="LTS Until 2016-12-31"><a href="doc/changelogs/CHANGELOG_V012.md">v0.12</a><sup>LTS</sup></th>
   <th title="LTS Until 2016-10-31" colspan="3"><a href="doc/changelogs/CHANGELOG_V010.md">v0.10</a><sup>LTS</sup></th>
 </tr>
 <tr>
-  <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V6.md#6.7.0">6.7.0</a></b><br/>
+<td valign="top">
+<b><a href="doc/changelogs/CHANGELOG_V7.md#7.3.0">7.3.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V7.md#7.2.1">7.2.1</a><br/>
+<a href="doc/changelogs/CHANGELOG_V7.md#7.2.0">7.2.0</a><br/>
+<a href="doc/changelogs/CHANGELOG_V7.md#7.1.0">7.1.0</a><br/>
+<a href="doc/changelogs/CHANGELOG_V7.md#7.0.0">7.0.0</a><br/>
+</td>
+<td valign="top">
+<b><a href="doc/changelogs/CHANGELOG_V6.md#6.9.2">6.9.2</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V6.md#6.9.1">6.9.1</a><br/>
+<a href="doc/changelogs/CHANGELOG_V6.md#6.9.0">6.9.0</a><br/>
+<a href="doc/changelogs/CHANGELOG_V6.md#6.8.1">6.8.1</a><br/>
+<a href="doc/changelogs/CHANGELOG_V6.md#6.8.0">6.8.0</a><br/>
+<a href="doc/changelogs/CHANGELOG_V6.md#6.7.0">6.7.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.6.0">6.6.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.5.0">6.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.4.0">6.4.0</a><br/>
@@ -59,11 +73,14 @@ release.
 <a href="doc/changelogs/CHANGELOG_V5.md#5.0.0">5.0.0</a><br/>
   </td>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V4.md#4.6.0">4.6.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V4.md#4.6.2">4.7.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V4.md#4.6.1">4.6.2</a><br/>
+<a href="doc/changelogs/CHANGELOG_V4.md#4.6.1">4.6.1</a><br/>
+<a href="doc/changelogs/CHANGELOG_V4.md#4.6.0">4.6.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V4.md#4.5.0">4.5.0</a><br/>
-<a href="doc/changelogs/CHANGELOG_V4.md#4.4.7">4.4.7</a></b>
-<a href="doc/changelogs/CHANGELOG_V4.md#4.4.6">4.4.6</a></b>
-<a href="doc/changelogs/CHANGELOG_V4.md#4.4.5">4.4.5</a></b>
+<a href="doc/changelogs/CHANGELOG_V4.md#4.4.7">4.4.7</a><br/>
+<a href="doc/changelogs/CHANGELOG_V4.md#4.4.6">4.4.6</a><br/>
+<a href="doc/changelogs/CHANGELOG_V4.md#4.4.5">4.4.5</a><br/>
 <a href="doc/changelogs/CHANGELOG_V4.md#4.4.4">4.4.4</a><br/>
 <a href="doc/changelogs/CHANGELOG_V4.md#4.4.3">4.4.3</a><br/>
 <a href="doc/changelogs/CHANGELOG_V4.md#4.4.2">4.4.2</a><br/>
@@ -85,7 +102,9 @@ release.
 <a href="doc/changelogs/CHANGELOG_V4.md#4.0.0">4.0.0</a><br/>
   </td>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V012.md#0.12.16">0.12.16</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V012.md#0.12.18">0.12.18</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V012.md#0.12.17">0.12.17</a><br/>
+<a href="doc/changelogs/CHANGELOG_V012.md#0.12.16">0.12.16</a><br/>
 <a href="doc/changelogs/CHANGELOG_V012.md#0.12.15">0.12.15</a><br/>
 <a href="doc/changelogs/CHANGELOG_V012.md#0.12.14">0.12.14</a><br/>
 <a href="doc/changelogs/CHANGELOG_V012.md#0.12.13">0.12.13</a><br/>
@@ -104,7 +123,8 @@ release.
 <a href="doc/changelogs/CHANGELOG_V012.md#0.12.0">0.12.0</a><br/>
   </td>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V010.md#0.10.47">0.10.47</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V010.md#0.10.48">0.10.48</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V010.md#0.10.47">0.10.47</a><br/>
 <a href="doc/changelogs/CHANGELOG_V010.md#0.10.46">0.10.46</a><br/>
 <a href="doc/changelogs/CHANGELOG_V010.md#0.10.45">0.10.45</a><br/>
 <a href="doc/changelogs/CHANGELOG_V010.md#0.10.44">0.10.44</a><br/>