Permalink
Browse files

Moved jquery out of travis.yml file and into devDependencies #1418

  • Loading branch information...
Mark Stahl
Mark Stahl committed Jan 30, 2015
1 parent d0c4338 commit e2485ef5f1f7ead33474640255af773b9f0c879a
Showing with 5 additions and 7 deletions.
  1. +2 −2 .travis.yml
  2. +3 −5 package.json
View
@@ -1,7 +1,7 @@
language: node_js
node_js: 0.10
before_script: npm install jquery#1.11.0 && node_modules/.bin/bower install
before_script: node_modules/.bin/bower install
script: npm test
before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- "sh -e /etc/init.d/xvfb start"
View
@@ -7,15 +7,12 @@
"email": "contact@bitovi.com",
"web": "http://bitovi.com/"
},
"homepage": "http://canjs.us/",
"homepage": "http://canjs.com/",
"repository": {
"type": "git",
"url": "git@github.com:bitovi/canjs.git",
"github": "https://github.com/bitovi/canjs"
},
"peerDependencies": {
"jquery": ">1.9.0"
},
"devDependencies": {
"bitovi-tools": "git://github.com/bitovi/bitovi-tools.git#steal-tools",
"bower": "~1.3.8",
@@ -34,6 +31,7 @@
"grunt-shell": "~0.5.0",
"grunt-simple-mocha": "^0.4.0",
"grunt-string-replace": "~0.2.2",
"jquery": "~1.11.0",
"lodash": "2.4.1",
"rimraf": "2.1",
"steal": "bitovi/steal#npm",
@@ -103,4 +101,4 @@
"browserify": true
}
}
}
}

1 comment on commit e2485ef

@justinbmeyer

This comment has been minimized.

Show comment
Hide comment
@justinbmeyer

justinbmeyer Feb 15, 2015

Contributor

Why did you remove jQuery from peerDependencies? It should probably be peerDependency.

Contributor

justinbmeyer commented on e2485ef Feb 15, 2015

Why did you remove jQuery from peerDependencies? It should probably be peerDependency.

Please sign in to comment.