@marko/vite 3.1.2 → 3.1.4

package/dist/index.js

@@ -76,10 +76,8 @@ function markoPlugin(opts = {}) {
   let domConfig;
   let hydrateConfig;
   const resolveVirtualDependency = (from, dep) => {
-    const query = `${virtualFileQuery}&id=${encodeURIComponent(
-      normalizePath(dep.virtualPath)
-    )}`;
     const normalizedFrom = normalizePath(from);
+    const query = `${virtualFileQuery}&id=${Buffer.from(dep.virtualPath).toString("base64url") + import_path.default.extname(dep.virtualPath)}`;
     const id = normalizePath(normalizedFrom) + query;
     if (devServer) {
       const prev = virtualFiles.get(id);
@@ -416,7 +414,7 @@ function markoPlugin(opts = {}) {
             cachedSources.set(id, source);
           }
           if (!query) {
-            if (!isBuild && /[\\/]node_modules[\\/]/.test(id) && getModuleType(id) === "cjs") {
+            if (!isBuild && isCJSModule(id)) {
               const { ast } = await compiler.compile(source, id, {
                 cache,
                 ast: true,
@@ -650,30 +648,25 @@ function isEmpty(obj) {
   }
   return true;
 }
-function findPackageJson(file, root = process.cwd()) {
-  let currentDir = import_path.default.dirname(file);
-  while (currentDir !== root && currentDir.length > root.length) {
-    const pkgPath = import_path.default.join(currentDir, "package.json");
-    if (import_fs.default.existsSync(pkgPath)) {
-      return pkgPath;
-    }
-    currentDir = import_path.default.dirname(currentDir);
-  }
-  return null;
-}
-const moduleTypeMap = /* @__PURE__ */ new Map();
-function getModuleType(file) {
-  const pkgPath = findPackageJson(file);
-  if (pkgPath) {
-    let moduleType = moduleTypeMap.get(pkgPath);
-    if (!moduleType) {
-      const pkg = JSON.parse(import_fs.default.readFileSync(pkgPath, "utf8"));
-      moduleType = pkg.type === "module" || pkg.exports ? "esm" : "cjs";
-      moduleTypeMap.set(pkgPath, moduleType);
+const cjsModuleLookup = /* @__PURE__ */ new Map();
+function isCJSModule(id) {
+  var _a;
+  const modulePath = (_a = /^.*[/\\]node_modules[/\\](?:@[^/\\]+[/\\])?[^/\\]+[/\\]/.exec(id)) == null ? void 0 : _a[0];
+  if (modulePath) {
+    let isCJS = cjsModuleLookup.get(modulePath);
+    if (isCJS === void 0) {
+      const pkgPath = modulePath + "package.json";
+      try {
+        const pkg = JSON.parse(import_fs.default.readFileSync(pkgPath, "utf8"));
+        isCJS = pkg.type !== "module" && !pkg.exports;
+      } catch {
+        isCJS = false;
+      }
+      cjsModuleLookup.set(modulePath, isCJS);
     }
-    return moduleType;
+    return isCJS;
   }
-  return "esm";
+  return false;
 }
 function stripVersionAndTimeStamp(id) {
   const queryStart = id.indexOf("?");

package/dist/index.mjs

@@ -56,10 +56,8 @@ function markoPlugin(opts = {}) {
   let domConfig;
   let hydrateConfig;
   const resolveVirtualDependency = (from, dep) => {
-    const query = `${virtualFileQuery}&id=${encodeURIComponent(
-      normalizePath(dep.virtualPath)
-    )}`;
     const normalizedFrom = normalizePath(from);
+    const query = `${virtualFileQuery}&id=${Buffer.from(dep.virtualPath).toString("base64url") + path.extname(dep.virtualPath)}`;
     const id = normalizePath(normalizedFrom) + query;
     if (devServer) {
       const prev = virtualFiles.get(id);
@@ -396,7 +394,7 @@ function markoPlugin(opts = {}) {
             cachedSources.set(id, source);
           }
           if (!query) {
-            if (!isBuild && /[\\/]node_modules[\\/]/.test(id) && getModuleType(id) === "cjs") {
+            if (!isBuild && isCJSModule(id)) {
               const { ast } = await compiler.compile(source, id, {
                 cache,
                 ast: true,
@@ -630,30 +628,25 @@ function isEmpty(obj) {
   }
   return true;
 }
-function findPackageJson(file, root = process.cwd()) {
-  let currentDir = path.dirname(file);
-  while (currentDir !== root && currentDir.length > root.length) {
-    const pkgPath = path.join(currentDir, "package.json");
-    if (fs.existsSync(pkgPath)) {
-      return pkgPath;
-    }
-    currentDir = path.dirname(currentDir);
-  }
-  return null;
-}
-var moduleTypeMap = /* @__PURE__ */ new Map();
-function getModuleType(file) {
-  const pkgPath = findPackageJson(file);
-  if (pkgPath) {
-    let moduleType = moduleTypeMap.get(pkgPath);
-    if (!moduleType) {
-      const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
-      moduleType = pkg.type === "module" || pkg.exports ? "esm" : "cjs";
-      moduleTypeMap.set(pkgPath, moduleType);
+var cjsModuleLookup = /* @__PURE__ */ new Map();
+function isCJSModule(id) {
+  var _a;
+  const modulePath = (_a = /^.*[/\\]node_modules[/\\](?:@[^/\\]+[/\\])?[^/\\]+[/\\]/.exec(id)) == null ? void 0 : _a[0];
+  if (modulePath) {
+    let isCJS = cjsModuleLookup.get(modulePath);
+    if (isCJS === void 0) {
+      const pkgPath = modulePath + "package.json";
+      try {
+        const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+        isCJS = pkg.type !== "module" && !pkg.exports;
+      } catch {
+        isCJS = false;
+      }
+      cjsModuleLookup.set(modulePath, isCJS);
     }
-    return moduleType;
+    return isCJS;
   }
-  return "esm";
+  return false;
 }
 function stripVersionAndTimeStamp(id) {
   const queryStart = id.indexOf("?");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/vite",
   "description": "A Marko plugin for Vite",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {