Skip to content

Angular: Properly merge builder options and browserTarget options #32272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 29, 2025
Merged

Angular: Properly merge builder options and browserTarget options #32272

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
447210f
fix(angular): properly merge storybook and browserTarget options
Aug 14, 2025
a8d6fee
Merge remote-tracking branch 'origin/next' into kroeder/angular-confi…
Aug 14, 2025
14c3017
Merge remote-tracking branch 'origin/next' into kroeder/angular-confi…
Aug 21, 2025
a53ccef
test(angular): fix framework-cli test cases
Aug 21, 2025
e652fb6
Merge branch 'next' into kroeder/angular-config-merge-bug
kroeder Aug 21, 2025
3fda769
Merge branch 'next' into kroeder/angular-config-merge-bug
kroeder Aug 22, 2025
ea55415
Merge branch 'next' into kroeder/angular-config-merge-bug
kroeder Aug 27, 2025
3575e12
Merge branch 'next' into kroeder/angular-config-merge-bug
kroeder Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions code/frameworks/angular/src/server/framework-preset-angular-cli.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ describe('framework-preset-angular-cli', () => {
const browserTargetOptions = { a: 1, nested: { x: 10 } };
const storybookOptions = { b: 2, nested: { y: 20 } };

vi.mocked(mockBuilderContext.getTargetOptions).mockResolvedValue(browserTargetOptions);
vi.mocked(mockBuilderContext.getTargetOptions)
.mockResolvedValueOnce(browserTargetOptions)
.mockResolvedValueOnce(storybookOptions);

const options: PresetOptions = {
configType: 'DEVELOPMENT',
Expand Down Expand Up @@ -201,7 +203,7 @@ describe('framework-preset-angular-cli', () => {
const result = await getBuilderOptions(options, mockBuilderContext);

expect(mockedTargetFromTargetString).not.toHaveBeenCalled();
expect(mockBuilderContext.getTargetOptions).not.toHaveBeenCalled();
expect(mockBuilderContext.getTargetOptions).toHaveBeenCalledOnce();
Copy link
Member Author

@kroeder kroeder Aug 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi: since we now also use getTargetOptions for retrieving the builder options, it is always called once, and if theres a browserTarget, called twice

expect(result).toEqual({
tsConfig: '/test/tsconfig.json',
});
Expand Down