concurrently 10.0.4 → 10.0.6

package/README.md

@@ -103,7 +103,7 @@ Check out documentation and other usage examples in the [`docs` directory](./doc
   - `handleInput`: when `true`, reads input from `process.stdin`.
   - `inputStream`: a [`Readable` stream](https://nodejs.org/docs/latest/api/stream.html#readable-streams)
     to read the input from. Should only be used in the rare instance you would like to stream anything other than `process.stdin`. Overrides `handleInput`.
-  - `pauseInputStreamOnFinish`: by default, pauses the input stream (`process.stdin` when `handleInput` is enabled, or `inputStream` if provided) when all of the processes have finished. If you need to read from the input stream after `concurrently` has finished, set this to `false`. ([#252](https://github.com/kimmobrunfeldt/concurrently/issues/252)).
+  - `pauseInputStreamOnFinish`: by default, pauses the input stream (`process.stdin` when `handleInput` is enabled, or `inputStream` if provided) when all of the processes have finished. If you need to read from the input stream after `concurrently` has finished, set this to `false`. ([#252](https://github.com/open-cli-tools/concurrently/issues/252)).
   - `killOthersOn`: once the first command exits with one of these statuses, kill other commands.
     Can be an array containing the strings `success` (status code zero) and/or `failure` (non-zero exit status).
   - `maxProcesses`: how many processes should run at once.
@@ -139,7 +139,9 @@ Check out documentation and other usage examples in the [`docs` directory](./doc
 Example:
 
 ```js
-const concurrently = require('concurrently');
+import path from 'node:path';
+import { concurrently } from 'concurrently';
+
 const { result } = concurrently(
   [
     'npm:watch-*',
@@ -148,14 +150,14 @@ const { result } = concurrently(
     {
       command: 'watch',
       name: 'watch',
-      cwd: path.resolve(__dirname, 'scripts/watchers'),
+      cwd: path.resolve(import.meta.dirname, 'scripts/watchers'),
     },
   ],
   {
     prefix: 'name',
     killOthersOn: ['failure', 'success'],
     restartTries: 3,
-    cwd: path.resolve(__dirname, 'scripts'),
+    cwd: path.resolve(import.meta.dirname, 'scripts'),
   },
 );
 result.then(success, failure);

package/dist/bin/console-codepage.d.ts

@@ -0,0 +1,13 @@
+import { spawnSync as baseSpawnSync } from 'node:child_process';
+export type SpawnSync = typeof baseSpawnSync;
+/**
+ * On Windows, concurrently pipes child-process output through a freshly-allocated console whose
+ * codepage may not be UTF-8, garbling non-ASCII output from commands that rely on it (see
+ * open-cli-tools/concurrently#302). This sets the console's codepage to UTF-8 once, which spawned
+ * children then inherit, and returns a function that restores the original codepage.
+ *
+ * No-ops (and never throws) if not on Windows, if the codepage is already UTF-8, or if reading/setting
+ * it fails for any reason -- this is a best-effort convenience, never something that should block
+ * concurrently from running.
+ */
+export declare function ensureUtf8Codepage(spawnSync?: SpawnSync, process?: Pick<NodeJS.Process, 'platform'>): () => void;

package/dist/bin/console-codepage.js

@@ -0,0 +1,61 @@
+import { spawnSync as baseSpawnSync } from 'node:child_process';
+import nodeProcess from 'node:process';
+const UTF8_CODEPAGE = 65001;
+/**
+ * On Windows, concurrently pipes child-process output through a freshly-allocated console whose
+ * codepage may not be UTF-8, garbling non-ASCII output from commands that rely on it (see
+ * open-cli-tools/concurrently#302). This sets the console's codepage to UTF-8 once, which spawned
+ * children then inherit, and returns a function that restores the original codepage.
+ *
+ * No-ops (and never throws) if not on Windows, if the codepage is already UTF-8, or if reading/setting
+ * it fails for any reason -- this is a best-effort convenience, never something that should block
+ * concurrently from running.
+ */
+export function ensureUtf8Codepage(spawnSync = baseSpawnSync, process = nodeProcess) {
+    const noop = () => { };
+    if (process.platform !== 'win32') {
+        return noop;
+    }
+    try {
+        const original = readCodepage(spawnSync);
+        if (original == null || original === UTF8_CODEPAGE) {
+            return noop;
+        }
+        if (!setCodepage(spawnSync, UTF8_CODEPAGE)) {
+            return noop;
+        }
+        let restored = false;
+        return () => {
+            if (restored) {
+                return;
+            }
+            restored = true;
+            try {
+                setCodepage(spawnSync, original);
+            }
+            catch {
+                // Best-effort restore; nothing more we can do.
+            }
+        };
+    }
+    catch {
+        return noop;
+    }
+}
+function readCodepage(spawnSync) {
+    const result = spawnSync('cmd.exe', ['/s', '/c', 'chcp'], { encoding: 'utf8' });
+    if (result.error || result.status !== 0 || !result.stdout) {
+        return null;
+    }
+    // Locale-dependent text (e.g. "Active code page: 65001." or "Aktive Codepage: 65001."),
+    // so match on the number rather than the surrounding words.
+    const match = /(\d+)/.exec(result.stdout);
+    return match ? Number(match[1]) : null;
+}
+function setCodepage(spawnSync, codepage) {
+    // `chcp` changes the codepage of the console this process is attached to regardless of where its
+    // own stdio points, so output can be safely discarded here rather than inherited -- otherwise its
+    // confirmation text (e.g. "Active code page: 65001.") would leak into concurrently's own output.
+    const result = spawnSync('cmd.exe', ['/s', '/c', `chcp ${codepage}`], { stdio: 'ignore' });
+    return !result.error && result.status === 0;
+}

package/dist/bin/index.js

@@ -5,6 +5,7 @@ import { hideBin } from 'yargs/helpers';
 import * as defaults from '../lib/defaults.js';
 import { concurrently } from '../lib/index.js';
 import { castArray, splitOutsideParens } from '../lib/utils.js';
+import { ensureUtf8Codepage } from './console-codepage.js';
 import { normalizeCliCommand } from './normalize-cli-command.js';
 import { readPackageJson } from './read-package-json.js';
 const version = String(readPackageJson().version);
@@ -197,33 +198,47 @@ if (!commands.length) {
     program.showHelp();
     process.exit();
 }
-concurrently(commands.map((command, index) => ({
-    command: normalizeCliCommand(String(command)),
-    name: names[index],
-})), {
-    handleInput: args.handleInput,
-    defaultInputTarget: args.defaultInputTarget,
-    killOthersOn: args.killOthers
-        ? ['success', 'failure']
-        : args.killOthersOnFail
-            ? ['failure']
-            : [],
-    killSignal: args.killSignal,
-    killTimeout: args.killTimeout,
-    maxProcesses: args.maxProcesses,
-    raw: args.raw,
-    hide: args.hide.split(','),
-    group: args.group,
-    prefix: args.prefix,
-    prefixColors: splitOutsideParens(args.prefixColors, ','),
-    prefixLength: args.prefixLength,
-    padPrefix: args.padPrefix,
-    restartDelay: args.restartAfter === 'exponential' ? 'exponential' : Number(args.restartAfter),
-    restartTries: args.restartTries,
-    successCondition: args.success,
-    timestampFormat: args.timestampFormat,
-    timings: args.timings,
-    shell: args.shell,
-    teardown: args.teardown,
-    additionalArguments: args.passthroughArguments ? additionalArguments : undefined,
-}).result.then(() => process.exit(0), () => process.exit(1));
+// Piped output on Windows uses the console's active codepage, which may not be UTF-8 -- see
+// open-cli-tools/concurrently#302. Raw mode inherits the real console directly instead of piping
+// through concurrently, so it isn't affected and doesn't need this.
+const restoreCodepage = args.raw ? () => { } : ensureUtf8Codepage();
+const exitProcess = (code) => {
+    restoreCodepage();
+    process.exit(code);
+};
+try {
+    concurrently(commands.map((command, index) => ({
+        command: normalizeCliCommand(String(command)),
+        name: names[index],
+    })), {
+        handleInput: args.handleInput,
+        defaultInputTarget: args.defaultInputTarget,
+        killOthersOn: args.killOthers
+            ? ['success', 'failure']
+            : args.killOthersOnFail
+                ? ['failure']
+                : [],
+        killSignal: args.killSignal,
+        killTimeout: args.killTimeout,
+        maxProcesses: args.maxProcesses,
+        raw: args.raw,
+        hide: args.hide.split(','),
+        group: args.group,
+        prefix: args.prefix,
+        prefixColors: splitOutsideParens(args.prefixColors, ','),
+        prefixLength: args.prefixLength,
+        padPrefix: args.padPrefix,
+        restartDelay: args.restartAfter === 'exponential' ? 'exponential' : Number(args.restartAfter),
+        restartTries: args.restartTries,
+        successCondition: args.success,
+        timestampFormat: args.timestampFormat,
+        timings: args.timings,
+        shell: args.shell,
+        teardown: args.teardown,
+        additionalArguments: args.passthroughArguments ? additionalArguments : undefined,
+    }).result.then(() => exitProcess(0), () => exitProcess(1));
+}
+catch (error) {
+    restoreCodepage();
+    throw error;
+}

package/dist/lib/command-parser/expand-wildcard.js

@@ -28,8 +28,14 @@ export class ExpandWildcard {
     }
     static readPackage() {
         try {
-            const json = fs.readFileSync('package.json', { encoding: 'utf-8' });
-            return JSON.parse(json);
+            let json = '{}';
+            if (fs.existsSync('package.json')) {
+                json = fs.readFileSync('package.json', { encoding: 'utf-8' });
+            }
+            else if (fs.existsSync('package.json5')) {
+                json = fs.readFileSync('package.json5', { encoding: 'utf-8' });
+            }
+            return JSONC.parse(json);
         }
         catch {
             return {};

package/dist/lib/flow-control/kill-others.js

@@ -41,7 +41,7 @@ export class KillOthers {
         }
         setTimeout(() => {
             const killableCommands = commands.filter((command) => Command.canKill(command));
-            if (killableCommands) {
+            if (killableCommands.length) {
                 this.logger.logGlobalEvent(`Sending SIGKILL to ${killableCommands.length} processes..`);
                 killableCommands.forEach((command) => command.kill('SIGKILL'));
             }

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../bin/index.spec.ts","../bin/index.ts","../bin/normalize-cli-command.spec.ts","../bin/normalize-cli-command.ts","../bin/read-package-json.ts","../lib/assert.spec.ts","../lib/assert.ts","../lib/command.spec.ts","../lib/command.ts","../lib/completion-listener.spec.ts","../lib/completion-listener.ts","../lib/concurrently.spec.ts","../lib/concurrently.ts","../lib/date-format.spec.ts","../lib/date-format.ts","../lib/defaults.ts","../lib/index.ts","../lib/jsonc.spec.ts","../lib/jsonc.ts","../lib/logger.spec.ts","../lib/logger.ts","../lib/observables.spec.ts","../lib/observables.ts","../lib/output-writer.spec.ts","../lib/output-writer.ts","../lib/prefix-color-selector.spec.ts","../lib/prefix-color-selector.ts","../lib/spawn.spec.ts","../lib/spawn.ts","../lib/utils.spec.ts","../lib/utils.ts","../lib/__fixtures__/create-mock-instance.ts","../lib/__fixtures__/fake-command.ts","../lib/command-parser/command-parser.d.ts","../lib/command-parser/expand-arguments.spec.ts","../lib/command-parser/expand-arguments.ts","../lib/command-parser/expand-shortcut.spec.ts","../lib/command-parser/expand-shortcut.ts","../lib/command-parser/expand-wildcard.spec.ts","../lib/command-parser/expand-wildcard.ts","../lib/declarations/intl.d.ts","../lib/flow-control/flow-controller.ts","../lib/flow-control/input-handler.spec.ts","../lib/flow-control/input-handler.ts","../lib/flow-control/kill-on-signal.spec.ts","../lib/flow-control/kill-on-signal.ts","../lib/flow-control/kill-others.spec.ts","../lib/flow-control/kill-others.ts","../lib/flow-control/log-error.spec.ts","../lib/flow-control/log-error.ts","../lib/flow-control/log-exit.spec.ts","../lib/flow-control/log-exit.ts","../lib/flow-control/log-output.spec.ts","../lib/flow-control/log-output.ts","../lib/flow-control/log-timings.spec.ts","../lib/flow-control/log-timings.ts","../lib/flow-control/logger-padding.spec.ts","../lib/flow-control/logger-padding.ts","../lib/flow-control/output-error-handler.spec.ts","../lib/flow-control/output-error-handler.ts","../lib/flow-control/restart-process.spec.ts","../lib/flow-control/restart-process.ts","../lib/flow-control/teardown.spec.ts","../lib/flow-control/teardown.ts"],"version":"5.9.3"}
+{"root":["../bin/console-codepage.spec.ts","../bin/console-codepage.ts","../bin/index.spec.ts","../bin/index.ts","../bin/normalize-cli-command.spec.ts","../bin/normalize-cli-command.ts","../bin/read-package-json.ts","../lib/assert.spec.ts","../lib/assert.ts","../lib/command.spec.ts","../lib/command.ts","../lib/completion-listener.spec.ts","../lib/completion-listener.ts","../lib/concurrently.spec.ts","../lib/concurrently.ts","../lib/date-format.spec.ts","../lib/date-format.ts","../lib/defaults.ts","../lib/index.ts","../lib/jsonc.spec.ts","../lib/jsonc.ts","../lib/logger.spec.ts","../lib/logger.ts","../lib/observables.spec.ts","../lib/observables.ts","../lib/output-writer.spec.ts","../lib/output-writer.ts","../lib/prefix-color-selector.spec.ts","../lib/prefix-color-selector.ts","../lib/spawn.spec.ts","../lib/spawn.ts","../lib/utils.spec.ts","../lib/utils.ts","../lib/__fixtures__/create-mock-instance.ts","../lib/__fixtures__/fake-command.ts","../lib/command-parser/command-parser.d.ts","../lib/command-parser/expand-arguments.spec.ts","../lib/command-parser/expand-arguments.ts","../lib/command-parser/expand-shortcut.spec.ts","../lib/command-parser/expand-shortcut.ts","../lib/command-parser/expand-wildcard.spec.ts","../lib/command-parser/expand-wildcard.ts","../lib/declarations/intl.d.ts","../lib/flow-control/flow-controller.ts","../lib/flow-control/input-handler.spec.ts","../lib/flow-control/input-handler.ts","../lib/flow-control/kill-on-signal.spec.ts","../lib/flow-control/kill-on-signal.ts","../lib/flow-control/kill-others.spec.ts","../lib/flow-control/kill-others.ts","../lib/flow-control/log-error.spec.ts","../lib/flow-control/log-error.ts","../lib/flow-control/log-exit.spec.ts","../lib/flow-control/log-exit.ts","../lib/flow-control/log-output.spec.ts","../lib/flow-control/log-output.ts","../lib/flow-control/log-timings.spec.ts","../lib/flow-control/log-timings.ts","../lib/flow-control/logger-padding.spec.ts","../lib/flow-control/logger-padding.ts","../lib/flow-control/output-error-handler.spec.ts","../lib/flow-control/output-error-handler.ts","../lib/flow-control/restart-process.spec.ts","../lib/flow-control/restart-process.ts","../lib/flow-control/teardown.spec.ts","../lib/flow-control/teardown.ts"],"version":"5.9.3"}

package/docs/cli/prefixing.md

@@ -77,6 +77,7 @@ $ concurrently -c red,blue 'echo Hello there' 'echo General Kenobi!'
 - `red`
 - `white`
 - `yellow`
+
 </details>
 
 Colors can take modifiers too. Several can be applied at once by appending `.<modifier 1>.<modifier 2>` and so on.
@@ -96,6 +97,7 @@ $ concurrently -c '#23de43.inverse,bold.blue.dim' 'echo Hello there' 'echo Gener
 - `italic`
 - `strikethrough`
 - `underline`
+
 </details>
 
 A background color can be set in a similarly fashion.
@@ -116,6 +118,7 @@ $ concurrently -c bgGray,red.bgBlack 'echo Hello there' 'echo General Kenobi!'
 - `bgRed`
 - `bgWhite`
 - `bgYellow`
+
 </details>
 
 ### Advanced Color Functions

package/docs/cli/shortcuts.md

@@ -1,6 +1,6 @@
 # Command Shortcuts
 
-Package managers that execute scripts from a `package.json` or `deno.(json|jsonc)` file can be shortened when in concurrently.<br/>
+Package managers that execute scripts from a `package.json` / `package.json5` or `deno.(json|jsonc)` file can be shortened when in concurrently.<br/>
 The following are supported:
 
 | Syntax          | Expands to            |

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "concurrently",
   "type": "module",
-  "version": "10.0.4",
+  "version": "10.0.6",
   "description": "Run commands concurrently",
   "author": "Kimmo Brunfeldt",
   "license": "MIT",
@@ -41,7 +41,7 @@
   "dependencies": {
     "chalk": "5.6.2",
     "rxjs": "7.8.2",
-    "shell-quote": "1.9.0",
+    "shell-quote": "1.12.0",
     "supports-color": "10.2.2",
     "tree-kill": "1.2.2",
     "yargs": "18.0.0"
@@ -49,26 +49,26 @@
   "devDependencies": {
     "@eslint/js": "^10.0.1",
     "@hirez_io/observer-spy": "^2.2.0",
-    "@types/node": "^22.20.0",
+    "@types/node": "^22.20.1",
     "@types/yargs": "^17.0.35",
-    "@vitest/coverage-v8": "^4.1.6",
-    "@vitest/eslint-plugin": "^1.6.17",
+    "@vitest/coverage-v8": "^4.1.10",
+    "@vitest/eslint-plugin": "^1.6.27",
     "ctrlc-wrapper": "^0.0.5",
-    "eslint": "^10.4.0",
+    "eslint": "^10.8.1",
     "eslint-config-flat-gitignore": "^2.3.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-import-lite": "^0.6.0",
-    "eslint-plugin-prettier": "^5.5.5",
+    "eslint-plugin-prettier": "^5.5.6",
     "eslint-plugin-simple-import-sort": "^13.0.0",
-    "globals": "^17.6.0",
+    "globals": "^17.11.0",
     "husky": "^9.1.7",
-    "lint-staged": "^17.0.5",
-    "prettier": "^3.8.3",
+    "lint-staged": "^17.3.0",
+    "prettier": "^3.9.6",
     "safe-publish-latest": "^2.0.0",
     "string-argv": "^0.3.2",
     "typescript": "~5.9.3",
-    "typescript-eslint": "^8.59.3",
-    "vitest": "^4.1.6"
+    "typescript-eslint": "^8.67.0",
+    "vitest": "^4.1.10"
   },
   "lint-staged": {
     "*.{js,ts}": "eslint --fix",