Skip to content

Commit 74105fd

Browse files
committed
Address feedback
1 parent 1b038c0 commit 74105fd

File tree

279 files changed

+298
-234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

279 files changed

+298
-234
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ jobs:
141141
- run: ./scripts/circleci/run-browserstack-tests.sh
142142

143143
# -----------------------------------------------------------------------------------------
144-
# Job that builds the demo-app with AOT. In order to speed up this job, the release output
144+
# Job that builds the dev-app with AOT. In order to speed up this job, the release output
145145
# from the workspace storage will be attached to this job.
146146
# -----------------------------------------------------------------------------------------
147-
build_demoapp_aot:
147+
build_devapp_aot:
148148
<<: *job_defaults
149149
steps:
150150
- *checkout_code
@@ -181,7 +181,7 @@ jobs:
181181

182182
# -------------------------------------------------------------------------------------------
183183
# Job that builds all release packages with Gulp. The built packages can be then used in the
184-
# same workflow to publish snapshot builds or test the demo-app with the release packages.
184+
# same workflow to publish snapshot builds or test the dev-app with the release packages.
185185
# -------------------------------------------------------------------------------------------
186186
build_release_packages:
187187
<<: *job_defaults
@@ -277,7 +277,7 @@ workflows:
277277
release_output:
278278
jobs:
279279
- build_release_packages
280-
- build_demoapp_aot:
280+
- build_devapp_aot:
281281
requires:
282282
- build_release_packages
283283
- publish_snapshots:

