Skip to content

Commit 8b3b27d

Browse files
committed
Lint and format all code with same configs
1 parent de9bfcd commit 8b3b27d

File tree

20 files changed

+275
-315
lines changed

20 files changed

+275
-315
lines changed

.eslintrc.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
module.exports = {
22
root: true,
3-
ignorePatterns: ['cli/', '.cache/', 'public/'],
3+
ignorePatterns: ['.cache/', 'public/'],
44
extends: [
5+
'@npmcli',
56
'react-app',
67
// 'react-app/jest',
78
'eslint:recommended',
@@ -13,6 +14,7 @@ module.exports = {
1314
'prettier',
1415
],
1516
rules: {
17+
'max-len': 'off',
1618
'react/prop-types': 'off',
1719
'primer-react/no-system-props': ['error', {includeUtilityComponents: true}],
1820
},

.prettierignore

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
**/template-oss/*.json
22
**/template-oss/*.yml
3-
content/
4-
cli/
5-
.github/
6-
package-lock.json
7-
SECURITY.md
8-
.reuse/
3+
/content/
4+
/.github/
5+
/package-lock.json
6+
/SECURITY.md
7+
/.reuse/
8+
.nyc_output/
9+
coverage/

cli/.eslintrc.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

cli/bin/build.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
const { resolve, relative, join } = require('path')
2-
const { spawnSync } = require('child_process')
1+
const {resolve, relative, join} = require('path')
2+
const {spawnSync} = require('child_process')
33
const build = require('../lib/build.js')
4-
const { nwo } = require('../lib/gh')
4+
const {nwo} = require('../lib/gh')
55

66
// check only build with the current versions instead of checking the registry
77
// and also fails if any changes are detected. this is used in CI to make sure
@@ -13,7 +13,7 @@ const contentPath = join(ROOT, 'content/cli')
1313
const navPath = join(ROOT, 'content/nav.yml')
1414

1515
const checkContent = () => {
16-
const status = spawnSync('git', ['status', '--porcelain', contentPath], { encoding: 'utf-8' })
16+
const status = spawnSync('git', ['status', '--porcelain', contentPath], {encoding: 'utf-8'})
1717
if (status.stdout) {
1818
const msg = [
1919
`The following untracked changes to ${relative(process.cwd(), contentPath)} were found:`,
@@ -38,7 +38,7 @@ build({
3838
}
3939
return console.log('DONE')
4040
})
41-
.catch((e) => {
41+
.catch(e => {
4242
console.error(e)
4343
process.exit(1)
4444
})

cli/lib/build.js

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { posix } = require('path')
1+
const {posix} = require('path')
22
const fs = require('fs').promises
33
const yaml = require('yaml')
44
const semver = require('semver')
@@ -8,25 +8,24 @@ const log = require('./log')
88

99
const DOCS_PATH = 'cli'
1010

11-
const updateNav = async (updates, { nav, path }) => {
12-
const variants = updates.map((release) => ({
11+
const updateNav = async (updates, {nav, path}) => {
12+
const variants = updates.map(release => ({
1313
title: release.title,
1414
shortName: release.id,
1515
url: release.url,
1616
default: release.default,
1717
children: release.nav,
1818
}))
1919

20-
const index = nav.contents.items
21-
.findIndex(n => posix.basename(n.get('url')) === DOCS_PATH)
20+
const index = nav.contents.items.findIndex(n => posix.basename(n.get('url')) === DOCS_PATH)
2221
const key = [index, 'variants']
2322
const current = nav.getIn(key)
2423

2524
if (!current) {
2625
nav.setIn(key, nav.createNode(variants))
2726
} else {
2827
for (const variant of variants) {
29-
const vIndex = current.items.findIndex((n) => n.get('url') === variant.url)
28+
const vIndex = current.items.findIndex(n => n.get('url') === variant.url)
3029
if (vIndex === -1) {
3130
nav.addIn(key, nav.createNode(variant))
3231
} else {
@@ -38,29 +37,24 @@ const updateNav = async (updates, { nav, path }) => {
3837
return fs.writeFile(path, nav.toString(), 'utf-8')
3938
}
4039

41-
const getCurrentVersions = (nav) => {
40+
const getCurrentVersions = nav => {
4241
// the only place the current versions are stored is in the nav
4342
const currentSections = nav.find(s => s.url === `/${DOCS_PATH}`).variants
4443

45-
const currentVersions = currentSections.map((v) => {
46-
const version = v.title?.match(/^Version\s(.*?)\s/)[1]
47-
return version
48-
}).sort(semver.compare)
44+
const currentVersions = currentSections
45+
.map(v => {
46+
const version = v.title?.match(/^Version\s(.*?)\s/)[1]
47+
return version
48+
})
49+
.sort(semver.compare)
4950

5051
return {
5152
versions: currentVersions,
5253
latest: currentVersions[currentVersions.length - 1],
5354
}
5455
}
5556

56-
const main = async ({
57-
loglevel,
58-
releases: rawReleases,
59-
useCurrent,
60-
navPath,
61-
contentPath,
62-
prerelease,
63-
}) => {
57+
const main = async ({loglevel, releases: rawReleases, useCurrent, navPath, contentPath, prerelease}) => {
6458
/* istanbul ignore next */
6559
if (loglevel) {
6660
log.on(loglevel)
@@ -72,32 +66,40 @@ const main = async ({
7266

7367
const pack = useCurrent
7468
? getCurrentVersions(navData)
75-
: await pacote.packument('npm', { preferOnline: true }).then(p => ({
76-
versions: Object.keys(p.versions),
77-
latest: p['dist-tags'].latest,
78-
}))
79-
80-
const releaseVersions = rawReleases.map(release => {
81-
const major = Number(release.id.replace(/^v/, ''))
82-
const range = `>=${major}.0.0-a <${major + 1}.0.0` // include all prereleases
83-
const version = semver.parse(semver.maxSatisfying(pack.versions, range))
84-
85-
return version && {
86-
...release,
87-
version: version.toString(),
88-
// the default release is always controlled by the latest dist-tag
89-
default: semver.eq(version, pack.latest),
90-
prerelease: version.prerelease.length > 0,
91-
}
92-
}).filter(Boolean)
93-
94-
const latestRelease = releaseVersions.find(r => r.default) ??
69+
: await pacote.packument('npm', {preferOnline: true}).then(p => ({
70+
versions: Object.keys(p.versions),
71+
latest: p['dist-tags'].latest,
72+
}))
73+
74+
const releaseVersions = rawReleases
75+
.map(release => {
76+
const major = Number(release.id.replace(/^v/, ''))
77+
const range = `>=${major}.0.0-a <${major + 1}.0.0` // include all prereleases
78+
const version = semver.parse(semver.maxSatisfying(pack.versions, range))
79+
80+
return (
81+
version && {
82+
...release,
83+
version: version.toString(),
84+
// the default release is always controlled by the latest dist-tag
85+
default: semver.eq(version, pack.latest),
86+
prerelease: version.prerelease.length > 0,
87+
}
88+
)
89+
})
90+
.filter(Boolean)
91+
92+
const latestRelease =
93+
releaseVersions.find(r => r.default) ??
9594
releaseVersions.slice(0).sort((a, b) => semver.compare(b.version, a.version))[0]
9695

97-
const releases = releaseVersions.map((release) => {
98-
const type = release.default ? 'Latest Release'
99-
: release.prerelease ? 'Prerelease'
100-
: semver.gt(release.version, latestRelease.version) ? 'Current Release'
96+
const releases = releaseVersions.map(release => {
97+
const type = release.default
98+
? 'Latest Release'
99+
: release.prerelease
100+
? 'Prerelease'
101+
: semver.gt(release.version, latestRelease.version)
102+
? 'Current Release'
101103
: 'Legacy Release'
102104

103105
return {
@@ -110,12 +112,10 @@ const main = async ({
110112
})
111113

112114
const updates = await Promise.all(
113-
releases.map((r) =>
114-
extractRelease(r, { contentPath, baseNav: navData, prerelease })
115-
)
116-
).then((r) => r.filter(Boolean))
115+
releases.map(r => extractRelease(r, {contentPath, baseNav: navData, prerelease})),
116+
).then(r => r.filter(Boolean))
117117

118-
await updateNav(updates, { nav: navDoc, path: navPath })
118+
await updateNav(updates, {nav: navDoc, path: navPath})
119119
}
120120

121121
module.exports = main

0 commit comments

Comments
 (0)