Use JSON.parse to parse package.json file in v2 migration

kamilkisiela · Aug 5, 2020 · af8c26e · af8c26e
1 parent 1d233a4
commit af8c26e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/packages/apollo-angular/CHANGELOG.md b/packages/apollo-angular/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### vNext
 
+### v2.0.3
+
+- Use JSON.parse to parse `package.json` file in v2 migration
+
 ### v2.0.2
 
 - Fix duplicated imports in v2 migration

diff --git a/packages/apollo-angular/schematics/migrations/v2.ts b/packages/apollo-angular/schematics/migrations/v2.ts
@@ -17,7 +17,7 @@ export default function (): Rule {
 function migrateDependencies() {
   return (tree: Tree, context: SchematicContext) => {
     const packageJsonPath = 'package.json';
-    const packageJson = getJsonFile(tree, packageJsonPath);
+    const packageJson = getJsonFile(tree, packageJsonPath, true);
 
     packageJson.dependencies = packageJson.dependencies || {};
 

diff --git a/packages/apollo-angular/schematics/utils/file.ts b/packages/apollo-angular/schematics/utils/file.ts
@@ -10,14 +10,17 @@ export function parseJSON<T = any>(content: string): T {
  * @param host {Tree} The source tree.
  * @param path {String} The path to the file to read. Relative to the root of the tree.
  */
-export function getJsonFile(host: Tree, path: string) {
+export function getJsonFile(host: Tree, path: string, strict = false) {
   const buffer = host.read(path);
   if (buffer === null) {
     throw new SchematicsException(`Couldn't read ${path}!`);
   }
 
   const content = buffer.toString('utf-8');
   try {
+    if (strict) {
+      return JSON.parse(content);
+    }
     // remove comments :)
     return parseJSON(content);
   } catch (e) {