From 0c2ca9a040c0ce69ad363b8cb323af87c6b6e4e5 Mon Sep 17 00:00:00 2001
From: Alan Agius <alanagius@google.com>
Date: Wed, 14 Aug 2024 16:46:59 +0000
Subject: [PATCH] build: remove Bazel typings workaround

The workaround is no longer necessary since the bug has been resolved upstream.

(cherry picked from commit 474571f087d4f3c0e8c768da15683ee2316828cb)
---
 package.json                                    |  1 +
 packages/angular/cli/BUILD.bazel                |  1 +
 packages/angular/cli/src/typings-bazel.d.ts     | 14 --------------
 .../build_angular/src/babel-bazel.d.ts          | 17 -----------------
 tsconfig.json                                   |  1 -
 yarn.lock                                       |  1 +
 6 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 packages/angular/cli/src/typings-bazel.d.ts
 delete mode 100644 packages/angular_devkit/build_angular/src/babel-bazel.d.ts

diff --git a/package.json b/package.json
index e11e1e53da57..a157861a8d94 100644
--- a/package.json
+++ b/package.json
@@ -167,6 +167,7 @@
     "ng-packagr": "18.2.0-next.0",
     "npm": "^10.8.1",
     "npm-package-arg": "11.0.3",
+    "npm-pick-manifest": "9.1.0",
     "open": "10.1.0",
     "ora": "5.4.1",
     "pacote": "18.0.6",
diff --git a/packages/angular/cli/BUILD.bazel b/packages/angular/cli/BUILD.bazel
index 252cd6c77df3..bfdcaca10e98 100644
--- a/packages/angular/cli/BUILD.bazel
+++ b/packages/angular/cli/BUILD.bazel
@@ -69,6 +69,7 @@ ts_library(
         "@npm//jsonc-parser",
         "@npm//listr2",
         "@npm//npm-package-arg",
+        "@npm//npm-pick-manifest",
         "@npm//pacote",
         "@npm//semver",
         "@npm//yargs",
diff --git a/packages/angular/cli/src/typings-bazel.d.ts b/packages/angular/cli/src/typings-bazel.d.ts
deleted file mode 100644
index 80cc2d571570..000000000000
--- a/packages/angular/cli/src/typings-bazel.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.dev/license
- */
-
-/* eslint-disable import/no-extraneous-dependencies */
-// Workaround for https://github.com/bazelbuild/rules_nodejs/issues/1033
-// Alternative approach instead of https://github.com/angular/angular/pull/33226
-declare module '@yarnpkg/lockfile' {
-  export * from '@types/yarnpkg__lockfile';
-}
diff --git a/packages/angular_devkit/build_angular/src/babel-bazel.d.ts b/packages/angular_devkit/build_angular/src/babel-bazel.d.ts
deleted file mode 100644
index ba847b93d585..000000000000
--- a/packages/angular_devkit/build_angular/src/babel-bazel.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.dev/license
- */
-
-/* eslint-disable import/no-extraneous-dependencies */
-// Workaround for https://github.com/bazelbuild/rules_nodejs/issues/1033
-// Alternative approach instead of https://github.com/angular/angular/pull/33226
-declare module '@babel/core' {
-  export * from '@types/babel__core';
-}
-declare module '@babel/generator' {
-  export { default } from '@types/babel__generator';
-}
diff --git a/tsconfig.json b/tsconfig.json
index fe9e0e782ebd..7ff8885fe17c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -33,7 +33,6 @@
     }
   },
   "exclude": [
-    "packages/angular_devkit/build_angular/src/babel-bazel.d.ts",
     "dist/**/*",
     "dist-schema/**",
     "goldens/**/*",
diff --git a/yarn.lock b/yarn.lock
index 4c8a33aed457..6df9b82679f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -734,6 +734,7 @@ __metadata:
     ng-packagr: "npm:18.2.0-next.0"
     npm: "npm:^10.8.1"
     npm-package-arg: "npm:11.0.3"
+    npm-pick-manifest: "npm:9.1.0"
     open: "npm:10.1.0"
     ora: "npm:5.4.1"
     pacote: "npm:18.0.6"