From f3644a939c15f7533e5b240005f7247b8219f646 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Thu, 2 Mar 2017 11:34:07 -0800
Subject: [PATCH] fix(@angular/cli): pass the base href through to the sw
 plugin

---
 .../cli/models/webpack-configs/production.ts   | 18 +++++++++++++++++-
 tests/e2e/tests/build/service-worker.ts        |  7 +++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/packages/@angular/cli/models/webpack-configs/production.ts b/packages/@angular/cli/models/webpack-configs/production.ts
index ba963e8d9298..b54e6fa9ee36 100644
--- a/packages/@angular/cli/models/webpack-configs/production.ts
+++ b/packages/@angular/cli/models/webpack-configs/production.ts
@@ -1,6 +1,7 @@
 import * as path from 'path';
 import * as webpack from 'webpack';
 import * as fs from 'fs';
+import * as semver from 'semver';
 import { stripIndent } from 'common-tags';
 import { StaticAssetPlugin } from '../../plugins/static-asset';
 import { GlobCopyWebpackPlugin } from '../../plugins/glob-copy-webpack-plugin';
@@ -26,6 +27,19 @@ export const getProdConfig = function (wco: WebpackConfigOptions) {
       `);
     }
 
+    // Read the version of @angular/service-worker and throw if it doesn't match the
+    // expected version.
+    const allowedVersion = '>= 1.0.0-beta.5 < 2.0.0';
+    const swPackageJson = fs.readFileSync(`${swModule}/package.json`).toString();
+    const swVersion = JSON.parse(swPackageJson)['version'];
+    if (!semver.satisfies(swVersion, allowedVersion)) {
+      throw new Error(stripIndent`
+        The installed version of @angular/service-worker is ${swVersion}. This version of the CLI
+        requires the @angular/service-worker version to satisfy ${allowedVersion}. Please upgrade
+        your service worker version.
+      `);
+    }
+
     // Path to the worker script itself.
     const workerPath = path.resolve(swModule, 'bundles/worker-basic.min.js');
 
@@ -52,7 +66,9 @@ export const getProdConfig = function (wco: WebpackConfigOptions) {
     // Load the Webpack plugin for manifest generation and install it.
     const AngularServiceWorkerPlugin = require('@angular/service-worker/build/webpack')
         .AngularServiceWorkerPlugin;
-    extraPlugins.push(new AngularServiceWorkerPlugin());
+    extraPlugins.push(new AngularServiceWorkerPlugin({
+      baseHref: buildOptions.baseHref || '/',
+    }));
 
     // Copy the worker script into assets.
     const workerContents = fs.readFileSync(workerPath).toString();
diff --git a/tests/e2e/tests/build/service-worker.ts b/tests/e2e/tests/build/service-worker.ts
index a48b13300772..4277a7a10020 100644
--- a/tests/e2e/tests/build/service-worker.ts
+++ b/tests/e2e/tests/build/service-worker.ts
@@ -1,6 +1,6 @@
 import {join} from 'path';
 import {getGlobalVariable} from '../../utils/env';
-import {expectFileToExist} from '../../utils/fs';
+import {expectFileToExist, expectFileToMatch} from '../../utils/fs';
 import {ng, npm} from '../../utils/process';
 
 export default function() {
@@ -15,5 +15,8 @@ export default function() {
     .then(() => ng('set', 'apps.0.serviceWorker=true'))
     .then(() => ng('build', '--prod'))
     .then(() => expectFileToExist(join(process.cwd(), 'dist')))
-    .then(() => expectFileToExist(join(process.cwd(), 'dist/ngsw-manifest.json')));
+    .then(() => expectFileToExist(join(process.cwd(), 'dist/ngsw-manifest.json')))
+    .then(() => ng('build', '--prod', '--base-href=/foo/bar'))
+    .then(() => expectFileToExist(join(process.cwd(), 'dist/ngsw-manifest.json')))
+    .then(() => expectFileToMatch('dist/ngsw-manifest.json', /"\/foo\/bar\/index.html"/));
 }