just-scripts 2.5.0 → 2.6.0

package/lib/tasks/webpackDevServerTask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webpackDevServerTask.d.ts","sourceRoot":"","sources":["../../src/tasks/webpackDevServerTask.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,OAAO,EAA+B,YAAY,EAAE,MAAM,WAAW,CAAC;AAGtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAKzD,MAAM,WAAW,2BAA4B,SAAQ,qBAAqB,EAAE,aAAa;IACvF;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IAEpB;;OAEG;IACH,IAAI,CAAC,EAAE,YAAY,GAAG,aAAa,CAAC;IAEpC;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,GAAG,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IAE5C;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,GAAE,2BAAgC,GAAG,YAAY,CAiD5F"}
+{"version":3,"file":"webpackDevServerTask.d.ts","sourceRoot":"","sources":["../../src/tasks/webpackDevServerTask.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,OAAO,EAAuB,YAAY,EAAE,MAAM,WAAW,CAAC;AAG9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAKzD,MAAM,WAAW,2BAA4B,SAAQ,qBAAqB,EAAE,aAAa;IACvF;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IAEpB;;OAEG;IACH,IAAI,CAAC,EAAE,YAAY,GAAG,aAAa,CAAC;IAEpC;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,GAAG,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IAE5C;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,GAAE,2BAAgC,GAAG,YAAY,CAiD5F"}

package/lib/tasks/webpackDevServerTask.js

@@ -42,7 +42,7 @@ function webpackDevServerTask(options = {}) {
         if (options.webpackCliArgs) {
             args = [...args, ...options.webpackCliArgs];
         }
-        just_task_1.logger.info(process.execPath, (0, utils_1.encodeArgs)(args).join(' '));
+        (0, utils_1.logNodeCommand)(args);
         return (0, utils_1.spawn)(process.execPath, args, { stdio: 'inherit', env: options.env });
     };
 }

package/lib/tasks/webpackDevServerTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpackDevServerTask.js","sourceRoot":"","sources":["../../src/tasks/webpackDevServerTask.ts"],"names":[],"mappings":";;;AAEA,oCAA6C;AAC7C,yCAAsE;AACtE,yBAAyB;AACzB,6BAA6B;AAE7B,6DAA0D;AAC1D,oEAAiE;AACjE,iCAAiC;AAwCjC,SAAgB,oBAAoB,CAAC,UAAuC,EAAE;IAC5E,MAAM,UAAU,GACd,OAAO,IAAI,OAAO,CAAC,MAAM;QACvB,CAAC,CAAC,IAAA,sBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC,CAAC,IAAA,qCAAiB,EAAC,yBAAyB,EAAE,mBAAmB,CAAC,CAAC;IAExE,kGAAkG;IAClG,MAAM,cAAc,GAAG,IAAA,mBAAO,EAAC,0BAA0B,CAAC,CAAC;IAE3D,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,6EAA6E,CAAC,CAAC;KAChG;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;IAEvF,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAE/D,MAAM,YAAY,GAAG,eAAe;QAClC,CAAC,CAAC,oEAAoE;YACpE,CAAC,IAAA,mBAAO,EAAC,wBAAwB,CAAE,EAAE,OAAO,CAAC;QAC/C,CAAC,CAAC,oEAAoE;YACpE,CAAC,IAAA,mBAAO,EAAC,8CAA8C,CAAE,CAAC,CAAC;IAE/D,OAAO,SAAS,gBAAgB;QAC9B,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,GAAG,YAAY,CAAC,CAAC;QAE1D,IAAI,UAAU,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YAC3C,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YACzC,OAAO,CAAC,GAAG,GAAG;gBACZ,GAAG,OAAO,CAAC,GAAG;gBACd,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAA,2BAAY,EAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;aACzF,CAAC;SACH;QAED,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACrB;QAED,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;SAC1C;QAED,IAAI,OAAO,CAAC,cAAc,EAAE;YAC1B,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;SAC7C;QAED,kBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAA,kBAAU,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,OAAO,IAAA,aAAK,EAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/E,CAAC,CAAC;AACJ,CAAC;AAjDD,oDAiDC"}
+{"version":3,"file":"webpackDevServerTask.js","sourceRoot":"","sources":["../../src/tasks/webpackDevServerTask.ts"],"names":[],"mappings":";;;AAEA,oCAAiD;AACjD,yCAA8D;AAC9D,yBAAyB;AACzB,6BAA6B;AAE7B,6DAA0D;AAC1D,oEAAiE;AACjE,iCAAiC;AAwCjC,SAAgB,oBAAoB,CAAC,UAAuC,EAAE;IAC5E,MAAM,UAAU,GACd,OAAO,IAAI,OAAO,CAAC,MAAM;QACvB,CAAC,CAAC,IAAA,sBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC,CAAC,IAAA,qCAAiB,EAAC,yBAAyB,EAAE,mBAAmB,CAAC,CAAC;IAExE,kGAAkG;IAClG,MAAM,cAAc,GAAG,IAAA,mBAAO,EAAC,0BAA0B,CAAC,CAAC;IAE3D,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,6EAA6E,CAAC,CAAC;KAChG;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;IAEvF,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAE/D,MAAM,YAAY,GAAG,eAAe;QAClC,CAAC,CAAC,oEAAoE;YACpE,CAAC,IAAA,mBAAO,EAAC,wBAAwB,CAAE,EAAE,OAAO,CAAC;QAC/C,CAAC,CAAC,oEAAoE;YACpE,CAAC,IAAA,mBAAO,EAAC,8CAA8C,CAAE,CAAC,CAAC;IAE/D,OAAO,SAAS,gBAAgB;QAC9B,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,GAAG,YAAY,CAAC,CAAC;QAE1D,IAAI,UAAU,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YAC3C,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YACzC,OAAO,CAAC,GAAG,GAAG;gBACZ,GAAG,OAAO,CAAC,GAAG;gBACd,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAA,2BAAY,EAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;aACzF,CAAC;SACH;QAED,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACrB;QAED,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;SAC1C;QAED,IAAI,OAAO,CAAC,cAAc,EAAE;YAC1B,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;SAC7C;QAED,IAAA,sBAAc,EAAC,IAAI,CAAC,CAAC;QACrB,OAAO,IAAA,aAAK,EAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/E,CAAC,CAAC;AACJ,CAAC;AAjDD,oDAiDC"}

