App root schematics

packages/angular_devkit/build_optimizer/src/purify/webpack-plugin.ts

@@ -33,4 +33,3 @@ export class PurifyPlugin {
     });
   }
 }
-

packages/angular_devkit/build_optimizer/src/transforms/scrub-file_spec.ts

@@ -203,4 +203,3 @@ describe('scrub-file', () => {
     });
   });
 });
-

packages/angular_devkit/schematics/src/rules/call.ts

@@ -68,4 +68,3 @@ export function callRule(rule: Rule,
     }
   });
 }
-

packages/angular_devkit/schematics/src/sink/dryrun.ts

@@ -114,4 +114,3 @@ export class DryRunSink extends FileSystemSink {
     return Observable.empty<void>();
   }
 }
-

packages/angular_devkit/schematics/src/tree/action_spec.ts

@@ -77,4 +77,3 @@ describe('Action', () => {
     });
   });
 });
-

packages/angular_devkit/schematics/tools/description.ts

@@ -49,4 +49,3 @@ export declare type FileSystemSchematicDesc
   = SchematicDescription<FileSystemCollectionDescription, FileSystemSchematicDescription>;
 export declare type FileSystemSchematicContext
   = TypedSchematicContext<FileSystemCollectionDescription, FileSystemSchematicDescription>;
-

packages/angular_devkit/schematics/tools/registry-engine-host.ts

@@ -118,4 +118,3 @@ export class RegistryEngineHost extends FileSystemEngineHostBase {
     return desc as FileSystemSchematicDesc;
   }
 }
-

packages/schematics/angular/class/schema.d.ts

