Skip to content
Merged
Changes from all commits
Commits
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
18 changes: 12 additions & 6 deletions packages/angular_devkit/build_angular/src/utils/service-worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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),
);
}
}
Expand All @@ -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 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 crypto
.createHash('sha1')
.update(await this.read(file))
.update(await reader())
.digest('hex');
}

Expand Down