Merge pull request #6086 from umbraco/v8/feature/more-flexi-angular-sln

Fix the gulp build to allow directives/components to exist where they need to be allowed

src/Umbraco.Web.UI.Client/gulp/config.js

@@ -16,13 +16,31 @@ module.exports = {
         //processed in the js task
         js: {
             preview: { files: ["./src/preview/**/*.js"], out: "umbraco.preview.js" },
-            installer: { files: ["./src/installer/**/*.js"], out: "umbraco.installer.js" },
-            controllers: { files: ["./src/{views,controllers}/**/*.controller.js"], out: "umbraco.controllers.js" },
-            directives: { files: ["./src/common/directives/**/*.js"], out: "umbraco.directives.js" },
+            installer: { files: ["./src/installer/**/*.js"], out: "umbraco.installer.js" },            
             filters: { files: ["./src/common/filters/**/*.js"], out: "umbraco.filters.js" },
             resources: { files: ["./src/common/resources/**/*.js"], out: "umbraco.resources.js" },
             services: { files: ["./src/common/services/**/*.js"], out: "umbraco.services.js" },
-            security: { files: ["./src/common/interceptors/**/*.js"], out: "umbraco.interceptors.js" }
+            security: { files: ["./src/common/interceptors/**/*.js"], out: "umbraco.interceptors.js" },
+
+            //the controllers for views
+            controllers: {
+                files: [                    
+                    "./src/views/**/*.controller.js",
+                    "./src/*.controller.js"
+                ], out: "umbraco.controllers.js"
+            },
+
+            //directives/components 
+            // - any JS file found in common / directives or common/ components
+            // - any JS file found inside views that has the suffix .directive.js or .component.js
+            directives: {
+                files: [
+                    "./src/common/directives/_module.js",
+                    "./src/{common/directives,common/components}/**/*.js",
+                    "./src/{views}/**/*.{directive,component}.js"
+                ],
+                out: "umbraco.directives.js"
+            },
         },
 
         //selectors for copying all views into the build
@@ -34,7 +52,7 @@ module.exports = {
 
         //globs for file-watching
         globs:{
-            views: "./src/views/**/*.html",
+            views: ["./src/views/**/*.html", "./src/common/directives/**/*.html", "./src/common/components/**/*.html" ],
             less: "./src/less/**/*.less",
             js: "./src/*.js",
             lib: "./lib/**/*",