fix(@angular/cli): support ejection of service worker apps

Author: alxhub

packages/@angular/cli/tasks/eject.ts

@@ -7,6 +7,7 @@ import { getAppFromConfig } from '../utilities/app-utils';
 import { EjectTaskOptions } from '../commands/eject';
 import { NgCliWebpackConfig } from '../models/webpack-config';
 import { CliConfig } from '../models/config';
+import { usesServiceWorker } from '../utilities/service-worker';
 import { stripBom } from '../utilities/strip-bom';
 import { AotPlugin, AngularCompilerPlugin } from '@ngtools/webpack';
 import { PurifyPlugin } from '@angular-devkit/build-optimizer';
@@ -484,7 +485,6 @@ class JsonWebpackSerializer {
   }
 }
 
-
 export default Task.extend({
   run: function (runTaskOptions: EjectTaskOptions) {
     const project = this.project;
@@ -554,6 +554,16 @@ export default Task.extend({
         packageJson['scripts']['pree2e'] = pree2eNpmScript;
         packageJson['scripts']['e2e'] = 'protractor ./protractor.conf.js';
 
+        if (!!appConfig.serviceWorker && runTaskOptions.target === 'production' &&
+            usesServiceWorker(project.root) && !!runTaskOptions.serviceWorker) {
+          packageJson['scripts']['build'] += ' && npm run sw-config && npm run sw-copy';
+          packageJson['scripts']['sw-config'] = `ngsw-config ${outputPath} src/ngsw-config.json`;
+          packageJson['scripts']['sw-copy'] =
+              `cpx node_modules/@angular/service-worker/ngsw-worker.js ${outputPath}`;
+
+          packageJson['devDependencies']['cpx'] = '^1.5.0';
+        }
+
         // Add new dependencies based on our dependencies.
         const ourPackageJson = require('../package.json');
         if (!packageJson['devDependencies']) {

tests/e2e/tests/build/service-worker.ts

@@ -1,7 +1,7 @@
 import {join} from 'path';
 import {getGlobalVariable} from '../../utils/env';
 import {expectFileNotToExist, expectFileToExist, expectFileToMatch, writeFile} from '../../utils/fs';
-import {ng, silentNpm} from '../../utils/process';
+import {ng, npm, silentNpm} from '../../utils/process';
 
 const MANIFEST = {
   index: '/index.html',
@@ -42,5 +42,11 @@ export default function() {
     .then(() => expectFileToMatch('dist/ngsw.json', /"\/foo\/bar\/index.html"/))
     .then(() => ng('build', '--prod', '--service-worker=false'))
     .then(() => expectFileNotToExist('dist/ngsw.json'))
+    .then(() => ng('eject', '--prod'))
+    .then(() => silentNpm('install'))
+    .then(() => npm('run', 'build'))
+    .then(() => expectFileToMatch('package.json', /"sw-config"/))
+    .then(() => expectFileToExist(join(process.cwd(), 'dist/ngsw-worker.js')))
+    .then(() => expectFileToExist(join(process.cwd(), 'dist/ngsw.json')))
     .then(() => ng('set', 'apps.0.serviceWorker=false'));
 }