Chore: upgrade eslint and eslint-config

.eslintrc.json

@@ -1,12 +1,9 @@
 {
     "root": true,
-    "extends": ["mysticatea/base", "mysticatea/node"],
-    "parserOptions": {
-        "ecmaVersion": 6
-    },
+    "extends": ["mysticatea", "mysticatea/node"],
     "rules": {
-        "node/no-unsupported-features": "off",
-        "no-restricted-syntax": ["error", "ForOfStatement"]
+        "prefer-rest-params": "off",
+        "prefer-spread": "off"
     },
     "settings": {
         "node": {

package.json

@@ -13,7 +13,7 @@
     "lib"
   ],
   "engines": {
-    "node": ">= 0.10",
+    "node": ">= 4",
     "npm": ">= 2"
   },
   "scripts": {
@@ -42,15 +42,15 @@
     "string.prototype.padend": "^3.0.0"
   },
   "devDependencies": {
-    "@types/node": "^6.0.51",
+    "@types/node": "^4.0.30",
     "babel-cli": "^6.4.0",
     "babel-core": "^6.4.0",
     "babel-plugin-espower": "^2.0.0",
     "babel-preset-es2015": "^6.3.13",
     "babel-register": "^6.4.3",
     "coveralls": "^2.11.4",
-    "eslint": "^2.13.1",
-    "eslint-config-mysticatea": "^4.0.0",
+    "eslint": "^3.12.2",
+    "eslint-config-mysticatea": "^7.0.1",
     "jsdoc": "^3.4.0",
     "mocha": "^2.3.4",
     "nyc": "^7.1.0",

scripts/make-slink.js

@@ -3,20 +3,20 @@
  * @copyright 2016 Toru Nagashima. All rights reserved.
  * See LICENSE file in root directory for full license.
  */
-"use strict";
+"use strict"
 
-var fs = require("fs");
-var path = require("path");
+const fs = require("fs")
+const path = require("path")
 
 try {
     fs.symlinkSync(
         path.resolve(__dirname, "../test/lib"),
         path.resolve(__dirname, "../test-workspace/tasks/lib"),
         "junction"
-    );
+    )
 }
 catch (err) {
     if (err.code !== "EEXIST") {
-        throw err;
+        throw err
     }
 }

src/bin/common/bootstrap.js

@@ -8,7 +8,7 @@
 //------------------------------------------------------------------------------
 // Public Interface
 //------------------------------------------------------------------------------
-/*eslint-disable no-console, no-process-exit */
+/*eslint-disable no-process-exit */
 
 module.exports = function bootstrap(name) {
     const argv = process.argv.slice(2)

src/bin/common/parse-cli-args.js

@@ -5,7 +5,7 @@
  */
 "use strict"
 
-/*eslint no-process-env: "off"*/
+/*eslint-disable no-process-env */
 
 //------------------------------------------------------------------------------
 // Requirements
@@ -32,7 +32,7 @@ const CONCAT_OPTIONS = /^-[clnprs]+$/
  * @returns {void}
  */
 function overwriteConfig(config, packageName, variable, value) {
-    const scope = config[packageName] || (config[packageName] = {}) // eslint-disable-line no-param-reassign
+    const scope = config[packageName] || (config[packageName] = {})
     scope[variable] = value
 }
 
@@ -82,15 +82,15 @@ class ArgumentSet {
      * @param {object} initialValues - A key-value map for the default of new value.
      * @param {object} options - A key-value map for the options.
      */
-    constructor(initialValues = {}, options = {}) {
+    constructor(initialValues, options) {
         this.continueOnError = false
         this.groups = []
         this.printLabel = false
         this.printName = false
         this.race = false
         this.rest = []
         this.silent = process.env.npm_config_loglevel === "silent"
-        this.singleMode = Boolean(options.singleMode)
+        this.singleMode = Boolean(options && options.singleMode)
         this.packageConfig = createPackageConfig()
         this.config = {}
 
@@ -231,3 +231,5 @@ function parseCLIArgsCore(set, args) {    // eslint-disable-line complexity
 module.exports = function parseCLIArgs(args, initialValues, options) {
     return parseCLIArgsCore(new ArgumentSet(initialValues, options), args)
 }
+
+/*eslint-enable */

src/bin/common/version.js

@@ -10,7 +10,7 @@
 //------------------------------------------------------------------------------
 
 const Promise = require("pinkie-promise")
-const {sync: readPkgUp} = require("read-pkg-up")
+const readPkgUp = require("read-pkg-up").sync
 
 //------------------------------------------------------------------------------
 // Public Interface

src/bin/npm-run-all/main.js

@@ -29,45 +29,35 @@ const parseCLIArgs = require("../common/parse-cli-args")
 module.exports = function npmRunAll(args, stdout, stderr) {
     try {
         const stdin = process.stdin
-        const {
-            continueOnError,
-            groups,
-            config,
-            packageConfig,
-            printLabel,
-            printName,
-            silent,
-            race,
-            rest,
-        } = parseCLIArgs(args)
+        const argv = parseCLIArgs(args)
 
-        const promise = groups.reduce(
-            (prev, {patterns, parallel}) => {
-                if (patterns.length === 0) {
+        const promise = argv.groups.reduce(
+            (prev, group) => {
+                if (group.patterns.length === 0) {
                     return prev
                 }
                 return prev.then(() => runAll(
-                    patterns,
+                    group.patterns,
                     {
                         stdout,
                         stderr,
                         stdin,
-                        parallel,
-                        continueOnError,
-                        printLabel,
-                        printName,
-                        config,
-                        packageConfig,
-                        silent,
-                        arguments: rest,
-                        race,
+                        parallel: group.parallel,
+                        continueOnError: argv.continueOnError,
+                        printLabel: argv.printLabel,
+                        printName: argv.printName,
+                        config: argv.config,
+                        packageConfig: argv.packageConfig,
+                        silent: argv.silent,
+                        arguments: argv.rest,
+                        race: argv.race,
                     }
                 ))
             },
             Promise.resolve(null)
         )
 
-        if (!silent) {
+        if (!argv.silent) {
             promise.catch(err => {
                 //eslint-disable-next-line no-console
                 console.error("ERROR:", err.message)

src/bin/run-p/main.js

@@ -29,41 +29,32 @@ const parseCLIArgs = require("../common/parse-cli-args")
 module.exports = function npmRunAll(args, stdout, stderr) {
     try {
         const stdin = process.stdin
-        const {
-            lastGroup: {patterns, parallel},
-            continueOnError,
-            config,
-            packageConfig,
-            printLabel,
-            printName,
-            silent,
-            race,
-            rest,
-        } = parseCLIArgs(args, {parallel: true}, {singleMode: true})
+        const argv = parseCLIArgs(args, {parallel: true}, {singleMode: true})
+        const group = argv.lastGroup
 
-        if (patterns.length === 0) {
+        if (group.patterns.length === 0) {
             return Promise.resolve(null)
         }
 
         const promise = runAll(
-            patterns,
+            group.patterns,
             {
                 stdout,
                 stderr,
                 stdin,
-                parallel,
-                continueOnError,
-                printLabel,
-                printName,
-                config,
-                packageConfig,
-                silent,
-                arguments: rest,
-                race,
+                parallel: group.parallel,
+                continueOnError: argv.continueOnError,
+                printLabel: argv.printLabel,
+                printName: argv.printName,
+                config: argv.config,
+                packageConfig: argv.packageConfig,
+                silent: argv.silent,
+                arguments: argv.rest,
+                race: argv.race,
             }
         )
 
-        if (!silent) {
+        if (!argv.silent) {
             promise.catch(err => {
                 //eslint-disable-next-line no-console
                 console.error("ERROR:", err.message)

src/bin/run-s/main.js

@@ -29,39 +29,31 @@ const parseCLIArgs = require("../common/parse-cli-args")
 module.exports = function npmRunAll(args, stdout, stderr) {
     try {
         const stdin = process.stdin
-        const {
-            lastGroup: {patterns, parallel},
-            continueOnError,
-            config,
-            packageConfig,
-            printLabel,
-            printName,
-            silent,
-            rest,
-        } = parseCLIArgs(args, {parallel: false}, {singleMode: true})
+        const argv = parseCLIArgs(args, {parallel: false}, {singleMode: true})
+        const group = argv.lastGroup
 
-        if (patterns.length === 0) {
+        if (group.patterns.length === 0) {
             return Promise.resolve(null)
         }
 
         const promise = runAll(
-            patterns,
+            group.patterns,
             {
                 stdout,
                 stderr,
                 stdin,
-                parallel,
-                continueOnError,
-                printLabel,
-                printName,
-                config,
-                packageConfig,
-                silent,
-                arguments: rest,
+                parallel: group.parallel,
+                continueOnError: argv.continueOnError,
+                printLabel: argv.printLabel,
+                printName: argv.printName,
+                config: argv.config,
+                packageConfig: argv.packageConfig,
+                silent: argv.silent,
+                arguments: argv.rest,
             }
         )
 
-        if (!silent) {
+        if (!argv.silent) {
             promise.catch(err => {
                 //eslint-disable-next-line no-console
                 console.error("ERROR:", err.message)

src/lib/create-header.js

@@ -34,16 +34,10 @@ module.exports = function createHeader(nameAndArgs, packageInfo, isTTY) {
     const index = nameAndArgs.indexOf(" ")
     const name = (index === -1) ? nameAndArgs : nameAndArgs.slice(0, index)
     const args = (index === -1) ? "" : nameAndArgs.slice(index + 1)
-    const {
-        body: {
-            name: packageName,
-            version: packageVersion,
-            scripts: {
-                [name]: scriptBody,
-            },
-        },
-        path: packagePath,
-    } = packageInfo || {}
+    const packageName = packageInfo.body.name
+    const packageVersion = packageInfo.body.version
+    const scriptBody = packageInfo.body.scripts[name]
+    const packagePath = packageInfo.path
     const color = isTTY ? chalk.styles.gray : {open: "", close: ""}
 
     return `

src/lib/create-prefix-transform-stream.js

@@ -10,7 +10,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const {Transform} = require("stream")
+const stream = require("stream")
 
 //------------------------------------------------------------------------------
 // Helpers
@@ -27,7 +27,7 @@ const ALL_BR = /\n/g
  *
  * @private
  */
-class PrefixTransform extends Transform {
+class PrefixTransform extends stream.Transform {
     /**
      * @param {string} prefix - A prefix text to be inserted.
      * @param {object} state - A state object.