.github/CODEOWNERS

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -94,58 +94,59 @@
9494
/guides/** @jelbourn
9595
/src/material-examples/** @jelbourn
9696

97-
# Demo app
98-
/src/demo-app/* @jelbourn
99-
/src/demo-app/a11y-demos/** @jelbourn
100-
/src/demo-app/library-demos/* @jelbourn
101-
/src/demo-app/library-demos/autocomplete/** @crisbeto
102-
/src/demo-app/library-demos/badge/** @jelbourn
103-
/src/demo-app/library-demos/baseline/** @mmalerba
104-
/src/demo-app/library-demos/bottom-sheet/** @jelbourn @crisbeto
105-
/src/demo-app/library-demos/button-toggle/** @jelbourn
106-
/src/demo-app/library-demos/button/** @jelbourn
107-
/src/demo-app/library-demos/card/** @jelbourn
108-
/src/demo-app/library-demos/checkbox/** @jelbourn @devversion
109-
/src/demo-app/library-demos/chips/** @jelbourn
110-
/src/demo-app/library-demos/connected-overlay/** @jelbourn @crisbeto
111-
/src/demo-app/library-demos/dataset/** @andrewseguin
112-
/src/demo-app/library-demos/datepicker/** @mmalerba
113-
/src/demo-app/library-demos/dialog/** @jelbourn @crisbeto
114-
/src/demo-app/library-demos/drawer/** @mmalerba
115-
/src/demo-app/library-demos/drag-drop/** @crisbeto
116-
/src/demo-app/library-demos/example/** @andrewseguin
117-
/src/demo-app/library-demos/examples-page/** @andrewseguin
118-
/src/demo-app/library-demos/expansion/** @josephperrott
119-
/src/demo-app/library-demos/focus-origin/** @mmalerba
120-
/src/demo-app/library-demos/gestures/** @jelbourn
121-
/src/demo-app/library-demos/grid-list/** @jelbourn
122-
/src/demo-app/library-demos/icon/** @jelbourn
123-
/src/demo-app/library-demos/input/** @mmalerba
124-
/src/demo-app/library-demos/list/** @jelbourn @crisbeto @devversion
125-
/src/demo-app/library-demos/menu/** @crisbeto
126-
/src/demo-app/library-demos/live-announcer/** @jelbourn
127-
/src/demo-app/library-demos/overlay/** @jelbourn @crisbeto
128-
/src/demo-app/library-demos/paginator/** @andrewseguin
129-
/src/demo-app/library-demos/platform/** @jelbourn @devversion
130-
/src/demo-app/library-demos/portal/** @jelbourn
131-
/src/demo-app/library-demos/progress-bar/** @jelbourn @crisbeto @josephperrott
132-
/src/demo-app/library-demos/progress-spinner/** @jelbourn @crisbeto @josephperrott
133-
/src/demo-app/library-demos/radio/** @jelbourn @devversion
134-
/src/demo-app/library-demos/ripple/** @devversion
135-
/src/demo-app/library-demos/screen-type/** @josephperrott
136-
/src/demo-app/library-demos/select/** @crisbeto
137-
/src/demo-app/library-demos/sidenav/** @mmalerba
138-
/src/demo-app/library-demos/slide-toggle/** @devversion
139-
/src/demo-app/library-demos/slider/** @mmalerba
140-
/src/demo-app/library-demos/snack-bar/** @jelbourn @crisbeto @josephperrott
141-
/src/demo-app/library-demos/stepper/** @mmalerba
142-
/src/demo-app/library-demos/table/** @andrewseguin
143-
/src/demo-app/library-demos/tabs/** @andrewseguin
144-
/src/demo-app/library-demos/toolbar/** @devversion
145-
/src/demo-app/library-demos/tooltip/** @andrewseguin
146-
/src/demo-app/library-demos/tree/** @jelbourn
147-
/src/demo-app/library-demos/typography/** @crisbeto
148-
/src/demo-app/library-demos/virtual-scroll/** @mmalerba
97+
# Accessibility demos
98+
/src/a11y-demo/**/* @jelbourn
99+
100+
# Dev-app
101+
/src/dev-app/* @jelbourn
102+
/src/dev-app/autocomplete/** @crisbeto
103+
/src/dev-app/badge/** @jelbourn
104+
/src/dev-app/baseline/** @mmalerba
105+
/src/dev-app/bottom-sheet/** @jelbourn @crisbeto
106+
/src/dev-app/button-toggle/** @jelbourn
107+
/src/dev-app/button/** @jelbourn
108+
/src/dev-app/card/** @jelbourn
109+
/src/dev-app/checkbox/** @jelbourn @devversion
110+
/src/dev-app/chips/** @jelbourn
111+
/src/dev-app/connected-overlay/** @jelbourn @crisbeto
112+
/src/dev-app/dataset/** @andrewseguin
113+
/src/dev-app/datepicker/** @mmalerba
114+
/src/dev-app/dialog/** @jelbourn @crisbeto
115+
/src/dev-app/drawer/** @mmalerba
116+
/src/dev-app/drag-drop/** @crisbeto
117+
/src/dev-app/example/** @andrewseguin
118+
/src/dev-app/examples-page/** @andrewseguin
119+
/src/dev-app/expansion/** @josephperrott
120+
/src/dev-app/focus-origin/** @mmalerba
121+
/src/dev-app/gestures/** @jelbourn
122+
/src/dev-app/grid-list/** @jelbourn
123+
/src/dev-app/icon/** @jelbourn
124+
/src/dev-app/input/** @mmalerba
125+
/src/dev-app/list/** @jelbourn @crisbeto @devversion
126+
/src/dev-app/menu/** @crisbeto
127+
/src/dev-app/live-announcer/** @jelbourn
128+
/src/dev-app/overlay/** @jelbourn @crisbeto
129+
/src/dev-app/paginator/** @andrewseguin
130+
/src/dev-app/platform/** @jelbourn @devversion
131+
/src/dev-app/portal/** @jelbourn
132+
/src/dev-app/progress-bar/** @jelbourn @crisbeto @josephperrott
133+
/src/dev-app/progress-spinner/** @jelbourn @crisbeto @josephperrott
134+
/src/dev-app/radio/** @jelbourn @devversion
135+
/src/dev-app/ripple/** @devversion
136+
/src/dev-app/screen-type/** @josephperrott
137+
/src/dev-app/select/** @crisbeto
138+
/src/dev-app/sidenav/** @mmalerba
139+
/src/dev-app/slide-toggle/** @devversion
140+
/src/dev-app/slider/** @mmalerba
141+
/src/dev-app/snack-bar/** @jelbourn @crisbeto @josephperrott
142+
/src/dev-app/stepper/** @mmalerba
143+
/src/dev-app/table/** @andrewseguin
144+
/src/dev-app/tabs/** @andrewseguin
145+
/src/dev-app/toolbar/** @devversion
146+
/src/dev-app/tooltip/** @andrewseguin
147+
/src/dev-app/tree/** @jelbourn
148+
/src/dev-app/typography/** @crisbeto
149+
/src/dev-app/virtual-scroll/** @mmalerba
149150

150151
# E2E app
151152
/e2e/* @jelbourn

CODE_REVIEWS.md

Lines changed: 1 addition & 1 deletion

firebase.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hosting": {
3-
"public": "dist/packages/demo-app",
3+
"public": "dist/packages/dev-app",
44
"rewrites": [
55
{
66
"source": "/**/!(*.@(js|ts|html|css|json|svg|png|jpg|jpeg))",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"scripts": {
1515
"build": "gulp :publish:build-releases",
16-
"demo-app": "gulp serve:devapp",
16+
"dev-app": "gulp serve:devapp",
1717
"test": "gulp test",
1818
"tslint": "gulp lint",
1919
"stylelint": "gulp lint",

