Skip to content

Commit 81f1cdd

Browse files
committed
Adapted to breaking change in return type of Puppeteer.LaunchAsync
1 parent 16f38fe commit 81f1cdd

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

Codeuctivity.HtmlRenderer/Codeuctivity.HtmlRenderer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<ItemGroup>
4040
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
4141
<PackageReference Include="PuppeteerSharp" Version="8.0.0" />
42-
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.40.0.48530">
42+
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.46.0.54807">
4343
<PrivateAssets>all</PrivateAssets>
4444
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4545
</PackageReference>

Codeuctivity.HtmlRenderer/Renderer.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public Renderer(string? launchOptions = null)
2121
LaunchOptions = launchOptions;
2222
}
2323

24-
private Browser Browser { get; set; } = default!;
24+
private IBrowser Browser { get; set; } = default!;
2525
private int LastProgressValue { get; set; }
2626

2727
/// <summary>
@@ -112,6 +112,8 @@ public async Task ConvertHtmlToPdf(string sourceHtmlFilePath, string destination
112112
var absolutePath = Path.GetFullPath(sourceHtmlFilePath);
113113
await using var page = (await Browser.NewPageAsync().ConfigureAwait(false));
114114
await page.GoToAsync($"file://{absolutePath}").ConfigureAwait(false);
115+
// Wait for fonts to be loaded. Omitting this might result in no text rendered in PDF.
116+
await page.EvaluateExpressionHandleAsync("document.fonts.ready");
115117
await page.PdfAsync(destinationPdfFilePath).ConfigureAwait(false);
116118
}
117119

@@ -130,6 +132,8 @@ public async Task ConvertHtmlToPng(string sourceHtmlFilePath, string destination
130132
var absolutePath = Path.GetFullPath(sourceHtmlFilePath);
131133
await using var page = (await Browser.NewPageAsync().ConfigureAwait(false));
132134
await page.GoToAsync($"file://{absolutePath}").ConfigureAwait(false);
135+
// Wait for fonts to be loaded. Omitting this might result in no text the screenshot.
136+
await page.EvaluateExpressionHandleAsync("document.fonts.ready");
133137
await page.ScreenshotAsync(destinationPngFilePath, new ScreenshotOptions { FullPage = true }).ConfigureAwait(false);
134138
}
135139

Codeuctivity.HtmlRendererCliTests/Codeuctivity.HtmlRendererCliTests.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
11-
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.40.0.48530">
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
11+
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.46.0.54807">
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
<PrivateAssets>all</PrivateAssets>
1414
</PackageReference>
15-
<PackageReference Include="xunit" Version="2.4.1" />
15+
<PackageReference Include="xunit" Version="2.4.2" />
1616
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
<PrivateAssets>all</PrivateAssets>

Codeuctivity.HtmlRendererTests/Codeuctivity.HtmlRendererTests.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Codeuctivity.ImageSharpCompare" Version="2.0.61" />
19+
<PackageReference Include="Codeuctivity.ImageSharpCompare" Version="2.0.76" />
2020
<PackageReference Include="Codeuctivity.PdfjsSharp" Version="1.2.47" />
21-
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.40.0.48530">
21+
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.46.0.54807">
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
<PrivateAssets>all</PrivateAssets>
2424
</PackageReference>
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
26-
<PackageReference Include="xunit" Version="2.4.1" />
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
26+
<PackageReference Include="xunit" Version="2.4.2" />
2727
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)