Skip to content

Commit 1a3accb

Browse files
Merge branch 'master' into expansion-overflow
2 parents 402d303 + 872952e commit 1a3accb

File tree

1,031 files changed

+49075
-17276
lines changed

Some content is hidden

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

1,031 files changed

+49075
-17276
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
# This may be unnecessary once rules_nodejs uses nodejs 8
3737
- run: bazel run @nodejs//:npm run postinstall
3838
- run: bazel build src/...
39+
- run: bazel test src/...
3940
- save_cache:
4041
key: material2-{{ .Branch }}-{{ checksum "package-lock.json" }}
4142
paths:

.github/CODEOWNERS

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Angular Material components
22
/src/lib/* @jelbourn
33
/src/lib/autocomplete/** @kara @crisbeto
4+
/src/lib/badge/** @amcdnl
5+
/src/lib/bottom-sheet/** @jelbourn @crisbeto
46
/src/lib/button-toggle/** @tinayuangao
57
/src/lib/button/** @tinayuangao
68
/src/lib/card/** @jelbourn
@@ -17,9 +19,11 @@
1719
/src/lib/list/** @jelbourn @crisbeto @devversion
1820
/src/lib/menu/** @kara @crisbeto
1921
/src/lib/paginator/** @andrewseguin
22+
/src/lib/prebuilt-themes/** @jelbourn
2023
/src/lib/progress-bar/** @jelbourn @crisbeto @josephperrott
2124
/src/lib/progress-spinner/** @jelbourn @crisbeto @josephperrott
2225
/src/lib/radio/** @tinayuangao @devversion
26+
/src/lib/schematics/** @amcdnl
2327
/src/lib/select/** @kara @crisbeto
2428
/src/lib/sidenav/** @mmalerba
2529
/src/lib/slide-toggle/** @devversion
@@ -31,6 +35,7 @@
3135
/src/lib/tabs/** @andrewseguin
3236
/src/lib/toolbar/** @devversion
3337
/src/lib/tooltip/** @andrewseguin
38+
/src/lib/tree/** @tinayuangao
3439

3540
# Angular Material core
3641
/src/lib/core/* @jelbourn
@@ -39,10 +44,10 @@
3944
/src/lib/core/datetime/** @mmalerba
4045
/src/lib/core/error/** @crisbeto @mmalerba
4146
/src/lib/core/gestures/** @jelbourn
47+
/src/lib/core/label/** @kara @mmalerba
4248
/src/lib/core/line/** @jelbourn
4349
/src/lib/core/option/** @kara @crisbeto
4450
/src/lib/core/placeholder/** @kara @mmalerba
45-
/src/lib/core/label/** @kara @mmalerba
4651
/src/lib/core/ripple/** @devversion
4752
/src/lib/core/selection/** @tinayuangao @jelbourn
4853
/src/lib/core/selection/pseudo*/** @crisbeto @jelbourn
@@ -69,16 +74,18 @@
6974
/src/cdk/stepper/** @mmalerba
7075
/src/cdk/table/** @andrewseguin
7176
/src/cdk/testing/** @devversion
77+
/src/cdk/text-field/** @mmalerba
78+
/src/cdk/tree/** @tinayuangao
7279

7380
# Moment adapter package
7481
/src/material-moment-adapter/** @mmalerba
7582

7683
# Material experimental package
7784
/src/material-experimental/** @jelbourn
78-
/src/material-experimental/dialog/** @jelbourn @josephperrott @crisbeto
7985

8086
# CDK experimental package
8187
/src/cdk-experimental/** @jelbourn
88+
/src/cdk-experimental/dialog/** @jelbourn @josephperrott @crisbeto
8289

8390
# Docs examples & guides
8491
/guides/** @amcdnl @jelbourn
@@ -88,12 +95,15 @@
8895
/src/demo-app/* @jelbourn
8996
/src/demo-app/a11y/** @tinayuangao
9097
/src/demo-app/autocomplete/** @kara @crisbeto
98+
/src/demo-app/badge/** @amcdnl
9199
/src/demo-app/baseline/** @mmalerba
100+
/src/demo-app/bottom-sheet/** @jelbourn @crisbeto
92101
/src/demo-app/button-toggle/** @tinayuangao
93102
/src/demo-app/button/** @tinayuangao
94103
/src/demo-app/card/** @jelbourn
95104
/src/demo-app/checkbox/** @tinayuangao @devversion
96105
/src/demo-app/chips/** @tinayuangao
106+
/src/demo-app/connected-overlay/** @jelbourn @crisbeto
97107
/src/demo-app/dataset/** @andrewseguin
98108
/src/demo-app/datepicker/** @mmalerba
99109
/src/demo-app/demo-app/** @jelbourn
@@ -126,6 +136,7 @@
126136
/src/demo-app/tabs/** @andrewseguin
127137
/src/demo-app/toolbar/** @devversion
128138
/src/demo-app/tooltip/** @andrewseguin
139+
/src/demo-app/tree/** @tinayuangao
129140
/src/demo-app/typography/** @crisbeto
130141

131142
# E2E app

.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88

99

1010
#### What are the steps to reproduce?
11-
Providing a StackBlitz/Plunker (or similar) is the *best* way to get the team to see your issue. <br/>
12-
Plunker starter (using on `@master`): https://goo.gl/uDmqyY<br/>
13-
StackBlitz starter (using latest `npm` release): https://goo.gl/wwnhMV<br/>
11+
Providing a StackBlitz reproduction is the *best* way to share your issue. <br/>
12+
StackBlitz starter: https://goo.gl/wwnhMV<br/>
1413

1514

1615
#### What is the use-case or motivation for changing an existing behavior?

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
/tmp
66
/deploy
77
/screenshots
8+
/bazel-out
9+
10+
# Example module file will be auto-generated.
11+
/src/material-examples/example-module.ts
812

913
# dependencies
1014
node_modules
@@ -35,3 +39,7 @@ npm-debug.log
3539
testem.log
3640
/.chrome
3741
/.git
42+
43+
# schematics
44+
/src/lib/schematics/**/*.js
45+
/src/lib/schematics/**/*.map

