feat(@angular/cli): making app root configurable

Author: hansl

packages/@angular/cli/blueprints/component/index.ts

@@ -114,7 +114,8 @@ export default Blueprint.extend({
         resolveModulePath(options.module, this.project, this.project.root, appConfig);
     } else {
       try {
-        this.pathToModule = findParentModule(this.project.root, appConfig.root, this.generatePath);
+        this.pathToModule =
+          findParentModule(this.project.root, appConfig.root, this.generatePath, appConfig.appRoot);
       } catch (e) {
         if (!options.skipImport) {
           throw `Error locating module for declaration\n\t${e}`;

packages/@angular/cli/blueprints/directive/index.ts

@@ -67,7 +67,8 @@ export default Blueprint.extend({
         resolveModulePath(options.module, this.project, this.project.root, appConfig);
     } else {
       try {
-        this.pathToModule = findParentModule(this.project.root, appConfig.root, this.generatePath);
+        this.pathToModule =
+          findParentModule(this.project.root, appConfig.root, this.generatePath, appConfig.appRoot);
       } catch (e) {
         if (!options.skipImport) {
           throw `Error locating module for declaration\n\t${e}`;

packages/@angular/cli/blueprints/ng/files/angular-cli.json

@@ -5,6 +5,7 @@
   },
   "apps": [
     {
+      "appRoot": "app",
       "root": "<%= sourceDir %>",
       "outDir": "dist",
       "assets": [

packages/@angular/cli/blueprints/pipe/index.ts

@@ -61,7 +61,8 @@ export default Blueprint.extend({
         resolveModulePath(options.module, this.project, this.project.root, appConfig);
     } else {
       try {
-        this.pathToModule = findParentModule(this.project.root, appConfig.root, this.generatePath);
+        this.pathToModule =
+          findParentModule(this.project.root, appConfig.root, this.generatePath, appConfig.appRoot);
       } catch (e) {
         if (!options.skipImport) {
           throw `Error locating module for declaration\n\t${e}`;

packages/@angular/cli/lib/config/schema.json

@@ -33,9 +33,14 @@
             "type": "string",
             "description": "Name of the app."
           },
-          "root": {
+          "appRoot": {
             "type": "string",
+            "default": "app",
             "description": "The root directory of the app."
+          },          
+          "root": {
+            "type": "string",
+            "description": "The root src directory for the apps."
           },
           "outDir": {
             "type": "string",

packages/@angular/cli/utilities/dynamic-path-parser.ts

@@ -6,7 +6,7 @@ const stringUtils = require('ember-cli-string-utils');
 export function dynamicPathParser(project: any, entityName: string, appConfig: any) {
   const projectRoot = project.root;
   const sourceDir = appConfig.root;
-  const appRoot = path.join(sourceDir, 'app');
+  const appRoot = path.join(sourceDir, appConfig.appRoot || 'app');
   const cwd = process.env.PWD;
 
   const rootPath = path.join(projectRoot, appRoot);

packages/@angular/cli/utilities/find-parent-module.ts

@@ -3,12 +3,12 @@ import * as path from 'path';
 const SilentError = require('silent-error');
 
 export default function findParentModule(
-  projectRoot: string, appRoot: string, currentDir: string): string {
+  projectRoot: string, srcRoot: string, currentDir: string, appRoot = 'app'): string {
 
-  const sourceRoot = path.join(projectRoot, appRoot, 'app');
+  const sourceRoot = path.join(projectRoot, srcRoot, appRoot);
 
   // trim currentDir
-  currentDir = currentDir.replace(path.join(appRoot, 'app'), '');
+  currentDir = currentDir.replace(path.join(srcRoot, appRoot), '');
 
   let pathToCheck = path.join(sourceRoot, currentDir);