Require Node.js 6

Closes #581
Closes #582

Author: sindresorhus

.editorconfig

@@ -3,6 +3,7 @@ root = true
 [*]
 indent_style = space
 indent_size = 2
+end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true

.gitattributes

@@ -1,2 +1 @@
-* text=auto
-*.js text eol=lf
+* text=auto eol=lf

.gitignore

@@ -1,2 +1,3 @@
 node_modules
+yarn.lock
 coverage

.travis.yml

@@ -1,5 +1,5 @@
-sudo: false
 language: node_js
 node_js:
+  - '10'
+  - '8'
   - '6'
-  - '4'

lib/cli.js

@@ -32,10 +32,10 @@ const cli = gens.map(gen => {
 
   // Add un-camelized options too, for legacy
   // TODO: Remove some time in the future when generators have upgraded
-  Object.keys(opts).forEach(key => {
+  for (const key of Object.keys(opts)) {
     const legacyKey = key.replace(/[A-Z]/g, m => `-${m.toLowerCase()}`);
     opts[legacyKey] = opts[key];
-  });
+  }
 
   return {opts, args};
 });
@@ -201,7 +201,7 @@ if (firstCmd.opts.insight !== false && insight.optOut === undefined) {
 } else {
   if (firstCmd.opts.insight !== false) {
     // Only track the two first subcommands
-    insight.track.apply(insight, firstCmd.args.slice(0, 2));
+    insight.track(...firstCmd.args.slice(0, 2));
   }
 
   updateCheck();

lib/completion/completer.js

@@ -1,6 +1,6 @@
 'use strict';
 const path = require('path');
-const execFile = require('child_process').execFile;
+const {execFile} = require('child_process');
 const parseHelp = require('parse-help');
 
 /**
@@ -43,7 +43,7 @@ class Completer {
    * @param {Function} done   Callback to invoke with completion results
    */
   generator(data, done) {
-    const last = data.last;
+    const {last} = data;
     const bin = path.resolve(__dirname, '../cli.js');
 
     execFile('node', [bin, last, '--help'], (err, out) => {

lib/router.js

@@ -6,7 +6,7 @@ const humanizeString = require('humanize-string');
 const readPkgUp = require('read-pkg-up');
 const updateNotifier = require('update-notifier');
 const Configstore = require('configstore');
-const namespaceToName = require('yeoman-environment').namespaceToName;
+const {namespaceToName} = require('yeoman-environment');
 
 /**
  * The router is in charge of handling `yo` different screens.
@@ -62,7 +62,7 @@ class Router {
         return;
       }
 
-      const pkg = readPkgUp.sync({cwd: path.dirname(generator.resolved)}).pkg;
+      const {pkg} = readPkgUp.sync({cwd: path.dirname(generator.resolved)});
 
       if (!pkg) {
         return;

lib/routes/clear-config.js

@@ -2,7 +2,7 @@
 const _ = require('lodash');
 const chalk = require('chalk');
 const inquirer = require('inquirer');
-const namespaceToName = require('yeoman-environment').namespaceToName;
+const {namespaceToName} = require('yeoman-environment');
 const globalConfig = require('../utils/global-config');
 
 module.exports = app => {
@@ -24,7 +24,7 @@ module.exports = app => {
     const generator = app.generators[name];
 
     if (generator) {
-      prettyName = generator.prettyName;
+      ({prettyName} = generator);
       sort = -app.conf.get('generatorRunCount')[namespaceToName(generator.namespace)] || 0;
     } else {
       prettyName = name.replace(/^generator-/, '') + chalk.red(' (not installed anymore)');

lib/routes/home.js

@@ -3,8 +3,8 @@ const _ = require('lodash');
 const chalk = require('chalk');
 const fullname = require('fullname');
 const inquirer = require('inquirer');
-const isString = require('lodash').isString;
-const namespaceToName = require('yeoman-environment').namespaceToName;
+const {isString} = require('lodash');
+const {namespaceToName} = require('yeoman-environment');
 const globalConfigHasContent = require('../utils/global-config').hasContent;
 
 module.exports = app => {

lib/routes/install.js

@@ -40,7 +40,7 @@ module.exports = app => {
   }]).then(answers => searchNpm(app, answers.searchTerm));
 };
 
-const generatorMatchTerm = (generator, term) => `${generator.name} ${generator.description}`.indexOf(term) !== -1;
+const generatorMatchTerm = (generator, term) => `${generator.name} ${generator.description}`.includes(term);
 const getAllGenerators = _.memoize(() => npmKeyword('yeoman-generator'));
 
 function searchMatchingGenerators(app, term, cb) {
@@ -49,11 +49,11 @@ function searchMatchingGenerators(app, term, cb) {
 
     getAllGenerators().then(allGenerators => {
       cb(null, allGenerators.filter(generator => {
-        if (blacklist.indexOf(generator.name) !== -1) {
+        if (blacklist.includes(generator.name)) {
           return false;
         }
 
-        if (installedGenerators.indexOf(generator.name) !== -1) {
+        if (installedGenerators.includes(generator.name)) {
           return false;
         }
 
@@ -68,7 +68,7 @@ function searchMatchingGenerators(app, term, cb) {
 
 function fetchGeneratorInfo(generator, cb) {
   packageJson(generator.name).then(pkg => {
-    const official = OFFICIAL_GENERATORS.indexOf(pkg.name) !== -1;
+    const official = OFFICIAL_GENERATORS.includes(pkg.name);
     const mustache = official ? chalk.green(` ${figures.mustache} `) : '';
 
     cb(null, {

lib/routes/run.js

@@ -1,6 +1,6 @@
 'use strict';
 const chalk = require('chalk');
-const namespaceToName = require('yeoman-environment').namespaceToName;
+const {namespaceToName} = require('yeoman-environment');
 
 module.exports = (app, name) => {
   const baseName = namespaceToName(name);

package.json

@@ -12,7 +12,7 @@
     "yo-complete": "lib/completion/index.js"
   },
   "engines": {
-    "node": ">=4"
+    "node": ">=6"
   },
   "scripts": {
     "test": "xo && gulp",
@@ -86,7 +86,7 @@
     "proxyquire": "^1.0.1",
     "registry-url": "^3.0.0",
     "sinon": "^1.12.1",
-    "xo": "^0.18.1"
+    "xo": "^0.21.1"
   },
   "tabtab": {
     "yo": [

test/cli.js

@@ -1,7 +1,7 @@
 'use strict';
 const path = require('path');
 const assert = require('assert');
-const execFile = require('child_process').execFile;
+const {execFile} = require('child_process');
 const mockery = require('mockery');
 const pkg = require('../package.json');
 

test/completion.js

@@ -2,8 +2,8 @@
 const path = require('path');
 const assert = require('assert');
 const events = require('events');
-const execFile = require('child_process').execFile;
-const find = require('lodash').find;
+const {execFile} = require('child_process');
+const {find} = require('lodash');
 const Completer = require('../lib/completion/completer');
 const completion = require('../lib/completion');
 

test/route-clear-config.js

@@ -98,7 +98,7 @@ describe('clear config route', () => {
     let choices = [];
 
     this.sandbox.stub(inquirer, 'prompt', arg => {
-      choices = arg[0].choices;
+      ({choices} = arg[0]);
       return Promise.resolve({whatNext: 'foo'});
     });
     return this.router.navigate('clearConfig').then(() => {

test/route-home.js

@@ -51,7 +51,7 @@ describe('home route', () => {
   it('does not display update options if no generators is installed', function () {
     this.router.generator = [];
     this.sandbox.stub(inquirer, 'prompt', prompts => {
-      assert.equal(_.map(prompts[0].choices, 'value').indexOf('update'), -1);
+      assert.equal(_.map(prompts[0].choices, 'value').includes('update'), false);
       return Promise.resolve({whatNext: 'exit'});
     });
 
@@ -67,7 +67,7 @@ describe('home route', () => {
     }];
 
     this.sandbox.stub(inquirer, 'prompt', prompts => {
-      assert(_.map(prompts[0].choices, 'value').indexOf('update') >= 0);
+      assert(_.map(prompts[0].choices, 'value').includes('update'));
       return Promise.resolve({whatNext: 'update'});
     });
 
@@ -108,7 +108,7 @@ describe('home route', () => {
     }];
 
     this.sandbox.stub(inquirer, 'prompt', prompts => {
-      assert(prompts[0].choices[1].name.indexOf('♥ Update Available!') >= 0);
+      assert(prompts[0].choices[1].name.includes('♥ Update Available!'));
       return Promise.resolve({whatNext: 'exit'});
     });
 

test/route-install.js

@@ -79,12 +79,12 @@ describe('install route', () => {
 
       nock(registryUrl)
         .get('/-/v1/search')
-          .query(true)
-          .reply(200, {objects: this.packages.map(data => ({package: data}))})
+        .query(true)
+        .reply(200, {objects: this.packages.map(data => ({package: data}))})
         .filteringPath(/\/[^?]+$/g, '/pkg')
-          .get('/pkg')
-          .times(4)
-          .reply(200, this.pkgData);
+        .get('/pkg')
+        .times(4)
+        .reply(200, this.pkgData);
 
       nock('http://yeoman.io')
         .get('/blacklist.json')
@@ -104,7 +104,7 @@ describe('install route', () => {
           return Promise.resolve({searchTerm: 'unicorn'});
         }
         if (call === 2) {
-          const choices = arg[0].choices;
+          const {choices} = arg[0];
           assert.equal(_.filter(choices, {value: 'generator-foo'}).length, 1);
           assert.equal(_.filter(choices, {value: 'generator-unicorn-1'}).length, 1);
           assert.equal(_.filter(choices, {value: 'generator-unicorn'}).length, 0);
@@ -126,7 +126,7 @@ describe('install route', () => {
           return Promise.resolve({searchTerm: 'blacklist'});
         }
         if (call === 2) {
-          const choices = arg[0].choices;
+          const {choices} = arg[0];
           assert.equal(_.filter(choices, {value: 'generator-blacklist-1'}).length, 0);
           assert.equal(_.filter(choices, {value: 'generator-blacklist-2'}).length, 0);
           assert.equal(_.filter(choices, {value: 'generator-blacklist-3'}).length, 1);
@@ -233,7 +233,7 @@ describe('install route', () => {
         }
 
         if (call === 2) {
-          const choices = arg[0].choices;
+          const {choices} = arg[0];
           assert.deepEqual(_.map(choices, 'value'), ['install', 'home']);
           done();
         }