Skip to content

Commit c5ab431

Browse files
committed
feat(gen:app): run eslint w/ fix on both client & server
1 parent 85921be commit c5ab431

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

Diff for: src/generators/app/index.js

+14-9
Original file line numberDiff line numberDiff line change
@@ -488,9 +488,9 @@ export class Generator extends Base {
488488

489489
const genDir = path.join(__dirname, '../../');
490490

491-
let jsFilter = filter(['client/**/*.js'], {restore: true});
491+
let clientJsFilter = filter(['client/**/*.js'], {restore: true});
492492
this.registerTransformStream([
493-
jsFilter,
493+
clientJsFilter,
494494
babelStream({
495495
plugins: babelPlugins.map(require.resolve),
496496
/* Babel get's confused about these if you're using an `npm link`ed
@@ -528,14 +528,9 @@ export class Generator extends Base {
528528
}),
529529
eslint({
530530
fix: true,
531-
configFile: path.join(genDir, 'templates/app/.eslintrc'),
532-
env: {
533-
es6: true,
534-
browser: true,
535-
commonjs: true
536-
}
531+
configFile: path.join(genDir, 'templates/app/client/.eslintrc(babel)')
537532
}),
538-
jsFilter.restore
533+
clientJsFilter.restore
539534
]);
540535

541536
/**
@@ -575,6 +570,16 @@ export class Generator extends Base {
575570
]);
576571
}
577572

573+
let serverJsFilter = filter(['server/**/*.js'], {restore: true});
574+
this.registerTransformStream([
575+
serverJsFilter,
576+
eslint({
577+
fix: true,
578+
configFile: path.join(genDir, 'templates/app/server/.eslintrc')
579+
}),
580+
serverJsFilter.restore
581+
]);
582+
578583
let self = this;
579584
this.sourceRoot(path.join(__dirname, '../../templates/app'));
580585
this.processDirectory('.', '.');

0 commit comments

Comments
 (0)