build: update ng-dev setup to work with new ESM version

The `ng-dev` tool is now strict ESM. Config loading needs to be updated
to also emit `.mjs` with `ts-node` (this cannot happen dynamically as
ESM Node loading cannot be patched by ts-node at runtime).

Author: devversion

.ng-dev/caretaker.ts renamed to .ng-dev/caretaker.mts

@@ -0,0 +1,13 @@
+import { CommitMessageConfig } from '@angular/dev-infra-private/ng-dev';
+import packages from '../lib/packages.js';
+
+/**
+ * The configuration for `ng-dev commit-message` commands.
+ */
+export const commitMessage: CommitMessageConfig = {
+  maxLineLength: Infinity,
+  minBodyLength: 0,
+  minBodyLengthTypeExcludes: ['docs'],
+  // Note: When changing this logic, also change the `contributing.ejs` file.
+  scopes: [...Object.keys(packages.packages)],
+};

.ng-dev/commit-message.mts

@@ -0,0 +1,6 @@
+export { commitMessage } from './commit-message.mjs';
+export { format } from './format.mjs';
+export { github } from './github.mjs';
+export { pullRequest } from './pull-request.mjs';
+export { release } from './release.mjs';
+export { caretaker } from './caretaker.mjs';

.ng-dev/commit-message.ts

@@ -1,10 +1,10 @@
-import '../lib/bootstrap-local';
+import '../lib/bootstrap-local.js';
 
 import { ReleaseConfig } from '@angular/dev-infra-private/ng-dev';
-import { releasePackages } from '../lib/packages';
-import buildPackages from '../scripts/build';
+import packages from '../lib/packages.js';
+import buildPackages from '../scripts/build.js';
 
