From f4fd488d4d5754c836f6bb7a67b013aedce73860 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Sat, 26 Feb 2022 21:59:18 +0100
Subject: [PATCH] build: update tooling to use new entry-point for dev-infra
 exports (#45206)

Previously, dev-infra only bundled the CLI with all its dependencies, while
we still also kept all bundled dependencies in the `dependencies`. This basically
meant that the CLI bundling did not provide any value at all.

We fixed this upstream and now dependencies are still bundled, but no longer
also declared as `dependencies`. We also stopped shipping deep JS files, only
shipping the bundles now.

As part of this deep file removal, we introduced a runtime entry-point for
exports/types. This one will also benefit from the bundling and it will be
predictable what symbols dev-infra consumer projects rely on (allowing us to
also have an API guard or something in the future).

PR Close #45206
---
 .ng-dev/caretaker.ts      |  4 ++--
 .ng-dev/commit-message.ts |  4 ++--
 .ng-dev/format.ts         | 10 ++++------
 .ng-dev/github.ts         |  2 +-
 .ng-dev/pullRequest.ts    |  4 ++--
 .ng-dev/release.ts        | 10 ++--------
 6 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/.ng-dev/caretaker.ts b/.ng-dev/caretaker.ts
index 1b2a720e7a3..3168aa74b64 100644
--- a/.ng-dev/caretaker.ts
+++ b/.ng-dev/caretaker.ts
@@ -1,4 +1,4 @@
-import {CaretakerConfig} from '@angular/dev-infra-private/ng-dev/caretaker/config';
+import {CaretakerConfig} from '@angular/dev-infra-private/ng-dev';
 
 /** The configuration for `ng-dev caretaker` commands. */
 export const caretaker: CaretakerConfig = {
@@ -14,7 +14,7 @@ export const caretaker: CaretakerConfig = {
     {
       name: 'Initial Triage Queue',
       query: `is:open no:milestone`,
-    }
+    },
   ],
   caretakerGroup: 'angular-caretaker',
 };
diff --git a/.ng-dev/commit-message.ts b/.ng-dev/commit-message.ts
index ae07929a0d2..ca00170a2e2 100644
--- a/.ng-dev/commit-message.ts
+++ b/.ng-dev/commit-message.ts
@@ -1,4 +1,4 @@
-import {CommitMessageConfig} from '@angular/dev-infra-private/ng-dev/commit-message/config';
+import {CommitMessageConfig} from '@angular/dev-infra-private/ng-dev';
 
 /**
  * The configuration for `ng-dev commit-message` commands.
@@ -37,5 +37,5 @@ export const commitMessage: CommitMessageConfig = {
     'upgrade',
     've',
     'zone.js',
-  ]
+  ],
 };
diff --git a/.ng-dev/format.ts b/.ng-dev/format.ts
index a729d4201f6..d50ac69de77 100644
--- a/.ng-dev/format.ts
+++ b/.ng-dev/format.ts
@@ -1,13 +1,11 @@
-import {FormatConfig} from '@angular/dev-infra-private/ng-dev/format/config';
+import {FormatConfig} from '@angular/dev-infra-private/ng-dev';
 
 /**
  * Configuration for the `ng-dev format` command.
  */
 export const format: FormatConfig = {
   'prettier': {
-    'matchers': [
-      '**/*.{yaml,yml}',
-    ]
+    'matchers': ['**/*.{yaml,yml}'],
   },
   'clang-format': {
     'matchers': [
@@ -31,7 +29,7 @@ export const format: FormatConfig = {
       '!packages/core/src/i18n/locale_en.ts',
       '!packages/common/locales/closure-locale.ts',
       '!packages/common/src/i18n/currencies.ts',
-    ]
+    ],
   },
-  'buildifier': true
+  'buildifier': true,
 };
diff --git a/.ng-dev/github.ts b/.ng-dev/github.ts
index 6af18a58938..f9a982722ec 100644
--- a/.ng-dev/github.ts
+++ b/.ng-dev/github.ts
@@ -1,4 +1,4 @@
-import {GithubConfig} from '@angular/dev-infra-private/ng-dev/utils/config';
+import {GithubConfig} from '@angular/dev-infra-private/ng-dev';
 
 /**
  * Github configuration for the `ng-dev` command. This repository is used as
diff --git a/.ng-dev/pullRequest.ts b/.ng-dev/pullRequest.ts
index dcf4afba9e1..3118942ffa0 100644
--- a/.ng-dev/pullRequest.ts
+++ b/.ng-dev/pullRequest.ts
@@ -1,4 +1,4 @@
-import {PullRequestConfig} from '@angular/dev-infra-private/ng-dev/pr/config';
+import {PullRequestConfig} from '@angular/dev-infra-private/ng-dev';
 
 /**
  * Configuration for the merge tool in `ng-dev`. This sets up the labels which
@@ -19,5 +19,5 @@ export const pullRequest: PullRequestConfig = {
   // `dev-infra` and `docs-infra` are not affecting the public NPM packages. Similarly,
   // the `bazel` package is not considered part of the public API so that features
   // can land in patch branches.
-  targetLabelExemptScopes: ['dev-infra', 'docs-infra', 'bazel']
+  targetLabelExemptScopes: ['dev-infra', 'docs-infra', 'bazel'],
 };
diff --git a/.ng-dev/release.ts b/.ng-dev/release.ts
index d05bed94d64..81c6836a2cb 100644
--- a/.ng-dev/release.ts
+++ b/.ng-dev/release.ts
@@ -1,4 +1,4 @@
-import {ReleaseConfig} from '@angular/dev-infra-private/ng-dev/release/config';
+import {ReleaseConfig} from '@angular/dev-infra-private/ng-dev';
 import {join} from 'path';
 
 /** Configuration for the `ng-dev release` command. */
@@ -30,13 +30,7 @@ export const release: ReleaseConfig = {
     return buildTargetPackages('dist/release-output', false, 'Release', /* isRelease */ true);
   },
   releaseNotes: {
-    hiddenScopes: [
-      'aio',
-      'dev-infra',
-      'docs-infra',
-      'zone.js',
-      'devtools',
-    ],
+    hiddenScopes: ['aio', 'dev-infra', 'docs-infra', 'zone.js', 'devtools'],
   },
   releasePrLabels: ['comp: build & ci', 'action: merge', 'PullApprove: disable'],
 };