Skip to content

Commit 296180a

Browse files
ysmoradiysmoradi
authored
feat(infra): preload assets across websites #11334 (#11335)
1 parent eb3a953 commit 296180a

File tree

9 files changed

+66
-47
lines changed

9 files changed

+66
-47
lines changed

‎src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ self.serverHandledUrls = [
2020
/\/api.fda.gov/
2121
];
2222

23+
self.enableCacheControl = false;
24+
2325
self.prerenderMode = 'always';
2426
self.enableIntegrityCheck = false;
2527

‎src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,6 @@ self.prerenderMode = 'none'; // Demo: https://adminpanel.bitplatform.dev/ (No-Pr
114114
// self.prerenderMode = 'always'; // Demo: https://sales.bitplatform.dev/ (Always show pre-render without offline support)
115115
// self.prerenderMode = 'initial'; // Demo: https://todo.bitplatform.dev/ (Pre-Render on first site visit + Offline support)
116116

117+
self.enableCacheControl = false; // false means origin's cache headers are respected, true means service worker would manage the cache headers.
118+
117119
self.importScripts('_content/Bit.Bswup/bit-bswup.sw.js');

‎src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@
3232
</Script>
3333

3434
@*#if (captcha == "reCaptcha")*@
35-
<Link rel="preconnect" href="https://www.google.com" />
36-
<Link rel="preconnect" href="https://www.gstatic.com" crossorigin />
35+
<Link rel="preconnect" Href="https://www.google.com" />
36+
<Link rel="preconnect" Href="https://www.gstatic.com" crossorigin />
3737
@*#endif*@
3838

39-
<Link rel="preconnect" href="@absoluteServerAddress.ToString()" />@* for PWA *@
39+
<Link rel="preconnect" Href="@absoluteServerAddress.ToString()" />@* for PWA *@
4040

41-
<Link rel="icon" href="favicon.ico" type="image/x-icon" />
41+
<Link rel="icon" Href="favicon.ico" type="image/x-icon" />
4242
<HeadOutlet @rendermode=renderMode />
4343
@*#if (appInsights == true)*@
44-
<Link rel="preconnect" href="https://js.monitor.azure.com" crossorigin />
44+
<Link rel="preconnect" Href="https://js.monitor.azure.com" crossorigin />
4545
<!-- Perform the initial static render of ApplicationInsightsInit to start App Insights ASAP. -->
4646
<BlazorApplicationInsights.ApplicationInsightsInit />
4747
@if (renderMode is not null)
@@ -51,18 +51,21 @@
5151
<BlazorApplicationInsights.ApplicationInsightsInit IsWasmStandalone="true" @rendermode=renderMode />
5252
}
5353
@*#endif*@
54-
<Link rel="apple-touch-icon" sizes="512x512" href="images/icons/bit-icon-512.png" />
55-
<Link rel="manifest" href="manifest.json" />
54+
<Link rel="apple-touch-icon" sizes="512x512" Href="images/icons/bit-icon-512.png" />
55+
<Link rel="manifest" Href="manifest.json" />
56+
57+
<Link rel="preload" Href="_framework/dotnet.js" as="script" type="text/javascript" />
58+
<Link rel="preload" Href="_framework/blazor.boot.json" as="fetch" type="application/json" />
5659
</head>
5760

5861
<body class="@BitCss.Class.Color.Background.Primary @BitCss.Class.Color.Foreground.Primary bit-blazor-web">
5962

60-
<Link rel="stylesheet" href="_content/Bit.BlazorUI/styles/bit.blazorui.css" />
61-
<Link rel="stylesheet" href="_content/Bit.BlazorUI.Icons/styles/bit.blazorui.icons.css" />
62-
<Link rel="stylesheet" href="_content/Bit.BlazorUI.Assets/styles/bit.blazorui.assets.css" />
63-
<Link rel="stylesheet" href="_content/Bit.BlazorUI.Extras/styles/bit.blazorui.extras.css" />
64-
<Link rel="stylesheet" href="_content/Boilerplate.Client.Core/styles/app.css" />
65-
<Link rel="stylesheet" href="Boilerplate.Server.Web.styles.css" />
63+
<Link rel="stylesheet" Href="_content/Bit.BlazorUI/styles/bit.blazorui.css" />
64+
<Link rel="stylesheet" Href="_content/Bit.BlazorUI.Icons/styles/bit.blazorui.icons.css" />
65+
<Link rel="stylesheet" Href="_content/Bit.BlazorUI.Assets/styles/bit.blazorui.assets.css" />
66+
<Link rel="stylesheet" Href="_content/Bit.BlazorUI.Extras/styles/bit.blazorui.extras.css" />
67+
<Link rel="stylesheet" Href="_content/Boilerplate.Client.Core/styles/app.css" />
68+
<Link rel="stylesheet" Href="Boilerplate.Server.Web.styles.css" />
6669