src/a11y-demo/BUILD.bazel

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package(default_visibility=["//visibility:public"])
2+
3+
load("//:packages.bzl", "MATERIAL_TARGETS")
4+
load("//tools:defaults.bzl", "ng_module")
5+
load("//tools:sass_generate_binaries.bzl", "sass_generate_binaries")
6+
7+
# Generate sass binaries for all nested SCSS files.
8+
sass_generate_binaries("a11y_demo_scss", glob(["**/*.scss"]))
9+
10+
ng_module(
11+
name = "a11y-demo",
12+
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
13+
assets = glob(["**/*.html"]) + [":a11y_demo_scss"],
14+
deps = [
15+
"@angular//packages/core",
16+
"@angular//packages/router",
17+
"//src/cdk/table",
18+
] + MATERIAL_TARGETS
19+
)

src/demo-app/a11y-demos/a11y-demo-module.ts renamed to src/a11y-demo/a11y-demo-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
1111
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
1212
import {RouterModule} from '@angular/router';
13-
import {DemoMaterialModule} from '../demo-material-module';
1413
import {AccessibilityDemoHome, AccessibilityDemoRoot} from './a11y-demo';
1514
import {ACCESSIBILITY_DEMO_ROUTES} from './a11y-demo-routes';
15+
import {DemoMaterialModule} from './a11y-material-module';
1616
import {AutocompleteAccessibilityDemo} from './autocomplete/autocomplete-a11y';
1717
import {ButtonToggleAccessibilityDemo} from './button-toggle/button-toggle-a11y';
1818
import {ButtonAccessibilityDemo} from './button/button-a11y';
File renamed without changes.
File renamed without changes.

src/demo-app/a11y-demos/a11y-demo.ts renamed to src/a11y-demo/a11y-demo.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import {Subscription} from 'rxjs';
1717
})
1818
export class AccessibilityDemoRoot implements OnDestroy {
1919
currentComponent = '';
20-
2120
fullscreen = false;
2221

2322
private _routerSubscription = Subscription.EMPTY;
@@ -85,6 +84,6 @@ export class AccessibilityDemoRoot implements OnDestroy {
8584
@Component({
8685
moduleId: module.id,
8786
selector: 'accessibility-home',
88-
template: `<p>Welcome to the accessibility demos for Angular Material!</p>`,
87+
template: `<p>Welcome to the accessibility examples for Angular Material!</p>`,
8988
})
9089
export class AccessibilityDemoHome {}

src/a11y-demo/a11y-material-module.ts

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
9+
import {CdkTableModule} from '@angular/cdk/table';
10+
import {NgModule} from '@angular/core';
11+
import {
12+
MatAutocompleteModule,
13+
MatButtonModule,
14+
MatButtonToggleModule,
15+
MatCardModule,
16+
MatCheckboxModule,
17+
MatChipsModule,
18+
MatDatepickerModule,
19+
MatDialogModule,
20+
MatExpansionModule,
21+
MatGridListModule,
22+
MatIconModule,
23+
MatInputModule,
24+
MatListModule,
25+
MatMenuModule,
26+
MatPaginatorModule,
27+
MatProgressBarModule,
28+
MatProgressSpinnerModule,
29+
MatRadioModule,
30+
MatSelectModule,
31+
MatSidenavModule,
32+
MatSliderModule,
33+
MatSlideToggleModule,
34+
MatSnackBarModule,
35+
MatTableModule,
36+
MatTabsModule,
37+
MatToolbarModule,
38+
MatTooltipModule,
39+
} from '@angular/material';
40+
41+
/**
42+
* NgModule that includes all Material modules that are required to serve the dev-app.
43+
*/
44+
@NgModule({
45+
exports: [
46+
CdkTableModule,
47+
MatAutocompleteModule,
48+
MatButtonModule,
49+
MatButtonToggleModule,
50+
MatCardModule,
51+
MatCheckboxModule,
52+
MatChipsModule,
53+
MatTableModule,
54+
MatDatepickerModule,
55+
MatDialogModule,
56+
MatExpansionModule,
57+
MatGridListModule,
58+
MatIconModule,
59+
MatInputModule,
60+
MatListModule,
61+
MatMenuModule,
62+
MatPaginatorModule,
63+
MatProgressBarModule,
64+
MatProgressSpinnerModule,
65+
MatRadioModule,
66+
MatSelectModule,
67+
MatSidenavModule,
68+
MatSliderModule,
69+
MatSlideToggleModule,
70+
MatSnackBarModule,
71+
MatTableModule,
72+
MatTabsModule,
73+
MatToolbarModule,
74+
MatTooltipModule,
75+
]
76+
})
77+
export class DemoMaterialModule {}
File renamed without changes.

src/demo-app/a11y-demos/BUILD.bazel

Whitespace-only changes.

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

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)