build: upgrade to rollup@3 and fix re-export error (#4108)

vitest-dev · Sep 15, 2023 · 701415b · 701415b
1 parent b245ce3
commit 701415b
Show file tree

Hide file tree

Showing 7 changed files with 126 additions and 393 deletions.
diff --git a/packages/browser/package.json b/packages/browser/package.json
@@ -44,7 +44,7 @@
   "dependencies": {
     "estree-walker": "^3.0.3",
     "magic-string": "^0.30.1",
-    "modern-node-polyfills": "^0.1.3",
+    "modern-node-polyfills": "^1.0.0",
     "sirv": "^2.0.3"
   },
   "devDependencies": {
@@ -54,7 +54,6 @@
     "@vitest/ui": "workspace:*",
     "@vitest/ws-client": "workspace:*",
     "periscopic": "^3.1.0",
-    "rollup": "^3.26.0",
     "vitest": "workspace:*"
   }
 }
diff --git a/packages/vite-node/package.json b/packages/vite-node/package.json
@@ -1,5 +1,6 @@
 {
   "name": "vite-node",
+  "type": "module",
   "version": "0.34.4",
   "description": "Vite as Node.js runtime",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
@@ -91,7 +92,6 @@
   },
   "devDependencies": {
     "@jridgewell/trace-mapping": "^0.3.18",
-    "@types/debug": "^4.1.8",
-    "rollup": "^2.79.1"
+    "@types/debug": "^4.1.8"
   }
 }
diff --git a/packages/vite-node/rollup.config.js b/packages/vite-node/rollup.config.js
@@ -6,7 +6,7 @@ import commonjs from '@rollup/plugin-commonjs'
 import json from '@rollup/plugin-json'
 import alias from '@rollup/plugin-alias'
 import { defineConfig } from 'rollup'
-import pkg from './package.json'
+import pkg from './package.json' assert { type: 'json' }
 
 const entries = {
   'index': 'src/index.ts',

diff --git a/packages/vite-node/src/server.ts b/packages/vite-node/src/server.ts
@@ -3,8 +3,7 @@ import { existsSync } from 'node:fs'
 import { join, normalize, relative, resolve } from 'pathe'
 import type { TransformResult, ViteDevServer } from 'vite'
 import createDebug from 'debug'
-import type { EncodedSourceMap } from '@jridgewell/trace-mapping'
-import type { DebuggerOptions, FetchResult, ViteNodeResolveId, ViteNodeServerOptions } from './types'
+import type { DebuggerOptions, EncodedSourceMap, FetchResult, ViteNodeResolveId, ViteNodeServerOptions } from './types'
 import { shouldExternalize } from './externalize'
 import { normalizeModuleId, toArray, toFilePath, withTrailingSlash } from './utils'
 import { Debugger } from './debug'

diff --git a/packages/vite-node/src/source-map.ts b/packages/vite-node/src/source-map.ts
@@ -1,8 +1,8 @@
 import type { TransformResult } from 'vite'
 import { dirname, isAbsolute, relative, resolve } from 'pathe'
-import type { EncodedSourceMap } from '@jridgewell/trace-mapping'
 import { withTrailingSlash } from './utils'
 import { install } from './source-map-handler'
+import type { EncodedSourceMap } from './types'
 
 interface InstallSourceMapSupportOptions {
   getSourceMap: (source: string) => EncodedSourceMap | null | undefined

diff --git a/packages/ws-client/package.json b/packages/ws-client/package.json
@@ -44,7 +44,6 @@
     "ws": "^8.13.0"
   },
   "devDependencies": {
-    "@vitest/runner": "workspace:*",
-    "rollup": "^2.79.1"
+    "@vitest/runner": "workspace:*"
   }
 }