fix(@angular/pwa): use default project

Author: cyrilletuzi

packages/angular/pwa/pwa/index.ts

@@ -36,6 +36,9 @@ function addServiceWorker(options: PwaOptions): Rule {
 export default function (options: PwaOptions): Rule {
  return (host: Tree, context: SchematicContext) => {
  const workspace = getWorkspace(host);
+ if (!options.project) {
+ throw new SchematicsException('Option "project" is required.');
+ }
  const project = workspace.projects[options.project];
  if (project.projectType !== 'application') {
  throw new SchematicsException(`PWA requires a project type of "application".`);

packages/angular/pwa/pwa/schema.d.ts

@@ -10,7 +10,7 @@ export interface Schema {
  /**
  * The name of the project.
  */
- project: string;
+ project?: string;
  /**
  * ": "The target to apply service worker to.
  */

packages/angular/pwa/pwa/schema.json

@@ -6,7 +6,10 @@
  "properties": {
  "project": {
  "type": "string",
- "description": "The name of the project."
+ "description": "The name of the project.",
+ "$default": {
+ "$source": "projectName"
+ }
  },
  "target": {
  "type": "string",
@@ -23,7 +26,5 @@
  "description": "The title of the application."
  }
  },
- "required": [
- "project"
- ]
+ "required": []
 }

packages/schematics/angular/service-worker/index.ts

@@ -38,7 +38,7 @@ function updateConfigFile(options: ServiceWorkerOptions): Rule {
 
  const workspace = getWorkspace(host);
 
- const project = workspace.projects[options.project];
+ const project = workspace.projects[options.project as string];
 
  if (!project) {
  throw new Error(`Project is not defined in this workspace.`);
@@ -94,7 +94,7 @@ function updateAppModule(options: ServiceWorkerOptions): Rule {
 
  // find app module
  const workspace = getWorkspace(host);
- const project = workspace.projects[options.project];
+ const project = workspace.projects[options.project as string];
  if (!project.architect) {
  throw new Error('Project architect not found.');
  }
@@ -164,7 +164,7 @@ function getTsSourceFile(host: Tree, path: string): ts.SourceFile {
 function updateIndexFile(options: ServiceWorkerOptions): Rule {
  return (host: Tree, context: SchematicContext) => {
  const workspace = getWorkspace(host);
- const project = workspace.projects[options.project];
+ const project = workspace.projects[options.project as string];
  let path: string;
  if (project && project.architect && project.architect.build &&
  project.architect.build.options.index) {
@@ -227,6 +227,9 @@ function getIndent(text: string): string {
 export default function (options: ServiceWorkerOptions): Rule {
  return (host: Tree, context: SchematicContext) => {
  const workspace = getWorkspace(host);
+ if (!options.project) {
+ throw new SchematicsException('Option "project" is required.');
+ }
  const project = workspace.projects[options.project];
  if (!project) {
  throw new SchematicsException(`Invalid project name (${options.project})`);

packages/schematics/angular/service-worker/schema.d.ts

@@ -10,7 +10,7 @@ export interface Schema {
  /**
  * The name of the project.
  */
- project: string;
+ project?: string;
  /**
  * ": "The target to apply service worker to.
  */

packages/schematics/angular/service-worker/schema.json

@@ -6,7 +6,10 @@
  "properties": {
  "project": {
  "type": "string",
- "description": "The name of the project."
+ "description": "The name of the project.",
+ "$default": {
+ "$source": "projectName"
+ }
  },
  "target": {
  "type": "string",
@@ -19,7 +22,5 @@
  "default": "production"
  }
  },
- "required": [
- "project"
- ]
+ "required": []
 }