@marko/vite 5.3.2 → 5.3.3

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

@@ -9,20 +9,21 @@ import type { PluginObj } from "@babel/core";
  * Examples
  *   1. Source: ```import { bar as baz } from 'foo';```
  *      Becomes:```
- *        import _foo from 'foo';
- *        const { bar: baz } = _foo
+ *        import * as _foo from 'foo';
+ *        const { bar: baz } = _foo?.default === void 0 || _foo?.__esModule ? _foo : _foo.default;
  *      ```
  *
  *   2. Source:  ```import myFoo from 'foo';```
  *      Becomes: ```
  *        import * as _myFoo from 'foo';
- *        const myFoo = _myFoo?.__esModule ? _myFoo.default : _myFoo;
+ *        const { default: myFoo } = _myFoo?.__esModule ? _myFoo.default : _myFoo;
  *      ```
  *
  *   3. Source:  ```import foo, * as nsFoo from 'foo';```
  *      Becomes: ```
- *        import nsFoo from 'foo';
- *        const myFoo = nsFoo?.__esModule ? nsFoo.default : nsFoo
+ *        import * as _nsFoo from 'foo';
+ *        const nsFoo = _nsFoo?.default === void 0 || _nsFoo?.__esModule ? _nsFoo : _nsFoo.default
+ *        const { default: myFoo } = _nsFoo?.__esModule ? _nsFoo.default : _nsFoo
  *      ```
  */
 export default function plugin(options: {

package/dist/esbuild-plugin.d.ts

@@ -2,5 +2,9 @@ import * as compiler from "@marko/compiler";
 import type * as vite from "vite";
 type ESBuildOptions = Exclude<vite.DepOptimizationConfig["esbuildOptions"], undefined>;
 type ESBuildPlugin = Exclude<ESBuildOptions["plugins"], undefined>[number];
-export default function esbuildPlugin(config: compiler.Config): ESBuildPlugin;
+export default function esbuildPlugin(config: compiler.Config, virtualFiles: Map<string, {
+    code: string;
+} | Promise<{
+    code: string;
+}>>, cacheVirtualFile: (path: string) => void): ESBuildPlugin;
 export {};

package/dist/index.mjs

@@ -110,11 +110,24 @@ function plugin(options) {
               t.variableDeclarator(
                 namespaceId,
                 t.conditionalExpression(
-                  t.optionalMemberExpression(
-                    rawImport,
-                    t.identifier("__esModule"),
-                    false,
-                    true
+                  t.logicalExpression(
+                    "||",
+                    t.binaryExpression(
+                      "===",
+                      t.optionalMemberExpression(
+                        rawImport,
+                        t.identifier("default"),
+                        false,
+                        true
+                      ),
+                      t.unaryExpression("void", t.numericLiteral(0), true)
+                    ),
+                    t.optionalMemberExpression(
+                      rawImport,
+                      t.identifier("__esModule"),
+                      false,
+                      true
+                    )
                   ),
                   rawImport,
                   t.memberExpression(rawImport, t.identifier("default"))
@@ -138,11 +151,24 @@ function plugin(options) {
                   )
                 ),
                 t.conditionalExpression(
-                  t.optionalMemberExpression(
-                    rawImport,
-                    t.identifier("__esModule"),
-                    false,
-                    true
+                  t.logicalExpression(
+                    "||",
+                    t.binaryExpression(
+                      "===",
+                      t.optionalMemberExpression(
+                        rawImport,
+                        t.identifier("default"),
+                        false,
+                        true
+                      ),
+                      t.unaryExpression("void", t.numericLiteral(0), true)
+                    ),
+                    t.optionalMemberExpression(
+                      rawImport,
+                      t.identifier("__esModule"),
+                      false,
+                      true
+                    )
                   ),
                   rawImport,
                   t.memberExpression(rawImport, t.identifier("default"))
@@ -161,8 +187,9 @@ import * as compiler from "@marko/compiler";
 import fs2 from "fs";
 import path2 from "path";
 var importTagReg = /<([^>]+)>/;
-var markoErrorRegExp = /^(.+?)(?:\((\d+)(?:\s*,\s*(\d+))?\))?: (.*)$/gm;
-function esbuildPlugin(config) {
+var markoErrorReg = /^(.+?)(?:\((\d+)(?:\s*,\s*(\d+))?\))?: (.*)$/gm;
+var virtualFileReg = /\?marko-virtual&/;
+function esbuildPlugin(config, virtualFiles2, cacheVirtualFile) {
   return {
     name: "marko",
     async setup(build) {
@@ -178,12 +205,27 @@ function esbuildPlugin(config) {
         ...finalConfig,
         output: "hydrate"
       };
-      build.onResolve({ filter: /\.marko\./ }, (args) => {
+      build.onResolve({ filter: virtualFileReg }, (args) => {
+        const resolvedPath = path2.resolve(args.resolveDir, args.path);
+        const isExternal = !/\.(?:[cm]?[jt]s|json)$/i.test(resolvedPath);
+        if (isExternal && !isScan) {
+          void cacheVirtualFile(resolvedPath);
+        }
         return {
-          path: path2.resolve(args.resolveDir, args.path),
-          external: true
+          path: resolvedPath,
+          external: isExternal
         };
       });
+      build.onLoad({ filter: virtualFileReg }, async (args) => {
+        const file = virtualFiles2.get(args.path);
+        if (file) {
+          return {
+            contents: (await file).code,
+            loader: path2.extname(args.path).slice(1),
+            resolveDir: path2.dirname(args.path)
+          };
+        }
+      });
       build.onResolve({ filter: importTagReg }, (args) => {
         const tagName = importTagReg.exec(args.path)?.[1];
         if (tagName) {
@@ -211,7 +253,7 @@ function esbuildPlugin(config) {
           const errors = [];
           let match;
           let lines;
-          while (match = markoErrorRegExp.exec(text)) {
+          while (match = markoErrorReg.exec(text)) {
             const [, file, rawLine, rawCol, text2] = match;
             const line = parseInt(rawLine, 10) || 1;
             const column = parseInt(rawCol, 10) || 1;
@@ -821,6 +863,7 @@ function markoPlugin(opts = {}) {
     return `./${path6.posix.basename(normalizedFrom) + query}`;
   };
   let root;
+  let cacheDir;
   let rootResolveFile;
   let devEntryFile;
   let devEntryFilePosix;
@@ -988,7 +1031,23 @@ function markoPlugin(opts = {}) {
         optimizeExtensions.push(".marko");
         const esbuildOptions = optimizeDeps.esbuildOptions ??= {};
         const esbuildPlugins = esbuildOptions.plugins ??= [];
-        esbuildPlugins.push(esbuildPlugin(baseConfig));
+        let cacheDirPromise;
+        esbuildPlugins.push(
+          esbuildPlugin(baseConfig, virtualFiles, async (resolved) => {
+            if (cacheDir) {
+              const file = virtualFiles.get(resolved);
+              if (file) {
+                await (cacheDirPromise ||= fs4.promises.mkdir(cacheDir, {
+                  recursive: true
+                }));
+                await fs4.promises.writeFile(
+                  virtualPathToCacheFile(resolved, root, cacheDir),
+                  (await file).code
+                );
+              }
+            }
+          })
+        );
         const ssr = config.ssr ??= {};
         const { noExternal } = ssr;
         if (noExternal !== true) {
@@ -1061,6 +1120,7 @@ function markoPlugin(opts = {}) {
       },
       configResolved(config) {
         basePath = config.base;
+        cacheDir = config.cacheDir && normalizePath(config.cacheDir);
         getMarkoAssetFns = void 0;
         for (const plugin2 of config.plugins) {
           const fn = plugin2.api?.getMarkoAssetCodeForEntry;
@@ -1170,6 +1230,9 @@ function markoPlugin(opts = {}) {
         }
         let importeeQuery = getMarkoQuery(importee);
         if (importeeQuery) {
+          if (importee[0] !== "." && importee[0] !== "\0" && importeeQuery.startsWith(virtualFileQuery)) {
+            return importee;
+          }
           importee = importee.slice(0, -importeeQuery.length);
         } else if (!importOpts.scan) {
           if (ssr && linked && importer && importer[0] !== "\0" && (importer !== devEntryFile || normalizePath(importer) !== devEntryFilePosix) && // Vite tries to resolve against an `index.html` in some cases, we ignore it here.
@@ -1191,7 +1254,7 @@ function markoPlugin(opts = {}) {
             )
           } : await this.resolve(importee, importer, resolveOpts);
           if (resolved) {
-            resolved.id += importeeQuery;
+            resolved.id = stripVersionAndTimeStamp(resolved.id) + importeeQuery;
           }
           return resolved;
         }
@@ -1219,14 +1282,26 @@ function markoPlugin(opts = {}) {
           return "NO_CLIENT_ASSETS";
         }
         const query = getMarkoQuery(id);
-        switch (query) {
-          case serverEntryQuery: {
-            entryIds.add(id.slice(0, -query.length));
-            return null;
-          }
-          case browserEntryQuery:
-          case browserQuery: {
-            return cachedSources.get(id.slice(0, -query.length)) || null;
+        if (query) {
+          switch (query) {
+            case serverEntryQuery: {
+              entryIds.add(id.slice(0, -query.length));
+              return null;
+            }
+            case browserEntryQuery:
+            case browserQuery: {
+              return cachedSources.get(id.slice(0, -query.length)) || null;
+            }
+            default:
+              return virtualFiles.get(id) || cacheDir && fs4.promises.readFile(
+                virtualPathToCacheFile(id, root, cacheDir),
+                "utf8"
+              ).then((code) => {
+                virtualFiles.set(id, { code });
+                return code;
+              }).catch(() => {
+                return null;
+              });
           }
         }
         return virtualFiles.get(id) || null;
@@ -1491,6 +1566,12 @@ function fileNameToURL(fileName, root) {
   }
   return `/${relativeURL}`;
 }
+function virtualPathToCacheFile(virtualPath, root, cacheDir) {
+  return path6.join(
+    cacheDir,
+    normalizePath(path6.relative(root, virtualPath)).replace(/[\\/]+/g, "_")
+  );
+}
 function getPosixBasenameWithoutExt(file) {
   const baseStart = file.lastIndexOf(POSIX_SEP) + 1;
   const extStart = file.indexOf(".", baseStart + 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/vite",
-  "version": "5.3.2",
+  "version": "5.3.3",
   "description": "A Marko plugin for Vite",
   "keywords": [
     "loader",
@@ -87,7 +87,7 @@
     "tsx": "^4.20.3",
     "typescript": "^5.8.3",
     "typescript-eslint": "^8.37.0",
-    "vite": "^7.0.4"
+    "vite": "^7.1.10"
   },
   "peerDependencies": {
     "@marko/compiler": "^5",