@@ -8,6 +8,7 @@
 
 export interface Schema {
     name: string;
+    appRoot?: string;
     path?: string;
     sourceDir?: string;
     /**

packages/schematics/angular/class/schema.json

@@ -7,6 +7,9 @@
     "name": {
       "type": "string"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "path": {
       "type": "string",
       "default": "app"

packages/schematics/angular/component/schema.d.ts

@@ -8,6 +8,7 @@
 
 export interface Schema {
     path?: string;
+    appRoot?: string;
     sourceDir?: string;
     name: string;
     /**

packages/schematics/angular/component/schema.json

@@ -8,6 +8,9 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src",

packages/schematics/angular/directive/schema.d.ts

@@ -9,6 +9,7 @@
 export interface Schema {
     name: string;
     path?: string;
+    appRoot?: string;
     /**
      * The prefix to apply to generated selectors.
      */

packages/schematics/angular/directive/schema.json

@@ -11,6 +11,9 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "prefix": {
       "type": "string",
       "description": "The prefix to apply to generated selectors.",

packages/schematics/angular/enum/schema.d.ts

@@ -9,5 +9,6 @@
 export interface Schema {
     name: string;
     path?: string;
+    appRoot?: string;
     sourceDir?: string;
 }

packages/schematics/angular/enum/schema.json

@@ -11,6 +11,9 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"

packages/schematics/angular/guard/schema.d.ts

@@ -15,5 +15,6 @@ export interface Schema {
      */
     module?: string;
     path?: string;
+    appRoot?: string;
     sourceDir?: string;
 }

packages/schematics/angular/guard/schema.json

@@ -25,6 +25,9 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"

packages/schematics/angular/interface/schema.d.ts

@@ -9,6 +9,7 @@
 export interface Schema {
     name: string;
     path?: string;
+    appRoot?: string;
     sourceDir?: string;
     /**
      * Specifies the prefix to use.

packages/schematics/angular/interface/schema.json

@@ -11,6 +11,9 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"

packages/schematics/angular/module/schema.d.ts

@@ -9,8 +9,10 @@
 export interface Schema {
     name: string;
     path?: string;
+    appRoot?: string;
     sourceDir?: string;
     routing?: boolean;
+    routingScope?: ('Child' | 'Root');
     spec?: boolean;
     flat?: boolean;
     commonModule?: boolean;

packages/schematics/angular/module/schema.json

@@ -11,6 +11,9 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"

packages/schematics/angular/pipe/schema.d.ts

@@ -9,6 +9,7 @@
 export interface Schema {
     name: string;
     path?: string;
+    appRoot?: string;
     sourceDir?: string;
     /**
      * Flag to indicate if a dir is created.

packages/schematics/angular/pipe/schema.json

@@ -11,6 +11,9 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"

packages/schematics/angular/service/schema.d.ts

@@ -9,6 +9,7 @@
 export interface Schema {
     name: string;
     path?: string;
+    appRoot?: string;
     sourceDir?: string;
     /**
      * Flag to indicate if a dir is created.

packages/schematics/angular/service/schema.json

@@ -11,6 +11,9 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"

packages/schematics/angular/utility/ast-utils.ts

@@ -399,4 +399,3 @@ export function addBootstrapToModule(source: ts.SourceFile,
                                      importPath: string): Change[] {
   return _addSymbolToNgModuleMetadata(source, modulePath, 'bootstrap', classifiedName, importPath);
 }
-

packages/schematics/angular/utility/find-module.ts

@@ -16,6 +16,7 @@ export interface ModuleOptions {
   sourceDir?: string;
   path?: string;
   skipImport?: boolean;
+  appRoot?: string;
 }
 
 
@@ -35,7 +36,7 @@ export function findModuleFromOptions(host: Tree,
     return normalizePath(findModule(host, pathToCheck));
   } else {
     const modulePath = normalizePath(
-      options.sourceDir + '/' + options.path + '/' + options.module);
+      options.sourceDir + '/' + (options.appRoot || options.path) + '/' + options.module);
     const moduleBaseName = normalizePath(modulePath).split('/').pop();
 
     if (host.exists(modulePath)) {

packages/schematics/angular/utility/route-utils.ts

@@ -87,4 +87,3 @@ export function insertImport(source: ts.SourceFile, fileToEdit: string, symbolNa
     ts.SyntaxKind.StringLiteral,
   );
 }
-

rules/singleEofLineRule.ts

@@ -0,0 +1,59 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import * as Lint from 'tslint';
+import * as ts from 'typescript';
+
+
+export class Rule extends Lint.Rules.AbstractRule {
+  public static metadata: Lint.IRuleMetadata = {
+    ruleName: 'single-eof-line',
+    type: 'style',
+    description: `Ensure the file ends with a single new line.`,
+    rationale: `This is similar to eofline, but ensure an exact count instead of just any new
+                line.`,
+    options: null,
+    optionsDescription: `Two integers indicating minimum and maximum number of new lines.`,
+    typescriptOnly: false,
+  };
+
+  public static FAILURE_STRING = 'You need to have a single blank line at end of file.';
+
+  public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
+    const length = sourceFile.text.length;
+    if (length === 0) {
+      // Allow empty files.
+      return [];
+    }
+
+    const matchEof = /\r?\n((\r?\n)*)$/.exec(sourceFile.text);
+    if (!matchEof) {
+      const lines = sourceFile.getLineStarts();
+      const fix = Lint.Replacement.appendText(
+        length,
+        sourceFile.text[lines[1] - 2] === '\r' ? '\r\n' : '\n',
+      );
+
+      return [
+        new Lint.RuleFailure(sourceFile, length, length, Rule.FAILURE_STRING, this.ruleName, fix),
+      ];
+    } else if (matchEof[1]) {
+      const lines = sourceFile.getLineStarts();
+      const fix = Lint.Replacement.replaceFromTo(
+        matchEof.index,
+        length,
+        sourceFile.text[lines[1] - 2] === '\r' ? '\r\n' : '\n',
+      );
+
+      return [
+        new Lint.RuleFailure(sourceFile, length, length, Rule.FAILURE_STRING, this.ruleName, fix),
+      ];
+    }
+
+    return [];
+  }
+}

tslint.json

@@ -6,6 +6,8 @@
     "import-groups": true,
     "non-null-operator": true,
     "no-global-tslint-disable": true,
+    "single-eof-line": true,
+
 
     "import-blacklist": [
       true,