Merge branch 'master' into build/update-version-placeholders

angular · Nov 3, 2021 · 49f90ca · 49f90ca
2 parents ef3ec4f + a801603
commit 49f90ca
Show file tree

Hide file tree

Showing 90 changed files with 1,633 additions and 1,915 deletions.
diff --git a/.github/workflows/deploy-dev-app.yml b/.github/workflows/deploy-dev-app.yml
@@ -42,7 +42,7 @@ jobs:
           repoToken: '${{secrets.GITHUB_TOKEN}}'
           firebaseServiceAccount: '${{secrets.FIREBASE_PREVIEW_SERVICE_TOKEN}}'
           expires: 20d
-          projectId: angular-components-test
+          projectId: ng-comp-dev
           channelId: pr-${{steps.pr_info.outputs.number}}-${{steps.pr_info.outputs.sha}}
 
       - uses: marocchino/sticky-pull-request-comment@v2

diff --git a/.github/workflows/dev-infra.yml b/.github/workflows/dev-infra.yml
@@ -5,10 +5,10 @@ on:
     types: [opened, synchronize, reopened]
 
 jobs:
-  breaking-changes-label:
+  labels:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: angular/dev-infra/github-actions/breaking-changes-label@3f4646c252bc54b2ae93b4e322ebde9030de30b2
+      - uses: angular/dev-infra/github-actions/commit-message-based-labels@589f402fa601c4c8ab006bdfb337564b3ea32338
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
diff --git a/.prettierrc b/.prettierrc
@@ -5,5 +5,5 @@
   "quoteProps": "preserve",
   "bracketSpacing": false,
   "arrowParens": "avoid",
-  "embeddedLanguageFormatting": "off",
-}
+  "embeddedLanguageFormatting": "off"
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+<a name="13.0.0-rc.3"></a>
+# 13.0.0-rc.3 "fir-valise" (2021-11-02)
+### material-experimental
+| Commit | Type | Description |
+| -- | -- | -- |
+| [e7a77edf1e](https://github.com/angular/components/commit/e7a77edf1e3f0215c26715366a31bf9c3f5e6cfd) | fix | **mdc-tabs:** update theming api ([#23855](https://github.com/angular/components/pull/23855)) |
+## Special Thanks
+Andrew Seguin, Joey Perrott, Kristiyan Kostadinov, Paul Gschwendtner and Suguru Inatomi
+
+<!-- CHANGELOG SPLIT MARKER -->
+
 <a name="13.0.0-rc.2"></a>
 # 13.0.0-rc.2 "tweed-thimble" (2021-10-27)
 ### cdk

diff --git a/DEV_ENVIRONMENT.md b/DEV_ENVIRONMENT.md
@@ -1,5 +1,4 @@
 # Developer guide: getting your environment set up
-
 1. Make sure you have both `node` and `yarn` installed.
    We recommend using `nvm` to manage your node versions.
 2. angular/components uses Bazel which requires certain Bash and UNIX tools.
@@ -19,7 +18,6 @@ To bring up a local server, run `yarn dev-app`. This will automatically watch fo
 and rebuild. The browser should refresh automatically when changes are made.
 
 ### Running tests
-
 To run unit tests, run `yarn test <target>`. The `target` can be either a short name (e.g. `yarn test button`) or an explicit path `yarn test src/cdk/stepper`.
 To run the e2e tests, run `yarn e2e`.
 To run lint, run `yarn lint`.
@@ -67,7 +65,6 @@ at the file under `tools/public_api_guard/<target>.d.ts`.
 
 
 ### Disabling Git hooks
-
 If your development workflow does not intend the commit message validation to run automatically
 when commits are being created, or if you do not want to run the formatter upon `git commit`, you
 can disable any installed Git hooks by setting `HUSKY=0` in your shell environment. e.g.
@@ -78,4 +75,11 @@ export HUSKY=0
 
 # .bashrc
 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:
+
+* `GOOGLE_MAPS_KEY` - Optional key for the Google Maps API.
diff --git a/integration/linker/link-packages-test.mjs b/integration/linker/link-packages-test.mjs
@@ -76,17 +76,19 @@ function testPackage(pkg) {
         ast: true,
         filename: diskFilePath,
         filenameRelative: debugFileName,
-        plugins: [linkerPlugin]
+        plugins: [linkerPlugin],
       });
 
       // Naively check if there are any Angular declarations left that haven't been linked.
       traverse(ast, {
-        Identifier: (astPath) => {
+        Identifier: astPath => {
           if (astPath.node.name.startsWith('ɵɵngDeclare')) {
             throw astPath.buildCodeFrameError(
-                'Found Angular declaration that has not been linked.', Error);
+              'Found Angular declaration that has not been linked.',
+              Error,
+            );
           }
-        }
+        },
       });
 
       passedFiles.push(debugFileName);