package/lib/utils/exec.d.ts

@@ -1,45 +1,34 @@
 /// <reference types="node" />
 import * as cp from 'child_process';
-export interface ExecError extends cp.ExecException {
-    stdout?: string;
-    stderr?: string;
-}
 /**
- * Execute a command.
- *
- * @param cmd Command to execute
- * @param opts Normal exec options plus stdout/stderr for piping output. Can pass `process` for this param.
- * @returns Promise which will settle when the command completes. If output was not piped, it will be
- * returned as the promise's value. If the promise was rejected, the error will be of type `ExecError`.
- */
-export declare function exec(cmd: string, opts?: cp.ExecOptions & {
-    stdout?: NodeJS.WritableStream;
-    stderr?: NodeJS.WritableStream;
-}): Promise<string | undefined>;
-/**
- * Encode args for a shell command.
- * @param cmdArgs Args to encode
- * @returns Encoded args
+ * @deprecated This prevents issues from spaces in args, but does NOT escape shell metacharacters.
+ * For full escaping, consider a library such as `shell-quote` instead. (Note that `spawn` and tasks
+ * from this package now use `cross-spawn` which escapes spaces internally.)
  */
 export declare function encodeArgs(cmdArgs: string[]): string[];
 /**
- * Execute a command synchronously.
- *
- * @param cmd  Command to execute
- * @param cwd Working directory in which to run the command (default: `process.cwd()`)
- * @param returnOutput If true, return the command's output. If false/unspecified,
- * inherit stdio from the parent process (so the child's output goes to the console).
- * @returns If `returnOutput` is true, returns the command's output. Otherwise returns undefined.
+ * Log `Running: <process.execPath> <...args>`
  */
