From ed8feac4c068b67d0143613a8123b9298d887bff Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Wed, 20 Jan 2016 13:34:01 -0500 Subject: [PATCH 01/17] chore(npm): add `.idea` to .npmignore [skip ci] --- .npmignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.npmignore b/.npmignore index ec6ff802d..c823223d9 100644 --- a/.npmignore +++ b/.npmignore @@ -1,2 +1,3 @@ angular-fullstack-deps test +.idea From d3b4c541decd92d6ab878dd5d7451a9cddc92ec5 Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Tue, 26 Jan 2016 09:33:17 -0500 Subject: [PATCH 02/17] docs(readme): show options for endpoint --models flag --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 495ea7527..7e3ec2919 100644 --- a/readme.md +++ b/readme.md @@ -135,7 +135,7 @@ Options: -h, --help # Print the generator's options and usage --skip-cache # Do not remember prompt answers Default: false --route # URL for the endpoint - --models # Specify which model(s) to use + --models # Specify which model(s) to use Options: mongoose, sequelize --endpointDirectory # Parent directory for enpoints Arguments: From 6c4e926262f3be14fed9fcb28e71ca10d8dc4a6a Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Wed, 27 Jan 2016 22:31:27 -0500 Subject: [PATCH 03/17] fix(npm): make sure to include mocha for server tests --- app/templates/_package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/_package.json b/app/templates/_package.json index 13c47e4e3..b68dc4c34 100644 --- a/app/templates/_package.json +++ b/app/templates/_package.json @@ -150,8 +150,8 @@ "karma-ng-jade2js-preprocessor": "^0.2.0",<% } else { %> "karma-ng-html2js-preprocessor": "~0.2.0",<% } %> "karma-spec-reporter": "~0.0.20", - "sinon-chai": "^2.8.0",<% if (filters.mocha) { %> - "mocha": "^2.2.5", + "sinon-chai": "^2.8.0", + "mocha": "^2.2.5",<% if (filters.mocha) { %> "karma-mocha": "^0.2.0", "karma-chai-plugins": "^0.6.0",<% } if (filters.jasmine) { %> "jasmine-core": "^2.3.4", From f4e590ffeaf4acb56a43d07d12e1f6bab3b1872f Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Thu, 28 Jan 2016 15:32:54 -0500 Subject: [PATCH 04/17] fix(grunt): exclude constant file from jshint:all --- app/templates/Gruntfile(grunt).js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/Gruntfile(grunt).js b/app/templates/Gruntfile(grunt).js index 87846d184..a775cce6c 100644 --- a/app/templates/Gruntfile(grunt).js +++ b/app/templates/Gruntfile(grunt).js @@ -161,7 +161,7 @@ module.exports = function (grunt) { }, src: ['<%%= yeoman.server %>/**/*.{spec,integration}.js'] }, - all: ['<%%= yeoman.client %>/{app,components}/**/!(*.spec|*.mock).js'], + all: ['<%%= yeoman.client %>/{app,components}/**/!(*.spec|*.mock|app.constant).js'], test: { src: ['<%%= yeoman.client %>/{app,components}/**/*.{spec,mock}.js'] } From 103db1169d38d954a8aab709e8b8806fe47615ef Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Thu, 28 Jan 2016 15:33:32 -0500 Subject: [PATCH 05/17] fix(gulp): exclude constant file from lint:scripts:client closes #1587 --- app/templates/gulpfile.babel(gulp).js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/templates/gulpfile.babel(gulp).js b/app/templates/gulpfile.babel(gulp).js index 7f9fe93ee..902bed155 100644 --- a/app/templates/gulpfile.babel(gulp).js +++ b/app/templates/gulpfile.babel(gulp).js @@ -312,7 +312,11 @@ gulp.task('transpile:server', () => { gulp.task('lint:scripts', cb => runSequence(['lint:scripts:client', 'lint:scripts:server'], cb)); gulp.task('lint:scripts:client', () => { - return gulp.src(_.union(paths.client.scripts, _.map(paths.client.test, blob => '!' + blob))) + return gulp.src(_.union( + paths.client.scripts, + _.map(paths.client.test, blob => '!' + blob), + [`!${clientPath}/app/app.constant.<%= scriptExt %>`] + )) .pipe(lintClientScripts()); }); From 885438f4f701ce926db68c7cdb4eac2c5ad01e00 Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Thu, 28 Jan 2016 15:05:39 -0500 Subject: [PATCH 06/17] fix(grunt:babel): don't try to transpile JSON files closes #1561 --- app/templates/Gruntfile(grunt).js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/Gruntfile(grunt).js b/app/templates/Gruntfile(grunt).js index 87846d184..af7ee8c7e 100644 --- a/app/templates/Gruntfile(grunt).js +++ b/app/templates/Gruntfile(grunt).js @@ -636,7 +636,7 @@ module.exports = function (grunt) { files: [{ expand: true, cwd: '<%%= yeoman.server %>', - src: ['**/*.{js,json}'], + src: ['**/*.js'], dest: '<%%= yeoman.dist %>/<%%= yeoman.server %>' }] } From be5a1f4876c5b5b1651e56b045ce726f820cd0b8 Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Thu, 28 Jan 2016 15:18:43 -0500 Subject: [PATCH 07/17] fix(grunt:build): don't copy local.env.sample closes #1570 --- app/templates/Gruntfile(grunt).js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/templates/Gruntfile(grunt).js b/app/templates/Gruntfile(grunt).js index 87846d184..a3d3a695a 100644 --- a/app/templates/Gruntfile(grunt).js +++ b/app/templates/Gruntfile(grunt).js @@ -424,7 +424,8 @@ module.exports = function (grunt) { dest: '<%%= yeoman.dist %>', src: [ 'package.json', - '<%%= yeoman.server %>/**/*' + '<%%= yeoman.server %>/**/*', + '!<%%= yeoman.server %>/config/local.env.sample.js' ] }] }, From 009b78985647d0ad478f07ef18e7a248662fc7e4 Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Tue, 2 Feb 2016 08:22:35 -0500 Subject: [PATCH 08/17] 3.3.0 --- angular-fullstack-deps | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/angular-fullstack-deps b/angular-fullstack-deps index 29cd1a011..7c3662328 160000 --- a/angular-fullstack-deps +++ b/angular-fullstack-deps @@ -1 +1 @@ -Subproject commit 29cd1a01184213b1c4a278d0f98b9a46ef000c7d +Subproject commit 7c3662328ffd32f819ae381825399ed578c11f98 diff --git a/package.json b/package.json index d2cd698aa..382e981b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "generator-angular-fullstack", - "version": "3.3.0-beta.0", + "version": "3.3.0", "description": "Yeoman generator for creating MEAN stack applications, using MongoDB, Express, AngularJS, and Node", "keywords": [ "yeoman-generator", From 18412a7e2b61c6343e4724aa89d187f7d1db7785 Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Fri, 5 Feb 2016 11:43:50 -0500 Subject: [PATCH 09/17] fix(gulp:watch): re-compile jade to .tmp --- app/templates/gulpfile.babel(gulp).js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/templates/gulpfile.babel(gulp).js b/app/templates/gulpfile.babel(gulp).js index 902bed155..e939c5a55 100644 --- a/app/templates/gulpfile.babel(gulp).js +++ b/app/templates/gulpfile.babel(gulp).js @@ -377,7 +377,9 @@ gulp.task('watch', () => { .pipe(plugins.livereload()); }); - plugins.watch(paths.client.views) + plugins.watch(paths.client.views)<% if(filters.jade) { %> + .pipe(plugins.jade()) + .pipe(gulp.dest('.tmp'))<% } %> .pipe(plugins.plumber()) .pipe(plugins.livereload()); From 978e07edf9b2afc7492cd9ecf8a4a063dd82086f Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Sun, 7 Feb 2016 03:16:22 -0500 Subject: [PATCH 10/17] fix(gulp): add inject:tsconfig, change script watcher --- app/templates/gulpfile.babel(gulp).js | 31 ++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/app/templates/gulpfile.babel(gulp).js b/app/templates/gulpfile.babel(gulp).js index 902bed155..3297bbad1 100644 --- a/app/templates/gulpfile.babel(gulp).js +++ b/app/templates/gulpfile.babel(gulp).js @@ -218,7 +218,26 @@ gulp.task('inject:js', () => { transform: (filepath) => '' })) .pipe(gulp.dest(clientPath)); -}); +});<% if(filters.ts) { %> + +gulp.task('inject:tsconfig', () => { + let src = gulp.src([ + `${clientPath}/**/!(*.spec|*.mock).ts`, + `!${clientPath}/bower_components/**/*`, + `${clientPath}/typings/**/*.d.ts` + ], {read: false}) + .pipe(plugins.sort()); + + return gulp.src('./tsconfig.client.json') + .pipe(plugins.inject(src, { + starttag: '"files": [', + endtag: ']', + transform: (filepath, file, i, length) => { + return `"${filepath.substr(1)}"${i + 1 < length ? ',' : ''}`; + } + })) + .pipe(gulp.dest('./')); +});<% } %> gulp.task('inject:css', () => { return gulp.src(paths.client.mainView) @@ -280,7 +299,7 @@ gulp.task('copy:constant', () => { }) let tsProject = plugins.typescript.createProject('./tsconfig.client.json'); -gulp.task('transpile:client', ['constant', 'copy:constant'], () => { +gulp.task('transpile:client', ['inject:tsconfig', 'constant', 'copy:constant'], () => { return tsProject.src() .pipe(plugins.sourcemaps.init()) .pipe(plugins.typescript(tsProject)).js @@ -379,13 +398,15 @@ gulp.task('watch', () => { plugins.watch(paths.client.views) .pipe(plugins.plumber()) - .pipe(plugins.livereload()); + .pipe(plugins.livereload());<% if(filters.babel) { %> plugins.watch(paths.client.scripts) //['inject:js'] .pipe(plugins.plumber()) .pipe(transpileClient()) .pipe(gulp.dest('.tmp')) - .pipe(plugins.livereload()); + .pipe(plugins.livereload());<% } %><% if(filters.ts) { %> + + gulp.watch(paths.client.scripts, ['inject:tsconfig', 'lint:scripts:client', 'transpile:client']);<% } %> plugins.watch(_.union(paths.server.scripts, testFiles)) .pipe(plugins.plumber()) @@ -397,7 +418,7 @@ gulp.task('watch', () => { gulp.task('serve', cb => { runSequence(['clean:tmp', 'constant'<% if(filters.ts) { %>, 'tsd'<% } %>], - ['lint:scripts', 'inject'<% if(filters.jade) { %>, 'jade'<% } %>], + ['lint:scripts', 'inject'<% if(filters.jade) { %>, 'jade'<% } %><% if(filters.ts) { %>, 'inject:tsconfig'<% } %>], ['wiredep:client'], ['transpile:client', 'styles'], ['start:server', 'start:client'], From 3d061cce7ce3f58110ebc1b7800fbd972b19da3c Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Thu, 18 Feb 2016 12:57:17 -0500 Subject: [PATCH 11/17] chore(bower): upgrade angular-bootstrap to ~1.1.2 closes #1629 --- app/templates/_bower.json | 2 +- app/templates/client/app/main/main(html).html | 2 +- app/templates/client/app/main/main(jade).jade | 2 +- .../client/components/modal(uibootstrap)/modal.service.js | 6 +++--- app/templates/client/components/navbar/navbar(html).html | 2 +- app/templates/client/components/navbar/navbar(jade).jade | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/templates/_bower.json b/app/templates/_bower.json index b0de0c559..59b5007ca 100644 --- a/app/templates/_bower.json +++ b/app/templates/_bower.json @@ -12,7 +12,7 @@ "angular-cookies": "~1.4.0", "angular-sanitize": "~1.4.0",<% if (filters.ngroute) { %> "angular-route": "~1.4.0",<% } if (filters.uibootstrap) { %> - "angular-bootstrap": "~0.13.0",<% } %> + "angular-bootstrap": "~1.1.2",<% } %> "font-awesome": ">=4.1.0", "lodash": "~2.4.1"<% if(filters.socketio) { %>, "angular-socket-io": "~0.7.0"<% } if (filters.uirouter) { %>, diff --git a/app/templates/client/app/main/main(html).html b/app/templates/client/app/main/main(html).html index 0ee458852..1c413a22a 100644 --- a/app/templates/client/app/main/main(html).html +++ b/app/templates/client/app/main/main(html).html @@ -11,7 +11,7 @@

