Skip to content

Commit 02d0b69

Browse files
committed
unify indent style to space
1 parent 50a1c5f commit 02d0b69

30 files changed

+1376
-1380
lines changed

.editorconfig

-4
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,5 @@ insert_final_newline = true
1313
indent_style = space
1414
indent_size = 2
1515

16-
[*.js]
17-
indent_style = tab
18-
indent_size = 2
19-
2016
[*.{diff,md}]
2117
trim_trailing_whitespace = false

.eslintrc.js

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
module.exports = {
2-
env: {
3-
es6: true,
4-
node: true,
5-
},
6-
extends: ['eslint:recommended', 'plugin:prettier/recommended', 'plugin:n/recommended'],
7-
parserOptions: {
8-
ecmaVersion: 2020,
9-
sourceType: 'module',
10-
},
11-
rules: {
12-
'n/no-process-exit': 0,
13-
},
14-
overrides: [
15-
{
16-
files: 'test/**/*',
17-
env: {
18-
mocha: true,
19-
},
20-
rules: {
21-
'n/no-unpublished-import': 0,
22-
},
23-
},
24-
],
2+
env: {
3+
es6: true,
4+
node: true,
5+
},
6+
extends: ['eslint:recommended', 'plugin:prettier/recommended', 'plugin:n/recommended'],
7+
parserOptions: {
8+
ecmaVersion: 2020,
9+
sourceType: 'module',
10+
},
11+
rules: {
12+
'n/no-process-exit': 0,
13+
},
14+
overrides: [
15+
{
16+
files: 'test/**/*',
17+
env: {
18+
mocha: true,
19+
},
20+
rules: {
21+
'n/no-unpublished-import': 0,
22+
},
23+
},
24+
],
2525
}

generate-local.js

+85-85
Original file line numberDiff line numberDiff line change
@@ -12,97 +12,97 @@ const argv = minimist(process.argv.slice(2))
1212
const { project, version, install } = argv
1313

1414
const exit = function exit() {
15-
console.log(...arguments)
16-
process.exit(1)
15+
console.log(...arguments)
16+
process.exit(1)
1717
}
1818

1919
async function runCmd(cmd, path, args = []) {
20-
console.log(chalk.underline(`Running '${chalk.green(cmd)}' in ${path}`))
21-
const executedCmd = await execa(cmd, args, { cwd: path, shell: true, stdio: 'inherit' })
20+
console.log(chalk.underline(`Running '${chalk.green(cmd)}' in ${path}`))
21+
const executedCmd = await execa(cmd, args, { cwd: path, shell: true, stdio: 'inherit' })
2222

23-
if (executedCmd.failed) {
24-
console.error(executedCmd.stdout)
25-
console.error(executedCmd.stderr)
26-
process.exit(1)
27-
}
23+
if (executedCmd.failed) {
24+
console.error(executedCmd.stdout)
25+
console.error(executedCmd.stderr)
26+
process.exit(1)
27+
}
2828

29-
console.log(executedCmd.stdout + '\n')
29+
console.log(executedCmd.stdout + '\n')
3030
}
3131

