v11.14.0 proposal

.travis.yml

@@ -1,25 +1,57 @@
-language: cpp
-cache: ccache
 os: linux
 dist: xenial
-matrix:
+jobs:
   include:
-    - name: "First commit message adheres to guidelines at <a href=\"https://goo.gl/p2fr5Q\">https://goo.gl/p2fr5Q</a>"
+    - stage: "Lint and Compile"
+      name: "First commit message adheres to guidelines at <a href=\"https://goo.gl/p2fr5Q\">https://goo.gl/p2fr5Q</a>"
       if: type = pull_request
       language: node_js
       node_js: "node"
       script:
         - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
             bash -x tools/lint-pr-commit-message.sh ${TRAVIS_PULL_REQUEST};
           fi
+
     - name: "Linter"
       language: node_js
       node_js: "node"
-      env:
-        - NODE=$(which node)
+      install:
+        - make lint-py-build || true
+      script:
+        - NODE=$(which node) make lint-ci
+
+    - name: "Compile V8"
+      language: cpp
+      cache: ccache
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-6
+      install:
+        - CC='ccache gcc-6' CXX='ccache g++-6' ./configure
+      script:
+        - CC='ccache gcc-6' CXX='ccache g++-6' make -j2 -C out V=1 v8
+
+    - name: "Compile Node.js"
+      language: cpp
+      cache: ccache
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-6
+      install:
+        - CC='ccache gcc-6' CXX='ccache g++-6' ./configure
       script:
-        - make lint
-    - name: "Test Suite"
+        - CC='ccache gcc-6' CXX='ccache g++-6' make -j2 V=1
+
+    - stage: "Tests"
+      name: "Test Suite"
+      language: cpp
+      cache: ccache
       addons:
         apt:
           sources:
@@ -29,6 +61,8 @@ matrix:
       install:
         - export CC='ccache gcc-6' CXX='ccache g++-6' JOBS=2
         - ./configure
-        - make -j2 V=
+        # We already have a compile log in the above job
+        - make -j2 > /dev/null
+        - make -j1 build-addons build-js-native-api-tests build-node-api-tests > /dev/null
       script:
-        - PARALLEL_ARGS='--flaky-tests=skip' make -j1 test
+        - JOBS=2 FLAKY_TESTS=skip make -s -j1 V= test-ci | grep -F -e "---" -e "..." -v

CHANGELOG.md

@@ -22,13 +22,14 @@ release.
 <table>
 <tr>
   <th title="Current"><a href="doc/changelogs/CHANGELOG_V11.md">11</a><sup>Current</sup></th>
-  <th title="Current"><a href="doc/changelogs/CHANGELOG_V10.md">10</a><sup>Current</sup></th>
+  <th title="LTS Until 2021-04"><a href="doc/changelogs/CHANGELOG_V10.md">10</a><sup>LTS</sup></th>
   <th title="LTS Until 2019-12"><a href="doc/changelogs/CHANGELOG_V8.md">8</a><sup>LTS</sup></th>
   <th title="LTS Until 2019-04"><a href="doc/changelogs/CHANGELOG_V6.md">6</a><sup>LTS</sup></th>
 </tr>
 <tr>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V11.md#11.13.0">11.13.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V11.md#11.14.0">11.14.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V11.md#11.13.0">11.13.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V11.md#11.12.0">11.12.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V11.md#11.11.0">11.11.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V11.md#11.10.1">11.10.1</a><br/>

COLLABORATOR_GUIDE.md

