Skip to content
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.

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

feat: migrate vue-devtools to v7.3 #675

Merged
merged 3 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 0 additions & 22 deletions packages/devtools/client/composables/vue-devtools.ts

This file was deleted.

1 change: 1 addition & 0 deletions packages/devtools/client/pages/modules/components-tree.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<script setup lang="ts">
import { Components as VueComponents } from '@vue/devtools-applet'
import { useDevToolsState as useVueDevToolsState } from '@vue/devtools-core'

const { connected } = useVueDevToolsState()
const client = useClient()
Expand Down
1 change: 1 addition & 0 deletions packages/devtools/client/pages/modules/pinia.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<script setup lang="ts">
import { Pinia } from '@vue/devtools-applet'
import { useDevToolsState as useVueDevToolsState } from '@vue/devtools-core'

const { connected } = useVueDevToolsState()

Expand Down
5 changes: 5 additions & 0 deletions packages/devtools/client/plugins/vue-devtools.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { VueDevToolsVuePlugin } from '@vue/devtools-core'

export default defineNuxtPlugin((nuxtApp) => {
nuxtApp.vueApp.use(VueDevToolsVuePlugin())
})
57 changes: 7 additions & 50 deletions packages/devtools/client/setup/vue-devtools.ts
Original file line number Diff line number Diff line change
@@ -1,40 +1,5 @@
import { HandShakeServer, getDevToolsState, initDevToolsSeparateWindow, initDevToolsSeparateWindowBridge, onDevToolsStateUpdated, setupDevToolsBridge } from '@vue/devtools-core'
import type { AppRecord } from '@vue/devtools-kit'
import { toggleHighPerfMode } from '@vue/devtools-kit'

export type DevtoolsBridgeAppRecord = Pick<AppRecord, 'name' | 'id' | 'version' | 'routerId' | 'moduleDetectives'>

const appConnected = ref(false)
const clientConnected = ref(false)
const appRecords = ref<Array<DevtoolsBridgeAppRecord>>([])
const activeAppRecordId = ref<string | null>(null)
export const connected = computed(() => appConnected.value && clientConnected.value)
export const activeAppRecord = computed(() => appRecords.value.find(r => r.id === activeAppRecordId.value))

export function initVueDevToolsState() {
getDevToolsState().then((data) => {
if (!data)
return
appConnected.value = data.connected
clientConnected.value = data.clientConnected
appRecords.value = data.appRecords
activeAppRecordId.value = data.activeAppRecordId
})

onDevToolsStateUpdated((data) => {
if (!data)
return
appConnected.value = data.connected
clientConnected.value = data.clientConnected
appRecords.value = data.appRecords
activeAppRecordId.value = data.activeAppRecordId
})

return {
appRecords,
activeAppRecord,
}
}
import { functions, onRpcConnected, rpc } from '@vue/devtools-core'
import { createRpcClient, toggleHighPerfMode } from '@vue/devtools-kit'

export function setupVueDevTools() {
const state = useDevToolsFrameState()
Expand All @@ -48,18 +13,10 @@ export function setupVueDevTools() {
toggleHighPerfMode(!state.value?.open)
})

initDevToolsSeparateWindow({
onConnected(channel) {
const bridge = initDevToolsSeparateWindowBridge(channel)
setupDevToolsBridge(bridge)
new HandShakeServer(bridge).onnConnect().then(() => {
bridge.emit('devtools:client-ready')
initVueDevToolsState()
})
bridge.on('disconnect', () => {
channel.close()
initDevToolsSeparateWindow()
})
},
createRpcClient(functions, {
preset: 'iframe',
})
onRpcConnected(() => {
rpc.value.initDevToolsServerListener()
})
}
6 changes: 3 additions & 3 deletions packages/devtools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
"@nuxt/devtools-kit": "workspace:*",
"@nuxt/devtools-wizard": "workspace:*",
"@nuxt/kit": "^3.12.2",
"@vue/devtools-core": "7.3.3",
"@vue/devtools-kit": "7.3.3",
"birpc": "^0.2.17",
"consola": "^3.2.3",
"cronstrue": "^2.50.0",
Expand Down Expand Up @@ -96,9 +98,7 @@
"@unocss/preset-uno": "^0.61.0",
"@unocss/runtime": "^0.61.0",
"@vitest/ui": "^1.6.0",
"@vue/devtools-applet": "7.1.3",
"@vue/devtools-core": "7.1.3",
"@vue/devtools-kit": "7.1.3",
"@vue/devtools-applet": "7.3.3",
"@vueuse/nuxt": "^10.11.0",
"esno": "^4.7.0",
"floating-vue": "5.0.2",
Expand Down
2 changes: 2 additions & 0 deletions packages/devtools/src/runtime/plugins/view/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { createHooks } from 'hookable'
import { debounce } from 'perfect-debounce'
import type { Router } from 'vue-router'
import type { $Fetch } from 'ofetch'
import { setIframeServerContext } from '@vue/devtools-kit'
import type { NuxtDevtoolsHostClient, TimelineEventRoute, TimelineMetrics } from '../../../types'
import { initTimelineMetrics } from '../../function-metrics-helpers'
import Main from './Main.vue'
Expand Down Expand Up @@ -133,6 +134,7 @@ export async function setupDevToolsClient({
iframe.src = initialUrl
iframe.onload = async () => {
try {
setIframeServerContext(iframe!)
await waitForClientInjection()
client.syncClient()
}
Expand Down
8 changes: 5 additions & 3 deletions packages/devtools/src/runtime/vue-devtools/overlay.mjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { devtools } from '@vue/devtools-kit'
import { initAppSeparateWindow } from '@vue/devtools-core'
import { createRpcServer, devtools } from '@vue/devtools-kit'
import { functions } from '@vue/devtools-core'

devtools.init()

initAppSeparateWindow()
createRpcServer(functions, {
preset: 'iframe',
})
Loading