fix(@angular/pwa): support updating projects that use the targets property

Author: filipesilva

packages/angular/pwa/pwa/index.ts

@@ -55,9 +55,9 @@ function updateIndexFile(options: PwaOptions): Rule {
     const workspace = getWorkspace(host);
     const project = workspace.projects[options.project as string];
     let path: string;
-    if (project && project.architect && project.architect.build &&
-        project.architect.build.options.index) {
-      path = project.architect.build.options.index;
+    const projectTargets = project.targets || project.architect;
+    if (project && projectTargets && projectTargets.build && projectTargets.build.options.index) {
+      path = projectTargets.build.options.index;
     } else {
       throw new SchematicsException('Could not find index file for the project');
     }
@@ -115,15 +115,14 @@ function addManifestToAssetsConfig(options: PwaOptions) {
 
     const assetEntry = join(normalize(project.root), 'src', 'manifest.json');
 
-    if (!project.architect) {
-      throw new Error(`Architect is not defined for this project.`);
+    const projectTargets = project.targets || project.architect;
+    if (!projectTargets) {
+      throw new Error(`Targets are not defined for this project.`);
     }
 
-    const architect = project.architect;
-
     ['build', 'test'].forEach((target) => {
 
-      const applyTo = architect[target].options;
+      const applyTo = projectTargets[target].options;
       const assets = applyTo.assets || (applyTo.assets = []);
 
       assets.push(assetEntry);

packages/angular/pwa/pwa/index_spec.ts

@@ -51,7 +51,7 @@ describe('PWA Schematic', () => {
     const tree = schematicRunner.runSchematic('ng-add', defaultOptions, appTree);
     const configText = tree.readContent('/angular.json');
     const config = JSON.parse(configText);
-    const swFlag = config.projects.bar.architect.build.configurations.production.serviceWorker;
+    const swFlag = config.projects.bar.targets.build.configurations.production.serviceWorker;
     expect(swFlag).toEqual(true);
   });
 
@@ -101,9 +101,9 @@ describe('PWA Schematic', () => {
     const tree = schematicRunner.runSchematic('ng-add', defaultOptions, appTree);
     const configText = tree.readContent('/angular.json');
     const config = JSON.parse(configText);
-    const architect = config.projects.bar.architect;
+    const targets = config.projects.bar.targets;
     ['build', 'test'].forEach((target) => {
-      expect(architect[target].options.assets).toContain('projects/bar/src/manifest.json');
+      expect(targets[target].options.assets).toContain('projects/bar/src/manifest.json');
     });
   });
 });