Merge pull request #1 from angular/master

Merging changes from material

Author: relair

.circleci/config.yml

@@ -1,5 +1,6 @@
 # Configuration file for https://circleci.com/gh/angular/material2
 
+#
 # Note: YAML anchors allow an object to be re-used, reducing duplication.
 # The ampersand declares an alias for an object, then later the `<<: *name`
 # syntax dereferences it.
@@ -10,58 +11,111 @@
 var_1: &docker_image angular/ngcontainer:0.6.0
 var_2: &cache_key v2-ng-mat-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.6.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
+var_3: &job_defaults
   working_directory: ~/ng
   docker:
     - image: *docker_image
 
-# After checkout, rebase on top of master.
-# Similar to travis behavior, but not quite the same.
-# By default, PRs are not rebased on top of master, which we want.
-# See https://discuss.circleci.com/t/1662
-anchor_2: &post_checkout
-  post: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge"
+# Job step for checking out the source code from GitHub. This also ensures that the source code
+# is rebased on top of master.
+var_4: &checkout_code
+  checkout:
+    # After checkout, rebase on top of master. By default, PRs are not rebased on top of master,
+    # which we want. See https://discuss.circleci.com/t/1662
+    post: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge"
+
+# Restores the cache that could be available for the current Yarn lock file. The cache usually
+# includes the node modules and the Bazel repository cache.
+var_5: &restore_cache
+  restore_cache:
+    key: *cache_key
+
+# Saves the cache for the current Yarn lock file. We store the node modules and the Bazel
+# repository cache in order to make subsequent builds faster.
+var_6: &save_cache
+  save_cache:
+    key: *cache_key
+    paths:
+      - "node_modules"
+      - "~/bazel_repository_cache"
 
+# Job step that ensures that the node module dependencies are installed and up-to-date. We use
+# Yarn with the frozen lockfile option in order to make sure that lock file and package.json are
+# in sync. Unlike in Travis, we don't need to manually purge the node modules if stale because
+# CircleCI automatically discards the cache if the checksum of the lock file has changed.
+var_7: &yarn_install
+  run: yarn install --frozen-lockfile --non-interactive
+
+# Copies the Bazel config which is specifically for CircleCI to a location where Bazel picks it
+# up and merges it with the project-wide bazel configuration (tools/bazel.rc)
+var_8: &copy_bazel_config
+  # Set up the CircleCI specific bazel configuration.
+  run: sudo cp ./.circleci/bazel.rc /etc/bazel.bazelrc
+
+# -----------------------------
+# Container version of CircleCI
+# -----------------------------
 version: 2
+
+# -----------------------------------------------------------------------------------------
+# Job definitions. Jobs which are defined just here, will not run automatically. Each job
+# must be part of a workflow definition in order to run for PRs and push builds.
+# -----------------------------------------------------------------------------------------
 jobs:
-  build:
+
+  # -----------------------------------
+  # Build and test job that uses Bazel.
+  # -----------------------------------
+  bazel_build_test:
     <<: *job_defaults
     resource_class: xlarge
     steps:
-      - checkout:
-          <<: *post_checkout
-      - restore_cache:
-          key: *cache_key
-      # Set up the CircleCI specific bazel configuration.
-      - run: sudo cp ./.circleci/bazel.rc /etc/bazel.bazelrc
+      - *checkout_code
+      - *restore_cache
+      - *copy_bazel_config
 
       # TODO(jelbourn): Update this command to run all tests if the Bazel issues have been fixed.
-      - run: bazel test src/{cdk,lib}/schematics:unit_tests
+      - run: bazel build src/cdk/...
+      - run: bazel test src/cdk/...
 
-      - save_cache:
-          key: *cache_key
-          paths:
-            - "node_modules"
-            - "~/bazel_repository_cache"
+      - *save_cache
 
+  # ----------------------------------
+  # Lint job. Runs the gulp lint task.
+  # ----------------------------------
+  lint:
+    <<: *job_defaults
+    steps:
+      - *checkout_code
+      - *restore_cache
+      - *yarn_install
+
+      - run: yarn ci:lint
+
+      - *save_cache
+
+# ----------------------------------------------------------------------------------------
+# Workflow definitions. A workflow usually groups multiple jobs together. This is useful if
+# one job depends on another.
+# ----------------------------------------------------------------------------------------
 workflows:
   version: 2
