Merge pull request #2081 from angular-fullstack/canary

Merge 4.0.0 into master

Author: Awk34

Diff for: .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:

Diff for: 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

Diff for: circle.yml

@@ -3,7 +3,7 @@ machine:
   node:
     version: 5.11.1
   post:
-    - npm install -g gulp-cli grunt-cli bower
+    - npm install -g gulp-cli
 
 ## Customize checkout
 checkout:

Diff for: 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

Diff for: 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

Diff for: 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
 

Diff for: gulpfile.js

@@ -35,7 +35,7 @@ const transpile = lazypipe()
     .pipe(babel);
 
 gulp.task('clean', () => {
-    return del(['generators/**/*', './test/(**|!fixtures/node_modules|!fixtures/bower_components)/*']);
+    return del(['generators/**/*', './test/(**|!fixtures/node_modules)/*']);
 });
 
 gulp.task('babel', () => {
@@ -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
@@ -113,10 +113,7 @@ function updateFixtures(target) {
     const dest = __dirname + (deps ? '/angular-fullstack-deps/' : '/test/fixtures/');
     const appName = deps ? 'angular-fullstack-deps' : 'tempApp';
 
-    return Promise.all([
-        processJson('templates/app/_package.json', dest + 'package.json', {appName, genVer, private: !deps, test: test}),
-        processJson('templates/app/_bower.json', dest + 'bower.json', {appName, genVer, private: !deps, test: test})
-    ]);
+    return processJson('templates/app/_package.json', dest + 'package.json', {appName, genVer, private: !deps, test: test});
 }
 
 gulp.task('updateFixtures', cb => {
@@ -143,16 +140,13 @@ function execAsync(cmd, opt) {
 }
 
 gulp.task('installFixtures', function() {
-    gutil.log('installing npm & bower dependencies for generated app');
+    gutil.log('installing npm dependencies for generated app');
     let progress = setInterval(() => {
         process.stdout.write('.');
     }, 1 * 1000);
     shell.cd('test/fixtures');
 
-    return Promise.all([
-        execAsync('npm install --quiet', {cwd: '../fixtures'}),
-        execAsync('bower install', {cwd: '../fixtures'})
-    ]).then(() => {
+    execAsync('npm install --quiet', {cwd: '../fixtures'}).then(() => {
         process.stdout.write('\n');
         if(!process.env.SAUCE_USERNAME) {
             gutil.log('running npm run-script update-webdriver');

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-angular-fullstack",
-  "version": "3.7.6",
+  "version": "4.0.0-rc.0",
   "description": "Yeoman generator for creating MEAN stack applications, using MongoDB, Express, AngularJS, and Node",
   "keywords": [
     "yeoman-generator",
@@ -40,11 +40,12 @@
     "babel-plugin-transform-flow-strip-types": "^6.7.0",
     "bluebird": "^3.3.5",
     "chalk": "^1.1.0",
-    "generator-ng-component": "~0.3.1",
+    "generator-ng-component": "~1.0.1",
     "glob": "^7.0.3",
     "gulp-babel": "^6.1.2",
     "gulp-beautify": "^2.0.0",
     "gulp-filter": "^4.0.0",
+    "gulp-tap": "^0.1.3",
     "insight": "~0.8.1",
     "lodash": "^4.13.1",
     "semver": "^5.1.0",
@@ -73,7 +74,6 @@
     "gulp-plumber": "^1.1.0",
     "gulp-util": "^3.0.7",
     "jit-grunt": "~0.10.0",
-    "jscs": "^3.0.3",
     "lazypipe": "^1.0.1",
     "merge-stream": "^1.0.0",
     "minimatch": "^3.0.2",
@@ -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"
 }

Diff for: readme.md

@@ -19,9 +19,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`
@@ -36,7 +36,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
 
@@ -47,7 +47,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`