fix: Use require.resolve when yarn v2 is detected

packages/server/lib/util/resolve.js

@@ -1,4 +1,3 @@
-const resolve = require('resolve')
 const env = require('./env')
 const debug = require('debug')('cypress:server:plugins')
 
@@ -15,13 +14,9 @@ module.exports = {
     }
 
     try {
-      const options = {
-        basedir: projectRoot,
-      }
+      debug('resolving typescript for %o', projectRoot)
 
-      debug('resolving typescript with options %o', options)
-
-      const resolved = resolve.sync('typescript', options)
+      const resolved = require.resolve('typescript', { paths: [projectRoot] })
 
       debug('resolved typescript %s', resolved)
 

packages/server/test/e2e/4_yarn_v2_spec.ts

@@ -0,0 +1,63 @@
+import fs from 'fs-extra'
+import os from 'os'
+import path from 'path'
+import cp from 'child_process'
+import util from 'util'
+import e2e from '../support/helpers/e2e'
+import Fixtures from '../support/helpers/fixtures'
+
+const exec = async (cmd, ...args) => {
+  console.log(`Running "${cmd}"...`)
+  const ret = await util.promisify(cp.exec)(cmd, ...args)
+  .catch((err) => {
+    console.error('Error:', err)
+
+    return err
+  })
+
+  console.log('stdout:', ret.stdout)
+  ret.stderr && console.log('stderr:', ret.stderr)
+
+  return ret
+}
+
+const fixtureDir = Fixtures.path('projects/yarn-v2')
+const cypressCli = path.join(__dirname, '../../../../cli/bin/cypress')
+
+describe('e2e yarn v2', () => {
+  let projectDir
+
+  beforeEach(async function () {
+    this.timeout(240000)
+
+    // copy yarn-v2 to tmpdir so node_modules resolution won't fall back to project root
+    projectDir = path.join(os.tmpdir(), `cy-yarn-v2-${Date.now()}`)
+
+    await fs.mkdir(projectDir)
+    await fs.copy(fixtureDir, projectDir)
+
+    const projectExec = (cmd) => exec(cmd, { cwd: projectDir })
+
+    // set up and verify the yarn v2 project
+    // https://yarnpkg.com/getting-started/migration#step-by-step
+    await projectExec('yarn set version berry')
+    expect((await projectExec('yarn --version')).stdout).to.match(/^2\./)
+    await projectExec('yarn')
+  })
+
+  // @see https://github.com/cypress-io/cypress/pull/15623
+  e2e.it('can load typescript plugins files', {
+    snapshot: false,
+    command: 'yarn',
+    browser: 'electron',
+    onRun: async (run) => {
+      await run({
+        args: `node ${cypressCli} run --dev --spec=* --project=${projectDir}`.split(' '),
+        spawnOpts: {
+          cwd: projectDir,
+          shell: true,
+        },
+      })
+    },
+  })
+})

packages/server/test/support/fixtures/projects/yarn-v2/.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: pnp

packages/server/test/support/fixtures/projects/yarn-v2/cypress.json

@@ -0,0 +1 @@
+{}

packages/server/test/support/fixtures/projects/yarn-v2/cypress/integration/spec.ts

@@ -0,0 +1 @@
+it('passes', () => {})

packages/server/test/support/fixtures/projects/yarn-v2/cypress/plugins/index.ts

@@ -0,0 +1,4 @@
+// typescript dummy code
+exports = (on: any, config: any) => {
+  return config
+}

packages/server/test/support/fixtures/projects/yarn-v2/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "yarn-v2",
+  "version": "1.0.0",
+  "main": "index.js",
+  "devDependencies": {
+    "typescript": "^4.2.4"
+  },
+  "license": "MIT"
+}

packages/server/test/support/fixtures/projects/yarn-v2/yarn.lock

@@ -0,0 +1,34 @@
+# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
+__metadata:
+  version: 4
+  cacheKey: 7
+
+typescript@^4.2.4:
+  version: 4.2.4
+  resolution: "typescript@npm:4.2.4"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: edaede2fa77f56b7fba80ee624a2368ab1216e75b0434d968ccb47ab0a5e2f6d94f848b3b111c1237dd71e988cd376af26370dcdad3b94355c76e759f0dd0a1e
+  languageName: node
+  linkType: hard
+
+"typescript@patch:typescript@^4.2.4#builtin<compat/typescript>":
+  version: 4.2.4
+  resolution: "typescript@patch:typescript@npm%3A4.2.4#builtin<compat/typescript>::version=4.2.4&hash=a45b0e"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 3be44317593182e8ce494c114e7ad9b0bb2553a22f3085cc6da4f0a36912c20850daa9be4c898af2ab6fc8b12f430c1c9e46ac715721867cd38643f2350d3ef9
+  languageName: node
+  linkType: hard
+
+"yarn-v2@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "yarn-v2@workspace:."
+  dependencies:
+    typescript: ^4.2.4
+  languageName: unknown
+  linkType: soft

packages/server/test/support/helpers/e2e.ts

@@ -648,7 +648,7 @@ const e2e = {
       Fixtures.installStubPackage(options.project, options.stubPackage)
     }
 
-    args = ['index.js'].concat(args)
+    args = options.args || ['index.js'].concat(args)
 
     let stdout = ''
     let stderr = ''
@@ -716,7 +716,7 @@ const e2e = {
 
     return new Bluebird((resolve, reject) => {
       debug('spawning Cypress %o', { args })
-      const sp = cp.spawn('node', args, {
+      const sp = cp.spawn(options.command || 'node', args, {
         env: _.chain(process.env)
         .omit('CYPRESS_DEBUG')
         .extend({
@@ -744,6 +744,7 @@ const e2e = {
           ...(options.noExit ? { CYPRESS_INTERNAL_FORCE_FILEWATCH: '1' } : {}),
         })
         .extend(options.processEnv)
+        .extend(options.spawnOpts)
         .value(),
       })