fix(@angular-devkit/build-angular): fix service worker assets paths

Fix angular/angular-cli#10297

Author: filipesilva

packages/angular_devkit/build_angular/src/server/index.ts

@@ -37,6 +37,7 @@ import {
 import { BuildWebpackServerSchema } from './schema';
 const webpackMerge = require('webpack-merge');
 
+import { addFileReplacements } from '../utils';
 
 export class ServerBuilder implements Builder<BuildWebpackServerSchema> {
 
@@ -46,12 +47,14 @@ export class ServerBuilder implements Builder<BuildWebpackServerSchema> {
     const options = builderConfig.options;
     const root = this.context.workspace.root;
     const projectRoot = resolve(root, builderConfig.root);
+    const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<Stats>);
 
     // TODO: verify using of(null) to kickstart things is a pattern.
     return of(null).pipe(
       concatMap(() => options.deleteOutputPath
         ? this._deleteOutputDir(root, normalize(options.outputPath))
         : of(null)),
+      concatMap(() => addFileReplacements(root, host, options.fileReplacements)),
       concatMap(() => new Observable(obs => {
         // Ensure Build Optimizer is only used with AOT.
         let webpackConfig;

packages/angular_devkit/build_angular/src/server/schema.d.ts

@@ -70,9 +70,9 @@ export interface BuildWebpackServerSchema {
    */
   lazyModules?: string[];
   /**
-   * Defines the build environment.
+   * Replace files with other files in the build.
    */
-  environment?: string;
+  fileReplacements: FileReplacements[];
   /**
    * Define the output filename cache-busting hashing mode.
    */

packages/angular_devkit/build_angular/src/server/schema.json

@@ -32,9 +32,13 @@
       "description": "Defines the optimization level of the build.",
       "default": false
     },
-    "environment": {
-      "type": "string",
-      "description": "Defines the build environment."
+    "fileReplacements": {
+      "description": "Replace files with other files in the build.",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/fileReplacement"
+      },
+      "default": []
     },
     "outputPath": {
       "type": "string",
@@ -155,5 +159,37 @@
     "outputPath",
     "main",
     "tsConfig"
-  ]
-}
+  ],
+  "definitions": {
+    "fileReplacement": {
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "src": {
+              "type": "string"
+            },
+            "replaceWith": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false,
+          "required": ["src", "replaceWith"]
+        },
+        {
+          "type": "object",
+          "properties": {
+            "replace": {
+              "type": "string"
+            },
+            "with": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false,
+          "required": ["replace", "with"]
+        }
+      ]
+    }
+  }
+}