Merge branch 'main' into 1418

raineorshine · Jun 12, 2024 · 3be761d · 3be761d
2 parents a5a92a5 + f34082d
commit 3be761d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/src/package-managers/yarn.ts b/src/package-managers/yarn.ts
@@ -294,3 +294,5 @@ export const patch = withNpmConfigFromYarn(npm.patch)
 export const semver = withNpmConfigFromYarn(npm.semver)
 
 export default spawnYarn
+
+export { getPeerDependencies, packageAuthorChanged } from './npm'
diff --git a/test/doctor.test.ts b/test/doctor.test.ts
@@ -109,8 +109,16 @@ describe('doctor', function () {
       await fs.rm(lockfilePath, { recursive: true, force: true })
       await fs.rm(nodeModulesPath, { recursive: true, force: true })
 
-      // stderr should be empty
-      stderr.should.equal('')
+      stderr = stripAnsi(stderr).trim()
+      if (stderr !== '') {
+        stderr.should.equal(`> test
+> node test.js
+
+
+
+> test
+> node test.js`)
+      }
 
       // stdout should include normal output
       stripAnsi(stdout).should.containIgnoreCase('Tests pass')
@@ -154,8 +162,16 @@ describe('doctor', function () {
       await fs.rm(lockfilePath, { recursive: true, force: true })
       await fs.rm(nodeModulesPath, { recursive: true, force: true })
 
-      // stderr should be empty
-      stderr.should.equal('')
+      stderr = stripAnsi(stderr).trim()
+      if (stderr !== '') {
+        stripAnsi(stderr).should.equal(`> test
+> echo 'Test Success'
+
+
+
+> test
+> echo 'Test Success'`)
+      }
 
       // stdout should include normal output
       stripAnsi(stdout).should.containIgnoreCase('Tests pass')

diff --git a/test/helpers/doctorHelpers.ts b/test/helpers/doctorHelpers.ts
@@ -77,7 +77,16 @@ export const testPass = ({ packageManager }: { packageManager: PackageManagerNam
     if (packageManager === 'bun') {
       stripAnsi(stderr).should.equal('$ echo Success\n\n$ echo Success\n\n')
     } else {
-      stderr.should.equal('')
+      stderr = stripAnsi(stderr).trim()
+      if (stderr !== '') {
+        stderr.should.equal(`> test
+> echo Success
+
+
+
+> test
+> echo Success`)
+      }
     }
 
     // stdout should include normal output