-  default_workflow:
+
+  # Build and test workflow. A workflow includes multiple jobs that run in parallel. All jobs
+  # that build and test source code should be part of this workflow
+  build_and_test:
+    jobs:
+      - bazel_build_test
+
+  # Lint workflow. As we want to lint in one job, this is a workflow with just one job.
+  lint:
     jobs:
-      - build
+      - lint
 
+# ---------------------------
+# General setup for CircleCI
+# ---------------------------
 general:
   branches:
     only:

.travis.yml

@@ -25,7 +25,6 @@ branches:
 
 jobs:
   include:
-    - env: "MODE=lint"
     - env: "MODE=aot"
     - env: "MODE=payload"
     - env: "MODE=prerender"
@@ -53,10 +52,10 @@ env:
 before_install:
   - source ./scripts/ci/travis-env.sh
   - source ./scripts/ci/install-yarn.sh
-  - if [[ "$TRAVIS_EVENT_TYPE" == "cron" ]]; then ./scripts/install-angular-snapshot.sh --only-save; fi
 
 install:
-  - yarn install --frozen-lockfile --non-interactive
+  - ./scripts/ci/travis-install.sh
+  - if [[ "$TRAVIS_EVENT_TYPE" == "cron" ]]; then ./scripts/install-angular-snapshot.sh --only-save; fi
 
 before_script:
   - mkdir -p $LOGS_DIR

BUILD.bazel

@@ -1,48 +1 @@
 package(default_visibility = ["//visibility:public"])
-
-# TODO(jelbourn): figure out if these workarounds are still needed
-
-# TODO: Replace with fine-grained node_modules using `npm_install` / `yarn_install`.
-# TODO: See https://github.com/bazelbuild/rules_nodejs/wiki#migrating-to-rules_nodejs-013
-alias(
-  name = "node_modules",
-  actual = "@npm//:node_modules",
-)
-
-# Glob pattern that matches all Angular testing bundles.
-ANGULAR_TESTING = [
-  "node_modules/@angular/*/bundles/*-testing.umd.js",
-  # The compiler and the dynamic platform-browser should be visible only in tests
-  "node_modules/@angular/compiler/bundles/*.umd.js",
-  "node_modules/@angular/platform-browser-dynamic/bundles/*.umd.js",
-]
-
-filegroup(
-  name = "angular_bundles",
-  srcs = glob(["node_modules/@angular/*/bundles/*.umd.js"], exclude = ANGULAR_TESTING),
-)
-
-filegroup(
-  name = "angular_test_bundles",
-  testonly = 1,
-  srcs = glob(ANGULAR_TESTING),
-)
-
-filegroup(
-  name = "tslib_bundle",
-  testonly = 1,
-  srcs = glob(["node_modules/tslib/tslib.js"]),
-)
-
-# Files necessary for unit tests that use zonejs
-filegroup(
-  name = "web_test_bootstrap_scripts",
-  # The order of these deps is important.
-  # Do not sort.
-  srcs = [
-    "//:node_modules/reflect-metadata/Reflect.js",
-    "//:node_modules/zone.js/dist/zone.js",
-    "//:node_modules/zone.js/dist/zone-testing.js",
-    "//:node_modules/zone.js/dist/task-tracking.js",
-  ],
-)

CHANGELOG.md

