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

Merge 78a7536 as of 2018-03-06
This commit was automatically generated. For any problems, please contact jackhorton

Reviewed-By: Jack Horton <jahorto@microsoft.com>

Author: chakrabot

.eslintrc.js

@@ -42,43 +42,80 @@ module.exports = {
     },
   ],
   rules: {
-    // Possible Errors
-    // http://eslint.org/docs/rules/#possible-errors
+    // ESLint built-in rules
+    // http://eslint.org/docs/rules
+    'accessor-pairs': 'error',
+    'array-callback-return': 'error',
+    'arrow-parens': ['error', 'always'],
+    'arrow-spacing': ['error', { before: true, after: true }],
+    'block-spacing': 'error',
+    'brace-style': ['error', '1tbs', { allowSingleLine: true }],
+    'comma-dangle': ['error', 'only-multiline'],
+    'comma-spacing': 'error',
+    'comma-style': 'error',
+    'computed-property-spacing': 'error',
+    'constructor-super': 'error',
+    'dot-location': ['error', 'property'],
+    'dot-notation': 'error',
+    'eol-last': 'error',
+    eqeqeq: ['error', 'smart'],
     'for-direction': 'error',
+    'func-call-spacing': 'error',
+    'func-name-matching': 'error',
+    'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
+    indent: ['error', 2, {
+      ArrayExpression: 'first',
+      CallExpression: { arguments: 'first' },
+      FunctionDeclaration: { parameters: 'first' },
+      FunctionExpression: { parameters: 'first' },
+      MemberExpression: 'off',
+      ObjectExpression: 'first',
+      SwitchCase: 1,
+    }],
+    'key-spacing': ['error', { mode: 'strict' }],
+    'keyword-spacing': 'error',
+    'linebreak-style': ['error', 'unix'],
+    'max-len': ['error', {
+      code: 80,
+      ignorePattern: '^// Flags:',
+      ignoreRegExpLiterals: true,
+      ignoreUrls: true,
+      tabWidth: 2,
+    }],
+    'new-parens': 'error',
+    'no-class-assign': 'error',
+    'no-confusing-arrow': 'error',
+    'no-const-assign': 'error',
     'no-control-regex': 'error',
     'no-debugger': 'error',
+    'no-delete-var': 'error',
     'no-dupe-args': 'error',
+    'no-dupe-class-members': 'error',
     'no-dupe-keys': 'error',
     'no-duplicate-case': 'error',
     'no-empty-character-class': 'error',
     'no-ex-assign': 'error',
     'no-extra-boolean-cast': 'error',
     'no-extra-parens': ['error', 'functions'],
     'no-extra-semi': 'error',
+    'no-fallthrough': 'error',
     'no-func-assign': 'error',
+    'no-global-assign': 'error',
     'no-invalid-regexp': 'error',
     'no-irregular-whitespace': 'error',
-    'no-obj-calls': 'error',
-    'no-template-curly-in-string': 'error',
-    'no-unexpected-multiline': 'error',
-    'no-unreachable': 'error',
-    'no-unsafe-negation': 'error',
-    'use-isnan': 'error',
-    'valid-typeof': 'error',
-
-    // Best Practices
-    // http://eslint.org/docs/rules/#best-practices
-    'accessor-pairs': 'error',
-    'array-callback-return': 'error',
-    'dot-location': ['error', 'property'],
-    'dot-notation': 'error',
-    eqeqeq: ['error', 'smart'],
-    'no-fallthrough': 'error',
-    'no-global-assign': 'error',
+    'no-lonely-if': 'error',
+    'no-mixed-requires': 'error',
+    'no-mixed-spaces-and-tabs': 'error',
     'no-multi-spaces': ['error', { ignoreEOLComments: true }],
+    'no-multiple-empty-lines': ['error', { max: 2, maxEOF: 0, maxBOF: 0 }],
+    'no-new-require': 'error',
+    'no-new-symbol': 'error',
+    'no-obj-calls': 'error',
     'no-octal': 'error',
+    'no-path-concat': 'error',
     'no-proto': 'error',
     'no-redeclare': 'error',
+    'no-restricted-modules': ['error', 'sys'],
     'no-restricted-properties': [
       'error',
       {
@@ -110,76 +147,6 @@ module.exports = {
         message: '__defineSetter__ is deprecated.',
       }
     ],
-    'no-return-await': 'error',
-    'no-self-assign': 'error',
-    'no-self-compare': 'error',
-    'no-throw-literal': 'error',
-    'no-unused-labels': 'error',
-    'no-useless-call': 'error',
-    'no-useless-concat': 'error',
-    'no-useless-escape': 'error',
-    'no-useless-return': 'error',
-    'no-void': 'error',
-    'no-with': 'error',
-
-    // Strict Mode
-    // http://eslint.org/docs/rules/#strict-mode
-    strict: ['error', 'global'],
-
-    // Variables
-    // http://eslint.org/docs/rules/#variables
-    'no-delete-var': 'error',
-    'no-undef': 'error',
-    'no-undef-init': 'error',
-    'no-unused-vars': ['error', { args: 'none' }],
-    'no-use-before-define': ['error', {
-      classes: true,
-      functions: false,
-      variables: false,
-    }],
-
-    // Node.js and CommonJS
-    // http://eslint.org/docs/rules/#nodejs-and-commonjs
-    'no-mixed-requires': 'error',
-    'no-new-require': 'error',
-    'no-path-concat': 'error',
-    'no-restricted-modules': ['error', 'sys'],
-
-    // Stylistic Issues
-    // http://eslint.org/docs/rules/#stylistic-issues'
-    'block-spacing': 'error',
-    'brace-style': ['error', '1tbs', { allowSingleLine: true }],
-    'comma-dangle': ['error', 'only-multiline'],
-    'comma-spacing': 'error',
-    'comma-style': 'error',
-    'computed-property-spacing': 'error',
-    'eol-last': 'error',
-    'func-call-spacing': 'error',
-    'func-name-matching': 'error',
-    'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
-    indent: ['error', 2, {
-      ArrayExpression: 'first',
-      CallExpression: { arguments: 'first' },
-      FunctionDeclaration: { parameters: 'first' },
-      FunctionExpression: { parameters: 'first' },
-      MemberExpression: 'off',
-      ObjectExpression: 'first',
-      SwitchCase: 1,
-    }],
-    'key-spacing': ['error', { mode: 'strict' }],
-    'keyword-spacing': 'error',
-    'linebreak-style': ['error', 'unix'],
-    'max-len': ['error', {
-      code: 80,
-      ignorePattern: '^// Flags:',
-      ignoreRegExpLiterals: true,
-      ignoreUrls: true,
-      tabWidth: 2,
-    }],
-    'new-parens': 'error',
-    'no-lonely-if': 'error',
-    'no-mixed-spaces-and-tabs': 'error',
-    'no-multiple-empty-lines': ['error', { max: 2, maxEOF: 0, maxBOF: 0 }],
     /* eslint-disable max-len, quotes */
     'no-restricted-syntax': [
       'error',
@@ -209,15 +176,41 @@ module.exports = {
       }
     ],
     /* eslint-enable max-len, quotes */
+    'no-return-await': 'error',
+    'no-self-assign': 'error',
+    'no-self-compare': 'error',
     'no-tabs': 'error',
+    'no-template-curly-in-string': 'error',
+    'no-this-before-super': 'error',
+    'no-throw-literal': 'error',
     'no-trailing-spaces': 'error',
+    'no-undef': 'error',
+    'no-undef-init': 'error',
+    'no-unexpected-multiline': 'error',
+    'no-unreachable': 'error',
     'no-unsafe-finally': 'error',
+    'no-unsafe-negation': 'error',
+    'no-unused-labels': 'error',
+    'no-unused-vars': ['error', { args: 'none' }],
+    'no-use-before-define': ['error', {
+      classes: true,
+      functions: false,
+      variables: false,
+    }],
+    'no-useless-call': 'error',
+    'no-useless-concat': 'error',
+    'no-useless-escape': 'error',
+    'no-useless-return': 'error',
+    'no-void': 'error',
     'no-whitespace-before-property': 'error',
+    'no-with': 'error',
     'object-curly-spacing': ['error', 'always'],
     'one-var': ['error', { initialized: 'never' }],
     'one-var-declaration-per-line': 'error',
     'operator-linebreak': ['error', 'after'],
+    'prefer-const': ['error', { ignoreReadBeforeAssign: true }],
     quotes: ['error', 'single', { avoidEscape: true }],
+    'rest-spread-spacing': 'error',
     semi: 'error',
     'semi-spacing': 'error',
     'space-before-blocks': ['error', 'always'],
@@ -229,25 +222,14 @@ module.exports = {
     'space-in-parens': ['error', 'never'],
     'space-infix-ops': 'error',
     'space-unary-ops': 'error',
-    'unicode-bom': 'error',
-
-    // ECMAScript 6
-    // http://eslint.org/docs/rules/#ecmascript-6
-    'arrow-parens': ['error', 'always'],
-    'arrow-spacing': ['error', { before: true, after: true }],
-    'constructor-super': 'error',
-    'no-class-assign': 'error',
-    'no-confusing-arrow': 'error',
-    'no-const-assign': 'error',
-    'no-dupe-class-members': 'error',
-    'no-new-symbol': 'error',
-    'no-this-before-super': 'error',
-    'prefer-const': ['error', { ignoreReadBeforeAssign: true }],
-    'rest-spread-spacing': 'error',
+    strict: ['error', 'global'],
     'symbol-description': 'error',
     'template-curly-spacing': 'error',
+    'unicode-bom': 'error',
+    'use-isnan': 'error',
+    'valid-typeof': 'error',
 
-    // Custom rules in from eslint-plugin-node-core
+    // Custom rules from eslint-plugin-node-core
     'node-core/no-unescaped-regexp-dot': 'error',
   },
   globals: {
@@ -262,7 +244,6 @@ module.exports = {
     DTRACE_HTTP_SERVER_REQUEST: false,
     DTRACE_HTTP_SERVER_RESPONSE: false,
     DTRACE_NET_SERVER_CONNECTION: false,
-    DTRACE_NET_STREAM_END: false,
-    internalBinding: false,
+    DTRACE_NET_STREAM_END: false
   },
 };

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,6 +14,3 @@ Contributors guide: https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
 - [ ] tests and/or benchmarks are included
 - [ ] documentation is changed or added
 - [ ] 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). -->

Makefile

@@ -1101,7 +1101,7 @@ lint-md:
 	@echo "To install (requires internet access) run: $ make lint-md-build"
 endif
 
-LINT_JS_TARGETS = benchmark doc lib test tools
+LINT_JS_TARGETS = .eslintrc.js benchmark doc lib test tools
 
 run-lint-js = tools/node_modules/eslint/bin/eslint.js --cache \
 	--ext=.js,.mjs,.md $(LINT_JS_TARGETS) --ignore-pattern '!.eslintrc.js'

common.gypi

@@ -29,7 +29,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.4',
+    'v8_embedder_string': '-node.5',
 
     # Enable disassembler for `--print-code` v8 options
     'v8_enable_disassembler': 1,

deps/v8/src/bootstrapper.cc

@@ -5475,6 +5475,11 @@ Genesis::Genesis(
     if (!InstallDebuggerNatives()) return;
   }
 
+  if (FLAG_disallow_code_generation_from_strings) {
+    native_context()->set_allow_code_gen_from_strings(
+        isolate->heap()->false_value());
+  }
+
   ConfigureUtilsObject(context_type);
 
   // Check that the script context table is empty except for the 'this' binding.

deps/v8/src/flag-definitions.h

@@ -768,6 +768,8 @@ DEFINE_BOOL(builtins_in_stack_traces, false,
             "show built-in functions in stack traces")
 DEFINE_BOOL(enable_experimental_builtins, true,
             "enable new csa-based experimental builtins")
+DEFINE_BOOL(disallow_code_generation_from_strings, false,
+            "disallow eval and friends")
 
 // builtins.cc
 DEFINE_BOOL(allow_unsafe_function_constructor, false,

deps/v8/test/mjsunit/disallow-codegen-from-strings.js

@@ -0,0 +1,9 @@
+// Copyright 2017 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --disallow-code-generation-from-strings
+
+assertThrows("1 + 1", EvalError);
+assertThrows(() => eval("1 + 1"), EvalError);
+assertThrows(() => Function("x", "return x + 1"), EvalError);

doc/api/_toc.md

@@ -1,5 +1,8 @@
 @// NB(chrisdickinson): if you move this file, be sure to update
 @// tools/doc/html.js to point at the new location.
+
+<!--introduced_in=v0.10.0-->
+
 * [About these Docs](documentation.html)
 * [Usage & Example](synopsis.html)
 

doc/api/deprecations.md

@@ -932,8 +932,8 @@ Using the `noAssert` argument has no functionality anymore. All input is going
 to be verified, no matter if it is set to true or not. Skipping the verification
 could lead to hard to find errors and crashes.
 
-<a id="DEP0XXX"></a>
-### DEP0XXX: process.binding('util').is[...] typechecks
+<a id="DEP0103"></a>
+### DEP0103: process.binding('util').is[...] typechecks
 
 Type: Documentation-only (supports [`--pending-deprecation`][])
 

doc/api/errors.md

@@ -1449,6 +1449,12 @@ An unspecified or non-specific system error has occurred within the Node.js
 process. The error object will have an `err.info` object property with
 additional details.
 
+<a id="ERR_STREAM_DESTROYED"></a>
+### ERR_STREAM_DESTROYED
+
+A stream method was called that cannot complete because the stream was
+destroyed using `stream.destroy()`.
+
 <a id="ERR_TLS_CERT_ALTNAME_INVALID"></a>
 ### ERR_TLS_CERT_ALTNAME_INVALID
 
@@ -1615,11 +1621,6 @@ The fulfilled value of a linking promise is not a `vm.Module` object.
 The current module's status does not allow for this operation. The specific
 meaning of the error depends on the specific function.
 
-<a id="ERR_ZLIB_BINDING_CLOSED"></a>
-### ERR_ZLIB_BINDING_CLOSED
-
-An attempt was made to use a `zlib` object after it has already been closed.
-
 <a id="ERR_ZLIB_INITIALIZATION_FAILED"></a>
 ### ERR_ZLIB_INITIALIZATION_FAILED