@@ -30,11 +30,8 @@
   - [I Made a Mistake](#i-made-a-mistake)
   - [Long Term Support](#long-term-support)
     - [What is LTS?](#what-is-lts)
-    - [How does LTS work?](#how-does-lts-work)
-    - [Landing semver-minor commits in LTS](#landing-semver-minor-commits-in-lts)
     - [How are LTS Branches Managed?](#how-are-lts-branches-managed)
     - [How can I help?](#how-can-i-help)
-    - [How is an LTS release cut?](#how-is-an-lts-release-cut)
 * [Who to CC in the issue tracker](#who-to-cc-in-the-issue-tracker)
 
 This document explains how Collaborators manage the Node.js project.
@@ -681,13 +678,6 @@ label.
 Attach the appropriate `lts-watch-` label to any PR that may impact an LTS
 release.
 
-#### How is an LTS release cut?
-
-When the LTS working group determines that a new LTS release is required,
-selected commits will be picked from the staging branch to be included in the
-release. This process of making a release will be a collaboration between the
-LTS working group and the Release team.
-
 ## Who to CC in the issue tracker
 
 | Subsystem                                | Maintainers                                                           |

GOVERNANCE.md

@@ -1,9 +1,5 @@
 # Node.js Project Governance
 
-The Node.js project is governed by its Collaborators, including a Technical
-Steering Committee (TSC) which is responsible for high-level guidance of the
-project.
-
 <!-- TOC -->
 
 - [Collaborators](#collaborators)

README.md

@@ -193,8 +193,6 @@ For information about the governance of the Node.js project, see
 **Michael Dawson** <michael_dawson@ca.ibm.com> (he/him)
 * [MylesBorins](https://github.com/MylesBorins) -
 **Myles Borins** <myles.borins@gmail.com> (he/him)
-* [ofrobots](https://github.com/ofrobots) -
-**Ali Ijaz Sheikh** <ofrobots@google.com> (he/him)
 * [rvagg](https://github.com/rvagg) -
 **Rod Vagg** <rod@vagg.org>
 * [targos](https://github.com/targos) -
@@ -226,6 +224,8 @@ For information about the governance of the Node.js project, see
 **Brian White** <mscdex@mscdex.net>
 * [nebrius](https://github.com/nebrius) -
 **Bryan Hughes** <bryan@nebri.us>
+* [ofrobots](https://github.com/ofrobots) -
+**Ali Ijaz Sheikh** <ofrobots@google.com> (he/him)
 * [orangemocha](https://github.com/orangemocha) -
 **Alexis Campailla** <orangemocha@nodejs.org>
 * [piscisaureus](https://github.com/piscisaureus) -

benchmark/_benchmark_progress.js

@@ -35,7 +35,6 @@ class BenchmarkProgress {
     // Number of times each file will be run (roughly).
     this.runsPerFile = queue.length / benchmarks.length;
     this.currentFile = '';  // Filename of current benchmark.
-    this.currentFileConfig;  // Configurations for current file
     // Number of configurations already run for the current file.
     this.completedConfig = 0;
     // Total number of configurations for the current file

benchmark/es/foreach-bench.js

@@ -12,19 +12,18 @@ function useFor(n, items, count) {
   bench.start();
   for (var i = 0; i < n; i++) {
     for (var j = 0; j < count; j++) {
-      /* eslint-disable no-unused-vars */
+      // eslint-disable-next-line no-unused-vars
       const item = items[j];
-      /* esline-enable no-unused-vars */
     }
   }
   bench.end(n);
 }
 
 function useForOf(n, items) {
-  var item;
   bench.start();
   for (var i = 0; i < n; i++) {
-    for (item of items) {}
+    // eslint-disable-next-line no-unused-vars
+    for (const item of items) {}
   }
   bench.end(n);
 }
@@ -33,9 +32,8 @@ function useForIn(n, items) {
   bench.start();
   for (var i = 0; i < n; i++) {
     for (var j in items) {
-      /* eslint-disable no-unused-vars */
+      // eslint-disable-next-line no-unused-vars
       const item = items[j];
-      /* esline-enable no-unused-vars */
     }
   }
   bench.end(n);

benchmark/fs/readfile-partitioned.js

@@ -29,7 +29,7 @@ function main(conf) {
   fs.writeFileSync(filename, data);
   data = null;
 
-  var zipData = Buffer.alloc(1024, 'a');
+  const zipData = Buffer.alloc(1024, 'a');
 
   var reads = 0;
   var zips = 0;

benchmark/fs/write-stream-throughput.js

@@ -38,7 +38,7 @@ function main({ dur, encodingType, size }) {
   var started = false;
   var ended = false;
 
-  var f = fs.createWriteStream(filename);
+  const f = fs.createWriteStream(filename);
   f.on('drain', write);
   f.on('open', write);
   f.on('close', done);

benchmark/http/_chunky_http_client.js

@@ -54,7 +54,7 @@ function main({ len, n }) {
   const add = 11;
   var count = 0;
   const PIPE = process.env.PIPE_NAME;
-  var socket = net.connect(PIPE, () => {
+  const socket = net.connect(PIPE, () => {
     bench.start();
     WriteHTTPHeaders(socket, 1, len);
     socket.setEncoding('utf8');

benchmark/http/http_server_for_chunky_client.js

@@ -10,9 +10,7 @@ process.env.PIPE_NAME = PIPE;
 
 tmpdir.refresh();
 
-var server;
-
-server = http.createServer((req, res) => {
+const server = http.createServer((req, res) => {
   const headers = {
     'content-type': 'text/plain',
     'content-length': '2'

benchmark/http/set-header.js

@@ -17,7 +17,7 @@ const c = 50;
 // setHeaderWH: setHeader(...), writeHead(status, ...)
 function main({ res }) {
   process.env.PORT = PORT;
-  var server = require('../fixtures/simple-http-server.js')
+  const server = require('../fixtures/simple-http-server.js')
   .listen(PORT)
   .on('listening', () => {
     const path = `/${type}/${len}/${chunks}/normal/${chunkedEnc}`;

benchmark/http/simple.js

@@ -11,7 +11,7 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ type, len, chunks, c, chunkedEnc, res }) {
-  var server = require('../fixtures/simple-http-server.js')
+  const server = require('../fixtures/simple-http-server.js')
   .listen(common.PORT)
   .on('listening', () => {
     const path = `/${type}/${len}/${chunks}/normal/${chunkedEnc}`;

benchmark/http/upgrade.js

@@ -19,7 +19,7 @@ const resData = 'HTTP/1.1 101 Web Socket Protocol Handshake\r\n' +
                 '\r\n\r\n';
 
 function main({ n }) {
-  var server = require('../fixtures/simple-http-server.js')
+  const server = require('../fixtures/simple-http-server.js')
     .listen(common.PORT)
     .on('listening', () => {
       bench.start();

benchmark/module/module-loader-deep.js

@@ -0,0 +1,51 @@
+'use strict';
+const fs = require('fs');
+const path = require('path');
+const common = require('../common.js');
+
+const tmpdir = require('../../test/common/tmpdir');
+const benchmarkDirectory = path.join(tmpdir.path, 'nodejs-benchmark-module');
+
+const bench = common.createBenchmark(main, {
+  ext: ['', '.js'],
+  files: [1e3],
+  cache: ['true', 'false']
+});
+
+function main({ ext, cache, files }) {
+  tmpdir.refresh();
+  fs.mkdirSync(benchmarkDirectory);
+  fs.writeFileSync(
+    `${benchmarkDirectory}/a.js`,
+    'module.exports = {};'
+  );
+  for (var i = 0; i <= files; i++) {
+    fs.mkdirSync(`${benchmarkDirectory}/${i}`);
+    fs.writeFileSync(
+      `${benchmarkDirectory}/${i}/package.json`,
+      '{"main": "index.js"}'
+    );
+    fs.writeFileSync(
+      `${benchmarkDirectory}/${i}/index.js`,
+      `require('../a${ext}');`
+    );
+  }
+
+  measureDir(cache === 'true', files);
+
+  tmpdir.refresh();
+}
+
+function measureDir(cache, files) {
+  var i;
+  if (cache) {
+    for (i = 0; i <= files; i++) {
+      require(`${benchmarkDirectory}/${i}`);
+    }
+  }
+  bench.start();
+  for (i = 0; i <= files; i++) {
+    require(`${benchmarkDirectory}/${i}`);
+  }
+  bench.end(files);
+}

benchmark/module/module-loader.js

@@ -1,21 +1,27 @@
 'use strict';
 const fs = require('fs');
 const path = require('path');
+const { builtinModules } = require('module');
 const common = require('../common.js');
 
 const tmpdir = require('../../test/common/tmpdir');
-const benchmarkDirectory = path.join(tmpdir.path, 'nodejs-benchmark-module');
+let benchmarkDirectory = path.join(tmpdir.path, 'nodejs-benchmark-module');
+
+// Filter all irregular modules.
+const otherModules = builtinModules.filter((name) => !/\/|^_|^sys/.test(name));
 
 const bench = common.createBenchmark(main, {
-  n: [5e4],
-  fullPath: ['true', 'false'],
-  useCache: ['true', 'false']
+  name: ['', '/', '/index.js'],
+  dir: ['rel', 'abs'],
+  files: [5e2],
+  n: [1, 1e3],
+  cache: ['true', 'false']
 });
 
-function main({ n, fullPath, useCache }) {
+function main({ n, name, cache, files, dir }) {
   tmpdir.refresh();
-  try { fs.mkdirSync(benchmarkDirectory); } catch {}
-  for (var i = 0; i <= n; i++) {
+  fs.mkdirSync(benchmarkDirectory);
+  for (var i = 0; i <= files; i++) {
     fs.mkdirSync(`${benchmarkDirectory}${i}`);
     fs.writeFileSync(
       `${benchmarkDirectory}${i}/package.json`,
@@ -27,38 +33,28 @@ function main({ n, fullPath, useCache }) {
     );
   }
 
-  if (fullPath === 'true')
-    measureFull(n, useCache === 'true');
-  else
-    measureDir(n, useCache === 'true');
+  if (dir === 'rel')
+    benchmarkDirectory = path.relative(__dirname, benchmarkDirectory);
 
-  tmpdir.refresh();
-}
+  measureDir(n, cache === 'true', files, name);
 
-function measureFull(n, useCache) {
-  var i;
-  if (useCache) {
-    for (i = 0; i <= n; i++) {
-      require(`${benchmarkDirectory}${i}/index.js`);
-    }
-  }
-  bench.start();
-  for (i = 0; i <= n; i++) {
-    require(`${benchmarkDirectory}${i}/index.js`);
-  }
-  bench.end(n);
+  tmpdir.refresh();
 }
 
-function measureDir(n, useCache) {
+function measureDir(n, cache, files, name) {
   var i;
-  if (useCache) {
-    for (i = 0; i <= n; i++) {
-      require(`${benchmarkDirectory}${i}`);
+  if (cache) {
+    for (i = 0; i <= files; i++) {
+      require(`${benchmarkDirectory}${i}${name}`);
     }
   }
   bench.start();
-  for (i = 0; i <= n; i++) {
-    require(`${benchmarkDirectory}${i}`);
+  for (i = 0; i <= files; i++) {
+    for (var j = 0; j < n; j++)
+      require(`${benchmarkDirectory}${i}${name}`);
+    // Pretend mixed input (otherwise the results are less representative due to
+    // highly specialized code).
+    require(otherModules[i % otherModules.length]);
   }
-  bench.end(n);
+  bench.end(n * files);
 }