Merge remote-tracking branch 'upstream/master' into virtual-scroll

Author: mmalerba

.circleci/config.yml

@@ -7,11 +7,28 @@
 # To validate changes, use an online parser, eg.
 # http://yaml-online-parser.appspot.com/
 
+## IMPORTANT
+# If you change the `docker_image` version, also change the `cache_key` suffix and the version of
+# `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
+var_1: &docker_image angular/ngcontainer:0.3.0
+var_2: &cache_key v2-ng-mat-{{ .Branch }}-{{ checksum "package-lock.json" }}-0.3.0
+
+# Define common ENV vars
+var_3: &define_env_vars
+  run: echo "export PROJECT_ROOT=$(pwd)" >> $BASH_ENV
+
+# See remote cache documentation in /docs/BAZEL.md
+var_4: &setup-bazel-remote-cache
+  run:
+    name: Start up bazel remote cache proxy
+    command: ~/bazel-remote-proxy -backend circleci://
+    background: true
+
 # Settings common to each job
 anchor_1: &job_defaults
   working_directory: ~/ng
   docker:
-    - image: angular/ngcontainer:0.1.0
+    - image: *docker_image
 
 # After checkout, rebase on top of master.
 # Similar to travis behavior, but not quite the same.
@@ -29,15 +46,16 @@ jobs:
       - checkout:
           <<: *post_checkout
       - restore_cache:
-          key: material2-{{ .Branch }}-{{ checksum "package-lock.json" }}
+          key: *cache_key
 
       - run: bazel run @nodejs//:npm install
       # For some reason, circleci needs the postinstall to be run explicitly.
       # This may be unnecessary once rules_nodejs uses nodejs 8
       - run: bazel run @nodejs//:npm run postinstall
       - run: bazel build src/...
+      - run: bazel test src/...
       - save_cache:
-          key: material2-{{ .Branch }}-{{ checksum "package-lock.json" }}
+          key: *cache_key
           paths:
             - "node_modules"
 

.github/CODEOWNERS

@@ -1,6 +1,6 @@
 # Angular Material components
 /src/lib/*                                         @jelbourn
-/src/lib/autocomplete/**                           @kara @crisbeto
+/src/lib/autocomplete/**                           @crisbeto
 /src/lib/badge/**                                  @amcdnl
 /src/lib/bottom-sheet/**                           @jelbourn @crisbeto
 /src/lib/button-toggle/**                          @tinayuangao
@@ -13,18 +13,18 @@
 /src/lib/divider/**                                @jelbourn @crisbeto
 /src/lib/expansion/**                              @josephperrott @jelbourn
 /src/lib/form-field/**                             @mmalerba
-/src/lib/grid-list/**                              @kara @jelbourn
+/src/lib/grid-list/**                              @jelbourn
 /src/lib/icon/**                                   @jelbourn
 /src/lib/input/**                                  @mmalerba
 /src/lib/list/**                                   @jelbourn @crisbeto @devversion
-/src/lib/menu/**                                   @kara @crisbeto
+/src/lib/menu/**                                   @crisbeto
 /src/lib/paginator/**                              @andrewseguin
 /src/lib/prebuilt-themes/**                        @jelbourn
 /src/lib/progress-bar/**                           @jelbourn @crisbeto @josephperrott
 /src/lib/progress-spinner/**                       @jelbourn @crisbeto @josephperrott
 /src/lib/radio/**                                  @tinayuangao @devversion
 /src/lib/schematics/**                             @amcdnl
-/src/lib/select/**                                 @kara @crisbeto
+/src/lib/select/**                                 @crisbeto
 /src/lib/sidenav/**                                @mmalerba
 /src/lib/slide-toggle/**                           @devversion
 /src/lib/slider/**                                 @mmalerba
@@ -44,10 +44,10 @@
 /src/lib/core/datetime/**                          @mmalerba
 /src/lib/core/error/**                             @crisbeto @mmalerba
 /src/lib/core/gestures/**                          @jelbourn
-/src/lib/core/label/**                             @kara @mmalerba
+/src/lib/core/label/**                             @mmalerba
 /src/lib/core/line/**                              @jelbourn
-/src/lib/core/option/**                            @kara @crisbeto
-/src/lib/core/placeholder/**                       @kara @mmalerba
+/src/lib/core/option/**                            @crisbeto
+/src/lib/core/placeholder/**                       @mmalerba
 /src/lib/core/ripple/**                            @devversion
 /src/lib/core/selection/**                         @tinayuangao @jelbourn
 /src/lib/core/selection/pseudo*/**                 @crisbeto @jelbourn
