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