Merge pull request #37 from tommytroylin/master

kevlened · kevlened · commit 1bead9f1e54c · 2016-04-23T12:29:02.000-07:00
Fix TypeError when working with webpack-dev-server
diff --git a/src/index.js b/src/index.js
@@ -24,13 +24,13 @@ const getOutputDir = (compiler) => {
         return compiler.options.output.path;
     }
 
-    const outputPath = compiler.options.devServer.outputPath;
+    const devServer = compiler.options.devServer;
 
-    if (!outputPath || outputPath === '/') {
+    if (!devServer || !devServer.outputPath || devServer.outputPath === '/') {
         throw new Error('CopyWebpackPlugin: to use webpack-dev-server, devServer.outputPath must be defined in the webpack config');
     }
 
-    return outputPath;
+    return devServer.outputPath;
 };
 
 export default (patterns = [], options = {}) => {

Original file line number	Diff line number	Diff line change
`@@ -24,13 +24,13 @@ const getOutputDir = (compiler) => {`
`24`	`24`	`return compiler.options.output.path;`
`25`	`25`	`}`
`26`	`26`
`27`		`- const outputPath = compiler.options.devServer.outputPath;`
	`27`	`+ const devServer = compiler.options.devServer;`
`28`	`28`
`29`		`- if (!outputPath \|\| outputPath === '/') {`
	`29`	`+ if (!devServer \|\| !devServer.outputPath \|\| devServer.outputPath === '/') {`
`30`	`30`	`throw new Error('CopyWebpackPlugin: to use webpack-dev-server, devServer.outputPath must be defined in the webpack config');`
`31`	`31`	`}`
`32`	`32`
`33`		`- return outputPath;`
	`33`	`+ return devServer.outputPath;`
`34`	`34`	`};`
`35`	`35`
`36`	`36`	`export default (patterns = [], options = {}) => {`