From ac30428582161ce449b1aed2f4e24974680bd7d6 Mon Sep 17 00:00:00 2001
From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
Date: Thu, 24 Sep 2020 02:19:13 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20don=E2=80=99t=C2=A0remove=20non=E2=80=91?=
 =?UTF-8?q?pnpm=C2=A0`.dot=5Ffiles`=20from=C2=A0`node=5Fmodules`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR #2833

Co-authored-by: Zoltan Kochan <z@kochan.io>
---
 .changeset/twenty-drinks-juggle.md |  5 +++++
 packages/get-context/src/index.ts  | 29 ++++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/twenty-drinks-juggle.md

diff --git a/.changeset/twenty-drinks-juggle.md b/.changeset/twenty-drinks-juggle.md
new file mode 100644
index 0000000000..94df5be239
--- /dev/null
+++ b/.changeset/twenty-drinks-juggle.md
@@ -0,0 +1,5 @@
+---
+'@pnpm/get-context': patch
+---
+
+When purging an incompatible modules directory, don't remove `.dot_files` that don't belong to pnpm. (<https://github.com/pnpm/pnpm/issues/2506>)
diff --git a/packages/get-context/src/index.ts b/packages/get-context/src/index.ts
index 10d2486053..6506bd5940 100644
--- a/packages/get-context/src/index.ts
+++ b/packages/get-context/src/index.ts
@@ -205,7 +205,7 @@ async function validateModules (
     !R.equals(modules.publicHoistPattern, opts.publicHoistPattern || undefined)
   ) {
     if (opts.forceNewModules && rootProject) {
-      await purgeModulesDirsOfImporter(rootProject)
+      await purgeModulesDirsOfImporter(opts.virtualStoreDir, rootProject)
       return { purged: true }
     }
     throw new PnpmError(
@@ -227,7 +227,7 @@ async function validateModules (
       }
     } catch (err) {
       if (!opts.forceNewModules) throw err
-      await purgeModulesDirsOfImporter(rootProject)
+      await purgeModulesDirsOfImporter(opts.virtualStoreDir, rootProject)
       purged = true
     }
   }
@@ -250,19 +250,19 @@ async function validateModules (
       }
     } catch (err) {
       if (!opts.forceNewModules) throw err
-      await purgeModulesDirsOfImporter(project)
+      await purgeModulesDirsOfImporter(opts.virtualStoreDir, project)
       purged = true
     }
   }))
   if (modules.registries && !R.equals(opts.registries, modules.registries)) {
     if (opts.forceNewModules) {
-      await Promise.all(projects.map(purgeModulesDirsOfImporter))
+      await Promise.all(projects.map(purgeModulesDirsOfImporter.bind(null, opts.virtualStoreDir)))
       return { purged: true }
     }
     throw new PnpmError('REGISTRIES_MISMATCH', `This modules directory was created using the following registries configuration: ${JSON.stringify(modules.registries)}. The current configuration is ${JSON.stringify(opts.registries)}. To recreate the modules directory using the new settings, run "pnpm install".`)
   }
   if (purged && !rootProject) {
-    await purgeModulesDirsOfImporter({
+    await purgeModulesDirsOfImporter(opts.virtualStoreDir, {
       modulesDir: path.join(opts.lockfileDir, opts.modulesDir),
       rootDir: opts.lockfileDir,
     })
@@ -271,6 +271,7 @@ async function validateModules (
 }
 
 async function purgeModulesDirsOfImporter (
+  virtualStoreDir: string,
   importer: {
     modulesDir: string
     rootDir: string
@@ -284,19 +285,33 @@ async function purgeModulesDirsOfImporter (
     // We don't remove the actual modules directory, just the contents of it.
     // 1. we will need the directory anyway.
     // 2. in some setups, pnpm won't even have permission to remove the modules directory.
-    await removeContentsOfDir(importer.modulesDir)
+    await removeContentsOfDir(importer.modulesDir, virtualStoreDir)
   } catch (err) {
     if (err.code !== 'ENOENT') throw err
   }
 }
 
-async function removeContentsOfDir (dir: string) {
+async function removeContentsOfDir (dir: string, virtualStoreDir: string) {
   const items = await fs.readdir(dir)
   for (const item of items) {
+    // The non-pnpm related hidden files are kept
+    if (
+      item.startsWith('.') &&
+      item !== '.bin' &&
+      item !== '.modules.yaml' &&
+      !dirsAreEqual(path.join(dir, item), virtualStoreDir)
+    ) {
+      continue
+    }
+
     await rimraf(path.join(dir, item))
   }
 }
 
+function dirsAreEqual (dir1: string, dir2: string) {
+  return path.relative(dir1, dir2) === ''
+}
+
 function stringifyIncludedDeps (included: IncludedDependencies) {
   return DEPENDENCIES_FIELDS.filter((depsField) => included[depsField]).join(', ')
 }