3232
;(async () => {
33-
if (!project || !version) {
34-
exit(
35-
chalk.red('Both project and version args are required.\n'),
36-
chalk.yellow(' e.g., yarn gen --project ember --version 3.10.1'),
37-
)
38-
}
39-
40-
if (!['ember', 'ember-data'].includes(project)) {
41-
exit(chalk.red(`Project has to be either 'ember' or 'ember-data'. (was given ${project})\n`))
42-
}
43-
44-
try {
45-
await commandExists('yarn')
46-
} catch (e) {
47-
exit(chalk.red('We need yarn installed globally for this script to work'))
48-
}
49-
50-
let emberProjectPath = path.join(__dirname, '../', 'ember.js')
51-
let emberDataProjectPath = path.join(__dirname, '../', 'data')
52-
53-
let checkIfProjectDirExists = dirPath => {
54-
if (!existsSync(dirPath)) {
55-
exit(chalk.yellow(`Please checkout the ${project} project at ${dirPath}`))
56-
}
57-
}
58-
59-
let buildDocs = async projDirPath => {
60-
checkIfProjectDirExists(projDirPath)
61-
62-
if (project === 'ember') {
63-
await runCmd('volta', projDirPath, ['run', 'yarn'])
64-
} else {
65-
await runCmd('corepack', projDirPath, ['pnpm', 'install'])
66-
}
67-
68-
if (install) {
69-
await runCmd(project === 'ember' ? 'yarn' : 'pnpm install', projDirPath)
70-
console.log('\n\n')
71-
}
72-
73-
await runCmd(
74-
project === 'ember' ? 'volta run yarn docs' : 'corepack pnpm run build:docs',
75-
projDirPath,
76-
)
77-
78-
let destination = `${docsPath}/s3-docs/v${version}/${project}-docs.json`
79-
ensureFileSync(destination)
80-
const projYuiDocFile = destination
81-
removeSync(projYuiDocFile)
82-
removeSync(`${docsPath}/json-docs/${project}/${version}`)
83-
84-
const yuiDocFile = path.join(
85-
projDirPath,
86-
project === 'ember' ? 'docs/data.json' : 'packages/-ember-data/dist/docs/data.json',
87-
)
88-
copyFileSync(yuiDocFile, projYuiDocFile)
89-
}
90-
91-
let dirMap = {
92-
ember: emberProjectPath,
93-
'ember-data': emberDataProjectPath,
94-
}
95-
96-
await buildDocs(dirMap[project])
97-
98-
await execa('volta', [
99-
'run',
100-
'yarn',
101-
'start',
102-
'--project',
103-
project,
104-
'--version',
105-
version,
106-
'--no-sync',
107-
]).stdout.pipe(process.stdout)
33+
if (!project || !version) {
34+
exit(
35+
chalk.red('Both project and version args are required.\n'),
36+
chalk.yellow(' e.g., yarn gen --project ember --version 3.10.1'),
37+
)
38+
}
39+
40+
if (!['ember', 'ember-data'].includes(project)) {
41+
exit(chalk.red(`Project has to be either 'ember' or 'ember-data'. (was given ${project})\n`))
42+
}
43+
44+
try {
45+
await commandExists('yarn')
46+
} catch (e) {
47+
exit(chalk.red('We need yarn installed globally for this script to work'))
48+
}
49+
50+
let emberProjectPath = path.join(__dirname, '../', 'ember.js')
51+
let emberDataProjectPath = path.join(__dirname, '../', 'data')
52+
53+
let checkIfProjectDirExists = dirPath => {
54+
if (!existsSync(dirPath)) {
55+
exit(chalk.yellow(`Please checkout the ${project} project at ${dirPath}`))
56+
}
57+
}
58+
59+
let buildDocs = async projDirPath => {
60+
checkIfProjectDirExists(projDirPath)
61+
62+
if (project === 'ember') {
63+
await runCmd('volta', projDirPath, ['run', 'yarn'])
64+
} else {
65+
await runCmd('corepack', projDirPath, ['pnpm', 'install'])
66+
}
67+
68+
if (install) {
69+
await runCmd(project === 'ember' ? 'yarn' : 'pnpm install', projDirPath)
70+
console.log('\n\n')
71+
}
72+
73+
await runCmd(
74+
project === 'ember' ? 'volta run yarn docs' : 'corepack pnpm run build:docs',
75+
projDirPath,
76+
)
77+
78+
let destination = `${docsPath}/s3-docs/v${version}/${project}-docs.json`
79+
ensureFileSync(destination)
80+
const projYuiDocFile = destination
81+
removeSync(projYuiDocFile)
82+
removeSync(`${docsPath}/json-docs/${project}/${version}`)
83+
84+
const yuiDocFile = path.join(
85+
projDirPath,
86+
project === 'ember' ? 'docs/data.json' : 'packages/-ember-data/dist/docs/data.json',
87+
)
88+
copyFileSync(yuiDocFile, projYuiDocFile)
89+
}
90+
91+
let dirMap = {
92+
ember: emberProjectPath,
93+
'ember-data': emberDataProjectPath,
94+
}
95+
96+
await buildDocs(dirMap[project])
97+
98+
await execa('volta', [
99+
'run',
100+
'yarn',
101+
'start',
102+
'--project',
103+
project,
104+
'--version',
105+
version,
106+
'--no-sync',
107+
]).stdout.pipe(process.stdout)
108108
})()

