diff --git a/package.json b/package.json
index ca99417f576e..472c5f153881 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "stylus": "^0.54.5",
     "stylus-loader": "^2.4.0",
     "temp": "0.8.3",
-    "typescript": "~2.0.3",
+    "typescript": "~2.1.0",
     "url-loader": "^0.5.7",
     "walk-sync": "^0.3.1",
     "webpack": "~2.2.0",
diff --git a/packages/@angular/cli/tsconfig.json b/packages/@angular/cli/tsconfig.json
index 79044077aca0..ed8cad33e491 100644
--- a/packages/@angular/cli/tsconfig.json
+++ b/packages/@angular/cli/tsconfig.json
@@ -1,37 +1,13 @@
 {
+  "extends": "../../../tsconfig.json",
+
   "compilerOptions": {
-    "declaration": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "mapRoot": "",
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "noEmitOnError": true,
-    "noImplicitAny": true,
-    "noUnusedParameters": true,
-    "noUnusedLocals": true,
     "outDir": "../../../dist/@angular/cli",
     "rootDir": ".",
-    "sourceMap": true,
-    "sourceRoot": "/",
-    "target": "es6",
-    "lib": [
-      "es2016"
-    ],
-    "skipLibCheck": true,
-    "typeRoots": [
-      "../../../node_modules/@types"
-    ],
     "baseUrl": "",
     "paths": {
       "@ngtools/json-schema": [ "../../../dist/@ngtools/json-schema/src" ],
       "@ngtools/webpack": [ "../../../dist/@ngtools/webpack/src" ]
     }
-  },
-  "include": [
-    "**/*"
-  ],
-  "exclude": [
-    "blueprints/*/files/**/*"
-  ]
+  }
 }
diff --git a/packages/@ngtools/json-schema/tsconfig.json b/packages/@ngtools/json-schema/tsconfig.json
index 7bd9a9b450de..775e35fdba6f 100644
--- a/packages/@ngtools/json-schema/tsconfig.json
+++ b/packages/@ngtools/json-schema/tsconfig.json
@@ -1,32 +1,9 @@
 {
+  "extends": "../../../tsconfig.json",
+
   "compilerOptions": {
-    "declaration": true,
-    "experimentalDecorators": true,
-    "mapRoot": "",
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "noEmitOnError": true,
-    "noImplicitAny": true,
-    "noUnusedParameters": true,
-    "noUnusedLocals": true,
     "outDir": "../../../dist/@ngtools/json-schema",
     "rootDir": ".",
-    "lib": [
-      "es2016",
-      "dom"
-    ],
-    "target": "es6",
-    "sourceMap": true,
-    "sourceRoot": "/",
-    "baseUrl": "./",
-    "paths": {
-    },
-    "typeRoots": [
-      "../../node_modules/@types"
-    ],
-    "types": [
-      "jasmine",
-      "node"
-    ]
+    "baseUrl": ""
   }
 }
diff --git a/packages/@ngtools/logger/src/console-logger-stack.spec.ts b/packages/@ngtools/logger/src/console-logger-stack.spec.ts
index 0cc99be052d1..f408c44e8f70 100644
--- a/packages/@ngtools/logger/src/console-logger-stack.spec.ts
+++ b/packages/@ngtools/logger/src/console-logger-stack.spec.ts
@@ -17,7 +17,7 @@ describe('ConsoleLoggerStack', () => {
       })
       .then(() => done(), (err: any) => done.fail(err));
 
-    console.debug('hello');
+    (console as any).debug('hello');
     console.log('world');
     ConsoleLoggerStack.end();
   });