-const npmPackages = Object.entries(releasePackages).map(([name, { experimental }]) => ({
+const npmPackages = Object.entries(packages.releasePackages).map(([name, { experimental }]) => ({
   name,
   experimental,
 }));
@@ -13,7 +13,7 @@ const npmPackages = Object.entries(releasePackages).map(([name, { experimental }
 export const release: ReleaseConfig = {
   representativeNpmPackage: '@angular/cli',
   npmPackages,
-  buildPackages: () => buildPackages(),
+  buildPackages: () => buildPackages.default(),
   releaseNotes: {
     groupOrder: [
       '@angular/cli',

.ng-dev/config.mts

@@ -1,8 +1,10 @@
 {
   "extends": "../tsconfig.json",
   "compilerOptions": {
+    "module": "Node16",
+    "moduleResolution": "Node16",
     "noEmit": true
   },
-  "include": ["**/*.ts"],
+  "include": ["**/*.mts"],
   "exclude": []
 }

.ng-dev/config.ts

@@ -24,15 +24,16 @@
     "build:bazel": "node ./bin/devkit-admin build-bazel",
     "build-tsc": "tsc -p tsconfig.json",
     "lint": "eslint --cache --max-warnings=0 \"**/*.ts\"",
+    "ng-dev": "TS_NODE_PROJECT=$PWD/.ng-dev/tsconfig.json node_modules/@angular/dev-infra-private/ng-dev/bundles/cli.mjs",
     "templates": "node ./bin/devkit-admin templates",
     "validate": "node ./bin/devkit-admin validate",
     "postinstall": "yarn webdriver-update && yarn husky install",
     "//webdriver-update-README": "ChromeDriver version must match Puppeteer Chromium version, see https://github.com/GoogleChrome/puppeteer/releases http://chromedriver.chromium.org/downloads",
     "webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 101.0.4951.41",
     "public-api:check": "node goldens/public-api/manage.js test",
     "public-api:update": "node goldens/public-api/manage.js accept",
-    "ts-circular-deps:check": "ng-dev ts-circular-deps check --config ./packages/circular-deps-test.conf.js",
-    "ts-circular-deps:approve": "ng-dev ts-circular-deps approve --config ./packages/circular-deps-test.conf.js",
+    "ts-circular-deps:check": "yarn -s ng-dev ts-circular-deps check --config ./packages/circular-deps-test.conf.js",
+    "ts-circular-deps:approve": "yarn -s ng-dev ts-circular-deps approve --config ./packages/circular-deps-test.conf.js",
     "check-tooling-setup": "tsc --project .ng-dev/tsconfig.json"
   },
   "repository": {
@@ -69,7 +70,7 @@
     "@angular/compiler": "14.0.0",
     "@angular/compiler-cli": "14.0.0",
     "@angular/core": "14.0.0",
-    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#2fe60016e0ce6f1e53d4f5c5a1feb29d64ecd979",
+    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#132c156fd32ea70e3755df0fdb211ef5b6299936",
     "@angular/forms": "14.0.0",
     "@angular/localize": "14.0.0",
     "@angular/material": "14.0.0",
@@ -207,7 +208,7 @@
     "terser": "5.13.1",
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
-    "ts-node": "^10.0.0",
+    "ts-node": "^10.8.1",
     "tslib": "2.4.0",
     "typescript": "~4.7.2",
     "verdaccio": "5.10.2",

.ng-dev/format.ts renamed to .ng-dev/format.mts

@@ -10,25 +10,35 @@ import { logging } from '@angular-devkit/core';
 import * as fs from 'fs';
 import * as path from 'path';
 
-function _runTemplate(inputPath: string, outputPath: string, logger: logging.Logger) {
+async function _runTemplate(inputPath: string, outputPath: string, logger: logging.Logger) {
   inputPath = path.resolve(__dirname, inputPath);
   outputPath = path.resolve(__dirname, outputPath);
 
   logger.info(`Building ${path.relative(path.dirname(__dirname), outputPath)}...`);
 
+  // TODO(ESM): Consider making this an actual import statement.
+  const { COMMIT_TYPES, ScopeRequirement } = await new Function(
+    `return import('@angular/dev-infra-private/ng-dev');`,
+  )();
+
   const template = require(inputPath).default;
   const content = template({
     monorepo: require('../.monorepo.json'),
     packages: require('../lib/packages').packages,
     encode: (x: string) => global.encodeURIComponent(x),
     require: (x: string) => require(path.resolve(path.dirname(inputPath), x)),
+
+    // Pass-through `ng-dev` ESM commit message information for the `contributing.ejs`
+    // template. EJS templates using the devkit template cannot use ESM.
+    COMMIT_TYPES: COMMIT_TYPES,
+    ScopeRequirement: ScopeRequirement,
   });
   fs.writeFileSync(outputPath, content, 'utf-8');
 }
 
 export default async function (_options: {}, logger: logging.Logger): Promise<number> {
-  _runTemplate('./templates/readme', '../README.md', logger);
-  _runTemplate('./templates/contributing', '../CONTRIBUTING.md', logger);
+  await _runTemplate('./templates/readme', '../README.md', logger);
+  await _runTemplate('./templates/contributing', '../CONTRIBUTING.md', logger);
 
   return 0;
 }

.ng-dev/github.ts renamed to .ng-dev/github.mts

@@ -193,7 +193,6 @@ If the commit reverts a previous commit, it should begin with `revert: `, follow
 Must be one of the following:
 
 <%
-const { COMMIT_TYPES, ScopeRequirement } = require('../../.ng-dev/commit-message');
 for (const typeName of Object.keys(COMMIT_TYPES).sort()) {
   const type = COMMIT_TYPES[typeName];
 %>* **<%= typeName %>**: <%= type.description %><%
@@ -214,8 +213,7 @@ The scope should be the name of the npm package affected as perceived by the per
 The following is the list of supported scopes:
 
 <%
-const { commitMessage } = require('../../.ng-dev/commit-message');
-for (const scope of commitMessage.scopes) {
+for (const scope of Object.keys(packages)) {
 %>* **<%= scope %>**
 <% } %>