Skip to content

Commit

Permalink
Remove Bower dependency in development
Browse files Browse the repository at this point in the history
  • Loading branch information
mislav committed Nov 12, 2016
1 parent 5fd8402 commit 5f9254f
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 13 deletions.
9 changes: 2 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
build: node_modules/ bower_components/

test: node_modules/ build lint
test: node_modules/ lint
./script/test

lint: node_modules/
./node_modules/.bin/jshint *.js test/*.js

bower_components/: node_modules/
./node_modules/.bin/bower install

node_modules/:
npm install

Expand All @@ -31,4 +26,4 @@ phantomjs/bin/phantomjs:
mkdir -p phantomjs
wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O- | tar xj -C phantomjs --strip-components 1

.PHONY: build clean lint test
.PHONY: clean lint test
3 changes: 0 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"name": "fetch",
"main": "fetch.js",
"devDependencies": {
"es6-promise": "1.0.0"
},
"ignore": [
".*",
"*.md",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"repository": "github/fetch",
"license": "MIT",
"devDependencies": {
"bower": "1.3.8",
"chai": "1.10.0",
"jshint": "2.8.0",
"mocha": "2.1.0",
"mocha-phantomjs-core": "2.0.1",
"promise-polyfill": "6.0.2",
"url-search-params": "0.6.1"
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion test/test.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}
</script>

<script src="/bower_components/es6-promise/promise.js"></script>
<script src="/node_modules/promise-polyfill/promise.js"></script>
<script src="/test/test.js"></script>
<script src="/fetch.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion test/worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ importScripts('/node_modules/mocha/mocha.js')
mocha.setup('tdd')
self.assert = chai.assert

importScripts('/bower_components/es6-promise/promise.js')
importScripts('/node_modules/promise-polyfill/promise.js')
importScripts('/test/test.js')
importScripts('/fetch.js')

Expand Down

0 comments on commit 5f9254f

Please sign in to comment.