diff --git a/packages/@ngtools/logger/src/console-logger-stack.ts b/packages/@ngtools/logger/src/console-logger-stack.ts
index e8271fdea5bb..629b2384dcaa 100644
--- a/packages/@ngtools/logger/src/console-logger-stack.ts
+++ b/packages/@ngtools/logger/src/console-logger-stack.ts
@@ -9,12 +9,12 @@ let originalConsoleError: (message?: any, ...optionalParams: any[]) => void;
 
 function _push(logger: Logger) {
   if (globalConsoleStack.length == 0) {
-    originalConsoleDebug = console.debug;
+    originalConsoleDebug = (console as any).debug;  // Some environment (node) don't have debug.
     originalConsoleLog = console.log;
     originalConsoleWarn = console.warn;
     originalConsoleError = console.error;
 
-    console.debug = (msg: string, ...args: any[]) => {
+    (console as any).debug = (msg: string, ...args: any[]) => {
       globalConsoleStack[globalConsoleStack.length - 1].debug(msg, { args });
     };
     console.log = (msg: string, ...args: any[]) => {
@@ -39,7 +39,7 @@ function _pop() {
     console.log = originalConsoleLog;
     console.warn = originalConsoleWarn;
     console.error = originalConsoleError;
-    console.debug = originalConsoleDebug;
+    (console as any).debug = originalConsoleDebug;  // Some environment (node) don't have debug.
     globalConsoleStack = null;
   }
 }
diff --git a/packages/@ngtools/logger/tsconfig.json b/packages/@ngtools/logger/tsconfig.json
index 0498a905a9f3..7019e572b507 100644
--- a/packages/@ngtools/logger/tsconfig.json
+++ b/packages/@ngtools/logger/tsconfig.json
@@ -1,30 +1,9 @@
 {
+  "extends": "../../../tsconfig.json",
+
   "compilerOptions": {
-    "declaration": true,
-    "experimentalDecorators": true,
-    "mapRoot": "",
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "noEmitOnError": true,
-    "noImplicitAny": true,
-    "noUnusedParameters": true,
-    "noUnusedLocals": true,
     "outDir": "../../../dist/@ngtools/logger",
     "rootDir": ".",
-    "lib": [
-      "es2016",
-      "dom"
-    ],
-    "target": "es6",
-    "sourceMap": true,
-    "sourceRoot": "/",
-    "baseUrl": ".",
-    "typeRoots": [
-      "../../node_modules/@types"
-    ],
-    "types": [
-      "jasmine",
-      "node"
-    ]
+    "baseUrl": ""
   }
 }
diff --git a/packages/@ngtools/webpack/src/lazy_routes.ts b/packages/@ngtools/webpack/src/lazy_routes.ts
index c32d396dfc22..aa49c8c16821 100644
--- a/packages/@ngtools/webpack/src/lazy_routes.ts
+++ b/packages/@ngtools/webpack/src/lazy_routes.ts
@@ -47,8 +47,9 @@ export function findLazyRoutes(filePath: string,
     .map((routePath: string) => {
       const moduleName = routePath.split('#')[0];
       const resolvedModuleName: ts.ResolvedModuleWithFailedLookupLocations = moduleName[0] == '.'
-        ? { resolvedModule: { resolvedFileName: join(dirname(filePath), moduleName) + '.ts' },
-            failedLookupLocations: [] }
+        ? ({
+            resolvedModule: { resolvedFileName: join(dirname(filePath), moduleName) + '.ts' }
+          } as any)
         : ts.resolveModuleName(moduleName, filePath, program.getCompilerOptions(), host);
       if (resolvedModuleName.resolvedModule
           && resolvedModuleName.resolvedModule.resolvedFileName
diff --git a/packages/@ngtools/webpack/tsconfig.json b/packages/@ngtools/webpack/tsconfig.json
index eba1a266c139..46fb29b75bb1 100644
--- a/packages/@ngtools/webpack/tsconfig.json
+++ b/packages/@ngtools/webpack/tsconfig.json
@@ -1,32 +1,9 @@
 {
+  "extends": "../../../tsconfig.json",
+
   "compilerOptions": {
-    "declaration": true,
-    "experimentalDecorators": true,
-    "mapRoot": "",
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "noEmitOnError": true,
-    "noImplicitAny": true,
-    "noUnusedParameters": true,
-    "noUnusedLocals": true,
     "outDir": "../../../dist/@ngtools/webpack",
     "rootDir": ".",
-    "lib": [
-      "es2016",
-      "dom"
-    ],
-    "target": "es6",
-    "sourceMap": true,
-    "sourceRoot": "/",
-    "baseUrl": "./",
-    "paths": {
-    },
-    "typeRoots": [
-      "../../node_modules/@types"
-    ],
-    "types": [
-      "jasmine",
-      "node"
-    ]
+    "baseUrl": ""
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
index 7441f58575c9..bc4e2f139f33 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,7 @@
 {
   "compilerOptions": {
+    "declaration": true,
+    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "mapRoot": "",
     "module": "commonjs",
@@ -10,12 +12,14 @@
     "noUnusedLocals": true,
     "outDir": "./dist",
     "rootDir": ".",
+    "skipLibCheck": true,
     "sourceMap": true,
     "sourceRoot": "",
-    "inlineSourceMap": true,
     "target": "es6",
     "lib": [
-      "es2016"
+      "es2015",
+      "es2016",
+      "es2017"
     ],
     "baseUrl": "",
     "typeRoots": [
@@ -26,10 +30,9 @@
       "node"
     ],
     "paths": {
-      "@angular/cli/*": [ "./packages/@angular/cli/*" ],
-      "@ngtools/json-schema": [ "./packages/json-schema/src" ],
-      "@ngtools/logger": [ "./packages/logger/src" ],
-      "@ngtools/webpack": [ "./packages/webpack/src" ]
+      "@ngtools/json-schema": [ "packages/@ngtools/json-schema/src" ],
+      "@ngtools/logger": [ "./packages/@ngtools/logger/src" ],
+      "@ngtools/webpack": [ "./packages/@ngtools/webpack/src" ]
     }
   },
   "exclude": [