From 2d67c0fe37449215d658ff5be183b61274cd976a Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Sat, 4 Mar 2017 14:48:27 -0800 Subject: [PATCH] upgrade to webpack 2 --- frontend/test/support/dom.js | 3 +-- package.json | 2 +- webpack.config.js | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/frontend/test/support/dom.js b/frontend/test/support/dom.js index 71d4d82e..f344be14 100644 --- a/frontend/test/support/dom.js +++ b/frontend/test/support/dom.js @@ -1,5 +1,4 @@ -import jsdom from 'jsdom' - +const jsdom = require('jsdom') const doc = jsdom.jsdom('') const win = doc.defaultView diff --git a/package.json b/package.json index 8fb346a7..076b69c4 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "riek": "1.0.7", "simplewebrtc": "2.2.2", "socket.io": "1.3.7", - "webpack": "1.14.0" + "webpack": "2.2.1" }, "devDependencies": { "babel-eslint": "^7.1.1", diff --git a/webpack.config.js b/webpack.config.js index 4c650ed2..a207d23c 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -33,10 +33,10 @@ module.exports = { externals, devtool, module: { - preLoaders: [ - { test: /\.json$/, loader: 'json' } - ], loaders: [ + { + test: /\.json$/, loader: 'json-loader' + }, { test: /\.(js|jsx)?$/, exclude: /node_modules/,