Merge branch 'angular:master' into align-attr-as-input-in-dialog-actions-#18479-2

Author: PooSham

.bazelignore

@@ -1,5 +1,8 @@
 node_modules
 
+integration/harness-e2e-cli/.angular
+integration/harness-e2e-cli/node_modules
+
 integration/ng-update-v13/.angular
 integration/ng-update-v13/node_modules
 

.github/CODEOWNERS

@@ -9,6 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: angular/dev-infra/github-actions/commit-message-based-labels@f0f363cb4ce5b5faf14e3d3bb7eeb7c7aee72da7
+      - uses: angular/dev-infra/github-actions/commit-message-based-labels@8298e121c51960857ef39abc16b743775ff6be68
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

.github/workflows/dev-infra.yml

@@ -9,6 +9,6 @@ jobs:
   lock_closed:
     runs-on: ubuntu-latest
     steps:
-      - uses: angular/dev-infra/github-actions/lock-closed@f0f363cb4ce5b5faf14e3d3bb7eeb7c7aee72da7
+      - uses: angular/dev-infra/github-actions/lock-closed@8298e121c51960857ef39abc16b743775ff6be68
         with:
           lock-bot-key: ${{ secrets.LOCK_BOT_PRIVATE_KEY }}

.github/workflows/lock-closed.yml

@@ -50,6 +50,3 @@ testem.log
 *.log
 .ng-dev.user*
 .husky/_
-
-# Variables that are inlined into the dev app index.html
-/src/dev-app/variables.json

.gitignore

@@ -90,7 +90,8 @@ export const release: ReleaseConfig = {
     },
   },
   publishRegistry: 'https://wombat-dressing-room.appspot.com',
-  npmPackages: releasePackages.map(pkg => `@angular/${pkg}`),
+  representativeNpmPackage: '@angular/cdk',
+  npmPackages: releasePackages.map(pkg => ({name: `@angular/${pkg}`})),
   buildPackages: async () => {
     // The `performNpmReleaseBuild` function is loaded at runtime as loading of the
     // script results in an invocation of Bazel for any `yarn ng-dev` command.

.ng-dev/release.ts

@@ -78,8 +78,18 @@ export HUSKY=0
 ```
 
 ### Injecting variables into the dev app
-Variables can be injected into the dev app by creating the `src/dev-app/variables.json` file.
-They'll be made available under the `window.DEV_APP_VARIABLES` object. The file isn't checked into
-Git and it can be used to pass private configuration like API keys. Variables currently being used:
+
+A set of environment variables is made available within the dev-app. Such variables
+will be injected into the dev-app, so that e.g. API keys can be used for development
+without requiring secrets to be committed. 
+
+The following variables are currently used in the dev-app:
 
 * `GOOGLE_MAPS_KEY` - Optional key for the Google Maps API.
+
+For example, you can store a personal development Google Maps API key for the
+dev-app within your `.bashrc` or `.zshrc` file.
+
+```bash
+export GOOGLE_MAPS_KEY=<api-key>
+```

CHANGELOG.md

@@ -16,10 +16,10 @@ http_archive(
 # Add sass rules
 http_archive(
     name = "io_bazel_rules_sass",
-    sha256 = "435efe759f1c8baffadc320ecc1830454da181fa790aa83bb4326f07e903a0f4",
-    strip_prefix = "rules_sass-1.41.0",
+    sha256 = "903858e0fb5eda0b36d37e1ce4cbcfbe03f65a5f153d894dc8a9894a4884e564",
+    strip_prefix = "rules_sass-1.49.0",
     urls = [
-        "https://github.com/bazelbuild/rules_sass/archive/1.41.0.zip",
+        "https://github.com/bazelbuild/rules_sass/archive/1.49.0.zip",
     ],
 )
 

DEV_ENVIRONMENT.md

@@ -28,14 +28,14 @@ The following sections will illustrate these benefits in more detail.
 ## Which kinds of tests can use harnesses?
 
 The Angular CDK's component harnesses are designed to work in multiple different test environments.
-Support currently includes Angular's Testbed environment in Karma unit tests and Protractor
+Support currently includes Angular's Testbed environment in Karma unit tests and Selenium WebDriver
 end-to-end (e2e) tests. You can also support additional environments by creating custom extensions
 of the CDK's `HarnessEnvironment` and `TestElement` classes.
 
 ## Getting started
 
 The foundation for all test harnesses lives in `@angular/cdk/testing`. Start by importing either
-`TestbedHarnessEnvironment` or `ProtractorHarnessEnvironment` based on whether you're writing a
+`TestbedHarnessEnvironment` or `SeleniumWebDriverHarnessEnvironment` based on whether you're writing a
 unit test or an e2e test. From the `HarnessEnvironment`, you can get a `HarnessLoader` instance,
 which you will use to load Angular Material component harnesses. For example, if we're writing unit
 tests for a `UserProfile` component, the code might look like this:
@@ -64,8 +64,8 @@ different paths.
 - `@angular/cdk/testing` contains symbols that are shared regardless of the environment your tests
   are in. 
 - `@angular/cdk/testing/testbed` contains symbols that are used only in Karma tests.
-- `@angular/cdk/testing/protractor` (not shown above) contains symbols that are used only in
-  Protractor tests.
+- `@angular/cdk/testing/selenium-webdriver` (not shown above) contains symbols that are used only in
+  Selenium WebDriver tests.
 
 ## Loading an Angular Material harness