.travis.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
language: node_js
2-
sudo: false
32
dist: trusty
3+
sudo: false
44

55
node_js:
6-
- '8'
6+
# Use the explicit NodeJS LTS version 8.9.4 to avoid any automatic upgrade of the version.
7+
# This ensures that all Travis jobs run consistently and don't have different Node versions.
8+
- '8.9.4'
79

810
addons:
911
jwt:
@@ -16,30 +18,35 @@ addons:
1618
branches:
1719
only:
1820
- master
21+
- 5.2.x
1922

2023
jobs:
2124
include:
2225
- env: "MODE=lint"
2326
- env: "MODE=aot"
2427
- env: "MODE=payload"
2528
- env: "MODE=prerender"
26-
# Closure Compiler CI check is temporarily disabled until a new version of
27-
# the tool is released with https://github.com/google/closure-compiler/pull/2600
28-
# - env: "MODE=closure-compiler"
2929
- env: "MODE=e2e"
3030
- env: "MODE=saucelabs_required"
3131
- env: "MODE=browserstack_required"
3232
- env: "MODE=travis_required"
3333
- env: "DEPLOY_MODE=build-artifacts"
34+
if: type = push
3435
- env: "DEPLOY_MODE=docs-content"
36+
if: type = push
3537
- env: "DEPLOY_MODE=screenshot-tool"
38+
if: type = cron
3639
- env: "DEPLOY_MODE=dashboard"
40+
if: type = cron
41+
# Closure Compiler CI check is temporarily disabled until a new version of
42+
# the tool is released with https://github.com/google/closure-compiler/pull/2600
43+
# - env: "MODE=closure-compiler"
3744
env:
3845
global:
3946
- LOGS_DIR=/tmp/angular-material2-build/logs
4047
- SAUCE_USERNAME=angular-ci
4148
- BROWSER_STACK_USERNAME=angularteam1
42-
- BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
49+
- BROWSER_STACK_ACCESS_KEY=CaXMeMHD9pr5PHg8N7Jq
4350
- BROWSER_PROVIDER_READY_FILE=/tmp/angular-material2-build/readyfile
4451
- BROWSER_PROVIDER_ERROR_FILE=/tmp/angular-material2-build/errorfile
4552

BUILD.bazel

Lines changed: 57 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,70 @@ filegroup(
1414
# TODO(alexeagle): figure out what to do
1515
srcs = glob(["/".join(["node_modules", pkg, "**", ext]) for pkg in [
1616
"@angular",
17-
"jasmine",
18-
"typescript",
19-
"tslib",
20-
"zone.js",
17+
"@angular-devkit",
18+
"@schematics",
2119
"@types",
22-
"tsickle",
23-
"hammerjs",
24-
"protobufjs",
2520
"bytebuffer",
26-
"reflect-metadata",
21+
"hammerjs",
22+
"jasmine",
2723
"minimist",
2824
"moment",
25+
"parse5",
26+
"protobufjs",
27+
"protractor",
28+
"reflect-metadata",
29+
"tsickle",
30+
"tslib",
31+
"tsutils",
32+
"typescript",
33+
"zone.js",
2934
] for ext in [
3035
"*.js",
3136
"*.json",
3237
"*.d.ts",
33-
]]),
38+
]] + [
39+
"node_modules/http-server/**",
40+
]),
41+
)
42+
43+
44+
# Glob pattern that matches all Angular testing bundles.
45+
ANGULAR_TESTING = [
46+
"node_modules/@angular/*/bundles/*-testing.umd.js",
47+
# The compiler and the dynamic platform-browser should be visible only in tests
48+
"node_modules/@angular/compiler/bundles/*.umd.js",
49+
"node_modules/@angular/platform-browser-dynamic/bundles/*.umd.js",
50+
]
51+
52+
filegroup(
53+
name = "angular_bundles",
54+
srcs = glob(["node_modules/@angular/*/bundles/*.umd.js"], exclude = ANGULAR_TESTING),
55+
)
56+
57+
filegroup(
58+
name = "angular_test_bundles",
59+
testonly = 1,
60+
srcs = glob(ANGULAR_TESTING),
3461
)
3562

63+
filegroup(
64+
name = "tslib_bundle",
65+
testonly = 1,
66+
srcs = glob(["node_modules/tslib/tslib.js"]),
67+
)
68+
69+
# Files necessary for unit tests that use zonejs
70+
filegroup(
71+
name = "web_test_bootstrap_scripts",
72+
# The order of these deps is important.
73+
# Do not sort.
74+
srcs = [
75+
"//:node_modules/reflect-metadata/Reflect.js",
76+
"//:node_modules/zone.js/dist/zone.js",
77+
"//:node_modules/zone.js/dist/async-test.js",
78+
"//:node_modules/zone.js/dist/sync-test.js",
79+
"//:node_modules/zone.js/dist/fake-async-test.js",
80+
"//:node_modules/zone.js/dist/proxy.js",
81+
"//:node_modules/zone.js/dist/jasmine-patch.js",
82+
],
83+
)

0 commit comments

Comments
 (0)