Rebase onto upstream/master

angular · Aug 14, 2017 · 2bdc6f3 · 2bdc6f3
1 parent b3d8edd
commit 2bdc6f3
Show file tree

Hide file tree

Showing 6 changed files with 129 additions and 197 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
     "gulp-clean-css": "^3.3.1",
     "gulp-cli": "^1.3.0",
     "gulp-connect": "^5.0.0",
-    "gulp-conventional-changelog": "^1.1.3",
+    "gulp-conventional-changelog": "^1.1.4",
     "gulp-dom": "^0.9.17",
     "gulp-flatten": "^0.3.1",
     "gulp-highlight-files": "^0.0.4",

diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts
@@ -22,7 +22,7 @@ import {
   ViewChild,
   TemplateRef
 } from '@angular/core';
-import {LEFT_ARROW, RIGHT_ARROW, ENTER, SPACE} from '@angular/cdk/keyboard';
+import {LEFT_ARROW, RIGHT_ARROW, ENTER, SPACE} from '@angular/cdk/keycodes';
 import {CdkStepLabel} from './step-label';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {AbstractControl} from '@angular/forms';

diff --git a/src/cdk/stepper/tsconfig-build.json b/src/cdk/stepper/tsconfig-build.json
@@ -1,13 +1,5 @@
 {
   "extends": "../tsconfig-build",
-  "compilerOptions": {
-    "outDir": "../../../dist/packages/cdk",
-    "baseUrl": ".",
-    "paths": {
-      "@angular/cdk/keyboard": ["../../../dist/packages/cdk/keyboard/public_api"],
-      "@angular/cdk/coercion": ["../../../dist/packages/cdk/coercion/public_api"]
-    }
-  },
   "files": [
     "public_api.ts"
   ],