Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-17 02:54:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular-devkit/build-angular): correctly generate serviceworker hashes for binary assets

Browse Source 
When using the esbuild-based build system with the service worker enabled, binary assets were
unintentionally being hashed with the assumption of UTF-8 encoding. The assets are now hashed
directly to ensure correct output hashes.
This commit is contained in:
Charles Lyding 2023-05-12 11:18:19 -04:00 committed by Charles
parent f412d7b5a4
commit d1f075e732
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/angular_devkit/build_angular/src/utils/service-worker.ts
View File

@ -63,15 +63,15 @@ class CliFilesystem implements Filesystem {
}
class ResultFilesystem implements Filesystem {
private readonly fileReaders = new Map<string, () => Promise<string>>();
private readonly fileReaders = new Map<string, () => Promise<Uint8Array>>();
constructor(outputFiles: OutputFile[], assetFiles: { source: string; destination: string }[]) {
for (const file of outputFiles) {
this.fileReaders.set('/' + file.path.replace(/\\/g, '/'), async () => file.text);
this.fileReaders.set('/' + file.path.replace(/\\/g, '/'), async () => file.contents);
}
for (const file of assetFiles) {
this.fileReaders.set('/' + file.destination.replace(/\\/g, '/'), () =>
fsPromises.readFile(file.source, 'utf-8'),
fsPromises.readFile(file.source),
);
}
}
@ -84,19 +84,25 @@ class ResultFilesystem implements Filesystem {
return [...this.fileReaders.keys()];
}
read(file: string): Promise<string> {
async read(file: string): Promise<string> {
const reader = this.fileReaders.get(file);
if (reader === undefined) {
throw new Error('File does not exist.');
}
const contents = await reader();
return Buffer.from(contents.buffer, contents.byteOffset, contents.byteLength).toString('utf-8');
}
async hash(file: string): Promise<string> {
const reader = this.fileReaders.get(file);
if (reader === undefined) {
throw new Error('File does not exist.');
}
return reader();
}
async hash(file: string): Promise<string> {
return crypto
.createHash('sha1')
.update(await this.read(file))
.update(await reader())
.digest('hex');
}