fix: works with yarn pnp (#1667)

* fix: works with yarn pnp * chore: cleanup * chore: comment
vitest-dev · Jul 19, 2022 · d553031 · d553031
1 parent c3cc6d8
commit d553031
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/packages/vitest/src/integrations/env/edge-runtime.ts b/packages/vitest/src/integrations/env/edge-runtime.ts
@@ -1,11 +1,10 @@
-import { importModule } from 'local-pkg'
 import type { Environment } from '../../types'
 import { populateGlobal } from './utils'
 
 export default <Environment>({
   name: 'edge-runtime',
   async setup(global) {
-    const { EdgeVM } = await importModule('@edge-runtime/vm') as typeof import('@edge-runtime/vm')
+    const { EdgeVM } = await import('@edge-runtime/vm')
     const vm = new EdgeVM({
       extend: (context) => {
         context.global = context

diff --git a/packages/vitest/src/integrations/env/happy-dom.ts b/packages/vitest/src/integrations/env/happy-dom.ts
@@ -1,4 +1,3 @@
-import { importModule } from 'local-pkg'
 import type { Environment } from '../../types'
 import { populateGlobal } from './utils'
 
@@ -7,7 +6,7 @@ export default <Environment>({
   async setup(global) {
     // happy-dom v3 introduced a breaking change to Window, but
     // provides GlobalWindow as a way to use previous behaviour
-    const { Window, GlobalWindow } = await importModule('happy-dom') as typeof import('happy-dom')
+    const { Window, GlobalWindow } = await import('happy-dom')
     const win = new (GlobalWindow || Window)()
 
     const { keys, originals } = populateGlobal(global, win, { bindFunctions: true })

diff --git a/packages/vitest/src/integrations/env/jsdom.ts b/packages/vitest/src/integrations/env/jsdom.ts
@@ -1,4 +1,3 @@
-import { importModule } from 'local-pkg'
 import type { Environment, JSDOMOptions } from '../../types'
 import { populateGlobal } from './utils'
 
@@ -10,7 +9,7 @@ export default <Environment>({
       JSDOM,
       ResourceLoader,
       VirtualConsole,
-    } = await importModule('jsdom') as typeof import('jsdom')
+    } = await import('jsdom')
     const {
       html = '<!DOCTYPE html>',
       userAgent,

diff --git a/packages/vitest/src/node/cli-api.ts b/packages/vitest/src/node/cli-api.ts
@@ -1,3 +1,4 @@
+import { resolve } from 'pathe'
 import type { UserConfig as ViteUserConfig } from 'vite'
 import { envPackageNames } from '../integrations/env'
 import type { UserConfig } from '../types'
@@ -20,7 +21,10 @@ export async function startVitest(cliFilters: string[], options: CliOptions, vit
   if (options.run)
     options.watch = false
 
-  if (!await ensurePackageInstalled('vite')) {
+  // this shouldn't affect _application root_ that can be changed inside config
+  const root = resolve(options.root || process.cwd())
+
+  if (!await ensurePackageInstalled('vite', root)) {
     process.exitCode = 1
     return false
   }
@@ -31,15 +35,15 @@ export async function startVitest(cliFilters: string[], options: CliOptions, vit
   const ctx = await createVitest(options, viteOverrides)
 
   if (ctx.config.coverage.enabled) {
-    if (!await ensurePackageInstalled('c8')) {
+    if (!await ensurePackageInstalled('c8', root)) {
       process.exitCode = 1
       return false
     }
   }
 
   if (ctx.config.environment && ctx.config.environment !== 'node') {
     const packageName = envPackageNames[ctx.config.environment]
-    if (!await ensurePackageInstalled(packageName)) {
+    if (!await ensurePackageInstalled(packageName, root)) {
       process.exitCode = 1
       return false
     }

diff --git a/packages/vitest/src/node/plugins/index.ts b/packages/vitest/src/node/plugins/index.ts
@@ -13,7 +13,7 @@ export async function VitestPlugin(options: UserConfig = {}, ctx = new Vitest())
   let haveStarted = false
 
   async function UIPlugin() {
-    await ensurePackageInstalled('@vitest/ui')
+    await ensurePackageInstalled('@vitest/ui', ctx.config?.root || options.root || process.cwd())
     return (await import('@vitest/ui')).default(options.uiBase)
   }
 

diff --git a/packages/vitest/src/utils/index.ts b/packages/vitest/src/utils/index.ts
@@ -58,11 +58,13 @@ export function getFullName(task: Task) {
 
 export async function ensurePackageInstalled(
   dependency: string,
-  promptInstall = !process.env.CI && process.stdout.isTTY,
+  root: string,
 ) {
-  if (isPackageExists(dependency))
+  if (isPackageExists(dependency, { paths: [root] }))
     return true
 
+  const promptInstall = !process.env.CI && process.stdout.isTTY
+
   process.stderr.write(c.red(`${c.inverse(c.red(' MISSING DEP '))} Can not find dependency '${dependency}'\n\n`))
 
   if (!promptInstall)