feat: support vite 7

rturnq · rturnq · commit 5020a97443e2 · 2025-07-07T10:04:52.000-07:00
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -7,5 +7,8 @@
   "commit": false,
   "linked": [],
   "ignore": ["*-example"],
-  "fixed": []
+  "fixed": [],
+  "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
+    "onlyUpdatePeerDependentsWhenOutOfRange": true
+  }
 }
diff --git a/.changeset/shiny-ways-wait.md b/.changeset/shiny-ways-wait.md
@@ -0,0 +1,5 @@
+---
+"@marko/run": minor
+---
+
+Support Vite 7
diff --git a/.changeset/warm-worlds-laugh.md b/.changeset/warm-worlds-laugh.md
@@ -0,0 +1,8 @@
+---
+"@marko/run-adapter-netlify": patch
+"@marko/run-adapter-static": patch
+"@marko/run-adapter-node": patch
+"@marko/run-explorer": patch
+---
+
+Update peer dependency
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/adapters/netlify/package.json b/packages/adapters/netlify/package.json
@@ -29,7 +29,7 @@
     "@netlify/functions": "^3.0.4"
   },
   "peerDependencies": {
-    "@marko/run": "^0.7.0"
+    "@marko/run": "^0.7||^0.8"
   },
   "logo": {
     "url": "https://github.com/marko-js/run/raw/main/assets/marko-run.png"
diff --git a/packages/adapters/node/package.json b/packages/adapters/node/package.json
@@ -26,7 +26,7 @@
     "test": ""
   },
   "peerDependencies": {
-    "@marko/run": "^0.7.4"
+    "@marko/run": "^0.7.4||^0.8"
   },
   "logo": {
     "url": "https://github.com/marko-js/run/raw/main/assets/marko-run.png"
diff --git a/packages/adapters/static/package.json b/packages/adapters/static/package.json
@@ -31,7 +31,7 @@
     "undici": "^6.21.0"
   },
   "peerDependencies": {
-    "@marko/run": "^0.7.7"
+    "@marko/run": "^0.7.7||^0.8"
   },
   "logo": {
     "url": "https://github.com/marko-js/run/raw/main/assets/marko-run.png"
diff --git a/packages/explorer/package.json b/packages/explorer/package.json
@@ -28,7 +28,7 @@
     "preview": "MR_EXPLORER=false marko-run preview"
   },
   "peerDependencies": {
-    "@marko/run": "^0.7.0"
+    "@marko/run": "^0.7||^0.8"
   },
   "logo": {
     "url": "https://github.com/marko-js/run/raw/main/assets/marko-run.png"
diff --git a/packages/run/src/__tests__/fixtures/micro-frame-fetch/package.json b/packages/run/src/__tests__/fixtures/micro-frame-fetch/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@micro-frame/marko": "^1.10.4"
+  }
+}
diff --git a/packages/run/src/__tests__/main.test.ts b/packages/run/src/__tests__/main.test.ts
@@ -78,10 +78,10 @@ before(async () => {
         .replace(/-[a-z0-9_-]+(\.\w+)/gi, "-[hash]$1")
         .replace(/:(\d{4,})/g, ":9999")
         .replace(
-          /\s+<script[^>]+(?:marko-vite-preload.*?<\/script>|src="\/@vite\/client".*?\/>)/gs,
+          /\s+<script[^>]+(?:marko-vite-preload.*?<\/script>|src="\/@vite\/client".*?\/>)/gms,
           "",
         )
-        .replace(/\s+<style[^>]+marko-vite-preload.*?<\/style>/gs, "")
+        .replace(/\s+<style[^>]+marko-vite-preload.*?<\/style>/gms, "")
         .replace(
           /^(\s*at)\s[^\n]+\s*\n?(?:\s*at\s[^\n]+\s*\n?)*$/gm,
           "$1 [Normalized Error Stack]",
@@ -278,6 +278,8 @@ async function testPage(
 
     await snap(snapshot, { ext: ".md", dir });
   } finally {
+    // TODO: figure out why the dev server fails to close sometimes without this wait
+    await delay(50);
     await server.close();
   }
 }
@@ -371,3 +373,7 @@ function htmlSnapshot(html: string, prevHtml?: string) {
   }
   return `\`\`\`html\n${html}\n\`\`\`\n\n`;
 }
+
+function delay(ms: number) {
+  return new Promise<void>((resolve) => setTimeout(resolve, ms));
+}
diff --git a/packages/run/src/vite/plugin.ts b/packages/run/src/vite/plugin.ts
@@ -41,7 +41,7 @@ import type {
   PackageData,
   Route,
 } from "./types";
-import { getExportIdentifiers, getViteSSRExportIdentifiers } from "./utils/ast";
+import { getExportIdentifiers } from "./utils/ast";
 import {
   getExternalAdapterOptions,
   getExternalPluginOptions,
@@ -106,10 +106,6 @@ export default function markoRun(opts: Options = {}): Plugin[] {
   let devServer: ViteDevServer;
   let routes: BuiltRoutes;
   let routeData!: RouteData;
-  let getExportsFromFile: (
-    context: PluginContext,
-    filePath: string,
-  ) => Promise<string[]>;
   let resolvedConfig: ResolvedConfig;
   let typesFile: string | undefined;
   const seenErrors = new Set<string>();
@@ -121,6 +117,18 @@ export default function markoRun(opts: Options = {}): Plugin[] {
     routesRender: 0,
   };
 
+  async function getExportsFromFile(context: PluginContext, filePath: string) {
+    if (devServer) {
+      const result = await devServer.transformRequest(filePath, { ssr: false });
+      return result ? getExportIdentifiers(context.parse(result.code)) : [];
+    }
+    const result = await context.load({
+      id: filePath,
+      resolveDependencies: false,
+    });
+    return result.exports || [];
+  }
+
   async function writeTypesFile(routes: BuiltRoutes) {
     if (
       routes &&
@@ -573,9 +581,9 @@ export default function markoRun(opts: Options = {}): Plugin[] {
           renderVirtualFilesResult = Promise.resolve();
         } else {
           // Build routes and generate code
-          getExportsFromFile = isBuild
-            ? getExportsFromFileBuild
-            : getExportsFromFileDev.bind(null, devServer);
+          // getExportsFromFile = isBuild
+          //   ? getExportsFromFileBuild
+          //   : getExportsFromFileDev.bind(null, devServer);
         }
       },
       async resolveId(importee, importer) {
@@ -703,32 +711,33 @@ export default function markoRun(opts: Options = {}): Plugin[] {
   ];
 }
 
-async function getExportsFromFileBuild(
-  context: PluginContext,
-  filePath: string,
-) {
-  const result = await context.load({
-    id: filePath,
-    resolveDependencies: false,
-  });
-  return result ? getExportIdentifiers(result.ast) : [];
-}
-
-async function getExportsFromFileDev(
-  devServer: ViteDevServer,
-  context: PluginContext,
-  filePath: string,
-) {
-  const result = await devServer.transformRequest(filePath, { ssr: true });
-  if (result) {
-    if (result.exports) {
-      return result.exports;
-    }
-    const ast = context.parse(result.code);
-    return getViteSSRExportIdentifiers(ast);
-  }
-  return [];
-}
+// async function getExportsFromFileBuild(
+//   context: PluginContext,
+//   filePath: string,
+// ) {
+//   const result = await context.load({
+//     id: filePath,
+//     resolveDependencies: false,
+//   });
+//   return result ? getExportIdentifiers(result.ast) : [];
+// }
+
+// async function getExportsFromFileDev(
+//   devServer: ViteDevServer,
+//   context: PluginContext,
+//   filePath: string,
+// ) {
+//   const result = await devServer.transformRequest(filePath, { ssr: true });
+//   // const x = await context._container.transform(filePath)
+//   if (result) {
+//     if (result.exports) {
+//       return result.exports;
+//     }
+//     const ast = context.parse(result.code);
+//     return getViteSSRExportIdentifiers(ast);
+//   }
+//   return [];
+// }
 
 async function globFileExists(root: string, pattern: string) {
   return (await glob(pattern, { root })).length > 0;
diff --git a/packages/run/src/vite/utils/ast.ts b/packages/run/src/vite/utils/ast.ts
@@ -39,49 +39,3 @@ export function getExportIdentifiers(astProgramNode: any): string[] {
 
   return result;
 }
-
-export function getViteSSRExportIdentifiers(
-  astProgramNode: any,
-  exportObjectName: string = "__vite_ssr_exports__",
-): string[] {
-  const result: string[] = [];
-
-  if (t.isProgram(astProgramNode)) {
-    for (const node of astProgramNode.body) {
-      if (t.isExpressionStatement(node)) {
-        if (
-          t.isAssignmentExpression(node.expression) &&
-          t.isMemberExpression(node.expression.left)
-        ) {
-          // __vite_ssr_exports__.XXX = ...
-          const { object, property } = node.expression.left;
-          if (
-            t.isIdentifier(object) &&
-            object.name === exportObjectName &&
-            t.isIdentifier(property)
-          ) {
-            result.push(property.name);
-          }
-        } else if (
-          t.isCallExpression(node.expression) &&
-          t.isMemberExpression(node.expression.callee)
-        ) {
-          //Object.defineProperty(__vite_ssr_exports__, "XXX", ...)
-          const {
-            arguments: [arg0, arg1],
-          } = node.expression;
-          if (
-            t.isIdentifier(arg0) &&
-            arg0.name === exportObjectName &&
-            (t.isStringLiteral(arg1) ||
-              ("value" in arg1 && typeof arg1.value === "string"))
-          ) {
-            result.push(arg1.value);
-          }
-        }
-      }
-    }
-  }
-
-  return result;
-}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@marko/run": minor
 +---
++
 +Support Vite 7
Original file line number	Diff line number	Diff line change
`@@ -78,10 +78,10 @@ before(async () => {`
`78`	`78`	`.replace(/-[a-z0-9_-]+(\.\w+)/gi, "-[hash]$1")`
`79`	`79`	`.replace(/:(\d{4,})/g, ":9999")`
`80`	`80`	`.replace(`
`81`		`- /\s+<script[^>]+(?:marko-vite-preload.?<\/script>\|src="\/@vite\/client".?\/>)/gs,`
	`81`	`+ /\s+<script[^>]+(?:marko-vite-preload.?<\/script>\|src="\/@vite\/client".?\/>)/gms,`
`82`	`82`	`"",`
`83`	`83`	`)`
`84`		`- .replace(/\s+<style[^>]+marko-vite-preload.*?<\/style>/gs, "")`
	`84`	`+ .replace(/\s+<style[^>]+marko-vite-preload.*?<\/style>/gms, "")`
`85`	`85`	`.replace(`
`86`	`86`	`/^(\sat)\s[^\n]+\s\n?(?:\sat\s[^\n]+\s\n?)*$/gm,`
`87`	`87`	`"$1 [Normalized Error Stack]",`
`@@ -278,6 +278,8 @@ async function testPage(`
`278`	`278`
`279`	`279`	`await snap(snapshot, { ext: ".md", dir });`
`280`	`280`	`} finally {`
	`281`	`+ // TODO: figure out why the dev server fails to close sometimes without this wait`
	`282`	`+ await delay(50);`
`281`	`283`	`await server.close();`
`282`	`284`	`}`
`283`	`285`	`}`
`@@ -371,3 +373,7 @@ function htmlSnapshot(html: string, prevHtml?: string) {`
`371`	`373`	`}`
`372`	`374`	return `\`\`\`html\n${html}\n\`\`\`\n\n`;
`373`	`375`	`}`
	`376`	`+`
	`377`	`+function delay(ms: number) {`
	`378`	`+ return new Promise<void>((resolve) => setTimeout(resolve, ms));`
	`379`	`+}`