Merge pull request requirejs#49 from jwhitley/regexp_from_string

jrburke · jrburke · commit d035781650f3 · 2011-12-05T20:40:19.000-08:00
Allow fileExclusionRegExp to accept a string as well as a JS regexp.
diff --git a/build/jslib/build.js b/build/jslib/build.js
@@ -653,7 +653,11 @@ function (lang,   logger,   file,          parse,    optimize,   pragma,
 
         //Set file.fileExclusionRegExp if desired
         if ('fileExclusionRegExp' in config) {
-            file.exclusionRegExp = config.fileExclusionRegExp;
+            if (typeof config.fileExclusionRegExp === "string") {
+              file.exclusionRegExp = new RegExp(config.fileExclusionRegExp);
+            } else {
+              file.exclusionRegExp = config.fileExclusionRegExp;
+            }
         } else if ('dirExclusionRegExp' in config) {
             //Set file.dirExclusionRegExp if desired, this is the old
             //name for fileExclusionRegExp before 1.0.2. Support for backwards
