Skip to content
Merged
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
- 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.
- Update to the latest version of the Crashlytics buildtools, v3.
- Support deployment of an Angular app using legacy browser builder (#7264)
20 changes: 12 additions & 8 deletions src/frameworks/angular/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@ export async function getContext(dir: string, targetOrConfiguration?: string) {
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)
Expand Down Expand Up @@ -412,15 +413,18 @@ export async function getBrowserConfig(sourceDir: string, configuration: string)
if (!buildOrBrowserTarget) {
throw new AssertionError({ message: "expected build or browser target defined" });
}
const { locales, defaultLocale } = await localesForTarget(
sourceDir,
architectHost,
buildOrBrowserTarget,
workspaceProject,
);
const targetOptions = await architectHost.getOptionsForTarget(buildOrBrowserTarget);
const [{ locales, defaultLocale }, targetOptions, builderName] = await Promise.all([
localesForTarget(sourceDir, architectHost, buildOrBrowserTarget, workspaceProject),
architectHost.getOptionsForTarget(buildOrBrowserTarget),
architectHost.getBuilderNameForTarget(buildOrBrowserTarget),
]);

assertIsString(targetOptions?.outputPath);
const outputPath = join(targetOptions.outputPath, buildTarget ? "browser" : "");

const outputPath = join(
targetOptions.outputPath,
buildTarget && builderName === ExpectedBuilder.APPLICATION ? "browser" : "",
);
return { locales, baseHref, outputPath, defaultLocale };
}

Expand Down