vitest-dev · sheremet-va · Feb 17, 2025 · Feb 17, 2025 · Feb 17, 2025 · Feb 17, 2025
diff --git a/examples/sveltekit/.gitignore b/examples/sveltekit/.gitignore
diff --git a/examples/sveltekit/package.json b/examples/sveltekit/package.json
diff --git a/examples/sveltekit/src/app.d.ts b/examples/sveltekit/src/app.d.ts
diff --git a/examples/sveltekit/src/app.html b/examples/sveltekit/src/app.html
diff --git a/examples/sveltekit/src/lib/add.test.ts b/examples/sveltekit/src/lib/add.test.ts
diff --git a/examples/sveltekit/src/lib/add.ts b/examples/sveltekit/src/lib/add.ts
diff --git a/examples/sveltekit/src/routes/+page.svelte b/examples/sveltekit/src/routes/+page.svelte
diff --git a/examples/sveltekit/static/favicon.png b/examples/sveltekit/static/favicon.png
diff --git a/examples/sveltekit/svelte.config.js b/examples/sveltekit/svelte.config.js
diff --git a/examples/sveltekit/tsconfig.json b/examples/sveltekit/tsconfig.json
diff --git a/examples/sveltekit/vite.config.ts b/examples/sveltekit/vite.config.ts
diff --git a/package.json b/package.json
@@ -55,24 +55,28 @@
     "magic-string": "^0.30.17",
     "pathe": "^2.0.3",
     "rimraf": "^6.0.1",
+    "rolldown": "1.0.0-beta.3-commit.b546e53",
     "rollup": "^4.34.8",
     "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-esbuild": "^6.2.0",
     "rollup-plugin-license": "^3.5.3",
     "tinyglobby": "^0.2.11",
     "tsx": "^4.19.2",
     "typescript": "^5.7.3",
-    "vite": "^6.0.11",
+    "vite": "https://pkg.pr.new/rolldown/vite@7e5a8b6",
     "vitest": "workspace:*",
     "zx": "^8.3.2"
   },
   "pnpm": {
     "overrides": {
+      "@types/node": "$@types/node",
       "@vitest/browser": "workspace:*",
       "@vitest/ui": "workspace:*",
       "acorn": "8.11.3",
+      "esbuild": "$esbuild",
       "mlly": "^1.7.4",
       "rollup": "$rollup",
+      "tsx": "$tsx",
       "vite": "$vite",
       "vitest": "workspace:*"
     },

diff --git a/packages/browser/src/node/plugin.ts b/packages/browser/src/node/plugin.ts
@@ -533,19 +533,20 @@ body {
       config() {
         return {
           optimizeDeps: {
-            esbuildOptions: {
+            rollupOptions: {
               plugins: [
                 {
-                  name: 'test-utils-rewrite',
-                  setup(build) {
+                  name: 'vue-test-utils-rewrite',
+                  resolveId: {
                     // test-utils: resolve to CJS instead of the browser because the browser version expects a global Vue object
                     // compiler-core: only CJS version allows slots as strings
-                    build.onResolve({ filter: /^@vue\/(test-utils|compiler-core)$/ }, (args) => {
-                      const resolved = getRequire().resolve(args.path, {
-                        paths: [args.importer],
+                    filter: { id: /^@vue\/(test-utils|compiler-core)$/ },
+                    handler(source, importer) {
+                      const resolved = getRequire().resolve(source, {
+                        paths: [importer!],
                       })
-                      return { path: resolved }
-                    })
+                      return resolved
+                    },
                   },
                 },
               ],

diff --git a/packages/mocker/src/node/dynamicImportPlugin.ts b/packages/mocker/src/node/dynamicImportPlugin.ts
@@ -32,7 +32,6 @@ export function dynamicImportPlugin(options: DynamicImportPluginOptions = {}): P
 }
 
 export interface DynamicImportInjectorResult {
-  ast: Rollup.ProgramNode
   code: string
   map: SourceMap
 }
@@ -75,7 +74,6 @@ export function injectDynamicImport(
   })
 
   return {
-    ast,
     code: s.toString(),
     map: s.generateMap({ hires: 'boundary', source: id }),
   }

diff --git a/packages/mocker/src/node/esmWalker.ts b/packages/mocker/src/node/esmWalker.ts
@@ -9,7 +9,6 @@ import type {
   Property,
   VariableDeclaration,
 } from 'estree'
-import type { Rollup } from 'vite'
 import { walk as eswalk } from 'estree-walker'
 
 export type * from 'estree'
@@ -61,7 +60,7 @@ export function isNodeInPattern(node: _Node): node is Property {
  * Except this is using acorn AST
  */
 export function esmWalker(
-  root: Rollup.ProgramNode,
+  root: any,
   { onIdentifier, onImportMeta, onDynamicImport, onCallExpression }: Visitors,
 ): void {
   const parentStack: Node[] = []

diff --git a/packages/mocker/src/node/hoistMocksPlugin.ts b/packages/mocker/src/node/hoistMocksPlugin.ts
@@ -125,7 +125,6 @@ const regexpHoistable
 const hashbangRE = /^#!.*\n/
 
 export interface HoistMocksResult {
-  ast: Rollup.ProgramNode
   code: string
   map: SourceMap
 }
@@ -149,7 +148,8 @@ export function hoistMocks(
 
   const s = new MagicString(code)
 
-  let ast: Rollup.ProgramNode
+  // TODO: rolldown doesn't expose Rollup.Program, but exposes Rollup.PluginContext['parse'] that uses it
+  let ast: any
   try {
     ast = parse(code)
   }
@@ -549,7 +549,6 @@ export function hoistMocks(
   }
 
   return {
-    ast,
     code: s.toString(),
     map: s.generateMap({ hires: 'boundary', source: id }),
   }

diff --git a/packages/vitest/src/node/plugins/normalizeURL.ts b/packages/vitest/src/node/plugins/normalizeURL.ts
@@ -24,7 +24,9 @@ export function NormalizeURLPlugin(): Plugin {
 
       const cleanString = stripLiteral(code)
       const assetImportMetaUrlRE
-        = /\bnew\s+URL\s*\(\s*(?:'[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*(?:,\s*)?\)/g
+      // vite injects new URL(path, import.meta.url) in the code
+      // rolldown injects new URL(path, '' + import.meta.url) in the code
+        = /\bnew\s+URL\s*\(\s*(?:'[^']+'|"[^"]+"|`[^`]+`)\s*,\s*(?:'' \+ )?import\.meta\.url\s*(?:,\s*)?\)/g
 
       let updatedCode = code
       let match: RegExpExecArray | null