index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const argv = require('minimist')(process.argv.slice(2))
55

66
let possibleProjects = ['ember', 'ember-data']
77
let projects =
8-
argv.project && possibleProjects.includes(argv.project) ? [argv.project] : possibleProjects
8+
argv.project && possibleProjects.includes(argv.project) ? [argv.project] : possibleProjects
99
let specificDocsVersion = argv.version ? argv.version : ''
1010

1111
let runClean = !!argv.clean

lib/add-inherited-items.js

+37-37
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
import _ from 'lodash'
22

33
export default function addInheritedItems(docSets) {
4-
docSets.forEach(versionData => {
5-
let data = versionData.data
6-
let classes = _.values(data.classes).filter(klass => klass && klass.name)
7-
classes = classes.filter(removeLongDocsBecauseEmber1HasWeirdDocs)
8-
let classItems = data.classitems.filter(({ itemtype }) => itemtype)
4+
docSets.forEach(versionData => {
5+
let data = versionData.data
6+
let classes = _.values(data.classes).filter(klass => klass && klass.name)
7+
classes = classes.filter(removeLongDocsBecauseEmber1HasWeirdDocs)
8+
let classItems = data.classitems.filter(({ itemtype }) => itemtype)
99

10-
classes.forEach(klass => {
11-
let parents = getParents(klass, classes)
10+
classes.forEach(klass => {
11+
let parents = getParents(klass, classes)
1212

13-
for (let i = 0; i < parents.length; ++i) {
14-
parents = parents.concat(getParents(parents[i], classes))
15-
}
16-
parents.forEach(parent => {
17-
if (!parent) return
18-
let parentItems = classItems.filter(item => item.class === parent.name)
19-
parentItems = parentItems.map(item => {
20-
item = _.clone(item)
21-
item.inherited = true
22-
item.inheritedFrom = item.class
23-
item.class = klass.name
24-
return item
25-
})
26-
data.classitems = data.classitems.concat(parentItems)
27-
})
28-
})
29-
})
13+
for (let i = 0; i < parents.length; ++i) {
14+
parents = parents.concat(getParents(parents[i], classes))
15+
}
16+
parents.forEach(parent => {
17+
if (!parent) return
18+
let parentItems = classItems.filter(item => item.class === parent.name)
19+
parentItems = parentItems.map(item => {
20+
item = _.clone(item)
21+
item.inherited = true
22+
item.inheritedFrom = item.class
23+
item.class = klass.name
24+
return item
25+
})
26+
data.classitems = data.classitems.concat(parentItems)
27+
})
28+
})
29+
})
3030

31-
return Promise.resolve(docSets)
31+
return Promise.resolve(docSets)
3232
}
3333

3434
function getParents(klass, classes) {
35-
let parents = []
36-
if (klass.extends) {
37-
parents = parents.concat([klass.extends])
38-
}
39-
if (klass.uses && klass.uses.length) {
40-
parents = parents.concat(klass.uses.reverse())
41-
}
42-
return parents
43-
.map(parent => _.find(classes, ({ name }) => name === parent))
44-
.filter(parent => parent)
35+
let parents = []
36+
if (klass.extends) {
37+
parents = parents.concat([klass.extends])
38+
}
39+
if (klass.uses && klass.uses.length) {
40+
parents = parents.concat(klass.uses.reverse())
41+
}
42+
return parents
43+
.map(parent => _.find(classes, ({ name }) => name === parent))
44+
.filter(parent => parent)
4545
}
4646

4747
function removeLongDocsBecauseEmber1HasWeirdDocs({ name }) {
48-
let str = 'A Suite can'
49-
return !name.includes(str)
48+
let str = 'A Suite can'
49+
return !name.includes(str)
5050
}

0 commit comments

Comments
 (0)