Merge pull request #53 from kevlened/subdirectory-blobs

Fix subdirectory errors in blob patterns

Author: kevlened

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.1 (May 29, 2016)
+
+* Fix error thrown when subdirectories are in glob results
+
 ## 3.0.0 (May 14, 2016)
 
 BREAKING CHANGE

package.json

@@ -1,6 +1,6 @@
 {
   "name": "copy-webpack-plugin",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Copy files and directories in webpack",
   "main": "dist/index.js",
   "repository": {

src/writeFileToAssets.js

@@ -25,6 +25,11 @@ export default (opts) => {
     .statAsync(absFileSrc)
     .then((stat) => {
 
+        // We don't write empty directories
+        if (stat.isDirectory()) {
+            return;
+        }
+
         function addToAssets() {
             compilation.assets[relFileDest] = {
                 size () {

tests/index.js

@@ -235,7 +235,7 @@ describe('apply function', () => {
                     'directory/nested/nestedfile.txt'
                 ],
                 patterns: [{
-                    from: '**/*.txt'
+                    from: '**/*'
                 }]
             })
             .then(done)
@@ -250,7 +250,7 @@ describe('apply function', () => {
                     'nested/directory/nested/nestedfile.txt'
                 ],
                 patterns: [{
-                    from: '**/*.txt',
+                    from: '**/*',
                     to: 'nested'
                 }]
             })
@@ -266,7 +266,7 @@ describe('apply function', () => {
                 ],
                 patterns: [{
                     context: 'directory',
-                    from: '**/*.txt',
+                    from: '**/*',
                     to: 'nested'
                 }]
             })
@@ -283,7 +283,7 @@ describe('apply function', () => {
                 patterns: [{
                     context: 'directory',
                     flatten: true,
-                    from: '**/*.txt',
+                    from: '**/*',
                     to: 'nested'
                 }]
             })
@@ -299,7 +299,7 @@ describe('apply function', () => {
                 ],
                 patterns: [{
                     context: path.join(HELPER_DIR, 'directory'),
-                    from: '**/*.txt',
+                    from: '**/*',
                     to: 'nested'
                 }]
             })
@@ -587,7 +587,7 @@ describe('apply function', () => {
                     'directory/nested/nestedfile.txt'
                 ],
                 patterns: [{
-                    from: '**/*.txt',
+                    from: '**/*',
                     ignore: [
                         'file.*'
                     ]