vite-node 2.1.4 → 2.1.6

package/dist/chunk-hmr.cjs

@@ -127,7 +127,7 @@ async function fetchUpdate(runner, { path, acceptedPath }) {
   };
 }
 function warnFailedFetch(err, path) {
-  if (!err.message.match("fetch")) {
+  if (!(err instanceof Error) || !err.message.match("fetch")) {
     console.error(err);
   }
   console.error(

package/dist/chunk-hmr.mjs

@@ -125,7 +125,7 @@ async function fetchUpdate(runner, { path, acceptedPath }) {
   };
 }
 function warnFailedFetch(err, path) {
-  if (!err.message.match("fetch")) {
+  if (!(err instanceof Error) || !err.message.match("fetch")) {
     console.error(err);
   }
   console.error(

package/dist/cli.cjs

@@ -17,10 +17,11 @@ require('pathe');
 require('node:fs');
 require('node:assert');
 require('node:perf_hooks');
+require('es-module-lexer');
 require('./constants.cjs');
 require('node:events');
 
-var version = "2.1.4";
+var version = "2.1.6";
 
 const cli = cac("vite-node");
 cli.option("-r, --root <path>", "Use specified root directory").option("-c, --config <path>", "Use specified config file").option("-m, --mode <mode>", "Set env mode").option("-w, --watch", 'Restart on file changes, similar to "nodemon"').option("--script", "Use vite-node as a script runner").option("--options <options>", "Use specified Vite server options").option("-v, --version", "Output the version number").option("-h, --help", "Display help for command");

package/dist/cli.mjs

@@ -15,10 +15,11 @@ import 'pathe';
 import 'node:fs';
 import 'node:assert';
 import 'node:perf_hooks';
+import 'es-module-lexer';
 import './constants.mjs';
 import 'node:events';
 
-var version = "2.1.4";
+var version = "2.1.6";
 
 const cli = cac("vite-node");
 cli.option("-r, --root <path>", "Use specified root directory").option("-c, --config <path>", "Use specified config file").option("-m, --mode <mode>", "Set env mode").option("-w, --watch", 'Restart on file changes, similar to "nodemon"').option("--script", "Use vite-node as a script runner").option("--options <options>", "Use specified Vite server options").option("-v, --version", "Output the version number").option("-h, --help", "Display help for command");

package/dist/server.cjs

@@ -7,12 +7,32 @@ var node_url = require('node:url');
 var createDebug = require('debug');
 var pathe = require('pathe');
 var browser = require('./chunk-browser.cjs');
+var esModuleLexer = require('es-module-lexer');
 var constants = require('./constants.cjs');
 var utils = require('./utils.cjs');
 var sourceMap = require('./source-map.cjs');
 require('node:module');
 require('node:path');
 
+function _interopNamespaceDefault(e) {
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+
+var esModuleLexer__namespace = /*#__PURE__*/_interopNamespaceDefault(esModuleLexer);
+
 function hashCode(s) {
   return s.split("").reduce((a, b) => {
     a = (a << 5) - a + b.charCodeAt(0);
@@ -111,10 +131,8 @@ ${result.code}`,
 }
 
 const BUILTIN_EXTENSIONS = /* @__PURE__ */ new Set([".mjs", ".cjs", ".node", ".wasm"]);
-const ESM_SYNTAX_RE = /(?:[\s;]|^)(?:import[\s\w*,{}]*from|import\s*["'*{]|export\b\s*(?:[*{]|default|class|type|function|const|var|let|async function)|import\.meta\b)/m;
 const ESM_EXT_RE = /\.(es|esm|esm-browser|esm-bundler|es6|module)\.js$/;
 const ESM_FOLDER_RE = /\/(es|esm)\/(.*\.js)$/;
-const COMMENT_RE = /\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm;
 const defaultInline = [
   /virtual:/,
   /\.[mc]?ts$/,
@@ -169,8 +187,14 @@ async function isValidNodeImport(id) {
   if (/\.(?:\w+-)?esm?(?:-\w+)?\.js$|\/esm?\//.test(id)) {
     return false;
   }
-  const code = await fs.promises.readFile(id, "utf8").catch(() => "");
-  return !ESM_SYNTAX_RE.test(code.replace(COMMENT_RE, ""));
+  try {
+    await esModuleLexer__namespace.init;
+    const code = await fs.promises.readFile(id, "utf8");
+    const [, , , hasModuleSyntax] = esModuleLexer__namespace.parse(code);
+    return !hasModuleSyntax;
+  } catch {
+    return false;
+  }
 }
 const _defaultExternalizeCache = /* @__PURE__ */ new Map();
 async function shouldExternalize(id, options, cache = _defaultExternalizeCache) {

package/dist/server.mjs

@@ -5,6 +5,7 @@ import { pathToFileURL } from 'node:url';
 import createDebug from 'debug';
 import { resolve, join, extname, dirname, relative, normalize } from 'pathe';
 import { f } from './chunk-browser.mjs';
+import * as esModuleLexer from 'es-module-lexer';
 import { KNOWN_ASSET_RE } from './constants.mjs';
 import { isNodeBuiltin, slash, findNearestPackageData, toArray, withTrailingSlash, normalizeModuleId, toFilePath } from './utils.mjs';
 import { withInlineSourcemap } from './source-map.mjs';
@@ -109,10 +110,8 @@ ${result.code}`,
 }
 
 const BUILTIN_EXTENSIONS = /* @__PURE__ */ new Set([".mjs", ".cjs", ".node", ".wasm"]);
-const ESM_SYNTAX_RE = /(?:[\s;]|^)(?:import[\s\w*,{}]*from|import\s*["'*{]|export\b\s*(?:[*{]|default|class|type|function|const|var|let|async function)|import\.meta\b)/m;
 const ESM_EXT_RE = /\.(es|esm|esm-browser|esm-bundler|es6|module)\.js$/;
 const ESM_FOLDER_RE = /\/(es|esm)\/(.*\.js)$/;
-const COMMENT_RE = /\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm;
 const defaultInline = [
   /virtual:/,
   /\.[mc]?ts$/,
@@ -167,8 +166,14 @@ async function isValidNodeImport(id) {
   if (/\.(?:\w+-)?esm?(?:-\w+)?\.js$|\/esm?\//.test(id)) {
     return false;
   }
-  const code = await promises.readFile(id, "utf8").catch(() => "");
-  return !ESM_SYNTAX_RE.test(code.replace(COMMENT_RE, ""));
+  try {
+    await esModuleLexer.init;
+    const code = await promises.readFile(id, "utf8");
+    const [, , , hasModuleSyntax] = esModuleLexer.parse(code);
+    return !hasModuleSyntax;
+  } catch {
+    return false;
+  }
 }
 const _defaultExternalizeCache = /* @__PURE__ */ new Map();
 async function shouldExternalize(id, options, cache = _defaultExternalizeCache) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-node",
   "type": "module",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "Vite as Node.js runtime",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -74,13 +74,14 @@
     "dist"
   ],
   "engines": {
-    "node": "^18.0.0 || >=20.0.0"
+    "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
   },
   "dependencies": {
     "cac": "^6.7.14",
     "debug": "^4.3.7",
+    "es-module-lexer": "^1.5.4",
     "pathe": "^1.1.2",
-    "vite": "^5.0.0"
+    "vite": "^5.0.0 || ^6.0.0"
   },
   "devDependencies": {
     "@jridgewell/trace-mapping": "^0.3.25",