diff --git a/.changeset/codemod-source-line-endings.md b/.changeset/codemod-source-line-endings.md new file mode 100644 index 00000000000..f69f3fc0a10 --- /dev/null +++ b/.changeset/codemod-source-line-endings.md @@ -0,0 +1,5 @@ +--- +'@fluentui-react-native/codemods': patch +--- + +Preserve source line endings when printing codemod results instead of using the host platform's default. diff --git a/.changeset/windows-tooling-command-spawn.md b/.changeset/windows-tooling-command-spawn.md new file mode 100644 index 00000000000..a585a520a2a --- /dev/null +++ b/.changeset/windows-tooling-command-spawn.md @@ -0,0 +1,5 @@ +--- +'@fluentui-react-native/desktop-test': patch +--- + +Launch Windows command shims with escaped arguments without deprecated shell-backed spawn calls. diff --git a/.yarn/patches/lage-npm-2.14.19-5dcab627c8.patch b/.yarn/patches/lage-npm-2.14.19-5dcab627c8.patch new file mode 100644 index 00000000000..008eacb2aa3 --- /dev/null +++ b/.yarn/patches/lage-npm-2.14.19-5dcab627c8.patch @@ -0,0 +1,11 @@ +diff --git a/dist/runners/NpmScriptRunner.js b/dist/runners/NpmScriptRunner.js +index 4c4b0fd6a7877dbb5fbc65208276efb0ec912031..47c607f8324933ccc898d15f0ed04f4f55727ffb 100644 +--- a/dist/runners/NpmScriptRunner.js ++++ b/dist/runners/NpmScriptRunner.js +@@ -1,4 +1,4 @@ +-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});Object.defineProperty(exports,"NpmScriptRunner",{enumerable:!0,get:function(){return g}});var b=A(require("fs")),v=A(require("path")),x=require("child_process");function C(r,n,e){return n in r?Object.defineProperty(r,n,{value:e,enumerable:!0,configurable:!0,writable:!0}):r[n]=e,r}function A(r){return r&&r.__esModule?r:{default:r}}var G=2500,g=class{getTargetTask(n){let e=n.options;return(e==null?void 0:e.script)??n.task}async shouldRun(n){var i;let e=this.getTargetTask(n),p=v.default.join(n.cwd,"package.json");return!!((i=JSON.parse(b.default.readFileSync(p,"utf8")).scripts)!=null&&i[e])&&(n.shouldRun??!0)}async run(n){var O,T;let{target:e,weight:p,abortSignal:s}=n,{nodeOptions:i,npmCmd:d,taskArgs:S}=this.runnerOptions,R=this.getTargetTask(e),t;if(s){if(s.aborted)return{exitCode:1};let u=()=>{if(s.removeEventListener("abort",u),t&&!t.killed){let l=t.pid;process.stdout.write(`Abort signal detected, attempting to killing process id ${l} +-`),t.kill("SIGTERM");let o=setTimeout(()=>{t&&!t.killed&&t.kill("SIGKILL")},G);o.unref&&o.unref()}};s.addEventListener("abort",u)}let _=[...S,...((O=e.options)==null?void 0:O.taskArgs)??[]],c=["run",R,..._.length>0?["--",..._]:[]],k=[i,(T=e.options)==null?void 0:T.nodeOptions].filter(Boolean).join(" ");return await new Promise((u,l)=>{t=(0,x.spawn)(d,c,{cwd:e.cwd,stdio:["inherit","pipe","pipe"],...process.platform==="win32"&&{shell:!0},env:{...process.stdout.isTTY&&{FORCE_COLOR:"1"},...process.env,...k&&{NODE_OPTIONS:k},LAGE_PACKAGE_NAME:e.packageName,LAGE_TASK:e.task,LAGE_WEIGHT:String(p)}});let o=!1,a=f=>{var m,w,E;if(t==null||t.off("exit",a),t==null||t.off("error",a),!o){if(o=!0,(m=t==null?void 0:t.stdout)==null||m.destroy(),(w=t==null?void 0:t.stderr)==null||w.destroy(),(E=t==null?void 0:t.stdin)==null||E.destroy(),f===0)return u();l({exitCode:f,error:`NPM Script Runner: ${d} ${c.join(" ")} exited with code ${f}`})}},{pid:h}=t;process.stdout.write(`Running ${[d,...c].join(" ")}, pid: ${h} ++"use strict";Object.defineProperty(exports,"__esModule",{value:!0});Object.defineProperty(exports,"NpmScriptRunner",{enumerable:!0,get:function(){return g}});var b=A(require("fs")),v=A(require("path")),x=require("cross-spawn");function C(r,n,e){return n in r?Object.defineProperty(r,n,{value:e,enumerable:!0,configurable:!0,writable:!0}):r[n]=e,r}function A(r){return r&&r.__esModule?r:{default:r}}var G=2500,g=class{getTargetTask(n){let e=n.options;return(e==null?void 0:e.script)??n.task}async shouldRun(n){var i;let e=this.getTargetTask(n),p=v.default.join(n.cwd,"package.json");return!!((i=JSON.parse(b.default.readFileSync(p,"utf8")).scripts)!=null&&i[e])&&(n.shouldRun??!0)}async run(n){var O,T;let{target:e,weight:p,abortSignal:s}=n,{nodeOptions:i,npmCmd:d,taskArgs:S}=this.runnerOptions,R=this.getTargetTask(e),t;if(s){if(s.aborted)return{exitCode:1};let u=()=>{if(s.removeEventListener("abort",u),t&&!t.killed){let l=t.pid;process.stdout.write(`Abort signal detected, attempting to killing process id ${l} ++`),t.kill("SIGTERM");let o=setTimeout(()=>{t&&!t.killed&&t.kill("SIGKILL")},G);o.unref&&o.unref()}};s.addEventListener("abort",u)}let _=[...S,...((O=e.options)==null?void 0:O.taskArgs)??[]],c=["run",R,..._.length>0?["--",..._]:[]],k=[i,(T=e.options)==null?void 0:T.nodeOptions].filter(Boolean).join(" ");return await new Promise((u,l)=>{t=(0,x.spawn)(d,c,{cwd:e.cwd,stdio:["inherit","pipe","pipe"],env:{...process.stdout.isTTY&&{FORCE_COLOR:"1"},...process.env,...k&&{NODE_OPTIONS:k},LAGE_PACKAGE_NAME:e.packageName,LAGE_TASK:e.task,LAGE_WEIGHT:String(p)}});let o=!1,a=f=>{var m,w,E;if(t==null||t.off("exit",a),t==null||t.off("error",a),!o){if(o=!0,(m=t==null?void 0:t.stdout)==null||m.destroy(),(w=t==null?void 0:t.stderr)==null||w.destroy(),(E=t==null?void 0:t.stdin)==null||E.destroy(),f===0)return u();l({exitCode:f,error:`NPM Script Runner: ${d} ${c.join(" ")} exited with code ${f}`})}},{pid:h}=t;process.stdout.write(`Running ${[d,...c].join(" ")}, pid: ${h} + `);let y=t.stdout,L=t.stderr;y.pipe(process.stdout),L.pipe(process.stderr),t.on("exit",a),t.on("error",()=>a(1))})}constructor(n){C(this,"runnerOptions",void 0),this.runnerOptions=n}}; + //# sourceMappingURL=NpmScriptRunner.js.map diff --git a/.yarnrc.yml b/.yarnrc.yml index f69b9310327..5c0551301e4 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -93,6 +93,10 @@ packageExtensions: iconv-lite@*: dependencies: iconv-lite: "*" + # The Lage patch uses cross-spawn for Windows command shims without DEP0190. + lage@2.14.19: + dependencies: + cross-spawn: "7.0.6" react-native-svg-transformer@*: peerDependencies: "@react-native/metro-babel-transformer": "*" diff --git a/package.json b/package.json index ee1555d8c3d..2c4c791c329 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,7 @@ "esbuild@npm:~0.25.0": "^0.28.0", "fast-uri@npm:^3.0.1": "3.1.9", "fast-xml-parser@npm:^4.4.1": "5.11.0", + "lage": "patch:lage@npm%3A2.14.19#~/.yarn/patches/lage-npm-2.14.19-5dcab627c8.patch", "launch-editor@npm:^2.9.1": "2.14.2", "lodash": "^4.18.1", "moment@npm:^2.24.0": "2.31.0", diff --git a/packages/agentic/desktop-test/package.json b/packages/agentic/desktop-test/package.json index 5cf87598d3a..c7778fa785c 100644 --- a/packages/agentic/desktop-test/package.json +++ b/packages/agentic/desktop-test/package.json @@ -64,10 +64,12 @@ "@rnx-kit/reporter": "catalog:", "@wdio/reporter": "catalog:", "commander": "^14.0.2", + "cross-spawn": "7.0.6", "import-meta-resolve": "4.2.0" }, "devDependencies": { "@fluentui-react-native/scripts": "workspace:*", + "@types/cross-spawn": "6.0.6", "@wdio/cli": "catalog:", "@wdio/jasmine-framework": "catalog:", "@wdio/local-runner": "catalog:", diff --git a/packages/agentic/desktop-test/references/lifecycle.md b/packages/agentic/desktop-test/references/lifecycle.md index 0ead981283d..43d51ee3be1 100644 --- a/packages/agentic/desktop-test/references/lifecycle.md +++ b/packages/agentic/desktop-test/references/lifecycle.md @@ -15,6 +15,10 @@ Cleanup drains worker reporting and stdio, closes sessions, releases owned input, and stops exact owned process trees in reverse service order. An externally owned app is preserved. +Commands keep their arguments as separate values. Windows executable lookup and +command-shim escaping use `cross-spawn`, without Node's deprecated +`spawn` argument array plus `shell: true` combination. + Interactive runs acquire a per-user `interactive.lock`; concurrent workloads fail closed. If a crash leaves a lock, inspect its recorded owner and verify that process and its resources have stopped before removing that exact lock. diff --git a/packages/agentic/desktop-test/src/commands.ts b/packages/agentic/desktop-test/src/commands.ts index fdbc0ac0e58..6b86b7cd6b9 100644 --- a/packages/agentic/desktop-test/src/commands.ts +++ b/packages/agentic/desktop-test/src/commands.ts @@ -1,4 +1,5 @@ -import { spawn } from 'node:child_process'; +import { spawn as spawnNative } from 'node:child_process'; +import spawn from 'cross-spawn'; import fs from 'node:fs'; import path from 'node:path'; import { randomUUID } from 'node:crypto'; @@ -101,11 +102,11 @@ export class NodeDesktopCommandRunner implements DesktopCommandRunner { command.context, ); emit({ kind: 'artifact', payload: { path: relativeLog, description: command.label ?? command.command } }, id, command.context); - const child = spawn(command.command, [...command.args], { + const spawnCommand = needsWindowsCommandShim(command.command) ? spawn : spawnNative; + const child = spawnCommand(command.command, [...command.args], { cwd: command.cwd, env: { ...process.env, ...command.env, ...this.options.environment, [DESKTOP_REPORT_SCOPE]: id }, detached: process.platform !== 'win32', - shell: windowsShell(command.command), stdio: ['ignore', 'pipe', 'pipe'], windowsHide: true, }); @@ -252,7 +253,7 @@ export class NodeDesktopCommandRunner implements DesktopCommandRunner { } } -function windowsShell(command: string): boolean { +function needsWindowsCommandShim(command: string): boolean { return ( process.platform === 'win32' && !['.exe', '.com'].includes(path.extname(command).toLowerCase()) && @@ -262,7 +263,7 @@ function windowsShell(command: string): boolean { async function stopProcessTree(pid: number, completed: Promise, timeoutMs: number): Promise { if (process.platform === 'win32') { - const killer = spawn('taskkill.exe', ['/PID', String(pid), '/T', '/F'], { stdio: ['ignore', 'pipe', 'pipe'], windowsHide: true }); + const killer = spawnNative('taskkill.exe', ['/PID', String(pid), '/T', '/F'], { stdio: ['ignore', 'pipe', 'pipe'], windowsHide: true }); let diagnostic = ''; killer.stdout.on('data', (data: Buffer) => { diagnostic += data.toString(); diff --git a/packages/agentic/desktop-test/src/contracts.contract.cjs b/packages/agentic/desktop-test/src/contracts.contract.cjs index 1ab14c4c48a..ebce38bd063 100644 --- a/packages/agentic/desktop-test/src/contracts.contract.cjs +++ b/packages/agentic/desktop-test/src/contracts.contract.cjs @@ -323,6 +323,34 @@ async function main() { .slice(out.text().indexOf('::group::one'), out.text().indexOf('::endgroup::', out.text().indexOf('::group::one'))); assert(groupOne.includes('::stop-commands::')); assert(!groupOne.includes('::warning::two')); + } else if (mode === 'command-arguments') { + const run = reporter({ kind: 'lifecycle' }); + const runner = new NodeDesktopCommandRunner({ reporter: run }); + const bin = path.join(root, 'command shims (test)'); + fs.mkdirSync(bin); + const fixture = path.join(bin, 'argv.cjs'); + fs.writeFileSync(fixture, "require('node:fs').writeFileSync(process.argv[2], JSON.stringify(process.argv.slice(3)));"); + const output = path.join(root, 'arguments.json'); + const values = ['', 'with spaces', 'a&b|(c)^e', '"quoted"', 'trailing\\', '%COMMAND_TEST_VALUE%']; + let prepared = { + command: process.execPath, + args: [fixture, output, ...values], + cwd: root, + env: { COMMAND_TEST_VALUE: 'must not expand' }, + }; + if (process.platform === 'win32') { + fs.writeFileSync(path.join(bin, 'argv-fixture.cmd'), '@"%COMMAND_TEST_NODE%" "%~dp0argv.cjs" %*\r\n'); + prepared = { + ...prepared, + command: 'argv-fixture', + args: [output, ...values], + env: { ...prepared.env, COMMAND_TEST_NODE: process.execPath, PATH: `${bin}${path.delimiter}${process.env.PATH}` }, + }; + } + await runner.run(prepared); + assert.deepEqual(JSON.parse(fs.readFileSync(output, 'utf8')), values); + const result = await run.finish(); + assert.equal(result.status, 'passed'); } else if (mode === 'transport') { const { startReportTransport } = await import(lib('reporting/transport.js')); const run = reporter({ kind: 'lifecycle' }); diff --git a/packages/agentic/desktop-test/src/contracts.test.ts b/packages/agentic/desktop-test/src/contracts.test.ts index 6702f2fcae9..ab84b087e3b 100644 --- a/packages/agentic/desktop-test/src/contracts.test.ts +++ b/packages/agentic/desktop-test/src/contracts.test.ts @@ -7,6 +7,7 @@ describe('neutral desktop harness contracts', () => { 'adapters', 'reporting', 'commands', + 'command-arguments', 'transport', 'delegated-cli', 'services', @@ -31,7 +32,9 @@ describe('neutral desktop harness contracts', () => { function runContract(mode: string): Promise { return new Promise((resolve, reject) => { - const child = spawn(process.execPath, [path.join(__dirname, 'contracts.contract.cjs'), mode], { stdio: ['ignore', 'pipe', 'pipe'] }); + const child = spawn(process.execPath, ['--throw-deprecation', path.join(__dirname, 'contracts.contract.cjs'), mode], { + stdio: ['ignore', 'pipe', 'pipe'], + }); const stdout: Buffer[] = []; const stderr: Buffer[] = []; child.stdout.on('data', (chunk: Buffer) => stdout.push(chunk)); diff --git a/packages/codemods/src/transforms/__tests__/button-v0-to-v1.test.ts b/packages/codemods/src/transforms/__tests__/button-v0-to-v1.test.ts index 592f9f68dc9..f34ce1f5d51 100644 --- a/packages/codemods/src/transforms/__tests__/button-v0-to-v1.test.ts +++ b/packages/codemods/src/transforms/__tests__/button-v0-to-v1.test.ts @@ -1,7 +1,18 @@ -import { defineTest } from 'jscodeshift/dist/testUtils'; +import { readFileSync } from 'node:fs'; +import path from 'node:path'; +import { applyTransform, defineTest } from 'jscodeshift/dist/testUtils'; +import transform from '../button-v0-to-v1'; jest.autoMockOff(); describe('button-v0-to-v1', () => { defineTest(__dirname, 'button-v0-to-v1', null, 'button-v0-to-v1', { parser: 'tsx' }); + + test('preserves CRLF source line endings', () => { + const fixture = (kind: string) => + readFileSync(path.join(__dirname, '..', '__testfixtures__', `button-v0-to-v1.${kind}.tsx`), 'utf8') + .replaceAll('\r\n', '\n') + .replaceAll('\n', '\r\n'); + expect(applyTransform(transform, {}, { source: fixture('input') }, { parser: 'tsx' })).toBe(fixture('output').trim()); + }); }); diff --git a/packages/codemods/src/transforms/__tests__/deprecate-exports.test.ts b/packages/codemods/src/transforms/__tests__/deprecate-exports.test.ts index 6e128eaa44a..1ee7a260cc8 100644 --- a/packages/codemods/src/transforms/__tests__/deprecate-exports.test.ts +++ b/packages/codemods/src/transforms/__tests__/deprecate-exports.test.ts @@ -1,7 +1,18 @@ -import { defineTest } from 'jscodeshift/dist/testUtils'; +import { readFileSync } from 'node:fs'; +import path from 'node:path'; +import { applyTransform, defineTest } from 'jscodeshift/dist/testUtils'; +import transform from '../deprecate-exports'; jest.autoMockOff(); describe('deprecate-exports', () => { defineTest(__dirname, 'deprecate-exports', null, 'deprecate-exports', { parser: 'tsx' }); + + test('preserves CRLF source line endings', () => { + const fixture = (kind: string) => + readFileSync(path.join(__dirname, '..', '__testfixtures__', `deprecate-exports.${kind}.tsx`), 'utf8') + .replaceAll('\r\n', '\n') + .replaceAll('\n', '\r\n'); + expect(applyTransform(transform, {}, { source: fixture('input') }, { parser: 'tsx' })).toBe(fixture('output').trim()); + }); }); diff --git a/packages/codemods/src/transforms/button-v0-to-v1.ts b/packages/codemods/src/transforms/button-v0-to-v1.ts index 5f034f2e7bf..d3eb3b4c001 100644 --- a/packages/codemods/src/transforms/button-v0-to-v1.ts +++ b/packages/codemods/src/transforms/button-v0-to-v1.ts @@ -4,6 +4,7 @@ export const transform: Transform = (fileInfo: FileInfo, api: API, options: Opti const j: JSCodeshift = api.jscodeshift; const printOptions = options.printOptions || { + lineTerminator: fileInfo.source.includes('\r\n') ? '\r\n' : '\n', printWidth: 140, quote: 'single', tabWidth: 2, diff --git a/packages/codemods/src/transforms/deprecate-exports.ts b/packages/codemods/src/transforms/deprecate-exports.ts index 8855f82dd43..e86239ee5cf 100644 --- a/packages/codemods/src/transforms/deprecate-exports.ts +++ b/packages/codemods/src/transforms/deprecate-exports.ts @@ -4,6 +4,7 @@ export const transform: Transform = (fileInfo: FileInfo, api: API, options: Opti const j: JSCodeshift = api.jscodeshift; const printOptions = options.printOptions || { + lineTerminator: fileInfo.source.includes('\r\n') ? '\r\n' : '\n', printWidth: 140, quote: 'single', tabWidth: 2, diff --git a/references/agents/repository/development.md b/references/agents/repository/development.md index d195947c045..a68a2fd349b 100644 --- a/references/agents/repository/development.md +++ b/references/agents/repository/development.md @@ -61,6 +61,9 @@ Set up a clone with `yarn` to install dependencies, then `yarn build`. | `yarn change` / `change:check` | Create or validate changesets; see [release](release.md) | Lage caches task outputs in `node_modules/.cache/lage`. Iterate with cached runs, and add `--verbose` for detail. +The repository patches Lage 2.14.19's task runner to use `cross-spawn` instead of spawning argument arrays with +`shell: true` on Windows. The root resolution and matching `.yarnrc.yml` package extension must stay together; +remove both once the upstream runner supports Windows command shims without DEP0190. `--no-cache` bypasses the cache for one run but leaves earlier entries in place, so a later cached run can still reuse results for tasks the uncached run never reached. For final validation, clear the cache instead (R-VALID-003). Before committing moved or renamed files, run `yarn lage test-links` and update stale links. diff --git a/scripts/package.json b/scripts/package.json index f1d4828eed4..2ed46c544de 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -30,7 +30,7 @@ "bundlesize": "bundlesize --debug", "format": "node ./src/cli.ts format", "lint": "node ./src/cli.ts lint", - "test": "node --test src/tasks/agentInstructions.test.ts src/tasks/clean.test.mjs src/utils/jestSelection.test.ts" + "test": "node --test src/tasks/agentInstructions.test.ts src/tasks/clean.test.mjs src/utils/jestSelection.test.ts src/utils/runScript.test.ts" }, "dependencies": { "@babel/core": "catalog:", @@ -53,6 +53,7 @@ "@rnx-kit/tsconfig": "catalog:", "@rnx-kit/types-kit-config": "catalog:", "babel-jest": "^29.0.0", + "cross-spawn": "7.0.6", "oxlint": "1.76.0" }, "devDependencies": { @@ -72,6 +73,7 @@ "@rnx-kit/tsconfig": "catalog:", "@rnx-kit/types-kit-config": "catalog:", "@rnx-kit/types-node": "catalog:", + "@types/cross-spawn": "6.0.6", "@types/micromatch": "^4.0.9", "@types/node": "catalog:", "@yarnpkg/types": "^4.0.1", diff --git a/scripts/src/tasks/checkPackageContentsTask.ts b/scripts/src/tasks/checkPackageContentsTask.ts index 5cf8353504a..b8f23452644 100644 --- a/scripts/src/tasks/checkPackageContentsTask.ts +++ b/scripts/src/tasks/checkPackageContentsTask.ts @@ -3,6 +3,7 @@ import { existsSync, readFileSync } from 'node:fs'; import path from 'node:path'; import { Command } from 'clipanion'; +import spawn from 'cross-spawn'; import micromatch from 'micromatch'; import { findGitRoot } from 'workspace-tools'; @@ -87,14 +88,16 @@ export class CheckPackageContentsCommand extends Command { let locations: Set; try { - const output = execFileSync('yarn', ['pack', '--dry-run', '--json'], { + const result = spawn.sync('yarn', ['pack', '--dry-run', '--json'], { cwd: packageRoot, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], maxBuffer: 64 * 1024 * 1024, }); + if (result.error) throw result.error; + if (result.status !== 0) throw new Error(result.stderr || `Yarn exited with ${result.status ?? result.signal}`); locations = new Set( - output + result.stdout .split(/\r?\n/) .filter(Boolean) .map((line) => JSON.parse(line) as { location?: string }) diff --git a/scripts/src/utils/runScript.test.ts b/scripts/src/utils/runScript.test.ts new file mode 100644 index 00000000000..44a219b54b7 --- /dev/null +++ b/scripts/src/utils/runScript.test.ts @@ -0,0 +1,19 @@ +import assert from 'node:assert/strict'; +import { it } from 'node:test'; + +import { captureScript, runYarn } from './runScript.ts'; + +it('launches Yarn without relying on a shell-backed spawn', async () => { + assert.equal(await runYarn('--version'), 0); +}); + +it('preserves a nonzero Yarn command exit status', async () => { + assert.equal(await runYarn('node', '-e', 'process.exit(7)'), 7); +}); + +it('captures a package binary output and preserves argument boundaries', async () => { + const pattern = 'test with spaces & (parentheses) "quotes"'; + const result = await captureScript('jest', ['--showConfig', '--testNamePattern', pattern]); + assert.equal(result.code, 0); + assert.equal(JSON.parse(result.stdout).globalConfig.testNamePattern, pattern); +}); diff --git a/scripts/src/utils/runScript.ts b/scripts/src/utils/runScript.ts index db29e9a0f15..f342a65312e 100644 --- a/scripts/src/utils/runScript.ts +++ b/scripts/src/utils/runScript.ts @@ -1,4 +1,5 @@ -import { spawn, type SpawnOptions } from 'node:child_process'; +import type { SpawnOptions } from 'node:child_process'; +import spawn from 'cross-spawn'; import { PackageContext } from '../pkgContext.ts'; import os from 'node:os'; @@ -24,7 +25,6 @@ function resolveScript(command: string, args: string[], options?: SpawnOptions): const spawnOptions: SpawnOptions = { cwd: process.cwd(), stdio: 'inherit', - shell: verb.endsWith('.cmd') || verb.endsWith('.bat') ? true : undefined, ...options, }; return [verb, spawnArgs, spawnOptions]; @@ -33,10 +33,12 @@ function resolveScript(command: string, args: string[], options?: SpawnOptions): export async function runScript(command: string, args: string[], options?: SpawnOptions): Promise { const [verb, spawnArgs, spawnOptions] = resolveScript(command, args, options); - return new Promise((resolve) => { - spawn(verb, spawnArgs, spawnOptions).on('close', (code) => { - resolve(code ?? -1); - }); + return new Promise((resolve, reject) => { + spawn(verb, spawnArgs, spawnOptions) + .on('error', reject) + .on('close', (code) => { + resolve(code ?? -1); + }); }); } @@ -63,12 +65,14 @@ export async function captureScript(command: string, args: string[], options?: S export async function runYarn(command: string, ...args: string[]): Promise { const verb = yarnVerb; const spawnArgs = [command, ...args]; - return new Promise((resolve) => { + return new Promise((resolve, reject) => { spawn(verb, spawnArgs, { cwd: process.cwd(), stdio: 'inherit', - }).on('close', (code) => { - resolve(code ?? -1); - }); + }) + .on('error', reject) + .on('close', (code) => { + resolve(code ?? -1); + }); }); } diff --git a/yarn.lock b/yarn.lock index d59bb93267b..5e6872b3ec1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3328,12 +3328,14 @@ __metadata: "@fluentui-react-native/desktop-driver": "workspace:*" "@fluentui-react-native/scripts": "workspace:*" "@rnx-kit/reporter": "catalog:" + "@types/cross-spawn": "npm:6.0.6" "@wdio/cli": "catalog:" "@wdio/jasmine-framework": "catalog:" "@wdio/local-runner": "catalog:" "@wdio/reporter": "catalog:" "@wdio/runner": "catalog:" commander: "npm:^14.0.2" + cross-spawn: "npm:7.0.6" expect-webdriverio: "catalog:" import-meta-resolve: "npm:4.2.0" webdriverio: "catalog:" @@ -4761,12 +4763,14 @@ __metadata: "@rnx-kit/tsconfig": "catalog:" "@rnx-kit/types-kit-config": "catalog:" "@rnx-kit/types-node": "catalog:" + "@types/cross-spawn": "npm:6.0.6" "@types/micromatch": "npm:^4.0.9" "@types/node": "catalog:" "@yarnpkg/types": "npm:^4.0.1" babel-jest: "npm:^29.0.0" chalk: "npm:^4.0.0" clipanion: "npm:^4.0.0-rc.4" + cross-spawn: "npm:7.0.6" depcheck: "npm:^1.0.0" find-up: "npm:^5.0.0" jest: "npm:^29.2.1" @@ -9984,6 +9988,15 @@ __metadata: languageName: node linkType: hard +"@types/cross-spawn@npm:6.0.6": + version: 6.0.6 + resolution: "@types/cross-spawn@npm:6.0.6" + dependencies: + "@types/node": "npm:*" + checksum: 10c0/e3d476bb6b3a54a8934a97fe6ee4bd13e2e5eb29073929a4be76a52466602ffaea420b20774ffe8503f9fa24f3ae34817e95e7f625689fb0d1c10404f5b2889c + languageName: node + linkType: hard + "@types/deep-eql@npm:*": version: 4.0.2 resolution: "@types/deep-eql@npm:4.0.2" @@ -12789,6 +12802,17 @@ __metadata: languageName: node linkType: hard +"cross-spawn@npm:7.0.6, cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.3, cross-spawn@npm:^7.0.6": + version: 7.0.6 + resolution: "cross-spawn@npm:7.0.6" + dependencies: + path-key: "npm:^3.1.0" + shebang-command: "npm:^2.0.0" + which: "npm:^2.0.1" + checksum: 10c0/053ea8b2135caff68a9e81470e845613e374e7309a47731e81639de3eaeb90c3d01af0e0b44d2ab9d50b43467223b88567dfeb3262db942dc063b9976718ffc1 + languageName: node + linkType: hard + "cross-spawn@npm:^6.0.0": version: 6.0.6 resolution: "cross-spawn@npm:6.0.6" @@ -12802,17 +12826,6 @@ __metadata: languageName: node linkType: hard -"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.3, cross-spawn@npm:^7.0.6": - version: 7.0.6 - resolution: "cross-spawn@npm:7.0.6" - dependencies: - path-key: "npm:^3.1.0" - shebang-command: "npm:^2.0.0" - which: "npm:^2.0.1" - checksum: 10c0/053ea8b2135caff68a9e81470e845613e374e7309a47731e81639de3eaeb90c3d01af0e0b44d2ab9d50b43467223b88567dfeb3262db942dc063b9976718ffc1 - languageName: node - linkType: hard - "css-select@npm:^5.1.0": version: 5.1.0 resolution: "css-select@npm:5.1.0" @@ -16726,7 +16739,7 @@ __metadata: languageName: node linkType: hard -"lage@npm:^2.14.19": +"lage@npm:2.14.19": version: 2.14.19 resolution: "lage@npm:2.14.19" dependencies: @@ -16742,6 +16755,22 @@ __metadata: languageName: node linkType: hard +"lage@patch:lage@npm%3A2.14.19#~/.yarn/patches/lage-npm-2.14.19-5dcab627c8.patch": + version: 2.14.19 + resolution: "lage@patch:lage@npm%3A2.14.19#~/.yarn/patches/lage-npm-2.14.19-5dcab627c8.patch::version=2.14.19&hash=9861b7" + dependencies: + fsevents: "npm:~2.3.2" + glob-hasher: "npm:^1.4.2" + dependenciesMeta: + fsevents: + optional: true + bin: + lage: dist/lage.js + lage-server: dist/lage-server.js + checksum: 10c0/3f0bfa00658f5eb9a659fa29c50c3b7c02ae45e6e996c0e0114b20024cf33e07f787eba73245a596281890e274e1bd4e3b4af0b3f88452862aa034cefa88fcad + languageName: node + linkType: hard + "launch-editor@npm:2.14.2, launch-editor@npm:^2.14.1": version: 2.14.2 resolution: "launch-editor@npm:2.14.2"