fix(build): buildNgMaterialDefinition RegExp updated

update buildNgMaterialDefinition() regExp to search for module definitions of 'material.*'. excludes any extraneous, demo-related module definitions. use `material.layout` to match `material.animate` Fixes #4305.
angular · Aug 24, 2015 · 391cff5 · ngraef · Aug 24, 2015 · ThomasBurleson
1 parent d5c3edb
commit 391cff5
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 11 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\(('[^']*'|"[^"]*")\s*,(?:\s*\[([^\]]+)\])?/g;
+  var NG_MODULE_REGEX = /\.module\((['|"]\material\..*'|"[^"]*")\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/gulp/util.js b/gulp/util.js
@@ -179,7 +179,7 @@ function readModuleArg() {
 
 function filterNonCodeFiles() {
   return filter(function(file) {
-    return !/demo|module\.json|\.spec.js|README/.test(file.path);
+    return !/demo|module\.json|script\.js|\.spec.js|README/.test(file.path);
   });
 }
 

diff --git a/src/components/icon/js/iconDirective.js b/src/components/icon/js/iconDirective.js
@@ -1,9 +1,3 @@
-/**
- * @ngdoc directive
- * @name material.components.icon
- * @description
- * Icon
- */
 angular
   .module('material.components.icon')
   .directive('mdIcon', ['$mdIcon', '$mdTheming', '$mdAria', mdIconDirective]);

diff --git a/src/core/core.js b/src/core/core.js
@@ -6,8 +6,8 @@ angular
   .module('material.core', [
     'ngAnimate',
     'material.animate',
+    'material.layout',
     'material.core.gestures',
-    'material.core.layout',
     'material.core.theming'
   ])
   .directive('mdTemplate', MdTemplateDirective)

diff --git a/src/core/services/layout/layout.js b/src/core/services/layout/layout.js
@@ -41,7 +41,7 @@
      *  }
      *  ```
      */
-    angular.module('material.core.layout', [ ])
+    angular.module('material.layout', [ ])
 
       // Attribute directives with optional value(s)
 

diff --git a/src/core/services/layout/layout.spec.js b/src/core/services/layout/layout.spec.js
@@ -1,6 +1,6 @@
 describe('layout directives', function() {
 
-  beforeEach(module('material.core'));
+  beforeEach(module('material.core', 'material.layout'));
 
   describe('expecting layout classes', function() {