build: update to latest version of the ng-dev shared package

.ng-dev/config.ts

@@ -1,6 +1,6 @@
 import {format} from './format';
 import {github} from './github';
-import {merge} from './merge';
+import {pullRequest} from './pull-request';
 import {commitMessage} from './commit-message';
 import {caretaker} from './caretaker';
 import {release} from './release';
@@ -9,7 +9,7 @@ module.exports = {
   commitMessage,
   format,
   github,
-  merge,
+  pullRequest,
   caretaker,
   release,
 };

.ng-dev/merge.ts → .ng-dev/pull-request.ts

@@ -1,10 +1,10 @@
-import {MergeConfig} from '@angular/dev-infra-private/ng-dev/pr/merge/config';
+import {PullRequestConfig} from '@angular/dev-infra-private/ng-dev/pr/config';
 
 /**
- * Configuration for the merge tool in `ng-dev`. This sets up the labels which
- * are respected by the merge script (e.g. the target labels).
+ * Configuration for the pull request commands in `ng-dev`. This includes the
+ * setup for the merge command.
  */
-export const merge: MergeConfig = {
+export const pullRequest: PullRequestConfig = {
   // By default, the merge script merges locally with `git cherry-pick` and autosquash.
   // This has the downside of pull requests showing up as `Closed` instead of `Merged`.
   // In the components repository, since we don't use fixup or squash commits, we can

WORKSPACE

@@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Add NodeJS rules
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "b32a4713b45095e9e1921a7fcb1adf584bc05959f3336e7351bcf77f015a2d7c",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.1.0/rules_nodejs-4.1.0.tar.gz"],
+    sha256 = "4e1a5633267a0ca1d550cced2919dd4148575c0bafd47608b88aea79c41b5ca3",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.2.0/rules_nodejs-4.2.0.tar.gz"],
 )
 
 # Add sass rules

package.json

@@ -74,7 +74,7 @@
     "@angular-devkit/schematics": "13.0.0-next.1",
     "@angular/bazel": "13.0.0-next.2",
     "@angular/compiler-cli": "13.0.0-next.2",
-    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#16ccdd6316d72bfdaa9f95148b6918d22c0a3471",
+    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#5744e8e7ca5b3dfa76ad73b7b0eff271a108a737",
     "@angular/localize": "13.0.0-next.2",
     "@angular/platform-browser-dynamic": "13.0.0-next.2",
     "@angular/platform-server": "13.0.0-next.2",
@@ -84,15 +84,15 @@
     "@babel/traverse": "^7.13.0",
     "@bazel/bazelisk": "1.10.1",
     "@bazel/buildifier": "4.2.1",
-    "@bazel/concatjs": "4.0.0",
-    "@bazel/esbuild": "4.1.0",
+    "@bazel/concatjs": "4.2.0",
+    "@bazel/esbuild": "4.2.0",
     "@bazel/ibazel": "0.15.10",
-    "@bazel/jasmine": "4.1.0",
-    "@bazel/protractor": "4.1.0",
-    "@bazel/rollup": "4.1.0",
-    "@bazel/runfiles": "4.1.0",
-    "@bazel/terser": "4.1.0",
-    "@bazel/typescript": "4.1.0",
+    "@bazel/jasmine": "4.2.0",
+    "@bazel/protractor": "4.2.0",
+    "@bazel/rollup": "4.2.0",
+    "@bazel/runfiles": "4.2.0",
+    "@bazel/terser": "4.2.0",
+    "@bazel/typescript": "4.2.0",
     "@firebase/app-types": "^0.6.1",
     "@material/animation": "13.0.0-canary.860ad06a1.0",
     "@material/auto-init": "13.0.0-canary.860ad06a1.0",
@@ -144,6 +144,7 @@
     "@octokit/rest": "18.3.5",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-commonjs": "^18.0.0",
+    "@rollup/plugin-node-resolve": "^13.0.5",
     "@schematics/angular": "13.0.0-next.1",
     "@types/browser-sync": "^2.26.1",
     "@types/fs-extra": "^9.0.5",