From 91daec7b47ca9d64983621ec1bdfaa3ff1503d17 Mon Sep 17 00:00:00 2001 From: Djamil Legato Date: Thu, 18 Feb 2016 15:48:35 -0800 Subject: [PATCH] Updated dependencies --- themes/grav/package.json | 23 ++++++++++++----------- themes/grav/webpack.conf.js | 4 ++++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/themes/grav/package.json b/themes/grav/package.json index 833a8dac..eb5fcbb9 100644 --- a/themes/grav/package.json +++ b/themes/grav/package.json @@ -16,11 +16,11 @@ "bootstrap": "^3.3.6", "chartist": "^0.9.5", "debounce": "^1.0.0", - "dropzone": "^4.2.0", + "dropzone": "^4.3.0", "eonasdan-bootstrap-datetimepicker": "^4.15.35", + "es6-map": "^0.1.3", "immutable": "^3.7.6", "jquery-slugify": "^1.2.3", - "prosemirror": "^0.3.0", "remodal": "^1.0.6", "selectize": "^0.12.1", "sortablejs": "^1.4.2", @@ -28,17 +28,18 @@ "whatwg-fetch": "^0.11.0" }, "devDependencies": { - "babel-core": "^6.4.5", - "babel-loader": "^6.2.1", - "babel-polyfill": "^6.3.14", - "babel-preset-es2015": "^6.3.13", - "eslint": "^1.10.3", - "eslint-loader": "^1.2.1", - "exports-loader": "^0.6.2", - "gulp": "^3.9.0", + "babel-core": "^6.5.2", + "babel-loader": "^6.2.3", + "babel-polyfill": "^6.5.0", + "babel-preset-es2015": "^6.5.0", + "eslint": "^2.1.0", + "eslint-loader": "^1.3.0", + "exports-loader": "^0.6.3", + "gulp": "^3.9.1", "gulp-webpack": "^1.5.0", "imports-loader": "^0.6.5", + "json-loader": "^0.5.4", "merge-stream": "^1.0.0", - "webpack": "^1.12.12" + "webpack": "^1.12.13" } } diff --git a/themes/grav/webpack.conf.js b/themes/grav/webpack.conf.js index aa64aedc..67dc03fc 100644 --- a/themes/grav/webpack.conf.js +++ b/themes/grav/webpack.conf.js @@ -26,6 +26,10 @@ module.exports = { }, module: { preLoaders: [ + { + test: /\.json$/, + loader: 'json' + }, { test: /\.js$/, loader: 'eslint',