fix: support deployment of an Angular app using legacy browser builder

CHANGELOG.md

@@ -5,3 +5,4 @@
 - Improved handling of 'fresh from Console' services during `init dataconnect`.
 - Add support for node22 in function deployments (#7252).
 - Update to Firebase Data Connect Emulator v1.2.0, which adds support for Postgres 16 and creates the Postgres database specified in dataconnect.yaml or .firebaserc if it does not already exist.
+- Support deployment of an Angular app using legacy browser builder (#7264)

src/frameworks/angular/utils.ts

@@ -11,7 +11,7 @@
 import { assertIsString } from "../../utils";
 import { coerce } from "semver";
 
 async function localesForTarget(
   dir: string,
   architectHost: WorkspaceNodeModulesArchitectHost,
   target: Target,
@@ -27,7 +27,7 @@
   let locales: string[] | undefined = undefined;
   let defaultLocale: string | undefined = undefined;
   if (targetOptions.localize) {
     const i18n: AngularI18nConfig | undefined = workspaceProject.extensions?.i18n as any;
     if (!i18n) throw new FirebaseError(`No i18n config on project.`);
     if (typeof i18n.sourceLocale === "string") {
       throw new FirebaseError(`All your i18n locales must have a baseHref of "" on Firebase, use an object for sourceLocale in your angular.json:
@@ -49,7 +49,7 @@
       for (const [locale, { baseHref }] of Object.entries(i18n.locales)) {
         if (baseHref !== "")
           throw new FirebaseError(
             `All your i18n locales must have a baseHref of \"\" on Firebase, errored on ${locale}.`,
           );
         locales.push(locale);
       }
@@ -96,7 +96,7 @@
   ];
 }
 
 export async function getAllTargets(purpose: BUILD_TARGET_PURPOSE, dir: string) {
   const validBuilders = getValidBuilders(purpose);
   const [{ NodeJsAsyncHost }, { workspaces }, { targetStringFromTarget }] = await Promise.all([
     relativeRequire(dir, "@angular-devkit/core/node"),
@@ -123,7 +123,7 @@
 }
 
 // TODO(jamesdaniels) memoize, dry up
 export async function getContext(dir: string, targetOrConfiguration?: string) {
   const [
     { NodeJsAsyncHost },
     { workspaces },
@@ -165,7 +165,7 @@
   }
 
   if (!project) {
     const angularJson = parse(await host.readFile(join(dir, "angular.json")));
     project = angularJson.defaultProject;
   }
 
@@ -355,6 +355,7 @@
       const { builder } = definition;
       if (target === deployTarget && builder === ExpectedBuilder.DEPLOY) continue;
       if (target === buildTarget && builder === ExpectedBuilder.APPLICATION) continue;
+      if (target === buildTarget && builder === ExpectedBuilder.LEGACY_BROWSER) continue;
       if (target === browserTarget && builder === ExpectedBuilder.BROWSER_ESBUILD) continue;
       if (target === browserTarget && builder === ExpectedBuilder.LEGACY_BROWSER) continue;
       if (target === prerenderTarget && builder === ExpectedBuilder.LEGACY_DEVKIT_PRERENDER)
@@ -420,7 +421,13 @@
   );
   const targetOptions = await architectHost.getOptionsForTarget(buildOrBrowserTarget);
   assertIsString(targetOptions?.outputPath);
-  const outputPath = join(targetOptions.outputPath, buildTarget ? "browser" : "");
+
+  const builderName = await architectHost.getBuilderNameForTarget(buildOrBrowserTarget);
+
+  const outputPath =
+    builderName === ExpectedBuilder.APPLICATION
+      ? join(targetOptions.outputPath, buildTarget ? "browser" : "")
+      : targetOptions.outputPath;
   return { locales, baseHref, outputPath, defaultLocale };
 }