Skip to content

Commit be759ab

Browse files
fix(linter): let Prettier does the stylistic code formatting (#8)
1 parent ac6f7f2 commit be759ab

4 files changed

Lines changed: 41 additions & 36 deletions

File tree

app/index.js

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,46 +18,46 @@ module.exports = class extends Generator {
1818
{
1919
name: 'projectName',
2020
message: 'Project name',
21-
default: this.appname
21+
default: this.appname,
2222
},
2323
{
2424
name: 'description',
2525
message: 'Description',
2626
default: 'as cute as bunny',
27-
store: true
27+
store: true,
2828
},
2929
{
3030
name: 'esnext',
3131
message: 'Need ES2015+',
3232
type: 'confirm',
33-
default: false
33+
default: false,
3434
},
3535
{
3636
name: 'coverage',
3737
message: 'Need code coverage',
3838
type: 'confirm',
39-
default: false
39+
default: false,
4040
},
4141
{
4242
name: 'name',
43-
message: 'Author\'s name',
44-
default: this.user.git.name()
43+
message: "Author's name",
44+
default: this.user.git.name(),
4545
},
4646
{
4747
name: 'email',
48-
message: 'Author\'s email',
49-
default: this.user.git.email()
48+
message: "Author's email",
49+
default: this.user.git.email(),
5050
},
5151
{
5252
name: 'website',
53-
message: 'Author\'s website',
54-
store: true
53+
message: "Author's website",
54+
store: true,
5555
},
5656
{
5757
name: 'githubUsername',
5858
message: 'GitHub username',
59-
store: true
60-
}
59+
store: true,
60+
},
6161
]).then(answers => {
6262
this.props = {
6363
projectName: kebabCase(answers.projectName),
@@ -68,7 +68,7 @@ module.exports = class extends Generator {
6868
name: answers.name,
6969
email: answers.email,
7070
website: answers.website,
71-
githubUsername: answers.githubUsername
71+
githubUsername: answers.githubUsername,
7272
};
7373
});
7474
}
@@ -81,7 +81,7 @@ module.exports = class extends Generator {
8181
}
8282

8383
default() {
84-
this.spawnCommandSync('git', ['init'], {stdio: false});
84+
this.spawnCommandSync('git', ['init'], { stdio: false });
8585
}
8686

8787
writing() {
@@ -114,8 +114,9 @@ module.exports = class extends Generator {
114114
}
115115
}
116116
install() {
117-
this.installDependencies({bower: false});
117+
this.installDependencies({ bower: false });
118118
}
119+
119120
end() {
120121
this.fs.delete(findUp.sync('.yo-rc.json'));
121122
}

