From 76d3bf8ee4886342b324ea8337e6f1d583020360 Mon Sep 17 00:00:00 2001 From: Adam Bullmer Date: Sun, 2 Apr 2017 22:24:54 -0500 Subject: [PATCH 1/2] Bumped angular-bro app version Fixes #17 --- generators/app/index.js | 12 ++++++------ generators/app/templates/{ => app}/index.html | 0 generators/app/templates/package.json | 2 +- package.json | 2 +- test/app.js | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) rename generators/app/templates/{ => app}/index.html (100%) diff --git a/generators/app/index.js b/generators/app/index.js index 8cbb2e2..ed9f89a 100644 --- a/generators/app/index.js +++ b/generators/app/index.js @@ -58,12 +58,6 @@ module.exports = generators.Base.extend({ this.destinationPath('Gruntfile.js') ); - this.fs.copyTpl( - this.templatePath('index.html'), - this.destinationPath('index.html'), - this - ); - this.fs.copy( this.templatePath('karma.conf.js'), this.destinationPath('karma.conf.js') @@ -83,6 +77,12 @@ module.exports = generators.Base.extend({ this ); + this.fs.copyTpl( + this.templatePath('app/index.html'), + this.destinationPath('app/index.html'), + this + ); + this.fs.copyTpl( this.templatePath('app/router.js'), this.destinationPath('app/router.js'), diff --git a/generators/app/templates/index.html b/generators/app/templates/app/index.html similarity index 100% rename from generators/app/templates/index.html rename to generators/app/templates/app/index.html diff --git a/generators/app/templates/package.json b/generators/app/templates/package.json index 8729175..6b01938 100644 --- a/generators/app/templates/package.json +++ b/generators/app/templates/package.json @@ -10,7 +10,7 @@ "author": "", "license": "MIT", "dependencies": { - "angular-bro-app": "0.10.0", + "angular-bro-app": "0.10.1", "broccoli": "0.16.9", "grunt": "^1.0.1", "grunt-broccoli": "^0.4.1", diff --git a/package.json b/package.json index 0f1d1e6..a85e54e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "generator-angular-bro", - "version": "0.9.0", + "version": "0.10.0", "description": "Angular app scaffolding and build chain", "main": "generators/app/index.js", "files": [ diff --git a/test/app.js b/test/app.js index ca648f4..de2cc1e 100644 --- a/test/app.js +++ b/test/app.js @@ -18,10 +18,10 @@ describe('generator-angular-bro:app', function () { 'Brocfile.js', 'circle.yml', 'Gruntfile.js', - 'index.html', 'karma.conf.js', 'package.json', 'app/app.js', + 'app/index.html', 'app/router.js', 'app/test-app.js', 'assets/.gitkeep', From fce4230ddf7825558b3a1803639135e4cb18e038 Mon Sep 17 00:00:00 2001 From: Adam Bullmer Date: Sun, 2 Apr 2017 22:45:32 -0500 Subject: [PATCH 2/2] fixup! Bumped angular-bro app version Fixes #17 --- test/app.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/app.js b/test/app.js index de2cc1e..8c46c50 100644 --- a/test/app.js +++ b/test/app.js @@ -12,8 +12,7 @@ describe('generator-angular-bro:app', function () { it('creates files', function () { assert.file([ - '.jscsrc', - '.jshintrc', + '.eslintrc', 'bower.json', 'Brocfile.js', 'circle.yml', @@ -52,8 +51,8 @@ describe('generator-angular-bro:app', function () { assert.fileContent('bower.json', /\n "name": "test-app",\n/); }); - it('index.html', function () { - assert.fileContent('index.html', /\n Test App<\/title>\n/); + it('app/index.html', function () { + assert.fileContent('app/index.html', /\n <title>Test App<\/title>\n/); }); it('package.json', function () {