Skip to content

Commit 7d74cbf

Browse files
committed
Cleanup formatting
1 parent bf276bd commit 7d74cbf

17 files changed

+138
-367
lines changed

prettier.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ export default {
55
trailingComma: 'all',
66
plugins: ['@ianvs/prettier-plugin-sort-imports'],
77
importOrder: ['^@', '^[a-zA-Z0-9-]+', '^[./]'],
8+
printWidth: 120,
89
}

scripts/copy-licenses.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import checker from 'license-checker'
55

66
const __dirname = path.dirname(fileURLToPath(import.meta.url))
77

8-
const pkg = JSON.parse(
9-
await fs.readFile(path.resolve(__dirname, '../package.json'), 'utf8'),
10-
)
8+
const pkg = JSON.parse(await fs.readFile(path.resolve(__dirname, '../package.json'), 'utf8'))
119

1210
let exclude = [
1311
'cpy-cli',
@@ -42,8 +40,5 @@ for (let key in packages) {
4240

4341
let dir = path.resolve(__dirname, '../dist/licenses', name)
4442
await fs.mkdir(dir, { recursive: true })
45-
await fs.copyFile(
46-
dep.licenseFile,
47-
path.resolve(dir, path.basename(dep.licenseFile)),
48-
)
43+
await fs.copyFile(dep.licenseFile, path.resolve(dir, path.basename(dep.licenseFile)))
4944
}

scripts/release-channel.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ import { fileURLToPath } from 'node:url'
1212

1313
const __dirname = path.dirname(fileURLToPath(import.meta.url))
1414

15-
const pkg = JSON.parse(
16-
await fs.readFile(path.resolve(__dirname, '../package.json'), 'utf8'),
17-
)
15+
const pkg = JSON.parse(await fs.readFile(path.resolve(__dirname, '../package.json'), 'utf8'))
1816

1917
let version = process.argv[2] || process.env.npm_package_version || pkg.version
2018

scripts/release-notes.js

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,12 @@ import { fileURLToPath } from 'node:url'
77

88
const __dirname = path.dirname(fileURLToPath(import.meta.url))
99

10-
const pkg = JSON.parse(
11-
await fs.readFile(path.resolve(__dirname, '../package.json'), 'utf8'),
12-
)
10+
const pkg = JSON.parse(await fs.readFile(path.resolve(__dirname, '../package.json'), 'utf8'))
1311

1412
let version = process.argv[2] || process.env.npm_package_version || pkg.version
1513

16-
let changelog = await fs.readFile(
17-
path.resolve(__dirname, '..', 'CHANGELOG.md'),
18-
'utf8',
19-
)
20-
let match = new RegExp(
21-
`## \\[${version}\\] - (.*)\\n\\n([\\s\\S]*?)\\n(?:(?:##\\s)|(?:\\[))`,
22-
'g',
23-
).exec(changelog)
14+
let changelog = await fs.readFile(path.resolve(__dirname, '..', 'CHANGELOG.md'), 'utf8')
15+
let match = new RegExp(`## \\[${version}\\] - (.*)\\n\\n([\\s\\S]*?)\\n(?:(?:##\\s)|(?:\\[))`, 'g').exec(changelog)
2416

2517
if (match) {
2618
let [, , notes] = match

src/expiring-map.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ export function expiringMap<K, V>(duration: number): ExpiringMap<K, V> {
99
return {
1010
get(key: K) {
1111
let result = map.get(key)
12-
if (!result) return undefined
13-
if (result.expiration <= new Date()) {
14-
map.delete(key)
15-
return undefined
12+
13+
if (result && result.expiration > new Date()) {
14+
return result.value
1615
}
1716

18-
return result.value
17+
map.delete(key)
18+
19+
return undefined
1920
},
2021

2122
set(key: K, value: V) {

0 commit comments

Comments
 (0)