app/templates/_package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"babel-jest": "^20.0.3",
3232
"babel-plugin-add-module-exports": "^0.2.1",
3333
"babel-preset-env": "^1.6.0",<% } %>
34+
"eslint-config-prettier": "^2.3.0",
3435
"husky": "^0.14.3",
3536
"jest": "^20.0.4",
3637
"lint-staged": "^4.0.3",
@@ -48,13 +49,13 @@
4849
},
4950
"lint-staged": {<% if (esnext) { %>
5051
"src/**/*.js": [<% } else { %>"*.js": [<% } %>
51-
"prettier --trailing-comma es5 --single-quote --write",
5252
"xo --fix",
53+
"prettier --trailing-comma es5 --single-quote --write",
5354
"git add"
5455
]
5556
},
5657
"xo": {
57-
"space": true,
58+
"extends": "prettier",
5859
"envs": [
5960
"jest"
6061
]

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@
3131
"devDependencies": {
3232
"all-contributors-cli": "^4.4.0",
3333
"async-to-gen": "^1.3.3",
34+
"eslint-config-prettier": "^2.3.0",
3435
"husky": "^0.14.3",
3536
"jest": "^20.0.4",
3637
"lint-staged": "^4.0.3",
3738
"pify": "^3.0.0",
39+
"prettier": "^1.5.3",
3840
"remove-lockfiles": "^1.1.1",
3941
"xo": "^0.18.2",
4042
"yeoman-assert": "^3.0.0",
@@ -54,11 +56,12 @@
5456
"lint-staged": {
5557
"*.js": [
5658
"xo --fix",
59+
"prettier --trailing-comma es5 --single-quote --write",
5760
"git add"
5861
]
5962
},
6063
"xo": {
61-
"space": true,
64+
"extends": "prettier",
6265
"envs": [
6366
"jest"
6467
],

test.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ let generator;
1212
beforeEach(async () => {
1313
await pify(helpers.testDirectory)(path.join(__dirname, 'temp'));
1414
generator = helpers.createGenerator('node-oss:app', ['../app'], null, {
15-
skipInstall: true
15+
skipInstall: true,
1616
});
1717
});
1818

1919
it('creates and uses the folder for the project', async () => {
2020
helpers.mockPrompt(generator, {
21-
projectName: 'test'
21+
projectName: 'test',
2222
});
2323

2424
await pify(generator.run.bind(generator))();
@@ -47,7 +47,7 @@ it('generates default files', async () => {
4747
'other/roadmap.md',
4848
'package.json',
4949
'readme.md',
50-
'test.js'
50+
'test.js',
5151
]);
5252

5353
assert.noFile(['.babelrc', 'src/index.js', 'src/__tests__/index.test.js']);
@@ -56,7 +56,7 @@ it('generates default files', async () => {
5656

5757
it('generates files for esnext', async () => {
5858
helpers.mockPrompt(generator, {
59-
esnext: true
59+
esnext: true,
6060
});
6161

6262
await pify(generator.run.bind(generator))();
@@ -69,7 +69,7 @@ describe('templating', () => {
6969
test('projectName', async () => {
7070
helpers.mockPrompt(generator, {
7171
projectName: 'foo',
72-
githubUsername: 'test'
72+
githubUsername: 'test',
7373
});
7474

7575
await pify(generator.run.bind(generator))();
@@ -83,7 +83,7 @@ describe('templating', () => {
8383
'[![npm](https://img.shields.io/npm/v/foo.svg?style=flat-square)](https://www.npmjs.com/package/foo)\n[![Travis branch](https://img.shields.io/travis/test/foo/master.svg?style=flat-square)](https://travis-ci.org/test/foo)\n[![npm](https://img.shields.io/npm/dm/foo.svg?style=flat-square)](https://npm-stat.com/charts.html?package=foo&from=2016-04-01)'
8484
);
8585
assert.fileContent('readme.md', /npm install --save foo/);
86-
assert.fileContent('readme.md', 'const foo = require(\'foo\');');
86+
assert.fileContent('readme.md', "const foo = require('foo');");
8787
assert.fileContent(
8888
'.github/issue_template.md',
8989
/foo version: <!-- run `npm ls foo` -->/
@@ -97,7 +97,7 @@ describe('templating', () => {
9797
test('coverage', async () => {
9898
helpers.mockPrompt(generator, {
9999
coverage: true,
100-
githubUsername: 'test'
100+
githubUsername: 'test',
101101
});
102102

103103
await pify(generator.run.bind(generator))();
@@ -114,7 +114,7 @@ describe('templating', () => {
114114

115115
test('description', async () => {
116116
helpers.mockPrompt(generator, {
117-
description: 'foo'
117+
description: 'foo',
118118
});
119119

120120
await pify(generator.run.bind(generator))();
@@ -125,7 +125,7 @@ describe('templating', () => {
125125

126126
test('esnext', async () => {
127127
helpers.mockPrompt(generator, {
128-
esnext: true
128+
esnext: true,
129129
});
130130

131131
await pify(generator.run.bind(generator))();
@@ -135,33 +135,33 @@ describe('templating', () => {
135135
assert.JSONFileContent('package.json', {
136136
scripts: {
137137
prebuild: 'rimraf dist',
138-
build: 'babel --copy-files --out-dir dist --ignore *.test.js src'
138+
build: 'babel --copy-files --out-dir dist --ignore *.test.js src',
139139
},
140140
main: 'dist/index.js',
141141
files: ['dist'],
142142
devDependencies: {
143143
'babel-cli': /./,
144144
'babel-plugin-add-module-exports': /./,
145145
'babel-preset-env': /./,
146-
rimraf: /./
146+
rimraf: /./,
147147
},
148148
'lint-staged': {
149-
'src/**/*.js': []
149+
'src/**/*.js': [],
150150
},
151151
jest: {
152152
testEnvironment: 'node',
153-
collectCoverageFrom: ['src/**/*.js']
154-
}
153+
collectCoverageFrom: ['src/**/*.js'],
154+
},
155155
});
156-
assert.fileContent('src/index.test.js', 'import temp from \'./\';');
156+
assert.fileContent('src/index.test.js', "import temp from './';");
157157
assert.fileContent('.travis.yml', /before_script: npm run build/);
158158
assert.fileContent('src/index.js', /export default input/);
159159
assert.fileContent('readme.md', /import temp from 'temp';/);
160160
});
161161

162162
test('name', async () => {
163163
helpers.mockPrompt(generator, {
164-
name: 'foo bar'
164+
name: 'foo bar',
165165
});
166166

167167
await pify(generator.run.bind(generator))();
@@ -173,7 +173,7 @@ describe('templating', () => {
173173

174174
test('email', async () => {
175175
helpers.mockPrompt(generator, {
176-
email: 'test@test.com'
176+
email: 'test@test.com',
177177
});
178178

179179
await pify(generator.run.bind(generator))();
@@ -185,7 +185,7 @@ describe('templating', () => {
185185

186186
test('website', async () => {
187187
helpers.mockPrompt(generator, {
188-
website: 'test.com'
188+
website: 'test.com',
189189
});
190190

191191
await pify(generator.run.bind(generator))();

0 commit comments

Comments
 (0)