fix: import .mjs with vitestnode, decoupling vitenode from vitest (#689)

vitest-dev · Feb 9, 2022 · e561a1d · e561a1d
1 parent 5a848c0
commit e561a1d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/packages/vite-node/src/externalize.ts b/packages/vite-node/src/externalize.ts
@@ -7,17 +7,14 @@ const ESM_EXT_RE = /\.(es|esm|esm-browser|esm-bundler|es6|module)\.js$/
 const ESM_FOLDER_RE = /\/esm\/(.*\.js)$/
 
 const defaultInline = [
-  /\/vitest\/dist\//,
-  // yarn's .store folder
-  /vitest-virtual-\w+\/dist/,
   /virtual:/,
   /\.ts$/,
   ESM_EXT_RE,
   ESM_FOLDER_RE,
 ]
 
 const depsExternal = [
-  /\.cjs.js$/,
+  /\.cjs\.js$/,
   /\.mjs$/,
 ]
 

diff --git a/packages/vitest/src/node/config.ts b/packages/vitest/src/node/config.ts
@@ -62,6 +62,16 @@ export function resolveConfig(
   resolved.coverage = resolveC8Options(resolved.coverage, resolved.root)
 
   resolved.deps = resolved.deps || {}
+  // vitenode will try to import such file with native node,
+  // but then our mocker will not work properly
+  resolved.deps.inline ??= []
+  resolved.deps.inline.push(
+    /^(?!.*(?:node_modules)).*\.mjs$/,
+    /^(?!.*(?:node_modules)).*\.cjs\.js$/,
+    /\/vitest\/dist\//,
+    // yarn's .store folder
+    /vitest-virtual-\w+\/dist/,
+  )
 
   resolved.environment = resolved.environment || 'node'
   resolved.threads = resolved.threads ?? true