diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
| commit | 080e4534253338c94e6d8c86cb3679ff15410f85 (patch) | |
| tree | 6322fb822332b4135f0ff14de8c2d7137016f734 /web/package.json | |
| parent | db5c0b210b0133d7cd58124c727dbc24480e2568 (diff) | |
| parent | 074d8d7c7463cdb1f0a90e165a4b3ada3554b4c2 (diff) | |
| download | mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.gz mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.bz2 mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.zip | |
Merge branch 'master' into hardfailvenv
Conflicts:
dev
Diffstat (limited to 'web/package.json')
| -rw-r--r-- | web/package.json | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/web/package.json b/web/package.json index 14a31f48..e55081a3 100644 --- a/web/package.json +++ b/web/package.json @@ -1,52 +1,52 @@ { - "name": "mitmproxy", - "private": true, - "scripts": { - "test": "jest ./src/js" - }, - "jest": { - "testPathDirs": [ - "./src/js" - ], - "testPathIgnorePatterns": [ - "/node_modules/", - "testutils.js" - ], - "testDirectoryName": "tests" - }, - "dependencies": { - "jquery": "", - "lodash": "", - "react": "0.12.x", - "react-router": "", - "bootstrap": "", - "flux": "" - }, - "devDependencies": { - "browserify": "=8.0.1", - "gulp": "", - "gulp-concat": "", - "gulp-connect": "", - "gulp-jshint": "", - "gulp-less": "", - "gulp-livereload": "", - "gulp-minify-css": "", - "gulp-notify": "", - "gulp-peg": "", - "gulp-plumber": "", - "gulp-react": "", - "gulp-rename": "", - "gulp-replace": "", - "gulp-rev": "", - "gulp-sourcemaps": "", - "gulp-uglify": "", - "jest-cli": "^0.1.18", - "jshint-stylish": "", - "lodash": "", - "map-stream": "", - "reactify": "", - "vinyl-buffer": "", - "vinyl-source-stream": "", - "vinyl-transform": "" - } + "name": "mitmproxy", + "private": true, + "scripts": { + "test": "jest ./src/js" + }, + "jest": { + "testPathDirs": [ + "./src/js" + ], + "testPathIgnorePatterns": [ + "/node_modules/", + "testutils.js" + ], + "testDirectoryName": "tests" + }, + "dependencies": { + "bootstrap": "^3.3.4", + "flux": "", + "jquery": "", + "lodash": "", + "react": "^0.13.1", + "react-router": "^0.13.2" + }, + "devDependencies": { + "browserify": "=8.0.1", + "gulp": "", + "gulp-concat": "", + "gulp-connect": "", + "gulp-jshint": "", + "gulp-less": "", + "gulp-livereload": "", + "gulp-minify-css": "", + "gulp-notify": "", + "gulp-peg": "", + "gulp-plumber": "", + "gulp-react": "", + "gulp-rename": "", + "gulp-replace": "", + "gulp-rev": "", + "gulp-sourcemaps": "", + "gulp-uglify": "", + "jest-cli": "^0.1.18", + "jshint-stylish": "", + "lodash": "", + "map-stream": "", + "reactify": "", + "vinyl-buffer": "", + "vinyl-source-stream": "", + "vinyl-transform": "" + } } |