diff --git a/docs/index.md b/docs/index.md index 8e053b91f..f25320da3 100644 --- a/docs/index.md +++ b/docs/index.md @@ -110,7 +110,7 @@ Overview ├── client │   ├── app - All of our app specific components go in here │   ├── assets - Custom assets: fonts, images, etc… - │   ├── components - Our reusable components, non-specific to to our app + │   ├── components - Our reusable components, non-specific to our app │ ├── e2e - Our protractor end to end tests │ diff --git a/package.json b/package.json index 671b33dc9..6d4235010 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "grunt-david": "~0.7.0", "grunt-env": "^0.4.1", "grunt-mocha-test": "^0.12.7", - "grunt-release": "^0.13.0", + "grunt-release": "^0.14.0", "gulp": "^3.9.1", "gulp-if": "^2.0.1", "gulp-mocha": "^2.2.0", @@ -76,13 +76,13 @@ "jscs": "^3.0.3", "lazypipe": "^1.0.1", "merge-stream": "^1.0.0", - "minimatch": "^3.0.0", + "minimatch": "^3.0.2", "mocha": "^2.5.2", "q": "^1.0.1", "recursive-readdir": "^2.0.0", "run-sequence": "^1.2.1", "shelljs": "^0.7.0", - "should": "^9.0.0", + "should": "^9.0.2", "yeoman-assert": "^2.0.0", "yeoman-test": "~1.4.0" }, diff --git a/readme.md b/readme.md index a166442e5..b6f8a2398 100644 --- a/readme.md +++ b/readme.md @@ -19,6 +19,8 @@ Install `yo`, `grunt-cli`/`gulp-cli`, `bower`, and `generator-angular-fullstack` npm install -g yo grunt-cli gulp-cli bower generator-angular-fullstack ``` +> To install the latest 4.0.0 Beta with Webpack support, use `generator-angular-fullstack@webpack` + Make a new directory, and `cd` into it: ``` mkdir my-new-project && cd $_ @@ -40,7 +42,7 @@ Run `grunt`/`gulp build` for building, `grunt serve`/`gulp serve` for developmen **General** -* Build Systems: `Grunt`, `Gulp` +* Build Systems: `Grunt` (deprecated, will be removed in 4.0.0), `Gulp` * Testing: * `Jasmine` * `Mocha + Chai + Sinon` diff --git a/src/generators/app/index.js b/src/generators/app/index.js index 6d4dd5435..c237dab69 100644 --- a/src/generators/app/index.js +++ b/src/generators/app/index.js @@ -297,9 +297,12 @@ export class Generator extends Base { type: 'list', name: 'buildtool', message: 'Would you like to use Gulp or Grunt?', - choices: ['Grunt', 'Gulp'], - default: 1, - filter: val => val.toLowerCase() + choices: ['Gulp', 'Grunt (deprecated)'], + default: 0, + filter: val => ({ + 'Gulp': 'gulp', + 'Grunt (deprecated)': 'grunt' + })[val] }, { type: 'list', name: 'testing', diff --git a/templates/app/server/api/user(auth)/user.controller.js b/templates/app/server/api/user(auth)/user.controller.js index c79048546..0e7cd0719 100644 --- a/templates/app/server/api/user(auth)/user.controller.js +++ b/templates/app/server/api/user(auth)/user.controller.js @@ -89,7 +89,7 @@ export function show(req, res, next) { */ export function destroy(req, res) { <% if (filters.mongooseModels) { %>return User.findByIdAndRemove(req.params.id).exec()<% } - if (filters.sequelizeModels) { %>return User.destroy({ _id: req.params.id })<% } %> + if (filters.sequelizeModels) { %>return User.destroy({ where: { _id: req.params.id } })<% } %> .then(function() { res.status(204).end(); })