-
Notifications
You must be signed in to change notification settings - Fork 11.9k
feat(@angular/build): add opt-in manual rebuild mode to the dev-server #33330
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.
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
Open
fhackenberger
wants to merge
1
commit into
angular:main
Choose a base branch
from
fhackenberger:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
135 changes: 135 additions & 0 deletions
135
packages/angular/build/src/builders/dev-server/tests/options/manual-rebuild_spec.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| /** | ||
| * @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 | ||
| */ | ||
|
|
||
| import { TimeoutError } from 'rxjs'; | ||
| import { executeDevServer } from '../../index'; | ||
| import { describeServeBuilder } from '../jasmine-helpers'; | ||
| import { BASE_OPTIONS, DEV_SERVER_BUILDER_INFO } from '../setup'; | ||
|
|
||
| describeServeBuilder(executeDevServer, DEV_SERVER_BUILDER_INFO, (harness, setupTarget) => { | ||
| describe('Option: "manualRebuild"', () => { | ||
| beforeEach(() => { | ||
| setupTarget(harness); | ||
| }); | ||
|
|
||
| it('buffers file changes and does not rebuild until the trigger file is touched', async () => { | ||
| harness.useTarget('serve', { | ||
| ...BASE_OPTIONS, | ||
| watch: true, | ||
| manualRebuild: true, | ||
| }); | ||
|
|
||
| await harness | ||
| .executeWithCases([ | ||
| async ({ result }) => { | ||
| // Initial build should succeed | ||
| expect(result?.success).toBe(true); | ||
|
|
||
| // Modifying a source file should be buffered, not rebuilt | ||
| await harness.modifyFile( | ||
| 'src/main.ts', | ||
| (content) => content + 'console.log("abcd1234");', | ||
| ); | ||
| }, | ||
| () => { | ||
| fail('Expected automatic rebuild to be paused until the trigger file is touched.'); | ||
| }, | ||
| ]) | ||
| .catch((error) => { | ||
| // A timeout is expected because the rebuild is paused. | ||
| if (error instanceof TimeoutError) { | ||
| return; | ||
| } | ||
| throw error; | ||
| }); | ||
| }); | ||
|
|
||
| it('does not rebuild when the trigger file is touched but no changes are queued', async () => { | ||
| harness.useTarget('serve', { | ||
| ...BASE_OPTIONS, | ||
| watch: true, | ||
| manualRebuild: true, | ||
| }); | ||
|
|
||
| await harness | ||
| .executeWithCases([ | ||
| async ({ result }) => { | ||
| // Initial build should succeed | ||
| expect(result?.success).toBe(true); | ||
|
|
||
| // Touch the trigger file without modifying any source file. | ||
| // With an empty queue there is nothing to rebuild. | ||
| await harness.writeFile('.ng-rebuild', ''); | ||
| }, | ||
| () => { | ||
| fail('Expected no rebuild when the trigger file is touched with an empty queue.'); | ||
| }, | ||
| ]) | ||
| .catch((error) => { | ||
| // A timeout is expected because no rebuild should be emitted. | ||
| if (error instanceof TimeoutError) { | ||
| return; | ||
| } | ||
| throw error; | ||
| }); | ||
| }); | ||
|
|
||
| it('flushes buffered (coalesced) changes as a single rebuild when the trigger file is touched', async () => { | ||
| harness.useTarget('serve', { | ||
| ...BASE_OPTIONS, | ||
| watch: true, | ||
| manualRebuild: true, | ||
| }); | ||
|
|
||
| await harness.executeWithCases([ | ||
| async ({ result }) => { | ||
| // Initial build should succeed | ||
| expect(result?.success).toBe(true); | ||
|
|
||
| // Several edits to the same file should coalesce to a single net change... | ||
| await harness.modifyFile('src/main.ts', (content) => content + 'console.log("first");'); | ||
| await harness.modifyFile('src/main.ts', (content) => content + 'console.log("second");'); | ||
|
|
||
| // ...and only flush once the trigger file is modified. | ||
| await harness.writeFile('.ng-rebuild', ''); | ||
| }, | ||
| async ({ result }) => { | ||
| // Touching the trigger file should produce a single successful rebuild. | ||
| expect(result?.success).toBe(true); | ||
| }, | ||
| ]); | ||
| }); | ||
|
|
||
| it('supports a custom trigger file via "rebuildTrigger"', async () => { | ||
| harness.useTarget('serve', { | ||
| ...BASE_OPTIONS, | ||
| watch: true, | ||
| manualRebuild: true, | ||
| rebuildTrigger: '.rebuild-now', | ||
| }); | ||
|
|
||
| await harness.executeWithCases([ | ||
| async ({ result }) => { | ||
| // Initial build should succeed | ||
| expect(result?.success).toBe(true); | ||
|
|
||
| await harness.modifyFile( | ||
| 'src/main.ts', | ||
| (content) => content + 'console.log("abcd1234");', | ||
| ); | ||
|
|
||
| // Touch the custom trigger file to flush the buffered change. | ||
| await harness.writeFile('.rebuild-now', ''); | ||
| }, | ||
| async ({ result }) => { | ||
| expect(result?.success).toBe(true); | ||
| }, | ||
| ]); | ||
| }); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the trigger file is created for the first time (or recreated after being deleted), the file watcher might report it as an
addedevent rather than amodifiedevent. To ensure the manual rebuild is reliably triggered in all cases, we should check bothbatch.modifiedandbatch.addedfor the trigger file.