Fixed "targets" issue

nitayneeman · Sep 11, 2018 · 878651e · 878651e
1 parent 5538e90
commit 878651e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "schematics-utilities",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "author": "Nitay Neeman",
   "description": "🛠️ Useful exported utilities for working with Schematics",
   "homepage": "https://github.com/nitayneeman/schematics-utilities",

diff --git a/src/angular/project-targets.ts b/src/angular/project-targets.ts
@@ -13,7 +13,7 @@ export function getProjectTargets(
 ): experimental.workspace.WorkspaceTool {
   const projectTargets = (<any>project).targets || project.architect;
   if (!projectTargets) {
-    throw new Error('Project architect not found.');
+    throw new Error('Project targets not found.');
   }
 
   return projectTargets;

diff --git a/src/material/ast.ts b/src/material/ast.ts
@@ -30,7 +30,8 @@ export function getSourceFile(host: Tree, path: string): ts.SourceFile {
 
 /** Import and add module to root app module. */
 export function addModuleImportToRootModule(host: Tree, moduleName: string, src: string, project: WorkspaceProject) {
-  const modulePath = getAppModulePath(host, project.architect.build.options.main);
+  const targets = (<any>project).targets || project.architect;
+  const modulePath = getAppModulePath(host, targets.build.options.main);
   addModuleImportToModule(host, modulePath, moduleName, src);
 }
 
@@ -62,7 +63,8 @@ export function addModuleImportToModule(host: Tree, modulePath: string, moduleNa
 
 /** Gets the app index.html file */
 export function getIndexHtmlPath(project: WorkspaceProject): string {
-  const buildTarget = project.architect.build.options;
+  const targets = (<any>project).targets || project.architect;
+  const buildTarget = targets.build.options;
 
   if (buildTarget.index && buildTarget.index.endsWith('index.html')) {
     return buildTarget.index;
@@ -73,7 +75,8 @@ export function getIndexHtmlPath(project: WorkspaceProject): string {
 
 /** Get the root stylesheet file. */
 export function getStylesPath(project: WorkspaceProject): string {
-  const buildTarget = project.architect['build'];
+  const targets = (<any>project).targets || project.architect;
+  const buildTarget = targets['build'];
 
   if (buildTarget.options && buildTarget.options.styles && buildTarget.options.styles.length) {
     const styles = buildTarget.options.styles.map(s => (typeof s === 'string' ? s : s.input));