Bump rolldown-vite, simplify test Rolldown detection

Author: markdalgleish

integration/helpers/vite-rolldown-template/package.json

@@ -31,12 +31,12 @@
     "@types/react-dom": "^18.2.7",
     "eslint": "^8.38.0",
     "typescript": "^5.1.6",
-    "vite": "npm:[email protected].3",
+    "vite": "npm:[email protected].5",
     "vite-env-only": "^3.0.1",
     "vite-tsconfig-paths": "^4.2.1"
   },
   "overrides": {
-    "vite": "npm:[email protected].3"
+    "vite": "npm:[email protected].5"
   },
   "engines": {
     "node": ">=20.0.0"

integration/helpers/vite.ts

@@ -99,31 +99,18 @@ export const viteConfig = {
   build: ({ assetsInlineLimit, assetsDir }: ViteConfigBuildArgs = {}) => {
     return dedent`
       build: {
-        rollupOptions: await (async () => {
-          const fs = await import("node:fs/promises");
-          const path = await import("node:path");
-          const vitePackageJsonPath = path.join(import.meta.dirname, "node_modules/vite/package.json");
-          const vitePackageJson = JSON.parse(await fs.readFile(vitePackageJsonPath, "utf8"));
-          const isRolldown = vitePackageJson.name === "rolldown-vite";
-
-          return isRolldown ? {
-            // NOTE: ignore "The built-in minifier is still under development." warning
-            onwarn(warning, warn) {
-              if (warning.code === "MINIFY_WARNING") return;
-              warn(warning);
-            },
-          } : undefined;
-        })(),
-        ${
-          assetsInlineLimit !== undefined
-            ? `assetsInlineLimit: ${JSON.stringify(assetsInlineLimit)},`
-            : ""
-        }
-        ${
-          assetsDir !== undefined
-            ? `assetsDir: ${JSON.stringify(assetsDir)},`
-            : ""
-        }
+        // Detect rolldown-vite:
+        rollupOptions: "transformWithOxc" in (await import("vite"))
+          ? {
+              onwarn(warning, warn) {
+                // Ignore "The built-in minifier is still under development." warning
+                if (warning.code === "MINIFY_WARNING") return;
+                warn(warning);
+              },
+            }
+          : undefined,
+        assetsInlineLimit: ${assetsInlineLimit ?? "undefined"},
+        assetsDir: ${assetsDir ?? "undefined"},
       },
     `;
   },

playground/framework-rolldown-vite/package.json

@@ -23,11 +23,11 @@
     "@types/react": "^18.2.20",
     "@types/react-dom": "^18.2.7",
     "typescript": "^5.1.6",
-    "vite": "npm:[email protected].3",
+    "vite": "npm:[email protected].5",
     "vite-tsconfig-paths": "^4.2.1"
   },
   "overrides": {
-    "vite": "npm:[email protected].3"
+    "vite": "npm:[email protected].5"
   },
   "engines": {
     "node": ">=20.0.0"