revert: use the same directories on macOS as on Linux

This reverts commit b970d96.
gluxon · Mar 30, 2024 · d40f3ea · d40f3ea
1 parent 6caec81
commit d40f3ea
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/.changeset/silly-moles-rhyme.md b/.changeset/silly-moles-rhyme.md
diff --git a/config/config/src/dirs.ts b/config/config/src/dirs.ts
@@ -10,6 +10,9 @@ export function getCacheDir (
   if (opts.env.XDG_CACHE_HOME) {
     return path.join(opts.env.XDG_CACHE_HOME, 'pnpm')
   }
+  if (opts.platform === 'darwin') {
+    return path.join(os.homedir(), 'Library/Caches/pnpm')
+  }
   if (opts.platform !== 'win32') {
     return path.join(os.homedir(), '.cache/pnpm')
   }
@@ -28,7 +31,7 @@ export function getStateDir (
   if (opts.env.XDG_STATE_HOME) {
     return path.join(opts.env.XDG_STATE_HOME, 'pnpm')
   }
-  if (opts.platform !== 'win32') {
+  if (opts.platform !== 'win32' && opts.platform !== 'darwin') {
     return path.join(os.homedir(), '.local/state/pnpm')
   }
   if (opts.env.LOCALAPPDATA) {
@@ -49,6 +52,9 @@ export function getDataDir (
   if (opts.env.XDG_DATA_HOME) {
     return path.join(opts.env.XDG_DATA_HOME, 'pnpm')
   }
+  if (opts.platform === 'darwin') {
+    return path.join(os.homedir(), 'Library/pnpm')
+  }
   if (opts.platform !== 'win32') {
     return path.join(os.homedir(), '.local/share/pnpm')
   }
@@ -67,6 +73,9 @@ export function getConfigDir (
   if (opts.env.XDG_CONFIG_HOME) {
     return path.join(opts.env.XDG_CONFIG_HOME, 'pnpm')
   }
+  if (opts.platform === 'darwin') {
+    return path.join(os.homedir(), 'Library/Preferences/pnpm')
+  }
   if (opts.platform !== 'win32') {
     return path.join(os.homedir(), '.config/pnpm')
   }

diff --git a/config/config/test/dirs.test.ts b/config/config/test/dirs.test.ts
@@ -16,7 +16,7 @@ test('getCacheDir()', () => {
   expect(getCacheDir({
     env: {},
     platform: 'darwin',
-  })).toBe(path.join(os.homedir(), '.cache/pnpm'))
+  })).toBe(path.join(os.homedir(), 'Library/Caches/pnpm'))
   expect(getCacheDir({
     env: {
       LOCALAPPDATA: '/localappdata',
@@ -43,7 +43,7 @@ test('getStateDir()', () => {
   expect(getStateDir({
     env: {},
     platform: 'darwin',
-  })).toBe(path.join(os.homedir(), '.local/state/pnpm'))
+  })).toBe(path.join(os.homedir(), '.pnpm-state'))
   expect(getStateDir({
     env: {
       LOCALAPPDATA: '/localappdata',
@@ -76,7 +76,7 @@ test('getDataDir()', () => {
   expect(getDataDir({
     env: {},
     platform: 'darwin',
-  })).toBe(path.join(os.homedir(), '.local/share/pnpm'))
+  })).toBe(path.join(os.homedir(), 'Library/pnpm'))
   expect(getDataDir({
     env: {
       LOCALAPPDATA: '/localappdata',
@@ -103,7 +103,7 @@ test('getConfigDir()', () => {
   expect(getConfigDir({
     env: {},
     platform: 'darwin',
-  })).toBe(path.join(os.homedir(), '.config/pnpm'))
+  })).toBe(path.join(os.homedir(), 'Library/Preferences/pnpm'))
   expect(getConfigDir({
     env: {
       LOCALAPPDATA: '/localappdata',