From dfa96501db2b78f941d3423f0d33e5ed5e8084f0 Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Wed, 17 Mar 2021 13:38:19 +0300 Subject: [PATCH] use getWorkspaceSchema instead of JSON.parse --- npm/ng-packs/packages/schematics/src/utils/workspace.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/npm/ng-packs/packages/schematics/src/utils/workspace.ts b/npm/ng-packs/packages/schematics/src/utils/workspace.ts index 9e71d7d15b..84d186cb55 100644 --- a/npm/ng-packs/packages/schematics/src/utils/workspace.ts +++ b/npm/ng-packs/packages/schematics/src/utils/workspace.ts @@ -2,7 +2,7 @@ import { strings, workspaces } from '@angular-devkit/core'; import { SchematicsException, Tree } from '@angular-devkit/schematics'; import { Exception } from '../enums'; import { Project } from '../models'; -import { getWorkspace, ProjectType, WorkspaceSchema } from './angular'; +import { getWorkspace, getWorkspaceSchema, ProjectType, WorkspaceSchema } from './angular'; import { findEnvironmentExpression } from './ast'; import { readFileInTree } from './common'; @@ -20,13 +20,12 @@ export function readEnvironment(tree: Tree, project: workspaces.ProjectDefinitio } export function readWorkspaceSchema(tree: Tree) { - const workspaceBuffer = tree.read('/angular.json') || tree.read('/workspace.json'); - if (!workspaceBuffer) throw new SchematicsException(Exception.NoWorkspace); + if (!tree.exists('/angular.json')) throw new SchematicsException(Exception.NoWorkspace); let workspaceSchema: WorkspaceSchema; try { - workspaceSchema = JSON.parse(workspaceBuffer.toString()); + workspaceSchema = getWorkspaceSchema(tree); } catch (_) { throw new SchematicsException(Exception.InvalidWorkspace); }