From a307f5ebf23090cba258ad5558511a807c1aea71 Mon Sep 17 00:00:00 2001 From: George Kalpakas Date: Mon, 11 Jun 2018 16:46:46 +0300 Subject: [PATCH] refactor(@schematics/angular): minor refactorings --- packages/schematics/angular/service-worker/index.ts | 4 ++-- packages/schematics/angular/utility/dependencies.ts | 2 +- packages/schematics/angular/utility/json-utils.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/schematics/angular/service-worker/index.ts b/packages/schematics/angular/service-worker/index.ts index 77c6902576..838a134fe9 100644 --- a/packages/schematics/angular/service-worker/index.ts +++ b/packages/schematics/angular/service-worker/index.ts @@ -75,11 +75,11 @@ function addDependencies(): Rule { if (coreDep === null) { throw new SchematicsException('Could not find version.'); } - const platformServerDep = { + const serviceWorkerDep = { ...coreDep, name: packageName, }; - addPackageJsonDependency(host, platformServerDep); + addPackageJsonDependency(host, serviceWorkerDep); return host; }; diff --git a/packages/schematics/angular/utility/dependencies.ts b/packages/schematics/angular/utility/dependencies.ts index 892dece429..92d827182b 100644 --- a/packages/schematics/angular/utility/dependencies.ts +++ b/packages/schematics/angular/utility/dependencies.ts @@ -37,7 +37,7 @@ export function addPackageJsonDependency(tree: Tree, dependency: NodeDependency) // Haven't found the dependencies key, add it to the root of the package.json. appendPropertyInAstObject(recorder, packageJsonAst, dependency.type, { [dependency.name]: dependency.version, - }, 4); + }, 2); } else if (depsNode.kind === 'object') { // check if package already added const depNode = findPropertyInAstObject(depsNode, dependency.name); diff --git a/packages/schematics/angular/utility/json-utils.ts b/packages/schematics/angular/utility/json-utils.ts index 2894b01c2f..6a509ca7cd 100644 --- a/packages/schematics/angular/utility/json-utils.ts +++ b/packages/schematics/angular/utility/json-utils.ts @@ -84,7 +84,7 @@ export function insertPropertyInAstObjectInOrder( recorder.insertRight( insertIndex, - `${indentStr}` + indentStr + `"${propertyName}": ${JSON.stringify(value, null, 2).replace(/\n/g, indentStr)}` + ',', );