Skip to content

Commit b4164c5

Browse files
authored
Resolve all rollup imports to node_modules to avoid type conflict (#5386)
Resolve all rollup imports to node_modules
1 parent 8fecd35 commit b4164c5

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Diff for: test/types.d.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import type { SourceMap } from 'magic-string';
2-
import type { RollupLog } from 'rollup';
3-
import type { RollupBuild, RollupError, RollupOptions } from '../src/rollup/types';
2+
import type { RollupBuild, RollupError, RollupLog, RollupOptions } from '../src/rollup/types';
43

54
export interface TestConfigBase {
65
/**

Diff for: tsconfig.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
"skipLibCheck": true,
1212
"strict": true,
1313
"target": "ES2022",
14-
"useDefineForClassFields": false
14+
"useDefineForClassFields": false,
15+
"paths": {
16+
"rollup": ["./node_modules/rollup"]
17+
}
1518
},
1619
"include": ["typings/**/*.d.ts", "src", "cli", "browser", "rollup.config.ts", "native"],
1720
"exclude": ["dist", "node_modules", "test/typescript", "browser/dist"]

0 commit comments

Comments
 (0)