Skip to content

Commit 61653fd

Browse files
committed
Fix some build issues.
1 parent 271b488 commit 61653fd

File tree

11 files changed

+14
-26
lines changed

11 files changed

+14
-26
lines changed

apps/heft/src/utilities/subprocess/SubprocessTerminator.ts

-8
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,6 @@ import { Executable } from '@rushstack/node-core-library';
55
import * as child_process from 'child_process';
66
import process from 'process';
77

8-
declare module 'child_process' {
9-
/* eslint-disable */
10-
interface ChildProcess {
11-
exitCode?: number | null;
12-
}
13-
/* eslint-enable */
14-
}
15-
168
/**
179
* Details about how the `child_process.ChildProcess` was created.
1810
*/

apps/rush-lib/src/cli/scriptActions/BaseScriptAction.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export abstract class BaseScriptAction extends BaseRushAction {
8282
throw new Error(
8383
`${RushConstants.commandLineFilename} defines a parameter "${
8484
(parameterJson as ParameterJson).longName
85-
}"` + ` using an unsupported parameter kind "${(parameterJson as ParameterJson).parameterKind}"`
85+
}" using an unsupported parameter kind "${(parameterJson as ParameterJson).parameterKind}"`
8686
);
8787
}
8888

apps/rush-lib/src/logic/buildCache/ProjectBuildCache.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// See LICENSE in the project root for license information.
33

44
import * as path from 'path';
5-
import * as events from 'events';
5+
import events from 'events';
66
import * as crypto from 'crypto';
77
import type * as stream from 'stream';
88
import * as tar from 'tar';

apps/rush-lib/src/utilities/TarExecutable.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import * as path from 'path';
55
import { Executable, FileSystem, FileWriter, Terminal } from '@rushstack/node-core-library';
66
import { ChildProcess } from 'child_process';
7-
import * as events from 'events';
7+
import events from 'events';
88

99
import { RushConfigurationProject } from '../api/RushConfigurationProject';
1010
import { EnvironmentConfiguration } from '../api/EnvironmentConfiguration';
@@ -151,8 +151,8 @@ export class TarExecutable {
151151
currentWorkingDirectory: currentWorkingDirectory
152152
});
153153

154-
childProcess.stdout.on('data', (chunk) => fileWriter.write(`[stdout] ${chunk}`));
155-
childProcess.stderr.on('data', (chunk) => fileWriter.write(`[stderr] ${chunk}`));
154+
childProcess.stdout?.on('data', (chunk) => fileWriter.write(`[stdout] ${chunk}`));
155+
childProcess.stderr?.on('data', (chunk) => fileWriter.write(`[stderr] ${chunk}`));
156156

157157
const [tarExitCode] = await events.once(childProcess, 'exit');
158158

build-tests/api-extractor-lib1-test/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
},
1111
"devDependencies": {
1212
"@microsoft/api-extractor": "workspace:*",
13-
"@types/node": "12.20.24",
1413
"fs-extra": "~7.0.1",
1514
"typescript": "~2.9.2"
1615
}

build-tests/api-extractor-lib1-test/tsconfig.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
"sourceMap": true,
88
"experimentalDecorators": true,
99
"strictNullChecks": true,
10-
"types": ["node"],
1110
"lib": ["es5", "scripthost", "es2015.collection", "es2015.promise", "es2015.iterable", "dom"],
1211
"outDir": "lib"
1312
},
14-
"include": ["src/**/*.ts", "typings/tsd.d.ts"]
13+
"include": ["src/**/*.ts"]
1514
}

build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common/config/rush/pnpm-lock.yaml

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common/config/rush/repo-state.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
22
{
3-
"pnpmShrinkwrapHash": "0bdff54ae475bbd646622ab3543a206dc49ba3cf",
3+
"pnpmShrinkwrapHash": "37ed8324429452c58d3ab8468ca58080ef354ec5",
44
"preferredVersionsHash": "fe0ea762c60633ea39d8abd6f7e0791352654f89"
55
}

libraries/debug-certificate-manager/src/exec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ export async function runAsync(command: string, params: string[]): Promise<IRunR
2828
async function _handleChildProcess(childProcess: child_process.ChildProcess): Promise<IRunResult> {
2929
return await new Promise((resolve: (result: IRunResult) => void) => {
3030
const stderr: string[] = [];
31-
childProcess.stderr.on('data', (data: Buffer) => {
31+
childProcess.stderr?.on('data', (data: Buffer) => {
3232
stderr.push(data.toString());
3333
});
3434

3535
const stdout: string[] = [];
36-
childProcess.stdout.on('data', (data: Buffer) => {
36+
childProcess.stdout?.on('data', (data: Buffer) => {
3737
stdout.push(data.toString());
3838
});
3939

libraries/node-core-library/src/JsonFile.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export interface IJsonFileSaveOptions extends IJsonFileStringifyOptions {
9898
updateExistingFile?: boolean;
9999
}
100100

101-
const DEFAULT_ENCODING = 'utf8';
101+
const DEFAULT_ENCODING: 'utf8' = 'utf8';
102102

103103
/**
104104
* Utilities for reading/writing JSON files.

0 commit comments

Comments
 (0)