'Allo, 'Allo!

Features:

<% if (filters.socketio) { %> diff --git a/app/templates/client/app/main/main(jade).jade b/app/templates/client/app/main/main(jade).jade index 3191ca2d2..5a732f9dc 100644 --- a/app/templates/client/app/main/main(jade).jade +++ b/app/templates/client/app/main/main(jade).jade @@ -10,7 +10,7 @@ header#banner.hero-unit h1.page-header Features: ul.nav.nav-tabs.nav-stacked.col-md-4.col-lg-4.col-sm-6(ng-repeat='thing in main.awesomeThings') li - a(href='#', tooltip='{{thing.info}}') + a(href='#', uib-tooltip='{{thing.info}}') | {{thing.name}}<% if (filters.socketio) { %> button.close(type='button', ng-click='main.deleteThing(thing)') ×<% } %><% if (filters.socketio) { %> diff --git a/app/templates/client/components/modal(uibootstrap)/modal.service.js b/app/templates/client/components/modal(uibootstrap)/modal.service.js index d878f69dd..d7807e6b5 100644 --- a/app/templates/client/components/modal(uibootstrap)/modal.service.js +++ b/app/templates/client/components/modal(uibootstrap)/modal.service.js @@ -1,19 +1,19 @@ 'use strict'; angular.module('<%= scriptAppName %>') - .factory('Modal', function($rootScope, $modal) { + .factory('Modal', function($rootScope, $uibModal) { /** * Opens a modal * @param {Object} scope - an object to be merged with modal's scope * @param {String} modalClass - (optional) class(es) to be applied to the modal - * @return {Object} - the instance $modal.open() returns + * @return {Object} - the instance $uibModal.open() returns */ function openModal(scope = {}, modalClass = 'modal-default') { var modalScope = $rootScope.$new(); angular.extend(modalScope, scope); - return $modal.open({ + return $uibModal.open({ templateUrl: 'components/modal/modal.html', windowClass: modalClass, scope: modalScope diff --git a/app/templates/client/components/navbar/navbar(html).html b/app/templates/client/components/navbar/navbar(html).html index 8337fb6c2..4b6692d36 100644 --- a/app/templates/client/components/navbar/navbar(html).html +++ b/app/templates/client/components/navbar/navbar(html).html @@ -9,7 +9,7 @@ <%= lodash.slugify(lodash.humanize(appname)) %> -