fix: emit errors instead throw (#362)

webpack-contrib · Mar 22, 2019 · 3946473 · 3946473
1 parent 05963eb
commit 3946473
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/src/preProcessPattern.js b/src/preProcessPattern.js
@@ -34,7 +34,7 @@ export default function preProcessPattern(globalRef, pattern) {
 
     logger.error(message);
 
-    throw new Error(message);
+    compilation.errors.push(new Error(message));
   }
 
   pattern.to = pattern.to || '';

diff --git a/src/processPattern.js b/src/processPattern.js
@@ -7,7 +7,7 @@ import minimatch from 'minimatch';
 import isObject from './utils/isObject';
 
 export default function processPattern(globalRef, pattern) {
-  const { logger, output, concurrency } = globalRef;
+  const { logger, output, concurrency, compilation } = globalRef;
   const globOptions = Object.assign(
     {
       cwd: pattern.context,
@@ -103,7 +103,7 @@ export default function processPattern(globalRef, pattern) {
 
               logger.error(message);
 
-              throw new Error(message);
+              compilation.errors.push(new Error(message));
             }
 
             file.webpackTo = path.relative(output, file.webpackTo);

diff --git a/test/CopyPlugin.test.js b/test/CopyPlugin.test.js
@@ -157,6 +157,10 @@ describe('apply function', () => {
 
   const runEmit = (opts) =>
     run(opts).then((compilation) => {
+      if (opts.skipAssetsTesting) {
+        return;
+      }
+
       if (opts.expectedAssetKeys && opts.expectedAssetKeys.length > 0) {
         expect(Object.keys(compilation.assets).sort()).toEqual(
           opts.expectedAssetKeys
@@ -884,7 +888,24 @@ describe('apply function', () => {
 
     it('warns when pattern is empty', (done) => {
       runEmit({
-        expectedAssetKeys: [],
+        expectedAssetKeys: [
+          '.file.txt',
+          '[!]/hello.txt',
+          '[special?directory]/(special-*file).txt',
+          '[special?directory]/directoryfile.txt',
+          '[special?directory]/nested/nestedfile.txt',
+          'binextension.bin',
+          'dir (86)/file.txt',
+          'dir (86)/nesteddir/deepnesteddir/deepnesteddir.txt',
+          'dir (86)/nesteddir/nestedfile.txt',
+          'directory/.dottedfile',
+          'directory/directoryfile.txt',
+          'directory/nested/deep-nested/deepnested.txt',
+          'directory/nested/nestedfile.txt',
+          'file.txt',
+          'file.txt.gz',
+          'noextension',
+        ],
         expectedErrors: [new Error(`path "from" cannot be empty string`)],
         patterns: [
           {
@@ -964,7 +985,7 @@ describe('apply function', () => {
         compiler: new MockCompiler({
           outputPath: '/',
         }),
-        expectedAssetKeys: [],
+        skipAssetsTesting: true,
         expectedErrors: [
           new Error(
             'using older versions of webpack-dev-server, devServer.outputPath must be defined to write to absolute paths'