-export declare function execSync(cmd: string, cwd?: string, returnOutput?: boolean): string | undefined;
+export declare function logNodeCommand(...args: (string | string[])[]): void;
 /**
- * Execute a command in a new process.
+ * Execute a command in a new process. Uses `cross-spawn` to avoid issues with spaces in arguments,
+ * but does not do any additional escaping. (For further enhancements, consider using the `execa`
+ * library instead.)
+ *
+ * **WARNING: If the `shell` option is enabled, do not pass unsanitized user input to this function.
+ * Any input containing shell metacharacters may be used to trigger arbitrary command execution.**
  *
  * @param cmd Command to execute
- * @param args Args for the command
- * @param opts Normal spawn options plus stdout/stderr for piping output. Can pass `process` for this param.
+ * @param args Args for the command. Quoting spaces is handled internally by `cross-spawn`.
+ * @param opts Normal spawn options plus stdout/stderr for piping output. (To inherit stdio from the
+ * parent process, just use `stdio: 'inherit'` instead.)
+ *
  * @returns Promise which will settle when the command completes. If the promise is rejected, the error will
- * include the child process's exit code.
+ * include the child process's exit code (`error.code`) or signal (`error.signal`) if relevant.
+ * The returned promise also has a `child` property with the spawned `ChildProcess` instance.
+ *
+ * @deprecated This function is not recommended for use outside the `just-scripts` package.
+ * Instead, consider a more mature, purpose-specific library such as `execa` or `nano-spawn`.
  */
 export declare function spawn(cmd: string, args?: ReadonlyArray<string>, opts?: cp.SpawnOptions & {
     stdout?: NodeJS.WritableStream;

package/lib/utils/exec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../src/utils/exec.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,eAAe,CAAC;AAGpC,MAAM,WAAW,SAAU,SAAQ,EAAE,CAAC,aAAa;IACjD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAID;;;;;;;GAOG;AACH,wBAAgB,IAAI,CAClB,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,EAAE,CAAC,WAAW,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAA;CAAO,GAC7F,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAoB7B;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAetD;AAED;;;;;;;;GAQG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAY9F;AAED;;;;;;;;GAQG;AACH,wBAAgB,KAAK,CACnB,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,aAAa,CAAC,MAAM,CAAM,EAChC,IAAI,GAAE,EAAE,CAAC,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAA;CAAO,GAC9F,OAAO,CAAC,IAAI,CAAC,CAwBf"}
+{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../src/utils/exec.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,eAAe,CAAC;AAMpC;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAEtD;AAyBD;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,GAAG,IAAI,CAEnE;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,KAAK,CACnB,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,aAAa,CAAC,MAAM,CAAM,EAChC,IAAI,GAAE,EAAE,CAAC,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAA;CAAO,GAC9F,OAAO,CAAC,IAAI,CAAC,CA0Cf"}

package/lib/utils/exec.js

@@ -1,45 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.spawn = exports.execSync = exports.encodeArgs = exports.exec = void 0;
-const cp = require("child_process");
-const path_1 = require("path");
-const SEPARATOR = process.platform === 'win32' ? ';' : ':';
+exports.spawn = exports.logNodeCommand = exports.encodeArgs = void 0;
+const cross_spawn_1 = require("cross-spawn");
+const just_task_1 = require("just-task");
+// `exec` and `execSync` were removed due to security issues (keeping filename for history)
 /**
- * Execute a command.
- *
- * @param cmd Command to execute
- * @param opts Normal exec options plus stdout/stderr for piping output. Can pass `process` for this param.
- * @returns Promise which will settle when the command completes. If output was not piped, it will be
- * returned as the promise's value. If the promise was rejected, the error will be of type `ExecError`.
+ * @deprecated This prevents issues from spaces in args, but does NOT escape shell metacharacters.
+ * For full escaping, consider a library such as `shell-quote` instead. (Note that `spawn` and tasks
+ * from this package now use `cross-spawn` which escapes spaces internally.)
  */
-function exec(cmd, opts = {}) {
-    return new Promise((resolve, reject) => {
-        var _a, _b;
-        const child = cp.exec(cmd, opts, (error, stdout, stderr) => {
-            if (error) {
-                error.stdout = stdout;
-                error.stderr = stderr;
-                reject(error);
-            }
-            else {
-                resolve(stdout);
-            }
-        });
-        if (opts.stdout) {
-            (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.pipe(opts.stdout);
-        }
-        if (opts.stderr) {
-            (_b = child.stderr) === null || _b === void 0 ? void 0 : _b.pipe(opts.stderr);
-        }
-    });
+function encodeArgs(cmdArgs) {
+    return quoteSpaces(cmdArgs);
 }
-exports.exec = exec;
+exports.encodeArgs = encodeArgs;
 /**
- * Encode args for a shell command.
- * @param cmdArgs Args to encode
- * @returns Encoded args
+ * Quote arguments containing spaces. Note that this does NOT do any other escaping!
+ * For more complete escaping, consider a library such as `shell-quote`, or use safer APIs which
+ * don't require escaping. (Note that `spawn` from this package now uses `cross-spawn` which
+ * escapes spaces internally.)
  */
-function encodeArgs(cmdArgs) {
+function quoteSpaces(cmdArgs) {
     // Taken from https://github.com/xxorax/node-shell-escape/blob/master/shell-escape.js
     // However, we needed to use double quotes because that's the norm in more platforms
     if (!cmdArgs) {
@@ -53,42 +33,46 @@ function encodeArgs(cmdArgs) {
         return arg;
     });
 }
-exports.encodeArgs = encodeArgs;
 /**
- * Execute a command synchronously.
- *
- * @param cmd  Command to execute
- * @param cwd Working directory in which to run the command (default: `process.cwd()`)
- * @param returnOutput If true, return the command's output. If false/unspecified,
- * inherit stdio from the parent process (so the child's output goes to the console).
- * @returns If `returnOutput` is true, returns the command's output. Otherwise returns undefined.
+ * Log `Running: <process.execPath> <...args>`
  */
-function execSync(cmd, cwd, returnOutput) {
-    cwd = cwd || process.cwd();
-    const env = { ...process.env };
-    env.PATH = (0, path_1.resolve)('./node_modules/.bin') + SEPARATOR + env.PATH;
-    const output = cp.execSync(cmd, {
-        cwd,
-        env,
-        stdio: returnOutput ? undefined : 'inherit',
-    });
-    return returnOutput ? (output || '').toString('utf8') : undefined;
+function logNodeCommand(...args) {
+    just_task_1.logger.info(`Running: ${process.execPath} ${quoteSpaces(args.flat()).join(' ')}`);
 }
-exports.execSync = execSync;
+exports.logNodeCommand = logNodeCommand;
 /**
- * Execute a command in a new process.
+ * Execute a command in a new process. Uses `cross-spawn` to avoid issues with spaces in arguments,
+ * but does not do any additional escaping. (For further enhancements, consider using the `execa`
+ * library instead.)
+ *
+ * **WARNING: If the `shell` option is enabled, do not pass unsanitized user input to this function.
+ * Any input containing shell metacharacters may be used to trigger arbitrary command execution.**
  *
  * @param cmd Command to execute
- * @param args Args for the command
- * @param opts Normal spawn options plus stdout/stderr for piping output. Can pass `process` for this param.
+ * @param args Args for the command. Quoting spaces is handled internally by `cross-spawn`.
+ * @param opts Normal spawn options plus stdout/stderr for piping output. (To inherit stdio from the
+ * parent process, just use `stdio: 'inherit'` instead.)
+ *
  * @returns Promise which will settle when the command completes. If the promise is rejected, the error will
- * include the child process's exit code.
+ * include the child process's exit code (`error.code`) or signal (`error.signal`) if relevant.
+ * The returned promise also has a `child` property with the spawned `ChildProcess` instance.
+ *
+ * @deprecated This function is not recommended for use outside the `just-scripts` package.
+ * Instead, consider a more mature, purpose-specific library such as `execa` or `nano-spawn`.
  */
 function spawn(cmd, args = [], opts = {}) {
     return new Promise((resolve, reject) => {
         var _a, _b;
-        const child = cp.spawn(cmd, args, opts);
-        child.on('exit', (code, signal) => {
+        let child;
+        try {
+            child = (0, cross_spawn_1.spawn)(cmd, args, opts);
+        }
+        catch (error) {
+            reject(error);
+            return;
+        }
+        const onExit = (code, signal) => {
+            child.off('error', onError);
             if (code) {
                 const error = new Error('Command failed: ' + [cmd, ...args].join(' '));
                 error.code = code;
@@ -102,7 +86,15 @@ function spawn(cmd, args = [], opts = {}) {
             else {
                 resolve();
             }
-        });
+        };
+        // Some error circumstances may fire 'error' rather than 'exit'
+        // https://nodejs.org/docs/latest/api/child_process.html#event-error
+        const onError = (error) => {
+            reject(error);
+            child.off('exit', onExit);
+        };
+        child.on('exit', onExit);
+        child.on('error', onError);
         if (opts.stdout) {
             (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.pipe(opts.stdout);
         }

package/lib/utils/exec.js.map

@@ -1 +1 @@
-{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/utils/exec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/utils/exec.ts"],"names":[],"mappings":";;;AACA,6CAAkD;AAClD,yCAAmC;AAEnC,2FAA2F;AAE3F;;;;GAIG;AACH,SAAgB,UAAU,CAAC,OAAiB;IAC1C,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC;AAFD,gCAEC;AAED;;;;;GAKG;AACH,SAAS,WAAW,CAAC,OAAiB;IACpC,qFAAqF;IACrF,oFAAoF;IACpF,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,OAAO,CAAC;KAChB;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACvB,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACzB,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC;YACvC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;SAC7D;QAED,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,SAAgB,cAAc,CAAC,GAAG,IAA2B;IAC3D,kBAAM,CAAC,IAAI,CAAC,YAAY,OAAO,CAAC,QAAQ,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AACpF,CAAC;AAFD,wCAEC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,SAAgB,KAAK,CACnB,GAAW,EACX,OAA8B,EAAE,EAChC,OAA6F,EAAE;IAE/F,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;;QACrC,IAAI,KAAsB,CAAC;QAC3B,IAAI;YACF,KAAK,GAAG,IAAA,mBAAU,EAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;SACrC;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,CAAC;YACd,OAAO;SACR;QAED,MAAM,MAAM,GAAG,CAAC,IAAmB,EAAE,MAA6B,EAAQ,EAAE;YAC1E,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC5B,IAAI,IAAI,EAAE;gBACR,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,kBAAkB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBACtE,KAAa,CAAC,IAAI,GAAG,IAAI,CAAC;gBAC3B,MAAM,CAAC,KAAK,CAAC,CAAC;aACf;iBAAM,IAAI,MAAM,EAAE;gBACjB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,gCAAgC,MAAM,IAAI,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC9F,KAAa,CAAC,MAAM,GAAG,MAAM,CAAC;gBAC/B,MAAM,CAAC,KAAK,CAAC,CAAC;aACf;iBAAM;gBACL,OAAO,EAAE,CAAC;aACX;QACH,CAAC,CAAC;QAEF,+DAA+D;QAC/D,oEAAoE;QACpE,MAAM,OAAO,GAAG,CAAC,KAAY,EAAQ,EAAE;YACrC,MAAM,CAAC,KAAK,CAAC,CAAC;YACd,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5B,CAAC,CAAC;QAEF,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACzB,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE3B,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,MAAA,KAAK,CAAC,MAAM,0CAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACjC;QACD,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,MAAA,KAAK,CAAC,MAAM,0CAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACjC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AA9CD,sBA8CC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "just-scripts",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "Just Stack Scripts",
   "keywords": [],
   "repository": {
@@ -28,10 +28,11 @@
   },
   "dependencies": {
     "chalk": "^4.0.0",
+    "cross-spawn": "^7.0.6",
     "diff-match-patch": "1.0.5",
     "fs-extra": "^11.0.0",
     "glob": "^7.1.3",
-    "just-task": ">=1.13.0 <2.0.0",
+    "just-task": "^1.13.0",
     "prompts": "^2.4.0",
     "run-parallel-limit": "^1.0.6",
     "semver": "^7.0.0",
@@ -39,6 +40,7 @@
     "webpack-merge": "^5.7.3"
   },
   "devDependencies": {
+    "@types/cross-spawn": "^6.0.6",
     "@types/diff-match-patch": "^1.0.32",
     "@types/glob": "^7.2.0",
     "@types/prompts": "^2.4.2",

package/src/tasks/eslintTask.ts

@@ -1,5 +1,5 @@
-import { resolve, logger, resolveCwd, TaskFunction } from 'just-task';
-import { encodeArgs, spawn } from '../utils';
+import { resolve, resolveCwd, TaskFunction } from 'just-task';
+import { logNodeCommand, spawn } from '../utils';
 import * as fs from 'fs';
 
 /**
@@ -70,7 +70,7 @@ export function eslintTask(options: EsLintTaskOptions = {}): TaskFunction {
         eslintCmd,
         ...(files ? files : ['.']),
         ...['--ext', extensions ? extensions : '.js,.jsx,.ts,.tsx'],
-        ...(noEslintRc ? '--no-eslintrc' : []),
+        ...(noEslintRc ? ['--no-eslintrc'] : []),
         ...(eslintConfigPath ? ['--config', eslintConfigPath] : []),
         ...(eslintIgnorePath ? ['--ignore-path', eslintIgnorePath] : []),
         ...(resolvePluginsPath ? ['--resolve-plugins-relative-to', resolvePluginsPath] : []),
@@ -95,10 +95,11 @@ export function eslintTask(options: EsLintTaskOptions = {}): TaskFunction {
         env.ESLINT_USE_FLAT_CONFIG = JSON.stringify(useFlatConfig);
       }
 
-      logger.info(encodeArgs(eslintArgs).join(' '));
+      logNodeCommand(eslintArgs);
       return spawn(process.execPath, eslintArgs, { stdio: 'inherit', env });
-    } else {
-      return Promise.resolve();
     }
+
+    // undertaker apparently requires returning a promise, async function, or function that calls done()
+    return Promise.resolve();
   };
 }

package/src/tasks/jestTask.ts

@@ -1,5 +1,5 @@
 import { resolve, logger, resolveCwd, TaskFunction, argv } from 'just-task';
-import { spawn, encodeArgs, readPackageJson } from '../utils';
+import { spawn, readPackageJson, logNodeCommand } from '../utils';
 import { existsSync } from 'fs';
 import * as supportsColor from 'supports-color';
 
@@ -14,7 +14,15 @@ export interface JestTaskOptions {
   passWithNoTests?: boolean;
   clearCache?: boolean;
   silent?: boolean;
+  /**
+   * This is not available in jest 30+
+   * Consider updating to jest 30 and using testPathPatterns (plural) instead.
+   */
   testPathPattern?: string;
+  /**
+   * Compatible with jest 30+ only
+   */
+  testPathPatterns?: string;
   testNamePattern?: string;
   // The maximum number of workers to use in jest for parallel test execution
   maxWorkers?: number;
@@ -54,7 +62,6 @@ export function jestTask(options: JestTaskOptions = {}): TaskFunction {
 
     if ((configFileExists || packageConfigExists) && jestCmd) {
       logger.info(`Running Jest`);
-      const cmd = process.execPath;
 
       const positional = argv()._.slice(1);
 
@@ -71,20 +78,22 @@ export function jestTask(options: JestTaskOptions = {}): TaskFunction {
         ...(options.watch ? ['--watch'] : []),
         ...(options.silent ? ['--silent'] : []),
         ...(options.testPathPattern ? ['--testPathPattern', options.testPathPattern] : []),
+        ...(options.testPathPatterns ? ['--testPathPatterns', options.testPathPatterns] : []),
         ...(options.testNamePattern ? ['--testNamePattern', options.testNamePattern] : []),
-        ...(options.maxWorkers ? ['--maxWorkers', options.maxWorkers] : []),
-        ...(options.u || options.updateSnapshot ? ['--updateSnapshot'] : ['']),
+        ...(options.maxWorkers ? ['--maxWorkers', `${options.maxWorkers}`] : []),
+        ...(options.u || options.updateSnapshot ? ['--updateSnapshot'] : []),
         // Only include the positional args if `options._` wasn't specified
         // (to avoid possibly including them twice)
         ...(options._ || positional),
       ].filter(arg => !!arg) as string[];
 
-      logger.info(cmd, encodeArgs(args).join(' '));
+      logNodeCommand(args);
 
-      return spawn(cmd, args, { stdio: 'inherit', env: options.env });
-    } else {
-      logger.warn('no jest configuration found, skipping jest');
-      return Promise.resolve();
+      return spawn(process.execPath, args, { stdio: 'inherit', env: options.env });
     }
+
+    logger.warn('no jest configuration found, skipping jest');
+    // undertaker apparently requires returning a promise, async function, or function that calls done()
+    return Promise.resolve();
   };
 }

package/src/tasks/nodeExecTask.ts

@@ -6,37 +6,51 @@ import { getTsNodeEnv } from '../typescript/getTsNodeEnv';
 
 export interface NodeExecTaskOptions {
   /**
-   * Arguments to be passed into a spawn call for webpack dev server. This can be used to do things
-   * like increase the heap space for the JS engine to address out of memory issues.
+   * Arguments to be passed into a spawn call, including the script path to execute.
+   * The script path should be **absolute** to prevent unpredictable resolution.
+   *
+   * **WARNING: If `options.shell` is enabled, do not pass unsanitized user input as `args`.
+   * Any input containing shell metacharacters may be used to trigger arbitrary command execution.**
    */
-  args?: string[];
+  args: string[];
 
   /**
-   * Environment variables to be passed to the webpack-cli
+   * Environment variables to be passed to the spawned process.
+   * Defaults to `process.env`.
    */
   env?: NodeJS.ProcessEnv;
 
   /**
-   * Should this nodeExec task be using something like ts-node to execute the binary
+   * Whether to use `ts-node` to execute the script
    */
   enableTypeScript?: boolean;
 
   /**
-   * The tsconfig file to pass to ts-node for Typescript config
+   * tsconfig file path to pass to `ts-node`
    */
   tsconfig?: string;
 
   /**
-   * Transpile the config only
+   * Whether to use `transpileOnly` mode for `ts-node`
    */
   transpileOnly?: boolean;
 
   /**
-   * Custom spawn options
+   * Custom spawn options.
+   *
+   * **WARNING: If the `shell` option is enabled, do not pass unsanitized user input as `args`.
+   * Any input containing shell metacharacters may be used to trigger arbitrary command execution.**
    */
   spawnOptions?: SpawnOptions;
 }
 
+/**
+ * Create a task to execute a command in a new process.
+ * Uses `cross-spawn` to avoid issues with spaces in arguments, but does not do any additional escaping.
+ *
+ * **WARNING: If the `shell` option is enabled, do not pass unsanitized user input to this task.
+ * Any input containing shell metacharacters may be used to trigger arbitrary command execution.**
+ */
 export function nodeExecTask(options: NodeExecTaskOptions): TaskFunction {
   return function () {
     const { spawnOptions, enableTypeScript, tsconfig, transpileOnly } = options;
@@ -44,17 +58,19 @@ export function nodeExecTask(options: NodeExecTaskOptions): TaskFunction {
     const tsNodeRegister = resolveCwd('ts-node/register');
     const nodeExecPath = process.execPath;
 
-    if (enableTypeScript && tsNodeRegister) {
-      options.args = options.args || [];
-      options.args.unshift(tsNodeRegister);
-      options.args.unshift('-r');
+    const args = [...(options.args || [])];
+    //  Preserve the default behavior of inheriting process.env if no options are specified
+    let env = options.env ? { ...options.env } : { ...process.env };
+    const isTS = enableTypeScript && tsNodeRegister;
 
-      options.env = { ...options.env, ...getTsNodeEnv(tsconfig, transpileOnly) };
-      logger.info('Executing [TS]: ' + [nodeExecPath, ...(options.args || [])].join(' '));
-    } else {
-      logger.info('Executing: ' + [nodeExecPath, ...(options.args || [])].join(' '));
+    if (isTS) {
+      args.unshift('-r', tsNodeRegister);
+
+      env = { ...env, ...getTsNodeEnv(tsconfig, transpileOnly) };
     }
 
-    return spawn(nodeExecPath, options.args, { stdio: 'inherit', env: options.env, ...spawnOptions });
+    logger.info([`Executing${isTS ? ' [TS]' : ''}:`, nodeExecPath, ...args].join(' '));
+
+    return spawn(nodeExecPath, args, { stdio: 'inherit', env, ...spawnOptions });
   };
 }

package/src/tasks/prettierTask.ts

@@ -1,5 +1,5 @@
 import { logger, resolve, TaskFunction } from 'just-task';
-import { spawn } from '../utils';
+import { logNodeCommand, spawn } from '../utils';
 import { splitArrayIntoChunks } from '../arrayUtils/splitArrayIntoChunks';
 import * as path from 'path';
 import { arrayify } from '../arrayUtils/arrayify';
@@ -16,10 +16,12 @@ export interface PrettierTaskOptions {
   files?: string[] | string;
   ignorePath?: string;
   configPath?: string;
+  check?: boolean;
 }
 
 export function prettierTask(options: PrettierTaskOptions = {}): TaskFunction {
-  const prettierBin = resolve('prettier/bin-prettier.js');
+  // check v2 or v3 path
+  const prettierBin = resolve('prettier/bin-prettier.js') || resolve('prettier/bin/prettier.cjs');
 
   if (prettierBin) {
     return function prettier() {
@@ -32,38 +34,19 @@ export function prettierTask(options: PrettierTaskOptions = {}): TaskFunction {
             options.files || path.resolve(process.cwd(), '**', '*.{ts,tsx,js,jsx,json,scss,html,yml,md}'),
           ),
         },
-        check: false,
+        check: !!options.check,
       });
     };
   }
 
-  return function () {
+  // undertaker apparently requires returning a promise, async function, or function that calls done()
+  return async () => {
     logger.warn('Prettier is not available, ignoring this task');
   };
 }
 
 export function prettierCheckTask(options: PrettierTaskOptions = {}): TaskFunction {
-  const prettierBin = resolve('prettier/bin-prettier.js');
-
-  if (prettierBin) {
-    return function prettierCheck() {
-      return runPrettierAsync({
-        prettierBin,
-        ...{ configPath: options.configPath || undefined },
-        ...{ ignorePath: options.ignorePath || undefined },
-        ...{
-          files: arrayify(
-            options.files || path.resolve(process.cwd(), '**', '*.{ts,tsx,js,jsx,json,scss,html,yml,md}'),
-          ),
-        },
-        check: true,
-      });
-    };
-  }
-
-  return function () {
-    logger.warn('Prettier is not available, ignoring this task');
-  };
+  return prettierTask({ ...options, check: true });
 }
 
 function runPrettierAsync(context: PrettierContext) {
@@ -81,7 +64,7 @@ function runPrettierAsync(context: PrettierContext) {
       ...chunk,
     ];
 
-    logger.info(process.execPath + ' ' + prettierArgs.join(' '));
+    logNodeCommand(prettierArgs);
 
     return finishPromise.then(() => spawn(process.execPath, prettierArgs, { stdio: 'inherit' }));
   }, Promise.resolve());

package/src/tasks/tscTask.ts

@@ -1,6 +1,6 @@
 import * as ts from 'typescript';
 import { resolve, logger, resolveCwd, TaskFunction } from 'just-task';
-import { exec, encodeArgs, spawn } from '../utils';
+import { logNodeCommand, spawn } from '../utils';
 import * as fs from 'fs';
 
 export type TscTaskOptions = { [key in keyof ts.CompilerOptions]?: string | boolean | string[] } & {
@@ -25,9 +25,8 @@ export function tscTask(options: TscTaskOptions = {}): TaskFunction {
       logger.info(`Running ${tscCmd} with ${options.project || options.build}`);
 
       const args = argsFromOptions(tscCmd, options);
-      const cmd = encodeArgs([process.execPath, ...args]).join(' ');
-      logger.info(`Executing: ${cmd}`);
-      return exec(cmd);
+      logNodeCommand(args);
+      return spawn(process.execPath, args, { stdio: 'inherit' });
     }
     return Promise.resolve();
   };
@@ -37,25 +36,7 @@ export function tscTask(options: TscTaskOptions = {}): TaskFunction {
  * Returns a task that runs the TSC CLI in watch mode.
  */
 export function tscWatchTask(options: TscTaskOptions = {}): TaskFunction {
-  const tscCmd = resolve('typescript/lib/tsc.js');
-
-  if (!tscCmd) {
-    throw new Error('cannot find tsc');
-  }
-
-  return function tscWatch() {
-    options = { ...options, ...getProjectOrBuildOptions(options) };
-
-    if (isValidProject(options)) {
-      logger.info(`Running ${tscCmd} with ${options.project || options.build} in watch mode`);
-
-      const args = argsFromOptions(tscCmd, options);
-      const cmd = [...args, '--watch'];
-      logger.info(encodeArgs(cmd).join(' '));
-      return spawn(process.execPath, cmd, { stdio: 'inherit' });
-    }
-    return Promise.resolve();
-  };
+  return tscTask({ ...options, watch: true });
 }
 
 /**
@@ -81,9 +62,7 @@ function isValidProject(options: TscTaskOptions) {
     (typeof options.project === 'string' && fs.existsSync(options.project)) ||
     (typeof options.build === 'string' && fs.existsSync(options.build)) ||
     (Array.isArray(options.build) &&
-      options.build.reduce((currentIsValid, buildPath) => {
-        return currentIsValid && typeof buildPath === 'string' && fs.existsSync(buildPath);
-      }, true as boolean))
+      options.build.every(buildPath => typeof buildPath === 'string' && fs.existsSync(buildPath)))
   );
 }
 
@@ -91,23 +70,21 @@ function isValidProject(options: TscTaskOptions) {
  * Returns an array of CLI arguments for TSC given the `options`.
  */
 function argsFromOptions(tscCmd: string, options: TscTaskOptions): string[] {
-  const { nodeArgs, ...rest } = options;
+  const { nodeArgs, build, ...rest } = options;
+
+  const args = [...(nodeArgs || []), tscCmd];
+  // --build must be the first arg if specified
+  const argEntries = [...(build !== undefined ? [['build', build]] : []), ...Object.entries(rest)];
+
+  for (const [option, optionValue] of argEntries) {
+    if (typeof optionValue === 'string') {
+      args.push('--' + option, optionValue);
+    } else if (typeof optionValue === 'boolean' && optionValue) {
+      args.push('--' + option);
+    } else if (Array.isArray(optionValue)) {
+      args.push('--' + option, ...optionValue);
+    }
+  }
 
-  return [
-    ...(nodeArgs ? nodeArgs : []),
-    ...Object.keys(rest).reduce(
-      (currentArgs, option) => {
-        const optionValue = options[option];
-        if (typeof optionValue === 'string') {
-          return currentArgs.concat(['--' + option, optionValue]);
-        } else if (typeof optionValue === 'boolean' && optionValue) {
-          return currentArgs.concat(['--' + option]);
-        } else if (Array.isArray(optionValue)) {
-          return currentArgs.concat(['--' + option, ...optionValue]);
-        }
-        return currentArgs;
-      },
-      [tscCmd],
-    ),
-  ];
+  return args;
 }