Skip to content

fix(kit): cast nuxt addVitePlugin calls past duplicate vite peer types #590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
antfubot wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −8
Open

fix(kit): cast nuxt addVitePlugin calls past duplicate vite peer types #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions packages/oxc/src/modules/rpc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
import type { PluginWithDevTools } from '@vitejs/devtools-kit'
import { addVitePlugin, defineNuxtModule } from '@nuxt/kit'
import { DevToolsServer } from '../../../core/src/node/plugins/server'
import { rpcFunctions } from '../node/rpc'

// `@nuxt/kit` types `addVitePlugin` against whatever `vite` install pnpm
// resolves for its own peer chain, which can differ from the one our
// plugins are built against even on the same `vite` version — cast past
// the resulting structural mismatch.
function addDevToolsVitePlugin<T extends { name: string }>(plugin: T): void {
addVitePlugin(plugin as unknown as Parameters<typeof addVitePlugin>[0])
}

export default defineNuxtModule({
meta: {
name: 'devtools-rpc',
configKey: 'devtoolsRpc',
},
setup() {
addVitePlugin({
const rpcPlugin: PluginWithDevTools = {
name: 'vite:devtools:oxc',
devtools: {
setup(ctx) {
Expand All @@ -17,8 +26,9 @@ export default defineNuxtModule({
}
},
},
})
}
addDevToolsVitePlugin(rpcPlugin)

addVitePlugin(DevToolsServer())
addDevToolsVitePlugin(DevToolsServer())
},
})
16 changes: 13 additions & 3 deletions packages/rolldown/src/modules/rpc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
import type { PluginWithDevTools } from '@vitejs/devtools-kit'
import { addVitePlugin, defineNuxtModule } from '@nuxt/kit'
import { DevToolsServer } from '../../../core/src/node/plugins/server'
import { rpcFunctions } from '../node/rpc'

// `@nuxt/kit` types `addVitePlugin` against whatever `vite` install pnpm
// resolves for its own peer chain, which can differ from the one our
// plugins are built against even on the same `vite` version — cast past
// the resulting structural mismatch.
function addDevToolsVitePlugin<T extends { name: string }>(plugin: T): void {
addVitePlugin(plugin as unknown as Parameters<typeof addVitePlugin>[0])
}

export default defineNuxtModule({
meta: {
name: 'devtools-rpc',
configKey: 'devtoolsRpc',
},
setup() {
addVitePlugin({
const rpcPlugin: PluginWithDevTools = {
name: 'vite:devtools:rolldown',
devtools: {
setup(ctx) {
Expand All @@ -17,8 +26,9 @@ export default defineNuxtModule({
}
},
},
})
}
addDevToolsVitePlugin(rpcPlugin)

addVitePlugin(DevToolsServer())
addDevToolsVitePlugin(DevToolsServer())
},
})
12 changes: 10 additions & 2 deletions packages/vite/src/modules/rpc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,21 @@ import { addVitePlugin, defineNuxtModule } from '@nuxt/kit'
import { DevToolsServer } from '../../../core/src/node/plugins/server'
import { DevToolsViteInspect } from '../node/inspect/plugin'

// `@nuxt/kit` types `addVitePlugin` against whatever `vite` install pnpm
// resolves for its own peer chain, which can differ from the one our
// plugins are built against even on the same `vite` version — cast past
// the resulting structural mismatch.
function addDevToolsVitePlugin<T extends { name: string }>(plugin: T): void {
addVitePlugin(plugin as unknown as Parameters<typeof addVitePlugin>[0])
}

export default defineNuxtModule({
meta: {
name: 'devtools-rpc',
configKey: 'devtoolsRpc',
},
setup() {
addVitePlugin(DevToolsViteInspect())
addVitePlugin(DevToolsServer())
addDevToolsVitePlugin(DevToolsViteInspect())
addDevToolsVitePlugin(DevToolsServer())
},
})
Loading