Skip to content

Commit bfa9311

Browse files
committed
Update deps and fixup tests
1 parent 3f1f4ac commit bfa9311

File tree

3 files changed

+24
-23
lines changed

3 files changed

+24
-23
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Mostly lifted from https://andreypopp.com/posts/2013-05-16-makefile-recipes-for-node-js.html
22
# Thanks @andreypopp
33

4-
BIN = ./node_modules/.bin
4+
BIN := $(shell npm bin)
55
DIST = dist
66
LIB = $(DIST)/react-draggable.js
77
MIN = $(DIST)/react-draggable.min.js

karma.conf.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,18 @@ module.exports = function(config) {
1818

1919
webpack: {
2020
cache: true,
21+
devtool: 'eval',
2122
module: {
2223
loaders: [
2324
{
2425
test: /\.(?:js|es).?$/,
25-
loader: 'babel-loader',
26+
loader: 'babel-loader?cacheDirectory',
2627
exclude: /(node_modules)/
2728
}
2829
]
2930
},
3031
resolve: {
31-
extensions: ["", ".webpack.js", ".web.js", ".js", ".es6"]
32+
extensions: ['', '.webpack.js', '.web.js', '.js', '.es6']
3233
}
3334
},
3435

package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,33 +25,33 @@
2525
},
2626
"homepage": "https://github.com/mzabriskie/react-draggable",
2727
"devDependencies": {
28-
"babel-core": "^5.6.4",
29-
"babel-eslint": "^3.1.18",
30-
"babel-loader": "^5.1.4",
31-
"eslint": "^0.23.0",
32-
"karma": "^0.12.19",
33-
"karma-cli": "0.0.4",
34-
"karma-firefox-launcher": "^0.1.3",
35-
"karma-jasmine": "^0.1.5",
36-
"karma-phantomjs-launcher": "^0.2.0",
37-
"karma-webpack": "^1.2.1",
38-
"lodash": "^3.9.3",
28+
"babel-core": "^5.8.25",
29+
"babel-eslint": "^4.1.3",
30+
"babel-loader": "^5.3.2",
31+
"eslint": "^1.5.1",
32+
"karma": "^0.13.10",
33+
"karma-cli": "0.1.1",
34+
"karma-firefox-launcher": "^0.1.6",
35+
"karma-jasmine": "^0.3.6",
36+
"karma-phantomjs-launcher": "^0.2.1",
37+
"karma-webpack": "^1.7.0",
38+
"lodash": "^3.10.1",
3939
"open": "0.0.5",
40-
"phantomjs": "^1.9.17",
41-
"pre-commit": "^1.0.10",
42-
"react": "^0.13.2",
43-
"semver": "^4.3.3",
40+
"phantomjs": "^1.9.18",
41+
"pre-commit": "^1.1.1",
42+
"react": "^0.13.3",
43+
"semver": "^5.0.3",
4444
"static-server": "^2.0.0",
45-
"uglify-js": "^2.4.15",
46-
"webpack": "^1.3.2-beta8",
47-
"webpack-dev-server": "^1.4.7"
45+
"uglify-js": "^2.4.24",
46+
"webpack": "^1.12.2",
47+
"webpack-dev-server": "^1.12.0"
4848
},
4949
"precommit": [
5050
"commitLint",
5151
"test"
5252
],
5353
"dependencies": {
54-
"classnames": "^1.2.2",
55-
"object-assign": "^3.0.0"
54+
"classnames": "^2.1.3",
55+
"object-assign": "^4.0.1"
5656
}
5757
}

0 commit comments

Comments
 (0)