Skip to content

Commit 10b5179

Browse files
committed
Merge pull request #1312 from DaftMonk/gen-default-babel
feat(gen): always use Babel
2 parents 2365188 + cdfc423 commit 10b5179

29 files changed

+6
-73
lines changed

app/generator.js

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,18 +90,13 @@ export default class Generator extends Base {
9090

9191
this.log('# Client\n');
9292

93-
this.prompt([{
93+
this.prompt([/*{
9494
type: 'list',
9595
name: 'script',
9696
message: 'What would you like to write scripts with?',
97-
choices: [ 'JavaScript', 'JavaScript + Babel'],
98-
filter: function( val ) {
99-
return {
100-
'JavaScript': 'js',
101-
'JavaScript + Babel': 'babel'
102-
}[val];
103-
}
104-
}, {
97+
choices: ['Babel', 'TypeScript'],
98+
filter: function(val) { return val.toLowerCase(); }
99+
}, */{
105100
type: 'list',
106101
name: 'markup',
107102
message: 'What would you like to write markup with?',
@@ -134,9 +129,8 @@ export default class Generator extends Base {
134129
}
135130
}], function (answers) {
136131

137-
// also set 'js' to true if using babel
138-
if(answers.script === 'babel') { this.filters.js = true; }
139-
this.filters[answers.script] = true;
132+
this.filters.js = true;
133+
this.filters.babel = true;
140134
this.filters[answers.markup] = true;
141135
this.filters[answers.stylesheet] = true;
142136
this.filters[answers.router] = true;
File renamed without changes.

app/templates/client/app/account(auth)/login/login.controller(js).js renamed to app/templates/client/app/account(auth)/login/login.controller.js

File renamed without changes.

app/templates/client/app/account(auth)/settings/settings.controller(js).js renamed to app/templates/client/app/account(auth)/settings/settings.controller.js

File renamed without changes.

app/templates/client/app/account(auth)/signup/signup.controller(js).js renamed to app/templates/client/app/account(auth)/signup/signup.controller.js

File renamed without changes.

app/templates/client/app/admin(auth)/admin.controller(js).js renamed to app/templates/client/app/admin(auth)/admin.controller.js

File renamed without changes.
File renamed without changes.
File renamed without changes.

app/templates/client/app/main/main.controller.spec(js).js renamed to app/templates/client/app/main/main.controller.spec.js

File renamed without changes.

0 commit comments

Comments
 (0)