Skip to content

Commit 8260883

Browse files
author
Niels Dequeker
committed
Merge pull request angular-ui-tree#435 from angular-ui-tree/replace-grunt-with-gulp
Replace Grunt with Gulp
2 parents 8f8e8f3 + 1fad15d commit 8260883

File tree

321 files changed

+1518
-104155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

321 files changed

+1518
-104155
lines changed

.bowerrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"directory": "demo/bower_components"
2+
"directory": "examples/bower_components"
33
}

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ Thumbs.db
1212
# Project dependencies #
1313
########################
1414
node_modules
15-
bower_components
1615

1716
# IDE files #
1817
.idea
1918
*.iml
19+
20+
examples/bower_components
21+
examples/source

.jshintrc

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,34 @@
11
{
2-
"bitwise": true,
3-
"immed": true,
4-
"newcap": true,
5-
"noarg": true,
6-
"noempty": true,
7-
"nonew": true,
8-
"trailing": true,
9-
"maxlen": 200,
10-
"boss": true,
11-
"eqnull": true,
12-
"expr": true,
13-
"globalstrict": true,
14-
"laxbreak": true,
15-
"loopfunc": true,
16-
"sub": false,
17-
"undef": true,
18-
"curly": true,
19-
"browser": true,
20-
"indent": 2,
21-
"globals": {
22-
"jQuery": true,
23-
"$": true,
24-
"_": true,
25-
"angular": true,
26-
"module": true,
27-
"require": true,
28-
"IE": true,
29-
"console": true
30-
}
2+
"bitwise": true,
3+
"immed": true,
4+
"newcap": true,
5+
"noarg": true,
6+
"noempty": true,
7+
"nonew": true,
8+
"trailing": true,
9+
"maxlen": 200,
10+
"boss": true,
11+
"eqnull": true,
12+
"expr": true,
13+
"laxbreak": true,
14+
"loopfunc": true,
15+
"sub": false,
16+
"undef": true,
17+
"curly": true,
18+
"browser": true,
19+
"indent": 2,
20+
"devel": true,
21+
"jquery": true,
22+
"globals": {
23+
"_": true,
24+
"angular": true,
25+
"module": true,
26+
"require": true,
27+
"IE": true,
28+
"beforeEach": true,
29+
"describe": true,
30+
"expect": true,
31+
"inject": true,
32+
"it": true
33+
}
3134
}

.travis.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@ language: node_js
22
node_js:
33
- "0.10"
44

5-
before_install:
6-
- "export DISPLAY=:99.0"
7-
- "sh -e /etc/init.d/xvfb start"
8-
95
before_script:
10-
- npm install -g grunt-cli bower
11-
- bower install --verbose
6+
- npm install -g bower
7+
- bower install
128

139
script:
14-
- grunt test
15-
10+
- npm test
11+
1612
notifications:
1713
- email: false

Gruntfile.js

Lines changed: 0 additions & 229 deletions
This file was deleted.

README.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -417,15 +417,15 @@ Use the `ui-tree-handle` to specify an element used to drag the object. If you d
417417

418418
#### Dependencies
419419

420-
* [Grunt](http://gruntjs.com/) (task automation)
420+
* [Gulp](http://gulpjs.com/) (task automation)
421421
* [Bower](http://bower.io/) (package management)
422422

423423
#### Installation
424424
Run the commands below in the project root directory.
425425

426-
#####1. Install Grunt and Bower
426+
#####1. Install Gulp and Bower
427427

428-
$ sudo npm install -g grunt-cli bower
428+
$ sudo npm install -g gulp bower
429429

430430
#####2. Install project dependencies
431431

@@ -439,24 +439,23 @@ To debug code and run end-to-end tests, it is often useful to have a local HTTP
439439

440440
To start the web server, run:
441441

442-
$ grunt webserver
442+
$ gulp serve
443443

444444
To access the local server, enter the following URL into your web browser:
445445

446-
http://localhost:8080/demo/
446+
http://localhost:9000
447447

448-
By default, it serves the contents of the demo project.
448+
By default, it serves the contents of the `examples` directory.
449449

450450

451451
####Building angular-ui-tree
452452
To build angular-ui-tree, you use the following command.
453453

454-
$ grunt build
454+
$ gulp build
455455

456456
This will generate non-minified and minified JavaScript files in the `dist` directory.
457457

458458
####Run tests
459-
You can run the tests once or continuous.
459+
You can run the unit test using a separate task.
460460

461-
$ grunt test
462-
$ grunt test:continuous
461+
$ gulp test

0 commit comments

Comments
 (0)