Skip to content

Commit 6897e91

Browse files
committed
refactor(gen): remove most references to grunt
1 parent bf78a58 commit 6897e91

23 files changed

Lines changed: 41 additions & 1101 deletions

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ before_install:
1414
- ./scripts/sauce_connect_setup.sh
1515
- gem update --system
1616
- gem install sass --version "=3.3.7"
17-
- npm install -g bower grunt-cli
17+
- npm install -g gulp-cli
1818
services: mongodb
1919
cache:
2020
directories:

ISSUE_TEMPLATE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ Transpiler | Babel / TypeScript
1414
Markup | HTML / Jade
1515
CSS | CSS / LESS / SCSS / Stylus
1616
Router | ngRoute / ui-router
17-
Build Tool | Grunt / Gulp
1817
Client Tests | Jasmine / Mocha
1918
DB | MongoDB / SQL
2019
Auth | Y / N

docs/generators/heroku.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,12 @@ Your app should now be live. To view it run `heroku open`.
4141
> heroku config:set DOMAIN=<your-custom-domain>
4242
>
4343
44-
> WARNING: Deployment is untested with Gulp
45-
4644
To make your deployment process easier consider using [grunt-build-control](https://github.com/robwierzbowski/grunt-build-control).
4745

4846
#### Pushing Updates
4947

50-
grunt
48+
gulp build
5149

5250
Commit and push the resulting build, located in your dist folder:
5351

54-
grunt buildcontrol:heroku
52+
gulp buildcontrol:heroku

docs/generators/openshift.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ To make your deployment process easier consider using [grunt-build-control](http
3131

3232
**Pushing Updates**
3333

34-
grunt
34+
gulp build
3535

3636
Commit and push the resulting build, located in your dist folder:
3737

38-
grunt buildcontrol:openshift
38+
gulp buildcontrol:openshift

docs/index.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ All of these can be updated with `bower update` as new versions are released.
5050

5151
## Injection
5252

53-
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.
53+
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.
5454

5555
* `less` files into `client/app/app.less`
5656
* `scss` files into `client/app/app.scss`
@@ -68,23 +68,23 @@ A `.yo-rc` file is generated for helping you copy configuration across projects,
6868

6969
## Testing
7070

71-
Running `grunt test` will run the client and server unit tests with karma and mocha.
71+
Running `gulp test` will run the client and server unit tests with karma and mocha.
7272

73-
Use `grunt test:server` to only run server tests.
73+
Use `gulp test:server` to only run server tests.
7474

75-
Use `grunt test:client` to only run client tests.
75+
Use `gulp test:client` to only run client tests.
7676

7777
**Protractor tests**
7878

7979
To setup protractor e2e tests, you must first run
8080

8181
`npm run update-webdriver`
8282

83-
Use `grunt test:e2e` to have protractor go through tests located in the `e2e` folder.
83+
Use `gulp test:e2e` to have protractor go through tests located in the `e2e` folder.
8484

8585
**Code Coverage**
8686

87-
Use `grunt test:coverage` to run mocha-istanbul and generate code coverage reports.
87+
Use `gulp test:coverage` to run mocha-istanbul and generate code coverage reports.
8888

8989
`coverage/server` will be populated with `e2e` and `unit` folders containing the `lcov` reports.
9090

@@ -97,11 +97,12 @@ The coverage taget has 3 available options:
9797

9898
**Debugging**
9999

100-
Use `grunt serve:debug` for a more debugging-friendly environment.
100+
Use `gulp serve:debug` for a more debugging-friendly environment.
101101

102102
## Environment Variables
103103

104-
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`.
104+
Keeping your app secrets and other sensitive information in source control isn't a good idea.
105+
To have gulp launch your app with specific environment variables, add them to the git ignored environment config file: `server/config/local.env.js`.
105106

106107
## Project Structure
107108

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ var processJson = function(src, dest, opt) {
8686

8787
if(/package.json/g.test(src) && opt.test) {
8888
delete json.scripts.postinstall;
89-
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';
89+
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';
9090
}
9191

9292
// set properties

readme.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
## Usage
1616

17-
Install `yo`, `grunt-cli`/`gulp-cli`, `bower`, and `generator-angular-fullstack`:
17+
Install `yo`, `gulp-cli`, and `generator-angular-fullstack`:
1818
```
19-
npm install -g yo grunt-cli gulp-cli bower generator-angular-fullstack
19+
npm install -g yo gulp-cli generator-angular-fullstack
2020
```
2121

2222
> 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:
3131
yo angular-fullstack [app-name]
3232
```
3333

34-
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.
34+
Run `gulp build` for building, `gulp serve` for development, and `gulp serve:dist` for a preview of the built app.
3535

3636
## Prerequisites
3737

@@ -42,7 +42,7 @@ Run `grunt`/`gulp build` for building, `grunt serve`/`gulp serve` for developmen
4242

4343
**General**
4444

45-
* Build Systems: `Grunt` (deprecated, will be removed in 4.0.0), `Gulp`
45+
* Build Systems: `Gulp`
4646
* Testing:
4747
* `Jasmine`
4848
* `Mocha + Chai + Sinon`

src/generators/app/index.js

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -323,16 +323,6 @@ export class Generator extends Base {
323323
this.log('\n# Project\n');
324324

325325
return this.prompt([{
326-
type: 'list',
327-
name: 'buildtool',
328-
message: 'Would you like to use Gulp or Grunt?',
329-
choices: ['Gulp', 'Grunt (deprecated)'],
330-
default: 0,
331-
filter: val => ({
332-
'Gulp': 'gulp',
333-
'Grunt (deprecated)': 'grunt'
334-
})[val]
335-
}, {
336326
type: 'list',
337327
name: 'testing',
338328
message: 'What would you like to write tests with?',
@@ -352,9 +342,6 @@ export class Generator extends Base {
352342
filter: val => val.toLowerCase(),
353343
when: answers => answers.testing === 'mocha'
354344
}]).then(answers => {
355-
this.filters[answers.buildtool] = true;
356-
insight.track('buildtool', answers.buildtool);
357-
358345
this.filters[answers.testing] = true;
359346
insight.track('testing', answers.testing);
360347
if(answers.testing === 'mocha') {

src/generators/heroku/index.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,9 @@ Generator.prototype.copyProcfile = function copyProcfile() {
115115
Generator.prototype.build = function build() {
116116
if(this.abort) return;
117117
var done = this.async();
118-
var buildCommand = this.filters.grunt ? 'grunt build' : 'gulp build';
119118

120119
this.log(chalk.bold('\nBuilding dist folder, please wait...'));
121-
var child = exec(buildCommand, function (err, stdout) {
120+
var child = exec('gulp build', function (err, stdout) {
122121
done();
123122
}.bind(this));
124123
child.stdout.on('data', function(data) {
@@ -189,10 +188,10 @@ Generator.prototype.gitForcePush = function gitForcePush() {
189188
}
190189

191190
this.log(chalk.yellow(
192-
'After app modification run\n\t' +
193-
chalk.bold(this.filters.grunt ? 'grunt build' : 'gulp build') +
191+
'After app modification run\n\t' +
192+
chalk.bold('gulp build') +
194193
'\nThen deploy with\n\t' +
195-
chalk.bold(this.filters.grunt ? 'grunt buildcontrol:heroku' : 'gulp buildcontrol:heroku')
194+
chalk.bold('gulp buildcontrol:heroku')
196195
));
197196
}
198197
done();

src/generators/openshift/index.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,9 @@ Generator.prototype.enableOpenShiftHotDeploy = function enableOpenshiftHotDeploy
196196
Generator.prototype.build = function build() {
197197
if(this.abort || !this.openshift_remote_exists ) return;
198198
var done = this.async();
199-
var buildCommand = this.filters.grunt ? 'grunt build' : 'gulp build';
200199

201200
this.log(chalk.bold('\nBuilding dist folder, please wait...'));
202-
var child = exec(buildCommand, function (err, stdout) {
201+
var child = exec('gulp build', function (err, stdout) {
203202
if (err) {
204203
this.log.error(err);
205204
}
@@ -297,10 +296,10 @@ Generator.prototype.restartApp = function restartApp() {
297296
}
298297

299298
this.log(chalk.yellow(
300-
'After app modification run\n\t' +
301-
chalk.bold(this.filters.grunt ? 'grunt build' : 'gulp build') +
299+
'After app modification run\n\t' +
300+
chalk.bold('gulp build') +
302301
'\nThen deploy with\n\t' +
303-
chalk.bold(this.filters.grunt ? 'grunt buildcontrol:openshift' : 'gulp buildcontrol:openshift')
302+
chalk.bold('gulp buildcontrol:openshift')
304303
));
305304
}.bind(this));
306305
};

0 commit comments

Comments
 (0)