glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

upgrade to webpack 2

Browse source
This commit is contained in:
Devin Howard 2017-03-04 14:48:27 -08:00
parent f6b8f8c7c8
commit 2d67c0fe37
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frontend/test/support/dom.js
View file

@ -1,5 +1,4 @@
import jsdom from 'jsdom' const jsdom = require('jsdom')
const doc = jsdom.jsdom('<!doctype html><html><body></body></html>') const doc = jsdom.jsdom('<!doctype html><html><body></body></html>')
const win = doc.defaultView const win = doc.defaultView

2
package.json
View file

@ -50,7 +50,7 @@
"riek": "1.0.7", "riek": "1.0.7",
"simplewebrtc": "2.2.2", "simplewebrtc": "2.2.2",
"socket.io": "1.3.7", "socket.io": "1.3.7",
"webpack": "1.14.0" "webpack": "2.2.1"
}, },
"devDependencies": { "devDependencies": {
"babel-eslint": "^7.1.1", "babel-eslint": "^7.1.1",

6
webpack.config.js
View file

@ -33,10 +33,10 @@ module.exports = {
externals, externals,
devtool, devtool,
module: { module: {
preLoaders: [
{ test: /\.json$/, loader: 'json' }
],
loaders: [ loaders: [
{
test: /\.json$/, loader: 'json-loader'
},
{ {
test: /\.(js|jsx)?$/, test: /\.(js|jsx)?$/,
exclude: /node_modules/, exclude: /node_modules/,