From 7c03fa55d83ea19014114c418e9832d9554a979f Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Thu, 21 Jul 2016 10:48:42 -0400 Subject: [PATCH 1/5] refactor(gen:test): `.skip` e2e instead of commenting them out --- src/test/main.test.js | 74 +++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/src/test/main.test.js b/src/test/main.test.js index e73eaaa04..c34b1ade0 100644 --- a/src/test/main.test.js +++ b/src/test/main.test.js @@ -50,7 +50,7 @@ function runEndpointGen(name, opt={}) { gen .on('error', reject) - .on('end', () => resolve()) + .on('end', () => resolve()); }); } @@ -131,15 +131,15 @@ describe('angular-fullstack:app', function() { }); if(!process.env.SKIP_E2E) { - // it('should run e2e tests successfully', function() { - // this.retries(2); - // return runCmd('gulp test:e2e').should.be.fulfilled(); - // }); - - // it('should run e2e tests successfully for production app', function() { - // this.retries(2); - // return runCmd('gulp test:e2e:prod').should.be.fulfilled(); - // }); + it.skip('should run e2e tests successfully', function() { + this.retries(2); + return runCmd('gulp test:e2e').should.be.fulfilled(); + }); + + it.skip('should run e2e tests successfully for production app', function() { + this.retries(2); + return runCmd('gulp test:e2e:prod').should.be.fulfilled(); + }); } }); @@ -243,15 +243,15 @@ describe('angular-fullstack:app', function() { }); if(!process.env.SKIP_E2E) { - // it('should run e2e tests successfully', function() { - // this.retries(2); - // return runCmd('gulp test:e2e').should.be.fulfilled(); - // }); - - // it('should run e2e tests successfully for production app', function() { - // this.retries(2); - // return runCmd('gulp test:e2e:prod').should.be.fulfilled(); - // }); + it.skip('should run e2e tests successfully', function() { + this.retries(2); + return runCmd('gulp test:e2e').should.be.fulfilled(); + }); + + it.skip('should run e2e tests successfully for production app', function() { + this.retries(2); + return runCmd('gulp test:e2e:prod').should.be.fulfilled(); + }); } }); @@ -315,15 +315,15 @@ describe('angular-fullstack:app', function() { }); if(!process.env.SKIP_E2E) { - // it('should run e2e tests successfully', function() { - // this.retries(2); - // return runCmd('gulp test:e2e').should.be.fulfilled(); - // }); - - // it('should run e2e tests successfully for production app', function() { - // this.retries(2); - // return runCmd('gulp test:e2e:prod').should.be.fulfilled(); - // }); + it.skip('should run e2e tests successfully', function() { + this.retries(2); + return runCmd('gulp test:e2e').should.be.fulfilled(); + }); + + it.skip('should run e2e tests successfully for production app', function() { + this.retries(2); + return runCmd('gulp test:e2e:prod').should.be.fulfilled(); + }); } }); @@ -388,15 +388,15 @@ describe('angular-fullstack:app', function() { }); if(!process.env.SKIP_E2E) { - // it('should run e2e tests successfully', function() { - // this.retries(2); - // return runCmd('gulp test:e2e').should.be.fulfilled(); - // }); - - // it('should run e2e tests successfully for production app', function() { - // this.retries(2); - // return runCmd('gulp test:e2e:prod').should.be.fulfilled(); - // }); + it.skip('should run e2e tests successfully', function() { + this.retries(2); + return runCmd('gulp test:e2e').should.be.fulfilled(); + }); + + it.skip('should run e2e tests successfully for production app', function() { + this.retries(2); + return runCmd('gulp test:e2e:prod').should.be.fulfilled(); + }); } }); }); From 12aeafbb2c82bebbd1fad6223e7236b71a6616a7 Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Tue, 5 Jul 2016 13:41:27 -0400 Subject: [PATCH 2/5] chore(package): update generator-ng-component to 1.0.0 --- package.json | 2 +- src/generators/app/index.js | 2 +- src/generators/component/index.js | 2 +- src/generators/controller/index.js | 2 +- src/generators/decorator/index.js | 2 +- src/generators/directive/index.js | 2 +- src/generators/filter/index.js | 2 +- src/generators/provider/index.js | 2 +- src/generators/route/index.js | 2 +- src/generators/service/index.js | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 1ea23b302..70611916c 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "babel-plugin-transform-flow-strip-types": "^6.7.0", "bluebird": "^3.3.5", "chalk": "^1.1.0", - "generator-ng-component": "~0.3.0", + "generator-ng-component": "~1.0.0", "glob": "^7.0.3", "gulp-babel": "^6.1.2", "gulp-beautify": "^2.0.0", diff --git a/src/generators/app/index.js b/src/generators/app/index.js index 761c097b2..4156092b1 100644 --- a/src/generators/app/index.js +++ b/src/generators/app/index.js @@ -428,7 +428,7 @@ export class Generator extends Base { 'basePath': 'client', 'forceConfig': this.forceConfig } - }, { local: require.resolve('generator-ng-component/app/index.js') }); + }, { local: require.resolve('generator-ng-component/generators/app/index.js') }); }, ngModules: function() { var angModules = [ diff --git a/src/generators/component/index.js b/src/generators/component/index.js index 9d742dca4..d27d3430c 100644 --- a/src/generators/component/index.js +++ b/src/generators/component/index.js @@ -6,7 +6,7 @@ class Generator extends Base { this.composeWith('ng-component:component', { arguments: this.arguments }, { - local: require.resolve('generator-ng-component/component') + local: require.resolve('generator-ng-component/generators/component') }); } } diff --git a/src/generators/controller/index.js b/src/generators/controller/index.js index 0c9a53d87..8504e5f2b 100644 --- a/src/generators/controller/index.js +++ b/src/generators/controller/index.js @@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator'); var Generator = yeoman.Base.extend({ compose: function() { - this.composeWith('ng-component:controller', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/controller') }); + this.composeWith('ng-component:controller', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/generators/controller') }); } }); diff --git a/src/generators/decorator/index.js b/src/generators/decorator/index.js index 578427ae2..070232031 100644 --- a/src/generators/decorator/index.js +++ b/src/generators/decorator/index.js @@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator'); var Generator = yeoman.Base.extend({ compose: function() { - this.composeWith('ng-component:decorator', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/decorator') }); + this.composeWith('ng-component:decorator', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/generators/decorator') }); } }); diff --git a/src/generators/directive/index.js b/src/generators/directive/index.js index 5ac3c7c0e..3213835ec 100644 --- a/src/generators/directive/index.js +++ b/src/generators/directive/index.js @@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator'); var Generator = yeoman.Base.extend({ compose: function() { - this.composeWith('ng-component:directive', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/directive') }); + this.composeWith('ng-component:directive', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/generators/directive') }); } }); diff --git a/src/generators/filter/index.js b/src/generators/filter/index.js index badbe02a1..0226dc8cf 100644 --- a/src/generators/filter/index.js +++ b/src/generators/filter/index.js @@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator'); var Generator = yeoman.Base.extend({ compose: function() { - this.composeWith('ng-component:filter', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/filter') }); + this.composeWith('ng-component:filter', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/generators/filter') }); } }); diff --git a/src/generators/provider/index.js b/src/generators/provider/index.js index 8e0213799..1410cfe4b 100644 --- a/src/generators/provider/index.js +++ b/src/generators/provider/index.js @@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator'); var Generator = yeoman.Base.extend({ compose: function() { - this.composeWith('ng-component:provider', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/provider') }); + this.composeWith('ng-component:provider', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/generators/provider') }); } }); diff --git a/src/generators/route/index.js b/src/generators/route/index.js index 9f6f1f12d..bfe6e4c26 100644 --- a/src/generators/route/index.js +++ b/src/generators/route/index.js @@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator'); var Generator = yeoman.Base.extend({ compose: function() { - this.composeWith('ng-component:route', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/route') }); + this.composeWith('ng-component:route', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/generators/route') }); } }); diff --git a/src/generators/service/index.js b/src/generators/service/index.js index 7ef1e214a..93f9fc266 100644 --- a/src/generators/service/index.js +++ b/src/generators/service/index.js @@ -3,7 +3,7 @@ var yeoman = require('yeoman-generator'); var Generator = yeoman.Base.extend({ compose: function() { - this.composeWith('ng-component:service', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/service') }); + this.composeWith('ng-component:service', {arguments: this.arguments}, { local: require.resolve('generator-ng-component/generators/service') }); } }); From 38d1541d0e9763161f7cd7425cfe20bcd6451387 Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Tue, 5 Jul 2016 16:28:27 -0400 Subject: [PATCH 3/5] chore(gen): use modules in ng-component --- src/generators/app/index.js | 1 + src/test/fixtures/.yo-rc.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/generators/app/index.js b/src/generators/app/index.js index 4156092b1..06308ac38 100644 --- a/src/generators/app/index.js +++ b/src/generators/app/index.js @@ -415,6 +415,7 @@ export class Generator extends Base { if(this.filters.less) extensions.push('less'); filters.push('es6'); // Generate ES6 syntax code + filters.push('modules'); // Generate ES6 Module imports/exports this.composeWith('ng-component', { options: { diff --git a/src/test/fixtures/.yo-rc.json b/src/test/fixtures/.yo-rc.json index b6bc72cce..edb9b4f06 100644 --- a/src/test/fixtures/.yo-rc.json +++ b/src/test/fixtures/.yo-rc.json @@ -46,7 +46,8 @@ "expect", "should", "uirouter", - "es6" + "es6", + "modules" ], "extensions": [ "babel", From 9b9d1a053b16d74fc0dbd2dd1f7d3cfebe6135d6 Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Thu, 21 Jul 2016 12:03:09 -0400 Subject: [PATCH 4/5] fix(gen): replace ng-component 'modules' filter with 'webpack' filter. Add 'ngRoute' to list of modules to fix for TS --- src/generators/app/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/generators/app/index.js b/src/generators/app/index.js index 06308ac38..a27480543 100644 --- a/src/generators/app/index.js +++ b/src/generators/app/index.js @@ -415,7 +415,7 @@ export class Generator extends Base { if(this.filters.less) extensions.push('less'); filters.push('es6'); // Generate ES6 syntax code - filters.push('modules'); // Generate ES6 Module imports/exports + filters.push('webpack'); // Generate ES6 Module imports/exports this.composeWith('ng-component', { options: { @@ -536,6 +536,7 @@ export class Generator extends Base { ['ngResource', 'angular-resource'], ['ngSanitize', 'angular-sanitize'], ['uiRouter', 'angular-ui-router'], + ['ngRoute', 'angular-route'], ['uiBootstrap', 'angular-ui-bootstrap'], ['ngMessages', 'angular-messages'], ['io', 'socket.io-client'] From 5854b78958235353c31dfad18dcb374b75cc30f4 Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Thu, 21 Jul 2016 16:38:55 -0400 Subject: [PATCH 5/5] chore(package): enforce ng-component 1.0.1+ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 70611916c..a42797e21 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "babel-plugin-transform-flow-strip-types": "^6.7.0", "bluebird": "^3.3.5", "chalk": "^1.1.0", - "generator-ng-component": "~1.0.0", + "generator-ng-component": "~1.0.1", "glob": "^7.0.3", "gulp-babel": "^6.1.2", "gulp-beautify": "^2.0.0",