Skip to content

Commit b217494

Browse files
alan-agius4clydin
authored andcommitted
refactor(@angular/pwa): use typed version of parse5-html-rewriting-stream
1 parent 409247e commit b217494

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

packages/angular/pwa/BUILD.bazel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ ts_library(
4242
"//packages/angular_devkit/schematics",
4343
"//packages/schematics/angular",
4444
"@npm//@types/node",
45-
"@npm//parse5-html-rewriting-stream",
45+
"@npm//@types/parse5-html-rewriting-stream",
4646
"@npm//rxjs",
4747
],
4848
)
@@ -60,6 +60,7 @@ ts_library(
6060
deps = [
6161
":pwa",
6262
"//packages/angular_devkit/schematics/testing",
63+
"@npm//parse5-html-rewriting-stream",
6364
],
6465
)
6566

packages/angular/pwa/pwa/index.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,24 @@ import { getWorkspace, updateWorkspace } from '@schematics/angular/utility/works
2222
import { Readable, Writable } from 'stream';
2323
import { Schema as PwaOptions } from './schema';
2424

25-
const RewritingStream = require('parse5-html-rewriting-stream');
26-
2725
function updateIndexFile(path: string): Rule {
28-
return (host: Tree) => {
26+
return async (host: Tree) => {
2927
const buffer = host.read(path);
3028
if (buffer === null) {
3129
throw new SchematicsException(`Could not read index file: ${path}`);
3230
}
3331

34-
const rewriter = new RewritingStream();
32+
const rewriter = new (await import('parse5-html-rewriting-stream'))();
3533
let needsNoScript = true;
36-
rewriter.on('startTag', (startTag: { tagName: string }) => {
34+
rewriter.on('startTag', startTag => {
3735
if (startTag.tagName === 'noscript') {
3836
needsNoScript = false;
3937
}
4038

4139
rewriter.emitStartTag(startTag);
4240
});
4341

44-
rewriter.on('endTag', (endTag: { tagName: string }) => {
42+
rewriter.on('endTag', endTag => {
4543
if (endTag.tagName === 'head') {
4644
rewriter.emitRaw(' <link rel="manifest" href="manifest.webmanifest">\n');
4745
rewriter.emitRaw(' <meta name="theme-color" content="#1976d2">\n');

0 commit comments

Comments
 (0)