build: remove ng-dev typescript configuration workaround

.ng-dev-config.ts

@@ -1,6 +1,6 @@
 import {MergeConfig} from '@angular/dev-infra-private/pr/merge/config';
+import {determineMergeBranches} from '@angular/dev-infra-private/pr/merge/determine-merge-branches';
 import {GithubConfig} from '@angular/dev-infra-private/utils/config';
-import {determineMergeBranches} from './scripts/determine-merge-branches';
 
 /**
  * Github configuration for the ng-dev command. This repository is
@@ -16,7 +16,11 @@ const github: GithubConfig = {
  * are respected by the merge script (e.g. the target labels).
  */
 const merge = (): MergeConfig => {
-  const {minor, patch} = determineMergeBranches(github.owner, github.name);
+  const currentVersion = require('./package.json').version;
+  // We use the `@angular/cdk` as source of truth for the latest published version in NPM.
+  // Any package from the monorepo could technically work and result in the same version.
+  const {minor, patch} = determineMergeBranches(currentVersion, '@angular/cdk');
+
   return {
     // 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`.

package.json

@@ -43,7 +43,6 @@
     "resync-caretaker-app": "ts-node --project scripts/tsconfig.json scripts/caretaking/resync-caretaker-app-prs.ts",
     "ts-circular-deps:check": "yarn -s ts-circular-deps check --config ./src/circular-deps-test.conf.js",
     "ts-circular-deps:approve": "yarn -s ts-circular-deps approve --config ./src/circular-deps-test.conf.js",
-    "ng-dev": "ts-node -O {\\\"module\\\":\\\"commonjs\\\"} ./node_modules/@angular/dev-infra-private/cli.js",
     "merge": "ng-dev pr merge",
     "approve-api": "node ./scripts/approve-api-golden.js"
   },
@@ -71,7 +70,7 @@
     "@angular-devkit/schematics": "^10.0.0-next.6",
     "@angular/bazel": "^10.0.0-rc.0",
     "@angular/compiler-cli": "^10.0.0-rc.0",
-    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#7f3e1227d199a55943152aac6119d40e1bbb028f",
+    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#2ac83eb462cb25c46a761d34dec030e360055016",
     "@angular/platform-browser-dynamic": "^10.0.0-rc.0",
     "@angular/platform-server": "^10.0.0-rc.0",
     "@angular/router": "^10.0.0-rc.0",

yarn.lock

@@ -92,9 +92,9 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#7f3e1227d199a55943152aac6119d40e1bbb028f":
+"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#2ac83eb462cb25c46a761d34dec030e360055016":
   version "0.0.0"
-  resolved "https://github.com/angular/dev-infra-private-builds.git#7f3e1227d199a55943152aac6119d40e1bbb028f"
+  resolved "https://github.com/angular/dev-infra-private-builds.git#2ac83eb462cb25c46a761d34dec030e360055016"
   dependencies:
     "@octokit/graphql" "^4.3.1"
     chalk "^2.3.1"
@@ -103,6 +103,7 @@
     inquirer "^7.1.0"
     minimatch "^3.0.4"
     multimatch "^4.0.0"
+    semver "^6.3.0"
     shelljs "^0.8.3"
     typed-graphqlify "^2.3.0"
     yaml "^1.7.2"