@@ -1,11 +1,30 @@
+<a name="7.0.0-rc.2"></a>
+# 7.0.0-rc.2 (2018-10-15)
+
+
+### Bug Fixes
+
+* **drag-drop:** enterPredicate being called with wrong drop container ([#13578](https://github.com/angular/material2/issues/13578)) ([60b4a58](https://github.com/angular/material2/commit/60b4a58))
+* **drag-drop:** rename cdkDrop to cdkDropList ([#13619](https://github.com/angular/material2/issues/13619)) ([160b688](https://github.com/angular/material2/commit/160b688))
+* **ng-add:** do not add theme file if existing theme is set up ([#13468](https://github.com/angular/material2/issues/13468)) ([d1e59a2](https://github.com/angular/material2/commit/d1e59a2))
+* **schematics:** template content exceeds max line length ([#13521](https://github.com/angular/material2/issues/13521)) ([b0a1daf](https://github.com/angular/material2/commit/b0a1daf))
+* **schematics:** tree folder icons do not have enough contrast ([#13462](https://github.com/angular/material2/issues/13462)) ([4a0eb2b](https://github.com/angular/material2/commit/4a0eb2b))
+* **virtual-scroll:** fix several small bugs ([#13597](https://github.com/angular/material2/issues/13597)) ([8cfaeea](https://github.com/angular/material2/commit/8cfaeea))
+
+### Features
+
+* **schematics:** prompt for name when generating component ([#13518](https://github.com/angular/material2/issues/13518)) ([9085de7](https://github.com/angular/material2/commit/9085de7))
+
+
+
 <a name="7.0.0-rc.1"></a>
 # 7.0.0-rc.1 (2018-10-09)
 
 
 ### Bug Fixes
 
 * **a11y:** not being able to escape disabled focus trap using arrow keys ([#13133](https://github.com/angular/material2/issues/13133)) ([3c55caa](https://github.com/angular/material2/commit/3c55caa)), closes [#13132](https://github.com/angular/material2/issues/13132)
-* **autocomplete:** closing parent overlay when pressing escpe ([#13413](https://github.com/angular/material2/issues/13413)) ([8dfd2ee](https://github.com/angular/material2/commit/8dfd2ee))
+* **autocomplete:** closing parent overlay when pressing escape (Esc) ([#13413](https://github.com/angular/material2/issues/13413)) ([8dfd2ee](https://github.com/angular/material2/commit/8dfd2ee))
 * **bottom-sheet:** dismiss bottom sheet on destroy ([#13120](https://github.com/angular/material2/issues/13120)) ([ffa4a06](https://github.com/angular/material2/commit/ffa4a06))
 * **button-toggle:** not setting proper border in vertical mode ([#13397](https://github.com/angular/material2/issues/13397)) ([d58db5d](https://github.com/angular/material2/commit/d58db5d))
 * **button-toggle:** remove extra focus indication added by firefox ([#13367](https://github.com/angular/material2/issues/13367)) ([3583913](https://github.com/angular/material2/commit/3583913))

README.md

@@ -26,13 +26,11 @@ and which pieces are blocked) and make a comment.
 Also see our [`help wanted`](https://github.com/angular/material2/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
 label.
 
-High level stuff planned for Q3 2018 (July - September):
-* Finishing cdk virtual-scroll
-* Finishing cdk drag-and-drop
-* New cdk/collections selection directives
-* Ongoing migration to bazel
-* Improve docs for cdk
-* Bug fixes and code health improvements, especially around accessibility.
+High level stuff planned for Q4 2018 (October - Dec):
+* Improve our own build and automation tooling
+* Fix bugs and reduce some technical debt inside Google
+* Working on long-term plans on how to collaborate with the MDC Web team
+* Designs for advanced table improvements (column resize, selection directives, inline-edit)
 
 
 #### Available features
@@ -51,11 +49,12 @@ High level stuff planned for Q3 2018 (July - September):
 | datepicker       |                                                        |   [Docs][25] |
 | dialog           |                                                        |   [Docs][22] |
 | divider          |                                                        |   [Docs][35] |
+| drag-drop        |                                          Landing in v7 |              |
 | expansion-panel  |                                                        |   [Docs][32] |
 | grid-list        |                                                        |   [Docs][9]  |
 | icon             |                                                        |   [Docs][10] |
 | input            |                                                        |   [Docs][5]  |
-| list             |                               Action list planned 2018 |   [Docs][8]  |
+| list             |                                                        |   [Docs][8]  |
 | menu             |                                                        |   [Docs][17] |
 | paginator        |                                                        |   [Docs][29] |
 | progress-bar     |                                                        |   [Docs][12] |
@@ -74,6 +73,7 @@ High level stuff planned for Q3 2018 (July - September):
 | toolbar          |                                                        |   [Docs][7]  |
 | tooltip          |                                                        |   [Docs][18] |
 | tree             |                                                        |   [Docs][36] |
+| virtual-scroll   |                                          Landing in v7 |              |
 | ---------------- | ------------------------------------------------------ | ------------ |
 | theming          |                                                        |  [Guide][20] |
 | typography       |                                                        |  [Guide][27] |
@@ -85,7 +85,6 @@ High level stuff planned for Q3 2018 (July - September):
 
 | Feature          | Status                              | Docs         | Issue          |
 |------------------|-------------------------------------|--------------|----------------|
-| virtual-repeat   |        In-progress, planned Q3 2018 |           -  |   [#823][0823] |
 | fab speed-dial   |            Not started, not planned |           -  |   [#860][0860] |
 | fab toolbar      |            Not started, not planned |           -  |              - |
 | bottom-nav       |            Not started, not planned |           -  |   [#408][0408] |

WORKSPACE

@@ -3,17 +3,17 @@ workspace(name = "angular_material")
 # Add NodeJS rules (explicitly used for sass bundle rules)
 http_archive(
   name = "build_bazel_rules_nodejs",
-  url = "https://github.com/bazelbuild/rules_nodejs/archive/0.14.2.zip",
-  strip_prefix = "rules_nodejs-0.14.2",
-  sha256 = "af481421c9e74f754a693a8bf5e9409484e38cf7be6f73f85879bdc7ed1b1d82",
+  url = "https://github.com/bazelbuild/rules_nodejs/archive/0.15.0.zip",
+  strip_prefix = "rules_nodejs-0.15.0",
+  sha256 = "5f5b6464ca20aa63d278caaf4736f0381eb838800d7375132057a48f09d0b837",
 )
 
 # Add TypeScript rules
 http_archive(
   name = "build_bazel_rules_typescript",
-  url = "https://github.com/bazelbuild/rules_typescript/archive/0.19.1.zip",
-  strip_prefix = "rules_typescript-0.19.1",
-  sha256 = "91a03623a03a463ffd62cea3f7a384c2f298af6438d5d153fc4d69aa5665b53d",
+  url = "https://github.com/bazelbuild/rules_typescript/archive/0.20.2.zip",
+  strip_prefix = "rules_typescript-0.20.2",
+  sha256 = "2879fbd7168ba5d17db22bc2f585c0d1d3a82dd5e6f8af118e8b2f74d290024e",
 )
 
 # Fetch transient dependencies of the TypeScript bazel rules.
@@ -31,6 +31,27 @@ http_archive(
 load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")
 sass_repositories()
 
+# Add Angular source and Bazel rules.
+http_archive(
+  name = "angular",
+  # Temporarily locked down to the angular/angular:bazel branch. This branch includes necessary
+  # commits that make building from source possible.
+  # TODO(devversion): switch to release archive if workaround can be removed
+  url = "https://github.com/angular/angular/archive/08e4489cf5a93a352954f1639da5e92112993753.zip",
+  strip_prefix = "angular-08e4489cf5a93a352954f1639da5e92112993753",
+  sha256 = "a59c85426048cc95f51937d0c26f4d1143b7bef730152b68ac4b79d1438e746b",
+)
+
+# Add RxJS as repository because those are needed in order to build Angular from source.
+# Also we cannot refer to the RxJS version from the node modules because self-managed
+# node modules are not guaranteed to be installed.
+http_archive(
+  name = "rxjs",
+  url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz",
+  strip_prefix = "package/src",
+  sha256 = "72b0b4e517f43358f554c125e40e39f67688cd2738a8998b4a266981ed32f403",
+)
+
 # NOTE: this rule installs nodejs, npm, and yarn, but does NOT install
 # your npm dependencies. You must still run the package manager.
 load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories", "yarn_install")
@@ -54,14 +75,25 @@ yarn_install(
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
 ts_setup_workspace()
 
-# Add Angular rules
-local_repository(
-  name = "angular",
-  path = "node_modules/@angular/bazel",
-)
+# Setup Angular bazel rules
+load("@angular//packages/bazel:package.bzl", "rules_angular_dependencies")
+rules_angular_dependencies()
 
-# Add rxjs
-local_repository(
-  name = "rxjs",
-  path = "node_modules/rxjs/src",
+# Setup Angular workspace for building (Bazel managed node modules)
+load("@angular//:index.bzl", "ng_setup_workspace")
+ng_setup_workspace()
+
+# Setup Go toolchain (required for Bazel web testing rules)
+load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
+go_rules_dependencies()
+go_register_toolchains()
+
+# Setup web testing. We need to setup a browser because the web testing rules for TypeScript need
+# a reference to a registered browser (ideally that's a hermetic version of a browser)
+load("@io_bazel_rules_webtesting//web:repositories.bzl", "browser_repositories",
+  "web_test_repositories")
+
+web_test_repositories()
+browser_repositories(
+  chromium = True,
 )