@@ -95,5 +97,5 @@ function testPackage(pkg) {
     }
   }
 
-  return {passedFiles, failures}
+  return {passedFiles, failures};
 }
diff --git a/integration/npm-packages-from-runfiles.mjs b/integration/npm-packages-from-runfiles.mjs
@@ -20,12 +20,14 @@ export function getNpmPackagesFromRunfiles() {
   const workspacePath = 'angular_material/src';
   if (!runfilesManifestPath) {
     const packageRunfilesDir = path.join(process.env.RUNFILES, workspacePath);
-    return fs.readdirSync(packageRunfilesDir)
+    return fs
+      .readdirSync(packageRunfilesDir)
       .map(name => ({name, pkgPath: path.join(packageRunfilesDir, name, 'npm_package/')}))
       .filter(({pkgPath}) => fs.existsSync(pkgPath));
   }
   const workspaceManifestPathRegex = new RegExp(`^${workspacePath}/[\\w-]+/npm_package$`);
-  return fs.readFileSync(runfilesManifestPath, 'utf8')
+  return fs
+    .readFileSync(runfilesManifestPath, 'utf8')
     .split('\n')
     .map(mapping => mapping.split(' '))
     .filter(([runfilePath]) => runfilePath.match(workspaceManifestPathRegex))

diff --git a/integration/ts-compat/helpers.mjs b/integration/ts-compat/helpers.mjs
@@ -1,8 +1,8 @@
-import {join}  from 'path';
-import {unlinkSync}  from 'fs';
+import {join} from 'path';
+import {unlinkSync} from 'fs';
 import shelljs from 'shelljs';
-import {fork}  from 'child_process';
-import {getNpmPackagesFromRunfiles}  from '../npm-packages-from-runfiles.mjs';
+import {fork} from 'child_process';
+import {getNpmPackagesFromRunfiles} from '../npm-packages-from-runfiles.mjs';
 import {runfiles} from '@bazel/runfiles';
 
 // Exit if any command fails.
@@ -14,7 +14,8 @@ const npmPackages = getNpmPackagesFromRunfiles();
 const nodeModulesDir = runfiles.resolve('npm/node_modules');
 // Path to the generated file that imports all entry-points.
 const testFilePath = runfiles.resolveWorkspaceRelative(
-  'integration/ts-compat/import-all-entry-points.ts');
+  'integration/ts-compat/import-all-entry-points.ts',
+);
 
 /**
  * Runs the TypeScript compatibility test with the specified tsc binary. The
@@ -40,17 +41,19 @@ export async function runTypeScriptCompatibilityTest(tscBinPath) {
       // Disables automatic type resolution. In non-sandbox environments, the node modules
       // are accessible and types could end up as part of the program.
       '--types',
-      '--lib', 'es2015,dom',
+      '--lib',
+      'es2015,dom',
       // Ensures that `node_modules` can be resolved. By default, in sandbox environments the
       // node modules cannot be resolved because they are wrapped in the `npm/node_modules` folder
-      '--baseUrl', nodeModulesDir,
-      testFilePath
+      '--baseUrl',
+      nodeModulesDir,
+      testFilePath,
     ];
     // Run `tsc` to compile the project. The stdout/stderr output is inherited, so that
     // warnings and errors are printed to the console.
     const tscProcess = fork(tscBinPath, tscArgs, {stdio: 'inherit'});
 
-    tscProcess.on('exit', (exitCode) => {
+    tscProcess.on('exit', exitCode => {
       // Remove symlinks to keep a clean repository state.
       for (const {name} of npmPackages) {
         console.info(`Removing link for "@angular/${name}"..`);
@@ -60,5 +63,4 @@ export async function runTypeScriptCompatibilityTest(tscBinPath) {
       exitCode === 0 ? resolve() : reject();
     });
   });
-};
-
+}
diff --git a/package.json b/package.json
@@ -50,33 +50,33 @@
   },
   "version": "13.1.0-next.0",
   "dependencies": {
-    "@angular/animations": "13.0.0-next.15",
-    "@angular/common": "13.0.0-next.15",
-    "@angular/compiler": "13.0.0-next.15",
-    "@angular/core": "13.0.0-next.15",
-    "@angular/forms": "13.0.0-next.15",
-    "@angular/platform-browser": "13.0.0-next.15",
+    "@angular/animations": "13.0.0-rc.3",
+    "@angular/common": "13.0.0-rc.3",
+    "@angular/compiler": "13.0.0-rc.3",
+    "@angular/core": "13.0.0-rc.3",
+    "@angular/forms": "13.0.0-rc.3",
+    "@angular/platform-browser": "13.0.0-rc.3",
     "@types/google.maps": "^3.45.6",
     "@types/youtube": "^0.0.42",
     "core-js-bundle": "^3.8.2",
-    "material-components-web": "14.0.0-canary.c78ff0429.0",
-    "rxjs": "^6.5.3",
+    "material-components-web": "14.0.0-canary.1af7c1c4a.0",
+    "rxjs": "^6.6.7",
     "rxjs-tslint-rules": "^4.33.1",
     "tslib": "^2.3.0",
     "zone.js": "~0.11.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "13.0.0-next.7",
-    "@angular-devkit/core": "13.0.0-next.7",
-    "@angular-devkit/schematics": "13.0.0-next.7",
-    "@angular/bazel": "13.0.0-next.15",
-    "@angular/cli": "13.0.0-next.7",
-    "@angular/compiler-cli": "13.0.0-next.15",
+    "@angular-devkit/build-angular": "13.0.0-rc.3",
+    "@angular-devkit/core": "13.0.0-rc.3",
+    "@angular-devkit/schematics": "13.0.0-rc.3",
+    "@angular/bazel": "13.0.0-rc.3",
+    "@angular/cli": "13.0.0-rc.3",
+    "@angular/compiler-cli": "13.0.0-rc.3",
     "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#26d2e72c0311590097861c87319ba8acbd898f63",
-    "@angular/localize": "13.0.0-next.15",
-    "@angular/platform-browser-dynamic": "13.0.0-next.15",
-    "@angular/platform-server": "13.0.0-next.15",
-    "@angular/router": "13.0.0-next.15",
+    "@angular/localize": "13.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "13.0.0-rc.3",
+    "@angular/platform-server": "13.0.0-rc.3",
+    "@angular/router": "13.0.0-rc.3",
     "@axe-core/webdriverjs": "^4.1.0",
     "@babel/core": "^7.13.10",
     "@babel/traverse": "^7.13.0",
@@ -92,58 +92,57 @@
     "@bazel/terser": "4.3.0",
     "@bazel/typescript": "4.3.0",
     "@firebase/app-types": "^0.6.1",
-    "@material/animation": "14.0.0-canary.c78ff0429.0",
-    "@material/auto-init": "14.0.0-canary.c78ff0429.0",
-    "@material/banner": "14.0.0-canary.c78ff0429.0",
-    "@material/base": "14.0.0-canary.c78ff0429.0",
-    "@material/button": "14.0.0-canary.c78ff0429.0",
-    "@material/card": "14.0.0-canary.c78ff0429.0",
-    "@material/checkbox": "14.0.0-canary.c78ff0429.0",
-    "@material/chips": "14.0.0-canary.c78ff0429.0",
-    "@material/circular-progress": "14.0.0-canary.c78ff0429.0",
-    "@material/data-table": "14.0.0-canary.c78ff0429.0",
-    "@material/density": "14.0.0-canary.c78ff0429.0",
-    "@material/dialog": "14.0.0-canary.c78ff0429.0",
-    "@material/dom": "14.0.0-canary.c78ff0429.0",
-    "@material/drawer": "14.0.0-canary.c78ff0429.0",
-    "@material/elevation": "14.0.0-canary.c78ff0429.0",
-    "@material/fab": "14.0.0-canary.c78ff0429.0",
-    "@material/feature-targeting": "14.0.0-canary.c78ff0429.0",
-    "@material/floating-label": "14.0.0-canary.c78ff0429.0",
-    "@material/form-field": "14.0.0-canary.c78ff0429.0",
-    "@material/icon-button": "14.0.0-canary.c78ff0429.0",
-    "@material/image-list": "14.0.0-canary.c78ff0429.0",
-    "@material/layout-grid": "14.0.0-canary.c78ff0429.0",
-    "@material/line-ripple": "14.0.0-canary.c78ff0429.0",
-    "@material/linear-progress": "14.0.0-canary.c78ff0429.0",
-    "@material/list": "14.0.0-canary.c78ff0429.0",
-    "@material/menu": "14.0.0-canary.c78ff0429.0",
-    "@material/menu-surface": "14.0.0-canary.c78ff0429.0",
-    "@material/notched-outline": "14.0.0-canary.c78ff0429.0",
-    "@material/radio": "14.0.0-canary.c78ff0429.0",
-    "@material/ripple": "14.0.0-canary.c78ff0429.0",
-    "@material/rtl": "14.0.0-canary.c78ff0429.0",
-    "@material/segmented-button": "14.0.0-canary.c78ff0429.0",
-    "@material/select": "14.0.0-canary.c78ff0429.0",
-    "@material/shape": "14.0.0-canary.c78ff0429.0",
-    "@material/slider": "14.0.0-canary.c78ff0429.0",
-    "@material/snackbar": "14.0.0-canary.c78ff0429.0",
-    "@material/switch": "14.0.0-canary.c78ff0429.0",
-    "@material/tab": "14.0.0-canary.c78ff0429.0",
-    "@material/tab-bar": "14.0.0-canary.c78ff0429.0",
-    "@material/tab-indicator": "14.0.0-canary.c78ff0429.0",
-    "@material/tab-scroller": "14.0.0-canary.c78ff0429.0",
-    "@material/textfield": "14.0.0-canary.c78ff0429.0",
-    "@material/theme": "14.0.0-canary.c78ff0429.0",
-    "@material/tooltip": "14.0.0-canary.c78ff0429.0",
-    "@material/top-app-bar": "14.0.0-canary.c78ff0429.0",
-    "@material/touch-target": "14.0.0-canary.c78ff0429.0",
-    "@material/typography": "14.0.0-canary.c78ff0429.0",
+    "@material/animation": "14.0.0-canary.1af7c1c4a.0",
+    "@material/auto-init": "14.0.0-canary.1af7c1c4a.0",
+    "@material/banner": "14.0.0-canary.1af7c1c4a.0",
+    "@material/base": "14.0.0-canary.1af7c1c4a.0",
+    "@material/button": "14.0.0-canary.1af7c1c4a.0",
+    "@material/card": "14.0.0-canary.1af7c1c4a.0",
+    "@material/checkbox": "14.0.0-canary.1af7c1c4a.0",
+    "@material/chips": "14.0.0-canary.1af7c1c4a.0",
+    "@material/circular-progress": "14.0.0-canary.1af7c1c4a.0",
+    "@material/data-table": "14.0.0-canary.1af7c1c4a.0",
+    "@material/density": "14.0.0-canary.1af7c1c4a.0",
+    "@material/dialog": "14.0.0-canary.1af7c1c4a.0",
+    "@material/dom": "14.0.0-canary.1af7c1c4a.0",
+    "@material/drawer": "14.0.0-canary.1af7c1c4a.0",
+    "@material/elevation": "14.0.0-canary.1af7c1c4a.0",
+    "@material/fab": "14.0.0-canary.1af7c1c4a.0",
+    "@material/feature-targeting": "14.0.0-canary.1af7c1c4a.0",
+    "@material/floating-label": "14.0.0-canary.1af7c1c4a.0",
+    "@material/form-field": "14.0.0-canary.1af7c1c4a.0",
+    "@material/icon-button": "14.0.0-canary.1af7c1c4a.0",
+    "@material/image-list": "14.0.0-canary.1af7c1c4a.0",
+    "@material/layout-grid": "14.0.0-canary.1af7c1c4a.0",
+    "@material/line-ripple": "14.0.0-canary.1af7c1c4a.0",
+    "@material/linear-progress": "14.0.0-canary.1af7c1c4a.0",
+    "@material/list": "14.0.0-canary.1af7c1c4a.0",
+    "@material/menu": "14.0.0-canary.1af7c1c4a.0",
+    "@material/menu-surface": "14.0.0-canary.1af7c1c4a.0",
+    "@material/notched-outline": "14.0.0-canary.1af7c1c4a.0",
+    "@material/radio": "14.0.0-canary.1af7c1c4a.0",
+    "@material/ripple": "14.0.0-canary.1af7c1c4a.0",
+    "@material/rtl": "14.0.0-canary.1af7c1c4a.0",
+    "@material/segmented-button": "14.0.0-canary.1af7c1c4a.0",
+    "@material/select": "14.0.0-canary.1af7c1c4a.0",
+    "@material/shape": "14.0.0-canary.1af7c1c4a.0",
+    "@material/slider": "14.0.0-canary.1af7c1c4a.0",
+    "@material/snackbar": "14.0.0-canary.1af7c1c4a.0",
+    "@material/switch": "14.0.0-canary.1af7c1c4a.0",
+    "@material/tab": "14.0.0-canary.1af7c1c4a.0",
+    "@material/tab-bar": "14.0.0-canary.1af7c1c4a.0",
+    "@material/tab-indicator": "14.0.0-canary.1af7c1c4a.0",
+    "@material/tab-scroller": "14.0.0-canary.1af7c1c4a.0",
+    "@material/textfield": "14.0.0-canary.1af7c1c4a.0",
+    "@material/theme": "14.0.0-canary.1af7c1c4a.0",
+    "@material/tooltip": "14.0.0-canary.1af7c1c4a.0",
+    "@material/top-app-bar": "14.0.0-canary.1af7c1c4a.0",
+    "@material/touch-target": "14.0.0-canary.1af7c1c4a.0",
+    "@material/typography": "14.0.0-canary.1af7c1c4a.0",
     "@octokit/rest": "18.3.5",
-    "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^20.0.0",
+    "@rollup/plugin-commonjs": "^21.0.0",
     "@rollup/plugin-node-resolve": "^13.0.5",
-    "@schematics/angular": "13.0.0-next.7",
+    "@schematics/angular": "13.0.0-rc.3",
     "@types/babel__core": "^7.1.16",
     "@types/browser-sync": "^2.26.1",
     "@types/fs-extra": "^9.0.5",
@@ -152,7 +151,6 @@
     "@types/jasmine": "^3.6.0",
     "@types/luxon": "^1.27.0",
     "@types/marked": "^2.0.0",
-    "@types/merge2": "^0.3.30",
     "@types/minimist": "^1.2.0",
     "@types/node": "^14.14.22",
     "@types/node-fetch": "^2.5.5",
@@ -168,11 +166,9 @@
     "browser-sync": "2.26.13",
     "chalk": "^4.1.0",
     "codelyzer": "^6.0.2",
-    "conventional-changelog": "^3.0.5",
     "date-fns": "^2.23.0",
     "dgeni": "^0.4.11",
     "dgeni-packages": "^0.28.4",
-    "diff": "^5.0.0",
     "esbuild": "^0.13.3",
     "firebase-tools": "^9.2.1",
     "fs-extra": "^9.0.1",
@@ -196,7 +192,6 @@
     "luxon": "^2.0.0",
     "madge": "^4.0.0",
     "marked": "^2.0.0",
-    "merge2": "^1.2.3",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.0",
     "moment": "^2.18.1",

diff --git a/packages.bzl b/packages.bzl
@@ -2,7 +2,7 @@
 # all in-sync. This map is passed to each ng_package rule to stamp out the appropriate
 # version for the placeholders.
 ANGULAR_PACKAGE_VERSION = "^13.0.0 || ^14.0.0-0"
-MDC_PACKAGE_VERSION = "14.0.0-canary.c78ff0429.0"
+MDC_PACKAGE_VERSION = "14.0.0-canary.1af7c1c4a.0"
 TSLIB_PACKAGE_VERSION = "^2.3.0"
 RXJS_PACKAGE_VERSION = "^6.5.3 || ^7.4.0"