Skip to content

Commit 58d7329

Browse files
committed
Rebase onto upstream/master
1 parent 2e660b4 commit 58d7329

File tree

6 files changed

+128
-196
lines changed

6 files changed

+128
-196
lines changed

package-lock.json

Lines changed: 121 additions & 185 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"gulp-clean-css": "^3.3.1",
7373
"gulp-cli": "^1.3.0",
7474
"gulp-connect": "^5.0.0",
75-
"gulp-conventional-changelog": "^1.1.3",
75+
"gulp-conventional-changelog": "^1.1.4",
7676
"gulp-dom": "^0.9.17",
7777
"gulp-flatten": "^0.3.1",
7878
"gulp-highlight-files": "^0.0.4",

src/cdk/stepper/stepper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
ViewChild,
2323
TemplateRef
2424
} from '@angular/core';
25-
import {LEFT_ARROW, RIGHT_ARROW, ENTER, SPACE} from '@angular/cdk/keyboard';
25+
import {LEFT_ARROW, RIGHT_ARROW, ENTER, SPACE} from '@angular/cdk/keycodes';
2626
import {CdkStepLabel} from './step-label';
2727
import {coerceBooleanProperty} from '@angular/cdk/coercion';
2828
import {AbstractControl} from '@angular/forms';

src/cdk/stepper/tsconfig-build.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
{
22
"extends": "../tsconfig-build",
3-
"compilerOptions": {
4-
"outDir": "../../../dist/packages/cdk",
5-
"baseUrl": ".",
6-
"paths": {
7-
"@angular/cdk/keyboard": ["../../../dist/packages/cdk/keyboard/public_api"],
8-
"@angular/cdk/coercion": ["../../../dist/packages/cdk/coercion/public_api"]
9-
}
10-
},
113
"files": [
124
"public_api.ts"
135
],

src/demo-app/demo-app/demo-module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import {PeopleDatabase} from '../table/people-database';
4040
import {DatepickerDemo} from '../datepicker/datepicker-demo';
4141
import {TypographyDemo} from '../typography/typography-demo';
4242
import {ExpansionDemo} from '../expansion/expansion-demo';
43+
import {StepperDemo} from '../stepper/stepper-demo';
4344
import {DemoMaterialModule} from '../demo-material-module';
4445
import {
4546
FullscreenOverlayContainer,
@@ -92,6 +93,7 @@ import {TableHeaderDemo} from '../table/table-header-demo';
9293
SliderDemo,
9394
SlideToggleDemo,
9495
SpagettiPanel,
96+
StepperDemo,
9597
StyleDemo,
9698
TableHeaderDemo,
9799
ToolbarDemo,

0 commit comments

Comments
 (0)