fix(@angular/build): use stable worker filenames during dev server #32940
+19
−4
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -286,8 +286,9 @@ export function createCompilerPlugin( | |||||
| ); | ||||||
|
|
||||||
| // Return bundled worker file entry name to be used in the built output | ||||||
| // Match both hashed (worker-ABCD1234.js) and non-hashed (worker-<name>.js) patterns | ||||||
| const workerCodeFile = workerResult.outputFiles.find((file) => | ||||||
| /^worker-.+\.[cm]?js$/.test(path.basename(file.path)), | ||||||
|
There was a problem hiding this comment. The regex
Suggested change
|
||||||
| ); | ||||||
| assert(workerCodeFile, 'Web Worker bundled code file should always be present.'); | ||||||
| const workerCodePath = path.relative( | ||||||
|
|
@@ -763,20 +764,32 @@ function bundleWebWorker( | |||||
| workerFile: string, | ||||||
| ) { | ||||||
| try { | ||||||
| // Use content hashing only when the parent build uses hashing in entry names. | ||||||
| // During dev server (ng serve), hashing is disabled and using it for workers | ||||||
| // causes the filename hash to change on every rebuild even when the worker | ||||||
| // content hasn't changed, breaking debugging sessions. | ||||||
| const parentEntryNames = build.initialOptions.entryNames ?? ''; | ||||||
| const useHashing = parentEntryNames.includes('[hash]'); | ||||||
|
|
||||||
| return build.esbuild.buildSync({ | ||||||
| ...build.initialOptions, | ||||||
| platform: 'browser', | ||||||
| write: false, | ||||||
| bundle: true, | ||||||
| metafile: true, | ||||||
| format: 'esm', | ||||||
| entryNames: useHashing ? 'worker-[hash]' : 'worker-[name]', | ||||||
| entryPoints: [workerFile], | ||||||
| sourcemap: pluginOptions.sourcemap, | ||||||
| // Zone.js is not used in Web workers so no need to disable | ||||||
| supported: undefined, | ||||||
| // Plugins are not supported in sync esbuild calls | ||||||
| plugins: undefined, | ||||||
| // Splitting is not needed for workers and can cause non-deterministic output | ||||||
| splitting: false, | ||||||
| // Footer may contain build-specific data (e.g., i18n hashes) that changes | ||||||
| // between rebuilds, causing unnecessary hash changes for workers | ||||||
| footer: undefined, | ||||||
| }); | ||||||
| } catch (error) { | ||||||
| if (error && typeof error === 'object' && 'errors' in error && 'warnings' in error) { | ||||||
|
|
||||||
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.
For improved robustness in this test, consider making the regular expression more specific. The
.+pattern is quite broad. Using[\w-]+instead would restrict matches to alphanumeric characters, underscores, and hyphens, which more accurately reflects the expected worker filenames (worker-[name].jsorworker-[hash].js).