Merge remote-tracking branch 'origin/v8.x' into v8-cfx

citizenfx · Apr 21, 2018 · 8d5360e · 8d5360e
2 parents ccfb855 + ce751b1
commit 8d5360e
Show file tree

Hide file tree

Showing 4,083 changed files with 147,697 additions and 159,287 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -4,6 +4,7 @@ test/addons/??_*
 test/fixtures
 tools/eslint
 tools/icu
+tools/remark-*
 node_modules
 benchmark/tmp
 doc/**/*.js
diff --git a/.eslintrc.yaml b/.eslintrc.yaml
@@ -66,6 +66,7 @@ rules:
       message: __defineGetter__ is deprecated.
     - property: __defineSetter__
       message: __defineSetter__ is deprecated.
+  no-return-await: error
   no-self-assign: error
   no-throw-literal: error
   no-unused-labels: error

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -13,7 +13,7 @@ Contributors guide: /~https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
 - [ ] `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](/~https://github.com/nodejs/node/blob/master/CONTRIBUTING.md#commit-message-guidelines)
+- [ ] commit message follows [commit guidelines](/~https://github.com/nodejs/node/blob/master/doc/guides/contributing/pull-requests.md#commit-message-guidelines)
 
 ##### Affected core subsystem(s)
 <!-- Provide affected core subsystem(s) (like doc, cluster, crypto, etc). -->
diff --git a/.gitignore b/.gitignore
@@ -36,6 +36,7 @@ node_g
 icu_config.gypi
 .eslintcache
 node_trace.*.log
+coverage/
 
 /out
 
@@ -58,6 +59,7 @@ _UpgradeReport_Files/
 ipch/
 *.sdf
 *.opensdf
+*.VC.db
 *.VC.opendb
 .vs/
 .vscode/
@@ -117,3 +119,6 @@ icu_config.gypi
 deps/uv/.github/
 deps/uv/docs/code/
 deps/uv/docs/src/guide/
+
+# do not override V8's .gitignore
+!deps/v8/**
diff --git a/.mailmap b/.mailmap