6770
@if (renderMode != null && (serverWebSettings.WebAppRender.PrerenderEnabled is false || noPrerender))
6871
{
@@ -88,7 +91,7 @@
8891
<!-- If you don't plan to older browsers and prefer to use the original `blazor.web.js`, follow the instructions in this link: https://github.com/orgs/bitfoundation/discussions/10238#discussioncomment-12493737 -->
8992
<Script Src="_content/Bit.BlazorES2019/blazor.web.js" autostart="false"></Script>
9093
<Script Src="_content/Bit.Bswup/bit-bswup.js" blazorScript="_content/Bit.BlazorES2019/blazor.web.js"></Script>
91-
<Script src="_content/Bit.Bswup/bit-bswup.progress.js"></Script>
94+
<Script Src="_content/Bit.Bswup/bit-bswup.progress.js"></Script>
9295
<AppBswupProgressBar />
9396
<Script Src="_content/Bit.Butil/bit-butil.js"></Script>
9497
@*#if (offlineDb == true)*@

‎src/Websites/Careers/src/Bit.Websites.Careers.Client/wwwroot/service-worker.published.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ self.serverHandledUrls = [
2121
];
2222

2323
self.prerenderMode = 'always';
24+
self.enableCacheControl = false;
2425
self.enableIntegrityCheck = false;
2526

2627
self.importScripts('_content/Bit.Bswup/bit-bswup.sw.js');

‎src/Websites/Careers/src/Bit.Websites.Careers.Server/Components/App.razor‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,18 @@
77
<meta name="theme-color">
88
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
99
<meta name="description" content="The Bit.Websites.Careers is built with ASP.NET Core, Identity, Web API, and EF Core for the server-side, and Blazor for the client-side. It allows you to build a multi-mode Web applications from a single codebase." />
10-
<Link rel="icon" href="/favicon.ico" type="image/x-icon" />
10+
<Link rel="icon" Href="/favicon.ico" type="image/x-icon" />
1111
<HeadOutlet @rendermode=RenderModeProvider.Current />
12-
<Link rel="apple-touch-icon" sizes="512x512" href="images/icons/bit-icon-512.png" />
13-
<Link rel="manifest" href="manifest.json" />
14-
<Link rel="stylesheet" href="_content/Bit.BlazorUI/styles/bit.blazorui.css" />
15-
<Link rel="stylesheet" href="_content/Bit.BlazorUI.Icons/styles/bit.blazorui.icons.css" />
16-
<Link rel="stylesheet" href="_content/Bit.BlazorUI.Assets/styles/bit.blazorui.assets.css" />
17-
<Link rel="stylesheet" href="styles/app.css" />
18-
<Link rel="stylesheet" href="Bit.Websites.Careers.Client.bundle.scp.css" />
12+
<Link rel="apple-touch-icon" sizes="512x512" Href="images/icons/bit-icon-512.png" />
13+
<Link rel="manifest" Href="manifest.json" />
14+
<Link rel="stylesheet" Href="_content/Bit.BlazorUI/styles/bit.blazorui.css" />
15+
<Link rel="stylesheet" Href="_content/Bit.BlazorUI.Icons/styles/bit.blazorui.icons.css" />
16+
<Link rel="stylesheet" Href="_content/Bit.BlazorUI.Assets/styles/bit.blazorui.assets.css" />
17+
<Link rel="stylesheet" Href="styles/app.css" />
18+
<Link rel="stylesheet" Href="Bit.Websites.Careers.Client.bundle.scp.css" />
19+
20+
<Link rel="preload" Href="_framework/dotnet.js" as="script" type="text/javascript" />
21+
<Link rel="preload" Href="_framework/blazor.boot.json" as="fetch" type="application/json" />
1922
</head>
2023

2124
<body class="bit-blazor-web">
@@ -26,10 +29,10 @@
2629
{
2730
<Script Src="_content/Bit.BlazorES2019/blazor.web.js" autostart="false"></Script>
2831
<Script Src="_content/Bit.Bswup/bit-bswup.js" blazorScript="_content/Bit.BlazorES2019/blazor.web.js"></Script>
29-
<Script src="_content/Bit.Bswup/bit-bswup.progress.js"></Script>
32+
<Script Src="_content/Bit.Bswup/bit-bswup.progress.js"></Script>
3033
<AppBswupProgressBar />
31-
<Script src="_content/Bit.BlazorUI/scripts/bit.blazorui.js"></Script>
32-
<Script src="scripts/app.js"></Script>
34+
<Script Src="_content/Bit.BlazorUI/scripts/bit.blazorui.js"></Script>
35+
<Script Src="scripts/app.js"></Script>
3336
}
3437
</body>
3538

‎src/Websites/Platform/src/Bit.Websites.Platform.Client/wwwroot/service-worker.published.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ self.serverHandledUrls = [
2121
];
2222

2323
self.prerenderMode = 'always';
24+
self.enableCacheControl = false;
2425
self.enableIntegrityCheck = false;
2526

2627
self.importScripts('_content/Bit.Bswup/bit-bswup.sw.js');

‎src/Websites/Platform/src/Bit.Websites.Platform.Server/Components/App.razor‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@
66
<meta charset="utf-8" />
77
<meta name="theme-color">
88
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
9-
<Link rel="icon" href="/favicon.ico" type="image/x-icon" />
9+
<Link rel="icon" Href="/favicon.ico" type="image/x-icon" />
1010
<HeadOutlet @rendermode=RenderModeProvider.Current />
11-
<Link rel="apple-touch-icon" sizes="512x512" href="images/bit-icon-512.png" />
12-
<Link rel="stylesheet" href="_content/Bit.BlazorUI/styles/bit.blazorui.css" />
13-
<Link rel="stylesheet" href="_content/Bit.BlazorUI.Assets/styles/bit.blazorui.assets.css" />
14-
<Link rel="stylesheet" href="styles/app.css" />
15-
<Link rel="stylesheet" href="Bit.Websites.Platform.Client.bundle.scp.css" />
16-
<Link rel="manifest" href="manifest.json" />
11+
<Link rel="apple-touch-icon" sizes="512x512" Href="images/bit-icon-512.png" />
12+
<Link rel="stylesheet" Href="_content/Bit.BlazorUI/styles/bit.blazorui.css" />
13+
<Link rel="stylesheet" Href="_content/Bit.BlazorUI.Assets/styles/bit.blazorui.assets.css" />
14+
<Link rel="stylesheet" Href="styles/app.css" />
15+
<Link rel="stylesheet" Href="Bit.Websites.Platform.Client.bundle.scp.css" />
16+
<Link rel="manifest" Href="manifest.json" />
17+
18+
<Link rel="preload" Href="_framework/dotnet.js" as="script" type="text/javascript" />
19+
<Link rel="preload" Href="_framework/blazor.boot.json" as="fetch" type="application/json" />
1720
</head>
1821

1922
<body class="@BitCss.Class.Color.Background.Primary @BitCss.Class.Color.Foreground.Primary bit-blazor-web">
@@ -24,11 +27,11 @@
2427
{
2528
<Script Src="_content/Bit.BlazorES2019/blazor.web.js" autostart="false"></Script>
2629
<Script Src="_content/Bit.Bswup/bit-bswup.js" blazorScript="_content/Bit.BlazorES2019/blazor.web.js"></Script>
27-
<Script src="_content/Bit.Bswup/bit-bswup.progress.js"></Script>
30+
<Script Src="_content/Bit.Bswup/bit-bswup.progress.js"></Script>
2831
<AppBswupProgressBar />
29-
<Script src="_content/Bit.Butil/bit-butil.js"></Script>
30-
<Script src="_content/Bit.BlazorUI/scripts/bit.blazorui.js"></Script>
31-
<Script src="scripts/app.js"></Script>
32+
<Script Src="_content/Bit.Butil/bit-butil.js"></Script>
33+
<Script Src="_content/Bit.BlazorUI/scripts/bit.blazorui.js"></Script>
34+
<Script Src="scripts/app.js"></Script>
3235
}
3336
</body>
3437

‎src/Websites/Sales/src/Bit.Websites.Sales.Client/wwwroot/service-worker.published.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ self.serverHandledUrls = [
2121
];
2222

2323
self.prerenderMode = 'always';
24+
self.enableCacheControl = false;
2425
self.enableIntegrityCheck = false;
2526

2627
self.importScripts('_content/Bit.Bswup/bit-bswup.sw.js');

‎src/Websites/Sales/src/Bit.Websites.Sales.Server/Components/App.razor‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<meta name="theme-color">
88
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
99
<meta name="description" content="bit is a digital innovation company with software development at its core. We help out our customers innovate with designing and building their digital products efficiently with our Agile mindset and lean processes." />
10-
<Link rel="icon" href="/favicon.ico" type="image/x-icon" />
10+
<Link rel="icon" Href="/favicon.ico" type="image/x-icon" />
1111
<HeadOutlet @rendermode=RenderModeProvider.Current />
12-
<Link rel="apple-touch-icon" sizes="512x512" href="images/icons/bit-icon-512.png" />
13-
<Link rel="manifest" href="manifest.json" />
12+
<Link rel="apple-touch-icon" sizes="512x512" Href="images/icons/bit-icon-512.png" />
13+
<Link rel="manifest" Href="manifest.json" />
1414
<style>
1515
* {
1616
box-sizing: border-box;
@@ -32,11 +32,14 @@
3232
}
3333
3434
</style>
35-
<Link rel="stylesheet" href="_content/Bit.BlazorUI/styles/bit.blazorui.css" />
36-
<Link rel="stylesheet" href="_content/Bit.BlazorUI.Icons/styles/bit.blazorui.icons.css" />
37-
<Link rel="stylesheet" href="_content/Bit.BlazorUI.Assets/styles/bit.blazorui.assets.css" />
38-
<Link rel="stylesheet" href="styles/app.css" />
39-
<Link rel="stylesheet" href="Bit.Websites.Sales.Client.bundle.scp.css" />
35+
<Link rel="stylesheet" Href="_content/Bit.BlazorUI/styles/bit.blazorui.css" />
36+
<Link rel="stylesheet" Href="_content/Bit.BlazorUI.Icons/styles/bit.blazorui.icons.css" />
37+
<Link rel="stylesheet" Href="_content/Bit.BlazorUI.Assets/styles/bit.blazorui.assets.css" />
38+
<Link rel="stylesheet" Href="styles/app.css" />
39+
<Link rel="stylesheet" Href="Bit.Websites.Sales.Client.bundle.scp.css" />
40+
41+
<Link rel="preload" Href="_framework/dotnet.js" as="script" type="text/javascript" />
42+
<Link rel="preload" Href="_framework/blazor.boot.json" as="fetch" type="application/json" />
4043
</head>
4144

4245
<body class="bit-blazor-web">
@@ -47,10 +50,10 @@
4750
{
4851
<Script Src="_content/Bit.BlazorES2019/blazor.web.js" autostart="false"></Script>
4952
<Script Src="_content/Bit.Bswup/bit-bswup.js" blazorScript="_content/Bit.BlazorES2019/blazor.web.js"></Script>
50-
<Script src="_content/Bit.Bswup/bit-bswup.progress.js"></Script>
53+
<Script Src="_content/Bit.Bswup/bit-bswup.progress.js"></Script>
5154
<AppBswupProgressBar />
52-
<Script src="_content/Bit.BlazorUI/scripts/bit.blazorui.js"></Script>
53-
<Script src="scripts/app.js"></Script>
55+
<Script Src="_content/Bit.BlazorUI/scripts/bit.blazorui.js"></Script>
56+
<Script Src="scripts/app.js"></Script>
5457
}
5558
</body>
5659

0 commit comments

Comments
 (0)