Commit 668dfa02 authored by Alfredo Sumaran's avatar Alfredo Sumaran

Merge branch 'fix-node-dev-deps' into 'master'

Move frontend dev dependencies out of production dependency list.

See merge request !9319
parents b612d01f fd504fa8
...@@ -15,27 +15,25 @@ ...@@ -15,27 +15,25 @@
"babel-loader": "^6.2.10", "babel-loader": "^6.2.10",
"babel-preset-es2015": "^6.22.0", "babel-preset-es2015": "^6.22.0",
"babel-preset-stage-2": "^6.22.0", "babel-preset-stage-2": "^6.22.0",
"bootstrap-sass": "3.3.6", "bootstrap-sass": "^3.3.6",
"compression-webpack-plugin": "^0.3.2", "compression-webpack-plugin": "^0.3.2",
"d3": "3.5.11", "d3": "^3.5.11",
"dropzone": "4.2.0", "dropzone": "^4.2.0",
"es6-promise": "^4.0.5", "es6-promise": "^4.0.5",
"imports-loader": "^0.6.5", "imports-loader": "^0.6.5",
"jquery": "2.2.1", "jquery": "^2.2.1",
"jquery-ui": "git+https://github.com/jquery/jquery-ui#1.11.4", "jquery-ui": "git+https://github.com/jquery/jquery-ui#1.11.4",
"jquery-ujs": "1.2.1", "jquery-ujs": "^1.2.1",
"js-cookie": "^2.1.3", "js-cookie": "^2.1.3",
"karma-mocha-reporter": "^2.2.2", "mousetrap": "^1.4.6",
"mousetrap": "1.4.6",
"pikaday": "^1.5.1", "pikaday": "^1.5.1",
"select2": "3.5.2-browserify", "select2": "3.5.2-browserify",
"stats-webpack-plugin": "^0.4.3", "stats-webpack-plugin": "^0.4.3",
"timeago.js": "^2.0.5", "timeago.js": "^2.0.5",
"underscore": "1.8.3", "underscore": "^1.8.3",
"vue": "2.0.3", "vue": "^2.0.3",
"vue-resource": "0.9.3", "vue-resource": "^0.9.3",
"webpack": "^2.2.1", "webpack": "^2.2.1"
"webpack-dev-server": "^2.3.0"
}, },
"devDependencies": { "devDependencies": {
"babel-plugin-istanbul": "^4.0.0", "babel-plugin-istanbul": "^4.0.0",
...@@ -51,9 +49,11 @@ ...@@ -51,9 +49,11 @@
"karma": "^1.4.1", "karma": "^1.4.1",
"karma-coverage-istanbul-reporter": "^0.2.0", "karma-coverage-istanbul-reporter": "^0.2.0",
"karma-jasmine": "^1.1.0", "karma-jasmine": "^1.1.0",
"karma-mocha-reporter": "^2.2.2",
"karma-phantomjs-launcher": "^1.0.2", "karma-phantomjs-launcher": "^1.0.2",
"karma-sourcemap-loader": "^0.3.7", "karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^2.0.2" "karma-webpack": "^2.0.2",
"webpack-dev-server": "^2.3.0"
}, },
"nyc": { "nyc": {
"exclude": [ "exclude": [
......
...@@ -852,7 +852,7 @@ boom@2.x.x: ...@@ -852,7 +852,7 @@ boom@2.x.x:
dependencies: dependencies:
hoek "2.x.x" hoek "2.x.x"
bootstrap-sass@3.3.6: bootstrap-sass@^3.3.6:
version "3.3.6" version "3.3.6"
resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.6.tgz#363b0d300e868d3e70134c1a742bb17288444fd1" resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.6.tgz#363b0d300e868d3e70134c1a742bb17288444fd1"
...@@ -1265,7 +1265,7 @@ custom-event@~1.0.0: ...@@ -1265,7 +1265,7 @@ custom-event@~1.0.0:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
d3@3.5.11: d3@^3.5.11:
version "3.5.11" version "3.5.11"
resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.11.tgz#d130750eed0554db70e8432102f920a12407b69c" resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.11.tgz#d130750eed0554db70e8432102f920a12407b69c"
...@@ -1404,7 +1404,7 @@ domain-browser@^1.1.1: ...@@ -1404,7 +1404,7 @@ domain-browser@^1.1.1:
version "1.1.7" version "1.1.7"
resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
dropzone@4.2.0: dropzone@^4.2.0:
version "4.2.0" version "4.2.0"
resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-4.2.0.tgz#fbe7acbb9918e0706489072ef663effeef8a79f3" resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-4.2.0.tgz#fbe7acbb9918e0706489072ef663effeef8a79f3"
...@@ -2628,13 +2628,13 @@ jodid25519@^1.0.0: ...@@ -2628,13 +2628,13 @@ jodid25519@^1.0.0:
version "1.11.4" version "1.11.4"
resolved "git+https://github.com/jquery/jquery-ui#d6713024e16de90ea71dc0544ba34e1df01b4d8a" resolved "git+https://github.com/jquery/jquery-ui#d6713024e16de90ea71dc0544ba34e1df01b4d8a"
jquery-ujs@1.2.1: jquery-ujs@^1.2.1:
version "1.2.1" version "1.2.1"
resolved "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.1.tgz#6ee75b1ef4e9ac95e7124f8d71f7d351f5548e92" resolved "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.1.tgz#6ee75b1ef4e9ac95e7124f8d71f7d351f5548e92"
dependencies: dependencies:
jquery ">=1.8.0" jquery ">=1.8.0"
jquery@2.2.1, jquery@>=1.8.0: jquery@^2.2.1, jquery@>=1.8.0:
version "2.2.1" version "2.2.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.1.tgz#3c3e16854ad3d2ac44ac65021b17426d22ad803f" resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.1.tgz#3c3e16854ad3d2ac44ac65021b17426d22ad803f"
...@@ -3031,7 +3031,7 @@ moment@2.x: ...@@ -3031,7 +3031,7 @@ moment@2.x:
version "2.17.1" version "2.17.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82" resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82"
mousetrap@1.4.6: mousetrap@^1.4.6:
version "1.4.6" version "1.4.6"
resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.4.6.tgz#eaca72e22e56d5b769b7555873b688c3332e390a" resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.4.6.tgz#eaca72e22e56d5b769b7555873b688c3332e390a"
...@@ -4296,7 +4296,7 @@ unc-path-regex@^0.1.0: ...@@ -4296,7 +4296,7 @@ unc-path-regex@^0.1.0:
version "0.1.2" version "0.1.2"
resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
underscore@1.8.3: underscore@^1.8.3:
version "1.8.3" version "1.8.3"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
...@@ -4387,11 +4387,11 @@ void-elements@^2.0.0: ...@@ -4387,11 +4387,11 @@ void-elements@^2.0.0:
version "2.0.1" version "2.0.1"
resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
vue-resource@0.9.3: vue-resource@^0.9.3:
version "0.9.3" version "0.9.3"
resolved "https://registry.yarnpkg.com/vue-resource/-/vue-resource-0.9.3.tgz#ab46e1c44ea219142dcc28ae4043b3b04c80959d" resolved "https://registry.yarnpkg.com/vue-resource/-/vue-resource-0.9.3.tgz#ab46e1c44ea219142dcc28ae4043b3b04c80959d"
vue@2.0.3: vue@^2.0.3:
version "2.0.3" version "2.0.3"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.0.3.tgz#3f7698f83d6ad1f0e35955447901672876c63fde" resolved "https://registry.yarnpkg.com/vue/-/vue-2.0.3.tgz#3f7698f83d6ad1f0e35955447901672876c63fde"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment