Skip to content

Commit 7b4ff81

Browse files
bump prettier to 2.8.4
1 parent a7ffbd2 commit 7b4ff81

File tree

4 files changed

+23
-20
lines changed

4 files changed

+23
-20
lines changed

__tests__/main.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ describe("filename tests", () => {
2424
["protoc-3.20.2-osx-aarch_64.zip", "darwin", "arm64"],
2525
["protoc-3.20.2-osx-x86_64.zip", "darwin", "x64"],
2626
["protoc-3.20.2-win64.zip", "win32", "x64"],
27-
["protoc-3.20.2-win32.zip", "win32", "x32"]
27+
["protoc-3.20.2-win32.zip", "win32", "x32"],
2828
];
2929
it(`Downloads all expected versions correctly`, () => {
3030
for (const [expected, plat, arch] of tests) {
@@ -35,7 +35,7 @@ describe("filename tests", () => {
3535
});
3636

3737
describe("installer tests", () => {
38-
beforeEach(async function() {
38+
beforeEach(async function () {
3939
await io.rmRF(toolDir);
4040
await io.rmRF(tempDir);
4141
await io.mkdirP(toolDir);

package-lock.json

Lines changed: 8 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"markdown-link-check": "^3.10.2",
4949
"markdownlint-cli": "^0.32.2",
5050
"nock": "^10.0.6",
51-
"prettier": "^1.17.1",
51+
"prettier": "^2.8.4",
5252
"ts-jest": "^24.0.2",
5353
"typescript": "^4.9.5"
5454
}

src/installer.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ export async function getProtoc(
7777
listeners: {
7878
stdout: (data: Buffer) => {
7979
stdOut += data.toString();
80-
}
81-
}
80+
},
81+
},
8282
};
8383

8484
await exc.exec("go", ["env", "GOPATH"], options);
@@ -189,7 +189,7 @@ async function fetchVersions(
189189
let rest: restm.RestClient;
190190
if (repoToken != "") {
191191
rest = new restm.RestClient("setup-protoc", "", [], {
192-
headers: { Authorization: "Bearer " + repoToken }
192+
headers: { Authorization: "Bearer " + repoToken },
193193
});
194194
} else {
195195
rest = new restm.RestClient("setup-protoc");
@@ -210,9 +210,9 @@ async function fetchVersions(
210210
}
211211

212212
return tags
213-
.filter(tag => tag.tag_name.match(/v\d+\.[\w.]+/g))
214-
.filter(tag => includePrerelease(tag.prerelease, includePreReleases))
215-
.map(tag => tag.tag_name.replace("v", ""));
213+
.filter((tag) => tag.tag_name.match(/v\d+\.[\w.]+/g))
214+
.filter((tag) => includePrerelease(tag.prerelease, includePreReleases))
215+
.map((tag) => tag.tag_name.replace("v", ""));
216216
}
217217

218218
// Compute an actual version starting from the `version` configuration param.
@@ -232,15 +232,15 @@ async function computeVersion(
232232
}
233233

234234
const allVersions = await fetchVersions(includePreReleases, repoToken);
235-
const validVersions = allVersions.filter(v => semver.valid(v));
236-
const possibleVersions = validVersions.filter(v => v.startsWith(version));
235+
const validVersions = allVersions.filter((v) => semver.valid(v));
236+
const possibleVersions = validVersions.filter((v) => v.startsWith(version));
237237

238238
const versionMap = new Map();
239-
possibleVersions.forEach(v => versionMap.set(normalizeVersion(v), v));
239+
possibleVersions.forEach((v) => versionMap.set(normalizeVersion(v), v));
240240

241241
const versions = Array.from(versionMap.keys())
242242
.sort(semver.rcompare)
243-
.map(v => versionMap.get(v));
243+
.map((v) => versionMap.get(v));
244244

245245
core.debug(`evaluating ${versions.length} versions`);
246246

@@ -266,7 +266,7 @@ function normalizeVersion(version: string): string {
266266
} else {
267267
// handle beta and rc
268268
// e.g. 1.10beta1 -? 1.10.0-beta1, 1.10rc1 -> 1.10.0-rc1
269-
if (preStrings.some(el => versionPart[1].includes(el))) {
269+
if (preStrings.some((el) => versionPart[1].includes(el))) {
270270
versionPart[1] = versionPart[1]
271271
.replace("beta", ".0-beta")
272272
.replace("rc", ".0-rc")
@@ -282,7 +282,7 @@ function normalizeVersion(version: string): string {
282282
} else {
283283
// handle beta and rc
284284
// e.g. 1.8.5beta1 -> 1.8.5-beta1, 1.8.5rc1 -> 1.8.5-rc1
285-
if (preStrings.some(el => versionPart[2].includes(el))) {
285+
if (preStrings.some((el) => versionPart[2].includes(el))) {
286286
versionPart[2] = versionPart[2]
287287
.replace("beta", "-beta")
288288
.replace("rc", "-rc")

0 commit comments

Comments
 (0)