Skip to content

Commit f79ac5b

Browse files
felixfbeckerfelixfbecker
committed
chore: upgrade eslint
1 parent 5c1128a commit f79ac5b

File tree

6 files changed

+251
-261
lines changed

6 files changed

+251
-261
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"devDependencies": {
6464
"@commitlint/cli": "^11.0.0",
6565
"@commitlint/config-conventional": "^11.0.0",
66-
"@sourcegraph/eslint-config": "^0.20.10",
66+
"@sourcegraph/eslint-config": "^0.20.19",
6767
"@sourcegraph/prettierrc": "^3.0.3",
6868
"@sourcegraph/tsconfig": "^4.0.1",
6969
"@types/execa": "0.9.0",
@@ -73,7 +73,7 @@
7373
"@types/mz": "2.7.1",
7474
"@types/node": "12.12.31",
7575
"download-cli": "^1.1.1",
76-
"eslint": "^7.10.0",
76+
"eslint": "^7.17.0",
7777
"husky": "^4.2.3",
7878
"json-schema-to-typescript": "^8.2.0",
7979
"prettier": "^2.1.2",

‎src/buildkite.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ export async function initBuildkite({
8585
responseType: 'json',
8686
resolveBodyOnly: true,
8787
})
88-
} catch (err) {
88+
} catch (error) {
8989
if (
90-
err instanceof HTTPError &&
91-
(err.response.body as any)?.errors?.some?.(
92-
(err: any) => err?.field === 'name' && err?.code === 'already_exists'
90+
error instanceof HTTPError &&
91+
(error.response.body as any)?.errors?.some?.(
92+
(error_: any) => error_?.field === 'name' && error_?.code === 'already_exists'
9393
)
9494
) {
9595
console.log(`Buildkite pipeline "${repoName}" already exists, skipping creation`)
@@ -98,7 +98,7 @@ export async function initBuildkite({
9898
resolveBodyOnly: true,
9999
})
100100
} else {
101-
throw err
101+
throw error
102102
}
103103
}
104104

@@ -114,16 +114,16 @@ export async function initBuildkite({
114114
},
115115
},
116116
})
117-
} catch (err) {
117+
} catch (error) {
118118
if (
119-
err instanceof HTTPError &&
120-
(err.response.body as any)?.errors?.some?.(
121-
(err: any) => typeof err?.message === 'string' && /hook already exists/i.test(err.message)
119+
error instanceof HTTPError &&
120+
(error.response.body as any)?.errors?.some?.(
121+
(error_: any) => typeof error_?.message === 'string' && /hook already exists/i.test(error_.message)
122122
)
123123
) {
124124
console.log('Webhook already exists')
125125
} else {
126-
throw err
126+
throw error
127127
}
128128
}
129129

‎src/cli.ts‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ async function main(): Promise<void> {
6666
let description: string | undefined
6767
try {
6868
;({ name: packageName, description } = JSON.parse(await readFile('package.json', 'utf-8')))
69-
} catch (err) {
70-
if (err.code !== 'ENOENT') {
71-
throw err
69+
} catch (error) {
70+
if (error.code !== 'ENOENT') {
71+
throw error
7272
}
7373
}
7474
if (packageName) {
@@ -110,22 +110,22 @@ async function main(): Promise<void> {
110110
},
111111
})
112112
console.log(`📘 Created https://github.com/sourcegraph/${repoName}`)
113-
} catch (err) {
113+
} catch (error) {
114114
if (
115-
err instanceof HTTPError &&
116-
(err.response.body as any)?.errors?.some?.(
117-
(err: any) =>
118-
err?.resource === 'Repository' &&
119-
err?.field === 'name' &&
120-
typeof err?.message === 'string' &&
121-
/already exists/i.test(err.message)
115+
error instanceof HTTPError &&
116+
(error.response.body as any)?.errors?.some?.(
117+
(error_: any) =>
118+
error_?.resource === 'Repository' &&
119+
error_?.field === 'name' &&
120+
typeof error_?.message === 'string' &&
121+
/already exists/i.test(error_.message)
122122
)
123123
) {
124124
console.log(
125125
`📘 Repository already exists at https://github.com/sourcegraph/${repoName}, skipping creation`
126126
)
127127
} else {
128-
throw err
128+
throw error
129129
}
130130
}
131131
await exec('git', ['remote', 'add', 'origin', `https://github.com/sourcegraph/${repoName}.git`])
@@ -157,8 +157,8 @@ async function main(): Promise<void> {
157157
resolveBodyOnly: true,
158158
})
159159
const licenseText = license.body
160-
.replace(/\[year\]/g, new Date().getFullYear().toString())
161-
.replace(/\[fullname\]/g, 'Sourcegraph')
160+
.replace(/\[year]/g, new Date().getFullYear().toString())
161+
.replace(/\[fullname]/g, 'Sourcegraph')
162162
await writeFile('LICENSE', licenseText)
163163
}
164164

