upgrade to webpack 2

2017-03-04 14:48:27 -08:00 · 2017-03-04 14:48:27 -08:00 · 2d67c0fe37
commit 2d67c0fe37
parent f6b8f8c7c8
3 changed files with 5 additions and 6 deletions
--- 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('<!doctype html><html><body></body></html>')
 const win = doc.defaultView

--- 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",
--- 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/,