File tree 1 file changed +14
-9
lines changed
1 file changed +14
-9
lines changed Original file line number Diff line number Diff line change @@ -488,9 +488,9 @@ export class Generator extends Base {
488
488
489
489
const genDir = path . join ( __dirname , '../../' ) ;
490
490
491
- let jsFilter = filter ( [ 'client/**/*.js' ] , { restore : true } ) ;
491
+ let clientJsFilter = filter ( [ 'client/**/*.js' ] , { restore : true } ) ;
492
492
this . registerTransformStream ( [
493
- jsFilter ,
493
+ clientJsFilter ,
494
494
babelStream ( {
495
495
plugins : babelPlugins . map ( require . resolve ) ,
496
496
/* Babel get's confused about these if you're using an `npm link`ed
@@ -528,14 +528,9 @@ export class Generator extends Base {
528
528
} ) ,
529
529
eslint ( {
530
530
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)' )
537
532
} ) ,
538
- jsFilter . restore
533
+ clientJsFilter . restore
539
534
] ) ;
540
535
541
536
/**
@@ -575,6 +570,16 @@ export class Generator extends Base {
575
570
] ) ;
576
571
}
577
572
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
+
578
583
let self = this ;
579
584
this . sourceRoot ( path . join ( __dirname , '../../templates/app' ) ) ;
580
585
this . processDirectory ( '.' , '.' ) ;
You can’t perform that action at this time.
0 commit comments