fix(build): parse module definitions for material only or general

angular · Aug 24, 2015 · e4ca61f · e4ca61f
1 parent d32270e
commit e4ca61f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/config/ngModuleData.js b/config/ngModuleData.js
@@ -1,7 +1,7 @@
 // Regex adapted from https://github.com/ceymard/gulp-ngcompile
 
-module.exports = function processContent(fileContent) {
-  var NG_MODULE_REGEX = /\.module\(('material\.[^']*'|"material\.[^"]*")\s*,(?:\s*\[([^\]]+)\])?/g;
+module.exports = function processContent(fileContent, materialOnly) {
+  var NG_MODULE_REGEX = materialOnly ? /\.module\(('material\.[^']*'|"material\.[^"]*")\s*,(?:\s*\[([^\]]+)\])?/g : /\.module\(('[^']*'|"[^"]*")\s*,(?:\s*\[([^\]]+)\])?/g;
   var match = NG_MODULE_REGEX.exec(fileContent || '');
   var module = match && match[1] && match[1].slice(1, -1); //remove quotes
   var depsMatch = match && match[2] && match[2].trim();

diff --git a/scripts/gulp-utils.js b/scripts/gulp-utils.js
@@ -169,7 +169,7 @@ exports.buildNgMaterialDefinition = function() {
   var modulesSeen = [];
   return through2.obj(function(file, enc, next) {
     var moduleName;
-    if (moduleName = getModuleInfo(file.contents).module) {
+    if (moduleName = getModuleInfo(file.contents, true).module) {
       modulesSeen.push(moduleName);
     }
     buffer.push(file);