diff --git a/packages/vite/package.json b/packages/vite/package.json index 2cd2346a2c5e4f..ca2601a40983b2 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -72,7 +72,7 @@ "@babel/parser": "^7.19.3", "@babel/types": "^7.19.3", "@jridgewell/trace-mapping": "^0.3.16", - "@rollup/plugin-alias": "^3.1.9", + "@rollup/plugin-alias": "^4.0.0", "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-dynamic-import-vars": "^1.4.4", "@rollup/plugin-json": "^4.1.0", diff --git a/packages/vite/src/node/index.ts b/packages/vite/src/node/index.ts index 0e246615bfa5f3..d8e97d5a6a382f 100644 --- a/packages/vite/src/node/index.ts +++ b/packages/vite/src/node/index.ts @@ -119,6 +119,7 @@ export type { // dep types export type { AliasOptions, + MapToFunction, ResolverFunction, ResolverObject, Alias diff --git a/packages/vite/src/types/alias.d.ts b/packages/vite/src/types/alias.d.ts index 3f4393586f1299..5752c25c04fc96 100644 --- a/packages/vite/src/types/alias.d.ts +++ b/packages/vite/src/types/alias.d.ts @@ -40,7 +40,9 @@ export interface Alias { customResolver?: ResolverFunction | ResolverObject | null } -export type ResolverFunction = PluginHooks['resolveId'] +export type MapToFunction = T extends Function ? T : never + +export type ResolverFunction = MapToFunction export interface ResolverObject { buildStart?: PluginHooks['buildStart'] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 64c5d779f746da..000d30c1040610 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -215,7 +215,7 @@ importers: '@babel/parser': ^7.19.3 '@babel/types': ^7.19.3 '@jridgewell/trace-mapping': ^0.3.16 - '@rollup/plugin-alias': ^3.1.9 + '@rollup/plugin-alias': ^4.0.0 '@rollup/plugin-commonjs': ^22.0.2 '@rollup/plugin-dynamic-import-vars': ^1.4.4 '@rollup/plugin-json': ^4.1.0 @@ -282,7 +282,7 @@ importers: '@babel/parser': 7.19.3 '@babel/types': 7.19.3 '@jridgewell/trace-mapping': 0.3.16 - '@rollup/plugin-alias': 3.1.9_rollup@2.79.1 + '@rollup/plugin-alias': 4.0.0_rollup@2.79.1 '@rollup/plugin-commonjs': 22.0.2_rollup@2.79.1 '@rollup/plugin-dynamic-import-vars': 1.4.4_rollup@2.79.1 '@rollup/plugin-json': 4.1.0_rollup@2.79.1 @@ -2221,6 +2221,19 @@ packages: slash: 3.0.0 dev: true + /@rollup/plugin-alias/4.0.0_rollup@2.79.1: + resolution: {integrity: sha512-fGRWzM2F6wXnzAqn4Db8SdB/2Ree0u2XOQaaTy9mhqA35NmUzJXevMBUcpZywPF2MIUUAw+SKfWogKxFSPh+Qw==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + rollup: 2.79.1 + slash: 4.0.0 + dev: true + /@rollup/plugin-commonjs/22.0.2_rollup@2.79.1: resolution: {integrity: sha512-//NdP6iIwPbMTcazYsiBMbJW7gfmpHom33u1beiIoHDEM0Q9clvtQB1T0efvMqHeKsGohiHo97BCPCkBXdscwg==} engines: {node: '>= 12.0.0'}