@@ -95,7 +95,7 @@
 # Demo app
 /src/demo-app/*                                    @jelbourn
 /src/demo-app/a11y/**                              @tinayuangao
-/src/demo-app/autocomplete/**                      @kara @crisbeto
+/src/demo-app/autocomplete/**                      @crisbeto
 /src/demo-app/badge/**                             @amcdnl
 /src/demo-app/baseline/**                          @mmalerba
 /src/demo-app/bottom-sheet/**                      @jelbourn @crisbeto
@@ -110,15 +110,17 @@
 /src/demo-app/demo-app/**                          @jelbourn
 /src/demo-app/dialog/**                            @jelbourn @crisbeto
 /src/demo-app/drawer/**                            @mmalerba
+/src/demo-app/example/**                           @andrewseguin
+/src/demo-app/examples-page/**                     @andrewseguin
 /src/demo-app/expansion/**                         @josephperrott
 /src/demo-app/focus-origin/**                      @mmalerba
 /src/demo-app/gestures/**                          @jelbourn
-/src/demo-app/grid-list/**                         @kara @jelbourn
+/src/demo-app/grid-list/**                         @jelbourn
 /src/demo-app/icon/**                              @jelbourn
 /src/demo-app/input/**                             @mmalerba
 /src/demo-app/list/**                              @jelbourn @crisbeto @devversion
 /src/demo-app/live-announcer/**                    @jelbourn
-/src/demo-app/menu/**                              @kara @crisbeto
+/src/demo-app/menu/**                              @crisbeto
 /src/demo-app/overlay/**                           @jelbourn @crisbeto
 /src/demo-app/paginator/**                         @andrewseguin
 /src/demo-app/platform/**                          @jelbourn @devversion
@@ -128,7 +130,7 @@
 /src/demo-app/radio/**                             @tinayuangao @devversion
 /src/demo-app/ripple/**                            @devversion
 /src/demo-app/screen-type/**                       @josephperrott
-/src/demo-app/select/**                            @kara @crisbeto
+/src/demo-app/select/**                            @crisbeto
 /src/demo-app/sidenav/**                           @mmalerba
 /src/demo-app/slide-toggle/**                      @devversion
 /src/demo-app/slider/**                            @mmalerba
@@ -152,11 +154,11 @@
 /e2e/components/dialog-e2e.spec.ts                 @jelbourn @crisbeto
 /e2e/components/expansion-e2e.spec.ts              @josephperrott @jelbourn
 /e2e/components/fullscreen-e2e.spec.ts             @jelbourn
-/e2e/components/grid-list-e2e.spec.ts              @kara @jelbourn
+/e2e/components/grid-list-e2e.spec.ts              @jelbourn
 /e2e/components/icon-e2e.spec.ts                   @jelbourn
 /e2e/components/input-e2e.spec.ts                  @mmalerba
 /e2e/components/list-e2e.spec.ts                   @jelbourn @crisbeto @devversion
-/e2e/components/menu-e2e.spec.ts                   @kara @crisbeto
+/e2e/components/menu-e2e.spec.ts                   @crisbeto
 /e2e/components/progress-bar-e2e.spec.ts           @jelbourn @crisbeto @josephperrott
 /e2e/components/progress-spinner-e2e.spec.ts       @jelbourn @crisbeto @josephperrott
 /e2e/components/radio-e2e.spec.ts                  @tinayuangao @devversion
@@ -173,10 +175,10 @@
 /src/e2e-app/dialog/**                             @jelbourn @crisbeto
 /src/e2e-app/e2e-app/**                            @jelbourn
 /src/e2e-app/fullscreen/**                         @jelbourn
-/src/e2e-app/grid-list/**                          @kara @jelbourn
+/src/e2e-app/grid-list/**                          @jelbourn
 /src/e2e-app/icon/**                               @jelbourn
 /src/e2e-app/input/**                              @mmalerba
-/src/e2e-app/menu/**                               @kara @crisbeto
+/src/e2e-app/menu/**                               @crisbeto
 /src/e2e-app/progress-bar/**                       @jelbourn @crisbeto @josephperrott
 /src/e2e-app/progress-spinner/**                   @jelbourn @crisbeto @josephperrott
 /src/e2e-app/radio/**                              @tinayuangao @devversion

.github/angular-robot.yml

@@ -1,5 +1,9 @@
 # Configuration for angular-robot
 
+#options for the size plugin
+size:
+  disabled: true
+
 # options for the merge plugin
 merge:
   # the status will be added to your pull requests
@@ -29,9 +33,12 @@ merge:
   checks:
     # whether the PR shouldn't have a conflict with the base branch
     noConflict: true
+    # whether the PR should have all reviews completed.
+    requireReviews: false
     # list of labels that a PR needs to have, checked with a regexp (e.g. "PR target:" will work for the label "PR target: master")
     requiredLabels:
       - "target: *"
+      - "pr: merge ready"
       - "cla: yes"
 
     # list of labels that a PR shouldn't have, checked after the required labels with a regexp

BUILD.bazel

@@ -76,10 +76,7 @@ filegroup(
   srcs = [
     "//:node_modules/reflect-metadata/Reflect.js",
     "//:node_modules/zone.js/dist/zone.js",
-    "//:node_modules/zone.js/dist/async-test.js",
-    "//:node_modules/zone.js/dist/sync-test.js",
-    "//:node_modules/zone.js/dist/fake-async-test.js",
-    "//:node_modules/zone.js/dist/proxy.js",
-    "//:node_modules/zone.js/dist/jasmine-patch.js",
+    "//:node_modules/zone.js/dist/zone-testing.js",
+    "//:node_modules/zone.js/dist/task-tracking.js",
   ],
 )