Skip to content

refactor(@angular/pwa): use stream pipeline operator with HTML rewriter #26689

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
clydin merged 1 commit into from
Dec 18, 2023
Merged

refactor(@angular/pwa): use stream pipeline operator with HTML rewriter #26689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 9 additions & 29 deletions packages/angular/pwa/pwa/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,13 @@ import {
} from '@angular-devkit/schematics';
import { readWorkspace, writeWorkspace } from '@schematics/angular/utility';
import { posix } from 'path';
import { Readable, Writable } from 'stream';
import { Readable } from 'stream';
import { pipeline } from 'stream/promises';
import { Schema as PwaOptions } from './schema';

function updateIndexFile(path: string): Rule {
return async (host: Tree) => {
const buffer = host.read(path);
if (buffer === null) {
throw new SchematicsException(`Could not read index file: ${path}`);
}
const originalContent = host.readText(path);

const { RewritingStream } = await loadEsmModule<typeof import('parse5-html-rewriting-stream')>(
'parse5-html-rewriting-stream',
Expand Down Expand Up @@ -57,30 +55,12 @@ function updateIndexFile(path: string): Rule {
rewriter.emitEndTag(endTag);
});

return new Promise<void>((resolve) => {
const input = new Readable({
encoding: 'utf8',
read(): void {
this.push(buffer);
this.push(null);
},
});

const chunks: Array<Buffer> = [];
const output = new Writable({
write(chunk: string | Buffer, encoding: BufferEncoding, callback: Function): void {
chunks.push(typeof chunk === 'string' ? Buffer.from(chunk, encoding) : chunk);
callback();
},
final(callback: (error?: Error) => void): void {
const full = Buffer.concat(chunks);
host.overwrite(path, full.toString());
callback();
resolve();
},
});

input.pipe(rewriter).pipe(output);
return pipeline(Readable.from(originalContent), rewriter, async function (source) {
const chunks = [];
for await (const chunk of source) {
chunks.push(Buffer.from(chunk));
}
host.overwrite(path, Buffer.concat(chunks));
});
};
}
Expand Down