Skip to content

Commit 3d410c9

Browse files
Merge pull request #2826 from github/robertbrignull/any/deploy.ts
Avoid use of "as any" in gulpfile.ts/deploy.ts
2 parents 1b0f0f4 + ef38ffa commit 3d410c9

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

extensions/ql-vscode/gulpfile.ts/deploy.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
} from "fs-extra";
1010
import { resolve, join } from "path";
1111
import { isDevBuild } from "./dev";
12+
import type * as packageJsonType from "../package.json";
1213

1314
export interface DeployedPackage {
1415
distPath: string;
@@ -46,12 +47,10 @@ async function copyPackage(
4647
);
4748
}
4849

49-
export async function deployPackage(
50-
packageJsonPath: string,
51-
): Promise<DeployedPackage> {
50+
export async function deployPackage(): Promise<DeployedPackage> {
5251
try {
53-
const packageJson: any = JSON.parse(
54-
await readFile(packageJsonPath, "utf8"),
52+
const packageJson: typeof packageJsonType = JSON.parse(
53+
await readFile(resolve(__dirname, "../package.json"), "utf8"),
5554
);
5655

5756
const distDir = join(__dirname, "../../../dist");

extensions/ql-vscode/gulpfile.ts/package.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ import { deployPackage } from "./deploy";
33
import { spawn } from "child-process-promise";
44

55
export async function packageExtension(): Promise<void> {
6-
const deployedPackage = await deployPackage(
7-
resolve(__dirname, "../package.json"),
8-
);
6+
const deployedPackage = await deployPackage();
97
console.log(
108
`Packaging extension '${deployedPackage.name}@${deployedPackage.version}'...`,
119
);

extensions/ql-vscode/gulpfile.ts/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://json.schemastore.org/tsconfig",
33
"extends": "../tsconfig.json",
44
"compilerOptions": {
5-
"rootDir": "."
5+
"rootDir": ".."
66
},
77
"include": ["*.ts"]
88
}

0 commit comments

Comments
 (0)