Merge branch 'dmk255-fix-webpack-loaders'

flesch · John Flesch · commit 94783b48d902 · 2018-02-07T21:17:07.000-06:00
diff --git a/webpack.config.js b/webpack.config.js
@@ -15,8 +15,8 @@ module.exports = {
   externals: [externals()],
   module: {
     loaders: [
-      { test:/\.js$/, loader:'babel', exclude: /node_modules/ },
-      { test:/\.json$/, loader:'json' }
+      { test:/\.js$/, loader:'babel-loader', exclude: /node_modules/ },
+      { test:/\.json$/, loader:'json-loader' }
     ]
   }
 };

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ module.exports = {`
`15`	`15`	`externals: [externals()],`
`16`	`16`	`module: {`
`17`	`17`	`loaders: [`
`18`		`- { test:/\.js$/, loader:'babel', exclude: /node_modules/ },`
`19`		`- { test:/\.json$/, loader:'json' }`
	`18`	`+ { test:/\.js$/, loader:'babel-loader', exclude: /node_modules/ },`
	`19`	`+ { test:/\.json$/, loader:'json-loader' }`
`20`	`20`	`]`
`21`	`21`	`}`
`22`	`22`	`};`