diff options
| author | Jacob Thornton <[email protected]> | 2012-04-19 16:38:43 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-04-19 16:38:43 -0700 |
| commit | 1160935446e06339d8c7e09415d57086746fbce5 (patch) | |
| tree | 41d3c10eea67112352f0c5c941912a863620c7f0 | |
| parent | de9271bfd1113c8c6ca6cbcc2d56b77fd2763b77 (diff) | |
| download | bootstrap-1160935446e06339d8c7e09415d57086746fbce5.tar.xz bootstrap-1160935446e06339d8c7e09415d57086746fbce5.zip | |
make a few changes to package.json (add make test to makefile)
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | package.json | 12 |
3 files changed, 16 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 037e4e797..b8e1f1720 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,3 @@ language: node_js node_js: - - 0.6 -script: "make build" + - 0.6
\ No newline at end of file @@ -36,6 +36,14 @@ build: @echo "Thanks for using Bootstrap," @echo "<3 @mdo and @fat\n" +# +# RUN JSHINT +# TODO: run unittests +# + +test: + jshint js/*.js --config js/.jshintrc + jshint js/tests/unit/*.js --config js/.jshintrc # # BUILD SIMPLE BOOTSTRAP DIRECTORY diff --git a/package.json b/package.json index 0c74adcd0..c32979e53 100644 --- a/package.json +++ b/package.json @@ -1,22 +1,24 @@ { - "name": "bootstrap" + "name": "bootstrap" , "description": "HTML, CSS, and JS toolkit from Twitter." , "version": "2.0.3" , "keywords": ["bootstrap", "css"] , "homepage": "http://twitter.github.com/bootstrap/" , "author": "Twitter Inc." + , "scripts": { "test": "make test" } , "repository": { - "type": "git" + "type": "git" , "url": "https://github.com/twitter/bootstrap.git" } , "licenses": [ - { "type": "Apache-2.0" + { + "type": "Apache-2.0" , "url": "http://www.apache.org/licenses/LICENSE-2.0" } ] , "devDependencies": { - "uglify-js": "*" + "uglify-js": "*" , "jshint": "*" , "recess": "*" } -} +}
\ No newline at end of file |