@@ -267,9 +267,9 @@ async function main(): Promise<void> {
267267
try {
268268
packageJson = JSON.parse(await readFile('package.json', 'utf-8'))
269269
console.log('📄 package.json already exists, skipping creation')
270-
} catch (err) {
271-
if (err.code !== 'ENOENT') {
272-
throw err
270+
} catch (error) {
271+
if (error.code !== 'ENOENT') {
272+
throw error
273273
}
274274
console.log('📄 Adding package.json')
275275
packageJson = {
@@ -321,9 +321,9 @@ async function main(): Promise<void> {
321321
try {
322322
console.log('📂 Creating src directory')
323323
await mkdir('src')
324-
} catch (err) {
325-
if (err.code !== 'EEXIST') {
326-
throw err
324+
} catch (error) {
325+
if (error.code !== 'EEXIST') {
326+
throw error
327327
}
328328
}
329329
@@ -437,11 +437,11 @@ async function main(): Promise<void> {
437437
setTimeout(() => process.exit(0), 100)
438438
}
439439

440-
main().catch(err => {
441-
if (err.showStack === false) {
442-
console.error('\n' + chalk.red(err.message) + '\n')
440+
main().catch(error => {
441+
if (error.showStack === false) {
442+
console.error('\n' + chalk.red(error.message) + '\n')
443443
} else {
444-
console.error(err)
444+
console.error(error)
445445
}
446446
setTimeout(() => process.exit(1), 100)
447447
})

‎src/npm.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ export async function createSourcegraphBotNpmToken(): Promise<string> {
2727
body,
2828
auth: { otp },
2929
},
30-
(err: any, data: any, raw: any, response: any) =>
31-
err ? reject(Object.assign(err, { response })) : resolve(data)
30+
(error: any, data: any, raw: any, response: any) =>
31+
error ? reject(Object.assign(error, { response })) : resolve(data)
3232
)
3333
)
3434
if (!response.token) {

‎src/travis.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const createTravisClient = ({ token }: { token: string }): TravisClient =
1717
},
1818
})
1919

20-
const createTravisEnvVar = async ({
20+
const createTravisEnvironmentVar = async ({
2121
repoName,
2222
name,
2323
value,
@@ -51,7 +51,7 @@ interface TravisUser {
5151
synced_at: string
5252
}
5353

54-
interface TravisEnvVarsResult {
54+
interface TravisEnvironmentVarsResult {
5555
env_vars: {
5656
name: string
5757
}[]
@@ -131,31 +131,31 @@ export async function initTravis({
131131
console.log(`Activating repository at https://travis-ci.org/sourcegraph/${repoName}`)
132132
await travisClient.post(`repo/github/sourcegraph%2F${repoName}/activate`)
133133
break
134-
} catch (err) {
135-
console.log(err.response)
136-
if (!(err instanceof HTTPError) || err.response.statusCode !== 404) {
137-
throw err
134+
} catch (error) {
135+
console.log(error.response)
136+
if (!(error instanceof HTTPError) || error.response.statusCode !== 404) {
137+
throw error
138138
}
139139
}
140140
}
141141

142-
const envVars = await travisClient.get<TravisEnvVarsResult>(`repo/github/sourcegraph%2F${repoName}/env_vars`, {
142+
const environmentVars = await travisClient.get<TravisEnvironmentVarsResult>(`repo/github/sourcegraph%2F${repoName}/env_vars`, {
143143
responseType: 'json',
144144
resolveBodyOnly: true,
145145
})
146-
if (envVars.env_vars.some(envVar => envVar.name === 'NPM_TOKEN')) {
146+
if (environmentVars.env_vars.some(environmentVar => environmentVar.name === 'NPM_TOKEN')) {
147147
console.log('🔑 NPM_TOKEN already set in Travis, skipping creation')
148148
} else {
149149
const npmToken = await createSourcegraphBotNpmToken()
150150
console.log('🔑 Setting NPM_TOKEN env var in Travis')
151-
await createTravisEnvVar({ repoName, name: 'NPM_TOKEN', value: npmToken, branch: 'master', travisClient })
151+
await createTravisEnvironmentVar({ repoName, name: 'NPM_TOKEN', value: npmToken, branch: 'master', travisClient })
152152
}
153153

154-
if (envVars.env_vars.some(envVar => envVar.name === 'GITHUB_TOKEN')) {
154+
if (environmentVars.env_vars.some(environmentVar => environmentVar.name === 'GITHUB_TOKEN')) {
155155
console.log('🔑 GITHUB_TOKEN already set in Travis, skipping creation')
156156
} else {
157157
const githubToken = await createSourcegraphBotGitHubToken({ repoName, githubClient })
158158
console.log('🔑 Setting GITHUB_TOKEN env var in Travis')
159-
await createTravisEnvVar({ repoName, name: 'GITHUB_TOKEN', value: githubToken, branch: 'master', travisClient })
159+
await createTravisEnvironmentVar({ repoName, name: 'GITHUB_TOKEN', value: githubToken, branch: 'master', travisClient })
160160
}
161161
}

0 commit comments

Comments
 (0)