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

Commit 382a589

Browse files
committed
Remove vendor packages for test, pinned down dependencies
1 parent 07c18ed commit 382a589

9 files changed

Lines changed: 22 additions & 15743 deletions

File tree

bower.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
"api"
2424
],
2525
"dependencies": {
26-
"backbone": "~1.1.2",
27-
"jquery": "~2.1.4",
28-
"underscore": "~1.8.3"
26+
"backbone": "~1.2.3",
27+
"underscore": "^1.8.3"
2928
}
3029
}

karma.conf.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ module.exports = function(config) {
1515

1616
// list of files / patterns to load in the browser
1717
files: [
18-
'test/vendor/js/jquery.js',
19-
'test/vendor/js/underscore.js',
20-
'test/vendor/js/backbone.js',
21-
'test/vendor/js/backbone-pageable.js',
18+
'node_modules/jquery/dist/jquery.js',
19+
'node_modules/underscore/underscore.js',
20+
'node_modules/backbone/backbone.js',
21+
'node_modules/backbone.paginator/lib/backbone.paginator.js',
2222
'lib/backgrid.js',
2323
'test/preamble.js',
2424
'test/column.js',
@@ -39,7 +39,7 @@ module.exports = function(config) {
3939
// preprocess matching files before serving them to the browser
4040
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
4141
preprocessors: {
42-
42+
4343
},
4444

4545

package.json

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,20 @@
1818
"url": "http://github.com/wyuenho/backgrid"
1919
},
2020
"devDependencies": {
21-
"grunt": "~0.4.5",
22-
"grunt-cli": "~0.1.13",
23-
"grunt-contrib-clean": "~1.0.0",
24-
"grunt-contrib-concat": "~1.0.0",
25-
"grunt-contrib-connect": "~0.11.2",
26-
"grunt-contrib-jasmine": "~1.0.0",
27-
"grunt-contrib-uglify": "~1.0.0",
28-
"grunt-contrib-watch": "~0.6.1",
29-
"grunt-jsduck": "~1.0.1",
21+
"backbone.paginator": "^2.0.0",
22+
"grunt": "^0.4.5",
23+
"grunt-cli": "^0.1.13",
24+
"grunt-contrib-clean": "^1.0.0",
25+
"grunt-contrib-concat": "^1.0.0",
26+
"grunt-contrib-connect": "^0.11.2",
27+
"grunt-contrib-jasmine": "^1.0.0",
28+
"grunt-contrib-uglify": "^1.0.0",
29+
"grunt-contrib-watch": "^0.6.1",
30+
"grunt-jsduck": "^1.0.1",
3031
"grunt-karma": "^0.12.1",
31-
"grunt-recess": "~1.0.1",
32-
"grunt-template-jasmine-istanbul": "~0.4.0",
32+
"grunt-recess": "^1.0.1",
33+
"grunt-template-jasmine-istanbul": "^0.4.0",
34+
"jquery": "2.1.0",
3335
"karma": "^0.13.22",
3436
"karma-chrome-launcher": "^0.2.2",
3537
"karma-firefox-launcher": "^0.1.7",
@@ -41,7 +43,7 @@
4143
"node": ">=0.10"
4244
},
4345
"dependencies": {
44-
"backbone": "~1.1.2",
45-
"underscore": "~1.8.3"
46+
"backbone": "~1.2.3",
47+
"underscore": "^1.8.0"
4648
}
4749
}

test/vendor/css/jasmine.css

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)