@marko/vite 5.0.14 → 5.1.0

package/dist/babel-plugin-cjs-interop.d.ts

@@ -26,7 +26,5 @@ import type { PluginObj } from "@babel/core";
  *      ```
  */
 export default function plugin(options: {
-    extensions: string[];
-    conditions: string[];
     filter?: (path: string) => boolean;
 }): PluginObj;

package/dist/index.mjs

@@ -14,55 +14,42 @@ import * as t from "@babel/types";
 import fs from "fs";
 import path from "path";
 import Resolve from "resolve";
-import { exports } from "resolve.exports";
-var exportsMainFile = `__package_exports__`;
-var modulePathReg = /^.*[/\\]node_modules[/\\](?:@[^/\\]+[/\\])?[^/\\]+[/\\]/;
+var moduleNameReg = /^(?:@[^/\\]+[/\\])?[^/\\]+/;
+var modulePathReg = /^.*[/\\]node_modules[/\\]((?:@[^/\\]+[/\\])?[^/\\]+[/\\])/;
 var cjsModuleLookup = /* @__PURE__ */ new Map();
-function isCJSModule(id) {
-  const modulePath = modulePathReg.exec(id)?.[0];
-  if (modulePath) {
-    const pkgPath = modulePath + "package.json";
-    let isCJS = cjsModuleLookup.get(pkgPath);
-    if (isCJS === void 0) {
-      try {
+function isCJSModule(id, fromFile) {
+  if (/\.cjs$/.test(id)) return true;
+  if (/\.mjs$/.test(id)) return false;
+  if (id[0] === ".") return isCJSModule(fromFile, fromFile);
+  const isAbsolute = path.isAbsolute(id);
+  const moduleId = moduleNameReg.exec(
+    isAbsolute ? id.replace(modulePathReg, "$1").replace(/\\/g, "/") : id
+  )?.[0];
+  if (!moduleId) return false;
+  let isCJS = cjsModuleLookup.get(moduleId);
+  if (isCJS === void 0) {
+    try {
+      if (isAbsolute) {
+        const pkgPath = modulePathReg.exec(id)[0] + "/package.json";
         const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
         isCJS = pkg.type !== "module" && !pkg.exports;
-      } catch {
-        isCJS = false;
+      } else {
+        Resolve.sync(moduleId + "/package.json", {
+          basedir: path.dirname(fromFile),
+          filename: fromFile,
+          pathFilter(pkg, _pkgFile, relativePath) {
+            isCJS = pkg.type !== "module" && !pkg.exports;
+            return relativePath;
+          }
+        });
+        isCJS ??= false;
       }
-      cjsModuleLookup.set(pkgPath, isCJS);
-    }
-    return isCJS;
-  }
-  return false;
-}
-function resolve(id, from, extensions, conditions) {
-  return Resolve.sync(id, {
-    basedir: path.dirname(from),
-    filename: from,
-    pathFilter,
-    packageFilter,
-    extensions
-  });
-  function pathFilter(pkg, pkgFile, relativePath) {
-    cjsModuleLookup.set(pkgFile, pkg.type !== "module" && !pkg.exports);
-    if (pkg.exports) {
-      return exports(
-        pkg,
-        relativePath === exportsMainFile ? "." : relativePath,
-        {
-          conditions
-        }
-      )?.[0];
+    } catch {
+      isCJS = false;
     }
-    return relativePath;
-  }
-}
-function packageFilter(pkg) {
-  if (pkg.exports) {
-    pkg.main = exportsMainFile;
+    cjsModuleLookup.set(moduleId, isCJS);
   }
-  return pkg;
+  return isCJS;
 }
 
 // src/babel-plugin-cjs-interop.ts
@@ -71,20 +58,10 @@ function plugin(options) {
     name: "marko-import-interop",
     visitor: {
       ImportDeclaration(path7) {
-        if (!path7.node.specifiers.length || /\.(?:mjs|marko)$|\?/.test(path7.node.source.value) || options.filter?.(path7.node.source.value) === false) {
-          return;
-        }
-        try {
-          const resolved = resolve(
-            path7.node.source.value,
-            path7.hub.file.opts.filename,
-            options.extensions,
-            options.conditions
-          );
-          if (!/\.c?js$/.test(resolved) || !isCJSModule(resolved)) {
-            return;
-          }
-        } catch (_) {
+        if (!path7.node.specifiers.length || /\.(?:mjs|marko)$|\?/.test(path7.node.source.value) || options.filter?.(path7.node.source.value) === false || !isCJSModule(
+          path7.node.source.value,
+          path7.hub.file.opts.filename
+        )) {
           return;
         }
         let namespaceId;
@@ -455,7 +432,7 @@ function stripBasePath(basePath, path7) {
 // src/manifest-generator.ts
 var MARKER_COMMENT = "MARKO_VITE";
 function generateDocManifest(basePath, rawHtml) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve, reject) => {
     const parser = new Parser(
       new DomHandler(function(err, dom) {
         if (err) {
@@ -481,7 +458,7 @@ function generateDocManifest(basePath, rawHtml) {
           bodyPrepend,
           body
         );
-        resolve2({
+        resolve({
           preload,
           "head-prepend": serializeOrNull(basePath, headPrepend, preload),
           head: serializeOrNull(basePath, head, preload),
@@ -660,13 +637,10 @@ function renderAssets(slot) {
     const slotWrittenEntriesKey = \`___viteWrittenEntries-\${slot}\`;
     const lastWrittenEntry = this[slotWrittenEntriesKey] || 0;
     const writtenEntries = (this[slotWrittenEntriesKey] = entries.length);
-
-    if(!this.___flushedMBP && slot !== "head-prepend") {
-        this.___flushedMBP = true;
-
-        html += \`<script\${this.___viteInjectAttrs}>${opts.runtimeId ? `$mbp_${opts.runtimeId}` : "$mbp"}=\${JSON.stringify(base)}</script>\`
-    }
-
+    ${opts.basePathVar ? `if (!this.___flushedMBP && slot !== "head-prepend") {
+      this.___flushedMBP = true;
+      html += \`<script\${this.___viteInjectAttrs}>${opts.runtimeId ? `$mbp_${opts.runtimeId}` : "$mbp"}=\${JSON.stringify(base)}</script>\`
+    }` : ""}
     for (let i = lastWrittenEntry; i < writtenEntries; i++) {
       let entry = entries[i];
 
@@ -828,7 +802,7 @@ function markoPlugin(opts = {}) {
   let hydrateConfig;
   const resolveVirtualDependency = (from, dep) => {
     const normalizedFrom = normalizePath(from);
-    const query = `${virtualFileQuery}&id=${Buffer.from(dep.virtualPath).toString("base64url") + path6.extname(dep.virtualPath)}`;
+    const query = `${virtualFileQuery}&id=${encodeURIComponent(dep.virtualPath)}`;
     const id = normalizedFrom + query;
     if (devServer) {
       const prev = virtualFiles.get(id);
@@ -840,6 +814,7 @@ function markoPlugin(opts = {}) {
     return `./${path6.posix.basename(normalizedFrom) + query}`;
   };
   let root;
+  let rootResolveFile;
   let devEntryFile;
   let devEntryFilePosix;
   let renderAssetsRuntimeCode;
@@ -901,6 +876,7 @@ function markoPlugin(opts = {}) {
           config.base = process.env.BASE_URL;
         }
         root = normalizePath(config.root || process.cwd());
+        rootResolveFile = path6.join(root, "_.js");
         baseConfig = {
           cache,
           optimize,
@@ -1013,7 +989,7 @@ function markoPlugin(opts = {}) {
         if (isSSRBuild && !config.build?.commonjsOptions?.esmExternals) {
           config.build ??= {};
           config.build.commonjsOptions ??= {};
-          config.build.commonjsOptions.esmExternals = (id) => !isCJSModule(id);
+          config.build.commonjsOptions.esmExternals = (id) => !isCJSModule(id, rootResolveFile);
         }
         if (basePathVar) {
           config.experimental ??= {};
@@ -1067,8 +1043,6 @@ function markoPlugin(opts = {}) {
             ...ssrConfig.babelConfig,
             plugins: (ssrConfig.babelConfig.plugins || []).concat(
               plugin({
-                extensions: config.resolve.extensions,
-                conditions: config.resolve.conditions,
                 filter: isBuild ? void 0 : (path7) => !/^\./.test(path7)
               })
             )
@@ -1279,7 +1253,7 @@ function markoPlugin(opts = {}) {
         if (!isMarkoFile(id)) {
           if (!isBuild) {
             const ext = path6.extname(id);
-            if (ext === ".cjs" || ext === ".js" && isCJSModule(id)) {
+            if (ext === ".cjs" || ext === ".js" && isCJSModule(id, rootResolveFile)) {
               if (cjsToEsm === void 0) {
                 try {
                   cjsToEsm = (await import("@chialab/cjs-to-esm")).transform;
@@ -1303,7 +1277,7 @@ function markoPlugin(opts = {}) {
           if (linked) {
             cachedSources.set(id, source);
           }
-          if (!query && isCJSModule(id)) {
+          if (!query && isCJSModule(id, rootResolveFile)) {
             if (isBuild) {
               const { code: code2, map: map2, meta: meta2 } = await compiler2.compile(
                 source,
@@ -1323,7 +1297,7 @@ function markoPlugin(opts = {}) {
           id,
           getConfigForFileSystem(
             info,
-            isSSR ? isCJSModule(id) ? ssrCjsConfig : ssrConfig : query === browserEntryQuery ? hydrateConfig : domConfig
+            isSSR ? isCJSModule(id, rootResolveFile) ? ssrCjsConfig : ssrConfig : query === browserEntryQuery ? hydrateConfig : domConfig
           )
         );
         const { map, meta } = compiled;
@@ -1474,13 +1448,13 @@ function getPosixBasenameWithoutExt(file) {
   return file.slice(baseStart, extStart);
 }
 function createDeferredPromise() {
-  let resolve2;
+  let resolve;
   let reject;
   const promise = new Promise((res, rej) => {
-    resolve2 = res;
+    resolve = res;
     reject = rej;
   });
-  promise.resolve = resolve2;
+  promise.resolve = resolve;
   promise.reject = reject;
   return promise;
 }

package/dist/resolve.d.ts

@@ -1,2 +1 @@
-export declare function isCJSModule(id: string): boolean;
-export declare function resolve(id: string, from: string, extensions: string[], conditions: string[]): string;
+export declare function isCJSModule(id: string, fromFile: string): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/vite",
-  "version": "5.0.14",
+  "version": "5.1.0",
   "description": "A Marko plugin for Vite",
   "keywords": [
     "loader",