Fix ng add crash with Angular CLI 11.1

Updated dev dependencies to test that everything works as expected.

Fixes #291

.yarnrc.yml

@@ -4,4 +4,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-2.3.1.cjs
+yarnPath: .yarn/releases/yarn-2.4.0.cjs

package.json

@@ -27,41 +27,41 @@
   },
   "homepage": "https://github.com/FortAwesome/angular-fontawesome",
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1100.0",
-    "@angular-devkit/core": "~11.0.0",
-    "@angular-devkit/schematics": "~11.0.0",
-    "@angular/cli": "~11.0.0",
-    "@angular/common": "~11.0.0",
-    "@angular/compiler": "~11.0.0",
-    "@angular/compiler-cli": "~11.0.0",
-    "@angular/core": "~11.0.0",
-    "@angular/language-service": "~11.0.0",
-    "@angular/platform-browser": "~11.0.0",
-    "@angular/platform-browser-dynamic": "~11.0.0",
+    "@angular-devkit/build-angular": "~0.1101.2",
+    "@angular-devkit/core": "~11.1.2",
+    "@angular-devkit/schematics": "~11.1.2",
+    "@angular/cli": "~11.1.2",
+    "@angular/common": "~11.1.1",
+    "@angular/compiler": "~11.1.1",
+    "@angular/compiler-cli": "~11.1.1",
+    "@angular/core": "~11.1.1",
+    "@angular/language-service": "~11.1.1",
+    "@angular/platform-browser": "~11.1.1",
+    "@angular/platform-browser-dynamic": "~11.1.1",
     "@fortawesome/fontawesome-svg-core": "^1.2.32",
     "@fortawesome/free-regular-svg-icons": "^5.15.1",
     "@fortawesome/free-solid-svg-icons": "^5.15.1",
-    "@types/jasmine": "~3.6.1",
-    "@types/node": "~14.14.7",
+    "@types/jasmine": "~3.6.3",
+    "@types/node": "~14.14.22",
     "codelyzer": "^6.0.1",
     "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~6.0.0",
-    "karma": "~5.1.0",
+    "karma": "~5.2.3",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma-coverage-istanbul-reporter": "~3.0.3",
     "karma-jasmine": "~4.0.1",
-    "karma-jasmine-html-reporter": "^1.5.0",
-    "ng-packagr": "^11.0.1",
-    "prettier": "2.1.2",
+    "karma-jasmine-html-reporter": "^1.5.4",
+    "ng-packagr": "^11.1.3",
+    "prettier": "2.2.1",
     "protractor": "~7.0.0",
     "rxjs": "^6.6.3",
-    "ts-node": "~9.0.0",
+    "ts-node": "~9.1.1",
     "tslint": "~6.1.3",
-    "typescript": "~4.0.5",
-    "zone.js": "~0.10.3"
+    "typescript": "~4.1.3",
+    "zone.js": "~0.11.3"
   },
   "dependencies": {
-    "tslib": "^2.0.3"
+    "tslib": "^2.1.0"
   },
   "keywords": [
     "angular",

projects/schematics/src/ng-add/index.ts

@@ -1,3 +1,4 @@
+import { workspaces } from '@angular-devkit/core';
 import { chain, Rule, SchematicContext, SchematicsException, Tree } from '@angular-devkit/schematics';
 import { NodePackageInstallTask, TslintFixTask } from '@angular-devkit/schematics/tasks';
 import {
@@ -6,10 +7,9 @@ import {
 } from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { addImportToModule } from '@schematics/angular/utility/ast-utils';
 import { InsertChange } from '@schematics/angular/utility/change';
-import { getWorkspace } from '@schematics/angular/utility/config';
 import { addPackageJsonDependency, NodeDependencyType } from '@schematics/angular/utility/dependencies';
 import { getAppModulePath } from '@schematics/angular/utility/ng-ast-utils';
-import { WorkspaceProject } from '@schematics/angular/utility/workspace-models';
+import { getWorkspace } from '@schematics/angular/utility/workspace';
 import { Schema } from './schema';
 import { angularFontawesomeVersion, iconPackVersion, svgCoreVersion } from './versions';
 
@@ -41,16 +41,20 @@ export default function (options: Schema): Rule {
 
       return tree;
     },
-    addModule(options.project),
+    addModule(options),
   ]);
 }
 
-function addModule(projectName?: string): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    const workspace = getWorkspace(host);
-    const project = workspace.projects[projectName || workspace.defaultProject!];
+function addModule(options: Schema): Rule {
+  return async (host: Tree, context: SchematicContext) => {
+    const workspace = await getWorkspace(host);
+    const projectName = options.project ?? (workspace.extensions.defaultProject as string);
+    const project = workspace.projects.get(projectName);
+    if (project == null) {
+      throw new SchematicsException(`Project with name ${projectName} does not exist.`);
+    }
     const buildOptions = getProjectTargetOptions(project, 'build');
-    const modulePath = getAppModulePath(host, buildOptions.main);
+    const modulePath = getAppModulePath(host, buildOptions.main as string);
     const moduleSource = getSourceFile(host, modulePath);
     const changes = addImportToModule(
       moduleSource,
@@ -73,8 +77,6 @@ function addModule(projectName?: string): Rule {
     } catch (err) {
       context.logger.warn('Formatting was skipped because tslint is not installed.');
     }
-
-    return host;
   };
 }
 
@@ -87,13 +89,10 @@ function getSourceFile(host: Tree, path: string) {
   return createSourceFile(path, content, ScriptTarget.Latest, true);
 }
 
-export function getProjectTargetOptions(project: WorkspaceProject, buildTarget: string) {
-  if (project.targets && project.targets[buildTarget] && project.targets[buildTarget].options) {
-    return project.targets[buildTarget].options;
-  }
-
-  if (project.architect && project.architect[buildTarget] && project.architect[buildTarget].options) {
-    return project.architect[buildTarget].options;
+export function getProjectTargetOptions(project: workspaces.ProjectDefinition, buildTarget: string) {
+  const buildTargetObject = project.targets.get(buildTarget);
+  if (buildTargetObject && buildTargetObject.options) {
+    return buildTargetObject.options;
   }
 
   throw new SchematicsException(`Cannot determine project target configuration for: ${buildTarget}.`);