fix: changes from #19837 causing flake in e2e_cookies_spec

Author: tgriesser

cli/scripts/post-install.js

@@ -85,13 +85,22 @@ const filesToUncomment = [
   'jquery/misc.d.ts',
 ]
 
+// Added to make the execution of the script idempotent,
+// currently if this is run twice, under certain circumstances,
+// it's possible to double un-comment and break the type definitions
+const marker = '// -- Cypress Patched Types --'
+
 filesToUncomment.forEach((file) => {
   const filePath = join(__dirname, '../types', file)
-  const str = fs.readFileSync(filePath).toString()
+  const str = fs.readFileSync(filePath, 'utf8')
+
+  if (str.includes(marker)) {
+    return
+  }
 
   const result = str.split('\n').map((line) => {
     return line.startsWith('// ') ? line.substring(3) : line
   }).join('\n')
 
-  fs.writeFileSync(filePath, result)
+  fs.writeFileSync(filePath, [marker, result].join('\n\n'))
 })

packages/driver/src/cy/commands/navigation.ts

@@ -13,10 +13,10 @@ import debugFn from 'debug'
 const debug = debugFn('cypress:driver:navigation')
 
 let id = null
-let previousDomainVisited: boolean = false
-let hasVisitedAboutBlank: boolean = false
-let currentlyVisitingAboutBlank: boolean = false
-let knownCommandCausedInstability: boolean = false
+let previousDomainVisited: boolean | null = null
+let hasVisitedAboutBlank: boolean | null = null
+let currentlyVisitingAboutBlank: boolean | null = null
+let knownCommandCausedInstability: boolean | null = null
 
 const REQUEST_URL_OPTS = 'auth failOnStatusCode retryOnNetworkFailure retryOnStatusCodeFailure retryIntervals method body headers'
 .split(' ')

yarn.lock

@@ -35559,7 +35559,7 @@ [email protected], shell-quote@^1.4.2, shell-quote@^1.6.1:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
   integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
 
-[email protected]:
+[email protected], shelljs@^0.8.4:
   version "0.8.5"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c"
   integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==
@@ -35568,15 +35568,6 @@ [email protected]:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
-shelljs@^0.8.4:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
-  integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
 shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"