Merge pull request #2022 from angular-fullstack/remove-grunt-bower-etc

Remove grunt bower etc [skip ci]

Author: Awk34

.travis.yml

@@ -14,7 +14,7 @@ before_install:
   - ./scripts/sauce_connect_setup.sh
   - gem update --system
   - gem install sass --version "=3.3.7"
-  - npm install -g bower grunt-cli
+  - npm install -g gulp-cli
 services: mongodb
 cache:
   directories:

ISSUE_TEMPLATE.md

@@ -14,7 +14,6 @@ Transpiler | Babel / TypeScript
 Markup | HTML / Jade
 CSS | CSS / LESS / SCSS / Stylus
 Router | ngRoute / ui-router
-Build Tool | Grunt / Gulp
 Client Tests | Jasmine / Mocha
 DB | MongoDB / SQL
 Auth | Y / N

docs/generators/heroku.md

@@ -41,14 +41,12 @@ Your app should now be live. To view it run `heroku open`.
 >     heroku config:set DOMAIN=<your-custom-domain>
 >
 
-> WARNING: Deployment is untested with Gulp
-
 To make your deployment process easier consider using [grunt-build-control](https://github.com/robwierzbowski/grunt-build-control).
 
 #### Pushing Updates
 
-    grunt
+    gulp build
 
 Commit and push the resulting build, located in your dist folder:
 
-    grunt buildcontrol:heroku
+    gulp buildcontrol:heroku

docs/generators/openshift.md

@@ -31,8 +31,8 @@ To make your deployment process easier consider using [grunt-build-control](http
 
 **Pushing Updates**
 
-    grunt
+    gulp build
 
 Commit and push the resulting build, located in your dist folder:
 
-    grunt buildcontrol:openshift
+    gulp buildcontrol:openshift

docs/index.md

@@ -50,7 +50,7 @@ All of these can be updated with `bower update` as new versions are released.
 
 ## Injection
 
-A grunt/gulp task looks for new files in your `client/app` and `client/components` folder and automatically injects them in the appropriate places based on an injection block.
+A gulp task looks for new files in your `client/app` and `client/components` folder and automatically injects them in the appropriate places based on an injection block.
 
 * `less` files into `client/app/app.less`
 * `scss` files into `client/app/app.scss`
@@ -68,23 +68,23 @@ A `.yo-rc` file is generated for helping you copy configuration across projects,
 
 ## Testing
 
-Running `grunt test` will run the client and server unit tests with karma and mocha.
+Running `gulp test` will run the client and server unit tests with karma and mocha.
 
-Use `grunt test:server` to only run server tests.
+Use `gulp test:server` to only run server tests.
 
-Use `grunt test:client` to only run client tests.
+Use `gulp test:client` to only run client tests.
 
 **Protractor tests**
 
 To setup protractor e2e tests, you must first run
 
 `npm run update-webdriver`
 
-Use `grunt test:e2e` to have protractor go through tests located in the `e2e` folder.
+Use `gulp test:e2e` to have protractor go through tests located in the `e2e` folder.
 
 **Code Coverage**
 
-Use `grunt test:coverage` to run mocha-istanbul and generate code coverage reports.
+Use `gulp test:coverage` to run mocha-istanbul and generate code coverage reports.
 
 `coverage/server` will be populated with `e2e` and `unit` folders containing the `lcov` reports.
 
@@ -97,11 +97,12 @@ The coverage taget has 3 available options:
 
 **Debugging**
 
-Use `grunt serve:debug` for a more debugging-friendly environment.
+Use `gulp serve:debug` for a more debugging-friendly environment.
 
 ## Environment Variables
 
-Keeping your app secrets and other sensitive information in source control isn't a good idea. To have grunt launch your app with specific environment variables, add them to the git ignored environment config file: `server/config/local.env.js`.
+Keeping your app secrets and other sensitive information in source control isn't a good idea.
+To have gulp launch your app with specific environment variables, add them to the git ignored environment config file: `server/config/local.env.js`.
 
 ## Project Structure
 

gulpfile.js

@@ -86,7 +86,7 @@ var processJson = function(src, dest, opt) {
 
             if(/package.json/g.test(src) && opt.test) {
                 delete json.scripts.postinstall;
-                json.scripts['update-webdriver'] = 'node node_modules/grunt-protractor-runner/node_modules/protractor/bin/webdriver-manager update || node node_modules/protractor/bin/webdriver-manager update';
+                json.scripts['update-webdriver'] = 'node node_modules/gulp-protractor-runner/node_modules/protractor/bin/webdriver-manager update || node node_modules/protractor/bin/webdriver-manager update';
             }
 
             // set properties

package.json

@@ -87,8 +87,8 @@
     "yeoman-test": "~1.4.0"
   },
   "engines": {
-    "node": "^5.10.1",
-    "npm": "^3.8.3"
+    "node": "^6.2.2",
+    "npm": "^3.9.5"
   },
   "license": "BSD-2-Clause"
 }

readme.md

@@ -14,9 +14,9 @@
 
 ## Usage
 
-Install `yo`, `grunt-cli`/`gulp-cli`, `bower`, and `generator-angular-fullstack`:
+Install `yo`, `gulp-cli`, and `generator-angular-fullstack`:
 ```
-npm install -g yo grunt-cli gulp-cli bower generator-angular-fullstack
+npm install -g yo gulp-cli generator-angular-fullstack
 ```
 
 > To install the latest 4.0.0 Beta with Webpack support, use `generator-angular-fullstack@beta`
@@ -31,7 +31,7 @@ Run `yo angular-fullstack`, optionally passing an app name:
 yo angular-fullstack [app-name]
 ```
 
-Run `grunt`/`gulp build` for building, `grunt serve`/`gulp serve` for development, and `grunt serve:dist`/`gulp serve:dist` for a preview of the built app.
+Run `gulp build` for building, `gulp serve` for development, and `gulp serve:dist` for a preview of the built app.
 
 ## Prerequisites
 
@@ -42,7 +42,7 @@ Run `grunt`/`gulp build` for building, `grunt serve`/`gulp serve` for developmen
 
 **General**
 
-* Build Systems: `Grunt` (deprecated, will be removed in 4.0.0), `Gulp`
+* Build Systems: `Gulp`
 * Testing: 
   * `Jasmine`
   * `Mocha + Chai + Sinon`

src/generators/app/index.js

@@ -328,16 +328,6 @@ export class Generator extends Base {
         this.log('\n# Project\n');
 
         return this.prompt([{
-          type: 'list',
-          name: 'buildtool',
-          message: 'Would you like to use Gulp or Grunt?',
-          choices: ['Gulp', 'Grunt (deprecated)'],
-          default: 0,
-          filter: val => ({
-            'Gulp': 'gulp',
-            'Grunt (deprecated)': 'grunt'
-          })[val]
-        }, {
           type: 'list',
           name: 'testing',
           message: 'What would you like to write tests with?',
@@ -357,9 +347,6 @@ export class Generator extends Base {
           filter: val => val.toLowerCase(),
           when: answers => answers.testing === 'mocha'
         }]).then(answers => {
-          this.filters[answers.buildtool] = true;
-          insight.track('buildtool', answers.buildtool);
-
           this.filters[answers.testing] = true;
           insight.track('testing', answers.testing);
           if(answers.testing === 'mocha') {

src/generators/endpoint/index.js

@@ -5,7 +5,6 @@ import {Base} from 'yeoman-generator';
 import {genNamedBase} from '../generator-base';
 
 export class Generator extends Base {
-
   constructor(...args) {
     super(...args);
 
@@ -33,69 +32,68 @@ export class Generator extends Base {
   }
 
   prompting() {
-    var promptCb = (props) => {
+    let promptCb = props => {
       if(props.route.charAt(0) !== '/') {
-        props.route = '/' + props.route;
+        props.route = `/${props.route}`;
       }
 
       this.route = props.route;
 
-      if (props.models) {
+      if(props.models) {
         delete this.filters.mongoose;
         delete this.filters.mongooseModels;
         delete this.filters.sequelize;
         delete this.filters.sequelizeModels;
 
         this.filters[props.models] = true;
-        this.filters[props.models + 'Models'] = true;
+        this.filters[`${props.models}Models`] = true;
       }
     };
 
-    if (this.options.route) {
-      if (this.filters.mongoose && this.filters.sequelize) {
-        if (this.options.models) {
-          return promptCb(this.options);
-        }
+    if(this.options.route) {
+      if(this.filters.mongoose && this.filters.sequelize && this.options.models) {
+        return promptCb(this.options);
       } else {
-        if (this.filters.mongooseModels) { this.options.models = 'mongoose'; }
-        else if (this.filters.sequelizeModels) { this.options.models = 'sequelize'; }
-        else { delete this.options.models; }
+        if(this.filters.mongooseModels) this.options.models = 'mongoose';
+        else if(this.filters.sequelizeModels) this.options.models = 'sequelize';
+        else delete this.options.models;
         return promptCb(this.options);
       }
     }
 
     var name = this.name;
 
     var base = this.config.get('routesBase') || '/api/';
-    if(base.charAt(base.length-1) !== '/') {
-      base = base + '/';
+    if(base.charAt(base.length - 1) !== '/') {
+      base = `${base}/`;
     }
 
     // pluralization defaults to true for backwards compat
-    if (this.config.get('pluralizeRoutes') !== false) {
-      name = name + 's';
+    if(this.config.get('pluralizeRoutes') !== false) {
+      name = `${name}s`;
     }
 
     var prompts = [{
       name: 'route',
       message: 'What will the url of your endpoint be?',
-      default: base + name
+      default: `${base}${name}`
     }, {
       type: 'list',
       name: 'models',
       message: 'What would you like to use for the endpoint\'s models?',
-      choices: [ 'Mongoose', 'Sequelize' ],
+      choices: ['Mongoose', 'Sequelize'],
       default: this.filters.sequelizeModels ? 1 : 0,
-      filter: (val) => val.toLowerCase(),
+      filter: val => val.toLowerCase(),
       when: () => this.filters.mongoose && this.filters.sequelize
     }];
 
     return this.prompt(prompts).then(promptCb);
   }
 
   configuring() {
-    this.routeDest = path.join(this.options.endpointDirectory ||
-      this.config.get('endpointDirectory') || 'server/api/', this.name);
+    this.routeDest = path.join(this.options.endpointDirectory
+      || this.config.get('endpointDirectory')
+      || 'server/api/', this.name);
   }
 
   writing() {
@@ -111,34 +109,34 @@ export class Generator extends Base {
         file: routesFile,
         needle: this.config.get('routesNeedle'),
         splicable: [
-          "app.use(\'" + this.route +"\', require(\'" + reqPath + "\'));"
+          `app.use('${this.route}', require('${reqPath}'));`
         ]
       };
       this.rewriteFile(routeConfig);
     }
 
-    if (this.filters.socketio && this.config.get('insertSockets')) {
+    if(this.filters.socketio && this.config.get('insertSockets')) {
       var socketsFile = this.config.get('registerSocketsFile');
       var reqPath = this.relativeRequire(this.routeDest + '/' + this.basename +
         '.socket', socketsFile);
       var socketConfig = {
         file: socketsFile,
         needle: this.config.get('socketsNeedle'),
         splicable: [
-          "require(\'" + reqPath + "\').register(socket);"
+          `require('${reqPath}').register(socket);`
         ]
       };
       this.rewriteFile(socketConfig);
     }
 
-    if (this.filters.sequelize && this.config.get('insertModels')) {
+    if(this.filters.sequelize && this.config.get('insertModels')) {
       var modelsFile = this.config.get('registerModelsFile');
-      var reqPath = this.relativeRequire(this.routeDest + '/' + this.basename + '.model', modelsFile);
+      var reqPath = this.relativeRequire(`${this.routeDest}/${this.basename}.model`, modelsFile);
       var modelConfig = {
         file: modelsFile,
         needle: this.config.get('modelsNeedle'),
         splicable: [
-          "db." + this.classedName + " = db.sequelize.import(\'" + reqPath +"\');"
+          `db.${this.classedName} = db.sequelize.import('${reqPath}');`
         ]
       };
       this.rewriteFile(modelConfig);

src/generators/heroku/index.js

@@ -115,10 +115,9 @@ Generator.prototype.copyProcfile = function copyProcfile() {
 Generator.prototype.build = function build() {
   if(this.abort) return;
   var done = this.async();
-  var buildCommand = this.filters.grunt ? 'grunt build' : 'gulp build';
 
   this.log(chalk.bold('\nBuilding dist folder, please wait...'));
-  var child = exec(buildCommand, function (err, stdout) {
+  var child = exec('gulp build', function (err, stdout) {
     done();
   }.bind(this));
   child.stdout.on('data', function(data) {
@@ -189,10 +188,10 @@ Generator.prototype.gitForcePush = function gitForcePush() {
       }
 
       this.log(chalk.yellow(
-        'After app modification run\n\t' + 
-        chalk.bold(this.filters.grunt ? 'grunt build' : 'gulp build') +
+        'After app modification run\n\t' +
+        chalk.bold('gulp build') +
         '\nThen deploy with\n\t' +
-        chalk.bold(this.filters.grunt ? 'grunt buildcontrol:heroku' : 'gulp buildcontrol:heroku')
+        chalk.bold('gulp buildcontrol:heroku')
       ));
     }
     done();

src/generators/openshift/index.js

@@ -196,10 +196,9 @@ Generator.prototype.enableOpenShiftHotDeploy = function enableOpenshiftHotDeploy
 Generator.prototype.build = function build() {
   if(this.abort || !this.openshift_remote_exists ) return;
   var done = this.async();
-  var buildCommand = this.filters.grunt ? 'grunt build' : 'gulp build';
 
   this.log(chalk.bold('\nBuilding dist folder, please wait...'));
-  var child = exec(buildCommand, function (err, stdout) {
+  var child = exec('gulp build', function (err, stdout) {
     if (err) {
       this.log.error(err);
     }
@@ -297,10 +296,10 @@ Generator.prototype.restartApp = function restartApp() {
     }
 
     this.log(chalk.yellow(
-      'After app modification run\n\t' + 
-      chalk.bold(this.filters.grunt ? 'grunt build' : 'gulp build') +
+      'After app modification run\n\t' +
+      chalk.bold('gulp build') +
       '\nThen deploy with\n\t' +
-      chalk.bold(this.filters.grunt ? 'grunt buildcontrol:openshift' : 'gulp buildcontrol:openshift')
+      chalk.bold('gulp buildcontrol:openshift')
     ));
   }.bind(this));
 };

src/test/endpoint.test.js

@@ -18,7 +18,6 @@ import {
 const TEST_DIR = __dirname;
 
 const defaultOptions = {
-  buildtool: 'grunt',
   script: 'js',
   transpiler: 'babel',
   markup: 'html',

src/test/fixtures/.yo-rc.json

@@ -26,7 +26,6 @@
       "models": true,
       "mongooseModels": true,
       "mongoose": true,
-      "gulp": true,
       "mocha": true,
       "jasmine": false,
       "expect": true

src/test/get-expected-files.js

@@ -53,6 +53,7 @@ export function app(options) {
     `client/polyfills.${script}`,
     'client/app/app.' + script,
     'client/app/app.config.' + script,
+    'client/app/app.constants.' + script,
     'client/app/app.' + stylesheet,
     'client/app/main/main.component.' + script,
     'client/app/main/main.component.spec.' + script,