concurrently 5.3.0 → 6.0.0

package/README.md

@@ -10,11 +10,13 @@ Like `npm run watch-js & npm run watch-less` but better.
 ![](docs/demo.gif)
 
 **Table of contents**
-- [Why](#why)
-- [Install](#install)
-- [Usage](#usage)
-- [Programmatic Usage](#programmatic-usage)
-- [FAQ](#faq)
+- [Concurrently](#concurrently)
+  - [Why](#why)
+  - [Install](#install)
+  - [Usage](#usage)
+  - [Programmatic Usage](#programmatic-usage)
+    - [`concurrently(commands[, options])`](#concurrentlycommands-options)
+  - [FAQ](#faq)
 
 ## Why
 
@@ -140,7 +142,8 @@ Prefix styling
                           - Available modifiers: reset, bold, dim, italic,
                           underline, inverse, hidden, strikethrough
                           - Available colors: black, red, green, yellow, blue,
-                          magenta, cyan, white, gray
+                          magenta, cyan, white, gray, or any hex values for
+                          colors, eg #23de43
                           - Available background colors: bgBlack, bgRed,
                           bgGreen, bgYellow, bgBlue, bgMagenta, bgCyan, bgWhite
                           See https://www.npmjs.com/package/chalk for more
@@ -225,8 +228,10 @@ concurrently can be used programmatically by using the API documented below:
 
 ### `concurrently(commands[, options])`
 - `commands`: an array of either strings (containing the commands to run) or objects
-  with the shape `{ command, name, prefixColor, env }`.
+  with the shape `{ command, name, prefixColor, env, cwd }`.
 - `options` (optional): an object containing any of the below:
+    - `cwd`: the working directory to be used by all commands. Can be overriden per command.
+    Default: `process.cwd()`.
     - `defaultInputTarget`: the default input target when reading from `inputStream`.
     Default: `0`.
     - `inputStream`: a [`Readable` stream](https://nodejs.org/dist/latest-v10.x/docs/api/stream.html#stream_readable_streams)
@@ -263,11 +268,13 @@ const concurrently = require('concurrently');
 concurrently([
     'npm:watch-*',
     { command: 'nodemon', name: 'server' },
-    { command: 'deploy', name: 'deploy', env: { PUBLIC_KEY: '...' } }
+    { command: 'deploy', name: 'deploy', env: { PUBLIC_KEY: '...' } },
+    { command: 'watch', name: 'watch', cwd: path.resolve(__dirname, 'scripts/watchers')}
 ], {
     prefix: 'name',
     killOthers: ['failure', 'success'],
     restartTries: 3,
+    cwd: path.resolve(__dirname, 'scripts'),
 }).then(success, failure);
 ```
 

package/bin/concurrently.js

@@ -83,7 +83,8 @@ const args = yargs
                 'Comma-separated list of chalk colors to use on prefixes. ' +
                 'If there are more commands than colors, the last color will be repeated.\n' +
                 '- Available modifiers: reset, bold, dim, italic, underline, inverse, hidden, strikethrough\n' +
-                '- Available colors: black, red, green, yellow, blue, magenta, cyan, white, gray\n' +
+                '- Available colors: black, red, green, yellow, blue, magenta, cyan, white, gray \n' +
+                'or any hex values for colors, eg #23de43\n' +
                 '- Available background colors: bgBlack, bgRed, bgGreen, bgYellow, bgBlue, bgMagenta, bgCyan, bgWhite\n' +
                 'See https://www.npmjs.com/package/chalk for more information.',
             default: defaults.prefixColors,

package/index.js

@@ -22,6 +22,7 @@ module.exports = (commands, options = {}) => {
         maxProcesses: options.maxProcesses,
         raw: options.raw,
         successCondition: options.successCondition,
+        cwd: options.cwd,
         controllers: [
             new LogError({ logger }),
             new LogOutput({ logger }),

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "concurrently",
-  "version": "5.3.0",
+  "version": "6.0.0",
   "description": "Run commands concurrently",
   "main": "index.js",
   "bin": {
     "concurrently": "./bin/concurrently.js"
   },
   "engines": {
-    "node": ">=6.0.0"
+    "node": ">=10.0.0"
   },
   "scripts": {
     "lint": "eslint . --ignore-path .gitignore",
@@ -29,20 +29,20 @@
   "author": "Kimmo Brunfeldt",
   "license": "MIT",
   "dependencies": {
-    "chalk": "^2.4.2",
-    "date-fns": "^2.0.1",
-    "lodash": "^4.17.15",
-    "read-pkg": "^4.0.1",
-    "rxjs": "^6.5.2",
+    "chalk": "^4.1.0",
+    "date-fns": "^2.16.1",
+    "lodash": "^4.17.20",
+    "read-pkg": "^5.2.0",
+    "rxjs": "^6.6.3",
     "spawn-command": "^0.0.2-1",
-    "supports-color": "^6.1.0",
+    "supports-color": "^8.1.0",
     "tree-kill": "^1.2.2",
-    "yargs": "^13.3.0"
+    "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "coveralls": "^3.0.4",
-    "eslint": "^5.16.0",
-    "jest": "^24.8.0",
+    "coveralls": "^3.1.0",
+    "eslint": "^7.17.0",
+    "jest": "^26.6.3",
     "jest-create-mock-instance": "^1.1.0"
   },
   "files": [

package/src/concurrently.js

@@ -16,7 +16,8 @@ const defaults = {
     spawn,
     kill: treeKill,
     raw: false,
-    controllers: []
+    controllers: [],
+    cwd: undefined,
 };
 
 module.exports = (commands, options) => {
@@ -37,7 +38,11 @@ module.exports = (commands, options) => {
         .map((command, index) => new Command(
             Object.assign({
                 index,
-                spawnOpts: getSpawnOpts({ raw: options.raw, env: command.env }),
+                spawnOpts: getSpawnOpts({
+                    raw: options.raw,
+                    env: command.env,
+                    cwd: command.cwd || options.cwd,
+                }),
                 killProcess: options.kill,
                 spawn: options.spawn,
             }, command)

package/src/defaults.js

@@ -25,5 +25,7 @@ module.exports = {
     // Condition of success for concurrently itself.
     success: 'all',
     // Refer to https://date-fns.org/v2.0.1/docs/format
-    timestampFormat: 'yyyy-MM-dd HH:mm:ss.SSS'
+    timestampFormat: 'yyyy-MM-dd HH:mm:ss.SSS',
+    // Current working dir passed as option to spawn command. Default: process.cwd()
+    cwd: undefined
 };

package/src/get-spawn-opts.js

@@ -2,11 +2,14 @@ const supportsColor = require('supports-color');
 
 module.exports = ({
     colorSupport = supportsColor.stdout,
+    cwd,
     process = global.process,
     raw = false,
-    env = {}
+    env = {},
 }) => Object.assign(
-    {},
+    {
+        cwd: cwd || process.cwd(),
+    },
     raw && { stdio: 'inherit' },
     /^win/.test(process.platform) && { detached: false },
     { env: Object.assign(colorSupport ? { FORCE_COLOR: colorSupport.level } : {}, process.env, env) }

package/src/logger.js

@@ -57,7 +57,12 @@ module.exports = class Logger {
     }
 
     colorText(command, text) {
-        const color = _.get(chalk, command.prefixColor, chalk.gray.dim);
+        let color;
+        if (command.prefixColor && command.prefixColor.startsWith('#')) {
+            color = chalk.hex(command.prefixColor);
+        } else {
+            color = _.get(chalk, command.prefixColor, chalk.gray.dim);
+        }
         return color(text);
     }