fix(devkit): fix issue replacing package dependencies in malformed pa… (

#16823)
nrwl · May 5, 2023 · b93d46d · b93d46d
1 parent 197105a
commit b93d46d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 17 deletions.
diff --git a/packages/devkit/src/utils/replace-package.spec.ts b/packages/devkit/src/utils/replace-package.spec.ts
@@ -165,6 +165,14 @@ describe('replaceNrwlPackageWithNxPackage', () => {
     });
   });
 
+  it('should handle broken package.json files', () => {
+    tree.write('package.json', '{ broken: "json ');
+
+    expect(() =>
+      replaceNrwlPackageWithNxPackage(tree, 'old-package', 'new-package')
+    ).not.toThrow();
+  });
+
   it('should replace any mentions in files', () => {
     expect(tree.read('README.txt').toString()).toContain('new-package');
     expect(tree.read('README.txt').toString()).not.toContain('old-package');

diff --git a/packages/devkit/src/utils/replace-package.ts b/packages/devkit/src/utils/replace-package.ts
@@ -38,20 +38,26 @@ function replacePackageInDependencies(
       return;
     }
 
-    updateJson<PackageJson>(tree, path, (packageJson) => {
-      for (const deps of [
-        packageJson.dependencies ?? {},
-        packageJson.devDependencies ?? {},
-        packageJson.peerDependencies ?? {},
-        packageJson.optionalDependencies ?? {},
-      ]) {
-        if (oldPackageName in deps) {
-          deps[newPackageName] = deps[oldPackageName];
-          delete deps[oldPackageName];
+    try {
+      updateJson<PackageJson>(tree, path, (packageJson) => {
+        for (const deps of [
+          packageJson.dependencies ?? {},
+          packageJson.devDependencies ?? {},
+          packageJson.peerDependencies ?? {},
+          packageJson.optionalDependencies ?? {},
+        ]) {
+          if (oldPackageName in deps) {
+            deps[newPackageName] = deps[oldPackageName];
+            delete deps[oldPackageName];
+          }
         }
-      }
-      return packageJson;
-    });
+        return packageJson;
+      });
+    } catch (e) {
+      console.warn(
+        `Could not replace ${oldPackageName} with ${newPackageName} in ${path}.`
+      );
+    }
   });
 }
 

diff --git a/packages/nx/src/generators/utils/project-configuration.ts b/packages/nx/src/generators/utils/project-configuration.ts
@@ -218,10 +218,12 @@ function findCreatedProjectFiles(tree: Tree) {
       if (fileName === 'project.json') {
         createdProjectFiles.push(change.path);
       } else if (fileName === 'package.json') {
-        const contents: PackageJson = JSON.parse(change.content.toString());
-        if (contents.nx) {
-          createdProjectFiles.push(change.path);
-        }
+        try {
+          const contents: PackageJson = JSON.parse(change.content.toString());
+          if (contents.nx) {
+            createdProjectFiles.push(change.path);
+          }
+        } catch {}
       }
     }
   }