Skip to content

Commit

Permalink
Merge pull request #435 from angular-ui-tree/replace-grunt-with-gulp
Browse files Browse the repository at this point in the history
Replace Grunt with Gulp
  • Loading branch information
Niels Dequeker committed Apr 27, 2015
2 parents 8f8e8f3 + 1fad15d commit 8260883
Show file tree
Hide file tree
Showing 321 changed files with 1,518 additions and 104,155 deletions.
2 changes: 1 addition & 1 deletion .bowerrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"directory": "demo/bower_components"
"directory": "examples/bower_components"
}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ Thumbs.db
# Project dependencies #
########################
node_modules
bower_components

# IDE files #
.idea
*.iml

examples/bower_components
examples/source
61 changes: 32 additions & 29 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
{
"bitwise": true,
"immed": true,
"newcap": true,
"noarg": true,
"noempty": true,
"nonew": true,
"trailing": true,
"maxlen": 200,
"boss": true,
"eqnull": true,
"expr": true,
"globalstrict": true,
"laxbreak": true,
"loopfunc": true,
"sub": false,
"undef": true,
"curly": true,
"browser": true,
"indent": 2,
"globals": {
"jQuery": true,
"$": true,
"_": true,
"angular": true,
"module": true,
"require": true,
"IE": true,
"console": true
}
"bitwise": true,
"immed": true,
"newcap": true,
"noarg": true,
"noempty": true,
"nonew": true,
"trailing": true,
"maxlen": 200,
"boss": true,
"eqnull": true,
"expr": true,
"laxbreak": true,
"loopfunc": true,
"sub": false,
"undef": true,
"curly": true,
"browser": true,
"indent": 2,
"devel": true,
"jquery": true,
"globals": {
"_": true,
"angular": true,
"module": true,
"require": true,
"IE": true,
"beforeEach": true,
"describe": true,
"expect": true,
"inject": true,
"it": true
}
}
12 changes: 4 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@ language: node_js
node_js:
- "0.10"

before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"

before_script:
- npm install -g grunt-cli bower
- bower install --verbose
- npm install -g bower
- bower install

script:
- grunt test
- npm test

notifications:
- email: false
229 changes: 0 additions & 229 deletions Gruntfile.js

This file was deleted.

19 changes: 9 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -417,15 +417,15 @@ Use the `ui-tree-handle` to specify an element used to drag the object. If you d

#### Dependencies

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

#### Installation
Run the commands below in the project root directory.

#####1. Install Grunt and Bower
#####1. Install Gulp and Bower

$ sudo npm install -g grunt-cli bower
$ sudo npm install -g gulp bower

#####2. Install project dependencies

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

To start the web server, run:

$ grunt webserver
$ gulp serve

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

http://localhost:8080/demo/
http://localhost:9000

By default, it serves the contents of the demo project.
By default, it serves the contents of the `examples` directory.


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

$ grunt build
$ gulp build

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

####Run tests
You can run the tests once or continuous.
You can run the unit test using a separate task.

$ grunt test
$ grunt test:continuous
$ gulp test
Loading

0 comments on commit 8260883

Please sign in to comment.