Patch port of various build changes (#23440)

* build: update shared dev-infra package

Updates the shared dev-infra package to take advanatge
of recent improvements for the release tool.

This also fixes the issue where the merge tooling requires
the `breaking change` label, while there also is the
`state: breaking change` label. The ng-dev tool no longer
accepts custom configuration of that label.

Also the merge configuration no longer accepts custom labels,
in order to achieve consistent labeling as specified in the
Angular versioning/branching/labeling spec.

* build: check .ng-dev tool configuration in CI

Checks the `.ng-dev` tool configuration in CI, compared
to doing it locally when the caretaker intends to perform
a merge and then realizes the config is broken.

* build: remove legacy release tooling (#23428)

Removes the legacy release tooling from the repository. We
had two successful releases with the new tool, and the tool
has been used for quite a while in the framework repository.

We will fix issues in the new release tool going forward.

* build: no longer install snapshot build of `@angular/bazel`

No longer uses a snapshot build for `@angular/bazel`. We
previously used a snapshot build in order to update to
v4 of `rules_nodejs`.

* build: add missing dependency for jsonc-parser

Sets up the jsonc-parser dependency in the BUILD bazel file.

Author: devversion

.circleci/config.yml

@@ -387,7 +387,7 @@ jobs:
       - *setup_bazel_binary
 
       - run: yarn build-and-check-release-output
-      - run: yarn check-tools
+      - run: yarn check-tooling-setup
 
       # TODO(devversion): replace this with bazel tests that run Madge. This is
       # cumbersome and doesn't guarantee no circular deps for other entry-points.

.ng-dev/merge.ts

@@ -1,28 +1,22 @@
-import {DevInfraMergeConfig} from '@angular/dev-infra-private/ng-dev/pr/merge/config';
-import {getDefaultTargetLabelConfiguration} from '@angular/dev-infra-private/ng-dev/pr/merge/defaults';
-import {github} from './github';
-import {release} from './release';
+import {MergeConfig} from '@angular/dev-infra-private/ng-dev/pr/merge/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).
  */
-export const merge: DevInfraMergeConfig['merge'] = async api => {
-  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`.
-    // In the components repository, since we don't use fixup or squash commits, we can
-    // use the Github API merge strategy. That way we ensure that PRs show up as `Merged`.
-    githubApiMerge: {
-      default: 'squash',
-      labels: [
-        {pattern: 'preserve commits', method: 'rebase'}
-      ]
-    },
-    claSignedLabel: 'cla: yes',
-    mergeReadyLabel: 'merge ready',
-    commitMessageFixupLabel: 'commit message fixup',
-    caretakerNoteLabel: 'caretaker note',
-    labels: await getDefaultTargetLabelConfiguration(api, github, release),
-  };
+export const merge: MergeConfig = {
+  // 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
+  // use the Github API merge strategy. That way we ensure that PRs show up as `Merged`.
+  githubApiMerge: {
+    default: 'squash',
+    labels: [
+      {pattern: 'preserve commits', method: 'rebase'}
+    ]
+  },
+  claSignedLabel: 'cla: yes',
+  mergeReadyLabel: 'merge ready',
+  commitMessageFixupLabel: 'commit message fixup',
+  caretakerNoteLabel: 'caretaker note',
 };

.ng-dev/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "strict": true,
+    "target": "es2015",
+    "module": "commonjs",
+    "noEmit": true,
+    "skipLibCheck": true,
+    "types": []
+  },
+}

package.json

@@ -27,8 +27,6 @@
     "deploy-dev-app": "node ./scripts/deploy-dev-app.js",
     "breaking-changes": "ts-node --project scripts/tsconfig.json scripts/breaking-changes.ts",
     "gulp": "gulp",
-    "~~stage-release": "ts-node --project tools/legacy-release/tsconfig.json tools/legacy-release/stage-release.ts",
-    "~~publish-release": "ts-node --project tools/legacy-release/tsconfig.json tools/legacy-release/publish-release.ts",
     "check-entry-point-setup": "node ./scripts/check-entry-point-setup.js",
     "check-rollup-globals": "ts-node --project scripts/tsconfig.json scripts/check-rollup-globals.ts",
     "changelog": "ts-node --project tools/release/tsconfig.json tools/release/changelog.ts",
@@ -49,18 +47,18 @@
     "integration-tests:size-test": "bazel test //integration/size-test/...",
     "check-mdc-tests": "ts-node --project scripts/tsconfig.json scripts/check-mdc-tests.ts",
     "check-mdc-exports": "ts-node --project scripts/tsconfig.json scripts/check-mdc-exports.ts",
-    "check-tools": "yarn tsc --project tools/tsconfig-ci.json",
+    "check-tooling-setup": "yarn tsc --project tools/tsconfig-ci.json && yarn tsc --project .ng-dev/tsconfig.json",
     "tsc": "node ./node_modules/typescript/bin/tsc",
     "prepare": "husky install"
   },
   "version": "12.2.2",
   "dependencies": {
-    "@angular/animations": "12.1.2",
-    "@angular/common": "12.1.2",
-    "@angular/compiler": "12.1.2",
-    "@angular/core": "12.1.2",
-    "@angular/forms": "12.1.2",
-    "@angular/platform-browser": "12.1.2",
+    "@angular/animations": "12.2.2",
+    "@angular/common": "12.2.2",
+    "@angular/compiler": "12.2.2",
+    "@angular/core": "12.2.2",
+    "@angular/forms": "12.2.2",
+    "@angular/platform-browser": "12.2.2",
     "@types/googlemaps": "^3.43.1",
     "@types/youtube": "^0.0.42",
     "core-js-bundle": "^3.8.2",
@@ -72,16 +70,16 @@
     "zone.js": "~0.11.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-optimizer": "0.1201.0",
-    "@angular-devkit/core": "12.1.2",
-    "@angular-devkit/schematics": "12.1.2",
-    "@angular/bazel": "https://github.com/angular/bazel-builds.git#2566cc859235399edc72749a957f1cdcba2dc121",
-    "@angular/compiler-cli": "12.1.2",
-    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#6254699cc7ccff62be948dc5edcdea87a936ff24",
-    "@angular/localize": "12.1.2",
-    "@angular/platform-browser-dynamic": "12.1.2",
-    "@angular/platform-server": "12.1.2",
-    "@angular/router": "12.1.2",
+    "@angular-devkit/build-optimizer": "0.1202.2",
+    "@angular-devkit/core": "12.2.2",
+    "@angular-devkit/schematics": "12.2.2",
+    "@angular/bazel": "12.2.2",
+    "@angular/compiler-cli": "12.2.2",
+    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#56655ed6ccf24b7f3ad6b9ccdd1ef2896c7fa9f4",
+    "@angular/localize": "12.2.2",
+    "@angular/platform-browser-dynamic": "12.2.2",
+    "@angular/platform-server": "12.2.2",
+    "@angular/router": "12.2.2",
     "@axe-core/webdriverjs": "^4.1.0",
     "@babel/core": "^7.13.10",
     "@babel/traverse": "^7.13.0",
@@ -146,7 +144,7 @@
     "@octokit/rest": "18.3.5",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-commonjs": "^18.0.0",
-    "@schematics/angular": "12.1.2",
+    "@schematics/angular": "12.2.2",
     "@types/browser-sync": "^2.26.1",
     "@types/fs-extra": "^9.0.5",
     "@types/glob": "^7.1.3",
@@ -185,6 +183,7 @@
     "inquirer": "^8.0.0",
     "jasmine": "^3.6.0",
     "jasmine-core": "^3.6.0",
+    "jsonc-parser": "^3.0.0",
     "kagekiri": "^1.4.1",
     "karma": "^4.4.1",
     "karma-browserstack-launcher": "^1.6.0",

scripts/build-packages-dist.ts

@@ -72,7 +72,7 @@ function buildReleasePackages(useIvy: boolean, distPath: string,
   const targets = exec(queryPackagesCmd, true).split(/\r?\n/);
   const packageNames = getPackageNamesOfTargets(targets);
   const bazelBinPath = exec(`${bazelCmd} info bazel-bin`, true);
-  const getOutputPath = pkgName => join(bazelBinPath, 'src', pkgName, 'npm_package');
+  const getOutputPath = (pkgName: string) => join(bazelBinPath, 'src', pkgName, 'npm_package');
 
   // Build with "--config=release" or `--config=snapshot-build` so that Bazel
   // runs the workspace stamping script. The stamping script ensures that the

scripts/caretaking/resync-caretaker-app-prs.ts

@@ -1,4 +1,4 @@
-import * as Octokit from '@octokit/rest';
+import {Octokit} from '@octokit/rest';
 import * as fetch from 'node-fetch';
 
 const apiBaseUrl = 'https://test-jperrott.firebaseio.com/pulls';

scripts/check-mdc-exports-config.ts

@@ -21,5 +21,5 @@ export const config = {
       // Irrelevant for the MDC implementation, because the slider doesn't dispatch any events.
       'MatSliderChange'
     ]
-  }
+  } as {[entryPointName: string]: string[]}
 };

scripts/tsconfig.json

@@ -5,7 +5,12 @@
     "lib": ["es2016"],
     "moduleResolution": "node",
     "types": ["node"],
-    "strictNullChecks": true,
+    "strict": true,
+    "noEmit": true,
+    "skipLibCheck": true,
     "downlevelIteration": true
-  }
+  },
+  // The `firebase-functions` folder has its own `package.json` and does
+  // not pass type-checking. This excludes it from being checked.
+  "exclude": ["caretaking/firebase-functions/**"]
 }

src/cdk/schematics/testing/BUILD.bazel

@@ -21,6 +21,7 @@ ts_library(
         "@npm//@types/jasmine",
         "@npm//@types/node",
         "@npm//fs-extra",
+        "@npm//jsonc-parser",
         "@npm//rxjs",
     ],
 )

src/cdk/schematics/testing/test-case-setup.ts

@@ -5,7 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {getSystemPath, JsonParseMode, parseJson, Path} from '@angular-devkit/core';
+
+import {parse} from 'jsonc-parser';
+import {getSystemPath,  Path} from '@angular-devkit/core';
 import {HostTree, Tree} from '@angular-devkit/schematics';
 import {SchematicTestRunner, UnitTestTree} from '@angular-devkit/schematics/testing';
 import {readFileSync} from 'fs-extra';
@@ -82,10 +84,10 @@ export async function createTestCaseSetup(migrationName: string, collectionPath:
   });
 
   const testAppTsconfigPath = 'projects/cdk-testing/tsconfig.app.json';
-  // Parse TypeScript configuration files with JSON5 as they could contain comments or
-  // unquoted properties.
-  const testAppTsconfig =
-      parseJson(appTree.readContent(testAppTsconfigPath), JsonParseMode.Json5) as any;
+  // Parse TypeScript configuration files with JSONC (like the CLI does) as the
+  // config files could contain comments or trailing commas
+  const testAppTsconfig = parse(appTree.readContent(testAppTsconfigPath), [],
+      {allowTrailingComma: true});
 
   // include all TypeScript files in the project. Otherwise all test input
   // files won't be part of the program and cannot be migrated.