Add some checks to the 'pattern' option of Encore.copyFiles()

Author: Lyrkan

index.js

@@ -500,8 +500,9 @@ class Encore {
      * Supported options:
      *      * {string} from (mandatory)
      *              The path of the source directory (mandatory)
-     *      * {RegExp} pattern (default: all files)
-     *              A pattern that the filenames must match in order to be copied
+     *      * {RegExp|string} pattern (default: all files)
+     *              A regular expression (or a string containing one) that
+     *              the filenames must match in order to be copied
      *      * {string} to (default: [path][name].[ext])
      *              Where the files must be copied to. You can add all the
      *              placeholders supported by the file-loader.

lib/WebpackConfig.js

@@ -451,6 +451,20 @@ class WebpackConfig {
                 }
             }
 
+            if (typeof config.pattern !== 'undefined' && !(config.pattern instanceof RegExp)) {
+                let validPattern = false;
+                if (typeof config.pattern === 'string') {
+                    const regexPattern = /^\/(.*)\/([a-z]*)?$/;
+                    if (regexPattern.test(config.pattern)) {
+                        validPattern = true;
+                    }
+                }
+
+                if (!validPattern) {
+                    throw new Error(`Invalid pattern "${config.pattern}" passed to copyFiles(). Make sure it contains a valid regular expression.`);
+                }
+            }
+
             this.copyFilesConfigs.push(
                 Object.assign({}, defaultConfig, config)
             );

lib/config-generator.js

@@ -188,7 +188,7 @@ class ConfigGenerator {
                     return buffer + `
                         const context_${index} = require.context(
                             '${stringEscaper(requireContextParam)}',
-                            ${entry.includeSubdirectories},
+                            ${!!entry.includeSubdirectories},
                             ${entry.pattern}
                         );
                         context_${index}.keys().forEach(context_${index});

test/WebpackConfig.js

@@ -384,7 +384,7 @@ describe('WebpackConfig object', () => {
             // With multiple config objects
             config.copyFiles([
                 { from: './foo', pattern: /.*/ },
-                { from: './bar', pattern: /abc/, to: 'bar', includeSubdirectories: false },
+                { from: './bar', pattern: '/abc/', to: 'bar', includeSubdirectories: false },
             ]);
 
             // With a single config object
@@ -397,7 +397,7 @@ describe('WebpackConfig object', () => {
                 includeSubdirectories: true
             }, {
                 from: './bar',
-                pattern: /abc/,
+                pattern: '/abc/',
                 to: 'bar',
                 includeSubdirectories: false
             }, {
@@ -439,6 +439,18 @@ describe('WebpackConfig object', () => {
                 config.copyFiles({ from: 'images', foo: 'foo' });
             }).to.throw('Invalid config option "foo"');
         });
+
+        it('Calling it with an invalid "pattern" option', () => {
+            const config = createConfig();
+
+            expect(() => {
+                config.copyFiles({ from: 'images', pattern: true });
+            }).to.throw('Invalid pattern "true"');
+
+            expect(() => {
+                config.copyFiles({ from: 'images', pattern: 'foo' });
+            }).to.throw('Invalid pattern "foo"');
+        });
     });
 
     describe('autoProvideVariables', () => {