feat: add support for pnpm (install and cache deps)

cypress-io · Jul 25, 2022 · 0ec9869 · 0ec9869
1 parent 4996a77
commit 0ec9869
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 4 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -74706,15 +74706,21 @@ const yarnFilename = path.join(
   findYarnWorkspaceRoot(workingDirectory) || workingDirectory,
   'yarn.lock'
 )
+const pnpmLockFilename = path.join(
+  workingDirectory,
+  'pnpm-lock.yaml'
+)
 const packageLockFilename = path.join(
   workingDirectory,
   'package-lock.json'
 )
 
 const useYarn = () => fs.existsSync(yarnFilename)
 
+const usePnpm = () => fs.existsSync(pnpmLockFilename);
+
 const lockHash = () => {
-  const lockFilename = useYarn() ? yarnFilename : packageLockFilename
+  const lockFilename = useYarn() ? yarnFilename : (usePnpm() ? pnpmLockFilename : packageLockFilename)
   const fileHash = hasha.fromFileSync(lockFilename)
   debug(`Hash from file ${lockFilename} is ${fileHash}`)
   return fileHash
@@ -74729,6 +74735,8 @@ const getNpmCache = () => {
   if (!key) {
     if (useYarn()) {
       key = `yarn-${platformAndArch}-${hash}`
+    } if (usePnpm()) {
+      key = `pnpm-${platformAndArch}-${hash}`
     } else {
       key = `npm-${platformAndArch}-${hash}`
     }
@@ -74738,6 +74746,8 @@ const getNpmCache = () => {
 
   if (useYarn()) {
     o.inputPath = path.join(homeDirectory, '.cache', 'yarn')
+  } else if (usePnpm()) {
+    o.inputPath = NPM_CACHE_FOLDER
   } else {
     o.inputPath = NPM_CACHE_FOLDER
   }
@@ -74842,9 +74852,18 @@ const install = () => {
         cypressCommandOptions
       )
     })
+  } else if (usePnpm()) {
+    debug('installing NPM dependencies using pnpm')
+    return io.which('pnpm', true).then((pnpmPath) => {
+      debug(`pnpm at "${pnpmPath}"`)
+      return exec.exec(
+          quote(pnpmPath),
+          ['install', '--frozen-lockfile'],
+          cypressCommandOptions
+      )
+    })
   } else {
     debug('installing NPM dependencies')
-
     return io.which('npm', true).then((npmPath) => {
       debug(`npm at "${npmPath}"`)
       return exec.exec(quote(npmPath), ['ci'], cypressCommandOptions)

diff --git a/index.js b/index.js
@@ -96,15 +96,21 @@ const yarnFilename = path.join(
   findYarnWorkspaceRoot(workingDirectory) || workingDirectory,
   'yarn.lock'
 )
+const pnpmLockFilename = path.join(
+  workingDirectory,
+  'pnpm-lock.yaml'
+)
 const packageLockFilename = path.join(
   workingDirectory,
   'package-lock.json'
 )
 
 const useYarn = () => fs.existsSync(yarnFilename)
 
+const usePnpm = () => fs.existsSync(pnpmLockFilename);
+
 const lockHash = () => {
-  const lockFilename = useYarn() ? yarnFilename : packageLockFilename
+  const lockFilename = useYarn() ? yarnFilename : (usePnpm() ? pnpmLockFilename : packageLockFilename)
   const fileHash = hasha.fromFileSync(lockFilename)
   debug(`Hash from file ${lockFilename} is ${fileHash}`)
   return fileHash
@@ -119,6 +125,8 @@ const getNpmCache = () => {
   if (!key) {
     if (useYarn()) {
       key = `yarn-${platformAndArch}-${hash}`
+    } if (usePnpm()) {
+      key = `pnpm-${platformAndArch}-${hash}`
     } else {
       key = `npm-${platformAndArch}-${hash}`
     }
@@ -128,6 +136,8 @@ const getNpmCache = () => {
 
   if (useYarn()) {
     o.inputPath = path.join(homeDirectory, '.cache', 'yarn')
+  } else if (usePnpm()) {
+    o.inputPath = NPM_CACHE_FOLDER
   } else {
     o.inputPath = NPM_CACHE_FOLDER
   }
@@ -232,9 +242,18 @@ const install = () => {
         cypressCommandOptions
       )
     })
+  } else if (usePnpm()) {
+    debug('installing NPM dependencies using pnpm')
+    return io.which('pnpm', true).then((pnpmPath) => {
+      debug(`pnpm at "${pnpmPath}"`)
+      return exec.exec(
+          quote(pnpmPath),
+          ['install', '--frozen-lockfile'],
+          cypressCommandOptions
+      )
+    })
   } else {
     debug('installing NPM dependencies')
-
     return io.which('npm', true).then((npmPath) => {
       debug(`npm at "${npmPath}"`)
       return exec.exec(quote(npmPath), ['ci'], cypressCommandOptions)