build: support building with TS 2.6

WORKSPACE

@@ -1,13 +1,18 @@
 git_repository(
     name = "build_bazel_rules_nodejs",
     remote = "https://github.com/bazelbuild/rules_nodejs.git",
-    tag = "0.1.0",
+    tag = "0.3.1",
 )
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")
 node_repositories(package_json = ["//:package.json"])
 
-local_repository(
+git_repository(
     name = "build_bazel_rules_typescript",
-    path = "node_modules/@bazel/typescript",
+    remote = "https://github.com/bazelbuild/rules_typescript.git",
+    tag = "0.6.0",
 )
+
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_repositories")
+
+ts_repositories()

package.json

@@ -72,11 +72,8 @@
     "temp": "^0.8.3",
     "ts-node": "^2.0.0",
     "tslint": "^5.5.0",
-    "typescript": "~2.4.0",
+    "typescript": "~2.6.1",
     "v8-profiler": "^5.7.0",
     "webpack-sources": "^1.0.1"
-  },
-  "devDependencies": {
-    "@bazel/typescript": "0.0.10"
   }
 }

packages/angular_devkit/build_optimizer/src/helpers/transform-javascript.ts

@@ -47,7 +47,7 @@ export function transformJavascript(
   }
 
   // Print error diagnostics.
-  const checkDiagnostics = (diagnostics: ts.Diagnostic[]) => {
+  const checkDiagnostics = (diagnostics: ReadonlyArray<ts.Diagnostic>) => {
     if (diagnostics && diagnostics.length > 0) {
       let errors = '';
       errors = errors + '\n' + ts.formatDiagnostics(diagnostics, {

packages/angular_devkit/build_optimizer/src/transforms/class-fold.ts

@@ -29,13 +29,10 @@ export function getFoldFileTransformer(program: ts.Program): ts.TransformerFacto
       const classes = findClassDeclarations(sf);
       const statements = findClassStaticPropertyAssignments(sf, checker, classes);
 
-      const visitor: ts.Visitor = (node: ts.Node): ts.Node => {
+      const visitor: ts.Visitor = (node: ts.Node): ts.VisitResult<ts.Node> => {
         // Check if node is a statement to be dropped.
         if (statements.find((st) => st.expressionStatement === node)) {
-          // According to @mhegazy returning undefined is supported.
-          // https://github.com/Microsoft/TypeScript/pull/17044
-          // tslint:disable-next-line:no-any
-          return undefined as any;
+          return undefined;
         }
 
         // Check if node is a class to add statements to.

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

@@ -85,13 +85,10 @@ export function getScrubFileTransformer(program: ts.Program): ts.TransformerFact
         }
       }
 
-      const visitor: ts.Visitor = (node: ts.Node): ts.Node => {
+      const visitor: ts.Visitor = (node: ts.Node): ts.VisitResult<ts.Node> => {
         // Check if node is a statement to be dropped.
         if (nodes.find((n) => n === node)) {
-          // According to @mhegazy returning undefined is supported.
-          // https://github.com/Microsoft/TypeScript/pull/17044
-          // tslint:disable-next-line:no-any
-          return undefined as any;
+          return undefined;
         }
 
         // Otherwise return node as is.

packages/angular_devkit/schematics/BUILD

@@ -63,6 +63,7 @@ ts_library(
     ),
     deps = [
         ":schematics",
+        "//packages/angular_devkit/core",
         # @deps: rxjs
         # @typings: jasmine
     ],
@@ -75,6 +76,7 @@ ts_library(
         include = ["tools/**/*_spec.ts"],
     ),
     deps = [
+        ":schematics",
         ":tools",
         # @deps: rxjs
         # @typings: jasmine

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

@@ -31,7 +31,7 @@ export const kPathTemplateComponentRE = /__(.+?)__/g;
 export const kPathTemplatePipeRE = /@([^@]+)/;
 
 
-export type TemplateValue = boolean | string | number;
+export type TemplateValue = boolean | string | number | undefined;
 export type TemplatePipeFunction = (x: string) => TemplateValue;
 export type TemplateOptions = {
   [key: string]: TemplateValue | TemplateOptions | TemplatePipeFunction,

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

@@ -84,8 +84,7 @@ export class DryRunSink extends FileSystemSink {
         }
       }
 
-      const content = null;
-      this._subject.next({ kind: 'delete', path, content });
+      this._subject.next({ kind: 'delete', path });
     });
     this._filesToCreate.forEach((content, path) => {
       // Check if this is a renaming.
@@ -106,7 +105,7 @@ export class DryRunSink extends FileSystemSink {
       this._subject.next({ kind: 'update', path, content: content.generate() });
     });
     this._filesToRename.forEach(([path, to]) => {
-      this._subject.next({ kind: 'rename', path, to, content: null });
+      this._subject.next({ kind: 'rename', path, to });
     });
 
     this._subject.complete();

packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts

@@ -118,7 +118,7 @@ export abstract class FileSystemEngineHostBase implements
   createCollectionDescription(name: string): FileSystemCollectionDesc {
     const path = this._resolveCollectionPath(name);
     const jsonValue = readJsonFile(path);
-    if (!jsonValue || typeof jsonValue != 'object') {
+    if (!jsonValue || typeof jsonValue != 'object' || Array.isArray(jsonValue)) {
       throw new InvalidCollectionJsonException(name, path);
     }
 

packages/schematics/angular/application/index.ts

@@ -98,7 +98,7 @@ export default function (options: ApplicationOptions): Rule {
           options.serviceWorker ? noop() : filter(path => !path.endsWith('/ngsw-config.json')),
           template({
             utils: stringUtils,
-            ...options as object,
+            ...options,
             'dot': '.',
             sourcedir: sourceDir,
           }),

packages/schematics/angular/class/index.ts

@@ -35,7 +35,7 @@ export default function (options: ClassOptions): Rule {
     options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),
     template({
       ...stringUtils,
-      ...options as object,
+      ...options,
     }),
     move(sourceDir),
   ]);

packages/schematics/angular/component/index.ts

@@ -119,7 +119,7 @@ export default function(options: ComponentOptions): Rule {
       template({
         ...stringUtils,
         'if-flat': (s: string) => options.flat ? '' : s,
-        ...options as object,
+        ...options,
       }),
       move(sourceDir),
     ]);