vite-node 0.1.6 → 0.1.10

package/cli.mjs

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import minimist from 'minimist'
 import { red, dim } from 'kolorist'
-import { startAndRun } from './index.mjs'
+import { run } from './index.mjs'
 
 const argv = minimist(process.argv.slice(2), {
   'alias': {
@@ -37,7 +37,7 @@ if (!argv._.length) {
 // forward argv
 process.argv = [process.argv.slice(0, 2), ...argv['--']]
 
-startAndRun(argv)
+run(argv)
 
 function help() {
   console.log(`

package/index.mjs

@@ -3,7 +3,7 @@ import { builtinModules, createRequire } from 'module'
 import { pathToFileURL } from 'url'
 import { dirname, resolve, relative } from 'path'
 import vm from 'vm'
-import { createServer } from 'vite'
+import { createServer, mergeConfig } from 'vite'
 import createDebug from 'debug'
 import { red, dim, yellow, green, inverse, cyan } from 'kolorist'
 
@@ -12,7 +12,11 @@ const debugTransform = createDebug('vite-node:transform')
 
 let executing = false
 
-export async function startAndRun(argv) {
+export async function run(argv) {
+  process.exitCode = 0
+  executing = true
+  let err
+
   function log(...args) {
     if (argv.silent)
       return
@@ -24,7 +28,9 @@ export async function startAndRun(argv) {
 
   const files = argv.files || argv._
 
-  const server = await createServer({
+  const shouldExternalize = argv.shouldExternalize || (id => id.includes('/node_modules/'))
+
+  const server = await createServer(mergeConfig(argv.defaultConfig || {}, {
     logLevel: 'error',
     clearScreen: false,
     configFile: argv.config,
@@ -42,10 +48,27 @@ export async function startAndRun(argv) {
         },
       }
       : {},
-  })
+  }))
   await server.pluginContainer.buildStart({})
 
-  await run(files, server, argv)
+  process.__vite_node__ = {
+    server,
+  }
+
+  async function run() {
+    try {
+      await execute(files, server, shouldExternalize)
+    }
+    catch (e) {
+      console.error(e)
+      err = e
+      if (!argv.watch)
+        process.exit(1)
+    }
+    finally {
+      executing = false
+    }
+  }
 
   if (argv.watch) {
     log(inverse(cyan(' vite node ')), cyan('watch mode enabled\n'))
@@ -57,29 +80,8 @@ export async function startAndRun(argv) {
       }
     })
   }
-}
-
-async function run(files, server, argv) {
-  process.exitCode = 0
-  executing = true
-  let err
-  try {
-    await execute(files, server, argv)
-  }
-  catch (e) {
-    console.error(e)
-    err = e
-    if (!argv.watch)
-      process.exit(1)
-  }
-  finally {
-    executing = false
-  }
-
-  function log(...args) {
-    if (argv.silent)
-      return
-    console.log(...args)
+  else {
+    await run()
   }
 
   if (argv.watch) {
@@ -105,14 +107,19 @@ function normalizeId(id) {
 }
 
 function toFilePath(id, server) {
-  const absolute = id.startsWith('/@fs/')
+  let absolute = id.startsWith('/@fs/')
     ? id.slice(4)
     : slash(resolve(server.config.root, id.slice(1)))
 
+  if (absolute.startsWith('//'))
+    absolute = absolute.slice(1)
+  if (!absolute.startsWith('/'))
+    absolute = `/${absolute}`
+
   return absolute
 }
 
-async function execute(files, server) {
+async function execute(files, server, shouldExternalize) {
   const __pendingModules__ = new Map()
 
   const result = []
@@ -140,13 +147,8 @@ async function execute(files, server) {
 
     debugRequest(absolute)
 
-    // for windows
-    const unifiedPath = absolute[0] !== '/'
-      ? `/${absolute}`
-      : absolute
-
-    if (absolute.includes('/node_modules/'))
-      return import(unifiedPath)
+    if (shouldExternalize(absolute))
+      return import(absolute)
 
     const result = await server.transformRequest(id, { ssr: true })
     if (!result)
@@ -154,7 +156,7 @@ async function execute(files, server) {
 
     debugTransform(id, result.code)
 
-    const url = pathToFileURL(unifiedPath)
+    const url = pathToFileURL(absolute)
     const exports = {}
 
     const context = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-node",
-  "version": "0.1.6",
+  "version": "0.1.10",
   "description": "Vite as Node runtime",
   "keywords": [
     "vite"