From 4915d657809e0a089efa8b89cee64e3e335f0f13 Mon Sep 17 00:00:00 2001
From: Tim Griesser <tgriesser10@gmail.com>
Date: Wed, 12 Jan 2022 19:48:12 -0500
Subject: [PATCH] fix: flake in shelljs scripts during postinstall (#19678)

---
 cli/scripts/clean.js        | 13 +++++++++----
 cli/scripts/post-install.js | 11 +++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/cli/scripts/clean.js b/cli/scripts/clean.js
index 34eac3ffd7..406d3b225a 100644
--- a/cli/scripts/clean.js
+++ b/cli/scripts/clean.js
@@ -1,8 +1,13 @@
-const shelljs = require('shelljs')
+const fs = require('fs-extra')
+const path = require('path')
 const { includeTypes } = require('./utils')
 
-shelljs.rm('-rf', 'build')
+fs.removeSync(path.join(__dirname, '..', 'build'))
 
-includeTypes.map((m) => {
-  shelljs.rm('-rf', `types/${m}`)
+includeTypes.forEach((folder) => {
+  try {
+    fs.removeSync(path.join(__dirname, '..', 'types', folder))
+  } catch (e) {
+    //
+  }
 })
diff --git a/cli/scripts/post-install.js b/cli/scripts/post-install.js
index 1854fe8a04..492499cba1 100644
--- a/cli/scripts/post-install.js
+++ b/cli/scripts/post-install.js
@@ -2,13 +2,14 @@
 
 // @ts-check
 /* eslint-disable no-console */
-
+const fs = require('fs-extra')
 const { includeTypes } = require('./utils')
 const shell = require('shelljs')
-const fs = require('fs')
 const { join } = require('path')
 const resolvePkg = require('resolve-pkg')
 
+require('./clean')
+
 shell.set('-v') // verbose
 shell.set('-e') // any error is fatal
 
@@ -19,10 +20,12 @@ shell.set('-e') // any error is fatal
 // yet we do not install "@types/.." packages with "npm install cypress"
 // because they can conflict with user's own libraries
 
+fs.ensureDirSync(join(__dirname, '..', 'types'))
+
 includeTypes.forEach((folder) => {
   const source = resolvePkg(`@types/${folder}`, { cwd: join(__dirname, '..', '..') })
 
-  shell.cp('-R', source, 'types')
+  fs.copySync(source, join(__dirname, '..', 'types', folder))
 })
 
 // jQuery v3.3.x includes "dist" folder that just references back to itself
@@ -72,7 +75,7 @@ shell.sed('-i', 'from \'sinon\';', 'from \'../sinon\';', sinonChaiFilename)
 
 // copy experimental network stubbing type definitions
 // so users can import: `import 'cypress/types/net-stubbing'`
-shell.cp(resolvePkg('@packages/net-stubbing/lib/external-types.ts'), 'types/net-stubbing.ts')
+fs.copySync(resolvePkg('@packages/net-stubbing/lib/external-types.ts'), 'types/net-stubbing.ts')
 
 // https://github.com/cypress-io/cypress/issues/18069
 // To avoid type clashes, some files should be commented out entirely by patch-package