@@ -150,8 +150,7 @@ public override bool Execute()
150
150
ExtractAdditionalCSS ( ) ;
151
151
RemoveDuplicateAssets ( ) ;
152
152
GeneratePackageFolder ( ) ;
153
- BuildServiceWorker ( ) ;
154
- BuildServiceWorkerClassic ( ) ;
153
+ BuildServiceWorkers ( ) ;
155
154
GenerateEmbeddedJs ( ) ;
156
155
GenerateIndexHtml ( ) ;
157
156
GenerateConfig ( ) ;
@@ -295,27 +294,17 @@ private void CopyContent()
295
294
}
296
295
}
297
296
298
- private void BuildServiceWorker ( )
297
+ private void BuildServiceWorkers ( )
299
298
{
300
- using var resourceStream = GetType ( ) . Assembly . GetManifestResourceStream ( "Uno.Wasm.Bootstrap.v0.Embedded.service-worker.js" ) ;
301
- using var reader = new StreamReader ( resourceStream ) ;
302
-
303
- var worker = TouchServiceWorker ( reader . ReadToEnd ( ) ) ;
304
- var memoryStream = new MemoryStream ( ) ;
305
-
306
- using var writer = new StreamWriter ( memoryStream , Encoding . UTF8 ) ;
307
- writer . Write ( worker ) ;
308
- writer . Flush ( ) ;
309
-
310
- memoryStream . Position = 0 ;
299
+ BuildServiceWorker ( resource : "Uno.Wasm.Bootstrap.v0.Embedded.service-worker.js" , outputFile : "service-worker.js" ) ;
311
300
312
- CopyStreamToOutput ( "service-worker.js" , memoryStream , DeployMode . Root ) ;
301
+ // Case for browsers that do not support modules for service workers: Firefox for example
302
+ BuildServiceWorker ( resource : "Uno.Wasm.Bootstrap.v0.Embedded.service-worker-classic.js" , outputFile : "service-worker-classic.js" ) ;
313
303
}
314
304
315
- // Case for browsers that do not support modules for service workers: Firefox for example
316
- private void BuildServiceWorkerClassic ( )
305
+ private void BuildServiceWorker ( string resource , string outputFile )
317
306
{
318
- using var resourceStream = GetType ( ) . Assembly . GetManifestResourceStream ( "Uno.Wasm.Bootstrap.v0.Embedded.service-worker-classic.js" ) ;
307
+ using var resourceStream = GetType ( ) . Assembly . GetManifestResourceStream ( resource ) ;
319
308
using var reader = new StreamReader ( resourceStream ) ;
320
309
321
310
var worker = TouchServiceWorker ( reader . ReadToEnd ( ) ) ;
@@ -327,7 +316,7 @@ private void BuildServiceWorkerClassic()
327
316
328
317
memoryStream . Position = 0 ;
329
318
330
- CopyStreamToOutput ( "service-worker-classic.js" , memoryStream , DeployMode . Root ) ;
319
+ CopyStreamToOutput ( outputFile , memoryStream , DeployMode . Root ) ;
331
320
}
332
321
333
322
private void ExtractAdditionalJS ( )
0 commit comments