fix: don't fail when cafile is set

close #4877
pnpm · Jun 11, 2022 · c8445ce · c8445ce
1 parent 518d4a2
commit c8445ce
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/.changeset/tough-coats-battle.md b/.changeset/tough-coats-battle.md
@@ -0,0 +1,6 @@
+---
+"@pnpm/config": patch
+"pnpm": patch
+---
+
+Don't fail when the cafile setting is specified [#4877](https://github.com/pnpm/pnpm/issues/4877). This fixes a regression introduced in pnpm v6.32.21.
diff --git a/packages/config/package.json b/packages/config/package.json
@@ -35,7 +35,7 @@
     "@pnpm/constants": "workspace:5.0.0",
     "@pnpm/error": "workspace:2.1.0",
     "@pnpm/global-bin-dir": "workspace:3.0.1",
-    "@pnpm/npm-conf": "1.0.3",
+    "@pnpm/npm-conf": "1.0.4",
     "@pnpm/pnpmfile": "workspace:1.2.6",
     "@pnpm/read-project-manifest": "workspace:2.0.13",
     "@pnpm/types": "workspace:7.10.0",

diff --git a/packages/config/test/cafile.txt b/packages/config/test/cafile.txt
@@ -0,0 +1 @@
+xxx
diff --git a/packages/config/test/index.ts b/packages/config/test/index.ts
@@ -793,3 +793,17 @@ test('getConfig() sets sideEffectsCacheRead and sideEffectsCacheWrite when side-
   expect(config.sideEffectsCacheRead).toBeTruthy()
   expect(config.sideEffectsCacheWrite).toBeFalsy()
 })
+
+test('getConfig() should read cafile', async () => {
+  const { config } = await getConfig({
+    cliOptions: {
+      cafile: path.join(__dirname, 'cafile.txt'),
+    },
+    packageManager: {
+      name: 'pnpm',
+      version: '1.0.0',
+    },
+  })
+  expect(config).toBeDefined()
+  expect(config.ca).toBe('xxx')
+})
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml