Skip to content
This repository has been archived by the owner on Apr 2, 2019. It is now read-only.

Commit

Permalink
Remove vendor packages for test, pinned down dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
wyuenho committed Mar 10, 2016
1 parent 07c18ed commit 382a589
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 15,743 deletions.
5 changes: 2 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
"api"
],
"dependencies": {
"backbone": "~1.1.2",
"jquery": "~2.1.4",
"underscore": "~1.8.3"
"backbone": "~1.2.3",
"underscore": "^1.8.3"
}
}
10 changes: 5 additions & 5 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ module.exports = function(config) {

// list of files / patterns to load in the browser
files: [
'test/vendor/js/jquery.js',
'test/vendor/js/underscore.js',
'test/vendor/js/backbone.js',
'test/vendor/js/backbone-pageable.js',
'node_modules/jquery/dist/jquery.js',
'node_modules/underscore/underscore.js',
'node_modules/backbone/backbone.js',
'node_modules/backbone.paginator/lib/backbone.paginator.js',
'lib/backgrid.js',
'test/preamble.js',
'test/column.js',
Expand All @@ -39,7 +39,7 @@ module.exports = function(config) {
// preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
preprocessors: {

},


Expand Down
28 changes: 15 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,20 @@
"url": "http://github.com/wyuenho/backgrid"
},
"devDependencies": {
"grunt": "~0.4.5",
"grunt-cli": "~0.1.13",
"grunt-contrib-clean": "~1.0.0",
"grunt-contrib-concat": "~1.0.0",
"grunt-contrib-connect": "~0.11.2",
"grunt-contrib-jasmine": "~1.0.0",
"grunt-contrib-uglify": "~1.0.0",
"grunt-contrib-watch": "~0.6.1",
"grunt-jsduck": "~1.0.1",
"backbone.paginator": "^2.0.0",
"grunt": "^0.4.5",
"grunt-cli": "^0.1.13",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-concat": "^1.0.0",
"grunt-contrib-connect": "^0.11.2",
"grunt-contrib-jasmine": "^1.0.0",
"grunt-contrib-uglify": "^1.0.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-jsduck": "^1.0.1",
"grunt-karma": "^0.12.1",
"grunt-recess": "~1.0.1",
"grunt-template-jasmine-istanbul": "~0.4.0",
"grunt-recess": "^1.0.1",
"grunt-template-jasmine-istanbul": "^0.4.0",
"jquery": "2.1.0",
"karma": "^0.13.22",
"karma-chrome-launcher": "^0.2.2",
"karma-firefox-launcher": "^0.1.7",
Expand All @@ -41,7 +43,7 @@
"node": ">=0.10"
},
"dependencies": {
"backbone": "~1.1.2",
"underscore": "~1.8.3"
"backbone": "~1.2.3",
"underscore": "^1.8.0"
}
}
82 changes: 0 additions & 82 deletions test/vendor/css/jasmine.css

This file was deleted.

Loading

0 comments on commit 382a589

Please sign in to comment.