fix(core): fix lock file pruning optional dependencies (#13830)

packages/nx/src/lock-file/__fixtures__/npm.lock.ts

@@ -22642,3 +22642,313 @@ export const lockFileV1YargsAndDevkitOnly = `{
   }
 }
 `;
+
+export const ssh2LockFileV1 = `{
+  "name": "test",
+  "version": "0.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "asn1": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "buildcheck": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.3.tgz",
+      "integrity": "sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==",
+      "optional": true
+    },
+    "cpu-features": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.4.tgz",
+      "integrity": "sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==",
+      "optional": true,
+      "requires": {
+        "buildcheck": "0.0.3",
+        "nan": "^2.15.0"
+      }
+    },
+    "nan": {
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
+      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+      "optional": true
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "ssh2": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.11.0.tgz",
+      "integrity": "sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==",
+      "requires": {
+        "asn1": "^0.2.4",
+        "bcrypt-pbkdf": "^1.0.2",
+        "cpu-features": "~0.0.4",
+        "nan": "^2.16.0"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
+    }
+  }
+}
+`;
+
+export const ssh2LockFileV2 = `{
+  "name": "test",
+  "version": "0.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "test",
+      "version": "0.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "ssh2": "1.11.0"
+      }
+    },
+    "node_modules/asn1": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "dependencies": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "node_modules/bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+      "dependencies": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "node_modules/buildcheck": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.3.tgz",
+      "integrity": "sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==",
+      "optional": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/cpu-features": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.4.tgz",
+      "integrity": "sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==",
+      "optional": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "buildcheck": "0.0.3",
+        "nan": "^2.15.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/nan": {
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
+      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+      "optional": true
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/ssh2": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.11.0.tgz",
+      "integrity": "sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "asn1": "^0.2.4",
+        "bcrypt-pbkdf": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=10.16.0"
+      },
+      "optionalDependencies": {
+        "cpu-features": "~0.0.4",
+        "nan": "^2.16.0"
+      }
+    },
+    "node_modules/tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
+    }
+  },
+  "dependencies": {
+    "asn1": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "buildcheck": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.3.tgz",
+      "integrity": "sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==",
+      "optional": true
+    },
+    "cpu-features": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.4.tgz",
+      "integrity": "sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==",
+      "optional": true,
+      "requires": {
+        "buildcheck": "0.0.3",
+        "nan": "^2.15.0"
+      }
+    },
+    "nan": {
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
+      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+      "optional": true
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "ssh2": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.11.0.tgz",
+      "integrity": "sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==",
+      "requires": {
+        "asn1": "^0.2.4",
+        "bcrypt-pbkdf": "^1.0.2",
+        "cpu-features": "~0.0.4",
+        "nan": "^2.16.0"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
+    }
+  }
+}
+`;
+
+export const ssh2LockFileV3 = `{
+  "name": "test",
+  "version": "0.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "test",
+      "version": "0.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "ssh2": "1.11.0"
+      }
+    },
+    "node_modules/asn1": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "dependencies": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "node_modules/bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+      "dependencies": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "node_modules/buildcheck": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.3.tgz",
+      "integrity": "sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==",
+      "optional": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/cpu-features": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.4.tgz",
+      "integrity": "sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==",
+      "optional": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "buildcheck": "0.0.3",
+        "nan": "^2.15.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/nan": {
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
+      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+      "optional": true
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/ssh2": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.11.0.tgz",
+      "integrity": "sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "asn1": "^0.2.4",
+        "bcrypt-pbkdf": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=10.16.0"
+      },
+      "optionalDependencies": {
+        "cpu-features": "~0.0.4",
+        "nan": "^2.16.0"
+      }
+    },
+    "node_modules/tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
+    }
+  }
+}
+`;

packages/nx/src/lock-file/__fixtures__/pnpm.lock.ts

@@ -6739,3 +6739,67 @@ packages:
       yargs-parser: 21.1.1
     dev: false
 `;
+
+export const ssh2LockFile = `lockfileVersion: 5.4
+
+specifiers:
+  ssh2: 1.11.0
+
+dependencies:
+  ssh2: 1.11.0
+
+packages:
+
+  /asn1/0.2.6:
+    resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==}
+    dependencies:
+      safer-buffer: 2.1.2
+    dev: false
+
+  /bcrypt-pbkdf/1.0.2:
+    resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==}
+    dependencies:
+      tweetnacl: 0.14.5
+    dev: false
+
+  /buildcheck/0.0.3:
+    resolution: {integrity: sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==}
+    engines: {node: '>=10.0.0'}
+    dev: false
+    optional: true
+
+  /cpu-features/0.0.4:
+    resolution: {integrity: sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==}
+    engines: {node: '>=10.0.0'}
+    requiresBuild: true
+    dependencies:
+      buildcheck: 0.0.3
+      nan: 2.17.0
+    dev: false
+    optional: true
+
+  /nan/2.17.0:
+    resolution: {integrity: sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==}
+    dev: false
+    optional: true
+
+  /safer-buffer/2.1.2:
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
+    dev: false
+
+  /ssh2/1.11.0:
+    resolution: {integrity: sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==}
+    engines: {node: '>=10.16.0'}
+    requiresBuild: true
+    dependencies:
+      asn1: 0.2.6
+      bcrypt-pbkdf: 1.0.2
+    optionalDependencies:
+      cpu-features: 0.0.4
+      nan: 2.17.0
+    dev: false
+
+  /tweetnacl/0.14.5:
+    resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==}
+    dev: false
+`;

packages/nx/src/lock-file/npm.spec.ts

@@ -13,6 +13,9 @@ import {
   lockFileV1JustTypescript,
   lockFileV1YargsAndDevkitOnly,
   lockFileV2YargsAndDevkitOnly,
+  ssh2LockFileV2,
+  ssh2LockFileV3,
+  ssh2LockFileV1,
 } from './__fixtures__/npm.lock';
 import { vol } from 'memfs';
 import { npmLockFileWithWorkspaces } from './__fixtures__/workspaces.lock';
@@ -38,6 +41,13 @@ const YargsAndDevkitPackage = {
   version: '0.0.0',
   dependencies: { '@nrwl/devkit': '15.0.13', yargs: '17.6.2' },
 };
+const Ssh2Package = {
+  name: 'test',
+  version: '0.0.0',
+  dependencies: {
+    ssh2: '1.11.0',
+  },
+};
 
 describe('npm LockFile utility', () => {
   describe('v3', () => {
@@ -158,6 +168,14 @@ describe('npm LockFile utility', () => {
         )
       ).toEqual(JSON.parse(lockFileV3YargsAndDevkitOnly));
     });
+
+    it('should correctly prune lockfile with package that has optional dependencies', () => {
+      expect(
+        stringifyNpmLockFile(
+          pruneNpmLockFile(parseNpmLockFile(ssh2LockFileV3), Ssh2Package)
+        )
+      ).toEqual(ssh2LockFileV3);
+    });
   });
 
   describe('v2', () => {
@@ -284,6 +302,14 @@ describe('npm LockFile utility', () => {
         JSON.parse(lockFileV2YargsAndDevkitOnly)
       );
     });
+
+    it('should correctly prune lockfile with package that has optional dependencies', () => {
+      expect(
+        stringifyNpmLockFile(
+          pruneNpmLockFile(parseNpmLockFile(ssh2LockFileV2), Ssh2Package)
+        )
+      ).toEqual(ssh2LockFileV2);
+    });
   });
 
   describe('v1', () => {
@@ -404,6 +430,14 @@ describe('npm LockFile utility', () => {
           JSON.parse(lockFileV1YargsAndDevkitOnly)
         );
       });
+
+      it('should correctly prune lockfile with package that has optional dependencies', () => {
+        expect(
+          stringifyNpmLockFile(
+            pruneNpmLockFile(parseNpmLockFile(ssh2LockFileV1), Ssh2Package)
+          )
+        ).toEqual(ssh2LockFileV1);
+      });
     });
   });
 });

packages/nx/src/lock-file/npm.ts

@@ -791,6 +791,8 @@ function setPackageMetaModifiers(
 
   if (parent.devDependencies?.[packageName]) {
     packageMeta.dev = true;
+  } else if (dependency.optional) {
+    packageMeta.optional = true;
   } else if (parent.optionalDependencies?.[packageName]) {
     packageMeta.optional = true;
   } else if (parent.peerDependencies?.[packageName]) {

packages/nx/src/lock-file/pnpm.spec.ts

@@ -8,6 +8,7 @@ import {
   lockFileJustTypescript,
   lockFileWithInlineSpecifiers,
   lockFileYargsAndDevkit,
+  ssh2LockFile,
 } from './__fixtures__/pnpm.lock';
 import {
   pnpmLockFileWithInlineSpecifiersAndWorkspaces,
@@ -24,6 +25,13 @@ const YargsAndDevkitPackage = {
   version: '1.2.3',
   dependencies: { '@nrwl/devkit': '15.0.13', yargs: '17.6.2' },
 };
+const Ssh2Package = {
+  name: 'test',
+  version: '0.0.0',
+  dependencies: {
+    ssh2: '1.11.0',
+  },
+};
 
 describe('pnpm LockFile utility', () => {
   describe('standard lock file', () => {
@@ -153,6 +161,14 @@ describe('pnpm LockFile utility', () => {
         )
       ).toEqual(lockFileYargsAndDevkit);
     });
+
+    it('should correctly prune lockfile with package that has optional dependencies', () => {
+      expect(
+        stringifyPnpmLockFile(
+          prunePnpmLockFile(parsePnpmLockFile(ssh2LockFile), Ssh2Package)
+        )
+      ).toEqual(ssh2LockFile);
+    });
   });
 
   it('should parse lockfile with time-based resolution and workspaces', () => {

packages/nx/src/lock-file/pnpm.ts

@@ -539,7 +539,10 @@ function pruneTransitiveDependencies(
             rootVersion: false,
             packageMeta: [packageMeta],
           });
-          if (parent.optionalDependencies?.[packageName]) {
+          if (
+            parent.packageMeta[0].optional ||
+            parent.optionalDependencies?.[packageName]
+          ) {
             packageMeta.optional = true;
           }
           pruneTransitiveDependencies(

packages/nx/src/lock-file/utils/lock-file-type.ts

@@ -3,6 +3,7 @@ export interface PackageDependency {
   rootVersion?: boolean;
   packageMeta: any[];
   dependencies?: Record<string, string>;
+  optionalDependencies?: Record<string, string>;
   name?: string;
   [key: string]: any;
 }

packages/nx/src/lock-file/yarn.spec.ts

@@ -4,11 +4,13 @@ import {
   stringifyYarnLockFile,
 } from './yarn';
 import {
-  lockFile,
   berryLockFile,
-  lockFileJustTypescript,
-  lockFileDevkitAndYargs,
   berryLockFileDevkitAndYargs,
+  berrySsh2LockFile,
+  lockFile,
+  lockFileDevkitAndYargs,
+  lockFileJustTypescript,
+  ssh2LockFile,
 } from './__fixtures__/yarn.lock';
 
 const TypeScriptOnlyPackage = {
@@ -30,6 +32,13 @@ const YargsDevkitTypescriptPackage = {
     yargs: '17.6.2',
   },
 };
+const Ssh2Package = {
+  name: 'test',
+  version: '0.0.0',
+  dependencies: {
+    ssh2: '1.11.0',
+  },
+};
 
 describe('yarn LockFile utility', () => {
   describe('classic', () => {
@@ -85,7 +94,7 @@ describe('yarn LockFile utility', () => {
       expect(stringifyYarnLockFile(parsedLockFile)).toEqual(lockFile);
     });
 
-    it('shold prune the lock file', () => {
+    it('should prune the lock file', () => {
       expect(
         Object.keys(
           pruneYarnLockFile(parsedLockFile, TypeScriptOnlyPackage).dependencies
@@ -98,7 +107,7 @@ describe('yarn LockFile utility', () => {
       ).toEqual(36);
     });
 
-    it('shold correctly prune lockfile with single package', () => {
+    it('should correctly prune lockfile with single package', () => {
       expect(
         stringifyYarnLockFile(
           pruneYarnLockFile(parsedLockFile, TypeScriptOnlyPackage)
@@ -106,13 +115,21 @@ describe('yarn LockFile utility', () => {
       ).toEqual(lockFileJustTypescript);
     });
 
-    it('shold correctly prune lockfile with multiple packages', () => {
+    it('should correctly prune lockfile with multiple packages', () => {
       expect(
         stringifyYarnLockFile(
           pruneYarnLockFile(parsedLockFile, YargsAndDevkitPackage)
         )
       ).toEqual(lockFileDevkitAndYargs);
     });
+
+    it('should correctly prune lockfile with package that has optional dependencies', () => {
+      expect(
+        stringifyYarnLockFile(
+          pruneYarnLockFile(parseYarnLockFile(ssh2LockFile), Ssh2Package)
+        )
+      ).toEqual(ssh2LockFile);
+    });
   });
 
   describe('berry', () => {
@@ -179,7 +196,7 @@ describe('yarn LockFile utility', () => {
       expect(removeComment(result)).toEqual(removeComment(berryLockFile));
     });
 
-    it('shold prune the lock file', () => {
+    it('should prune the lock file', () => {
       expect(
         Object.keys(
           pruneYarnLockFile(parsedLockFile, YargsDevkitTypescriptPackage)
@@ -188,7 +205,7 @@ describe('yarn LockFile utility', () => {
       ).toEqual(37);
     });
 
-    it('shold correctly prune lockfile with multiple packages', () => {
+    it('should correctly prune lockfile with multiple packages', () => {
       const result = stringifyYarnLockFile(
         pruneYarnLockFile(parsedLockFile, YargsDevkitTypescriptPackage)
       );
@@ -197,7 +214,7 @@ describe('yarn LockFile utility', () => {
       );
     });
 
-    it('shold correctly prune lockfile with multiple packages and custom name', () => {
+    it('should correctly prune lockfile with multiple packages and custom name', () => {
       const result = pruneYarnLockFile(parsedLockFile, {
         ...YargsDevkitTypescriptPackage,
         name: 'custom-name',
@@ -218,6 +235,16 @@ describe('yarn LockFile utility', () => {
         }
       `);
     });
+
+    it('should correctly prune lockfile with package that has optional dependencies', () => {
+      expect(
+        removeComment(
+          stringifyYarnLockFile(
+            pruneYarnLockFile(parseYarnLockFile(berrySsh2LockFile), Ssh2Package)
+          )
+        )
+      ).toEqual(removeComment(berrySsh2LockFile));
+    });
   });
 });
 

packages/nx/src/lock-file/yarn.ts

@@ -296,11 +296,10 @@ function pruneTransitiveDependencies(
   prunedDeps: LockFileData['dependencies'],
   value: PackageDependency
 ): void {
-  if (!value.dependencies) {
+  [
-    return;
+    ...Object.entries(value.dependencies ?? {}),
-  }
+    ...Object.entries(value.optionalDependencies ?? {}),
-
+  ].forEach(([packageName, version]) => {
-  Object.entries(value.dependencies).forEach(([packageName, version]) => {
     if (dependencies[packageName]) {
       // check if package with given version exists in data
       // if yes, return key, value and version expression from packageMeta