From cdfc423c9f079eacff8592d7c100609f3e85171a Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Tue, 15 Sep 2015 15:33:08 -0400 Subject: [PATCH] feat(gen): always use Babel leave in supporting code for use with eventually supporting typescript --- app/generator.js | 18 ++---- .../{account(js).js => account.js} | 0 ....controller(js).js => login.controller.js} | 0 ...ntroller(js).js => settings.controller.js} | 0 ...controller(js).js => signup.controller.js} | 0 ....controller(js).js => admin.controller.js} | 0 .../admin(auth)/{admin(js).js => admin.js} | 0 .../client/app/{app(js).js => app.js} | 0 ...n.controller(js).js => main.controller.js} | 0 ...er.spec(js).js => main.controller.spec.js} | 0 .../client/app/main/{main(js).js => main.js} | 0 .../{auth.module(js).js => auth.module.js} | 0 .../{auth.service(js).js => auth.service.js} | 0 ....service(js).js => interceptor.service.js} | 0 ...r.decorator(js).js => router.decorator.js} | 0 .../{user.service(js).js => user.service.js} | 0 ...r.directive(js).js => footer.directive.js} | 0 ...{modal.service(js).js => modal.service.js} | 0 ...ive(js).js => mongoose-error.directive.js} | 0 ...controller(js).js => navbar.controller.js} | 0 ...r.directive(js).js => navbar.directive.js} | 0 ...ler(js).js => oauth-buttons.controller.js} | 0 ...s).js => oauth-buttons.controller.spec.js} | 0 ...tive(js).js => oauth-buttons.directive.js} | 0 ...js).js => oauth-buttons.directive.spec.js} | 0 .../{socket.mock(js).js => socket.mock.js} | 0 ...ocket.service(js).js => socket.service.js} | 0 ...i-router.mock(js).js => ui-router.mock.js} | 0 test/test-file-creation.js | 61 ------------------- 29 files changed, 6 insertions(+), 73 deletions(-) rename app/templates/client/app/account(auth)/{account(js).js => account.js} (100%) rename app/templates/client/app/account(auth)/login/{login.controller(js).js => login.controller.js} (100%) rename app/templates/client/app/account(auth)/settings/{settings.controller(js).js => settings.controller.js} (100%) rename app/templates/client/app/account(auth)/signup/{signup.controller(js).js => signup.controller.js} (100%) rename app/templates/client/app/admin(auth)/{admin.controller(js).js => admin.controller.js} (100%) rename app/templates/client/app/admin(auth)/{admin(js).js => admin.js} (100%) rename app/templates/client/app/{app(js).js => app.js} (100%) rename app/templates/client/app/main/{main.controller(js).js => main.controller.js} (100%) rename app/templates/client/app/main/{main.controller.spec(js).js => main.controller.spec.js} (100%) rename app/templates/client/app/main/{main(js).js => main.js} (100%) rename app/templates/client/components/auth(auth)/{auth.module(js).js => auth.module.js} (100%) rename app/templates/client/components/auth(auth)/{auth.service(js).js => auth.service.js} (100%) rename app/templates/client/components/auth(auth)/{interceptor.service(js).js => interceptor.service.js} (100%) rename app/templates/client/components/auth(auth)/{router.decorator(js).js => router.decorator.js} (100%) rename app/templates/client/components/auth(auth)/{user.service(js).js => user.service.js} (100%) rename app/templates/client/components/footer/{footer.directive(js).js => footer.directive.js} (100%) rename app/templates/client/components/modal(uibootstrap)/{modal.service(js).js => modal.service.js} (100%) rename app/templates/client/components/mongoose-error(auth)/{mongoose-error.directive(js).js => mongoose-error.directive.js} (100%) rename app/templates/client/components/navbar/{navbar.controller(js).js => navbar.controller.js} (100%) rename app/templates/client/components/navbar/{navbar.directive(js).js => navbar.directive.js} (100%) rename app/templates/client/components/oauth-buttons(oauth)/{oauth-buttons.controller(js).js => oauth-buttons.controller.js} (100%) rename app/templates/client/components/oauth-buttons(oauth)/{oauth-buttons.controller.spec(js).js => oauth-buttons.controller.spec.js} (100%) rename app/templates/client/components/oauth-buttons(oauth)/{oauth-buttons.directive(js).js => oauth-buttons.directive.js} (100%) rename app/templates/client/components/oauth-buttons(oauth)/{oauth-buttons.directive.spec(js).js => oauth-buttons.directive.spec.js} (100%) rename app/templates/client/components/socket(socketio)/{socket.mock(js).js => socket.mock.js} (100%) rename app/templates/client/components/socket(socketio)/{socket.service(js).js => socket.service.js} (100%) rename app/templates/client/components/ui-router(uirouter)/{ui-router.mock(js).js => ui-router.mock.js} (100%) diff --git a/app/generator.js b/app/generator.js index 00fad1ad5..5478748f0 100644 --- a/app/generator.js +++ b/app/generator.js @@ -90,18 +90,13 @@ export default class Generator extends Base { this.log('# Client\n'); - this.prompt([{ + this.prompt([/*{ type: 'list', name: 'script', message: 'What would you like to write scripts with?', - choices: [ 'JavaScript', 'JavaScript + Babel'], - filter: function( val ) { - return { - 'JavaScript': 'js', - 'JavaScript + Babel': 'babel' - }[val]; - } - }, { + choices: ['Babel', 'TypeScript'], + filter: function(val) { return val.toLowerCase(); } + }, */{ type: 'list', name: 'markup', message: 'What would you like to write markup with?', @@ -134,9 +129,8 @@ export default class Generator extends Base { } }], function (answers) { - // also set 'js' to true if using babel - if(answers.script === 'babel') { this.filters.js = true; } - this.filters[answers.script] = true; + this.filters.js = true; + this.filters.babel = true; this.filters[answers.markup] = true; this.filters[answers.stylesheet] = true; this.filters[answers.router] = true; diff --git a/app/templates/client/app/account(auth)/account(js).js b/app/templates/client/app/account(auth)/account.js similarity index 100% rename from app/templates/client/app/account(auth)/account(js).js rename to app/templates/client/app/account(auth)/account.js diff --git a/app/templates/client/app/account(auth)/login/login.controller(js).js b/app/templates/client/app/account(auth)/login/login.controller.js similarity index 100% rename from app/templates/client/app/account(auth)/login/login.controller(js).js rename to app/templates/client/app/account(auth)/login/login.controller.js diff --git a/app/templates/client/app/account(auth)/settings/settings.controller(js).js b/app/templates/client/app/account(auth)/settings/settings.controller.js similarity index 100% rename from app/templates/client/app/account(auth)/settings/settings.controller(js).js rename to app/templates/client/app/account(auth)/settings/settings.controller.js diff --git a/app/templates/client/app/account(auth)/signup/signup.controller(js).js b/app/templates/client/app/account(auth)/signup/signup.controller.js similarity index 100% rename from app/templates/client/app/account(auth)/signup/signup.controller(js).js rename to app/templates/client/app/account(auth)/signup/signup.controller.js diff --git a/app/templates/client/app/admin(auth)/admin.controller(js).js b/app/templates/client/app/admin(auth)/admin.controller.js similarity index 100% rename from app/templates/client/app/admin(auth)/admin.controller(js).js rename to app/templates/client/app/admin(auth)/admin.controller.js diff --git a/app/templates/client/app/admin(auth)/admin(js).js b/app/templates/client/app/admin(auth)/admin.js similarity index 100% rename from app/templates/client/app/admin(auth)/admin(js).js rename to app/templates/client/app/admin(auth)/admin.js diff --git a/app/templates/client/app/app(js).js b/app/templates/client/app/app.js similarity index 100% rename from app/templates/client/app/app(js).js rename to app/templates/client/app/app.js diff --git a/app/templates/client/app/main/main.controller(js).js b/app/templates/client/app/main/main.controller.js similarity index 100% rename from app/templates/client/app/main/main.controller(js).js rename to app/templates/client/app/main/main.controller.js diff --git a/app/templates/client/app/main/main.controller.spec(js).js b/app/templates/client/app/main/main.controller.spec.js similarity index 100% rename from app/templates/client/app/main/main.controller.spec(js).js rename to app/templates/client/app/main/main.controller.spec.js diff --git a/app/templates/client/app/main/main(js).js b/app/templates/client/app/main/main.js similarity index 100% rename from app/templates/client/app/main/main(js).js rename to app/templates/client/app/main/main.js diff --git a/app/templates/client/components/auth(auth)/auth.module(js).js b/app/templates/client/components/auth(auth)/auth.module.js similarity index 100% rename from app/templates/client/components/auth(auth)/auth.module(js).js rename to app/templates/client/components/auth(auth)/auth.module.js diff --git a/app/templates/client/components/auth(auth)/auth.service(js).js b/app/templates/client/components/auth(auth)/auth.service.js similarity index 100% rename from app/templates/client/components/auth(auth)/auth.service(js).js rename to app/templates/client/components/auth(auth)/auth.service.js diff --git a/app/templates/client/components/auth(auth)/interceptor.service(js).js b/app/templates/client/components/auth(auth)/interceptor.service.js similarity index 100% rename from app/templates/client/components/auth(auth)/interceptor.service(js).js rename to app/templates/client/components/auth(auth)/interceptor.service.js diff --git a/app/templates/client/components/auth(auth)/router.decorator(js).js b/app/templates/client/components/auth(auth)/router.decorator.js similarity index 100% rename from app/templates/client/components/auth(auth)/router.decorator(js).js rename to app/templates/client/components/auth(auth)/router.decorator.js diff --git a/app/templates/client/components/auth(auth)/user.service(js).js b/app/templates/client/components/auth(auth)/user.service.js similarity index 100% rename from app/templates/client/components/auth(auth)/user.service(js).js rename to app/templates/client/components/auth(auth)/user.service.js diff --git a/app/templates/client/components/footer/footer.directive(js).js b/app/templates/client/components/footer/footer.directive.js similarity index 100% rename from app/templates/client/components/footer/footer.directive(js).js rename to app/templates/client/components/footer/footer.directive.js diff --git a/app/templates/client/components/modal(uibootstrap)/modal.service(js).js b/app/templates/client/components/modal(uibootstrap)/modal.service.js similarity index 100% rename from app/templates/client/components/modal(uibootstrap)/modal.service(js).js rename to app/templates/client/components/modal(uibootstrap)/modal.service.js diff --git a/app/templates/client/components/mongoose-error(auth)/mongoose-error.directive(js).js b/app/templates/client/components/mongoose-error(auth)/mongoose-error.directive.js similarity index 100% rename from app/templates/client/components/mongoose-error(auth)/mongoose-error.directive(js).js rename to app/templates/client/components/mongoose-error(auth)/mongoose-error.directive.js diff --git a/app/templates/client/components/navbar/navbar.controller(js).js b/app/templates/client/components/navbar/navbar.controller.js similarity index 100% rename from app/templates/client/components/navbar/navbar.controller(js).js rename to app/templates/client/components/navbar/navbar.controller.js diff --git a/app/templates/client/components/navbar/navbar.directive(js).js b/app/templates/client/components/navbar/navbar.directive.js similarity index 100% rename from app/templates/client/components/navbar/navbar.directive(js).js rename to app/templates/client/components/navbar/navbar.directive.js diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller(js).js b/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller.js similarity index 100% rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller(js).js rename to app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller.js diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller.spec(js).js b/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller.spec.js similarity index 100% rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller.spec(js).js rename to app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.controller.spec.js diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive(js).js b/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive.js similarity index 100% rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive(js).js rename to app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive.js diff --git a/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive.spec(js).js b/app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive.spec.js similarity index 100% rename from app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive.spec(js).js rename to app/templates/client/components/oauth-buttons(oauth)/oauth-buttons.directive.spec.js diff --git a/app/templates/client/components/socket(socketio)/socket.mock(js).js b/app/templates/client/components/socket(socketio)/socket.mock.js similarity index 100% rename from app/templates/client/components/socket(socketio)/socket.mock(js).js rename to app/templates/client/components/socket(socketio)/socket.mock.js diff --git a/app/templates/client/components/socket(socketio)/socket.service(js).js b/app/templates/client/components/socket(socketio)/socket.service.js similarity index 100% rename from app/templates/client/components/socket(socketio)/socket.service(js).js rename to app/templates/client/components/socket(socketio)/socket.service.js diff --git a/app/templates/client/components/ui-router(uirouter)/ui-router.mock(js).js b/app/templates/client/components/ui-router(uirouter)/ui-router.mock.js similarity index 100% rename from app/templates/client/components/ui-router(uirouter)/ui-router.mock(js).js rename to app/templates/client/components/ui-router(uirouter)/ui-router.mock.js diff --git a/test/test-file-creation.js b/test/test-file-creation.js index 5edd9ec84..26f326dc7 100644 --- a/test/test-file-creation.js +++ b/test/test-file-creation.js @@ -729,66 +729,5 @@ describe('angular-fullstack generator', function () { } }); - - describe('with no preprocessors and no server options', function() { - var testOptions = { - script: 'js', - markup: 'html', - stylesheet: 'css', - router: 'ngroute', - testing: 'jasmine', - odms: [], - auth: false, - oauth: [], - socketio: false, - bootstrap: true, - uibootstrap: true - }; - - beforeEach(function(done) { - helpers.mockPrompt(gen, testOptions); - done(); - }); - - it('should run client tests successfully', function(done) { - runTest('grunt test:client', this, done); - }); - - it('should pass jscs', function(done) { - runTest('grunt jscs', this, done); - }); - - it('should pass lint', function(done) { - runTest('grunt jshint', this, done); - }); - - it('should run server tests successfully', function(done) { - runTest('grunt test:server', this, done); - }); - - it('should generate expected files', function (done) { - gen.run(function () { - assert.file(genFiles(testOptions)); - done(); - }); - }); - - it('should not generate unexpected files', function (done) { - gen.run(function () { - assertOnlyFiles(genFiles(testOptions), done); - }); - }); - - if(!process.env.SKIP_E2E) { - it('should run e2e tests successfully', function (done) { - runTest('grunt test:e2e', this, done, 240000); - }); - - //it('should run e2e tests successfully for production app', function (done) { - // runTest('grunt test:e2e:prod', this, done, 240000); - //}); - } - - }); }); });